diff -Nru wxglade-0.9.6/application.py wxglade-1.0.1/application.py
--- wxglade-0.9.6/application.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/application.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,15 +3,15 @@
 
 @copyright: 2002-2007 Alberto Griggio <agriggio@users.sourceforge.net>
 @copyright: 2012-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 
-import os, sys, random, re, logging, math
+import os, sys, random, re, logging, time
 import wx
 
-import common, config, misc, plugins, errors, compat
+import common, config, misc, plugins, compat
 import bugdialog
 import new_properties as np
 
@@ -19,17 +19,17 @@
 
 class FileDirDialog(object):
     """Custom class which displays a FileDialog or a DirDialog, according to the value of the
-    L{Application.multiple_files} of its parent (instance of L{Application}).
+    Application.multiple_files of its parent (instance of Application).
 
-    @ivar default_extension: The default extension will be added to all file names without extension.
-    @ivar file_message: Message to show on the file dialog
-    @ivar dir_message: Message to show on the directory dialog
-
-    @ivar file_style: Style for the file dialog
-    @ivar dir_style:  Style for the directory dialog
-    @ivar value:      Value returned by file or directory dialog on success
-    @ivar parent:     Parent instance of L{Application}
-    @ivar prev_dir:   Previous directory"""
+    default_extension: The default extension will be added to all file names without extension.
+    file_message: Message to show on the file dialog
+    dir_message: Message to show on the directory dialog
+
+    file_style: Style for the file dialog
+    dir_style:  Style for the directory dialog
+    value:      Value returned by file or directory dialog on success
+    parent:     Parent instance of Application
+    prev_dir:   Previous directory"""
 
     def __init__(self, parent, wildcard=_("All files|*"), file_message=_("Choose a file"),dir_message=None,file_style=0):
         self.prev_dir = config.preferences.codegen_path or ""
@@ -63,12 +63,114 @@
         return wx.ID_CANCEL
 
     def get_value(self):
-        "Return the dialog value returned during the last L{ShowModal()} call;  @see: L{value}"
+        "Return the dialog value returned during the last ShowModal() call."
         return self.value
 
 
+class EditRoot(np.PropertyOwner):
+    IS_ROOT = True
+    parent = None
+
+    # XXX move this to EditBase
+    def get_all_children(self):
+        return self.children
+
+    def _get_child_pos(self, child):
+        return self.children.index(child)
+
+    def has_ancestor(self, node):
+        return False
+
+    def get_path(self):
+        return self.name
+
+    def add_item(self, child, index=None):
+        # XXX index is always None at the moment
+        if index is None:
+            self.children.append(child)
+        else:
+            if len(self.children)<=index:
+                self.children += [None]*(index - len(self.children) + 1)
+            self.children[index] = child
+        if child.IS_TOPLEVEL_WINDOW:
+            self.add_top_window(child.name)
+
+    def remove_item(self, child, level=0, dummy=False):
+        if child.IS_TOPLEVEL_WINDOW:
+            self.remove_top_window(child.name)
+        self.children.remove(child)
+
+    def write(self, output, tabs=0):
+        """Writes the xml equivalent of this tree to the given output file.
+        This function writes unicode to the outfile."""
+        # XXX move this to application.Application
+        timestring = time.asctime()  if not config.testing else  'XXX XXX NN NN:NN:NN NNNN'
+        output.append( u'<?xml version="1.0"?>\n'
+                       u'<!-- generated by wxGlade %s on %s -->\n\n' % (config.version, timestring) )
+
+        attrs = ["name","class","language","top_window","encoding","use_gettext", "overwrite", "mark_blocks",
+                 "for_version","is_template","indent_amount"]
+        props = [self.properties[attr] for attr in attrs]
+        attrs = dict( (attr,prop.get_string_value()) for attr,prop in zip(attrs,props) if not prop.deactivated )
+        top_window_p = self.properties["top_window"]
+        if top_window_p.deactivated and top_window_p.value:
+            attrs["top_window"] = top_window_p.value
+        attrs["option"] = self.properties["multiple_files"].get_string_value()
+        attrs["indent_symbol"] = self.properties["indent_mode"].get_string_value()
+        attrs["path"] = self.properties["output_path"].get_string_value()
+        attrs['use_new_namespace'] = 1
+        # add a . to the file extensions
+        attrs["source_extension"] = '.' + self.properties["source_extension"].get_string_value()
+        attrs["header_extension"] = '.' + self.properties["header_extension"].get_string_value()
+
+        inner_xml = []
+
+        if self.is_template and getattr(self, 'template_data', None):
+            self.template_data.write(inner_xml, tabs+1)
+
+        for c in self.children:
+            c.write(inner_xml, tabs+1)
+
+        output.extend( common.format_xml_tag( u'application', inner_xml, is_xml=True, **attrs ) )
+
+    def find_widget_from_path(self, path):
+        path = path.split("/")
+        index = 1  # skip 'app'
+        w = self
+        for index in range(1, len(path)):
+            if path[index].startswith("SLOT "):
+                pos = int(path[index].split(" ")[1])
+                if pos<len(w.children) and w.children[pos].IS_SLOT:
+                    w = w.children[pos]
+                    continue
+            children = [c for c in w.get_all_children() if c.name==path[index]]
+            if not children: return None
+            w = children[0]
+        return w
+
+    def clear(self):
+        # delete all children; call common.root.new() or .init() afterwards
+        while self.children:
+            self.children[-1].recursive_remove(0)
+
+    def _get_parent_tooltip(self, index):
+        return None
+
+    def _get_tooltip_string(self):
+        return None
+
+    # use following to track toplevel windows?
+    def child_widget_created(self, child, level):
+        pass
+
+    def destroying_child_widget(self, child, index):
+        pass
+
+    def destroyed_child_widget(self):
+        pass
+
 
-class Application(np.PropertyOwner):
+class Application(EditRoot):
     "Properties of the application being created"
 
     all_supported_versions = ['2.8', '3.0']  # Supported wx versions
@@ -108,13 +210,13 @@
         _PROPERTY_HELP["output_path"] = "Output file or directory; double click label to show in Explorer"
     elif sys.platform=="darwin":
         _PROPERTY_HELP["output_path"] = "Output file or directory; double click label to show in Finder"
-    is_sizer = False
-    _is_toplevel = False
-    base = None
+
+    WX_CLASS = "wxApp"
+    IS_WINDOW = IS_SIZER = IS_TOPLEVEL = IS_SLOT = False
+    CHILDREN = None  # any number of toplevel windows etc.
 
     def __init__(self):
         np.PropertyOwner.__init__(self)
-        self._logger = logging.getLogger(self.__class__.__name__)
 
         self.__saved    = True  # raw value for self.saved property; if True, there are no changes to save
         self.__filename = None  # raw value for the self.filename property; Name of the output XML file
@@ -171,6 +273,7 @@
         self.generate_code = np.ActionButtonProperty(self.generate_code)
 
         self.widget = None  # always None, just to keep interface to Tree similar to other editors
+        self.children = []  # the toplevel windows
         self.node = None
 
     def set_for_version(self, value):
@@ -192,16 +295,6 @@
     def get_output_path(self):
         return os.path.normpath(os.path.expanduser(self.output_path))
 
-    def _add_page(self, label, page, sizer):
-        "Add a page to properties notebook (L{self.notebook})"
-        page.SetAutoLayout(True)
-        page.SetSizer(sizer)
-        sizer.Layout()
-        sizer.Fit(page)
-        self.notebook.AddPage(page, label)
-        h = page.GetSize()[1]
-        page.SetScrollbars(1, 5, 1, int(math.ceil(h / 5.0)))
-
     def set_encoding(self, value):
         try:
             unicode('a', value)
@@ -251,36 +344,35 @@
         self.properties["source_extension"].set_blocked(blocked)
         self.properties["header_extension"].set_blocked(blocked)
 
-
     # properties: saved and filename
     def _get_saved(self):
         return self.__saved
     def _set_saved(self, value):
         if self.__saved != value:
             self.__saved = value
-            t = common.app_tree.get_title().strip()
-            if not value:
-                common.app_tree.set_title('* ' + t)
-            else:
-                if t[0] == '*':
-                    common.app_tree.set_title(t[1:].strip())
+            if not config.use_gui: return
+            self._set_title()
     saved = property(_get_saved, _set_saved)
+
     def _get_filename(self):
         return self.__filename
     def _set_filename(self, value):
         if self.__filename != value:
             self.__filename = value
-            if self.__saved:
-                flag = ' '
-            else:
-                flag = '* '
-            if self.__filename is not None:
-                common.app_tree.set_title('%s(%s)' % (flag, self.__filename))
-            else:
-                common.app_tree.set_title(flag)
+            self._set_title()
     filename = property(_get_filename, _set_filename)
 
+    def _set_title(self):
+        if not config.use_gui: return
+        title = ["wxGlade: "]
+        if not self.__saved:
+            title.append( "* " )
+        if self.__filename:
+            title.append( "(%s)"%self.__filename )
+        common.main.SetTitle( "".join(title).strip() )
+
     # interface from tree ##############################################################################################
+    # handle top_window property choices
     def add_top_window(self, name):
         p = self.properties["top_window"]
         p.add_choice(name)
@@ -301,8 +393,17 @@
         p.choices[p.choices.index(oldname)] = newname
         p.set_choices()
 
+    def _get_top_window(self):
+        # helper for wxGladeFrame
+        toplevel_name = self.top_window
+        toplevel = None
+        for c in self.children:
+            if c.name==toplevel_name:
+                toplevel = c
+        return toplevel
+
     ####################################################################################################################
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         # ['encoding', 'output_path', 'class', 'name', 'multiple_files', 'language', 'top_window', 'use_gettext',
         # 'use_gettext', 'is_template', 'overwrite', 'indent_mode', 'indent_amount', 'for_version', 'source_extension',
         # 'header_extension']
@@ -318,6 +419,14 @@
             if block:
                 self.properties["mark_blocks"].set(True)
             self.properties["mark_blocks"].set_blocked(block)
+        if modified and len(modified)==1 and "multiple_files" in modified:
+            # the user has just edited
+            p = self.properties["output_path"]
+            if self.multiple_files:
+                p.set(os.path.dirname(p.value) or ".")
+            else:
+                extension = common.code_writers[self.language].default_extensions[0]
+                p.set( os.path.join(p.value or "", "wxglade_out.%s"%extension) )
 
     def _init(self):
         # common part for init and new
@@ -353,12 +462,10 @@
         self.properties_changed(None)
 
     def generate_code(self, preview=False, out_path=None, widget=None):
-        if config.use_gui:
-            common.property_panel.flush()
-        else:
-            np.flush_current_property()
+        np.flush_current_property()
         if out_path is None:
             out_path = os.path.expanduser(self.output_path.strip())
+            if not out_path and self.multiple_files: out_path = "."
             if not os.path.isabs(out_path) and (out_path and self.filename):
                 out_path = os.path.join(os.path.dirname(self.filename), out_path)
                 out_path = os.path.normpath(out_path)
@@ -379,23 +486,36 @@
                                            "application." )
 
         if preview:
-            writer = common.code_writers["python"].copy()
+            writer = common.code_writers["preview"]
         else:
-            writer = common.code_writers[self.language]#.copy()
+            writer = common.code_writers[self.language]
+
+        error = writer.new_project(self, out_path, preview)
+        if error:
+            # prerequisites were checked and there is a problem
+            misc.error_message( _("Error generating code:\n%s")%error )
+            return
 
         try:
-            writer.new_project(self, out_path, preview)
-            writer.generate_code(self.node, widget)
+            writer.generate_code(self, widget)
             writer.finalize()
-        except errors.WxgBaseException as inst:
-            misc.error_message( _("Error generating code:\n%s")%inst )
-            return
         except EnvironmentError as inst:
-            bugdialog.ShowEnvironmentError(_('An IO/OS related error is occurred:'), inst)
+            bugdialog.ShowEnvironmentError(_('An IO related error has occurred:'), inst)
+            return
+        except UnicodeEncodeError as inst:
+            msg = _("Could not convert generated source code to encoding %s.\n"
+                    '(characters "%s")')
+            chars = inst.object[inst.start:inst.end] # .encode('unicode-escape')
+            msg = msg%(self.encoding, chars)
+            misc.error_message( msg )
+            return
+        except Exception as inst:
+            # unexpected / internal error
+            if config.testing or config.debugging: raise
             bugdialog.Show(_('Generate Code'), inst)
             return
         finally:
-            writer.clean_up(self.node)
+            writer.clean_up(widget or self)
 
         if preview or not config.use_gui: return
         if config.preferences.show_completion:
@@ -407,7 +527,6 @@
             frame = app.GetTopWindow()
             frame.user_message(_('Code generated'))
 
-
     def is_visible(self):
         return True
 
@@ -424,6 +543,7 @@
             else:
                 dirname, basename = os.path.split(self.filename)
                 basename, extension = os.path.splitext(basename)
+                basename = basename.replace(".", "_")
                 if not os.path.exists(dirname):
                     error = "Directory '%s' not found"%dirname
                 elif not os.path.isdir(dirname):
@@ -439,33 +559,21 @@
     def preview(self, widget, position=None):
         """Generate and instantiate preview widget.
         None will be returned in case of errors. The error details are written to the application log file."""
-        # some checks
-        #if compat.IS_PHOENIX:
-            #found = common.app_tree.find_widgets_by_classnames(widget.node, "EditPropertyGridManager")
-            #if found:
-                #error = ("Preview with PropertyGridManager controls is currently deactivated as it causes crashes "
-                         #"with wxPython Phoenix")
-                #wx.MessageBox( error, _('Error'), wx.OK | wx.CENTRE | wx.ICON_EXCLAMATION )
-                #return
-        # XXX check other things as well, e.g. different bitmap sizes for BitmapButton
 
         preview_filename = self._get_preview_filename()
         if preview_filename is None: return
-        widget_class_name = widget.klass
-
-        # make a valid name for the class (this can be invalid for some sensible reasons...)
-        widget_class = widget.klass[widget.klass.rfind('.') + 1:]
-        widget_class = widget.klass[widget.klass.rfind(':') + 1:]
-        # ALB 2003-11-08: always randomize the class name: this is to make preview work even when there are multiple
-        # classes with the same name (which makes sense for XRC output...)
-        widget_class = '_%d_%s' % (random.randrange(10 ** 8, 10 ** 9), widget_class)
-        widget.properties["class"].set(widget_class)
 
         if wx.Platform == "__WXMAC__" and not compat.PYTHON2:
             # workaround for Mac OS testing: sometimes the caches need to be invalidated
             import importlib
             importlib.invalidate_caches()
 
+        # make a valid name for the class (this can be invalid for some sensible reasons...)
+        preview_classname = widget.WX_CLASS.split('.')[-1].split(':')[-1]
+        # randomize the class name to make preview work when there are multiple classes with the same name (e.g. XRC)
+        preview_classname = '_%d_%s' % (random.randrange(10 ** 8, 10 ** 9), preview_classname)
+        widget.properties["class"].set_temp(preview_classname)
+
         frame = None
         try:
             self.generate_code(True, preview_filename, widget)
@@ -481,12 +589,15 @@
                 return None
 
             try:
-                preview_class = getattr(preview_module, widget.klass)
+                preview_class = getattr(preview_module, preview_classname) # .klass)
             except AttributeError:
-                # module loade previously -> do a re-load XXX this is required for Python 3; check alternatives
-                import importlib
-                preview_module = importlib.reload(preview_module)
-                preview_class = getattr(preview_module, widget.klass)
+                # module loaded previously -> do a re-load XXX this is required for Python 3; check alternatives
+                if sys.version_info.major<3:
+                    preview_module = reload(preview_module)
+                else:
+                    import importlib
+                    preview_module = importlib.reload(preview_module)
+                preview_class = getattr(preview_module, preview_classname)
 
             if not preview_class:
                 misc.error_message( _('No preview class "%s" found.\nThe details are written to the log file.\n'
@@ -502,7 +613,7 @@
                 frame.SetClientSize((w + 20, h + 20))
             elif not issubclass(preview_class, (wx.Frame,wx.Dialog)):
                 # the toplevel class isn't really toplevel, add a frame...
-                frame = wx.Frame(None, -1, widget_class_name)
+                frame = wx.Frame(None, -1, widget.klass)
                 if issubclass(preview_class, wx.MenuBar):
                     menubar = preview_class()
                     frame.SetMenuBar(menubar)
@@ -550,8 +661,7 @@
             widget.preview_widget = None
             widget.properties["preview"].set_label(_('Show Preview'))
             bugdialog.Show(_("Generate Preview"), inst)
-        # XXX restore app state
-        widget.properties["class"].set(widget_class_name)
+
         return frame
     
     def on_char_hook(self, event):
@@ -570,7 +680,7 @@
         if language is None:
             language = self.language
         if widget is not None:
-            if widget.__class__.__name__=="SizerSlot":
+            if widget.__class__.__name__ in ("SizerSlot", "Slot"):
                 return
             cname = common.class_names[widget.__class__.__name__]
             if language != 'XRC':
@@ -580,22 +690,22 @@
                 xrcgen = common.code_writers['XRC']
                 ok = xrcgen.obj_builders.get(cname, None) is not xrcgen.NotImplementedXrcObject
             if not ok:
-                self._logger.warn( _('No %s code generator for %s (of type %s) available'),
+                logging.warn( _('No %s code generator for %s (of type %s) available'),
                                    misc.capitalize(language), widget.name, cname )
         else:
             # in this case, we check all the widgets in the tree
             def check_rec(node):
                 if node.widget is not None:
-                    self.check_codegen(node.widget)
+                    self.check_codegen(node)
                 if node.children:
                     for c in node.children:
                         check_rec(c)
-            if common.app_tree.root.children:
-                for c in common.app_tree.root.children:
+            if common.root.children:
+                for c in common.root.children:
                     check_rec(c)
 
     def _update_output_path(self, language):
-        "Update wildcards and default extension in the generic file and directory dialog (L{FileDirDialog})."
+        "Update wildcards and default extension in the generic file and directory dialog (FileDirDialog)."
 
         prop = self.properties["output_path"]
         prop.message = _("Select output file")  if self.multiple_files else  _("Select output directory")
@@ -611,8 +721,8 @@
     def popup_menu(self, event, pos=None):
         # right click event -> expand all or show context menu
         expanded = True
-        for child_node in common.app_tree.root.children or []:
-            if not common.app_tree.IsExpanded(child_node.item) and child_node.children:
+        for child in self.children:
+            if not common.app_tree.IsExpanded(child.item) and child.children:
                 expanded = False
                 break
         if not expanded:
@@ -640,11 +750,20 @@
         return (False, "Only toplevel widgets can be added here; click Frame or Dialog icon to do so")
 
     def check_compatibility(self, widget, typename=None):
-        if getattr(widget, "_is_toplevel", False) or typename=="window":
+        if (widget and widget.IS_TOPLEVEL) or typename=="window":
+            return (True, None)
+        if (widget and widget.WX_CLASS=="wxMenuBar") or typename=="menubar":
+            return (True, None)
+        if (widget and widget.WX_CLASS=="wxToolBar") or typename=="toolbar":
             return (True, None)
         return (False, "Only toplevel widgets can be pasted here (e.g. Frame or Dialog)")
 
     def clipboard_paste(self, clipboard_data):
         "Insert a widget from the clipboard to the current destination"
         import clipboard
-        return clipboard._paste(None, None, 0, clipboard_data)
+        return clipboard._paste(None, 0, clipboard_data)
+
+    ####################################################################################################################
+    def _label_editable(self):
+        return False
+
diff -Nru wxglade-0.9.6/bugdialog.py wxglade-1.0.1/bugdialog.py
--- wxglade-0.9.6/bugdialog.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/bugdialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -63,7 +63,7 @@
         exc_type: Exception type as string
         header: Initial message
 
-        see: L{SetContent(), SetContentEI()"""
+        see: SetContent(), SetContentEI()"""
         details = log.getBufferAsString()
 
         if not exc_msg:
@@ -97,7 +97,7 @@
 
 
 def Show(msg, exc):
-    """Wrapper for creating a L{BugReport} dialog and show the details of the given exception instance.
+    """Wrapper for creating a BugReport dialog and show the details of the given exception instance.
 
     msg: Short description of the action that has raised this error
     exc: Caught exception
@@ -110,14 +110,14 @@
 
 
 def ShowEI(exc_type, exc_value, exc_tb, msg=None):
-    """Wrapper for creating a L{BugReport} dialog and show the given exception details.
+    """Wrapper for creating a BugReport dialog and show the given exception details.
 
     exc_type: Exception type
     exc_value: Exception value
     exc_tb: Exception traceback
     msg: Short description of the exception
 
-    see: L{Show(), BugReport.SetContent()"""
+    see: Show(), BugReport.SetContent()"""
     dialog = BugReport()
     dialog.SetContentEI(exc_type, exc_value, exc_tb, msg)
     dialog.ShowModal()
diff -Nru wxglade-0.9.6/CHANGES.txt wxglade-1.0.1/CHANGES.txt
--- wxglade-0.9.6/CHANGES.txt	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/CHANGES.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,14868 +0,0 @@
-2016-03-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, docs/html/apa.html, docs/html/apb.html,
-	docs/html/apbs02.html, docs/html/apbs03.html, docs/html/apbs04.html,
-	docs/html/apc.html, docs/html/apd.html, docs/html/ape.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html,
-	docs/html/ch01s08.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html,
-	docs/html/ch05s05.html, docs/html/ch05s06.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/ch06s04.html, docs/html/ch06s05.html,
-	docs/html/ch06s06.html, docs/html/ch06s07.html,
-	docs/html/ch06s08.html, docs/html/ch06s09.html, docs/html/ch07.html,
-	docs/html/ch07s02.html, docs/html/ch07s03.html,
-	docs/html/design_window_empty_slot.png, docs/html/index.html,
-	docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/preferences.png, docs/pdf/manual.pdf,
-	docs/src/design_window_empty_slot.png, docs/src/manual.xml,
-	docs/src/preferences.png:
-	Reorganise and update the documentation
-	[2c030f953c91] [tip]
-
-2016-02-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Remove obsolete pass statement
-	[51bf01d7606c]
-
-2016-02-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* msgdialog.py, res/messagedialog.wxg:
-	Remove unused application startup code
-	[e79cc413602f]
-
-	* NEWS.txt, codegen/py_codegen.py, msgdialog.py,
-	tests/casefiles/AllWidgets_28.py, tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample_30.py, tests/casefiles/PyOgg1.py,
-	tests/casefiles/PyOgg2_app.py, tests/casefiles/PyOgg3.py,
-	tests/casefiles/PythonAddApp_multi_gettext_simple.py,
-	tests/casefiles/PythonAddApp_multi_simple.py,
-	tests/casefiles/PythonAddApp_single_gettext_simple.py,
-	tests/casefiles/PythonAddApp_single_simple.py:
-	Don't set the default value for redirection in wx.PySimpleApp()
-	[e38c12b01c54]
-
-	* widget_properties.py:
-	Treat (escape/unescape) tabs always like newlines in Properties
-	[c3519118ad95]
-
-	* widget_properties.py:
-	Convert newline character to newline sequence in GridProperty
-
-	Newline characters entered via Ctrl+Enter won't be handled
-	correctly. This change converts such characters to newline
-	sequences. Thereby it will be handled correctly.
-	[d34774dc6a0d]
-
-2016-02-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widget_properties.py:
-	Rework GridProperty to prevent changing the type of self.cols
-	[734fff193302]
-
-	* widget_properties.py:
-	Extract code to escape/unescape newlines / tabs into separate
-	functions
-	[c44a851bc014]
-
-2016-02-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widget_properties.py:
-	Add docstring for TextProperty.multiline
-	[3a6ddcecc4c7]
-
-	* about.py:
-	Remove unused application startup code
-	[fe84f58b56d2]
-
-2016-02-17  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.pl,
-	tests/casefiles/AllWidgets_30.pl,
-	widgets/datepicker_ctrl/perl_codegen.py:
-	Add workaround for missing wxDefaultDateTime in wxPerl
-	[72f1128ad9f8]
-
-2016-02-16  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxGlade.desktop:
-	Typo in desktop file
-	[e3e25d2a8e1e]
-
-	* widgets/grid/grid.py:
-	Show newlines correctly in the grid header if shown design window
-	[29794333dcce]
-
-2016-02-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_gui.py:
-	Add a simple test case for loading all XRC case files
-	[ae030730a36a]
-
-	* NEWS.txt, codegen/xrc_codegen.py, tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.xrc,
-	tests/casefiles/ComplexExample.xrc,
-	tests/casefiles/ComplexExample_30.xrc,
-	widgets/bitmap_button/codegen.py, widgets/toolbar/codegen.py:
-	Add support for wxArtProvider to XRC code generator
-	[d9d987998ab6]
-
-	* common.py:
-	Improve encode_to_unicode() to work in cli mode too
-	[8c14a3d58e05]
-
-2016-02-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wcodegen/__init__.py:
-	Typos in docstrings
-	[4ae0720df0c2]
-
-	* widgets/static_bitmap/codegen.py:
-	Rename class XrcCodeGenerator to StaticBitmapXrcObject
-	[74d0f108dd03]
-
-2016-02-10  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/import_test.xrc, xrc2wxg.py:
-	Remove attribute xmlns during converting xrc to wxg
-	[eaa6746cdf87]
-
-	* NEWS.txt, codegen/cpp_codegen.py, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.h, tests/casefiles/AllWidgets_30.cpp,
-	tests/casefiles/AllWidgets_30.h, tests/casefiles/Bug179_Frame.c++,
-	tests/casefiles/Bug179_Frame.hpp, tests/casefiles/CPPOgg1.cpp,
-	tests/casefiles/CPPOgg1.h, tests/casefiles/CPPOgg2_MyDialog.cpp,
-	tests/casefiles/CPPOgg2_MyDialog.h,
-	tests/casefiles/CPPOgg2_MyFrame.cpp,
-	tests/casefiles/CPPOgg2_MyFrame.h, tests/casefiles/CPPOgg3.cpp,
-	tests/casefiles/CPPOgg3.h, tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CPP_Preferences.h, tests/casefiles/CalendarCtrl.cpp,
-	tests/casefiles/CalendarCtrl.h, tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample_30.cpp,
-	tests/casefiles/ComplexExample_30.h,
-	tests/casefiles/CustomWidget.cpp, tests/casefiles/CustomWidget.h,
-	tests/casefiles/FontColour.cpp, tests/casefiles/FontColour.h,
-	tests/casefiles/Gauge.cpp, tests/casefiles/Gauge.h,
-	tests/casefiles/Grid.cpp, tests/casefiles/Grid.h,
-	tests/casefiles/HyperlinkCtrl_28.cpp,
-	tests/casefiles/HyperlinkCtrl_28.h,
-	tests/casefiles/Sizers_classattr.cpp,
-	tests/casefiles/Sizers_classattr.h,
-	tests/casefiles/Sizers_no_classattr.cpp,
-	tests/casefiles/Sizers_no_classattr.h,
-	tests/casefiles/Statusbar_wo_labels.cpp,
-	tests/casefiles/Statusbar_wo_labels.h,
-	tests/casefiles/add_class_inplace_extended.cpp,
-	tests/casefiles/add_class_inplace_extended.h,
-	tests/casefiles/add_class_inplace_orig.cpp,
-	tests/casefiles/add_class_inplace_orig.h,
-	tests/casefiles/app_wo_attrs.cpp, tests/casefiles/app_wo_attrs.h,
-	tests/casefiles/bug163.cpp, tests/casefiles/bug163.h,
-	tests/casefiles/bug165.cpp, tests/casefiles/bug165.h,
-	tests/casefiles/bug166.cpp, tests/casefiles/bug166.h,
-	tests/casefiles/bug167.cpp, tests/casefiles/bug167.h,
-	tests/casefiles/bug167_utf8.cpp, tests/casefiles/bug167_utf8.h,
-	tests/casefiles/no_suitable_writer.cpp,
-	tests/casefiles/no_suitable_writer.h,
-	tests/casefiles/no_supported_flags.cpp,
-	tests/casefiles/no_supported_flags.h,
-	tests/casefiles/remove_class_inplace_expected.cpp,
-	tests/casefiles/remove_class_inplace_expected.h,
-	tests/casefiles/remove_class_inplace_input.cpp,
-	tests/casefiles/remove_class_inplace_input.h, tests/casefiles
-	/styleless-dialog.cpp, tests/casefiles/styleless-dialog.h,
-	widgets/dialog/codegen.py, widgets/frame/codegen.py,
-	widgets/notebook/codegen.py, widgets/panel/codegen.py,
-	widgets/splitter_window/codegen.py, widgets/toolbar/codegen.py:
-	Use wxWindowID instead of int for widget identifiers in C++
-	[2ceb9bfa9998]
-
-2016-02-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.pyw:
-	Use unicode strings if reporting of early error messages on Windows
-
-	The previous code produces a mixture of ASCII and Unicode strings,
-	that causes unusable error messages.
-	[fa44856f4106]
-
-	* NEWS.txt, docs/html/apa.html, docs/html/apb.html,
-	docs/html/apc.html, docs/html/apd.html, docs/html/ape.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html,
-	docs/html/ch01s08.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/ch06s04.html, docs/html/ch06s05.html,
-	docs/html/ch06s06.html, docs/html/ch06s07.html,
-	docs/html/ch06s08.html, docs/html/ch06s09.html, docs/html/ch07.html,
-	docs/html/ch07s02.html, docs/html/ch07s03.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/pdf/manual.pdf, docs/src/manual.xml, test.py, wxglade.py,
-	wxglade.pyw:
-	Improve reporting of early error messages on Windows
-	[71c4b1eadf53]
-
-2016-02-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wcodegen/__init__.py:
-	Add docstring for constructor class variable
-	[a76aa5cf9831]
-
-	* xrc2wxg.py:
-	Show a warning message if an unsupported widgets is imported from
-	xrc
-	[4c5014fe1179]
-
-	* xrc2wxg.py:
-	Update list of supported widgets in xrc2wxg.py
-	[88738cd17adb]
-
-2016-02-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* res/templates_ui.wxg, template.py, templates_ui.py:
-	Rename internal variables in both template dialogs
-	[c4ccdf33f100]
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py, tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc, widgets/statusbar/codegen.py,
-	widgets/statusbar/perl_codegen.py:
-	Fix wrong CreateStatusBar statement if styles are selected
-	[88adbe54429d]
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	edit_sizers/cpp_sizers_codegen.py, edit_sizers/edit_sizers.py,
-	edit_sizers/lisp_sizers_codegen.py,
-	edit_sizers/perl_sizers_codegen.py,
-	edit_sizers/py_sizers_codegen.py, templates_ui.py,
-	tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.h,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CPP_Preferences.h,
-	tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample_30.cpp,
-	tests/casefiles/ComplexExample_30.h,
-	tests/casefiles/ComplexExample_30.pl,
-	tests/casefiles/ComplexExample_30.py,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Perl_Preferences.pl,
-	tests/casefiles/Python_Preferences.py,
-	tests/casefiles/Sizers_classattr.cpp,
-	tests/casefiles/Sizers_classattr.h,
-	tests/casefiles/Sizers_classattr.lisp,
-	tests/casefiles/Sizers_classattr.pl,
-	tests/casefiles/Sizers_classattr.py,
-	tests/casefiles/Sizers_no_classattr.cpp,
-	tests/casefiles/Sizers_no_classattr.h,
-	tests/casefiles/Sizers_no_classattr.lisp,
-	tests/casefiles/Sizers_no_classattr.pl,
-	tests/casefiles/Sizers_no_classattr.py:
-	Inline wxStaticBox statement into wxStaticBoxSizer statement
-	[f4aa032018dc]
-
-	* tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py, tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc:
-	Remove wxDatePickerCtrl style wxDP_SPIN from all test cases
-
-	The documentation describes some limitations if using this style.
-	Thereby the style has been removed from all test cases to prevent
-	trouble. (grafted from c1dc8a460862eaa7ebccceedc339a85985077733)
-	[0c16f91484e3] <WXG-BRANCH-VERSION_0_7_1>
-
-	* tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py, tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc:
-	Remove wxDatePickerCtrl style wxDP_SPIN from all test cases
-
-	The documentation describes some limitations if using this style.
-	Thereby the style has been removed from all test cases to prevent
-	trouble.
-	[c1dc8a460862]
-
-	* compat.py, widget_properties.py:
-	Add compatibility code for wxSizerItem.SetSizer()
-
-	With wx3 "wxWindow::IsEnabled() now returns false if a window parent
-	(and not necessarily the window itself) is disabled, new function
-	IsThisEnabled() with the same behaviour as old IsEnabled() was
-	added."
-
-	For instance: a parent window can be disabled during a modal dialog
-	is shown. (grafted from ba825f05d240e09a2d5ccb8453d64c45880b8d57)
-	[e6cf181b62d0] <WXG-BRANCH-VERSION_0_7_1>
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py, tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc,
-	widgets/datepicker_ctrl/codegen.py,
-	widgets/datepicker_ctrl/perl_codegen.py,
-	widgets/datepicker_ctrl/wconfig.py:
-	Fix generated code for wxDatePickerCtrl (grafted from
-	7d890365d1eca12e7c15a1ac911ac4e804a5be8a)
-	[633ec62814b4] <WXG-BRANCH-VERSION_0_7_1>
-
-	* NEWS.txt, widgets/statusbar/wconfig.py:
-	Add missing wxStatusBar style wxST_SIZEGRIP (grafted from
-	7040e98b356a30f12689354bd089fcc36cd32904)
-	[771f60c5728d] <WXG-BRANCH-VERSION_0_7_1>
-
-	* compat.py, widget_properties.py:
-	Add compatibility code for wxSizerItem.SetSizer()
-
-	With wx3 "wxWindow::IsEnabled() now returns false if a window parent
-	(and not necessarily the window itself) is disabled, new function
-	IsThisEnabled() with the same behaviour as old IsEnabled() was
-	added."
-
-	For instance: a parent window can be disabled during a modal dialog
-	is shown.
-	[ba825f05d240]
-
-2016-02-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py, tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc,
-	widgets/datepicker_ctrl/codegen.py,
-	widgets/datepicker_ctrl/perl_codegen.py,
-	widgets/datepicker_ctrl/wconfig.py:
-	Fix generated code for wxDatePickerCtrl
-	[7d890365d1ec]
-
-2016-02-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py:
-	Add widget names to simplify using widget inspector
-	[7804aa6ff905]
-
-	* application.py:
-	Rename panel to panel_application variable to clarify purpose
-	[64c525b6fc3d]
-
-2016-02-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, widgets/statusbar/wconfig.py:
-	Add missing wxStatusBar style wxST_SIZEGRIP
-	[7040e98b356a]
-
-2016-01-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py, tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc:
-	Add icons to AllWidget tests
-	[77810c100db3]
-
-	* NEWS.txt, codegen/cpp_codegen.py, tests/casefiles/Bug179_Frame.c++,
-	tests/casefiles/Bug179_Frame.hpp, tests/casefiles/Bug179_main.c++,
-	tests/casefiles/bug179.wxg, tests/test_bugs.py,
-	tests/test_codegen.py:
-	Fix main file is generated without custom extensions (sf bug #179)
-	(grafted from 3d351422d9fc6149542f241d9275d867afb5534b)
-	[1f1cce01ac62] <WXG-BRANCH-VERSION_0_7_1>
-
-	* NEWS.txt, codegen/cpp_codegen.py, tests/casefiles/Bug179_Frame.c++,
-	tests/casefiles/Bug179_Frame.hpp, tests/casefiles/Bug179_main.c++,
-	tests/casefiles/bug179.wxg, tests/test_bugs.py,
-	tests/test_codegen.py:
-	Fix main file is generated without custom extensions (sf bug #179)
-	[3d351422d9fc]
-
-2016-01-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, preferences_ui.py, tests/casefiles/Perl_Preferences.pl,
-	tests/casefiles/Python_Preferences.py, widgets/dialog/codegen.py,
-	widgets/dialog/perl_codegen.py, widgets/frame/codegen.py,
-	widgets/frame/perl_codegen.py:
-	Fix usage of wx.NullIcon for Perl and Python
-	[4028580ba0cc]
-
-	* NEWS.txt, edit_sizers/edit_sizers.py:
-	Fix PyDeadObjectError during closing wxGlade (grafted from
-	60fe758aa2994d64f02d62cbff57c9059cca5d58)
-	[89c22e4d3fb6] <WXG-BRANCH-VERSION_0_7_1>
-
-	* edit_sizers/edit_sizers.py:
-	Rename some variables to clarify purpose
-	[f70ef68ecc58]
-
-	* bugdialog.py, edit_sizers/edit_sizers.py, font_dialog.py, main.py,
-	widgets/custom_widget/custom_widget.py, widgets/dialog/dialog.py,
-	widgets/frame/frame.py, widgets/gauge/gauge.py,
-	widgets/menubar/menubar.py, widgets/notebook/notebook.py,
-	widgets/slider/slider.py, widgets/spacer/spacer.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_line/static_line.py, widgets/statusbar/statusbar.py,
-	widgets/toolbar/toolbar.py:
-	Destroy() all instances of wxDialog after usage
-	[24fb34baf3c3]
-
-	* tests/test_gui.py, widget_properties.py,
-	widgets/notebook/notebook.py:
-	Remove obsolete comma in function argument lists
-	[9cc1be9e2268]
-
-	* edit_sizers/edit_sizers.py:
-	Draw hatched lines of sizer slots only on MSW in foreground
-	[98b17716ac81]
-
-	* NEWS.txt, edit_sizers/edit_sizers.py:
-	Fix PyDeadObjectError during closing wxGlade
-	[60fe758aa299]
-
-2016-01-10  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, edit_sizers/edit_sizers.py:
-	Fix black window bug on Windows
-
-	It's not possible to draw the hatched lines to the background on MSW
-	due to a bug in wxWidgets.
-
-	It's wxWidget bug #17326 "SetBackground() with hatched brushes cases
-	black background on MSW" (grafted from
-	0a1811d9a3fe5257e60799e7fea9f3651117179a)
-	[51858439bbcb] <WXG-BRANCH-VERSION_0_7_1>
-
-	* NEWS.txt, edit_sizers/edit_sizers.py:
-	Fix black window bug on Windows
-
-	It's not possible to draw the hatched lines to the background on MSW
-	due to a bug in wxWidgets.
-
-	It's wxWidget bug #17326 "SetBackground() with hatched brushes cases
-	black background on MSW"
-	[0a1811d9a3fe]
-
-2016-01-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, common.py:
-	Fix WindowsError is the backup file already exists (Thanks to Graeme
-	Glenn) (grafted from 8363d1e592af423ea8e3f4b9ad90bf349e9b7851)
-	[4c20f2fa0215] <WXG-BRANCH-VERSION_0_7_1>
-
-	* NEWS.txt, common.py:
-	Fix WindowsError is the backup file already exists (Thanks to Graeme
-	Glenn)
-	[8363d1e592af]
-
-2016-01-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, compat.py, edit_sizers/edit_sizers.py:
-	Fix ZeroDevisionError during adding a new column to a
-	wxFlexGridSizer with only one row
-
-	The API changed with wx 2.9: wx3 wxGridSizer.GetRows() and
-	wxGridSizer.GetCols() "returns zero if the sizer is automatically
-	adjusting the number of rows depending on number of its children."
-	(grafted from fa206b3bcc3e3cf06e9671c1069373136d4142d0)
-	[012c084ba4ba] <WXG-BRANCH-VERSION_0_7_1>
-
-2016-01-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, edit_sizers/edit_sizers.py:
-	Fix NameError exception during inserting a sizer slot (grafted from
-	d7c6eda7a797e47993f5ca12ac76a7f875023eaf)
-	[2345ac6822a3] <WXG-BRANCH-VERSION_0_7_1>
-
-2016-01-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, widgets/static_line/static_line.py:
-	Fix wrong orientation of wxStaticLine widgets (grafted from
-	f9035341846ff0881fd6b3a69f8d806e924efb63)
-	[ecec97ef8332] <WXG-BRANCH-VERSION_0_7_1>
-
-	* widgets/slider/wconfig.py:
-	Extend style description of wxSlider (grafted from
-	e04101192b60dedd4571b3e1f5f13cfa67c7746c)
-	[ac72fa86bd0d] <WXG-BRANCH-VERSION_0_7_1>
-
-	* widgets/static_line/wconfig.py:
-	Extend style description of wxStaticLine (grafted from
-	7400864e82fd8f2e1d798001eab6ed7c14c25bdf)
-	[46ca917b4d50] <WXG-BRANCH-VERSION_0_7_1>
-
-2016-01-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, compat.py, edit_sizers/edit_sizers.py:
-	Fix ZeroDevisionError during adding a new column to a
-	wxFlexGridSizer with only one row
-
-	The API changed with wx 2.9: wx3 wxGridSizer.GetRows() and
-	wxGridSizer.GetCols() "returns zero if the sizer is automatically
-	adjusting the number of rows depending on number of its children."
-	[fa206b3bcc3e]
-
-2016-01-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, edit_sizers/edit_sizers.py:
-	Fix NameError exception during inserting a sizer slot
-	[d7c6eda7a797]
-
-2016-01-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Makefile:
-	Create all documentation from source files in "doc" rule
-	[ea1496fe1939]
-
-	* Makefile:
-	Update path of manpage style sheet
-	[771695f0648a]
-
-	* .hgignore, docs/man/wxglade.1:
-	Adding wxglade manpage to the repository
-	[cf20c36f98d4]
-
-	* .hgignore:
-	Remove ignored files from Eric IDE
-	[4c3bc52c2c75]
-
-	* NEWS.txt, widgets/static_line/static_line.py:
-	Fix wrong orientation of wxStaticLine widgets
-	[f9035341846f]
-
-	* widgets/slider/wconfig.py:
-	Extend style description of wxSlider
-	[e04101192b60]
-
-	* widgets/static_line/wconfig.py:
-	Extend style description of wxStaticLine
-	[7400864e82fd]
-
-2016-01-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* LICENSE.txt, MANIFEST.in, about.py, appdata.xml, application.py,
-	bugdialog.py, clipboard.py, code_property.py, codegen/__init__.py,
-	codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/perl_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, color_dialog.py, common.py, compat.py,
-	config.py, decorators.py, docs/html/apa.html, docs/html/apb.html,
-	docs/html/apc.html, docs/html/apd.html, docs/html/ape.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html,
-	docs/html/ch01s08.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/ch06s04.html, docs/html/ch06s05.html,
-	docs/html/ch06s06.html, docs/html/ch06s07.html,
-	docs/html/ch06s08.html, docs/html/ch06s09.html, docs/html/ch07.html,
-	docs/html/ch07s02.html, docs/html/ch07s03.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/man/manpage.xml, docs/pdf/manual.pdf, docs/src/manual.xml,
-	edit_sizers/__init__.py, edit_sizers/cpp_sizers_codegen.py,
-	edit_sizers/edit_sizers.py, edit_sizers/lisp_sizers_codegen.py,
-	edit_sizers/perl_sizers_codegen.py,
-	edit_sizers/py_sizers_codegen.py, edit_sizers/xrc_sizers_codegen.py,
-	edit_widget.py, edit_windows.py, errors.py, events_mixin.py,
-	gui_mixins.py, install/pyinstaller/build.bat,
-	install/pyinstaller/hooks/hook-main.py, install/pyinstaller/wxglade-
-	SAE-installer.iss, install/pyinstaller/wxglade-installer.iss,
-	install/pyinstaller/wxglade.spec, layout_option_property.py, log.py,
-	main.py, misc.py, plugins.py, preferencesdialog.py, setup.py,
-	template.py, test.py, tests/__init__.py,
-	tests/casefiles/file_encodings.txt, tests/test_bugs.py,
-	tests/test_codegen.py, tests/test_compile.py,
-	tests/test_external.py, tests/test_gui.py, tree.py,
-	wcodegen/__init__.py, wcodegen/dialogs.py, wcodegen/taghandler.py,
-	widget_properties.py, widgets/ChoicesCodeHandler.py,
-	widgets/ChoicesProperty.py, widgets/MenuTree.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/lisp_codegen.py,
-	widgets/bitmap_button/perl_codegen.py,
-	widgets/bitmap_button/wconfig.py, widgets/button/button.py,
-	widgets/button/codegen.py, widgets/button/lisp_codegen.py,
-	widgets/button/perl_codegen.py, widgets/button/wconfig.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/calendar_ctrl/codegen.py,
-	widgets/calendar_ctrl/perl_codegen.py,
-	widgets/calendar_ctrl/wconfig.py, widgets/checkbox/checkbox.py,
-	widgets/checkbox/checkbox_base.py, widgets/checkbox/codegen.py,
-	widgets/checkbox/lisp_codegen.py, widgets/checkbox/perl_codegen.py,
-	widgets/checkbox/wconfig.py, widgets/choice/choice.py,
-	widgets/choice/codegen.py, widgets/choice/lisp_codegen.py,
-	widgets/choice/perl_codegen.py, widgets/choice/wconfig.py,
-	widgets/combo_box/codegen.py, widgets/combo_box/combo_box.py,
-	widgets/combo_box/lisp_codegen.py,
-	widgets/combo_box/perl_codegen.py, widgets/combo_box/wconfig.py,
-	widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/custom_widget/lisp_codegen.py,
-	widgets/custom_widget/perl_codegen.py,
-	widgets/datepicker_ctrl/codegen.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/datepicker_ctrl/lisp_codegen.py,
-	widgets/datepicker_ctrl/perl_codegen.py,
-	widgets/datepicker_ctrl/wconfig.py, widgets/dialog/codegen.py,
-	widgets/dialog/dialog.py, widgets/dialog/lisp_codegen.py,
-	widgets/dialog/perl_codegen.py, widgets/dialog/wconfig.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/frame/lisp_codegen.py, widgets/frame/perl_codegen.py,
-	widgets/frame/wconfig.py, widgets/gauge/codegen.py,
-	widgets/gauge/lisp_codegen.py, widgets/gauge/perl_codegen.py,
-	widgets/gauge/wconfig.py, widgets/grid/grid.py,
-	widgets/grid/lisp_codegen.py, widgets/grid/perl_codegen.py,
-	widgets/grid/wconfig.py, widgets/hyperlink_ctrl/__init__.py,
-	widgets/hyperlink_ctrl/codegen.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/hyperlink_ctrl/lisp_codegen.py,
-	widgets/hyperlink_ctrl/perl_codegen.py,
-	widgets/hyperlink_ctrl/wconfig.py, widgets/list_box/codegen.py,
-	widgets/list_box/lisp_codegen.py, widgets/list_box/list_box.py,
-	widgets/list_box/perl_codegen.py, widgets/list_box/wconfig.py,
-	widgets/list_ctrl/codegen.py, widgets/list_ctrl/lisp_codegen.py,
-	widgets/list_ctrl/list_ctrl.py, widgets/list_ctrl/perl_codegen.py,
-	widgets/list_ctrl/wconfig.py, widgets/menubar/codegen.py,
-	widgets/menubar/menubar.py, widgets/menubar/perl_codegen.py,
-	widgets/notebook/codegen.py, widgets/notebook/lisp_codegen.py,
-	widgets/notebook/notebook.py, widgets/notebook/perl_codegen.py,
-	widgets/notebook/wconfig.py, widgets/panel/codegen.py,
-	widgets/panel/lisp_codegen.py, widgets/panel/panel.py,
-	widgets/panel/perl_codegen.py, widgets/panel/wconfig.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/lisp_codegen.py,
-	widgets/radio_box/perl_codegen.py, widgets/radio_box/radio_box.py,
-	widgets/radio_box/radio_box_base.py, widgets/radio_box/wconfig.py,
-	widgets/radio_button/codegen.py,
-	widgets/radio_button/lisp_codegen.py,
-	widgets/radio_button/perl_codegen.py,
-	widgets/radio_button/radio_button.py,
-	widgets/radio_button/wconfig.py, widgets/slider/codegen.py,
-	widgets/slider/lisp_codegen.py, widgets/slider/perl_codegen.py,
-	widgets/slider/slider.py, widgets/slider/wconfig.py,
-	widgets/spacer/codegen.py, widgets/spacer/lisp_codegen.py,
-	widgets/spacer/perl_codegen.py, widgets/spacer/spacer.py,
-	widgets/spin_button/codegen.py, widgets/spin_button/lisp_codegen.py,
-	widgets/spin_button/perl_codegen.py,
-	widgets/spin_button/spin_button.py, widgets/spin_button/wconfig.py,
-	widgets/spin_ctrl/codegen.py, widgets/spin_ctrl/lisp_codegen.py,
-	widgets/spin_ctrl/perl_codegen.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/spin_ctrl/wconfig.py, widgets/splitter_window/codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/splitter_window/wconfig.py,
-	widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/lisp_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_bitmap/wconfig.py, widgets/static_line/codegen.py,
-	widgets/static_line/lisp_codegen.py,
-	widgets/static_line/perl_codegen.py,
-	widgets/static_line/static_line.py, widgets/static_line/wconfig.py,
-	widgets/static_text/codegen.py, widgets/static_text/lisp_codegen.py,
-	widgets/static_text/perl_codegen.py,
-	widgets/static_text/static_text.py, widgets/static_text/wconfig.py,
-	widgets/statusbar/__init__.py, widgets/statusbar/codegen.py,
-	widgets/statusbar/lisp_codegen.py,
-	widgets/statusbar/perl_codegen.py, widgets/statusbar/statusbar.py,
-	widgets/statusbar/wconfig.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/lisp_codegen.py,
-	widgets/text_ctrl/perl_codegen.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/text_ctrl/wconfig.py, widgets/toggle_button/codegen.py,
-	widgets/toggle_button/lisp_codegen.py,
-	widgets/toggle_button/perl_codegen.py,
-	widgets/toggle_button/toggle_button.py,
-	widgets/toggle_button/wconfig.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/lisp_codegen.py, widgets/toolbar/perl_codegen.py,
-	widgets/toolbar/tool.py, widgets/toolbar/toolbar.py,
-	widgets/toolbar/wconfig.py, widgets/tree_ctrl/codegen.py,
-	widgets/tree_ctrl/lisp_codegen.py,
-	widgets/tree_ctrl/perl_codegen.py, widgets/tree_ctrl/tree_ctrl.py,
-	widgets/tree_ctrl/wconfig.py, wxglade, wxglade.py, wxglade.pyw,
-	xml_parse.py, xrc2wxg.py:
-	Update copyright year
-	[fabd4a25d23e]
-
-	* NEWS.txt, application.py, common.py, kdefiledialog.py, main.py,
-	misc.py, preferences_ui.py, preferencesdialog.py,
-	res/preferences_ui.wxg, widget_properties.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/static_bitmap/static_bitmap.py, widgets/toolbar/toolbar.py:
-	Remove usage of KDE file dialog
-	[c5fe5ef69ff7]
-
-	* CHANGES.txt, changelog.style, docs/ReleaseSteps.txt:
-	Update release documentation
-	[c1dfe4cb14f5]
-
-2015-12-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* setup.py:
-	Remove obsolation setup requirement setuptools_hg
-	[8cce02f8702e]
-
-2015-12-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* README.SF.md:
-	Add package checksums
-	[52c0472bd07f] <WXG-BRANCH-VERSION_0_7_1>
-
-	* version.py:
-	Add version file
-	[ca598bf107a7] <WXG-BRANCH-VERSION_0_7_1>
-
-	* NEWS.txt, install/pyinstaller/wxglade-installer.iss:
-	Start new development cycle
-	[b387f5691856]
-
-	* Created WXG-BRANCH-VERSION_0_7_1 branch
-	[59331e19f57a] <WXG-BRANCH-VERSION_0_7_1>
-
-	* .hgtags:
-	Added tag rel_0.7.1 for changeset 5668b53d9f7d
-	[f236cc6d527e]
-
-	* Closed WXG-BRANCH-VERSION_0_7_0 branch
-	[be549fd67e4f] <WXG-BRANCH-VERSION_0_7_0>
-
-	* CHANGES.txt, NEWS.txt, README.SF.md, README.txt, install/pyinstaller
-	/wxglade-installer.iss, wxGlade.desktop:
-	Bump version number to 0.7.1
-	[5668b53d9f7d] [rel_0.7.1]
-
-	* docs/ReleaseSteps.txt:
-	Update release steps
-	[7076007a12f2]
-
-2015-12-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widget_properties.py:
-	Add a cache for wrapped messages
-
-	textwarp.wrap() is teribble show. The cache accelerate loading
-	larger designs significantly.
-	[1ceb257b3e1c]
-
-2015-12-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* icons/wxg_file.ico:
-	Change size of wxg file icon to 32x64 to 32x32
-	[4f456563cac1]
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/apc.html,
-	docs/html/apd.html, docs/html/ape.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html,
-	docs/html/ch01s08.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/ch06s04.html, docs/html/ch06s05.html,
-	docs/html/ch06s06.html, docs/html/ch06s07.html,
-	docs/html/ch06s08.html, docs/html/ch06s09.html, docs/html/ch07.html,
-	docs/html/ch07s02.html, docs/html/ch07s03.html,
-	docs/html/custom_widget_SM_design1.png,
-	docs/html/custom_widget_SM_design2.png,
-	docs/html/custom_widget_SM_preview.png,
-	docs/html/custom_widget_SM_tree.png, docs/html/index.html,
-	docs/html/mondrian_200x200.png, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/properties_window_tab_3.png,
-	docs/html/properties_window_tab_3_dont_generate_code.png,
-	docs/pdf/manual.pdf, docs/src/custom_widget_SM_design1.png,
-	docs/src/custom_widget_SM_design2.png,
-	docs/src/custom_widget_SM_preview.png,
-	docs/src/custom_widget_SM_tree.png, docs/src/manual.xml,
-	docs/src/mondrian_200x200.png, docs/src/properties_window_tab_3.png,
-	docs/src/properties_window_tab_3_dont_generate_code.png:
-	Update and extend documentation
-	[cf99bed74b41]
-
-2015-12-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.h,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc:
-	Clarify widget name in AllWidgets examples
-	[e52637656945]
-
-2015-12-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* templates/Dialog_with_two_buttons.wgt:
-	Remove email from author entry in two button dialog template
-	[03e04b31c0f7]
-
-	* templates/CustomWidget_AGW_SpeedMeter.wgt:
-	Add a custom widget example as a template
-	[4776a304e204]
-
-2015-12-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py, widgets/notebook/notebook.py, widgets/panel/panel.py,
-	widgets/splitter_window/splitter_window.py:
-	Improve wording
-	[e005a68b619c]
-
-2015-12-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/src/manual.xml, wxGlade.desktop:
-	Use XPM formatted icon in wxGlade desktop file
-	[9ef2515dcf94]
-
-	* icons/wxglade.xpm:
-	Add XPM formatted wxGlade icon
-	[6aee6bc081aa]
-
-	* edit_sizers/edit_sizers.py:
-	Fix SegFault during removal of sizer slots
-
-	wxSizer.Remove(elem.widget) doesn't remove the widget from the
-	sizer. After the call the widget is listed with GetChildren().
-
-	Now the widget is detached only. It will be deleted later like in
-	the previous revisions.
-	[e2ab49f697a6]
-
-	* edit_sizers/edit_sizers.py:
-	Minor documentation and code improvements for sizer code
-	[e7f3db5c1050]
-
-	* README.SF.md:
-	Add RC2 details
-	[779305a771fb]
-
-	* .hgtags:
-	Added tag rel_0.7.1RC2 for changeset 27d9766606a8
-	[0c172f8b5b31]
-
-2015-12-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* compat.py:
-	Disable compatibility code for wxSizerItem.SetSizer()
-
-	AssignSizer() causes dead objects if widgets are added to more than
-	one sizer.
-	[27d9766606a8] [rel_0.7.1RC2]
-
-	* NEWS.txt, config.py, tests/casefiles/app_wo_attrs_gui.wxg,
-	tests/casefiles/app_wo_attrs_gui.xrc, tests/test_gui.py,
-	xml_parse.py:
-	Load wxg files even if application attributes are missing
-	[0cc9a0ce2409]
-
-	* tests/test_gui.py:
-	Show widgets during graphical tests are running
-	[65e6ad5775af]
-
-	* edit_sizers/edit_sizers.py:
-	Simplify widget handling in sizer code to prevent PyAssertionError
-
-	The current code raises a PyAssertionError because "Adding a window
-	to the same sizer twice?". The current simplified code should
-	prevent such messages.
-	[05e859527d7f]
-
-	* edit_sizers/edit_sizers.py:
-	Update source documentation of edit sizer code
-	[60e3605cc830]
-
-2015-12-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	main.py, misc.py, tree.py:
-	Remove hidden_property_panel workaround
-
-	The workaround caused an assertion exception because an object was
-	added to two sizers at the same time.
-	[d47846fa5f4a]
-
-2015-12-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_gui.py:
-	Suppress wx error messages during running test cases
-	[e4695e26371a]
-
-	* widgets/toolbar/toolbar.py:
-	Improve deleting tools from toolbar
-
-	A new test setup causes the assertion error shown below. This change
-	fix this error:
-
-	 File "/home/carsten/wxglade/widgets/toolbar/toolbar.py", line 718,
-	in set_tools while self.widget.DeleteToolByPos(0): File
-	"/usr/lib64/python2.7/site-packages/wx-3.0-gtk2/wx/_controls.py",
-	line 3777, in DeleteToolByPos return
-	_controls_.ToolBarBase_DeleteToolByPos(*args, **kwargs)
-	PyAssertionError: C++ assertion "pos < GetToolsCount()" failed at
-	./src/common/tbarbase.cpp(328) in DeleteToolByPos(): invalid
-	position in wxToolBar::DeleteToolByPos()
-	[c09299f9934b]
-
-2015-11-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, README.txt, wxGlade.desktop:
-	Bump version number to 0.7.1RC2
-	[eb84df738324]
-
-	* compat.py, edit_sizers/edit_sizers.py, edit_widget.py,
-	edit_windows.py, widgets/bitmap_button/bitmap_button.py,
-	widgets/button/button.py, widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/check_list_box/check_list_box.py,
-	widgets/checkbox/checkbox.py, widgets/choice/choice.py,
-	widgets/combo_box/combo_box.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/gauge/gauge.py,
-	widgets/generic_calendar_ctrl/generic_calendar_ctrl.py,
-	widgets/grid/grid.py, widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/list_box/list_box.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/menubar/menubar.py, widgets/notebook/notebook.py,
-	widgets/panel/panel.py,
-	widgets/property_grid_manager/property_grid_manager.py,
-	widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py, widgets/slider/slider.py,
-	widgets/spin_button/spin_button.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/static_line.py,
-	widgets/static_text/static_text.py, widgets/statusbar/statusbar.py,
-	widgets/text_ctrl/text_ctrl.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/toolbar.py,
-	widgets/tree_ctrl/tree_ctrl.py:
-	Add compatibility code for wxSizerItem.SetSizer()
-
-	wxSizerItem.SetSizer() is deprecated since wxPython 3.0 use
-	wxSizerItem.AssignSizer() instead.
-	[1717c49eb9d2]
-
-2015-11-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* compat.py:
-	Rework handling of compat function
-
-	Take the decision which function is to use once per application
-	runtime and not once per function call
-	[b4e847c9bfe7]
-
-2015-11-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/cpp_codegen.py:
-	Remove unsed local variable "out_path" in CPPCodeWriter.init_lang()
-	[df18c6238933]
-
-	* NEWS.txt, tests/casefiles/app_wo_attrs.cpp,
-	tests/casefiles/app_wo_attrs.h, tests/casefiles/app_wo_attrs.lisp,
-	tests/casefiles/app_wo_attrs.pl, tests/casefiles/app_wo_attrs.py,
-	tests/casefiles/app_wo_attrs.wxg, tests/casefiles/app_wo_attrs.xrc,
-	tests/test_codegen.py, xml_parse.py:
-	Use defaults for missing application attributes in wxg files
-
-	The <application> tag has a lot of attributes to specifiy generating
-	source files. If a attribute is missed the defaults will be used.
-	Except the "language" attribute. This will be get from the code
-	writer instance.
-	[35f567111940]
-
-2015-11-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Wrong type definition in docstring of xml_parse.Sizeritem.set_flag()
-	[e5c21a726f9a]
-
-	* codegen/cpp_codegen.py, config.py, tests/test_codegen.py:
-	Store some C++ defaults in config module
-	[811190f33cf4]
-
-	* tests/test_gui.py, xml_parse.py:
-	Typo in error message
-	[ab1fb8370768]
-
-2015-11-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* clipboard.py, xml_parse.py:
-	Minor code reorg and docstring changes related to the previous
-	commit
-	[a7d98ed6a95b]
-
-	* NEWS.txt, clipboard.py, xml_parse.py:
-	Fix root widget loses layout attributes during copy and paste
-	[2e2a110bcd84]
-
-2015-11-16  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/button/button.py, widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/generic_calendar_ctrl/generic_calendar_ctrl.py:
-	Add new created object existing sizer to some XML factory functions
-
-	Most of the XML factory functions adds new created objects to sizers
-	already. Some widgets hadn't implemented this code.
-	[1510f918aeef]
-
-2015-11-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Import and initialise Python Fault Handler if available
-	[b47df010ce3c]
-
-2015-11-10  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/perl_codegen.py, widgets/menubar/perl_codegen.py:
-	Remove usage of codegen.perl_codegen.PerlCodeWriter.quote_key()
-	[28f6c0d28e8e]
-
-	* tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.h,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc:
-	Add more complex menus to AllWidgets test cases for 2.8 and 3.0
-	[6831418208d3]
-
-	* NEWS.txt, codegen/perl_codegen.py, widgets/menubar/perl_codegen.py:
-	Fix binding of menu event in Perl
-	[adef9976b2ec]
-
-	* wcodegen/__init__.py:
-	Typo in docstring
-	[c848603c086f]
-
-	* Makefile:
-	Add rule for clonedigger
-	[f29fb543a033]
-
-2015-11-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* bugdialog_ui.py, res/bugdialog_ui.wxg:
-	Increase initial size of bug dialog
-	[74d38345f17c]
-
-	* misc.py:
-	Remove first and empty declaration of misc.accel_table
-
-	misc.accel_table has been declared twice. The first declaration is
-	removed and the docstring is part of the second declaration now.
-	[c433e63e5bcc]
-
-2015-11-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py, tree.py,
-	widgets/menubar/menubar.py, widgets/panel/panel.py,
-	widgets/toolbar/toolbar.py:
-	Rework calculating popup menu positions
-
-	The previous version doesn't work with wxPython 2.8
-	[dad39564da40]
-
-2015-11-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc:
-	Remove wxPropertyGridManager and wxGenericCalendarCtrl from 2.8
-	tests
-
-	Both widgets are not supported with wxPython 2.8 and prevent using
-	the test case with wxPython 2.8
-	[aa1fda2243ac]
-
-	* NEWS.txt, edit_windows.py:
-	Fix a infinite loop within sizing a widget (sf bug #170)
-
-	There are an infinite loop of wxSizeEvents. All events have the same
-	id. It looks currently like a bug in the underlaying wx libraries
-	especially in the GTK part. The bug doesn't occur on Windows.
-
-	The issue probably occur only within EditGrid.
-
-	This is workaround prevents the propagation if the size hasn't
-	changed.
-	[99eb611e25c1]
-
-2015-11-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_sizers/edit_sizers.py, events_mixin.py, widget_properties.py,
-	widgets/statusbar/lisp_codegen.py, xrc2wxg.py:
-	Rework some for statements to be more Pythonic
-	[bf00e82cea14]
-
-2015-10-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_sizers/edit_sizers.py:
-	Reformat docstring for edit_sizers.change_sizer()
-	[cc1dc83a1424]
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/apd.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html,
-	docs/html/ch01s08.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/ch06s04.html, docs/html/ch06s05.html,
-	docs/html/ch06s06.html, docs/html/ch06s07.html,
-	docs/html/ch06s08.html, docs/html/ch06s09.html, docs/html/ch07.html,
-	docs/html/ch07s02.html, docs/html/ch07s03.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/pdf/manual.pdf, docs/src/manual.xml:
-	Change documentation to reflect changed name of
-	SizerSlot.on_drop_widget()
-	[0b13533b75f1]
-
-	* clipboard.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	widgets/panel/panel.py:
-	Minor code reorg in accessing clipboard functions
-	[0dc724c3ad3d]
-
-	* edit_sizers/edit_sizers.py:
-	Fix segfault triggered by deleting a SizerSlot instance
-
-	The segfault was triggered by incorrect / incomplete deletion of
-	related objects.
-
-	The incorrect code was probably introduced in 1737:e6c212b7f347
-	"Rework SizerSlot class mainly to draw background buffered"
-	[02df7a2ab281]
-
-	* edit_sizers/edit_sizers.py:
-	Rename some event handler in calss SizerSlot to start with "on_"
-	[adb06566cb35]
-
-2015-10-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, widgets/gauge/gauge.py, widgets/slider/slider.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_line/static_line.py:
-	Fix TypeError triggered during generating the widget label
-
-	Creating a widget label raises a TypeError (due a programming bug)
-	if a widget of this type already exists.
-	[ee021cfff68f]
-
-2015-10-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, clipboard.py:
-	Fix unicode error during copying widgets to the clipboard
-	[4d21265043c7]
-
-2015-10-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Makefile, pylintrc:
-	Use Pylint config file instead of commandline options
-	[cac19923c9a8]
-
-	* pylintrc:
-	Plain and unmodified Pylint configuration file
-	[d8d352934705]
-
-	* setup.py:
-	Use own implementation to filter files for binary packages
-
-	This change solves a possible license issue, because the old
-	implementation was copied from the Python source code and modified.
-	The new implementation just filters the output of the original
-	implementation.
-	[1990285b58e0]
-
-2015-10-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/apd.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html,
-	docs/html/ch01s08.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/ch06s04.html, docs/html/ch06s05.html,
-	docs/html/ch06s06.html, docs/html/ch06s07.html,
-	docs/html/ch06s08.html, docs/html/ch06s09.html, docs/html/ch07.html,
-	docs/html/ch07s02.html, docs/html/ch07s03.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/properties_custom_widget.png, docs/pdf/manual.pdf,
-	docs/src/manual.xml, docs/src/properties_custom_widget.png,
-	widgets/custom_widget/custom_widget.py:
-	Remove button 'Help on "Arguments" property' use the documentation
-	instead
-
-	The custom widget is well described incl. a short example in the
-	wxGlade documentation now.
-	[b3eebf6429ee]
-
-2015-10-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/apd.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html,
-	docs/html/ch01s08.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html,
-	docs/html/ch02s09.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html, docs/html/ch04.html,
-	docs/html/ch04s02.html, docs/html/ch04s03.html, docs/html/ch05.html,
-	docs/html/ch05s02.html, docs/html/ch05s03.html,
-	docs/html/ch05s04.html, docs/html/ch06.html, docs/html/ch06s02.html,
-	docs/html/ch06s03.html, docs/html/ch06s04.html,
-	docs/html/ch06s05.html, docs/html/ch06s06.html,
-	docs/html/ch06s07.html, docs/html/ch06s08.html,
-	docs/html/ch06s09.html, docs/html/ch07.html, docs/html/ch07s02.html,
-	docs/html/ch07s03.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/properties_custom_widget.png,
-	docs/html/tooltip_styles.png, docs/html/wxglade_start_on_linux.png,
-	docs/html/wxglade_start_on_windows.png, docs/pdf/manual.pdf,
-	docs/src/manual.xml, docs/src/properties_custom_widget.png,
-	docs/src/tooltip_styles.png, docs/src/wxglade_start_on_linux.png,
-	docs/src/wxglade_start_on_windows.png:
-	Update and extend documentation
-	[1faf6ce251df]
-
-2015-10-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Makefile:
-	Clearify distclean rule
-	[1241901289f2]
-
-2015-09-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade:
-	Rework start shell script to search the right python interpreter
-	[6fef7aca9201]
-
-2015-09-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* config.py:
-	Re-add docstring lost in 2ce339510eca "Move common.widget_config
-	..."
-	[0e873dfda314]
-
-2015-09-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Extend cleanup of byte code files during deinstallation on Windows
-	[8d8d2322eefb]
-
-2015-09-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* about.py, common.py:
-	Rework detection of paths to different wxGlade resources
-	[e4a6e385aa7a]
-
-2015-08-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/index.html:
-	Remove obsolete documentation index file
-	[86363c74f5ec]
-
-	* common.py, config.py, docs/src/manual.xml, install/pyinstaller
-	/wxglade-installer.iss, main.py, tests/__init__.py, wxglade.py:
-	Clearify manual and tutorial path
-	[23eb133a540b]
-
-2015-08-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* README.SF.md:
-	Add RC1 details
-	[abd9e8955e0d]
-
-	* common.py, edit_sizers/edit_sizers.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/button/button.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/check_list_box/check_list_box.py,
-	widgets/checkbox/checkbox.py, widgets/choice/choice.py,
-	widgets/combo_box/combo_box.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/gauge/gauge.py,
-	widgets/generic_calendar_ctrl/generic_calendar_ctrl.py,
-	widgets/grid/grid.py, widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/list_box/list_box.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/menubar/menubar.py, widgets/notebook/notebook.py,
-	widgets/panel/panel.py,
-	widgets/property_grid_manager/property_grid_manager.py,
-	widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py, widgets/slider/slider.py,
-	widgets/spacer/spacer.py, widgets/spin_button/spin_button.py,
-	widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/static_line.py,
-	widgets/static_text/static_text.py, widgets/statusbar/statusbar.py,
-	widgets/text_ctrl/text_ctrl.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/toolbar.py,
-	widgets/tree_ctrl/tree_ctrl.py:
-	Search widget icons with relative paths always in config.icon_path
-	[c572134e1b93]
-
-	* CREDITS.txt, LICENSE.txt, MANIFEST.in, Makefile, README.txt,
-	__init__.py, about.py, application.py, bugdialog.py,
-	changelog.style, clipboard.py, code_property.py,
-	codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/perl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py, color_dialog.py,
-	common.py, compat.py, config.py, credits.txt, decorators.py,
-	docs/src/manual.xml, edit_sizers/__init__.py,
-	edit_sizers/cpp_sizers_codegen.py, edit_sizers/edit_sizers.py,
-	edit_sizers/lisp_sizers_codegen.py,
-	edit_sizers/perl_sizers_codegen.py,
-	edit_sizers/py_sizers_codegen.py, edit_sizers/xrc_sizers_codegen.py,
-	edit_widget.py, edit_windows.py, errors.py, events_mixin.py,
-	font_dialog.py, gui_mixins.py, install/pyinstaller/build.bat,
-	install/pyinstaller/hooks/hook-main.py, install/pyinstaller/wxglade-
-	SAE-installer.iss, install/pyinstaller/wxglade-installer.iss,
-	install/pyinstaller/wxglade.spec, install/rpm/wxglade.spec,
-	kdefiledialog.py, layout_option_property.py, license.txt, log.py,
-	main.py, misc.py, plugins.py, preferencesdialog.py, setup.py,
-	template.py, test.py, tests/__init__.py,
-	tests/casefiles/file_encodings.txt, tests/test_bugs.py,
-	tests/test_codegen.py, tests/test_compile.py,
-	tests/test_external.py, tests/test_gui.py, tree.py,
-	wcodegen/__init__.py, wcodegen/dialogs.py, wcodegen/taghandler.py,
-	widget_properties.py, widgets/ChoicesCodeHandler.py,
-	widgets/ChoicesProperty.py, widgets/MenuTree.py,
-	widgets/__init__.py, widgets/bitmap_button/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/lisp_codegen.py,
-	widgets/bitmap_button/perl_codegen.py,
-	widgets/bitmap_button/wconfig.py, widgets/button/__init__.py,
-	widgets/button/button.py, widgets/button/codegen.py,
-	widgets/button/lisp_codegen.py, widgets/button/perl_codegen.py,
-	widgets/button/wconfig.py, widgets/calendar_ctrl/__init__.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/calendar_ctrl/codegen.py,
-	widgets/calendar_ctrl/perl_codegen.py,
-	widgets/calendar_ctrl/wconfig.py,
-	widgets/check_list_box/__init__.py,
-	widgets/check_list_box/check_list_box.py,
-	widgets/check_list_box/codegen.py,
-	widgets/check_list_box/lisp_codegen.py,
-	widgets/check_list_box/perl_codegen.py,
-	widgets/check_list_box/wconfig.py, widgets/checkbox/__init__.py,
-	widgets/checkbox/checkbox.py, widgets/checkbox/checkbox_base.py,
-	widgets/checkbox/codegen.py, widgets/checkbox/lisp_codegen.py,
-	widgets/checkbox/perl_codegen.py, widgets/checkbox/wconfig.py,
-	widgets/choice/__init__.py, widgets/choice/choice.py,
-	widgets/choice/codegen.py, widgets/choice/lisp_codegen.py,
-	widgets/choice/perl_codegen.py, widgets/choice/wconfig.py,
-	widgets/combo_box/__init__.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/combo_box.py, widgets/combo_box/lisp_codegen.py,
-	widgets/combo_box/perl_codegen.py, widgets/combo_box/wconfig.py,
-	widgets/custom_widget/__init__.py, widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/custom_widget/lisp_codegen.py,
-	widgets/custom_widget/perl_codegen.py,
-	widgets/datepicker_ctrl/__init__.py,
-	widgets/datepicker_ctrl/codegen.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/datepicker_ctrl/lisp_codegen.py,
-	widgets/datepicker_ctrl/perl_codegen.py,
-	widgets/datepicker_ctrl/wconfig.py, widgets/dialog/__init__.py,
-	widgets/dialog/codegen.py, widgets/dialog/dialog.py,
-	widgets/dialog/lisp_codegen.py, widgets/dialog/perl_codegen.py,
-	widgets/dialog/wconfig.py, widgets/frame/__init__.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/frame/lisp_codegen.py, widgets/frame/perl_codegen.py,
-	widgets/frame/wconfig.py, widgets/gauge/__init__.py,
-	widgets/gauge/codegen.py, widgets/gauge/gauge.py,
-	widgets/gauge/lisp_codegen.py, widgets/gauge/perl_codegen.py,
-	widgets/gauge/wconfig.py, widgets/generic_calendar_ctrl/__init__.py,
-	widgets/generic_calendar_ctrl/codegen.py,
-	widgets/generic_calendar_ctrl/generic_calendar_ctrl.py,
-	widgets/generic_calendar_ctrl/perl_codegen.py,
-	widgets/generic_calendar_ctrl/wconfig.py, widgets/grid/__init__.py,
-	widgets/grid/codegen.py, widgets/grid/grid.py,
-	widgets/grid/lisp_codegen.py, widgets/grid/perl_codegen.py,
-	widgets/grid/wconfig.py, widgets/hyperlink_ctrl/__init__.py,
-	widgets/hyperlink_ctrl/codegen.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/hyperlink_ctrl/lisp_codegen.py,
-	widgets/hyperlink_ctrl/perl_codegen.py,
-	widgets/hyperlink_ctrl/wconfig.py, widgets/list_box/__init__.py,
-	widgets/list_box/codegen.py, widgets/list_box/lisp_codegen.py,
-	widgets/list_box/list_box.py, widgets/list_box/perl_codegen.py,
-	widgets/list_box/wconfig.py, widgets/list_ctrl/__init__.py,
-	widgets/list_ctrl/codegen.py, widgets/list_ctrl/lisp_codegen.py,
-	widgets/list_ctrl/list_ctrl.py, widgets/list_ctrl/perl_codegen.py,
-	widgets/list_ctrl/wconfig.py, widgets/menubar/__init__.py,
-	widgets/menubar/codegen.py, widgets/menubar/lisp_codegen.py,
-	widgets/menubar/menubar.py, widgets/menubar/perl_codegen.py,
-	widgets/notebook/__init__.py, widgets/notebook/codegen.py,
-	widgets/notebook/lisp_codegen.py, widgets/notebook/notebook.py,
-	widgets/notebook/perl_codegen.py, widgets/notebook/wconfig.py,
-	widgets/panel/__init__.py, widgets/panel/codegen.py,
-	widgets/panel/lisp_codegen.py, widgets/panel/panel.py,
-	widgets/panel/perl_codegen.py, widgets/panel/wconfig.py,
-	widgets/property_grid_manager/__init__.py,
-	widgets/property_grid_manager/codegen.py,
-	widgets/property_grid_manager/lisp_codegen.py,
-	widgets/property_grid_manager/perl_codegen.py,
-	widgets/property_grid_manager/property_grid_manager.py,
-	widgets/property_grid_manager/wconfig.py,
-	widgets/radio_box/__init__.py, widgets/radio_box/codegen.py,
-	widgets/radio_box/lisp_codegen.py,
-	widgets/radio_box/perl_codegen.py, widgets/radio_box/radio_box.py,
-	widgets/radio_box/radio_box_base.py, widgets/radio_box/wconfig.py,
-	widgets/radio_button/__init__.py, widgets/radio_button/codegen.py,
-	widgets/radio_button/lisp_codegen.py,
-	widgets/radio_button/perl_codegen.py,
-	widgets/radio_button/radio_button.py,
-	widgets/radio_button/wconfig.py, widgets/slider/__init__.py,
-	widgets/slider/codegen.py, widgets/slider/lisp_codegen.py,
-	widgets/slider/perl_codegen.py, widgets/slider/slider.py,
-	widgets/slider/wconfig.py, widgets/spacer/__init__.py,
-	widgets/spacer/codegen.py, widgets/spacer/lisp_codegen.py,
-	widgets/spacer/perl_codegen.py, widgets/spacer/spacer.py,
-	widgets/spin_button/__init__.py, widgets/spin_button/codegen.py,
-	widgets/spin_button/lisp_codegen.py,
-	widgets/spin_button/perl_codegen.py,
-	widgets/spin_button/spin_button.py, widgets/spin_button/wconfig.py,
-	widgets/spin_ctrl/__init__.py, widgets/spin_ctrl/codegen.py,
-	widgets/spin_ctrl/lisp_codegen.py,
-	widgets/spin_ctrl/perl_codegen.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/spin_ctrl/wconfig.py, widgets/splitter_window/__init__.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/splitter_window/wconfig.py,
-	widgets/static_bitmap/__init__.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/lisp_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_bitmap/wconfig.py, widgets/static_line/__init__.py,
-	widgets/static_line/codegen.py, widgets/static_line/lisp_codegen.py,
-	widgets/static_line/perl_codegen.py,
-	widgets/static_line/static_line.py, widgets/static_line/wconfig.py,
-	widgets/static_text/__init__.py, widgets/static_text/codegen.py,
-	widgets/static_text/lisp_codegen.py,
-	widgets/static_text/perl_codegen.py,
-	widgets/static_text/static_text.py, widgets/static_text/wconfig.py,
-	widgets/statusbar/__init__.py, widgets/statusbar/codegen.py,
-	widgets/statusbar/lisp_codegen.py,
-	widgets/statusbar/perl_codegen.py, widgets/statusbar/statusbar.py,
-	widgets/statusbar/wconfig.py, widgets/text_ctrl/__init__.py,
-	widgets/text_ctrl/codegen.py, widgets/text_ctrl/lisp_codegen.py,
-	widgets/text_ctrl/perl_codegen.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/text_ctrl/wconfig.py, widgets/toggle_button/__init__.py,
-	widgets/toggle_button/codegen.py,
-	widgets/toggle_button/lisp_codegen.py,
-	widgets/toggle_button/perl_codegen.py,
-	widgets/toggle_button/toggle_button.py,
-	widgets/toggle_button/wconfig.py, widgets/toolbar/__init__.py,
-	widgets/toolbar/codegen.py, widgets/toolbar/lisp_codegen.py,
-	widgets/toolbar/perl_codegen.py, widgets/toolbar/tool.py,
-	widgets/toolbar/toolbar.py, widgets/toolbar/wconfig.py,
-	widgets/tree_ctrl/__init__.py, widgets/tree_ctrl/codegen.py,
-	widgets/tree_ctrl/lisp_codegen.py,
-	widgets/tree_ctrl/perl_codegen.py, widgets/tree_ctrl/tree_ctrl.py,
-	widgets/tree_ctrl/wconfig.py, wxglade, wxglade.py, wxglade.pyw,
-	xml_parse.py, xrc2wxg.py:
-	Rename credits.txt to CREDITS.txt and license.txt to LICENSE.txt
-	[7196e0303a43]
-
-	* MANIFEST.in, setup.py:
-	Rework generation of release packages
-	[39a50ca1999f]
-
-2015-08-15  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/Sizers_classattr.cpp,
-	tests/casefiles/Sizers_classattr.lisp,
-	tests/casefiles/Sizers_classattr.pl,
-	tests/casefiles/Sizers_classattr.py,
-	tests/casefiles/Sizers_no_classattr.cpp,
-	tests/casefiles/Sizers_no_classattr.lisp,
-	tests/casefiles/Sizers_no_classattr.pl,
-	tests/casefiles/Sizers_no_classattr.py, wcodegen/__init__.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/lisp_codegen.py,
-	widgets/radio_box/perl_codegen.py,
-	widgets/radio_box/radio_box_base.py:
-	Revert "Empty choices will be filled with a placeholder ..."
-
-	Old commit was 1682:0fab37fd9138 "Empty choices will be filled with
-	a placeholder '<set by wxGlade>'"
-	[cda6b2be50f1]
-
-2015-08-13  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/CustomWidget.lisp,
-	widgets/custom_widget/lisp_codegen.py:
-	Fix Lisp code generator for CustomWidget
-	[9f631c040004]
-
-	* widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/custom_widget/lisp_codegen.py,
-	widgets/custom_widget/perl_codegen.py:
-	Minor code reorg for CustomWidget
-	[93720717fcb9]
-
-	* tests/casefiles/CustomWidget.cpp, tests/casefiles/CustomWidget.h,
-	tests/casefiles/CustomWidget.lisp, tests/casefiles/CustomWidget.pl,
-	tests/casefiles/CustomWidget.py, tests/casefiles/CustomWidget.wxg,
-	tests/casefiles/CustomWidget.xrc, tests/test_codegen.py,
-	tests/test_gui.py:
-	Add test cases for CustomWidget
-	[44e114b7e3e6]
-
-	* NEWS.txt, widgets/custom_widget/custom_widget.py:
-	Fix generated code for CustomWidget constructor (Thanks to Udi
-	Fuchs)
-	[10877c3ad73d]
-
-2015-08-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* install/pyinstaller/hooks/hook-main.py, install/pyinstaller/wxglade-
-	SAE-installer.iss, install/pyinstaller/wxglade-installer.iss,
-	install/pyinstaller/wxglade.spec:
-	Update copyright
-	[d81c410a80df]
-
-	* docs/BuildingInstaller.txt, install/pyinstaller/build.bat:
-	Update building Windows installer
-	[2b79f2510d3a]
-
-2015-08-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* .hgtags:
-	Added tag rel_0.7.1RC1 for changeset a5b57a51e924
-	[7bb5c00119a5]
-
-	* NEWS.txt, README.SF.md, README.txt, wxGlade.desktop:
-	Bump version number to 0.7.1RC1
-	[a5b57a51e924] [rel_0.7.1RC1]
-
-	* docs/ReleaseSteps.txt:
-	Update steps to release a new version
-	[c04200d199b2]
-
-	* about.py, clipboard.py, code_property.py, codegen/perl_codegen.py,
-	codegen/py_codegen.py, edit_windows.py, epydoc.conf, main.py,
-	msgdialog.py, ordereddict.py, templates_ui.py, tree.py,
-	widgets/ChoicesProperty.py, widgets/custom_widget/custom_widget.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/menubar/codegen.py, widgets/menubar/menubar.py,
-	widgets/panel/panel.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/perl_codegen.py, widgets/toolbar/toolbar.py:
-	PEP8: E251/E261/E262/E271/E272/E273/E274 Whitespaces
-	[2aab9017aff3]
-
-	* Makefile, NEWS.txt, README.SF.md, TODO.txt, about.py, clipboard.py,
-	code_property.py, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/perl_codegen.py,
-	codegen/py_codegen.py, color_dialog.py, credits.txt, edit_widget.py,
-	edit_windows.py, epydoc.conf, events_mixin.py, font_dialog.py,
-	install/update-po.py, kdefiledialog.py, layout_option_property.py,
-	main.py, template.py, tests/__init__.py, tests/test_codegen.py,
-	tree.py, widgets/ChoicesCodeHandler.py, widgets/MenuTree.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/button/button.py,
-	widgets/button/button_stockitems.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/checkbox/checkbox.py, widgets/choice/choice.py,
-	widgets/combo_box/combo_box.py, widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/grid/codegen.py, widgets/grid/grid.py,
-	widgets/list_box/list_box.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/menubar/codegen.py, widgets/menubar/lisp_codegen.py,
-	widgets/menubar/menubar.py, widgets/menubar/perl_codegen.py,
-	widgets/panel/panel.py, widgets/radio_button/radio_button.py,
-	widgets/spacer/spacer.py, widgets/spin_button/spin_button.py,
-	widgets/spin_ctrl/spin_ctrl.py, widgets/splitter_window/codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/static_line.py,
-	widgets/static_text/static_text.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/lisp_codegen.py, widgets/toolbar/perl_codegen.py,
-	widgets/toolbar/toolbar.py, widgets/tree_ctrl/tree_ctrl.py, wxglade:
-	PEP8: W291/W293 Trailing whitespaces
-	[8999c8192418]
-
-	* Makefile, about.py, application.py, clipboard.py, code_property.py,
-	codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/xrc_codegen.py, color_dialog.py,
-	compat.py, decorators.py, edit_windows.py, font_dialog.py, install
-	/update-po.py, main.py, misc.py, ordereddict.py, templates_ui.py,
-	tests/test_external.py, tree.py, widget_properties.py,
-	widgets/MenuTree.py, widgets/bitmap_button/codegen.py,
-	widgets/choice/choice.py, widgets/custom_widget/custom_widget.py,
-	widgets/custom_widget/lisp_codegen.py,
-	widgets/datepicker_ctrl/codegen.py, widgets/gauge/gauge.py,
-	widgets/gauge/lisp_codegen.py, widgets/grid/codegen.py,
-	widgets/menubar/codegen.py, widgets/menubar/menubar.py,
-	widgets/notebook/notebook.py, widgets/panel/lisp_codegen.py,
-	widgets/panel/panel.py, widgets/slider/slider.py,
-	widgets/spacer/spacer.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_text/static_text.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/toolbar/toolbar.py, xml_parse.py:
-	PEP8: E301/E302 missing blank lines
-	[907c4aeba03e]
-
-	* appdata.xml, bugdialog.py, bugdialog_ui.py, codegen/lisp_codegen.py,
-	decorators.py, edit_sizers/xrc_sizers_codegen.py, edit_widget.py,
-	gui_mixins.py, kdefiledialog.py, msgdialog.py, template.py,
-	tests/test_codegen.py, tests/test_gui.py, tree.py,
-	wcodegen/__init__.py, wcodegen/taghandler.py, widget_properties.py,
-	widgets/combo_box/combo_box.py, widgets/frame/codegen.py,
-	widgets/frame/perl_codegen.py, widgets/menubar/lisp_codegen.py,
-	widgets/menubar/menubar.py, widgets/menubar/perl_codegen.py,
-	widgets/radio_box/codegen.py, widgets/static_text/static_text.py,
-	widgets/statusbar/__init__.py, widgets/statusbar/statusbar.py,
-	widgets/toolbar/lisp_codegen.py, wxGlade.desktop, xrc2wxg.py:
-	PEP8: E303 too many blank lines
-	[154f240961d6]
-
-	* wxglade.pyw:
-	Reorder code to prevent reporting SystemExit exception
-	[3b8d01bb2be9]
-
-2015-08-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* .hgignore, config.py, setup.py:
-	Use module version.py to store the current version number
-	[593873a6fb68]
-
-2015-08-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_windows.py:
-	Minor docstring update
-	[a6de1512165e]
-
-	* edit_sizers/edit_sizers.py:
-	Rework SizerSlot class mainly to draw background buffered
-	[e6c212b7f347]
-
-	* NEWS.txt, edit_sizers/edit_sizers.py:
-	Always show new widgets in the design window
-
-	Some new widget wasn't show after adding to the design window. The
-	hatched background was shown instead of the new added widget.
-	[be9e795f2441]
-
-2015-07-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* misc.py:
-	Code cleanup in SelectionTag (blue squares) to mark the active
-	widget
-	[ebb3509a4cb2]
-
-2015-07-17  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, misc.py, widgets/button/button.py,
-	widgets/check_list_box/check_list_box.py, widgets/choice/choice.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/list_box/list_box.py, widgets/menubar/menubar.py,
-	widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py,
-	widgets/static_text/static_text.py,
-	widgets/toggle_button/toggle_button.py:
-	Remove obsolete function common.encode_from_xml()
-	[713b5693d473]
-
-	* common.py:
-	Fix handling of Unicode content in check for modified files
-	[5e3c84da9644] <WXG-BRANCH-VERSION_0_7_0>
-
-	* NEWS.txt, code_property.py, codegen/__init__.py,
-	codegen/xrc_codegen.py, common.py, edit_sizers/edit_sizers.py,
-	edit_windows.py, events_mixin.py, gui_mixins.py, template.py,
-	tests/casefiles/bug166.cpp, tests/casefiles/bug166.h,
-	tests/casefiles/bug166.lisp, tests/casefiles/bug166.pl,
-	tests/casefiles/bug166.py, tests/casefiles/bug166.wxg,
-	tests/casefiles/bug166.xrc, tests/test_bugs.py, tree.py,
-	wcodegen/taghandler.py, widget_properties.py,
-	widgets/ChoicesCodeHandler.py, widgets/ChoicesProperty.py,
-	widgets/MenuTree.py, widgets/checkbox/checkbox.py,
-	widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py, widgets/frame/codegen.py,
-	widgets/grid/codegen.py, widgets/grid/grid.py,
-	widgets/menubar/codegen.py, widgets/menubar/menubar.py,
-	widgets/notebook/codegen.py, widgets/notebook/notebook.py,
-	widgets/statusbar/codegen.py, widgets/statusbar/statusbar.py,
-	widgets/toolbar/codegen.py, widgets/toolbar/tool.py,
-	widgets/toolbar/toolbar.py, xml_parse.py:
-	Improve string and XML handling to be Unicode aware fully (sf bug
-	#166)
-	[d081a810e31d]
-
-	* wxglade.pyw:
-	Wrong newline sequence
-	[e996c8183a5e]
-
-2015-07-13  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	Fix handling of Unicode content in check for modified files
-	[327f789145e7]
-
-2015-07-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* gui_mixins.py:
-	Create EmptyBitmaps with a minimal size of 1, 1
-
-	Due to a limitation on the Mac bitmaps are not allowed to have a
-	size with a dimension of zero.
-	[c125717cb878]
-
-	* common.py, plugins.py:
-	Improve logging messages at startup
-	[24ad267642c8]
-
-	* install/pyinstaller/wxglade.spec:
-	Don't show a console window on MS Windows
-	[0d888524e0df]
-
-	* wxglade.py:
-	Fix for unexpected termination of SAE on Windows
-
-	The root cause is the missing encoding attribute in the PyInstaller
-	NullWriter implementation used as a drop-in replacement for
-	sys.stdout and sys.stderr.
-
-	https://github.com/pyinstaller/pyinstaller/issues/1324
-	[e068940e65cc]
-
-2015-07-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_sizers/edit_sizers.py:
-	Set color of new created sizer buttons initially
-
-	This change provides a consistent impression for non-default look
-	and feels.
-	[2ccea99a0683]
-
-2015-07-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_sizers/edit_sizers.py:
-	PEP8
-	[cc2541d93b7e]
-
-2015-06-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, color_dialog.py:
-	Fix broken color selection dialog
-	[bc1cdaba4acc] <WXG-BRANCH-VERSION_0_7_0>
-
-	* NEWS.txt, common.py:
-	Don't rewrite unchanged files
-
-	Use md5 to be compatible with Python 2.4
-	[03b4184cf876] <WXG-BRANCH-VERSION_0_7_0>
-
-2015-06-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Minor code reorg
-	[2081c5dc66c1]
-
-2015-06-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* config.py, test.py, wxglade.py:
-	Separate initialisation of locale to shorten wxglade.init_stage1()
-	[02fd229e9fc7]
-
-	* wxglade.py:
-	Adjust output messages
-	[946332de6423]
-
-	* xml_parse.py:
-	Clarify comment of custom tag handler interface
-	[e1083f61b801]
-
-2015-06-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.pl,
-	tests/casefiles/AllWidgets_28.py, tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py, tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc, tests/casefiles/CalendarCtrl.cpp,
-	widgets/calendar_ctrl/codegen.py:
-	Fix C++ template of wxCalendarCtrl
-
-	The old template has not compiled due a missing default parameter if
-	styles are given.
-	[c159a2d9c1dd]
-
-2015-06-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/calendar_ctrl/wconfig.py:
-	Add missing styles and event types to wxCalendarCtrl
-	[049b60e0d0aa]
-
-	* widgets/calendar_ctrl/wconfig.py:
-	Add missing styles and event types to wxCalendarCtrl
-	[f2b78211f402]
-
-	* docs/src/manual.xml, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.h, tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.h,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc:
-	Add unittests for generation of foreground and background colours
-	[6f066be3ef7e]
-
-2015-06-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/perl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/AllWidgets_28.pl,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample_30.pl, wcodegen/__init__.py,
-	widgets/custom_widget/codegen.py,
-	widgets/custom_widget/perl_codegen.py, widgets/grid/codegen.py,
-	widgets/grid/lisp_codegen.py, widgets/grid/perl_codegen.py,
-	widgets/menubar/codegen.py, widgets/menubar/perl_codegen.py,
-	widgets/notebook/codegen.py, widgets/notebook/lisp_codegen.py,
-	widgets/notebook/perl_codegen.py, widgets/panel/codegen.py,
-	widgets/panel/lisp_codegen.py, widgets/panel/perl_codegen.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/lisp_codegen.py, widgets/toolbar/perl_codegen.py:
-	Unify generating widget access
-
-	The base change is: if not obj.is_toplevel: parent = 'self.%s' %
-	obj.name else: parent = 'self' to this: parent =
-	self.format_widget_access(obj)
-	[3f8c15d57d22]
-
-2015-06-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/toolbar/toolbar.py:
-	Change bitmap labels in toolbar editor
-	[0d3973316c41]
-
-	* widgets/menubar/menubar.py, widgets/toolbar/toolbar.py:
-	Change signature of derived bind_event() to prevent pylint warning
-	[450a0ba7ba9d]
-
-	* gui_mixins.py, wcodegen/__init__.py, wcodegen/mixins.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/dialog/dialog.py,
-	widgets/frame/frame.py, widgets/static_bitmap/static_bitmap.py,
-	widgets/toolbar/toolbar.py:
-	Move and rename wcodegen.mixins to gui_mixins
-	[c1c727cabfbf]
-
-	* codegen/__init__.py, log.py, misc.py, tree.py:
-	unidiomatic-typecheck lint warn
-
-	Change this: type(obj) is T to this: isinstance(obj, T)
-	[ec76337f2a52]
-
-	* common.py, plugins.py:
-	Move plugins.style_attrs_to_sets to common module
-	[ce94f84ca927]
-
-	* common.py, config.py, events_mixin.py, misc.py, plugins.py,
-	tests/test_codegen.py, wcodegen/__init__.py, wcodegen/mixins.py,
-	widget_properties.py, widgets/dialog/wconfig.py,
-	widgets/notebook/notebook.py,
-	widgets/property_grid_manager/property_grid_manager.py,
-	widgets/static_bitmap/codegen.py:
-	Move common.widget_config to config module
-	[2ce339510eca]
-
-	* widget_properties.py:
-	Wrong formatted version numbers in styles tooltips
-	[e24f17112d94]
-
-2015-06-13  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/toolbar/codegen.py:
-	Remove unused imports
-	[3f1f84894c27]
-
-2015-06-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/calendar_ctrl/wconfig.py, widgets/grid/wconfig.py,
-	widgets/slider/wconfig.py:
-	Summarise event type definitions
-	[993a50a08349]
-
-	* README.SF.md, docs/ReleaseSteps.txt, setup.py:
-	Add a separate README file for the SF download folder
-	[056eec02912a]
-
-2015-06-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, config.py, edit_sizers/edit_sizers.py, misc.py:
-	Change public used private variables to public variables
-
-	E.g. rename config._backed_up to config.backed_up
-	[4b8a9d1552a4]
-
-2015-06-10  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.h,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc, tests/test_compile.py,
-	widgets/check_list_box/check_list_box.py,
-	widgets/check_list_box/wconfig.py,
-	widgets/generic_calendar_ctrl/codegen.py,
-	widgets/generic_calendar_ctrl/generic_calendar_ctrl.py,
-	widgets/generic_calendar_ctrl/wconfig.py,
-	widgets/property_grid_manager/codegen.py,
-	widgets/property_grid_manager/property_grid_manager.py,
-	widgets/property_grid_manager/wconfig.py:
-	Adapt new widgets to current wxGlade development version and add
-	tests
-	[fd013086abf8]
-
-	* NEWS.txt, credits.txt, widgets/check_list_box/__init__.py,
-	widgets/check_list_box/check_list_box.py,
-	widgets/check_list_box/codegen.py,
-	widgets/check_list_box/lisp_codegen.py,
-	widgets/check_list_box/perl_codegen.py,
-	widgets/check_list_box/wconfig.py,
-	widgets/generic_calendar_ctrl/__init__.py,
-	widgets/generic_calendar_ctrl/codegen.py,
-	widgets/generic_calendar_ctrl/generic_calendar_ctrl.py,
-	widgets/generic_calendar_ctrl/perl_codegen.py,
-	widgets/generic_calendar_ctrl/wconfig.py,
-	widgets/property_grid_manager/__init__.py,
-	widgets/property_grid_manager/codegen.py,
-	widgets/property_grid_manager/lisp_codegen.py,
-	widgets/property_grid_manager/perl_codegen.py,
-	widgets/property_grid_manager/property_grid_manager.py,
-	widgets/property_grid_manager/wconfig.py, widgets/widgets.txt:
-	New widgets CheckListBox, GenericCalendarCtrl and
-	PropertyGridManager contributed by Franco Bugnano
-
-	The widgets are licensed under MIT license too.
-	[e99c0059128a]
-
-2015-06-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tree.py:
-	Improve handling of values for storing in the WXG XML header
-	[bde585141ba0]
-
-2015-06-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_compile.py:
-	Show output of the compiling tests only on failures
-	[1cc7ce017d49]
-
-2015-05-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, common.py, plugins.py:
-	Separate code to import widgets and increase robustness
-	[d976616c68bf]
-
-2015-05-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade:
-	Fix wrong error message
-	[0a2638d8f0d3]
-
-2015-05-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* bugdialog.py:
-	Improve output format in bugdialog
-	[af03f19e71bb]
-
-2015-05-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, color_dialog.py:
-	Fix broken color selection dialog
-	[5d10648a232a]
-
-	* Makefile, test.py, tests/__init__.py, tests/test_compile.py:
-	Add a test suite to compile single-file C++ sources
-	[9aa8413b0a8f]
-
-2015-05-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample_30.pl, tests/casefiles/Grid.pl,
-	tests/casefiles/PlOgg2_MyFrame.pm, tests/casefiles/PlOgg3.pl,
-	widgets/grid/perl_codegen.py:
-	Remove unneded imports of Wx::Grid for Perl
-	[a87469ea1f78]
-
-	* codegen/perl_codegen.py, tests/casefiles/AllWidgets_28.pl,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample_30.pl, tests/casefiles/Grid.pl:
-	Add dependencies inside the package block additionally on Perl
-
-	The dependencies have to add to the package block too because global
-	imports are not visible inside the package block.
-	[2f44e36cf2e7]
-
-2015-05-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/cpp_codegen.py, wcodegen/__init__.py,
-	widgets/calendar_ctrl/codegen.py,
-	widgets/datepicker_ctrl/codegen.py, widgets/frame/codegen.py,
-	widgets/frame/lisp_codegen.py, widgets/frame/perl_codegen.py,
-	widgets/grid/codegen.py, widgets/hyperlink_ctrl/codegen.py,
-	widgets/list_ctrl/codegen.py, widgets/notebook/codegen.py,
-	widgets/spin_button/codegen.py, widgets/spin_ctrl/codegen.py,
-	widgets/splitter_window/codegen.py, widgets/static_line/codegen.py,
-	widgets/toggle_button/codegen.py, widgets/tree_ctrl/codegen.py:
-	Unify handling of additional imports in C++
-
-	extra_headers has been renamed to import_modules to use the same
-	variable within all code generators.
-	[29a0afbec3ba]
-
-	* codegen/__init__.py, wcodegen/__init__.py:
-	Simplify handling of additional imports
-	[138154860237]
-
-2015-05-17  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.h,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc, tests/test_codegen.py,
-	wcodegen/__init__.py, wcodegen/mixins.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/dialog/dialog.py,
-	widgets/frame/frame.py, widgets/static_bitmap/static_bitmap.py,
-	widgets/toolbar/toolbar.py:
-	Add support for bitmaps from wxArtProvider
-	[f4aa1f9a8107]
-
-	* tests/__init__.py:
-	Ignore version line during comparison of test files
-	[df4fa17392da]
-
-2015-05-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py, wcodegen/__init__.py:
-	Add support for dynamic dependencies
-	[0aa8a1f3d6e6]
-
-2015-05-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.h, tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.h,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc, tests/test_codegen.py,
-	wcodegen/__init__.py, wcodegen/mixins.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/dialog/dialog.py,
-	widgets/frame/frame.py, widgets/static_bitmap/static_bitmap.py,
-	widgets/toolbar/toolbar.py:
-	Add support for empty bitmaps
-	[5cc343df284f]
-
-2015-05-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample_30.cpp,
-	tests/casefiles/ComplexExample_30.pl,
-	tests/casefiles/Lisp_wxBitmapButton.lisp,
-	tests/casefiles/Perl_Preferences.pl,
-	tests/casefiles/Python_Preferences.py, tests/test_codegen.py,
-	wcodegen/__init__.py, widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/lisp_codegen.py,
-	widgets/bitmap_button/perl_codegen.py, widgets/dialog/codegen.py,
-	widgets/dialog/lisp_codegen.py, widgets/dialog/perl_codegen.py,
-	widgets/frame/codegen.py, widgets/frame/lisp_codegen.py,
-	widgets/frame/perl_codegen.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/lisp_codegen.py,
-	widgets/static_bitmap/perl_codegen.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/lisp_codegen.py, widgets/toolbar/perl_codegen.py:
-	Rework creation of wxBitmap code used by several widgets
-	[777c8c83d089]
-
-2015-04-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wcodegen/__init__.py:
-	Unify generating choice code
-	[b04e3a0ed418]
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/Sizers_classattr.cpp,
-	tests/casefiles/Sizers_classattr.lisp,
-	tests/casefiles/Sizers_classattr.pl,
-	tests/casefiles/Sizers_classattr.py,
-	tests/casefiles/Sizers_no_classattr.cpp,
-	tests/casefiles/Sizers_no_classattr.lisp,
-	tests/casefiles/Sizers_no_classattr.pl,
-	tests/casefiles/Sizers_no_classattr.py, wcodegen/__init__.py:
-	Empty choices will be filled with a placeholder '<set by wxGlade>'
-	[0fab37fd9138]
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/perl_codegen.py, codegen/py_codegen.py,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py:
-	Fix handling of EVT_NAVIGATION_KEY event because the signature
-	differs from the remaining events.
-	[2bdc1109253c]
-
-2015-04-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Unify XML parser code
-	[146701e2b142]
-
-2015-04-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/py_codegen.py, tests/casefiles/FontColour.py,
-	tests/casefiles/HyperlinkCtrl_28.py,
-	tests/casefiles/PythonAddApp_multi_detailed.py,
-	tests/casefiles/PythonAddApp_multi_gettext_detailed.py,
-	tests/casefiles/PythonAddApp_single_detailed.py,
-	tests/casefiles/PythonAddApp_single_gettext_detailed.py,
-	tests/casefiles/Sizers_classattr.py,
-	tests/casefiles/Sizers_no_classattr.py,
-	tests/casefiles/add_class_inplace_extended.py,
-	tests/casefiles/add_class_inplace_orig.py,
-	tests/casefiles/no_suitable_writer.py,
-	tests/casefiles/remove_class_inplace_expected.py,
-	tests/casefiles/remove_class_inplace_input.py:
-	OnInit() returns True instead of 1 for Python now
-	[f52c59c94e38]
-
-2015-04-22  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, common.py:
-	Don't rewrite unchanged files
-
-	Use md5 to be compatible with Python 2.4
-	[a89239bf9c6d]
-
-2015-04-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	Remove unused class variable from common.Preferences
-	[dc28a4138867]
-
-2015-04-16  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tree.py:
-	Don't access to a deprecated property
-	[b451e8ea6067]
-
-	* about.py, appdata.xml, application.py, changelog.style,
-	code_property.py, codegen/lisp_codegen.py, codegen/perl_codegen.py,
-	codegen/py_codegen.py, compat.py, config.py, docs/man/manpage.xml,
-	edit_sizers/__init__.py, edit_sizers/cpp_sizers_codegen.py,
-	edit_sizers/lisp_sizers_codegen.py,
-	edit_sizers/perl_sizers_codegen.py,
-	edit_sizers/py_sizers_codegen.py, edit_sizers/xrc_sizers_codegen.py,
-	edit_windows.py, layout_option_property.py, license.txt, test.py,
-	tests/test_external.py, wcodegen/__init__.py, wcodegen/dialogs.py,
-	widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/lisp_codegen.py,
-	widgets/bitmap_button/perl_codegen.py, widgets/button/codegen.py,
-	widgets/button/lisp_codegen.py, widgets/button/perl_codegen.py,
-	widgets/calendar_ctrl/perl_codegen.py, widgets/choice/codegen.py,
-	widgets/choice/lisp_codegen.py, widgets/choice/perl_codegen.py,
-	widgets/combo_box/codegen.py, widgets/combo_box/lisp_codegen.py,
-	widgets/combo_box/perl_codegen.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/custom_widget/lisp_codegen.py,
-	widgets/custom_widget/perl_codegen.py,
-	widgets/datepicker_ctrl/lisp_codegen.py,
-	widgets/datepicker_ctrl/perl_codegen.py, widgets/dialog/dialog.py,
-	widgets/dialog/lisp_codegen.py, widgets/dialog/perl_codegen.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/frame/lisp_codegen.py, widgets/frame/perl_codegen.py,
-	widgets/frame/wconfig.py, widgets/gauge/codegen.py,
-	widgets/gauge/lisp_codegen.py, widgets/gauge/perl_codegen.py,
-	widgets/gauge/wconfig.py, widgets/grid/lisp_codegen.py,
-	widgets/grid/perl_codegen.py, widgets/hyperlink_ctrl/__init__.py,
-	widgets/hyperlink_ctrl/lisp_codegen.py,
-	widgets/hyperlink_ctrl/perl_codegen.py,
-	widgets/list_box/lisp_codegen.py, widgets/list_ctrl/lisp_codegen.py,
-	widgets/list_ctrl/perl_codegen.py, widgets/menubar/menubar.py,
-	widgets/notebook/lisp_codegen.py, widgets/notebook/perl_codegen.py,
-	widgets/panel/codegen.py, widgets/panel/lisp_codegen.py,
-	widgets/panel/panel.py, widgets/panel/perl_codegen.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/lisp_codegen.py,
-	widgets/radio_box/perl_codegen.py, widgets/radio_button/codegen.py,
-	widgets/radio_button/lisp_codegen.py,
-	widgets/radio_button/perl_codegen.py,
-	widgets/slider/lisp_codegen.py, widgets/slider/perl_codegen.py,
-	widgets/spacer/codegen.py, widgets/spacer/lisp_codegen.py,
-	widgets/spacer/perl_codegen.py, widgets/spacer/spacer.py,
-	widgets/spin_button/lisp_codegen.py,
-	widgets/spin_button/perl_codegen.py,
-	widgets/spin_ctrl/lisp_codegen.py,
-	widgets/spin_ctrl/perl_codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/lisp_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_bitmap/wconfig.py, widgets/static_line/codegen.py,
-	widgets/static_line/lisp_codegen.py,
-	widgets/static_line/perl_codegen.py,
-	widgets/static_line/static_line.py, widgets/static_line/wconfig.py,
-	widgets/static_text/codegen.py, widgets/static_text/lisp_codegen.py,
-	widgets/static_text/perl_codegen.py, widgets/static_text/wconfig.py,
-	widgets/statusbar/__init__.py, widgets/statusbar/codegen.py,
-	widgets/statusbar/lisp_codegen.py,
-	widgets/statusbar/perl_codegen.py, widgets/statusbar/wconfig.py,
-	widgets/text_ctrl/codegen.py, widgets/text_ctrl/lisp_codegen.py,
-	widgets/text_ctrl/perl_codegen.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/lisp_codegen.py, widgets/toolbar/perl_codegen.py,
-	widgets/toolbar/toolbar.py, widgets/toolbar/wconfig.py,
-	widgets/tree_ctrl/lisp_codegen.py,
-	widgets/tree_ctrl/perl_codegen.py, wxglade, wxglade.py, xrc2wxg.py:
-	Update copyright year
-	[8aca18141318]
-
-2015-04-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.h, tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.h,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc, widgets/toggle_button/codegen.py,
-	widgets/toggle_button/lisp_codegen.py,
-	widgets/toggle_button/perl_codegen.py,
-	widgets/toggle_button/toggle_button.py:
-	Add styles to wxToggleButton
-	[a70f184b4934]
-
-2015-04-13  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/list_box/wconfig.py, widgets/slider/wconfig.py:
-	Update style definitions
-	[25ca954983dc]
-
-	* application.py, bugdialog.py, codegen/__init__.py,
-	codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/perl_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, main.py, misc.py, preferencesdialog.py,
-	tests/test_codegen.py, wcodegen/__init__.py, widgets/grid/grid.py,
-	widgets/menubar/codegen.py, widgets/menubar/perl_codegen.py,
-	widgets/toolbar/codegen.py:
-	Minor internal code changes like renames, improving wording, ...
-	[965ddf619dc2]
-
-2015-04-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/__init__.py, tests/casefiles/PerlAddApp_multi_detailed.pl,
-	tests/casefiles/PerlAddApp_multi_gettext_detailed.pl,
-	tests/casefiles/PerlAddApp_multi_gettext_simple.pl,
-	tests/casefiles/PerlAddApp_multi_simple.pl,
-	tests/casefiles/PerlAddApp_single_detailed.pl,
-	tests/casefiles/PerlAddApp_single_gettext_detailed.pl,
-	tests/casefiles/PerlAddApp_single_gettext_simple.pl,
-	tests/casefiles/PerlAddApp_single_simple.pl,
-	tests/casefiles/PlAddApp_multi_detailed.pl,
-	tests/casefiles/PlAddApp_multi_gettext_detailed.pl,
-	tests/casefiles/PlAddApp_multi_gettext_simple.pl,
-	tests/casefiles/PlAddApp_multi_simple.pl,
-	tests/casefiles/PlAddApp_single_detailed.pl,
-	tests/casefiles/PlAddApp_single_gettext_detailed.pl,
-	tests/casefiles/PlAddApp_single_gettext_simple.pl,
-	tests/casefiles/PlAddApp_single_simple.pl,
-	tests/casefiles/PyAddApp_multi_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_simple.py,
-	tests/casefiles/PyAddApp_multi_simple.py,
-	tests/casefiles/PyAddApp_single_detailed.py,
-	tests/casefiles/PyAddApp_single_gettext_detailed.py,
-	tests/casefiles/PyAddApp_single_gettext_simple.py,
-	tests/casefiles/PyAddApp_single_simple.py,
-	tests/casefiles/PythonAddApp_multi_detailed.py,
-	tests/casefiles/PythonAddApp_multi_gettext_detailed.py,
-	tests/casefiles/PythonAddApp_multi_gettext_simple.py,
-	tests/casefiles/PythonAddApp_multi_simple.py,
-	tests/casefiles/PythonAddApp_single_detailed.py,
-	tests/casefiles/PythonAddApp_single_gettext_detailed.py,
-	tests/casefiles/PythonAddApp_single_gettext_simple.py,
-	tests/casefiles/PythonAddApp_single_simple.py,
-	tests/test_codegen.py, tests/test_gui.py:
-	Summarise language specific contansts in base class instead of
-	declaring several times.
-	[55e70caf3b22]
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.pl,
-	tests/casefiles/AllWidgets_30.py, tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc,
-	tests/casefiles/Sizers_classattr.cpp,
-	tests/casefiles/Sizers_classattr.lisp,
-	tests/casefiles/Sizers_classattr.pl,
-	tests/casefiles/Sizers_no_classattr.cpp,
-	tests/casefiles/Sizers_no_classattr.lisp,
-	tests/casefiles/Sizers_no_classattr.pl, widgets/list_box/codegen.py,
-	widgets/list_box/perl_codegen.py, widgets/list_box/wconfig.py:
-	Fix generated code for wxListBox
-	[05bce66af2bd]
-
-	* NEWS.txt, codegen/cpp_codegen.py, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_30.h, tests/casefiles/CPPOgg1.h,
-	tests/casefiles/CPPOgg2_MyDialog.h, tests/casefiles/CPPOgg3.h,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample_30.h, tests/casefiles/Grid.h:
-	Event handler in C++ aren't virtual anymore
-
-	The wx documentation states "The member function that handles an
-	event does not have to be virtual."
-	[dc15f21dfa0b]
-
-	* NEWS.txt, codegen/xrc_codegen.py, tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.h,
-	tests/casefiles/AllWidgets_30.pl, tests/casefiles/AllWidgets_30.py,
-	tests/casefiles/AllWidgets_30.wxg,
-	tests/casefiles/AllWidgets_30.xrc, tests/test_codegen.py,
-	tests/test_gui.py, wcodegen/__init__.py, widgets/panel/wconfig.py:
-	Add support for events that are only supported by a specific wx
-	version
-	[ac3ee003ec75]
-
-2015-04-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.h, tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/AllWidgets_30.cpp, tests/casefiles/AllWidgets_30.h,
-	tests/test_codegen.py, wcodegen/__init__.py,
-	widgets/notebook/wconfig.py:
-	Add support for events with different prototypes for diff. wx
-	versions
-
-	The prototype of the events issued by wxNotebook has changed from
-	2.8 "wxNotebookEvent" to 3.0 "wxBookCtrlEvent".
-	[9e07a4f948d4]
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/perl_codegen.py,
-	codegen/py_codegen.py, common.py, events_mixin.py,
-	tests/test_codegen.py, wcodegen/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/wconfig.py, widgets/button/button.py,
-	widgets/button/wconfig.py, widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/calendar_ctrl/codegen.py, widgets/calendar_ctrl/wconfig.py,
-	widgets/checkbox/checkbox.py, widgets/checkbox/wconfig.py,
-	widgets/choice/choice.py, widgets/choice/wconfig.py,
-	widgets/combo_box/combo_box.py, widgets/combo_box/wconfig.py,
-	widgets/datepicker_ctrl/codegen.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/datepicker_ctrl/wconfig.py, widgets/dialog/codegen.py,
-	widgets/dialog/wconfig.py, widgets/grid/codegen.py,
-	widgets/grid/grid.py, widgets/grid/wconfig.py,
-	widgets/hyperlink_ctrl/codegen.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/hyperlink_ctrl/wconfig.py, widgets/list_box/list_box.py,
-	widgets/list_box/wconfig.py, widgets/list_ctrl/codegen.py,
-	widgets/list_ctrl/list_ctrl.py, widgets/list_ctrl/wconfig.py,
-	widgets/menubar/codegen.py, widgets/menubar/perl_codegen.py,
-	widgets/notebook/codegen.py, widgets/notebook/notebook.py,
-	widgets/notebook/wconfig.py, widgets/radio_box/radio_box.py,
-	widgets/radio_box/wconfig.py, widgets/radio_button/radio_button.py,
-	widgets/radio_button/wconfig.py, widgets/slider/codegen.py,
-	widgets/slider/slider.py, widgets/slider/wconfig.py,
-	widgets/spin_button/codegen.py, widgets/spin_button/spin_button.py,
-	widgets/spin_button/wconfig.py, widgets/spin_ctrl/codegen.py,
-	widgets/spin_ctrl/spin_ctrl.py, widgets/spin_ctrl/wconfig.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/splitter_window/wconfig.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/text_ctrl/wconfig.py,
-	widgets/toggle_button/toggle_button.py,
-	widgets/toggle_button/wconfig.py, widgets/toolbar/codegen.py,
-	widgets/tree_ctrl/codegen.py, widgets/tree_ctrl/tree_ctrl.py,
-	widgets/tree_ctrl/wconfig.py:
-	Migrate event definitions to the wconfig files and adapt event
-	handling
-	[56809e02f999]
-
-2015-04-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, widgets/datepicker_ctrl/codegen.py,
-	widgets/dialog/codegen.py, widgets/hyperlink_ctrl/codegen.py,
-	widgets/tree_ctrl/codegen.py:
-	Add missing event types for event handling in C++
-	[114168a0e9c5]
-
-2015-04-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/lisp_codegen.py, widgets/menubar/menubar.py:
-	Reduce usage of "Unbound local variable"
-
-	It's unclear if the orginal code may raise bugs.
-	[ce3b33d10084]
-
-2015-04-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_windows.py:
-	Use the memoize decorators instead of an own cache algorithm
-	[d803a4cea380]
-
-	* NEWS.txt, wxglade.pyw:
-	Catch and show early exceptions on Windows (Thanks to Tor Sjøwall)
-	[433c0af02aef]
-
-2015-04-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* bugdialog.py, bugdialog_ui.py, docs/html/apa.html,
-	docs/html/apb.html, docs/html/apd.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html,
-	docs/html/ch01s08.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html,
-	docs/html/ch02s09.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html, docs/html/ch04.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/ch06s04.html, docs/html/ch06s05.html,
-	docs/html/ch06s06.html, docs/html/ch06s07.html,
-	docs/html/ch06s08.html, docs/html/ch06s09.html, docs/html/ch07.html,
-	docs/html/ch07s02.html, docs/html/ch07s03.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/pdf/manual.pdf, docs/src/manual.xml, res/bugdialog_ui.wxg:
-	Show full path of error log file in the bug dialog
-	[e32e72f7285e]
-
-	* NEWS.txt, about.py, bugdialog_ui.py, codegen/py_codegen.py, main.py,
-	msgdialog.py, templates_ui.py, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample_30.py, tests/casefiles/FontColour.py,
-	tests/casefiles/HyperlinkCtrl_28.py,
-	tests/casefiles/PyAddApp_multi_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_simple.py,
-	tests/casefiles/PyAddApp_multi_simple.py,
-	tests/casefiles/PyAddApp_single_detailed.py,
-	tests/casefiles/PyAddApp_single_gettext_detailed.py,
-	tests/casefiles/PyAddApp_single_gettext_simple.py,
-	tests/casefiles/PyAddApp_single_simple.py,
-	tests/casefiles/PyOgg1.py, tests/casefiles/PyOgg2_app.py,
-	tests/casefiles/PyOgg3.py, tests/casefiles/Sizers_classattr.py,
-	tests/casefiles/Sizers_no_classattr.py,
-	tests/casefiles/add_class_inplace_extended.py,
-	tests/casefiles/add_class_inplace_orig.py,
-	tests/casefiles/no_suitable_writer.py,
-	tests/casefiles/remove_class_inplace_expected.py,
-	tests/casefiles/remove_class_inplace_input.py, tests/test_gui.py:
-	Remove obsolete calls of wx.InitAllImageHandlers()
-
-	wx.InitAllImageHandlers() has been removed from all Python code as
-	well as from the Python code generator.
-
-	The former functionality of InitAllImageHanders is now done internal
-	to the _core_ extension module and so this function has become a
-	simple NOP.
-	[a9d244fd7a2e]
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.h, tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc, widgets/checkbox/checkbox.py,
-	widgets/checkbox/checkbox_base.py, widgets/checkbox/codegen.py,
-	widgets/checkbox/lisp_codegen.py, widgets/checkbox/perl_codegen.py,
-	widgets/checkbox/wconfig.py:
-	Add support for 3-state checkboxes
-	[de213db4646a]
-
-	* wcodegen/mixins.py:
-	Fix docstring format
-	[978f1af9ffaa]
-
-2015-03-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_codegen.py:
-	Minor cleanups
-	[6a16f6f6b22e]
-
-	* widget_properties.py:
-	Increase robustness of RadioProperty
-
-	Now you can call enable_item() even if the widget isn't displayed /
-	created.
-	[949743b04254]
-
-2015-03-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, tests/test_codegen.py, wcodegen/mixins.py,
-	widget_properties.py, widgets/checkbox/wconfig.py:
-	Rework style processing to handle dependencies properly.
-
-	A new style attribute 'require' has been introduced.
-	[42776405add0]
-
-2015-03-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, wcodegen/mixins.py, widget_properties.py,
-	widgets/checkbox/wconfig.py:
-	Rename style attributes 'add' and 'delete' into 'include' and
-	'exclude'
-	[083773a39c57]
-
-2015-03-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, decorators.py, wcodegen/__init__.py, wcodegen/mixins.py:
-	Move code to prepare style attributes from wcodegen.mixins to common
-
-	Special style attributes ('add', 'combination' and 'delete') are
-	converted from string to set in a earlier. Thereby function can
-	always use these attributes as a set.
-	[32eccd5c6311]
-
-2015-03-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, tests/test_codegen.py, wcodegen/mixins.py,
-	widget_properties.py, widgets/checkbox/wconfig.py:
-	Add style attributes 'add' and 'delete'.
-
-	Both styles allows to add or remove a style based on current
-	selected styles.
-	[d74777c72589]
-
-2015-03-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* test.py:
-	Change test setup to use wx version 2.8 or newer instead of 2.8 only
-	[7d7afd8c0d9f]
-
-2015-03-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py:
-	Disable autosave checks during unittests
-	[5ae528aa226e]
-
-2015-03-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	Normalise paths of internal files and directories
-	[696a98de122f]
-
-	* application.py, bugdialog.py, main.py, preferencesdialog.py:
-	Introduce wrapper functions to simplify showing bug reports.
-	[0b5b3a0a0cd8]
-
-2015-03-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* bugdialog.py:
-	Show missing exception details in bug dialog
-	[ce877788c5b9]
-
-2015-03-16  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widget_properties.py:
-	Remove cache for style tooltips
-
-	Without cache widgets can use the same style but with an individual
-	tooltips
-	[265ec9bbee3c]
-
-	* widgets/checkbox/checkbox.py, widgets/checkbox/wconfig.py:
-	Add missing style handling for wxCheckbox widgets and fix wrong
-	styles
-
-	The styles weren't adapted after copying from wxCalenderCtrl :-(
-	[015761ac3f22]
-
-	* common.py, edit_sizers/edit_sizers.py, misc.py, template.py,
-	tree.py, widget_properties.py, widgets/ChoicesProperty.py,
-	widgets/MenuTree.py, widgets/grid/grid.py,
-	widgets/notebook/notebook.py, widgets/statusbar/statusbar.py,
-	widgets/toolbar/tool.py:
-	Rename encode_to_xml() to encode_to_unicode(), it returns Unicode
-
-	The function returns Unicode encoded strings and not UTF-8 like the
-	name suggests.
-	[a3cbc301b5b0]
-
-2015-03-13  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/apd.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html,
-	docs/html/ch01s08.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html,
-	docs/html/ch02s09.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html, docs/html/ch04.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/ch06s04.html, docs/html/ch06s05.html,
-	docs/html/ch06s06.html, docs/html/ch06s07.html,
-	docs/html/ch06s08.html, docs/html/ch06s09.html, docs/html/ch07.html,
-	docs/html/ch07s02.html, docs/html/ch07s03.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/pdf/manual.pdf, docs/src/manual.xml:
-	Typo
-	[73b7da91fde0]
-
-2015-03-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, widgets/button/button.py, widgets/checkbox/checkbox.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/radio_button/radio_button.py,
-	widgets/static_text/static_text.py,
-	widgets/toggle_button/toggle_button.py:
-	Fix Designer not displaying buttons two lines correctly (sf bug
-	#169) (grafted from 779fc77bf78a05ace8215a4b4fdeb7ae5af82560)
-	[00e4541a5eab] <WXG-BRANCH-VERSION_0_7_0>
-
-	* errors.py:
-	Remove obsolete exception class
-	[427c7f66c379]
-
-	* NEWS.txt, widgets/button/button.py, widgets/checkbox/checkbox.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/radio_button/radio_button.py,
-	widgets/static_text/static_text.py,
-	widgets/toggle_button/toggle_button.py:
-	Fix Designer not displaying buttons two lines correctly (sf bug
-	#169)
-	[779fc77bf78a]
-
-	* CONTRIBUTING.txt, README.txt, docs/html/apa.html,
-	docs/html/apb.html, docs/html/apc.html, docs/html/apd.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html,
-	docs/html/ch01s08.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html,
-	docs/html/ch02s09.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/ch06s04.html, docs/html/ch06s05.html,
-	docs/html/ch06s06.html, docs/html/ch06s07.html,
-	docs/html/ch06s08.html, docs/html/ch06s09.html, docs/html/ch07.html,
-	docs/html/ch07s02.html, docs/html/ch07s03.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/pdf/manual.pdf, docs/src/manual.xml,
-	errors.py:
-	Update and extend documentation
-	[94f3b97a391b]
-
-2015-02-10  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* CONTRIBUTING.txt, README.txt, docs/ReleaseSteps.txt,
-	install/pyinstaller/wxglade-installer.iss,
-	install/pyinstaller/wxglade.spec, setup.py:
-	Documentation updates
-	[b9b56d3df47c]
-
-2015-02-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py:
-	Fix file extensions update during changing languages
-	[db29a7b10e0d]
-
-	* main.py:
-	Rename two variables in class wxGladeFrame to use speaking names
-
-	Rename frame2 to frame_property and tree_frame to frame_tree
-	[c96faa85eb56]
-
-2015-02-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* setup.py:
-	Use setuptools instead of distutils
-
-	Looks like the parallel installation of setuptools and distutils
-	doesn't work. From my perspective setuptools breaks distutils.
-	Thereby I'm switching to setuptools to prevent strange behaviour.
-	[8c807647e7d2]
-
-2015-02-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/__init__.py, errors.py, tests/__init__.py,
-	tests/casefiles/bug167.cpp, tests/casefiles/bug167.h,
-	tests/casefiles/bug167.lisp, tests/casefiles/bug167.pl,
-	tests/casefiles/bug167.py, tests/casefiles/bug167.wxg,
-	tests/casefiles/bug167.xrc, tests/casefiles/bug167_utf8.cpp,
-	tests/casefiles/bug167_utf8.h, tests/casefiles/bug167_utf8.lisp,
-	tests/casefiles/bug167_utf8.pl, tests/casefiles/bug167_utf8.py,
-	tests/casefiles/bug167_utf8.wxg, tests/casefiles/bug167_utf8.xrc,
-	tests/casefiles/file_encodings.txt, tests/test_bugs.py:
-	Fix Unicode error during update of an existing source file (sf bug
-	#167)
-
-	Convert file content internally to Unicode always.
-
-	Thereby:
-	 - Store generated source files in the selected encoding
-	 - Read source files will be converted to Unicode also
-	[8f795494349c]
-
-2015-01-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/__init__.py, tests/casefiles/file_encodings.txt:
-	Read encoding of test case files from a file instead of hard-coded
-	encodings
-
-	The encodings are stored in tests/casefiles/file_encodings.txt
-	[d7c6e05750c0]
-
-2015-01-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/__init__.py:
-	Use a decorator to load test files from case file directory
-
-	Previously test cases used an own function to load the files. Those
-	function replaced the original implementation dynamically during the
-	tests run. Now the decorator adapts the filenames only and the tests
-	tests the real implementation.
-	[40c28ba6b7cb]
-
-2015-01-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_bugs.py:
-	Remove obsolete import
-	[bf89d00c971f]
-
-2015-01-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt:
-	Update NEWS.txt
-	[d3a0c45e6237]
-
-	* xml_parse.py:
-	Don't ignore disabled gettext support (Thanks to Udi Fuchs) (grafted
-	from 463bc8c718b5e00f3c7fa214ec75975ab9d36d0b)
-	[26808eb4a3a8] <WXG-BRANCH-VERSION_0_7_0>
-
-	* xml_parse.py:
-	Don't ignore disabled gettext support (Thanks to Udi Fuchs)
-	[463bc8c718b5]
-
-2015-01-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	Improve wording
-	[2589c129a475]
-
-	* tests/casefiles/bug165.cpp, tests/casefiles/bug165.h,
-	tests/casefiles/bug165.lisp, tests/casefiles/bug165.pl,
-	tests/casefiles/bug165.py, tests/casefiles/bug165.wxg,
-	tests/casefiles/bug165.xrc, tests/test_bugs.py,
-	wcodegen/__init__.py:
-	Fix error during preview of classed with custom names (sf bug #165)
-
-	Two assert statements were misplaced and are removed now. (grafted
-	from f9410889529c84ef5121b11631ac39ce4368aa35)
-	[7192ec5074ca] <WXG-BRANCH-VERSION_0_7_0>
-
-	* NEWS.txt, tests/casefiles/bug165.cpp, tests/casefiles/bug165.h,
-	tests/casefiles/bug165.lisp, tests/casefiles/bug165.pl,
-	tests/casefiles/bug165.py, tests/casefiles/bug165.wxg,
-	tests/casefiles/bug165.xrc, tests/test_bugs.py,
-	wcodegen/__init__.py:
-	Fix error during preview of classed with custom names (sf bug #165)
-
-	Two assert statements were misplaced and are removed now.
-	[f9410889529c]
-
-2015-01-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* bugdialog.py, log.py, main.py:
-	Rework handling of bug dialog
-
-	Rework the change "Show logged exceptions in wxGlade bug dialog"
-	(1602:c6724cad00a3) because the locking doesn't work always fine.
-	[f892a6c32a54]
-
-2015-01-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py:
-	Remove obsolete import
-	[628a68b24cb3]
-
-2014-12-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Makefile:
-	Remove automatically generated directory wxGlade.egg-info within
-	clean rule (grafted from fef9307f37a48e79260ff603e09e670f416628eb)
-	[3c6f483a8f8a] <WXG-BRANCH-VERSION_0_7_0>
-
-	* setup.py:
-	Add a workaround for a probable bug in setuptools
-
-	The sdist command failed with a "TypeError: dist must be a
-	Distribution instance" exception. This is probably caused by a
-	setuptools-monkeypatched Extension/Distribution class.
-
-	Workaround: import setuptools first if setuptools are installed
-
-	Bug details: http://bugs.python.org/issue23102 (grafted from
-	cd4db92a5b1e2bc7bed5e33d7cdb799d613343f6)
-	[9688fd1b9851] <WXG-BRANCH-VERSION_0_7_0>
-
-	* setup.py:
-	Take over handling icons as data files from Debian package
-	[5082bfa2bb89]
-
-2014-12-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Makefile:
-	Remove automatically generated directory wxGlade.egg-info within
-	clean rule
-	[fef9307f37a4]
-
-	* setup.py:
-	Add a workaround for a probable bug in setuptools
-
-	The sdist command failed with a "TypeError: dist must be a
-	Distribution instance" exception. This is probably caused by a
-	setuptools-monkeypatched Extension/Distribution class.
-
-	Workaround: import setuptools first if setuptools are installed
-
-	Bug details: http://bugs.python.org/issue23102
-	[cd4db92a5b1e]
-
-	* application.py, common.py, edit_windows.py, misc.py:
-	Hardening importing and showing preview widgets
-
-	The old code didn't handles failed imports very well. The new code
-	has more checks and prevent subsequent error. (grafted from
-	049de2845adc74bfdc97564e61c34fd9f1dbe205)
-	[07d9c6af801f] <WXG-BRANCH-VERSION_0_7_0>
-
-	* main.py, tests/__init__.py, tests/casefiles/import_test.wxg,
-	tests/test_codegen.py, tests/test_gui.py, tree.py, xrc2wxg.py:
-	Use and enforce unicode in internal file-like objects for wxg and
-	xrc files. (grafted from b0898ab090551f54b771ccd2c0c600463292afdb)
-	[a006ef8a1efa] <WXG-BRANCH-VERSION_0_7_0>
-
-2014-12-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* bugdialog.py, tests/__init__.py:
-	Disable bug dialog if unittests are running
-	[e7b5822eb51a]
-
-2014-12-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_windows.py, tests/test_gui.py:
-	Another fix incorrect handling of styles (grafted from
-	f4955614617dc5d0e4cf6ba9442ba5fa5e9135e0)
-	[942d4687a558] <WXG-BRANCH-VERSION_0_7_0>
-
-	* tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/no_supported_flags.cpp,
-	tests/casefiles/no_supported_flags.h,
-	tests/casefiles/no_supported_flags.lisp,
-	tests/casefiles/no_supported_flags.pl,
-	tests/casefiles/no_supported_flags.py,
-	tests/casefiles/no_supported_flags.wxg,
-	tests/casefiles/no_supported_flags.xrc, tests/test_codegen.py,
-	wcodegen/__init__.py, widgets/bitmap_button/codegen.py,
-	widgets/notebook/codegen.py, widgets/notebook/lisp_codegen.py,
-	widgets/notebook/perl_codegen.py, widgets/notebook/wconfig.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/splitter_window/wconfig.py:
-	Unify code used to format styles (grafted from
-	cc0753997b7e3374a05692fe1781430b5f9c892b)
-	[0363afe10fc5] <WXG-BRANCH-VERSION_0_7_0>
-
-	* widgets/toolbar/wconfig.py:
-	Update style attributes for wxToolBar (grafted from
-	79b429b586e02864d64a56f2f7d236a3bab5a960)
-	[7d0a7cd5e421] <WXG-BRANCH-VERSION_0_7_0>
-
-	* common.py:
-	Clarify log message (grafted from
-	37b97aca47d1f908817f6409aa2c1b137073ba67)
-	[9340b217d6ec] <WXG-BRANCH-VERSION_0_7_0>
-
-	* tests/test_codegen.py, wcodegen/mixins.py:
-	Fix incorrect handling of styles only supported by a specific wx
-	version (grafted from 97bf9909dc2a911521a4a231842db842fcd3d39b)
-	[b067eba71a38] <WXG-BRANCH-VERSION_0_7_0>
-
-	* common.py:
-	Clarify 'supported_by' documentation (grafted from
-	8ae3cb6db217dd65f1edd70d0b92425538c5b0af)
-	[6ba172a34ebb] <WXG-BRANCH-VERSION_0_7_0>
-
-	* misc.py:
-	Change title of design window to match schema used by property
-	window (grafted from 7b35936d2b3404247b3922b32929198606e3bc80)
-	[5041ba13b610] <WXG-BRANCH-VERSION_0_7_0>
-
-	* misc.py:
-	Change title of design window to match schema used by property
-	window (grafted from ebfde85ee859deffd4978ef1ee8b3662fb12fbbb)
-	[ac41b556de1c] <WXG-BRANCH-VERSION_0_7_0>
-
-	* edit_windows.py, tests/test_gui.py:
-	Another fix incorrect handling of styles
-	[f4955614617d]
-
-2014-12-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/no_supported_flags.cpp,
-	tests/casefiles/no_supported_flags.h,
-	tests/casefiles/no_supported_flags.lisp,
-	tests/casefiles/no_supported_flags.pl,
-	tests/casefiles/no_supported_flags.py,
-	tests/casefiles/no_supported_flags.wxg,
-	tests/casefiles/no_supported_flags.xrc, tests/test_codegen.py,
-	wcodegen/__init__.py, widgets/bitmap_button/codegen.py,
-	widgets/notebook/codegen.py, widgets/notebook/lisp_codegen.py,
-	widgets/notebook/perl_codegen.py, widgets/notebook/wconfig.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/splitter_window/wconfig.py:
-	Unify code used to format styles
-	[cc0753997b7e]
-
-	* widgets/toolbar/wconfig.py:
-	Update style attributes for wxToolBar
-	[79b429b586e0]
-
-2014-12-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt:
-	Add new changes
-	[8e163ed24b65]
-
-	* bugdialog.py, main.py:
-	Show logged exceptions in wxGlade bug dialog
-	[c6724cad00a3]
-
-2014-12-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	Clarify log message
-	[37b97aca47d1]
-
-	* bugdialog.py, main.py:
-	Show bugdialog for unhandled exception in wxGlade GUI
-	[1ac725293df6]
-
-	* log.py:
-	Simplify installation and deinstallation of the exception handler
-	[fb072b468f56]
-
-2014-11-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_codegen.py, wcodegen/mixins.py:
-	Fix incorrect handling of styles only supported by a specific wx
-	version
-	[97bf9909dc2a]
-
-2014-11-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	Clarify 'supported_by' documentation
-	[8ae3cb6db217]
-
-2014-11-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* install/pyinstaller/build.bat:
-	Show a status message after PyInstaller has run.
-	[0bc3a53f95a0]
-
-	* misc.py:
-	Change title of design window to match schema used by property
-	window
-	[7b35936d2b34]
-
-	* misc.py:
-	Change title of design window to match schema used by property
-	window
-	[ebfde85ee859]
-
-2014-11-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py:
-	Improve statusbar messages for loading from file-like objects
-	(grafted from 851aa3217fa642181c6c6131571be34a46df2e53)
-	[aa7bf8510ab2] <WXG-BRANCH-VERSION_0_7_0>
-
-	* application.py, common.py, edit_windows.py, misc.py:
-	Hardening importing and showing preview widgets
-
-	The old code didn't handles failed imports very well. The new code
-	has more checks and prevent subsequent error.
-	[049de2845adc]
-
-2014-11-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py:
-	Don't hide warnings. The warnings should be shown to fix them.
-	[3fedb337a071]
-
-	* main.py:
-	Improve statusbar messages for loading from file-like objects
-	[851aa3217fa6]
-
-	* NEWS.txt:
-	Update news
-	[f71b66fe14b8]
-
-	* log.py:
-	Add check for existing file logger destination (grafted from
-	4b42b463963ce457f1a87a80ba513e901dd1826e)
-	[9c97d34a9087] <WXG-BRANCH-VERSION_0_7_0>
-
-	* common.py:
-	Update creation config directory (grafted from
-	d12f1c050a77247e1940edbee6941e0da94070ba)
-	[ca6448d6903c] <WXG-BRANCH-VERSION_0_7_0>
-
-	* main.py:
-	Abbreviate statusbar messages (grafted from
-	fd81debe6d57c84ca0b1cdaa5bba4ec2d00ddbb1)
-	[d3ca70d95cf7] <WXG-BRANCH-VERSION_0_7_0>
-
-	* log.py:
-	Add check for existing file logger destination
-	[4b42b463963c]
-
-	* common.py:
-	Update creation config directory
-	[d12f1c050a77]
-
-	* main.py:
-	Abbreviate statusbar messages
-	[fd81debe6d57]
-
-2014-11-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py, tests/__init__.py, tests/casefiles/import_test.wxg,
-	tests/test_codegen.py, tests/test_gui.py, tree.py, xrc2wxg.py:
-	Use and enforce unicode in internal file-like objects for wxg and
-	xrc files.
-	[b0898ab09055]
-
-2014-11-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, tree.py:
-	More docstrings and minor code cosmetics
-	[c2fdcccbbb0c]
-
-2014-11-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, edit_windows.py:
-	Typos
-	[ecb43f6aa7c8]
-
-	* about.py, common.py, main.py:
-	Improve handling of UTF-8 encoded files especially wxg files.
-	[3135bd07aa8d]
-
-	* Makefile:
-	Remove autosave files within clean rule too
-	[ac650f4e3038]
-
-	* common.py:
-	Write autosave file in UTF-8
-	[3fb3942ec9a8]
-
-2014-11-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py:
-	Use UTF-8 encoded XML to generate source code
-
-	The old change used XML encoded with the selected source file
-	encoding, but the encoding wasn't mentioned. This caused ugly bugs.
-
-	Now the encoding isn't still mentioned - but wxGlade used the XML
-	default UTF-8. (grafted from
-	5e35b67e5e3446a7f199bc7b28a02a7f8048c703)
-	[e74a939461c5] <WXG-BRANCH-VERSION_0_7_0>
-
-	* main.py:
-	Fix swapping property and tree windows at every wxGlade startup
-	(grafted from 549deffea9f2076903cd178900eccaa835b19b9b)
-	[100e9d2a641e] <WXG-BRANCH-VERSION_0_7_0>
-
-	* application.py:
-	Use UTF-8 encoded XML to generate source code
-
-	The old change used XML encoded with the selected source file
-	encoding, but the encoding wasn't mentioned. This caused ugly bugs.
-
-	Now the encoding isn't still mentioned - but wxGlade used the XML
-	default UTF-8.
-	[5e35b67e5e34]
-
-	* main.py:
-	Fix swapping property and tree windows at every wxGlade startup
-	[549deffea9f2]
-
-2014-10-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt:
-	Add new changes
-	[4453b2ef0710]
-
-	* config.py:
-	Interims fix for handling the version file RELEASE-VERSION
-	[0af6e6d870b1] <WXG-BRANCH-VERSION_0_7_0>
-
-	* common.py, main.py, misc.py:
-	Open wxGlade windows in the upper left corner if wxGlade is starting
-	the first time (grafted from
-	37c252ed8fda2599de2474a431641fa028dda36a)
-	[5d8f3712eec9] <WXG-BRANCH-VERSION_0_7_0>
-
-	* common.py:
-	Decode Unicode written to wxg files later to prevent
-	UnicodeDecodeErrors (grafted from
-	27becaef20951d9a7164e647996d481f0464d56d)
-	[1e46478a0d54] <WXG-BRANCH-VERSION_0_7_0>
-
-	* common.py, main.py, misc.py:
-	Open wxGlade windows in the upper left corner if wxGlade is starting
-	the first time
-	[37c252ed8fda]
-
-	* config.py:
-	Minor docstring format update
-	[49b3b7173c6c]
-
-2014-10-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	Decode Unicode written to wxg files later to prevent
-	UnicodeDecodeErrors
-	[27becaef2095]
-
-2014-10-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* bugdialog_ui.py, main.py, templates_ui.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/dialog/dialog.py,
-	widgets/frame/frame.py, widgets/static_bitmap/static_bitmap.py:
-	Replace old styles (wx .6) by new styles (wx2.8 and wx3.0) (grafted
-	from 79cd1f59effc41f7288b7f07bf83a4abf186f4e7)
-	[db7b99d8e5e7] <WXG-BRANCH-VERSION_0_7_0>
-
-	* bugdialog_ui.py, main.py, templates_ui.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/dialog/dialog.py,
-	widgets/frame/frame.py, widgets/static_bitmap/static_bitmap.py:
-	Replace old styles (wx .6) by new styles (wx2.8 and wx3.0)
-	[79cd1f59effc]
-
-	* RELEASE-VERSION:
-	Adding RELEASE-VERSION file
-	[81698e054674] <WXG-BRANCH-VERSION_0_7_0>
-
-2014-10-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Closed WXG-BRANCH-VERSION_0_6_8 branch
-	[66d09153246b] <WXG-BRANCH-VERSION_0_6_8>
-
-	* common.py:
-	Create missing application data directory
-
-	Otherwise log initialisation will failed with an IOError "No such
-	file or directory"
-	[4c3c49e4cf61] <WXG-BRANCH-VERSION_0_7_0>
-
-	* wxglade.py:
-	Show version in wxglade CLI output too
-	[25263ed45bd2] <WXG-BRANCH-VERSION_0_7_0>
-
-	* common.py:
-	Create missing application data directory
-
-	Otherwise log initialisation will failed with an IOError "No such
-	file or directory"
-	[3b0c9705b793]
-
-	* wxglade.py:
-	Show version in wxglade CLI output too
-	[01431279a7b5]
-
-2014-10-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, install/pyinstaller/wxglade-installer.iss:
-	Start new development cycle
-	[e2850c84f9ad]
-
-	* Created WXG-BRANCH-VERSION_0_7_0 branch
-	[bb685d8ad2a0] <WXG-BRANCH-VERSION_0_7_0>
-
-	* .hgtags:
-	Added tag rel_0.7.0 for changeset 98fb6cee1545
-	[31d71d6218c7]
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Bump version number to 0.7.0
-	[98fb6cee1545] [rel_0.7.0]
-
-	* CHANGES.txt, NEWS.txt, README.txt:
-	Update documentation
-	[8605bcccf3eb]
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Remove technical notes from INNO setup
-	[5ac988366b8e]
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Change directory the SAE installed will placed to
-	[d7128a24050c]
-
-	* install/pyinstaller/wxglade.spec:
-	Remove appdata.xml and wxGlade.desktop from Windows distribution
-	[c30d0781be12]
-
-	* wxglade.py:
-	Remove obsolete wxversion comment
-	[6284e0555c1b]
-
-	* docs/BuildingInstaller.txt, docs/ReleaseSteps.txt,
-	install/pyinstaller/build.bat, install/pyinstaller/hook-main.py,
-	install/pyinstaller/hooks/hook-main.py, install/pyinstaller/wxglade-
-	installer.iss, install/pyinstaller/wxglade.spec:
-	Update Windows installation procedure after upgrading to Pyinstaller
-	2.1
-	[a53efb9ac8f3]
-
-	* credits.txt:
-	Update developers
-	[4dc155ba93f6]
-
-	* setup.py:
-	Update classification of the programming language
-	[d72fe7f9f6fd]
-
-2014-10-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Merge documenation
-	[f37bd738d687]
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/apc.html,
-	docs/html/apd.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html,
-	docs/html/ch01s07.html, docs/html/ch01s08.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html,
-	docs/html/ch02s06.html, docs/html/ch02s07.html,
-	docs/html/ch02s08.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html, docs/html/ch04.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/ch06s04.html, docs/html/ch06s05.html,
-	docs/html/ch06s06.html, docs/html/ch06s07.html,
-	docs/html/ch06s08.html, docs/html/ch06s09.html, docs/html/ch07.html,
-	docs/html/ch07s02.html, docs/html/ch07s03.html,
-	docs/html/index.html, docs/html/label_menu.png, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/properties_menu_editor.png,
-	docs/html/properties_toolbar_editor.png,
-	docs/html/properties_window_application.png,
-	docs/html/properties_window_settings.png,
-	docs/html/properties_window_statusbar.png, docs/html/sizer_menu.png,
-	docs/html/tree_window.png, docs/pdf/manual.pdf,
-	docs/src/label_menu.png, docs/src/manual.xml,
-	docs/src/properties_menu_editor.png,
-	docs/src/properties_toolbar_editor.png,
-	docs/src/properties_window_application.png,
-	docs/src/properties_window_settings.png,
-	docs/src/properties_window_statusbar.png, docs/src/sizer_menu.png,
-	docs/src/tree_window.png:
-	Update and extend documentation
-	[b15e740febca]
-
-	* tree.py, xml_parse.py:
-	Rename codegen_opt into multiple_files for clarification
-	[13ac79fec9a8]
-
-	* docs/src/manual.xml, docs/tech_notes.txt:
-	Migrate technical notes into manual
-	[1020317882ce]
-
-	* setup.py, wxglade.py:
-	Add myself to license statements
-	[96433fd01af9]
-
-	* setup.py:
-	Adapt software classification
-	[3a501524ac89]
-
-	* application.py:
-	Set proper output path at GUI startup
-	[2aee28624b44]
-
-	* application.py:
-	Rename codegen_opt into multiple_files for clarification
-	[4970f3edc9a4]
-
-2014-10-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, codegen/__init__.py, codegen/cpp_codegen.py,
-	edit_sizers/edit_sizers.py, edit_windows.py, main.py:
-	Use raw strings if strings contains backslashes
-	[845fe7309162]
-
-	* about.py, application.py, clipboard.py, codegen/__init__.py,
-	codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/perl_codegen.py, codegen/py_codegen.py, common.py,
-	edit_sizers/edit_sizers.py, edit_windows.py, main.py, misc.py,
-	preferences_ui.py, res/preferences_ui.wxg, tree.py,
-	widget_properties.py, widgets/dialog/dialog.py,
-	widgets/dialog/perl_codegen.py, widgets/grid/grid.py,
-	widgets/hyperlink_ctrl/wconfig.py, widgets/menubar/menubar.py,
-	widgets/notebook/notebook.py, widgets/panel/panel.py,
-	widgets/splitter_window/splitter_window.py, xml_parse.py:
-	Text improvements and typos
-	[286e6942366a]
-
-	* application.py:
-	Adapt file extensions to changing code generator languages in single
-	file mode
-	[869c8e52ab10]
-
-	* application.py, xml_parse.py:
-	Rename codegen_prop into multiple_files_prop for clarification
-	[287e061155ce]
-
-	* application.py, xml_parse.py:
-	Improve setting the code generator language
-	[f86d3947e305]
-
-2014-10-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/perl_codegen.py, codegen/py_codegen.py,
-	wcodegen/__init__.py:
-	Escape linebreak and tab characters in doc strings
-	[da23edfa913d]
-
-	* application.py:
-	Minor code reorg
-	[fa5315eee8f8]
-
-	* log.py:
-	Show locale settings in printed or logged exceptions
-	[8c91455a545c]
-
-	* common.py, wcodegen/__init__.py, widgets/choice/codegen.py,
-	widgets/choice/lisp_codegen.py, widgets/choice/perl_codegen.py,
-	widgets/combo_box/codegen.py, widgets/combo_box/lisp_codegen.py,
-	widgets/combo_box/perl_codegen.py, widgets/combo_box/wconfig.py,
-	widgets/gauge/codegen.py, widgets/gauge/lisp_codegen.py,
-	widgets/gauge/perl_codegen.py, widgets/gauge/wconfig.py,
-	widgets/list_box/codegen.py, widgets/list_box/lisp_codegen.py,
-	widgets/list_box/perl_codegen.py, widgets/list_ctrl/codegen.py,
-	widgets/list_ctrl/lisp_codegen.py,
-	widgets/list_ctrl/perl_codegen.py, widgets/list_ctrl/wconfig.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/lisp_codegen.py,
-	widgets/radio_box/perl_codegen.py, widgets/slider/codegen.py,
-	widgets/slider/lisp_codegen.py, widgets/slider/perl_codegen.py,
-	widgets/slider/wconfig.py, widgets/spin_button/codegen.py,
-	widgets/spin_button/lisp_codegen.py,
-	widgets/spin_button/perl_codegen.py, widgets/spin_button/wconfig.py,
-	widgets/spin_ctrl/codegen.py, widgets/spin_ctrl/lisp_codegen.py,
-	widgets/spin_ctrl/perl_codegen.py, widgets/spin_ctrl/wconfig.py,
-	widgets/static_line/codegen.py, widgets/static_line/lisp_codegen.py,
-	widgets/static_line/perl_codegen.py, widgets/static_line/wconfig.py,
-	widgets/tree_ctrl/codegen.py, widgets/tree_ctrl/lisp_codegen.py,
-	widgets/tree_ctrl/perl_codegen.py, widgets/tree_ctrl/wconfig.py:
-	Move default_style to widget config dict and recognise choices
-	automatically
-	[50281f66b867]
-
-2014-10-22  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/__init__.py, codegen/perl_codegen.py,
-	codegen/py_codegen.py, tests/test_codegen.py:
-	Fix incomplete Unicode escaping
-
-	The unicode range 0x80-0xFF (Latin-1 Supplement - also called C1
-	Controls and Latin-1 Supplement) wasn't escaped yet. Thereby the
-	returned string was not pure ascii. This commit manually converts
-	the remaining unicode characters.
-	[20ccdcc44a7e]
-
-	* NEWS.txt:
-	Short update to reflect already committed changes
-	[2287be298892]
-
-	* application.py:
-	Add a deprecation notice to the in place modification feature.
-
-	wxGlade can change code inside existing source files to reflect
-	changed designs. This feature is deprecated now und will be removed
-	within the next releases.
-	[686462f2fecf]
-
-2014-10-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Closed DEV_UNICODE branch
-	[291d010e653f] <DEV_UNICODE>
-
-	* install/pyinstaller/wxglade.spec:
-	Include RELEASE-VERSION into files/dirs generated by PyInstaller
-	[65a1092d9906]
-
-2014-10-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/py_codegen.py, common.py, tests/__init__.py,
-	tests/test_codegen.py:
-	Fix wrong decoding of strings in function to quote/escape Python
-	strings
-
-	The input parameter s is a string encoded with self.app_encoding.
-	Decoding with 'utf8' works for pure ascii strings only. Latin1
-	string with umlauts have failed.
-	[29e695522d81]
-
-2014-10-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* misc.py, widgets/button/button.py, widgets/choice/choice.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/list_box/list_box.py, widgets/menubar/menubar.py,
-	widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py,
-	widgets/static_text/static_text.py,
-	widgets/toggle_button/toggle_button.py:
-	Remove alias misc.encode
-	[8e277e979210]
-
-	* widget_properties.py:
-	Add missing docstring
-	[048d796d6c69]
-
-2014-10-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxGlade.desktop:
-	Add desktop entry file
-	[8f8145bde793]
-
-	* appdata.xml, docs/ReleaseSteps.txt,
-	install/pyinstaller/wxglade.spec, setup.py:
-	Add short application description via appdata.xml file
-	[2a44b7e947e6]
-
-	* codegen/cpp_codegen.py, misc.py:
-	Introduce an wrapper class for StringIO to enforce ASCII content.
-	[25e9a84e7118]
-
-	* application.py, misc.py:
-	Rename StringIO wrapper misc.EncStringIO() to misc.UnicodeStringIO()
-
-	The wrapper class enforces the conversion to Unicode always.
-	[ae11e42af74f]
-
-	* codegen/perl_codegen.py, tests/casefiles/ComplexExample_30.pl:
-	Change Perl tooltip statement for wx3 from SetToolTipString() to
-	SetToolTip()
-	[a10b60c1aac8]
-
-	* codegen/__init__.py, codegen/py_codegen.py:
-	Adapt naming schema for code statements to schema used with styles
-
-	Example: 'tooltip_3X' -> 'tooltip_3'
-	[1401ffbc36fe]
-
-	* common.py:
-	Rename wxALIGN_CENTRE* to wxALIGN_CENTER* during code generation
-	[c66c45031a9a]
-
-	* codegen/xrc_codegen.py:
-	Don't inject cn_f() into XrcObject, it's used from the StylesMixin
-	now.
-	[02121ac02d2a]
-
-	* codegen/xrc_codegen.py:
-	Fix wrong formatted string statement
-	[6060ffdde0ca]
-
-	* common.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/Sizers_classattr.cpp,
-	tests/casefiles/Sizers_classattr.lisp,
-	tests/casefiles/Sizers_classattr.pl,
-	tests/casefiles/Sizers_classattr.py,
-	tests/casefiles/Sizers_classattr.xrc,
-	tests/casefiles/Sizers_no_classattr.cpp,
-	tests/casefiles/Sizers_no_classattr.lisp,
-	tests/casefiles/Sizers_no_classattr.pl,
-	tests/casefiles/Sizers_no_classattr.py,
-	tests/casefiles/Sizers_no_classattr.xrc, tests/test_codegen.py,
-	wcodegen/__init__.py, wcodegen/mixins.py, xml_parse.py:
-	Separate styles related code
-
-	The resulting StylesMixin can be used within the widget writer
-	structure as well as the code generator structure later. This commit
-	fixes a bug in handling combined styles too.
-	[5537cf7b7f99]
-
-	* xml_parse.py:
-	Rework xml_parse.Sizeritem() to use style names instead of values
-	partially
-	[3148cc28c63d]
-
-	* edit_sizers/edit_sizers.py, edit_windows.py, tests/test_gui.py,
-	wcodegen/__init__.py, widgets/bitmap_button/bitmap_button.py,
-	widgets/button/button.py, widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/combo_box/combo_box.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/gauge/gauge.py, widgets/grid/grid.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/list_box/list_box.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/notebook/notebook.py, widgets/panel/panel.py,
-	widgets/radio_button/radio_button.py, widgets/slider/slider.py,
-	widgets/spacer/spacer.py, widgets/spin_button/spin_button.py,
-	widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/static_line.py,
-	widgets/static_text/static_text.py, widgets/statusbar/statusbar.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toolbar/toolbar.py,
-	widgets/tree_ctrl/tree_ctrl.py:
-	Rename StylesMixin in EditStylesMixin
-	[5e409245d2a2]
-
-2014-10-17  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wcodegen/__init__.py:
-	Remove unused parameter in cn_f()
-	[b355b943acbf]
-
-	* codegen/xrc_codegen.py, tests/casefiles/AllWidgets_28.xrc,
-	tests/casefiles/ComplexExample.xrc,
-	tests/casefiles/ComplexExample_30.xrc,
-	tests/casefiles/Format_flags.wxg, tests/casefiles/Format_flags.xrc,
-	tests/casefiles/Sizers_classattr.xrc,
-	tests/casefiles/Sizers_no_classattr.xrc, tests/test_codegen.py,
-	wcodegen/__init__.py, widgets/toolbar/codegen.py:
-	Rework formatting flags for XRC code
-	[5412db02dcb4]
-
-2014-10-15  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/static_bitmap/static_bitmap.py:
-	Typo
-	[fa1e3247a8ab]
-
-	* wcodegen/__init__.py:
-	Add debug message for processing flags (cn_f())
-	[cf6c240b6ca9]
-
-	* log.py:
-	Fix writing debug() messages to the log file
-	[aea715990cba]
-
-2014-10-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/Statusbar_wo_labels.cpp,
-	tests/casefiles/Statusbar_wo_labels.h,
-	tests/casefiles/Statusbar_wo_labels.lisp,
-	tests/casefiles/Statusbar_wo_labels.pl,
-	tests/casefiles/Statusbar_wo_labels.py,
-	tests/casefiles/Statusbar_wo_labels.wxg,
-	tests/casefiles/Statusbar_wo_labels.xrc, tests/test_codegen.py,
-	widgets/statusbar/codegen.py, widgets/statusbar/lisp_codegen.py,
-	widgets/statusbar/perl_codegen.py:
-	Don't set wxStatusbar labels if no label have a text
-	[0d923808cf05]
-
-	* config.py:
-	Minor fix for last commit
-	[63b1f9e93b8e]
-
-2014-10-13  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, config.py, docs/BuildingInstaller.txt,
-	docs/ReleaseSteps.txt, setup.py, wxglade.py:
-	Change internal handling of the version number and introduce
-	RELEASE-VERSION
-
-	The version number will determinate in three steps: 1. read from
-	release file 2. Queried from local hg repo 3. Set to "not found"
-	[f73c8b74a30d]
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Add statusbar widget to Windows installer file
-	[d89ece760839]
-
-	* codegen/perl_codegen.py, tests/casefiles/AllWidgets_28.pl,
-	tests/casefiles/CalendarCtrl.pl, tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample_30.pl, tests/casefiles/FontColour.pl,
-	tests/casefiles/Gauge.pl, tests/casefiles/Grid.pl,
-	tests/casefiles/HyperlinkCtrl_28.pl,
-	tests/casefiles/Perl_Preferences.pl,
-	tests/casefiles/PlAddApp_multi_detailed.pl,
-	tests/casefiles/PlAddApp_multi_gettext_detailed.pl,
-	tests/casefiles/PlAddApp_multi_gettext_simple.pl,
-	tests/casefiles/PlAddApp_multi_simple.pl, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg2_MyDialog.pm,
-	tests/casefiles/PlOgg2_MyFrame.pm, tests/casefiles/PlOgg2_app.pl,
-	tests/casefiles/PlOgg3.pl, tests/casefiles/Sizers_classattr.pl,
-	tests/casefiles/Sizers_no_classattr.pl,
-	tests/casefiles/add_class_inplace_extended.pl,
-	tests/casefiles/add_class_inplace_orig.pl,
-	tests/casefiles/bug163.pl, tests/casefiles/no_suitable_writer.pl,
-	tests/casefiles/remove_class_inplace_expected.pl,
-	tests/casefiles/remove_class_inplace_input.pl, tests/casefiles
-	/styleless-dialog.pl:
-	Update wxPerl homepage URL
-	[3750f1b57bec]
-
-	* misc.py:
-	Typo
-	[394c825b3556]
-
-	* configUI.py, configdialog.py, main.py, preferences_ui.py,
-	preferencesdialog.py, res/preferences.wxg, res/preferences_ui.wxg:
-	Rename configdialog into preferencesdialog to have consistent naming
-	schema
-	[99ace2652874]
-
-	* tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc:
-	Minor changes in all widgets test case
-	[c1d4ec279e8e]
-
-	* tests/casefiles/AllWidgets_28.cpp, widgets/radio_box/codegen.py:
-	Set majorDimension to 1 if choice is empty for C++ and wxRadiobox
-
-	wx raises an assertion if choices are empty and majorDim is 0
-	(default)
-	[d43658de1381]
-
-2014-10-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widget_properties.py:
-	Add caching for tooltips
-	[6ee5f55e98ed]
-
-	* xml_parse.py:
-	Fix comparing version number introduced with last commit
-	[b0eccb84d4b8]
-
-	* codegen/__init__.py, config.py, xml_parse.py:
-	Show warning if loading projects for wx2.6 or with old python
-	imports
-	[f080397cd59a]
-
-	* config.py:
-	Rework specified types in docstrings
-	[db81f7fc1f17]
-
-2014-10-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.pl, tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample_30.pl,
-	tests/casefiles/Perl_Preferences.pl, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg2_MyDialog.pm, tests/casefiles/PlOgg3.pl,
-	widgets/menubar/perl_codegen.py, widgets/panel/perl_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/toolbar/perl_codegen.py, wxglade.py:
-	Don't generate "wxDefaultPosition, wxDefaultSize, );" for Perl
-	[e13688559c77]
-
-	* tests/test_gui.py:
-	Separate setting wxGlade output path to an own function
-	[4e0700718588]
-
-	* tests/test_gui.py:
-	Extract processing of wx events to a separate function
-	[2490b6cab219]
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/perl_codegen.py,
-	codegen/py_codegen.py, edit_sizers/edit_sizers.py, install/update-
-	po.py, tests/__init__.py, tests/test_gui.py, wcodegen/__init__.py,
-	wcodegen/dialogs.py, widgets/bitmap_button/lisp_codegen.py,
-	widgets/custom_widget/custom_widget.py, widgets/dialog/codegen.py,
-	widgets/dialog/dialog.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/menubar/lisp_codegen.py,
-	widgets/menubar/menubar.py, widgets/notebook/notebook.py,
-	widgets/spacer/spacer.py, widgets/statusbar/statusbar.py,
-	widgets/toolbar/toolbar.py:
-	Rework specified types in docstrings and minor code changes
-	[e2ea9baeeecb]
-
-	* application.py, common.py, config.py, edit_windows.py, log.py,
-	main.py, misc.py, ordereddict.py, test.py, tree.py,
-	widget_properties.py, widgets/panel/codegen.py,
-	widgets/panel/lisp_codegen.py, widgets/panel/perl_codegen.py,
-	wxglade.py, xml_parse.py:
-	Add missing layout code generation for wxPanel
-	[13cafd1a4944]
-
-	* widgets/frame/frame.py, widgets/statusbar/statusbar.py:
-	Fix different call syntax of EditStatusBar
-	[bdde7b0a7db9]
-
-2014-10-10  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_gui.py:
-	Adapt GUI test setup to run on 2.8 and 3.0
-	[74c00b2d2ac9]
-
-2014-10-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py:
-	Show an info instead of an error if opening a non-existing last
-	visited file
-	[0049b908a587]
-
-	* application.py, tree.py, wxglade.py:
-	More path normalisation
-	[97a297b4006f]
-
-2014-10-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, codegen/__init__.py:
-	Expand user in output files and directories
-	[ca1cb7d10bb2]
-
-	* wxglade.py:
-	Enable wxPython3 for GUI
-	[1206fd23e176]
-
-	* xml_parse.py:
-	Remove unused import xml.sax.expatreader
-	[503af71a6a47]
-
-	* Closed WXG-BRANCH-VERSION_0_6_8 branch
-	[fbdcbd25b08e] <DEV_GUI_WX30>
-
-	* Makefile, NEWS.txt, about.py, application.py, codegen/__init__.py,
-	codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/perl_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py, common.py, config.py,
-	edit_sizers/sizers_codegen.py, log.py, main.py, setup.py, test.py,
-	tests/__init__.py, tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CPP_wxCalendarCtrl.cpp,
-	tests/casefiles/CPP_wxCalendarCtrl.h,
-	tests/casefiles/CPP_wxCalendarCtrl.wxg,
-	tests/casefiles/CalendarCtrl.pl,
-	tests/casefiles/ComplexExample.lisp, tests/casefiles/Gauge.lisp,
-	tests/casefiles/Gauge.pl, tests/casefiles/Grid.lisp,
-	tests/casefiles/Grid.pl, tests/casefiles/HyperlinkCtrl_26.cpp,
-	tests/casefiles/HyperlinkCtrl_26.h,
-	tests/casefiles/HyperlinkCtrl_26.lisp,
-	tests/casefiles/HyperlinkCtrl_26.pl,
-	tests/casefiles/HyperlinkCtrl_26.py,
-	tests/casefiles/HyperlinkCtrl_26.wxg,
-	tests/casefiles/HyperlinkCtrl_26.xrc, tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg2_MyFrame.lisp,
-	tests/casefiles/LispOgg3.lisp,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Lisp_wxBitmapButton.lisp,
-	tests/casefiles/Perl_Preferences.pl, tests/casefiles/PlOgg3.pl,
-	tests/casefiles/Preferences.wxg,
-	tests/casefiles/PyOgg1_oldnamespace.py,
-	tests/casefiles/Python_Preferences.py,
-	tests/casefiles/Sizers_classattr.lisp,
-	tests/casefiles/Sizers_no_classattr.lisp,
-	tests/casefiles/add_class_inplace_extended.lisp,
-	tests/casefiles/add_class_inplace_orig.lisp,
-	tests/casefiles/bug163.h, tests/casefiles/bug163.lisp,
-	tests/casefiles/bug163.pl,
-	tests/casefiles/remove_class_inplace_expected.lisp,
-	tests/casefiles/remove_class_inplace_input.lisp, tests/casefiles
-	/styleless-dialog.cpp, tests/casefiles/styleless-dialog.lisp,
-	tests/casefiles/styleless-dialog.pl, tests/casefiles/styleless-
-	dialog.py, tests/test_bugs.py, tests/test_codegen.py,
-	wcodegen/__init__.py, widget_properties.py,
-	widgets/custom_widget/codegen.py, widgets/grid/grid.py,
-	widgets/menubar/menubar.py, widgets/panel/__init__.py, wxglade.py,
-	xml_parse.py:
-	merged DEV_GUI_WX30 into default
-	[5e983acdcc76]
-
-2014-10-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/__init__.py:
-	Add option to exclude languages from
-	tests.WXGladeBaseTest._test_all()
-	[da8bb5e52c2f] <DEV_GUI_WX30>
-
-	* application.py, codegen/py_codegen.py, errors.py,
-	tests/test_codegen.py, wxglade.py:
-	Improve disabling old import style for wxPython 3.0
-	[e4264989b3bb] <DEV_GUI_WX30>
-
-	* application.py, codegen/lisp_codegen.py, errors.py,
-	tests/casefiles/ComplexExample_30.lisp, tests/test_codegen.py,
-	wxglade.py, xml_parse.py:
-	Disable Lisp code generation for wxWidgets 3.0
-
-	I've disabled Lisp due lack of testing possibilities for the
-	upcoming release of wxWidgets 3.0.
-	[ad23813a0818] <DEV_GUI_WX30>
-
-	* msgdialog.py, res/messagedialog.wxg:
-	Change "wxGlade Message" dialog to close on pressing enter
-	[99f75deb6b23] <DEV_GUI_WX30>
-
-2014-10-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, common.py, config.py, edit_sizers/edit_sizers.py,
-	layout_option_property.py, misc.py, template.py, tree.py,
-	widget_properties.py, widgets/ChoicesProperty.py,
-	widgets/MenuTree.py, widgets/grid/grid.py,
-	widgets/notebook/notebook.py, widgets/statusbar/statusbar.py,
-	widgets/toolbar/tool.py, xml_parse.py:
-	Minor code reorganisation
-	- rename common._encode_from_xml() to encode_from_xml()
-	- rename common._encode_to_xml() to encode_to_xml()
-	- move widget_properties.label_initial_width to config module
-	[853e6e5689f4] <DEV_GUI_WX30>
-
-	* application.py, codegen/xrc_codegen.py, edit_sizers/edit_sizers.py,
-	edit_windows.py, misc.py, template.py, widget_properties.py,
-	widgets/ChoicesCodeHandler.py, widgets/ChoicesProperty.py,
-	widgets/MenuTree.py, widgets/button/button_stockitems.py,
-	widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py, widgets/frame/codegen.py,
-	widgets/grid/codegen.py, widgets/grid/grid.py,
-	widgets/menubar/codegen.py, widgets/notebook/codegen.py,
-	widgets/notebook/notebook.py, widgets/statusbar/codegen.py,
-	widgets/toolbar/codegen.py, widgets/toolbar/tool.py:
-	Convert old-style classes in new-style classes
-	[c747aca85c28] <DEV_GUI_WX30>
-
-	* widget_properties.py, widgets/combo_box/combo_box.py:
-	Add list of public names to use during wildcard import
-	[737df80a3241] <DEV_GUI_WX30>
-
-	* edit_sizers/edit_sizers.py:
-	Change initialisation of border styles in SizerBase class
-
-	The old version caused an exception during copy / paste sizers.
-	[9d7013fab8a4] <DEV_GUI_WX30>
-
-2014-10-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/splitter_window/splitter_window.py:
-	Add support for wxSplitterWindow.SetMinimumPaneSize()
-	[c5aa6e853de9] <DEV_GUI_WX30>
-
-2014-10-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc:
-	Add wxTextCtrl to wxSpinButton test page
-	[e925c77a0da7] <DEV_GUI_WX30>
-
-	* tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	widgets/bitmap_button/codegen.py, widgets/static_bitmap/codegen.py,
-	wxglade.py:
-	Fix C++ compile error
-
-	The error was caused by using strings instead of wxT() for wxBitmap
-	file names. Old: wxBitmap("icon.xpm", wxBITMAP_TYPE_ANY) New:
-	wxBitmap(wxT("icon.xpm"), wxBITMAP_TYPE_ANY)
-	[f848b22a1ddc] <DEV_GUI_WX30>
-
-	* codegen/cpp_codegen.py,
-	tests/casefiles/CPPAddApp_multi_gettext_detailed.cpp,
-	tests/casefiles/CPPAddApp_multi_gettext_simple.cpp,
-	tests/casefiles/CPPOgg1.h, tests/casefiles/CPPOgg2_MyDialog.h,
-	tests/casefiles/CPPOgg2_MyFrame.h, tests/casefiles/CPPOgg2_main.cpp,
-	tests/casefiles/CPPOgg3.h, tests/casefiles/CPP_Preferences.h,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample_30.h, tests/casefiles/FontColour.h,
-	tests/casefiles/HyperlinkCtrl_28.h,
-	tests/casefiles/Sizers_classattr.h,
-	tests/casefiles/Sizers_no_classattr.h,
-	tests/casefiles/add_class_inplace_extended.h,
-	tests/casefiles/add_class_inplace_orig.h,
-	tests/casefiles/no_suitable_writer.h,
-	tests/casefiles/remove_class_inplace_expected.h,
-	tests/casefiles/remove_class_inplace_input.h, tests/casefiles
-	/styleless-dialog.h:
-	Change inclusion of C++ i18n header file from "wx/intl.h" to
-	<wx/intl.h>
-	[e80c0d089636] <DEV_GUI_WX30>
-
-	* config.py, widget_properties.py:
-	Wrap tooltip lines automatically.
-	[f64346e3a3d7] <DEV_GUI_WX30>
-
-2014-10-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc:
-	Add tests for widget without tests.
-
-	Now all widgets should be tested at least onece.
-	[3c724f259c55] <DEV_GUI_WX30>
-
-	* widgets/slider/perl_codegen.py:
-	Typo in Perl code template for wxSlider
-	[abce48683412] <DEV_GUI_WX30>
-
-	* widgets/splitter_window/splitter_window.py:
-	Use style names instead of style values wxSplitterWindow GUI
-	elements
-	[2d82ea0db4c7] <DEV_GUI_WX30>
-
-	* widget_properties.py:
-	Use the right value to set checkboxes in CheckListProperty.display()
-	[839be9262e98] <DEV_GUI_WX30>
-
-2014-10-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tree.py, widget_properties.py:
-	Changing binding events from wx.EVT*() to widget.Bind()
-
-	This change doesn't affect all occurrences. It was triggered by bug
-	fixing.
-	[ecb86304d026] <DEV_GUI_WX30>
-
-	* codegen/__init__.py, widgets/dialog/wconfig.py,
-	widgets/splitter_window/codegen.py:
-	Various minor bug fixes
-	[d4a79b752324] <DEV_GUI_WX30>
-
-2014-09-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_windows.py, tests/test_gui.py, wcodegen/__init__.py:
-	Improve handling of empty styles ('', None)
-	[95584f0064ae] <DEV_GUI_WX30>
-
-	* widgets/frame/codegen.py, widgets/frame/lisp_codegen.py,
-	widgets/frame/perl_codegen.py:
-	Further cleanup for wx2.6
-	[54bfcc07b1a0] <DEV_GUI_WX30>
-
-2014-09-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, application.py, codegen/py_codegen.py,
-	edit_sizers/edit_sizers.py, edit_windows.py, log.py, setup.py,
-	test.py, tests/casefiles/HyperlinkCtrl_26.cpp,
-	tests/casefiles/HyperlinkCtrl_26.h,
-	tests/casefiles/HyperlinkCtrl_26.lisp,
-	tests/casefiles/HyperlinkCtrl_26.pl,
-	tests/casefiles/HyperlinkCtrl_26.py,
-	tests/casefiles/HyperlinkCtrl_26.wxg,
-	tests/casefiles/HyperlinkCtrl_26.xrc, tests/test_codegen.py,
-	widgets/frame/codegen.py:
-	Remove support for wxPython 2.6
-	[1da6e745ea39] <DEV_GUI_WX30>
-
-	* about.py, application.py, kdefiledialog.py, main.py:
-	Replace old styles (wx .6) by new styles (wx2.8 and wx3.0)
-	[c6cb542d3bfc] <DEV_GUI_WX30>
-
-	* code_property.py, edit_windows.py, layout_option_property.py,
-	tests/test_gui.py, widgets/statusbar/__init__.py:
-	Minor bug fixes introduced during code rework
-	[1e8650cc1a59] <DEV_GUI_WX30>
-
-2014-09-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widget_properties.py, widgets/static_text/static_text.py:
-	Use always wx.lib.stattext.GenStaticText
-	[a229eebb4745] <DEV_GUI_WX30>
-
-	* NEWS.txt, application.py, codegen/py_codegen.py, edit_windows.py,
-	tree.py, widgets/calendar_ctrl/codegen.py, widgets/grid/codegen.py,
-	xml_parse.py:
-	Remove support for old Python import style generally
-	[535a6f5a277b] <DEV_GUI_WX30>
-
-	* wcodegen/__init__.py, widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/lisp_codegen.py,
-	widgets/bitmap_button/perl_codegen.py,
-	widgets/custom_widget/codegen.py,
-	widgets/custom_widget/lisp_codegen.py,
-	widgets/custom_widget/perl_codegen.py,
-	widgets/datepicker_ctrl/codegen.py, widgets/frame/codegen.py,
-	widgets/grid/codegen.py, widgets/grid/lisp_codegen.py,
-	widgets/grid/perl_codegen.py, widgets/menubar/codegen.py,
-	widgets/menubar/lisp_codegen.py, widgets/menubar/perl_codegen.py,
-	widgets/notebook/codegen.py, widgets/notebook/lisp_codegen.py,
-	widgets/notebook/perl_codegen.py, widgets/spin_ctrl/codegen.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/lisp_codegen.py, widgets/toolbar/perl_codegen.py:
-	Rework widget writer to use code generator via class attribute
-	[b44700241add] <DEV_GUI_WX30>
-
-	* msgdialog.py, widgets/custom_widget/custom_widget.py,
-	widgets/list_ctrl/list_ctrl.py, widgets/menubar/menubar.py,
-	widgets/toolbar/toolbar.py, widgets/tree_ctrl/tree_ctrl.py:
-	Replace wxSUNKEN_BORDER into wxBORDER_SUNKEN
-	[6facebbd40d7] <DEV_GUI_WX30>
-
-2014-09-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, common.py, docs/tech_notes.txt,
-	edit_sizers/edit_sizers.py, edit_widget.py, edit_windows.py,
-	events_mixin.py, layout_option_property.py, misc.py,
-	tests/__init__.py, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/test_codegen.py, tests/test_gui.py, wcodegen/__init__.py,
-	wcodegen/dialogs.py, widget_properties.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/lisp_codegen.py,
-	widgets/bitmap_button/perl_codegen.py,
-	widgets/bitmap_button/wconfig.py, widgets/button/button.py,
-	widgets/button/wconfig.py, widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/calendar_ctrl/wconfig.py, widgets/checkbox/checkbox.py,
-	widgets/checkbox/wconfig.py, widgets/choice/choice.py,
-	widgets/combo_box/combo_box.py, widgets/combo_box/wconfig.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/datepicker_ctrl/wconfig.py, widgets/dialog/dialog.py,
-	widgets/dialog/wconfig.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/frame/lisp_codegen.py,
-	widgets/frame/perl_codegen.py, widgets/frame/wconfig.py,
-	widgets/gauge/gauge.py, widgets/gauge/wconfig.py,
-	widgets/grid/grid.py, widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/hyperlink_ctrl/wconfig.py, widgets/list_box/list_box.py,
-	widgets/list_box/wconfig.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/list_ctrl/wconfig.py, widgets/menubar/menubar.py,
-	widgets/notebook/codegen.py, widgets/notebook/lisp_codegen.py,
-	widgets/notebook/notebook.py, widgets/notebook/perl_codegen.py,
-	widgets/notebook/wconfig.py, widgets/panel/codegen.py,
-	widgets/panel/lisp_codegen.py, widgets/panel/panel.py,
-	widgets/panel/perl_codegen.py, widgets/panel/wconfig.py,
-	widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py,
-	widgets/radio_button/wconfig.py, widgets/slider/slider.py,
-	widgets/slider/wconfig.py, widgets/spacer/spacer.py,
-	widgets/spin_button/spin_button.py, widgets/spin_button/wconfig.py,
-	widgets/spin_ctrl/spin_ctrl.py, widgets/spin_ctrl/wconfig.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/splitter_window/wconfig.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_bitmap/wconfig.py,
-	widgets/static_line/static_line.py, widgets/static_line/wconfig.py,
-	widgets/static_text/static_text.py, widgets/static_text/wconfig.py,
-	widgets/statusbar/__init__.py, widgets/statusbar/codegen.py,
-	widgets/statusbar/lisp_codegen.py,
-	widgets/statusbar/perl_codegen.py, widgets/statusbar/statusbar.py,
-	widgets/statusbar/wconfig.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/text_ctrl/wconfig.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/lisp_codegen.py, widgets/toolbar/perl_codegen.py,
-	widgets/toolbar/toolbar.py, widgets/toolbar/wconfig.py,
-	widgets/tree_ctrl/tree_ctrl.py, widgets/tree_ctrl/wconfig.py,
-	widgets/widgets.txt, wxglade.py, xml_parse.py:
-	Rework style handling to use style names.
-
-	Most positions use style names instead of a combination of style
-	names and style values now. This enables wxGlade to handle old (and
-	ancient) styles like wxADJUST_MINSIZE even if underlaying wxPython
-	don't know the styles.
-
-	This change changes allow wxGlade to run on wxPython3 and generate
-	code for wxPython2.8 and reverse later after all styles and
-	attributes are adapted.
-	[903c73d6a86b] <DEV_GUI_WX30>
-
-2014-09-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Minor changes to improve debugging
-	[e312435ddced] <DEV_GUI_WX30>
-
-	* main.py:
-	Improve exception message generated during loading a file
-	[d4367cecd0cc] <DEV_GUI_WX30>
-
-2014-09-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/perl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py,
-	tests/casefiles/PyOgg1_oldnamespace.py, tests/test_codegen.py,
-	wcodegen/__init__.py:
-	Reorg code generation and start removal of old style python imports
-	[0c167cfc2d31] <DEV_GUI_WX30>
-
-2014-09-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Makefile:
-	Change handling of epydoc options in Makefile
-	[3ee5492a129d] <DEV_GUI_WX30>
-
-2014-09-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/xrc_codegen.py,
-	edit_sizers/edit_sizers.py, tests/__init__.py,
-	tests/test_codegen.py, tests/test_gui.py, wcodegen/__init__.py,
-	widgets/panel/panel.py, widgets/static_bitmap/static_bitmap.py:
-	Improve copying instances ...
-	[cf594e9dce9a] <DEV_GUI_WX30>
-
-2014-09-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* clipboard.py, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/xrc_codegen.py, log.py, main.py, misc.py, tests/__init__.py,
-	tests/test_codegen.py, tests/test_gui.py,
-	widgets/custom_widget/codegen.py, xml_parse.py:
-	Replace cStringIO by StringIO because StringIO supports Unicode
-
-	(taken from ff7561dc0004)
-	[b38aa987293f] <DEV_GUI_WX30>
-
-2014-09-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/__init__.py, tests/test_gui.py:
-	Split test initialisation into setUpClass() and setUp()
-	[6d6164dcd29d] <DEV_GUI_WX30>
-
-2014-09-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/perl_codegen.py:
-	Fix bug in generation of valid hash keys for Perl
-	[3c7eee26186c] <DEV_GUI_WX30>
-
-	* codegen/__init__.py, tests/test_codegen.py:
-	Add BaseLangCodeWriter.copy() to create instance copies
-
-	This function should be used to rework styles update in graphical
-	editor
-	[5cd58e863585] <DEV_GUI_WX30>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/perl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py, config.py, main.py:
-	Add more default values used during initialising code generators
-	[769f0f046df4] <DEV_GUI_WX30>
-
-2014-09-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, main.py, wxglade.py:
-	Unite the four steps to initialise code generators
-	[d6dc3728adfa] <DEV_GUI_WX30>
-
-2014-08-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* setup.py:
-	Include wxglade.pyw into release packages
-	[555db48f7457]
-
-	* Makefile:
-	Change manpage XSL
-	[430d94e5a681]
-
-2014-08-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Makefile:
-	Use python2 in Makefile too (grafted from
-	737ac2bfe7ad81b3423f0fde6b9b329d1bdf6098)
-	[039aff30fc1e] <WXG-BRANCH-VERSION_0_6_8>
-
-	* Makefile:
-	Use python2 in Makefile too
-	[737ac2bfe7ad]
-
-	* wxglade.py:
-	Use wxPython 2.8 - only and always
-
-	The GUI isn't wxPython 3.0 ready yet. (grafted from
-	5bbecbbca1c67bd2a2d9c48258b4bbdd7b3b5665)
-	[585b06033e77] <WXG-BRANCH-VERSION_0_6_8>
-
-	* test.py:
-	Use wxPython 2.8 for GUI tests too (grafted from
-	b221e052e9111a99ddb2dbb8743f5b685a3c69cb)
-	[979b019391b5] <WXG-BRANCH-VERSION_0_6_8>
-
-	* wxglade:
-	Use python2 interpreter instead of just python (grafted from
-	081a452ad96441bbba62e494279f75d77710a1b3)
-	[64d3266fa6ce] <WXG-BRANCH-VERSION_0_6_8>
-
-	* test.py, wxglade.py, wxglade.pyw, xrc2wxg.py:
-	Change shebang to start Python2 always.
-
-	That's useful for systems with Python3 as default (grafted from
-	b01e80fc1fe3bb873afa1e9e7f3c1d4e95a653be)
-	[539eaf1f2420] <WXG-BRANCH-VERSION_0_6_8>
-
-2014-08-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/py_codegen.py, common.py,
-	edit_windows.py, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/CPPOgg1.cpp, tests/casefiles/CPPOgg1.wxg,
-	tests/casefiles/CPPOgg2.wxg, tests/casefiles/CPPOgg2_MyDialog.cpp,
-	tests/casefiles/CPPOgg2_MyDialog.h,
-	tests/casefiles/CPPOgg2_MyFrame.cpp,
-	tests/casefiles/CPPOgg2_MyFrame.h, tests/casefiles/CPPOgg3.cpp,
-	tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CPP_Preferences.h,
-	tests/casefiles/CPP_Preferences.wxg,
-	tests/casefiles/CPP_wxCalendarCtrl.cpp,
-	tests/casefiles/CPP_wxCalendarCtrl.h,
-	tests/casefiles/CPP_wxCalendarCtrl.wxg,
-	tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample_30.cpp,
-	tests/casefiles/ComplexExample_30.lisp,
-	tests/casefiles/ComplexExample_30.pl,
-	tests/casefiles/ComplexExample_30.py, tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg1.wxg, tests/casefiles/LispOgg2.wxg,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg2_MyFrame.lisp,
-	tests/casefiles/LispOgg3.lisp, tests/casefiles/LispOgg3.wxg,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Lisp_Preferences.wxg,
-	tests/casefiles/Notebook_w_tabs.wxg,
-	tests/casefiles/Notebook_wo_tabs.wxg,
-	tests/casefiles/Perl_Preferences.pl,
-	tests/casefiles/Perl_Preferences.wxg, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg1.wxg, tests/casefiles/PlOgg2.wxg,
-	tests/casefiles/PlOgg2_MyDialog.pm,
-	tests/casefiles/PlOgg2_MyFrame.pm, tests/casefiles/PlOgg3.pl,
-	tests/casefiles/Preferences.wxg, tests/casefiles/PyOgg1.py,
-	tests/casefiles/PyOgg1.wxg, tests/casefiles/PyOgg1_oldnamespace.py,
-	tests/casefiles/PyOgg2.wxg, tests/casefiles/PyOgg2_MyDialog.py,
-	tests/casefiles/PyOgg2_MyFrame.py, tests/casefiles/PyOgg2_app.py,
-	tests/casefiles/PyOgg3.py, tests/casefiles/Python_Preferences.py,
-	tests/casefiles/Python_Preferences.wxg,
-	tests/casefiles/Sizers_classattr.cpp,
-	tests/casefiles/Sizers_classattr.lisp,
-	tests/casefiles/Sizers_classattr.pl,
-	tests/casefiles/Sizers_classattr.py,
-	tests/casefiles/Sizers_no_classattr.cpp,
-	tests/casefiles/Sizers_no_classattr.lisp,
-	tests/casefiles/Sizers_no_classattr.pl,
-	tests/casefiles/Sizers_no_classattr.py, tests/casefiles/styleless-
-	dialog.cpp, tests/casefiles/styleless-dialog.py,
-	tests/test_codegen.py, tests/test_gui.py, wcodegen/__init__.py,
-	widgets/dialog/codegen.py, widgets/dialog/wconfig.py,
-	widgets/frame/wconfig.py, widgets/hyperlink_ctrl/config.py,
-	widgets/hyperlink_ctrl/wconfig.py, widgets/notebook/codegen.py,
-	widgets/notebook/lisp_codegen.py, widgets/notebook/notebook.py,
-	widgets/notebook/perl_codegen.py,
-	widgets/splitter_window/wconfig.py:
-	Rework formatting flags
-
-	Now we support:
-	 - removal of duplicate flags
-	 - removal of flags that are part of others flags
-	 - recombine flags from parts e.g. wxALL from
-	wxLEFT+wxRIGHT+wxTOP+wxBOTTOM
-	 - renameing of flags
-	[8e8fb2aa5982] <DEV_GUI_WX30>
-
-2014-08-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_windows.py, tree.py:
-	Use built-in set() instead of sets module
-	[cb7a2d8c7db6] <DEV_GUI_WX30>
-
-	* widgets/notebook/notebook.py:
-	Fix wrong initialisation sequence for graphical notebook editor.
-
-	This bug has been introduced with changeset 1396:fbf87e4590e7 "Unify
-	style handling code in widgets GUI elements"
-	[033dc86a05ec] <DEV_GUI_WX30>
-
-	* log.py:
-	Don't show non-printable values in exception handler
-	[cd2ee3030556]
-
-	* log.py:
-	Merge exception handler from default branch
-	[452acb298e2c] <DEV_GUI_WX30>
-
-2014-08-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_gui.py:
-	Extend error messages in GUI unittests
-	[2d37675babb3] <DEV_GUI_WX30>
-
-2014-08-17  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/perl_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, docs/tech_notes.txt,
-	edit_sizers/__init__.py, edit_sizers/cpp_sizers_codegen.py,
-	edit_sizers/edit_sizers.py, edit_sizers/py_sizers_codegen.py,
-	edit_sizers/sizers_codegen.py, edit_sizers/xrc_sizers_codegen.py,
-	tests/test_codegen.py, wcodegen/__init__.py:
-	Unify code writer and widget initialisation sequence
-
-	This commit changes the initialisation sequence to 0) load widget
-	configuation (already implemented in 1421:6167430196c8) 1) load and
-	initialise language code writer 2) load and initialise widget code
-	writer 3) load and initialise sizer
-
-	Earlier the steps 1), 2) and 3) was merged for Perl and Lisp but not
-	for Python, C++ and XRC.
-
-	Now the sequence is the same for all languages.
-	[1892694b1b59] <DEV_GUI_WX30>
-
-2014-08-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, common.py, edit_windows.py, main.py, misc.py,
-	tests/casefiles/HyperlinkCtrl_26.cpp,
-	tests/casefiles/HyperlinkCtrl_26.lisp,
-	tests/casefiles/HyperlinkCtrl_26.pl,
-	tests/casefiles/HyperlinkCtrl_26.py, tests/test_codegen.py,
-	wcodegen/__init__.py, widgets/hyperlink_ctrl/codegen.py,
-	widgets/hyperlink_ctrl/config.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/hyperlink_ctrl/lisp_codegen.py,
-	widgets/hyperlink_ctrl/perl_codegen.py, wxglade.py:
-	Introduce separation of widget settings in a config module
-	[6167430196c8] <DEV_GUI_WX30>
-
-2014-08-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_external.py:
-	Add some tests for external code
-
-	Currently just one test for deep-copying of OrderedDict() is
-	implemented.
-	[83bdfdfa39f0] <DEV_GUI_WX30>
-
-2014-08-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, wcodegen/__init__.py, widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/lisp_codegen.py,
-	widgets/bitmap_button/perl_codegen.py, widgets/button/codegen.py,
-	widgets/button/lisp_codegen.py, widgets/button/perl_codegen.py,
-	widgets/calendar_ctrl/codegen.py,
-	widgets/calendar_ctrl/perl_codegen.py, widgets/checkbox/codegen.py,
-	widgets/checkbox/lisp_codegen.py, widgets/checkbox/perl_codegen.py,
-	widgets/choice/codegen.py, widgets/choice/lisp_codegen.py,
-	widgets/choice/perl_codegen.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/lisp_codegen.py,
-	widgets/combo_box/perl_codegen.py, widgets/custom_widget/codegen.py,
-	widgets/custom_widget/lisp_codegen.py,
-	widgets/custom_widget/perl_codegen.py,
-	widgets/datepicker_ctrl/codegen.py,
-	widgets/datepicker_ctrl/lisp_codegen.py,
-	widgets/datepicker_ctrl/perl_codegen.py, widgets/dialog/codegen.py,
-	widgets/dialog/lisp_codegen.py, widgets/dialog/perl_codegen.py,
-	widgets/gauge/codegen.py, widgets/gauge/lisp_codegen.py,
-	widgets/gauge/perl_codegen.py, widgets/grid/codegen.py,
-	widgets/grid/lisp_codegen.py, widgets/grid/perl_codegen.py,
-	widgets/hyperlink_ctrl/codegen.py,
-	widgets/hyperlink_ctrl/lisp_codegen.py,
-	widgets/hyperlink_ctrl/perl_codegen.py, widgets/list_box/codegen.py,
-	widgets/list_box/lisp_codegen.py, widgets/list_box/perl_codegen.py,
-	widgets/list_ctrl/codegen.py, widgets/list_ctrl/lisp_codegen.py,
-	widgets/list_ctrl/perl_codegen.py, widgets/menubar/codegen.py,
-	widgets/menubar/lisp_codegen.py, widgets/menubar/perl_codegen.py,
-	widgets/notebook/codegen.py, widgets/notebook/lisp_codegen.py,
-	widgets/notebook/perl_codegen.py, widgets/panel/codegen.py,
-	widgets/panel/lisp_codegen.py, widgets/panel/perl_codegen.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/lisp_codegen.py,
-	widgets/radio_box/perl_codegen.py, widgets/radio_button/codegen.py,
-	widgets/radio_button/lisp_codegen.py,
-	widgets/radio_button/perl_codegen.py, widgets/slider/codegen.py,
-	widgets/slider/lisp_codegen.py, widgets/slider/perl_codegen.py,
-	widgets/spacer/codegen.py, widgets/spacer/lisp_codegen.py,
-	widgets/spacer/perl_codegen.py, widgets/spin_button/codegen.py,
-	widgets/spin_button/lisp_codegen.py,
-	widgets/spin_button/perl_codegen.py, widgets/spin_ctrl/codegen.py,
-	widgets/spin_ctrl/lisp_codegen.py,
-	widgets/spin_ctrl/perl_codegen.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/lisp_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_line/codegen.py, widgets/static_line/lisp_codegen.py,
-	widgets/static_line/perl_codegen.py, widgets/static_text/codegen.py,
-	widgets/static_text/lisp_codegen.py,
-	widgets/static_text/perl_codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/lisp_codegen.py,
-	widgets/text_ctrl/perl_codegen.py, widgets/toggle_button/codegen.py,
-	widgets/toggle_button/lisp_codegen.py,
-	widgets/toggle_button/perl_codegen.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/lisp_codegen.py, widgets/toolbar/perl_codegen.py,
-	widgets/tree_ctrl/codegen.py, widgets/tree_ctrl/lisp_codegen.py,
-	widgets/tree_ctrl/perl_codegen.py:
-	Simplify registration of widget code generators
-	[4fcb55cb7011] <DEV_GUI_WX30>
-
-2014-08-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* test.py:
-	Use wxPython 2.8 for GUI tests too
-	[6f429d71d767] <DEV_GUI_WX30>
-
-	* test.py:
-	Use wxPython 2.8 for GUI tests too
-	[b221e052e911]
-
-	* main.py:
-	Improve exception handling while loading data from file-like object
-	[45737ceccc25]
-
-2014-07-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/apd.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html,
-	docs/html/ch02s06.html, docs/html/ch02s07.html,
-	docs/html/ch02s08.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html, docs/html/ch04.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/pdf/manual.pdf, docs/src/manual.xml:
-	Update documentation about application start code
-	[5ecf9c2d7abb]
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CPP_wxCalendarCtrl.cpp,
-	tests/casefiles/CalendarCtrl.cpp, tests/casefiles/CalendarCtrl.pl,
-	tests/casefiles/CalendarCtrl.py, tests/casefiles/Gauge.cpp,
-	tests/casefiles/Gauge.lisp, tests/casefiles/Gauge.pl,
-	tests/casefiles/Gauge.py, tests/casefiles/Grid.cpp,
-	tests/casefiles/Grid.lisp, tests/casefiles/Grid.pl,
-	tests/casefiles/Grid.py, tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Lisp_wxBitmapButton.lisp,
-	tests/casefiles/Perl_Preferences.pl,
-	tests/casefiles/Python_Preferences.py, tests/casefiles/bug163.cpp,
-	tests/casefiles/bug163.lisp, tests/casefiles/bug163.pl,
-	tests/casefiles/bug163.py, tests/casefiles/styleless-dialog.cpp,
-	tests/casefiles/styleless-dialog.lisp, tests/casefiles/styleless-
-	dialog.pl, tests/casefiles/styleless-dialog.py,
-	tests/test_codegen.py:
-	Fix wrong conditions to generate application start code (sf bug
-	#161)
-	[7a070963581f]
-
-2014-07-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/src/manual.xml:
-	Change shebang from python to python2 in XRC example
-	[b9bc65f122f9]
-
-2014-06-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/bug163.cpp,
-	tests/casefiles/bug163.h, tests/casefiles/bug163.lisp,
-	tests/casefiles/bug163.pl, tests/casefiles/bug163.py,
-	tests/casefiles/bug163.wxg, tests/casefiles/bug163.xrc,
-	tests/test_bugs.py:
-	Don't convert first char of a XRC extraproperty to upper case (sf
-	bug #163)
-	[17926443bae9]
-
-	* widgets/custom_widget/codegen.py:
-	Show warning about malformed arguments in Custom Widget XRC code
-	writer
-	[3c39f60a800b]
-
-2014-06-22  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/import_test.wxg, tests/casefiles/import_test.xrc,
-	xrc2wxg.py:
-	Use "-1" instead of -1 for undefined statusbar widths during XRC
-	import
-	[b98f8bd97d5e]
-
-2014-06-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/import_test.wxg, tests/casefiles/import_test.xrc,
-	xrc2wxg.py:
-	Fix value of enabled/disabled property during import from XRC
-	[bbcff7f59ac5]
-
-	* NEWS.txt, tests/casefiles/import_test.wxg,
-	tests/casefiles/import_test.xrc, tests/test_codegen.py, xrc2wxg.py:
-	Fix import of wxStatusbar from XRC
-	[447dd5b41668]
-
-2014-06-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/import_test.wxg, xrc2wxg.py:
-	Fix wrong menu generation after importing from XRC file
-	[98d5b63dcffc]
-
-2014-06-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/import_test.wxg,
-	tests/casefiles/import_test.xrc, xrc2wxg.py:
-	Fix wrong wxMenuItem property name after importing from XRC file
-	[cbcb8e6818f2]
-
-	* tests/casefiles/import_test.wxg, tests/casefiles/import_test.xrc,
-	tests/test_codegen.py, xrc2wxg.py:
-	Code reorg and documentation improvements as well as a added test
-	case
-	[054015f64562]
-
-2014-05-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Closed agriggio branch
-	[cf75bd597a48] <agriggio>
-
-	* Closed v0-1-3devel branch
-	[084f0b95fcce] <v0-1-3devel>
-
-	* Closed HEAD branch
-	[6296183d519e] <HEAD>
-
-	* clipboard.py, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/xrc_codegen.py, log.py, main.py, misc.py, tests/__init__.py,
-	tests/test_codegen.py, tests/test_gui.py,
-	widgets/custom_widget/codegen.py, xml_parse.py:
-	Replace cStringIO by StringIO because StringIO supports Unicode
-	[ff7561dc0004] <DEV_UNICODE>
-
-2014-04-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Created DEV_UNICODE
-	[f5782c1899ab] <DEV_UNICODE>
-
-2014-04-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* log.py:
-	Adjust logging code
-	[8075d5eaea99]
-
-2014-03-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Use wxPython 2.8 - only and always
-
-	The GUI isn't wxPython 3.0 ready yet. (grafted from
-	5bbecbbca1c67bd2a2d9c48258b4bbdd7b3b5665)
-	[acbfabfba67b]
-
-2014-03-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc, tests/test_gui.py:
-	Add tests for the unified style handling
-	[a73b0ac1beb8] <DEV_GUI_WX30>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py, widget_properties.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/button/button.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/checkbox/checkbox.py, widgets/choice/choice.py,
-	widgets/combo_box/combo_box.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/gauge/gauge.py, widgets/grid/grid.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/list_box/list_box.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/menubar/menubar.py, widgets/notebook/notebook.py,
-	widgets/panel/panel.py, widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py, widgets/slider/slider.py,
-	widgets/spacer/spacer.py, widgets/spin_button/spin_button.py,
-	widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/static_line.py,
-	widgets/static_text/static_text.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/toolbar.py,
-	widgets/tree_ctrl/tree_ctrl.py:
-	Unify style handling code in widgets GUI elements
-	[fbf87e4590e7] <DEV_GUI_WX30>
-
-	* common.py:
-	fixed indentation (cosmetic change only)
-	[7f1bc5489cc8] <DEV_GUI_WX30>
-
-2014-02-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Use wxPython 2.8 - only and always
-
-	The GUI isn't wxPython 3.0 ready yet.
-	[5bbecbbca1c6] <DEV_GUI_WX30>
-
-2014-02-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	Catch OS errors during renaming the app directory (Thanks to
-	Davorin)
-	[e9544789b057]
-
-2014-02-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* test.py, tests/__init__.py, tests/test_gui.py:
-	Improve test initialisation to run tests with wxPython 2.8 currently
-
-	The initialisation order of wxPython was unexpected if if wxPython
-	2.8 and wxPython 3.0 are available.
-	[ad99879a5233] <DEV_GUI_WX30>
-
-2014-02-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_gui.py:
-	Add new GUI test case
-	[e29d03af61ba] <DEV_GUI_WX30>
-
-2014-02-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/__init__.py, tests/casefiles/AllWidgets_28.pl,
-	tests/casefiles/CalendarCtrl.pl, tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample_30.pl, tests/casefiles/FontColour.pl,
-	tests/casefiles/Gauge.pl, tests/casefiles/Grid.pl,
-	tests/casefiles/HyperlinkCtrl_26.pl,
-	tests/casefiles/HyperlinkCtrl_28.pl,
-	tests/casefiles/Perl_Preferences.pl, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg2_MyDialog.pm,
-	tests/casefiles/PlOgg2_MyFrame.pm, tests/casefiles/PlOgg2_app.pl,
-	tests/casefiles/PlOgg3.pl, tests/casefiles/Sizers_classattr.pl,
-	tests/casefiles/Sizers_no_classattr.pl,
-	tests/casefiles/add_class_inplace_extended.pl,
-	tests/casefiles/add_class_inplace_orig.pl,
-	tests/casefiles/no_suitable_writer.pl,
-	tests/casefiles/remove_class_inplace_expected.pl,
-	tests/casefiles/remove_class_inplace_input.pl, tests/casefiles
-	/styleless-dialog.pl:
-	Change indentation inside Perl test cases from 8 to the default of
-	4.
-
-	This change simplifies the generation of test files because the
-	default indentation is 4 always.
-	[192e520ed695] <DEV_GUI_WX30>
-
-2014-01-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/AllWidgets_28.cpp,
-	tests/casefiles/AllWidgets_28.h, tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc,
-	widgets/datepicker_ctrl/lisp_codegen.py,
-	widgets/datepicker_ctrl/perl_codegen.py:
-	Add Lisp and Perl support for wxDatePickerCtrl
-	[69ac59dd5068] <DEV_GUI_WX30>
-
-2014-01-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/apc.html,
-	docs/html/apd.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html,
-	docs/html/ch01s07.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html, docs/html/ch06.html,
-	docs/html/ch06s02.html, docs/html/ch06s03.html,
-	docs/html/error_dialog.png, docs/html/index.html,
-	docs/html/pr01.html, docs/html/pr01s02.html, docs/pdf/manual.pdf,
-	docs/src/error_dialog.png, docs/src/manual.xml:
-	Add a section about installing and designing own widgets primarily
-
-	The section is still incomplete but it should show current changes
-	already.
-	[165de0ffff96]
-
-2014-01-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Makefile, NEWS.txt, application.py, bugdialog.py, bugdialog_ui.py,
-	configdialog.py, main.py, res/bugdialog_ui.wxg:
-	Improve the internal error dialog
-	[000d787786a7]
-
-2014-01-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* misc.py, widgets/button/button.py, widgets/choice/choice.py,
-	widgets/combo_box/combo_box.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/list_box/list_box.py, widgets/menubar/menubar.py,
-	widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py,
-	widgets/static_text/static_text.py,
-	widgets/toggle_button/toggle_button.py:
-	Rename misc._encode to misc.encode
-	[ead08f134cf2] <DEV_GUI_WX30>
-
-	* tests/casefiles/AllWidgets_28.cpp, tests/casefiles/AllWidgets_28.h,
-	tests/casefiles/AllWidgets_28.lisp,
-	tests/casefiles/AllWidgets_28.pl, tests/casefiles/AllWidgets_28.py,
-	tests/casefiles/AllWidgets_28.wxg,
-	tests/casefiles/AllWidgets_28.xrc, tests/casefiles/icon.xpm,
-	tests/test_codegen.py:
-	Add new tests
-	[299197b0e082] <DEV_GUI_WX30>
-
-	* NEWS.txt, tests/casefiles/CPPOgg1.cpp,
-	tests/casefiles/CPPOgg2_MyDialog.cpp, tests/casefiles/CPPOgg3.cpp,
-	tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CalendarCtrl.pl, tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample_30.cpp,
-	tests/casefiles/ComplexExample_30.lisp,
-	tests/casefiles/ComplexExample_30.pl,
-	tests/casefiles/ComplexExample_30.py,
-	tests/casefiles/FontColour.lisp, tests/casefiles/Gauge.lisp,
-	tests/casefiles/Gauge.pl, tests/casefiles/Grid.lisp,
-	tests/casefiles/HyperlinkCtrl_26.lisp,
-	tests/casefiles/HyperlinkCtrl_28.lisp,
-	tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg2_MyFrame.lisp,
-	tests/casefiles/LispOgg3.lisp,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Lisp_wxBitmapButton.lisp,
-	tests/casefiles/Perl_Preferences.pl, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg2_MyDialog.pm,
-	tests/casefiles/PlOgg2_MyFrame.pm, tests/casefiles/PlOgg3.pl,
-	tests/casefiles/Sizers_classattr.cpp,
-	tests/casefiles/Sizers_classattr.lisp,
-	tests/casefiles/Sizers_classattr.pl,
-	tests/casefiles/Sizers_no_classattr.cpp,
-	tests/casefiles/Sizers_no_classattr.lisp,
-	tests/casefiles/Sizers_no_classattr.pl,
-	tests/casefiles/add_class_inplace_extended.lisp,
-	tests/casefiles/add_class_inplace_extended.pl,
-	tests/casefiles/add_class_inplace_orig.lisp,
-	tests/casefiles/add_class_inplace_orig.pl,
-	tests/casefiles/no_suitable_writer.lisp,
-	tests/casefiles/remove_class_inplace_expected.lisp,
-	tests/casefiles/remove_class_inplace_expected.pl,
-	tests/casefiles/remove_class_inplace_input.lisp,
-	tests/casefiles/remove_class_inplace_input.pl, tests/casefiles
-	/styleless-dialog.lisp, wcodegen/__init__.py,
-	widgets/button/codegen.py, widgets/button/lisp_codegen.py,
-	widgets/button/perl_codegen.py, widgets/calendar_ctrl/codegen.py,
-	widgets/calendar_ctrl/perl_codegen.py, widgets/checkbox/codegen.py,
-	widgets/checkbox/lisp_codegen.py, widgets/checkbox/perl_codegen.py,
-	widgets/choice/codegen.py, widgets/choice/lisp_codegen.py,
-	widgets/choice/perl_codegen.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/lisp_codegen.py,
-	widgets/combo_box/perl_codegen.py, widgets/custom_widget/codegen.py,
-	widgets/datepicker_ctrl/codegen.py, widgets/dialog/codegen.py,
-	widgets/dialog/lisp_codegen.py, widgets/dialog/perl_codegen.py,
-	widgets/frame/codegen.py, widgets/frame/lisp_codegen.py,
-	widgets/frame/perl_codegen.py, widgets/gauge/codegen.py,
-	widgets/gauge/lisp_codegen.py, widgets/gauge/perl_codegen.py,
-	widgets/grid/codegen.py, widgets/hyperlink_ctrl/codegen.py,
-	widgets/hyperlink_ctrl/lisp_codegen.py,
-	widgets/hyperlink_ctrl/perl_codegen.py, widgets/list_box/codegen.py,
-	widgets/list_box/lisp_codegen.py, widgets/list_box/perl_codegen.py,
-	widgets/list_ctrl/codegen.py, widgets/list_ctrl/lisp_codegen.py,
-	widgets/list_ctrl/perl_codegen.py, widgets/menubar/codegen.py,
-	widgets/menubar/lisp_codegen.py, widgets/menubar/perl_codegen.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/lisp_codegen.py,
-	widgets/radio_box/perl_codegen.py, widgets/radio_button/codegen.py,
-	widgets/radio_button/lisp_codegen.py,
-	widgets/radio_button/perl_codegen.py, widgets/slider/codegen.py,
-	widgets/slider/lisp_codegen.py, widgets/slider/perl_codegen.py,
-	widgets/spacer/codegen.py, widgets/spacer/lisp_codegen.py,
-	widgets/spacer/perl_codegen.py, widgets/spin_button/codegen.py,
-	widgets/spin_button/lisp_codegen.py,
-	widgets/spin_button/perl_codegen.py, widgets/spin_ctrl/codegen.py,
-	widgets/spin_ctrl/lisp_codegen.py,
-	widgets/spin_ctrl/perl_codegen.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/lisp_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_line/codegen.py, widgets/static_line/lisp_codegen.py,
-	widgets/static_line/perl_codegen.py, widgets/static_text/codegen.py,
-	widgets/static_text/lisp_codegen.py,
-	widgets/static_text/perl_codegen.py,
-	widgets/static_text/static_text.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/lisp_codegen.py,
-	widgets/text_ctrl/perl_codegen.py, widgets/toggle_button/codegen.py,
-	widgets/toggle_button/lisp_codegen.py,
-	widgets/toggle_button/perl_codegen.py, widgets/tree_ctrl/codegen.py,
-	widgets/tree_ctrl/lisp_codegen.py,
-	widgets/tree_ctrl/perl_codegen.py:
-	Unify the code generation of widget specific code. That causes minor
-	changes in the generated code.
-
-	Parallel two wrong Lisp statement in wxHyperlinkCtrl and wxFrame has
-	been corrected.
-	[ab887740ee3c] <DEV_GUI_WX30>
-
-	* codegen/xrc_codegen.py:
-	Typo
-	[322b754b06a4] <DEV_GUI_WX30>
-
-2014-01-17  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/pl_codegen.py:
-	Add more constants to Perl code generator
-	[b345b119539b] <DEV_GUI_WX30>
-
-2014-01-16  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py:
-	Documentation typos
-	[534610ca1bac] <DEV_GUI_WX30>
-
-2014-01-15  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/radio_box/radio_box.py:
-	Change initial dimension of a wxRadioBox from 0 to 1
-	[21d67e7289f2] <DEV_GUI_WX30>
-
-2014-01-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* log.py:
-	Remove gettext usage from exception handler
-	[894e98ab3259]
-
-2014-01-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* license.txt:
-	Add myself to license file
-	[16cada1aa8c5]
-
-2014-01-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/pl_codegen.py:
-	Fix bug in generation of valid hash keys for Perl
-	[33daddbba93e]
-
-2013-12-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* log.py:
-	Increase robustness of exception logger
-	[956750c8c23f]
-
-2013-12-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/bitmap_button/__init__.py, widgets/button/__init__.py,
-	widgets/calendar_ctrl/__init__.py, widgets/checkbox/__init__.py,
-	widgets/choice/__init__.py, widgets/combo_box/__init__.py,
-	widgets/custom_widget/__init__.py,
-	widgets/datepicker_ctrl/__init__.py, widgets/dialog/__init__.py,
-	widgets/frame/__init__.py, widgets/gauge/__init__.py,
-	widgets/grid/__init__.py, widgets/hyperlink_ctrl/__init__.py,
-	widgets/list_box/__init__.py, widgets/list_ctrl/__init__.py,
-	widgets/notebook/__init__.py, widgets/radio_box/__init__.py,
-	widgets/radio_button/__init__.py, widgets/slider/__init__.py,
-	widgets/spacer/__init__.py, widgets/spin_button/__init__.py,
-	widgets/spin_ctrl/__init__.py, widgets/splitter_window/__init__.py,
-	widgets/static_bitmap/__init__.py, widgets/static_line/__init__.py,
-	widgets/static_text/__init__.py, widgets/text_ctrl/__init__.py,
-	widgets/toggle_button/__init__.py, widgets/tree_ctrl/__init__.py:
-	Remove default widget initialisation code. The widget default
-	initialisation will be performed by the widget loader now.
-	[e6f4126c7a62] <DEV_GUI_WX30>
-
-	* NEWS.txt:
-	Typos
-	[2c62158e7b2b] <DEV_GUI_WX30>
-
-2013-12-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* log.py:
-	Extent exception handler by reversing the order of logged stack
-	frames and by including more general information (like version
-	numbers and platform infos).
-	[f65e4edb0e40]
-
-	* about.py, config.py, main.py, wxglade.py:
-	Store wx version in config.wx_version
-	[5480df7e0465]
-
-	* config.py:
-	Minor source documentation update for config.use_gui
-	[69abbef37c70]
-
-	* codegen/__init__.py, common.py:
-	Unity code to load and initialise widgets.
-	[a261491079b9] <DEV_GUI_WX30>
-
-2013-12-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* misc.py:
-	Typo in docstring
-	[579dad455f7f] <DEV_GUI_WX30>
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/apd.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html,
-	docs/html/ch02s06.html, docs/html/ch02s07.html,
-	docs/html/ch02s08.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html, docs/html/ch04.html,
-	docs/html/ch04s03.html, docs/html/ch05.html, docs/html/index.html,
-	docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/preferences.png, docs/pdf/manual.pdf,
-	docs/src/preferences.png:
-	Updated screenshot of preferences dialog
-	[b0c41d97a53b]
-
-	* NEWS.txt, codegen/__init__.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, common.py:
-	Improve widget import to be able to import widgets from ZIP files
-
-	The previous implementation of ZIP file imports doesn't work for
-	code generators.
-
-	The new implementation used the same code (copied) to load GUI part
-	of a widget as well as the widget code generators from a ZIP file.
-
-	Imports from ZIP files have a higher priority than traditional
-	imports. This is helpful for ad-hoc fixes.
-	[110b485dafe0] <DEV_GUI_WX30>
-
-	* Makefile:
-	Adapt Makefile to new pylint version
-	[95e2985d6bde] <DEV_GUI_WX30>
-
-2013-12-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	PEP8: rename variable id to widget_id
-	[2f773100ddb7] <DEV_GUI_WX30>
-
-2013-12-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Show log file during application startup similar to other files
-	[67fa55ddb6de]
-
-	* configUI.py, docs/html/apa.html, docs/html/apb.html,
-	docs/html/apd.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html,
-	docs/html/ch01s07.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s03.html,
-	docs/html/ch05.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/preferences.png,
-	docs/pdf/manual.pdf, docs/src/preferences.png, res/preferences.wxg:
-	Minor layout changes in preferences dialog
-	[6297d871b8da]
-
-	* wxglade:
-	Use python2 interpreter instead of just python
-	[081a452ad964] <DEV_GUI_WX30>
-
-	* test.py, wxglade.py, wxglade.pyw, xrc2wxg.py:
-	Change shebang to start Python2 always.
-
-	That's useful for systems with Python3 as default
-	[5496b927d38f] <DEV_GUI_WX30>
-
-	* edit_windows.py:
-	Fix bug introduced in 1333:9859659429ff
-	[35355bec2cdc] <DEV_GUI_WX30>
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/apc.html,
-	docs/html/apd.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html,
-	docs/html/ch01s07.html, docs/html/ch01s08.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html,
-	docs/html/ch02s06.html, docs/html/ch02s07.html,
-	docs/html/ch02s08.html, docs/html/ch02s09.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch03s07.html, docs/html/ch04.html,
-	docs/html/ch04s02.html, docs/html/ch04s03.html, docs/html/ch05.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/html/preferences.png,
-	docs/pdf/manual.pdf, docs/src/html.xsl, docs/src/manual.xml,
-	docs/src/pdf.xsl, docs/src/preferences.png:
-	Extend documentation HG Bitte gib eine Versions-Meldung ein. Zeilen
-	beginnend mit 'HG:' werden
-	[bc18610d0567]
-
-2013-12-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* log.py:
-	Set backupCount=1 during setup of RotatingFileHandler
-
-	The default backupCount=0 doesn't delete the file during the
-	rollover. Thereby the log file grows instead of remaining at 100
-	KiB.
-	[c24c07e5dcce]
-
-2013-12-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_windows.py:
-	Fix bug introduced in 1333:9859659429ff
-	[297fda9023c6]
-
-2013-11-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* log.py:
-	Add more details to logged exceptions and unify exception formatting
-	code
-	[c5afcde6f5e6]
-
-2013-11-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* errors.py, wxglade.py:
-	Improve error handling in case if missing code writer
-	[baa8d6246a56]
-
-	* tests/test_codegen.py:
-	Add test case for last commit "Prevent code generation ..."
-	[ecb3bf4f9787]
-
-	* NEWS.txt, codegen/__init__.py, errors.py:
-	Prevent code generation from a template file by commandline
-	invocation
-	[0ab726df3b2a]
-
-	* xml_parse.py:
-	Remove obsolete "import errors"
-	[5a075d2b9115]
-
-	* wxglade:
-	Use python2 interpreter instead of just python
-	[29f7c3faf169]
-
-	* tests/__init__.py, tests/test_codegen.py:
-	Improve tests of the existance of output file and directory
-	[fef6cdbda237]
-
-2013-11-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py:
-	Reorg code to open file to reduce duplicate code
-	[7bfd38922609]
-
-2013-11-16  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* test.py, wxglade.py, wxglade.pyw, xrc2wxg.py:
-	Change shebang to start Python2 always.
-
-	That's useful for systems with Python3 as default
-	[b01e80fc1fe3]
-
-2013-11-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	PEP8
-	[e478cd2d5cfd]
-
-	* codegen/xrc_codegen.py, errors.py, tests/test_codegen.py:
-	XRC code generator raises an own exception instead of IOError.
-
-	The code generator raises now WxgXRCMultipleFilesNotSupported
-	instead of the generic IOError exception. It's a logical mistake not
-	not an IO error.
-	[b054b258642a]
-
-	* application.py, wxglade.py:
-	Improve checks for wxGlade specific exceptions
-	[6257c4bf9ed3]
-
-	* application.py, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/py_codegen.py, errors.py,
-	tests/__init__.py, tests/test_codegen.py, wxglade.py, xml_parse.py:
-	Improve check for output directory
-	[a01618bc6930]
-
-2013-11-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, codegen/py_codegen.py, errors.py,
-	tests/test_codegen.py, wxglade.py:
-	Improve disabling old import style for wxPython 3.0
-	[12dcaea82563]
-
-2013-11-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, application.py, codegen/lisp_codegen.py, errors.py,
-	tests/casefiles/ComplexExample_30.lisp, tests/test_codegen.py,
-	wxglade.py, xml_parse.py:
-	Disable Lisp code generation for wxWidgets 3.0
-
-	I've disabled Lisp due lack of testing possibilities for the
-	upcoming release of wxWidgets 3.0.
-	[929b728156a5]
-
-	* widget_properties.py:
-	Add RadioProperty.enable_item() to enable/disable choices within the
-	property
-	[b43b01a1101a]
-
-2013-10-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/__init__.py:
-	Add option to exclude languages from
-	tests.WXGladeBaseTest._test_all()
-	[3f7594b6af3c]
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py:
-	Rework the initialisation of values in code generators
-	[5e826fc3103b]
-
-	* xml_parse.py:
-	Pep8 changes
-	[d7b4e45849e0]
-
-2013-10-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Minor update of the source code documentation
-	[735370d77e46]
-
-2013-10-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* log.py:
-	Minor code reorg in exception handlers
-	[d26255c41444]
-
-	* wxglade.py:
-	Update copyright notice
-	[95bef50e8089]
-
-	* merged DEV_GUI_WX30 into default
-	[09789fae8916]
-
-2013-10-16  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, compat.py, edit_sizers/edit_sizers.py,
-	edit_windows.py, tree.py:
-	Move compatibility code to compat.py
-	[9859659429ff] <DEV_GUI_WX30>
-
-2013-10-15  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py:
-	Use SizerItem.AssignWindow() instead of SetWindow()
-
-	SizerItem.SetWindow() is deprecated since wxPython 2.9
-	[11706a357d8f] <DEV_GUI_WX30>
-
-	* NEWS.txt:
-	Start implementing GUI changes to support upcoming wxPython 3.0
-	[19e898384490] <DEV_GUI_WX30>
-
-	* application.py, tree.py:
-	Use SizerItem.AssignWindow() instead of SetWindow() (Thanks to
-	Martin Gregory)
-
-	SizerItem.SetWindow() is deprecated since wxPython 2.9
-
-	This change is an adapt version of the patch provided by Martin.
-	[5a78f3b6c0ba] <DEV_GUI_WX30>
-
-2013-10-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Created DEV_GUI_WX30 branch
-	[d5ec8e0d20d2] <DEV_GUI_WX30>
-
-2013-10-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Reorg in determining locale to prevent warning message on Windows
-	[8a41588c804d]
-
-2013-09-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* setup.py:
-	Add installation requirement to setup.py
-	[5dbf1cdc40dd]
-
-2013-09-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, common.py:
-	Change default to remember position and geometry of the main windows
-
-	This configuration change effects fresh installations only because
-	wxGlade writes always all configuration settings into the rc file.
-	Changed defaults will be overwritten by the values from the rc file.
-	[7081c03e7c7b]
-
-	* docs/src/manual.xml, wxglade:
-	Typo
-	[262e10831dd5]
-
-	* Close DEV_LOGGING branch
-	[20bde6c43e2b] <DEV_LOGGING>
-
-	* NEWS.txt, main.py, wxglade.py:
-	merged DEV_LOGGING into default
-	[9510a31d471d]
-
-	* log.py:
-	Fix for a incomplete change in log.py
-
-	The cleanup for old log handlers was too late. Thereby the new
-	created handlers have been removed too.
-	[c7a48e74cdc3] <DEV_LOGGING>
-
-	* log.py:
-	Minor code reorg triggered by a PEP8 check
-	[5345f7e56b2f] <DEV_LOGGING>
-
-	* config.py:
-	Minor source documentation updates
-	[a71a67caa8dd] <DEV_LOGGING>
-
-	* NEWS.txt, common.py, config.py, configUI.py, configdialog.py,
-	log.py, main.py, res/preferences.wxg, wxglade.py:
-	Improve file logging
-
-	The log file will always created . The file is stored inside the
-	appdata directory and it's size is limited to 100kB.
-
-	Parallel a new option has added to log DEBUG information to the log
-	file. This option is off per default.
-	[4ebc54cf7601] <DEV_LOGGING>
-
-2013-09-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, common.py, config.py, template.py, wxglade.py:
-	Rework internal path handling
-	[92719b634b39] <DEV_LOGGING>
-
-2013-09-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* about.py, code_property.py, codegen/__init__.py, common.py,
-	config.py, configUI.py, docs/ReleaseSteps.txt,
-	edit_sizers/__init__.py, edit_sizers/edit_sizers.py, main.py,
-	misc.py, res/preferences.wxg, template.py, tests/__init__.py,
-	tests/casefiles/Preferences.wxg,
-	tests/casefiles/Python_Preferences.py, tree.py, widgets/__init__.py,
-	widgets/bitmap_button/__init__.py, widgets/bitmap_button/codegen.py,
-	widgets/button/__init__.py, widgets/calendar_ctrl/__init__.py,
-	widgets/checkbox/__init__.py, widgets/choice/__init__.py,
-	widgets/combo_box/__init__.py, widgets/custom_widget/__init__.py,
-	widgets/datepicker_ctrl/__init__.py, widgets/dialog/__init__.py,
-	widgets/dialog/dialog.py, widgets/frame/__init__.py,
-	widgets/frame/frame.py, widgets/gauge/__init__.py,
-	widgets/grid/__init__.py, widgets/hyperlink_ctrl/__init__.py,
-	widgets/list_box/__init__.py, widgets/list_ctrl/__init__.py,
-	widgets/menubar/__init__.py, widgets/menubar/menubar.py,
-	widgets/notebook/__init__.py, widgets/panel/__init__.py,
-	widgets/panel/panel.py, widgets/radio_box/__init__.py,
-	widgets/radio_button/__init__.py, widgets/slider/__init__.py,
-	widgets/spacer/__init__.py, widgets/spin_button/__init__.py,
-	widgets/spin_ctrl/__init__.py, widgets/splitter_window/__init__.py,
-	widgets/static_bitmap/__init__.py, widgets/static_bitmap/codegen.py,
-	widgets/static_line/__init__.py, widgets/static_text/__init__.py,
-	widgets/text_ctrl/__init__.py, widgets/toggle_button/__init__.py,
-	widgets/toolbar/__init__.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/toolbar.py, widgets/tree_ctrl/__init__.py,
-	widgets/tree_ctrl/tree_ctrl.py, wxglade.py, xml_parse.py:
-	Move configuration settings from common to config and code back to
-	common
-
-	This change moves most of configuration variables from common.py to
-	config.py and active code from config back to common.
-
-	This change prevents some circular imports of config and common.
-	[38de358eed2f] <DEV_LOGGING>
-
-2013-09-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* .hgignore:
-	Ignore wxGlade log file and PyCharm IDE files
-	[84e04744cb00] <DEV_LOGGING>
-
-2013-09-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample_30.pl, widgets/frame/perl_codegen.py:
-	Use configurable indents instead of hard coded tabs in wxFrame code
-	for Perl
-	[ca8a9b63640c]
-
-	* wcodegen/__init__.py:
-	Add BaseWidgetCodeWriter.stmt2list() convert a string into a list.
-
-	The function stmt2list() splits a multi line code statement into a
-	list of lines. The newlines will be conserved.
-	[22f4e4cde616]
-
-	* Makefile:
-	Add directoy wcodegen to list of source directories
-	[3e6acc670822]
-
-	* wxglade.py:
-	Write log file with utf-8 encoding
-	[65e5ba4f4a91] <DEV_LOGGING>
-
-	* main.py, wxglade.py:
-	Minor cosmetic changes
-	[8220d4169fd0]
-
-2013-09-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Created DEV_LOGGING branch
-	[a5eb50eb0377] <DEV_LOGGING>
-
-2013-09-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc,
-	tests/casefiles/ComplexExample_30.cpp,
-	tests/casefiles/ComplexExample_30.lisp,
-	tests/casefiles/ComplexExample_30.pl,
-	tests/casefiles/ComplexExample_30.py,
-	tests/casefiles/ComplexExample_30.wxg,
-	tests/casefiles/ComplexExample_30.xrc, widgets/toolbar/codegen.py:
-	Change bitmap specification in complex example
-	[5caa450eb90c]
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py, docs/html/apa.html,
-	docs/html/apb.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html,
-	docs/html/ch01s07.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html,
-	docs/html/ch02s07.html, docs/html/ch02s08.html,
-	docs/html/ch02s09.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s06.html, docs/html/ch03s07.html, docs/html/ch04.html,
-	docs/html/ch05.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html, docs/pdf/manual.pdf,
-	docs/src/manual.xml, tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc,
-	tests/casefiles/ComplexExample_30.cpp,
-	tests/casefiles/ComplexExample_30.h,
-	tests/casefiles/ComplexExample_30.lisp,
-	tests/casefiles/ComplexExample_30.pl,
-	tests/casefiles/ComplexExample_30.py,
-	tests/casefiles/ComplexExample_30.wxg,
-	tests/casefiles/ComplexExample_30.xrc, tests/test_codegen.py:
-	Rework quoting and escaping of special character sequences
-	[cf7d695c8278]
-
-2013-08-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Simplify signature of quote_str(), use quote_path() for filenames or
-	paths
-	[534c09b7673c]
-
-2013-08-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample_30.cpp,
-	widgets/bitmap_button/codegen.py, widgets/dialog/codegen.py,
-	widgets/frame/codegen.py, widgets/static_bitmap/codegen.py,
-	widgets/toolbar/codegen.py:
-	Use quote_path() instead of quote_str() to quote / escape filenames
-	[4fc773828910]
-
-2013-08-26  Carsten Grohmann  <carstengrohmann@gmx.de>
-
-	* docs/ReleaseSteps.txt:
-	Add creation of a development branch to release steps
-	[e494dfa8ae57]
-
-2013-08-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Close stable branch WXG-BRANCH-VERSION_0_6_7
-	[c15b934f9e44] <WXG-BRANCH-VERSION_0_6_7>
-
-2013-08-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/__init__.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc, tests/test_codegen.py:
-	Fix escape sequences in Unicode strings were escaped twice Perl and
-	Python
-	[c164edb5afff] <WXG-BRANCH-VERSION_0_6_8>
-
-	* NEWS.txt:
-	Extent NEWS.txt
-	[fd369e4c6aa9] <WXG-BRANCH-VERSION_0_6_8>
-
-	* Create new branch for stable version 0.6.8
-	[b9ba1e9ee9e1] <WXG-BRANCH-VERSION_0_6_8>
-
-	* NEWS.txt, codegen/__init__.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc,
-	tests/casefiles/ComplexExample_30.cpp,
-	tests/casefiles/ComplexExample_30.lisp,
-	tests/casefiles/ComplexExample_30.pl,
-	tests/casefiles/ComplexExample_30.py,
-	tests/casefiles/ComplexExample_30.wxg,
-	tests/casefiles/ComplexExample_30.xrc, tests/test_codegen.py:
-	Fix escape sequences in Unicode strings were escaped twice Perl and
-	Python
-	[ed6b1ff15a56]
-
-2013-08-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py:
-	Source documentation update for quote_str() and _quote_str_pattern
-	[0dfe9cf1a288]
-
-2013-08-17  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py,
-	edit_sizers/edit_sizers.py, misc.py, tests/__init__.py,
-	tests/test_codegen.py:
-	Rename class codegen.BaseCodeWriter -> BaseLangCodeWriter
-	[74ccfbc1bd58]
-
-	* NEWS.txt, application.py, clipboard.py, codegen/__init__.py,
-	codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, config.py,
-	edit_sizers/edit_sizers.py, edit_widget.py, edit_windows.py,
-	events_mixin.py, font_dialog.py, install/pyinstaller/wxglade-
-	installer.iss, install/pyinstaller/wxglade.spec,
-	install/rpm/wxglade.spec, log.py, main.py, misc.py, template.py,
-	tests/__init__.py, tests/test_gui.py, tree.py, wcodegen/__init__.py,
-	widget_properties.py, widgets/custom_widget/codegen.py,
-	widgets/grid/codegen.py, widgets/menubar/codegen.py,
-	widgets/menubar/lisp_codegen.py, widgets/menubar/perl_codegen.py,
-	widgets/notebook/notebook.py, widgets/panel/panel.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/static_bitmap.py, wxglade.py, xml_parse.py,
-	xrc2wxg.py:
-	Use Python logging facility instead of print statements
-
-	The information will be shown in three ways:
-	 - at console
-	 - in a log file
-	 - within the GUI
-	[a6dd33ce9368]
-
-2013-08-15  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, config.py, wxglade.py:
-	Initialise localisation earlier / at application start
-
-	In old version the localisation was initialised during the graphical
-	init process only.
-
-	Now the localisation is started always during the first step of
-	application initialisation.
-
-	BTW: The old call of "locale.setlocale(locale.LC_ALL)" initialised
-	the "C" locale always and not the user specific locales. This has
-	been fixed.
-	[a9d16f4d6697]
-
-2013-08-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Improve module import of wxversion and wx as well as the error
-	messages
-	[4161b6fb9096]
-
-2013-08-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py:
-	Change default version for code generation from 2.6 to 2.8
-
-	The preselected version for a new project in GUI is the version of
-	the used wxPython version.
-	[5903d225a95e]
-
-	* NEWS.txt, tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc,
-	tests/casefiles/ComplexExample_30.cpp,
-	tests/casefiles/ComplexExample_30.lisp,
-	tests/casefiles/ComplexExample_30.pl,
-	tests/casefiles/ComplexExample_30.py,
-	tests/casefiles/ComplexExample_30.wxg,
-	tests/casefiles/ComplexExample_30.xrc, widgets/notebook/notebook.py:
-	Add missing styles for wxNotebook (Thanks to Udi Fuchs)
-	[2ceb04d0021a]
-
-2013-08-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/notebook/__init__.py, widgets/notebook/codegen.py,
-	widgets/notebook/lisp_codegen.py, widgets/notebook/notebook.py,
-	widgets/notebook/perl_codegen.py, widgets/radio_box/__init__.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/lisp_codegen.py,
-	widgets/radio_box/perl_codegen.py, widgets/radio_box/radio_box.py:
-	Pep8
-	[973b01021e2d]
-
-2013-08-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/py_codegen.py,
-	tests/casefiles/ComplexExample_30.py:
-	Use SetToolTip() instead of SetToolTipString() for wxPython 3.x
-	[a525128133d2]
-
-	* NEWS.txt:
-	Update NEWS.txt
-	[b03e4a2d52b5]
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Extent handling for code statements use to set properties
-	[ef8a76603d7b]
-
-2013-08-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/ComplexExample_30.cpp,
-	tests/casefiles/ComplexExample_30.h,
-	tests/casefiles/ComplexExample_30.lisp,
-	tests/casefiles/ComplexExample_30.pl,
-	tests/casefiles/ComplexExample_30.py,
-	tests/casefiles/ComplexExample_30.wxg,
-	tests/casefiles/ComplexExample_30.xrc, tests/test_codegen.py:
-	Add initial test for wxPython 3.0 using a own copy of
-	"ComplexExample"
-	[ee47e557e8d6]
-
-	* tests/__init__.py, tests/test_codegen.py, tests/test_gui.py:
-	Update year in copyright statement
-	[5d6cf129a460]
-
-2013-07-13  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/tutorial.html:
-	Replace Albertos email in the tutorial by mailing list address
-	[e43a17d1922e]
-
-	* docs/BuildingInstaller.txt:
-	Add deleting Python bytecode files to release documentation
-	[2016ef90992e]
-
-	* .hgtags:
-	Added tag rel_0.6.8 for changeset 80fb1637a216
-	[64fc83033268] <WXG-BRANCH-VERSION_0_6_7>
-
-	* common.py, install/pyinstaller/wxglade-installer.iss:
-	Bump version number to 0.6.8
-	[80fb1637a216] [rel_0.6.8] <WXG-BRANCH-VERSION_0_6_7>
-
-2013-07-10  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, README.txt:
-	Prerelease documentation updates
-	[ffb705fc1782] <WXG-BRANCH-VERSION_0_6_7>
-
-	* NEWS.txt, codegen/pl_codegen.py, codegen/py_codegen.py,
-	tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc, tests/test_codegen.py:
-	Fix handling of unicode characters in strings for Perl and Python
-
-	Looks like wxGlade uses ASCII internal at all places. This change
-	escapes unicode characters to continue handling of strings as ascii
-	strings.
-
-	The generated source code is always ascii, even if it contains an
-	encoding statement at top.
-	[af83a01b67bb] <WXG-BRANCH-VERSION_0_6_7>
-
-	* NEWS.txt, common.py, wxglade.py:
-	Add comfortable exception handler for more detailed bug reports
-
-	This exception handler logs names, types and content of local
-	variables from top stack entry.
-	[f1935988f512] <WXG-BRANCH-VERSION_0_6_7>
-
-	* application.py:
-	Update text of two tooltips
-	[f91b569ebdbc]
-
-	* NEWS.txt, application.py:
-	Disable old import style for wxPython 3.0
-	[c65e2be8871f]
-
-	* widget_properties.py:
-	Improve source documentation
-	[0caac8e1633f]
-
-2013-07-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html,
-	docs/html/ch02s06.html, docs/html/ch02s07.html,
-	docs/html/ch02s08.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch05.html, docs/html/ch05s02.html, docs/html/ch05s03.html,
-	docs/html/ch05s04.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html,
-	docs/html/properties_window.png, docs/pdf/manual.pdf,
-	docs/src/manual.xml:
-	Add section about "Language specific peculiarities" and fix broken
-	links
-	[0bacd2937507] <WXG-BRANCH-VERSION_0_6_7>
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html,
-	docs/html/ch02s06.html, docs/html/ch02s07.html,
-	docs/html/ch02s08.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch05.html, docs/html/ch05s02.html, docs/html/ch05s03.html,
-	docs/html/ch05s04.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html,
-	docs/html/properties_window.png, docs/pdf/manual.pdf,
-	docs/src/manual.xml:
-	Add section about "Language specific peculiarities" and fix broken
-	links
-	[bbc054686648]
-
-2013-06-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, misc.py:
-	Code reorganisation
-	[44b9a46fbb58]
-
-2013-06-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/styleless-dialog.cpp, tests/casefiles
-	/styleless-dialog.h, tests/casefiles/styleless-dialog.lisp,
-	tests/casefiles/styleless-dialog.pl, tests/casefiles/styleless-
-	dialog.py, tests/casefiles/styleless-dialog.wxg, tests/casefiles
-	/styleless-dialog.xrc, tests/test_codegen.py, tests/test_gui.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py:
-	Fix handling of style-less dialogs and frames (sf bug #145)
-	[28d4010e08d9] <WXG-BRANCH-VERSION_0_6_7>
-
-	* tests/test_gui.py:
-	Improve GUI test code
-	[3e6399946365] <WXG-BRANCH-VERSION_0_6_7>
-
-	* NEWS.txt, tests/casefiles/styleless-dialog.cpp, tests/casefiles
-	/styleless-dialog.h, tests/casefiles/styleless-dialog.lisp,
-	tests/casefiles/styleless-dialog.pl, tests/casefiles/styleless-
-	dialog.py, tests/casefiles/styleless-dialog.wxg, tests/casefiles
-	/styleless-dialog.xrc, tests/test_codegen.py, tests/test_gui.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py:
-	Fix handling of style-less dialogs and frames (sf bug #145)
-	[4e391171149f]
-
-	* tests/test_gui.py:
-	Improve GUI test code
-	[0057a391ee52]
-
-2013-06-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widget_properties.py:
-	Minor function documentation update
-	[f5f6de46a504]
-
-2013-05-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* setup.py:
-	Add installer files to all packages
-	[0bcaf81f5daf]
-
-	* setup.py:
-	Internal restructuring
-	[b5955aef483c]
-
-2013-05-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* setup.py:
-	Typo
-	[d27f0c8d49d2]
-
-2013-05-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* setup.py:
-	Add test case files to release bundles
-	[9b46e37d8e9d]
-
-	* Makefile:
-	Call clean rule before building release packages
-	[60ac9a63907a]
-
-2013-05-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* README.txt, common.py:
-	Mark version as 0.6.7+
-	[1bfef4cd9659] <WXG-BRANCH-VERSION_0_6_7>
-
-	* docs/ReleaseSteps.txt:
-	Add stable branch handling to release documentation
-	[23e51b2ebdef]
-
-	* xml_parse.py:
-	Improve checking output path
-
-	The output path checking for single file generation returned a
-	misleading error message. This change improve the checking of the
-	ouput directory in such a case.
-	[79e542df29ee] <WXG-BRANCH-VERSION_0_6_7>
-
-	* NEWS.txt, main.py:
-	Fix an uninitialised variable in saving a project file (sf bug #
-	157)
-
-	The exception handler for general (not IOError and not OSError)
-	exceptions uses an uninitialised variable.
-	[0ba948da308b] <WXG-BRANCH-VERSION_0_6_7>
-
-	* NEWS.txt, xml_parse.py:
-	Fix "Overwrite existing sources" for new projects
-
-	The previous commit (1206:5214a3ac9026) to change the default for
-	overwriting existing sources was incomplete. Thereby this change
-	adds the missing part and set the GUI checkbox proberly also if a
-	non-overwrite project will be opened.
-	[ea791e73a6ec] <WXG-BRANCH-VERSION_0_6_7>
-
-	* NEWS.txt, codegen/__init__.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py,
-	tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc, tests/test_codegen.py:
-	Fix too strict sanity checks for class attributes
-	[3ee15268008d] <WXG-BRANCH-VERSION_0_6_7>
-
-	* tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc, tests/test_codegen.py:
-	Add complex test example
-	[5e68a548728f] <WXG-BRANCH-VERSION_0_6_7>
-
-	* NEWS.txt, widgets/notebook/codegen.py:
-	Fix XRC code generation for notebooks with panes
-	[85a8b4484e87] <WXG-BRANCH-VERSION_0_6_7>
-
-	* NEWS.txt, edit_sizers/perl_sizers_codegen.py:
-	Wrong SetSizeHint() call in Perl (Thanks to Eric McKeeth)
-	[0232035f04ee] <WXG-BRANCH-VERSION_0_6_7>
-
-	* Created WXG-BRANCH-VERSION_0_6_7 branch
-	[453a37c9f55a] <WXG-BRANCH-VERSION_0_6_7>
-
-	* msgdialog.py, res/messagedialog.wxg:
-	MessageDialog is resizeable now
-
-	It's simpler to read larger messages e.g. exception details now.
-	[d7c6498f673b]
-
-	* common.py:
-	Improve exception handler
-	[c99210689ebb]
-
-	* NEWS.txt, codegen/pl_codegen.py, codegen/py_codegen.py,
-	tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc, tests/test_codegen.py:
-	Fix handling of unicode characters in strings for Perl and Python
-
-	Looks like wxGlade uses ASCII internal at all places. This change
-	escapes unicode characters to continue handling of strings as ascii
-	strings.
-
-	The generated source code is always ascii, even if it contains an
-	encoding statement at top.
-	[7807f6d6a7fa]
-
-2013-05-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, common.py, wxglade.py:
-	Add comfortable exception handler for more detailed bug reports
-
-	This exception handler logs names, types and content of local
-	variables from top stack entry.
-	[1cd22e54ef36]
-
-2013-05-22  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Improve checking output path
-
-	The output path checking for single file generation returned a
-	misleading error message. This change improve the checking of the
-	ouput directory in such a case.
-	[528d6ec6e4cf]
-
-2013-05-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py:
-	Print locale settings during initialise GUI
-
-	Printing locale is a little bit late in init process. Setting and
-	printing should be earlier e.g. in wxglade.init_stage1().
-	[4f4e0e8bcdba]
-
-	* codegen/__init__.py, main.py:
-	Rename variables and minor code cleanups
-
-	Some variables have be renamed to prevent redefining Python built-
-	ins. Some imports have been restructured and other minor code
-	changes.
-	[274c597be116]
-
-	* NEWS.txt, main.py:
-	Fix an uninitialised variable in saving a project file (sf bug #
-	157)
-
-	The exception handler for general (not IOError and not OSError)
-	exceptions uses an uninitialised variable.
-	[6c47fb22bdad]
-
-	* NEWS.txt, xml_parse.py:
-	Fix "Overwrite existing sources" for new projects
-
-	The previous commit (1206:5214a3ac9026) to change the default for
-	overwriting existing sources was incomplete. Thereby this change
-	adds the missing part and set the GUI checkbox proberly also if a
-	non-overwrite project will be opened.
-	[32edb433b035]
-
-2013-05-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/__init__.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py,
-	tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc, tests/test_codegen.py:
-	Fix too strict sanity checks for class attributes
-	[c94dcad73493]
-
-2013-04-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/ComplexExample.cpp,
-	tests/casefiles/ComplexExample.h,
-	tests/casefiles/ComplexExample.lisp,
-	tests/casefiles/ComplexExample.pl,
-	tests/casefiles/ComplexExample.py,
-	tests/casefiles/ComplexExample.wxg,
-	tests/casefiles/ComplexExample.xrc, tests/test_codegen.py:
-	Add complex test example
-	[01d8bb798de7]
-
-	* NEWS.txt, widgets/notebook/codegen.py:
-	Fix XRC code generation for notebooks with panes
-	[57e7a7d844ed]
-
-2013-04-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* .hgtags:
-	Cleanup duplicate tags
-	[7ce391ea3f74]
-
-2013-04-13  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, edit_sizers/perl_sizers_codegen.py:
-	Wrong SetSizeHint() call in Perl (Thanks to Eric McKeeth)
-	[b7e763e639d3]
-
-	* NEWS.txt:
-	Prepare for new version
-	[d9d3e6c88263]
-
-2013-04-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, docs/html/apa.html, docs/html/apb.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html,
-	docs/html/ch02s06.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s06.html, docs/html/ch03s07.html, docs/html/ch04.html,
-	docs/html/ch05.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html, docs/pdf/manual.pdf,
-	docs/src/manual.xml:
-	Start development for wx 3.0 support
-	[36c2fab9a7e7]
-
-2013-04-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/BuildingInstaller.txt, docs/ReleaseSteps.txt:
-	Update release documentation
-	[354ad29010d1]
-
-	* common.py, install/pyinstaller/wxglade-installer.iss:
-	Set version numbers back to HG to start new development cycle
-	[0cd76cabf7cb]
-
-	* .hgtags:
-	Added tag rel_0.6.7 for changeset 09ab5dec05ce
-	[b82efd84c958]
-
-	* common.py, install/pyinstaller/wxglade-installer.iss:
-	Bump version number to 0.6.7
-	[09ab5dec05ce] [rel_0.6.7]
-
-	* CHANGES.txt, NEWS.txt, README.txt:
-	Prerelease documentation updates
-	[37684571f31f]
-
-	* NEWS.txt, res/templates_ui.wxg, template.py, templates_ui.py:
-	Improve usability of the dialog to list and open templates
-	[a19405d8464e]
-
-	* NEWS.txt, codegen/py_codegen.py:
-	Regression in generated Python code for bindung events
-
-	The regression was introduced in 1173:95047b445b12 "Rework
-	generating constructor code in all code generators".
-
-	The generated code raised an AssertionError if the source of the
-	event is specified by an ID number instead of a widget.
-	[11b82132ec86]
-
-2013-04-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, edit_sizers/edit_sizers.py, res/templates_ui.wxg,
-	templates_ui.py, widgets/spacer/spacer.py:
-	Preselect some dialog elements
-
-	Simplify usage of some dialogs by setting focus to first input
-	widget and select the widget content.
-	[4794febbd4d3]
-
-2013-04-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py:
-	Show feedback in status bar if code generation dialog is suppressed
-	[2a9c6855e18a]
-
-2013-04-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_gui.py:
-	Repair GUI test broken with 1223:602859354d4b
-	[92d261ba743f]
-
-	* NEWS.txt, codegen/py_codegen.py, tests/casefiles/CalendarCtrl.py,
-	tests/casefiles/FontColour.py, tests/casefiles/Gauge.py,
-	tests/casefiles/Grid.py, tests/casefiles/HyperlinkCtrl_26.py,
-	tests/casefiles/HyperlinkCtrl_28.py,
-	tests/casefiles/PyAddApp_multi_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_simple.py,
-	tests/casefiles/PyAddApp_multi_simple.py, tests/casefiles/PyOgg1.py,
-	tests/casefiles/PyOgg1_oldnamespace.py,
-	tests/casefiles/PyOgg2_app.py, tests/casefiles/PyOgg3.py,
-	tests/casefiles/Python_Preferences.py,
-	tests/casefiles/Sizers_classattr.py,
-	tests/casefiles/Sizers_no_classattr.py,
-	tests/casefiles/add_class_inplace_extended.py,
-	tests/casefiles/add_class_inplace_orig.py,
-	tests/casefiles/no_suitable_writer.py,
-	tests/casefiles/remove_class_inplace_expected.py,
-	tests/casefiles/remove_class_inplace_input.py:
-	Remove empty line between shebang and encoding statement in Python
-	files
-
-	The additional empty line between the shebang and the encoding
-	statement violates PEP 0263 and causes some trouble with utf-8 on
-	win7.
-	[2e90add4076a]
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py:
-	Change handling of empty lines in file headers
-
-	Hardcoded empty lines are removed. The empty lines are added to the
-	variables shebang, tmpl_encoding and language_note. Thereby the
-	generated code has not changed.
-	[df6744b0901d]
-
-	* application.py:
-	Minor change in source documentation
-	[8183c8ee4e24]
-
-2013-03-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* credits.txt:
-	Update Main Developer
-	[b4e3ef274e80]
-
-	* NEWS.txt, application.py, config.py, configUI.py, configdialog.py,
-	res/preferences.wxg:
-	Add a config option to suppress the code generation success message
-	[602859354d4b]
-
-	* common.py:
-	Fix plus sign for uncommitted changes in version number.
-
-	"++" was shown due a logical bug. Now just "+" is shown. The plus
-	sign in version number indicates not committed changes.
-	[5a9daca7f1cd]
-
-2013-03-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, common.py, install/pyinstaller/wxglade-installer.iss:
-	Set version numbers back to HG to start new development cycle
-	[508d0ee2eca7]
-
-2013-03-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* .hgtags:
-	Added tag rel_0.6.6 for changeset 9ee81dcd0dc1
-	[e29081a1182d]
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Uninstall byte-code files for hyperlink widget too
-	[9ee81dcd0dc1] [rel_0.6.6]
-
-	* .hgtags:
-	Added tag rel_0.6.6 for changeset 4487d7edc422
-	[198de9aff62b]
-
-	* common.py, install/pyinstaller/wxglade-installer.iss:
-	Bump version number to 0.6.6
-	[4487d7edc422]
-
-	* CHANGES.txt, NEWS.txt, README.txt, credits.txt:
-	Prerelease documentation updates
-	[0b81f0b99f4c]
-
-	* application.py, docs/html/apa.html, docs/html/apb.html,
-	docs/html/ch01.html, docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html,
-	docs/html/ch02s06.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s06.html, docs/html/ch03s07.html, docs/html/ch04.html,
-	docs/html/ch05.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html,
-	docs/html/properties_window_application.png,
-	docs/html/properties_window_settings.png,
-	docs/html/properties_window_tab_1_change.png, docs/html/wxglade.png,
-	docs/pdf/manual.pdf, docs/src/manual.xml,
-	docs/src/properties_window.png,
-	docs/src/properties_window_application.png,
-	docs/src/properties_window_settings.png,
-	docs/src/properties_window_tab_1_change.png, docs/src/wxglade.png:
-	Combine language specific panels in application properties dialog
-	[b0e2289dbaaf]
-
-	* application.py, codegen/__init__.py:
-	Typo in source documentation
-	[34788736bd1f]
-
-	* NEWS.txt, application.py, codegen/__init__.py, config.py,
-	docs/html/apa.html, docs/html/apb.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html,
-	docs/html/ch02s06.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s06.html, docs/html/ch03s07.html, docs/html/ch04.html,
-	docs/html/ch05.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html, docs/pdf/manual.pdf,
-	docs/src/manual.xml, tests/casefiles/PyAddApp_multi_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_simple.py,
-	tests/casefiles/PyAddApp_multi_simple.py, xml_parse.py:
-	Change some default settings and reorg internal handling
-
-	The primary changes are:
-	 - usage of UTF-8 as fallback encoding
-	 - enable gettext per default
-
-	Some of the default values are converted from hard coded values to
-	variables located in config module.
-	[530b2bc1c3dd]
-
-2013-03-16  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/LispOgg1.lisp, tests/casefiles/LispOgg1.wxg,
-	tests/casefiles/PlOgg1.pl, tests/casefiles/PlOgg1.wxg,
-	tests/casefiles/PyOgg1.py, tests/casefiles/PyOgg1.wxg,
-	tests/casefiles/PyOgg1_oldnamespace.py:
-	Unify test cases
-	[db270e04afa2]
-
-2013-03-15  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, edit_windows.py:
-	Setting invalid windows names hasn't blocked fully (sf bug #154)
-	[d4d79f527fcb]
-
-2013-03-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html,
-	docs/html/ch02s06.html, docs/html/ch02s07.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch05.html, docs/html/ch05s03.html, docs/html/index.html,
-	docs/html/pr01.html, docs/html/pr01s02.html, docs/html/pr01s03.html,
-	docs/pdf/manual.pdf, docs/src/manual.xml:
-	Extend documentation with a best practice section
-	[e4581bbb1907]
-
-2013-03-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/py_codegen.py, tests/test_codegen.py:
-	Do not format wx classnames, constants and ... twice in Python.
-
-	Add check if the parameter hand over to cn() is already formatted
-	and do not format such a parameter again.
-
-	This is just the case if the user enters language-specific formatted
-	values.
-	[fffa28856fa7]
-
-2013-02-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_sizers/edit_sizers.py:
-	Added tooltips to sizer elements and dialogs
-	[eadd3417d239]
-
-2013-02-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/test_codegen.py:
-	Unify code generation of adding objects to sizers
-	[1c0d04e7277b]
-
-2013-02-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, application.py:
-	Set "Overwrite existing sources" for new projects
-	[5214a3ac9026]
-
-	* codegen/py_codegen.py:
-	Small change to format flags in Python
-	[048c0e1bd6c7]
-
-2013-02-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/pl_codegen.py, codegen/py_codegen.py:
-	Don't format border property in add_sizeritem - it's always an
-	integer
-	[02c177e6f619]
-
-	* codegen/lisp_codegen.py, widgets/button/lisp_codegen.py,
-	widgets/checkbox/lisp_codegen.py, widgets/choice/lisp_codegen.py,
-	widgets/combo_box/lisp_codegen.py, widgets/gauge/lisp_codegen.py,
-	widgets/hyperlink_ctrl/lisp_codegen.py,
-	widgets/list_box/lisp_codegen.py, widgets/list_ctrl/lisp_codegen.py,
-	widgets/notebook/lisp_codegen.py, widgets/panel/lisp_codegen.py,
-	widgets/radio_box/lisp_codegen.py,
-	widgets/radio_button/lisp_codegen.py,
-	widgets/slider/lisp_codegen.py, widgets/spin_button/lisp_codegen.py,
-	widgets/spin_ctrl/lisp_codegen.py,
-	widgets/splitter_window/lisp_codegen.py,
-	widgets/static_bitmap/lisp_codegen.py,
-	widgets/static_line/lisp_codegen.py,
-	widgets/static_text/lisp_codegen.py,
-	widgets/text_ctrl/lisp_codegen.py, widgets/toolbar/lisp_codegen.py,
-	widgets/tree_ctrl/lisp_codegen.py:
-	Improve flag handling in Lisp code generator
-	[4a314a069f94]
-
-2013-02-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, edit_sizers/edit_sizers.py,
-	edit_sizers/lisp_sizers_codegen.py,
-	edit_sizers/perl_sizers_codegen.py, edit_sizers/sizers_codegen.py,
-	tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg2_MyFrame.lisp,
-	tests/casefiles/LispOgg3.lisp,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Sizers_classattr.cpp,
-	tests/casefiles/Sizers_classattr.h,
-	tests/casefiles/Sizers_classattr.lisp,
-	tests/casefiles/Sizers_classattr.pl,
-	tests/casefiles/Sizers_classattr.py,
-	tests/casefiles/Sizers_classattr.wxg,
-	tests/casefiles/Sizers_classattr.xrc,
-	tests/casefiles/Sizers_no_classattr.cpp,
-	tests/casefiles/Sizers_no_classattr.h,
-	tests/casefiles/Sizers_no_classattr.lisp,
-	tests/casefiles/Sizers_no_classattr.pl,
-	tests/casefiles/Sizers_no_classattr.py,
-	tests/casefiles/Sizers_no_classattr.wxg,
-	tests/casefiles/Sizers_no_classattr.xrc,
-	tests/casefiles/add_class_inplace_extended.lisp,
-	tests/casefiles/add_class_inplace_orig.lisp,
-	tests/casefiles/remove_class_inplace_expected.lisp,
-	tests/casefiles/remove_class_inplace_input.lisp,
-	tests/test_codegen.py, wxglade.py:
-	Add "Store as attribute" for sizers
-
-	Sizers won't store as class attributes per default. You can enable
-	this using the new GUI element.
-
-	This change primarily affects Python and C++, because the code
-	generators for Perl and Lisp do already store sizers as class
-	attributes.
-	[f4503e3639c7]
-
-2013-01-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/py_codegen.py:
-	Fix AttributeError during preview of a new generated project.
-
-	This bug is a regression introducted in commit 197d18d "Set
-	codewriter variables back to defaults if a new document is created"
-	[7d6af3dd3e56]
-
-2013-01-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Add source documention for in_sizers and in_windows
-	[8620694a219c]
-
-2013-01-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/__init__.py:
-	Improve error message for missing test files
-	[63309a107352]
-
-	* tests/__init__.py, tests/test_codegen.py:
-	Introduce WXGladeBaseTest._test_all() to generate code for all
-	languages at once.
-	[7562a1b59aad]
-
-2013-01-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_sizers/edit_sizers.py, edit_sizers/lisp_sizers_codegen.py,
-	edit_sizers/perl_sizers_codegen.py, edit_sizers/sizers_codegen.py,
-	tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/FontColour.lisp, tests/casefiles/Gauge.lisp,
-	tests/casefiles/Grid.lisp, tests/casefiles/HyperlinkCtrl_26.lisp,
-	tests/casefiles/HyperlinkCtrl_28.lisp,
-	tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg2_MyFrame.lisp,
-	tests/casefiles/LispOgg3.lisp,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Lisp_wxBitmapButton.lisp,
-	tests/casefiles/Perl_Preferences.pl,
-	tests/casefiles/add_class_inplace_extended.lisp,
-	tests/casefiles/add_class_inplace_orig.lisp,
-	tests/casefiles/no_suitable_writer.lisp,
-	tests/casefiles/remove_class_inplace_expected.lisp,
-	tests/casefiles/remove_class_inplace_input.lisp:
-	Unify sizer code generation
-	[98a1f4674b36]
-
-2013-01-15  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/pl_codegen.py:
-	Add more wx constants to prevent formatting of those contants.
-	[ff748962a528]
-
-2013-01-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tree.py, xml_parse.py:
-	applied patch by Roel van Os: "When pasting: only search current
-	top-level window for duplicate names"
-
-	Original commit: 923:3b06bb046ccf at
-	https://bitbucket.org/elentirmo/wxglade_elentirmo
-	[befeac404735]
-
-2013-01-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/CPPOgg1.cpp, tests/casefiles/CPPOgg1.wxg,
-	tests/casefiles/CPPOgg2.wxg, tests/casefiles/CPPOgg2_MyDialog.cpp,
-	tests/casefiles/CPPOgg3.cpp, tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg1.wxg, tests/casefiles/LispOgg2.wxg,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg3.lisp, tests/casefiles/LispOgg3.wxg,
-	tests/casefiles/PlOgg1.pl, tests/casefiles/PlOgg1.wxg,
-	tests/casefiles/PlOgg2.wxg, tests/casefiles/PlOgg2_MyDialog.pm,
-	tests/casefiles/PlOgg3.pl, tests/casefiles/PyOgg1.py,
-	tests/casefiles/PyOgg1.wxg, tests/casefiles/PyOgg1_oldnamespace.py,
-	tests/casefiles/PyOgg2.wxg, tests/casefiles/PyOgg2_MyDialog.py,
-	tests/casefiles/PyOgg3.py:
-	Remove flag wxTHICK_FRAME because it is not available with wxPerl
-	2.8
-
-	The code generated by the test suite is fine, but you can't start
-	the test programs with a current wxPerl. Thereby I've remove this
-	flag.
-	[1a2fe678e1b0]
-
-2013-01-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/HyperlinkCtrl_26.cpp,
-	tests/casefiles/HyperlinkCtrl_26.lisp,
-	tests/casefiles/HyperlinkCtrl_26.pl,
-	tests/casefiles/HyperlinkCtrl_26.py,
-	tests/casefiles/no_suitable_writer.cpp,
-	tests/casefiles/no_suitable_writer.lisp,
-	tests/casefiles/no_suitable_writer.pl,
-	tests/casefiles/no_suitable_writer.py,
-	tests/casefiles/no_suitable_writer.wxg:
-	Don't add unsupported widgets to a sizer
-
-	Widgets without code generator or widget that are not supporting the
-	requested wx version are blacklisted now. Thereby the widgets won't
-	add to any sizers.
-	[deff762b7529]
-
-	* tests/casefiles/HyperlinkCtrl_26.lisp, tests/test_codegen.py:
-	Activate tests for HyperlinkCtrl and Lisp
-	[ae54b3f2c112]
-
-	* codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Remove unused imports of cStringIO
-	[972fc3bdb200]
-
-	* codegen/__init__.py, tests/casefiles/HyperlinkCtrl_26.pl,
-	tests/casefiles/HyperlinkCtrl_26.py,
-	tests/casefiles/no_suitable_writer.lisp,
-	tests/casefiles/no_suitable_writer.pl,
-	tests/casefiles/no_suitable_writer.py:
-	Add warning messages to Perl, Python and Lisp source code again
-	[0006bfa8f874]
-
-2013-01-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/HyperlinkCtrl_26.pl,
-	tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg3.lisp,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Perl_Preferences.pl, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg2_MyDialog.pm,
-	tests/casefiles/no_suitable_writer.lisp,
-	tests/casefiles/no_suitable_writer.pl, tests/test_codegen.py:
-	Unify code generation for widgets in Perl, Python and Lisp.
-
-	Merge add_object() code of Perl, Python and Lisp code writer. The
-	change unify the code generation code.
-
-	The warning messages won't be included in generated Perl code now.
-	One of the next commits will re-introduce the warning messages to
-	Perl, Python and Lisp.
-	[f2673117df2a]
-
-2013-01-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_codegen.py:
-	Solve logical bug in test case for no suitable writer
-
-	A difference between generated and expected code causes an test
-	failure (that's ok). But the temporary removed wxButton widget
-	wouldn't restored in such a case. This change fixes the behaviour.
-	[869922b3cc5e]
-
-2012-12-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, codegen/__init__.py, edit_sizers/edit_sizers.py,
-	edit_windows.py, font_dialog.py, misc.py, tree.py,
-	widget_properties.py, wxglade.py:
-	Replace traceback.print_exc() by common.message.exception()
-	[166866b98938]
-
-	* codegen/__init__.py, codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg1.wxg:
-	Rework generating code in Lisp, Perl and Python code generator
-
-	This changes primarily unify the add_class() function and move it to
-	the base class.
-
-	BTW: This changes solves a bug that has suppressed adding extra code
-	to Perl sources.
-	[f8ef056f45c3]
-
-2012-12-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Simplify access to parent attributes in SourceFileContent
-
-	The language specific instances of SourceFileContent need access to
-	a few attributes of the parent code writer instance.
-
-	Most of the ctor parameters are replaced by a new parameter called
-	"code_writer" and this is used to access parents attributes in the
-	ctor once.
-	[28a48389ee1e]
-
-	* Makefile:
-	Exclude test cases from pylint run
-	[657c33e80e1b]
-
-	* codegen/xrc_codegen.py,
-	tests/casefiles/add_class_inplace_extended.xrc:
-	Use OrderedDict in XRC code generator to prevent flipping of
-	entries.
-
-	This flipping entries may break unittests randomly.
-	[814915641f4b]
-
-	* docs/html/apa.html, docs/html/apb.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch01s07.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch05.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/pdf/manual.pdf, docs/src/manual.xml,
-	ordereddict.py:
-	Add 3rd party software OrderedDict
-
-	The class OrderedDict provides a dictionary that remembers insertion
-	order.
-
-	This feature is useful to prevent flipping of lines or code blocks
-	in automatically generated source code.
-	[e9fda479ce91]
-
-	* Makefile, docs/src/html.xsl:
-	Suppress appendix toc in HTML documentation
-	[eb6faf0cccca]
-
-2012-12-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py,
-	tests/casefiles/remove_class_inplace_expected.cpp,
-	tests/casefiles/remove_class_inplace_expected.lisp,
-	tests/casefiles/remove_class_inplace_expected.pl,
-	tests/casefiles/remove_class_inplace_expected.py,
-	tests/test_codegen.py:
-	Fix warning for removed / renamed top-level classes.
-
-	The mis-formatting of the warning messages, was probably introduced
-	during the code generator rework. I'm sorry.
-	[53544add48cf]
-
-	* tests/casefiles/add_class_inplace_extended.cpp,
-	tests/casefiles/add_class_inplace_extended.h,
-	tests/casefiles/add_class_inplace_extended.lisp,
-	tests/casefiles/add_class_inplace_extended.pl,
-	tests/casefiles/add_class_inplace_extended.py,
-	tests/casefiles/add_class_inplace_extended.wxg,
-	tests/casefiles/add_class_inplace_extended.xrc,
-	tests/casefiles/add_class_inplace_orig.cpp,
-	tests/casefiles/add_class_inplace_orig.h,
-	tests/casefiles/add_class_inplace_orig.lisp,
-	tests/casefiles/add_class_inplace_orig.pl,
-	tests/casefiles/add_class_inplace_orig.py,
-	tests/casefiles/add_class_inplace_orig.xrc,
-	tests/casefiles/remove_class_inplace.wxg,
-	tests/casefiles/remove_class_inplace_expected.cpp,
-	tests/casefiles/remove_class_inplace_expected.h,
-	tests/casefiles/remove_class_inplace_expected.lisp,
-	tests/casefiles/remove_class_inplace_expected.pl,
-	tests/casefiles/remove_class_inplace_expected.py,
-	tests/casefiles/remove_class_inplace_expected.xrc,
-	tests/casefiles/remove_class_inplace_input.cpp,
-	tests/casefiles/remove_class_inplace_input.h,
-	tests/casefiles/remove_class_inplace_input.lisp,
-	tests/casefiles/remove_class_inplace_input.pl,
-	tests/casefiles/remove_class_inplace_input.py,
-	tests/casefiles/remove_class_inplace_input.xrc,
-	tests/test_codegen.py:
-	Add two test cases for adding and removing top-level widget in-place
-
-	The generated code looks broken for Perl, Python and Lisp currently.
-	[21db30e11f3a]
-
-2012-12-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, tests/casefiles/no_suitable_writer.cpp,
-	tests/casefiles/no_suitable_writer.h,
-	tests/casefiles/no_suitable_writer.lisp,
-	tests/casefiles/no_suitable_writer.pl,
-	tests/casefiles/no_suitable_writer.py,
-	tests/casefiles/no_suitable_writer.wxg,
-	tests/casefiles/no_suitable_writer.xrc, tests/test_codegen.py:
-	Add a test case to test "no suitable writer" warning.
-
-	This warning occurs if the widget exists generally but there is no
-	writer for the language to generate.
-
-	Currently the warning won't written to all generated source files.
-	It will be written for C++, Lisp and Perl. Not for Python.
-	[dfd7952244cc]
-
-	* common.py, config.py, template.py:
-	Replace os.mkdir() by more robust and recursive working
-	os.makedirs()
-	[59f60ff617c5]
-
-	* tests/__init__.py:
-	Add faked implementation of os.makedirs() for unittests
-	[7b14faea8cbf]
-
-2012-12-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Improve storing files from code generators.
-
-	Add new functions to separate creating filenames to unify code
-	generators a little bit more.
-
-	Create sub directories e.g. for Perl modules during saving of the
-	generated source code.
-	[00a679328f06]
-
-	* tests/__init__.py:
-	Improve faked os.path.isdir() implementation
-
-	This implementation will be used for tests only.
-	[0c7932b9d1d9]
-
-2012-12-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/CPPOgg1.cpp,
-	tests/casefiles/CPPOgg2_MyDialog.cpp, tests/casefiles/CPPOgg3.cpp,
-	tests/casefiles/CPP_wxCalendarCtrl.cpp,
-	tests/casefiles/CalendarCtrl.pl, tests/casefiles/FontColour.lisp,
-	tests/casefiles/FontColour.pl, tests/casefiles/Gauge.lisp,
-	tests/casefiles/Gauge.pl, tests/casefiles/Grid.cpp,
-	tests/casefiles/Grid.lisp, tests/casefiles/Grid.pl,
-	tests/casefiles/Grid.py, tests/casefiles/HyperlinkCtrl_26.lisp,
-	tests/casefiles/HyperlinkCtrl_26.pl,
-	tests/casefiles/HyperlinkCtrl_28.lisp,
-	tests/casefiles/HyperlinkCtrl_28.pl, tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg2_MyFrame.lisp,
-	tests/casefiles/LispOgg3.lisp,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Lisp_wxBitmapButton.lisp,
-	tests/casefiles/Perl_Preferences.pl, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg2_MyDialog.pm,
-	tests/casefiles/PlOgg2_MyFrame.pm, tests/casefiles/PlOgg3.pl,
-	tests/casefiles/PyOgg1.py, tests/casefiles/PyOgg1_oldnamespace.py,
-	tests/casefiles/PyOgg2_MyDialog.py, tests/casefiles/PyOgg3.py:
-	Rework generating constructor code in all code generators
-
-	This causes some minor changes in the code generated by wxGlade for
-	Lisp, Perl, Python and C++.
-
-	For Perl: Some empty lines are gone.
-
-	For Lisp: The round brackets are now outside of the blocks "begin
-	wxGlade" and "end wxGlade" in the Lisp code now. There is an
-	additional new line in front of the dependencies now.
-
-	For Python: A single quotation mark has changed in a printed
-	message.
-
-	For C++: Event table and event handler stubs have been moved later
-	in the same file. This change was necessary to equalise parts of the
-	C++ code generator code.
-	[95047b445b12]
-
-2012-12-22  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py:
-	Fix for wrong formatted error message
-	[a93cd2d12368]
-
-2012-12-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/CalendarCtrl.pl,
-	tests/casefiles/FontColour.lisp, tests/casefiles/FontColour.pl,
-	tests/casefiles/Gauge.lisp, tests/casefiles/Gauge.pl,
-	tests/casefiles/Grid.lisp, tests/casefiles/Grid.pl,
-	tests/casefiles/HyperlinkCtrl_26.lisp,
-	tests/casefiles/HyperlinkCtrl_26.pl,
-	tests/casefiles/HyperlinkCtrl_28.lisp,
-	tests/casefiles/HyperlinkCtrl_28.pl, tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg2_MyFrame.lisp,
-	tests/casefiles/LispOgg3.lisp,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Lisp_wxBitmapButton.lisp,
-	tests/casefiles/Perl_Preferences.pl, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg2_MyDialog.pm,
-	tests/casefiles/PlOgg2_MyFrame.pm, tests/casefiles/PlOgg3.pl:
-	Rework __do_layout() and __set_properties() in all code generators
-
-	Now the functions __do_layout() and __set_properties() are generated
-	by using the same code. This causes some minor changes in the code
-	generated by wxGlade for both functions for Perl and Lisp.
-
-	Both changes effects only Perl and Lisp code generated for both
-	functions and if in-place editing is used.
-
-	For Perl: Some empty lines are gone.
-
-	For Lisp: The round brackets are now outside of the blocks "begin
-	wxGlade" and "end wxGlade" in the Lisp code now.
-	[f307a8fbd781]
-
-	* codegen/pl_codegen.py:
-	Remove preview code from Perl code generator
-	[3cf9c2976fc8]
-
-	* widgets/bitmap_button/lisp_codegen.py:
-	Add missing newlines in Lisp codegen for wxBitmapButton
-	[817d0c6175e1]
-
-2012-12-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py:
-	Code generatore source code cleanups and aligments
-	[9608beb7c72f]
-
-	* codegen/__init__.py, codegen/xrc_codegen.py,
-	tests/casefiles/HyperlinkCtrl_26.cpp,
-	tests/casefiles/HyperlinkCtrl_26.pl:
-	Add BaseSourceFileContent._format_comment() and _source_comment().
-
-	Generic functions to write a warning message to the source code.
-	[3958c37229b2]
-
-2012-12-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Fix directory check in CodeWriter class if just the file name is
-	given
-	[6c1e25ee98e6]
-
-	* NEWS.txt:
-	Update NEWS.txt
-	[296e50bb4c1b]
-
-	* NEWS.txt, icons/hyperlink_ctrl.xpm,
-	tests/casefiles/HyperlinkCtrl_26.cpp,
-	tests/casefiles/HyperlinkCtrl_26.h,
-	tests/casefiles/HyperlinkCtrl_26.lisp,
-	tests/casefiles/HyperlinkCtrl_26.pl,
-	tests/casefiles/HyperlinkCtrl_26.py,
-	tests/casefiles/HyperlinkCtrl_26.wxg,
-	tests/casefiles/HyperlinkCtrl_26.xrc,
-	tests/casefiles/HyperlinkCtrl_28.cpp,
-	tests/casefiles/HyperlinkCtrl_28.h,
-	tests/casefiles/HyperlinkCtrl_28.lisp,
-	tests/casefiles/HyperlinkCtrl_28.pl,
-	tests/casefiles/HyperlinkCtrl_28.py,
-	tests/casefiles/HyperlinkCtrl_28.wxg,
-	tests/casefiles/HyperlinkCtrl_28.xrc, tests/test_codegen.py,
-	widgets/hyperlink_ctrl/__init__.py,
-	widgets/hyperlink_ctrl/codegen.py,
-	widgets/hyperlink_ctrl/hyperlink_ctrl.py,
-	widgets/hyperlink_ctrl/lisp_codegen.py,
-	widgets/hyperlink_ctrl/perl_codegen.py, widgets/widgets.txt:
-	Add new widget HyperlinkCtrl
-	[391295336917]
-
-2012-12-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* events_mixin.py, misc.py:
-	Remove code to support Python 2.2
-	[eb35f65cadf9]
-
-	* misc.py:
-	Epydoc fix
-	[f8e79ab6fffb]
-
-	* edit_windows.py, widget_properties.py:
-	Remove unused code
-	[793912785cee]
-
-	* NEWS.txt, codegen/__init__.py, edit_windows.py, misc.py:
-	Add support for widget builder that don't support all wx versions
-
-	Some new widgets like wxHyperlinkCtrl are not available for
-	wxWidgets 2.6. Thereby a new class attribute called "supported_by"
-	is introducted.
-
-	The attribute has set in the code generator class are well as in the
-	class to edit the widget.
-
-	The properties window shows a note at bottom if the widget is not
-	supported at all wx versions supported by wxGlade.
-	[ddbfb3f0bb2d]
-
-	* application.py:
-	Add a class variable to Application class with all supported wx
-	versions
-
-	The class variable Application.all_supported_versions contains a
-	list of all supported wxWidgets versions now. The variable is also
-	used to build GUI elements.
-	[016625ff23ce]
-
-2012-12-17  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py:
-	Just add a comment to source
-	[72cd121f0c04]
-
-2012-12-16  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Unify codegenerators
-
-	Move the initial action for adding a object from language specific
-	code generators to base class BaseCodeWriter.
-	[aa8fa3b004cd]
-
-2012-12-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py:
-	Minor changes to eliminate a indentation level
-	[e96710974d59]
-
-	* misc.py:
-	Check abbreviations case in-sensitive and return them upper case
-
-	The function capitalize() doesn't capitalize some abbreviations e.g.
-	XML. Now the check for this abbreviations is case in-sensitive and
-	returns the abbreviation always upper case.
-	[0876a4632567]
-
-2012-12-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py:
-	Show filename of loaded project file
-	[48c968ca924b]
-
-2012-12-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Use common.messages.exception() for exception logging
-	[0cd7f89db07b]
-
-	* xml_parse.py:
-	Implement workaround for SAX internal UnicodeEncodeError (sf bug
-	#149)
-
-	Permanent workaround for Python bug "Sax parser crashes if given
-	unicode file name" (http://bugs.python.org/issue11159).
-
-	This bug causes a UnicodeEncodeError if the SAX XML parser wants to
-	store an unicode filename internally. That's not a general file
-	handling issue because the parameter source is an open file already.
-	[244a415a4c5b]
-
-	* NEWS.txt, application.py, codegen/__init__.py,
-	codegen/xrc_codegen.py, common.py, main.py, widget_properties.py:
-	Improve message logging
-	[63c4f06d4d40]
-
-2012-12-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Pep8 and documentation changes only
-	[c715ad2019a8]
-
-	* layout_option_property.py:
-	Rename unused variable
-	[1837b69fb41a]
-
-	* main.py:
-	Remove mutable default arguments
-	[bc3c6f504fc4]
-
-	* edit_sizers/__init__.py:
-	Add some comments
-	[321c6bd38818]
-
-	* application.py, widget_properties.py:
-	Remove mutable default arguments
-	[a7ffaf686b21]
-
-	* widget_properties.py:
-	Remove unused parameter first in on_change_value()
-
-	Currently on_change_value() is mostly used for event handling an
-	mutable argument first isn't used.
-	[60c3a81acd1c]
-
-2012-12-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html,
-	docs/html/ch01s07.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch02s06.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch05.html, docs/html/ch05s03.html, docs/html/index.html,
-	docs/html/pr01.html, docs/html/pr01s02.html, docs/html/pr01s03.html,
-	docs/html/wxglade.png, docs/pdf/manual.pdf, docs/src/manual.xml,
-	docs/src/wxglade.png:
-	Update and extend documentation
-	[f9b3c679ebb4]
-
-	* xrc2wxg.py:
-	Set HG executable bit only
-	[cc18532ddd99]
-
-2012-12-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, edit_windows.py, main.py:
-	Fix exceptions during widget preview triggered by keyboard shortcut
-	[a0b7bb0b1c3c]
-
-2012-12-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xrc2wxg.py:
-	Pep8 changes only
-	[01afcc969aab]
-
-2012-11-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py, codegen/cpp_codegen.py, main.py:
-	Add file extension automatically if no extension is given
-	[4c61cec7e162]
-
-	* credits.txt:
-	Add myself
-	[56b6b11ef5fd]
-
-2012-11-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/cpp_codegen.py,
-	tests/casefiles/CPPAddApp_multi_gettext_detailed.cpp,
-	tests/casefiles/CPPAddApp_multi_gettext_simple.cpp,
-	tests/casefiles/CPPAddApp_single_gettext_detailed.cpp,
-	tests/casefiles/CPPAddApp_single_gettext_simple.cpp,
-	tests/casefiles/CPPOgg1.cpp, tests/casefiles/CPPOgg1.h,
-	tests/casefiles/CPPOgg2_main.cpp, tests/casefiles/CPPOgg3.cpp,
-	tests/casefiles/CPPOgg3.h, tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CPP_Preferences.h, tests/casefiles/FontColour.cpp,
-	tests/casefiles/FontColour.h:
-	Relocate parts of the i18n code to a earlier position in file
-	[05ba7a0cecfc]
-
-	* codegen/__init__.py:
-	Remove cleaning variables in BaseCodeWriter.initialze()
-
-	The cleanup is done in BaseCodeWriter._init_vars() already.
-	[d9e115cf493a]
-
-	* NEWS.txt, codegen/cpp_codegen.py,
-	tests/casefiles/CPPAddApp_multi_gettext_detailed.cpp,
-	tests/casefiles/CPPAddApp_multi_gettext_simple.cpp,
-	tests/casefiles/CPPAddApp_multi_simple.cpp,
-	tests/casefiles/CPPAddApp_single_gettext_detailed.cpp,
-	tests/casefiles/CPPAddApp_single_gettext_simple.cpp,
-	tests/casefiles/CPPAddApp_single_simple.cpp,
-	tests/casefiles/CPPOgg1.cpp, tests/casefiles/CPPOgg2_main.cpp,
-	tests/casefiles/CPPOgg3.cpp, tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CPP_wxCalendarCtrl.cpp,
-	tests/casefiles/CalendarCtrl.cpp, tests/casefiles/FontColour.cpp,
-	tests/casefiles/Gauge.cpp, tests/casefiles/Grid.cpp,
-	tests/test_codegen.py:
-	Add simple application start code to C++ code generator
-	[48d35546c885]
-
-	* NEWS.txt, codegen/cpp_codegen.py,
-	tests/casefiles/CPPAddApp_multi_gettext_detailed.cpp,
-	tests/casefiles/CPPAddApp_single_gettext_detailed.cpp,
-	tests/casefiles/CPPOgg1.cpp, tests/casefiles/CPPOgg2_main.cpp,
-	tests/casefiles/CPPOgg3.cpp, tests/casefiles/FontColour.cpp:
-	Add i18n support to C++ code generator
-	[962f2af1515d]
-
-2012-11-10  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt:
-	Update NEWS.txt
-	[d6a6014568f0]
-
-	* codegen/__init__.py, codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Rename some codegen variables and extent source documentation
-	[a4429201e969]
-
-	* codegen/py_codegen.py, tests/casefiles/FontColour.py,
-	tests/casefiles/PyAddApp_multi_gettext_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_simple.py,
-	tests/casefiles/PyAddApp_single_gettext_detailed.py,
-	tests/casefiles/PyAddApp_single_gettext_simple.py,
-	tests/casefiles/PyOgg1.py, tests/casefiles/PyOgg1_oldnamespace.py,
-	tests/casefiles/PyOgg2_app.py, tests/casefiles/PyOgg3.py,
-	tests/casefiles/Python_Preferences.py:
-	Relocate Pythons gettext import statements
-	[0603b7328418]
-
-	* codegen/__init__.py, codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Move python codegen specific code from BaseCodeWriter to
-	PythonCodeWriter
-	[66b7578476bd]
-
-2012-11-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/pl_codegen.py, codegen/py_codegen.py:
-	Set codewriter variables back to defaults if a new document is
-	created
-	[197d18db6d1d]
-
-2012-11-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/pl_codegen.py,
-	tests/casefiles/PlAddApp_multi_gettext_simple.pl,
-	tests/casefiles/PlAddApp_multi_simple.pl,
-	tests/casefiles/PlOgg2_app.pl:
-	Simplify generation of Perl application startup code
-	[33a7e8bfbade]
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/test_codegen.py:
-	Separate code templates for application startup code
-
-	The code pieces are moved into class variables as well as join
-	language specific parts of add_app().
-	[8c4d1d553680]
-
-2012-11-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/CPPAddApp_detailed.cpp,
-	tests/casefiles/CPPAddApp_gettext_detailed.cpp,
-	tests/casefiles/CPPAddApp_gettext_simple.cpp,
-	tests/casefiles/CPPAddApp_multi_detailed.cpp,
-	tests/casefiles/CPPAddApp_multi_gettext_detailed.cpp,
-	tests/casefiles/CPPAddApp_simple.cpp,
-	tests/casefiles/CPPAddApp_single_detailed.cpp,
-	tests/casefiles/CPPAddApp_single_gettext_detailed.cpp,
-	tests/casefiles/CPPAddApp_single_gettext_simple.cpp,
-	tests/casefiles/CPPAddApp_single_simple.cpp,
-	tests/casefiles/LispAddApp_detailed.lisp,
-	tests/casefiles/LispAddApp_gettext_detailed.lisp,
-	tests/casefiles/LispAddApp_gettext_simple.lisp,
-	tests/casefiles/LispAddApp_multi_detailed.lisp,
-	tests/casefiles/LispAddApp_multi_gettext_detailed.lisp,
-	tests/casefiles/LispAddApp_multi_gettext_simple.lisp,
-	tests/casefiles/LispAddApp_multi_simple.lisp,
-	tests/casefiles/LispAddApp_simple.lisp,
-	tests/casefiles/LispAddApp_single_detailed.lisp,
-	tests/casefiles/LispAddApp_single_gettext_detailed.lisp,
-	tests/casefiles/LispAddApp_single_gettext_simple.lisp,
-	tests/casefiles/LispAddApp_single_simple.lisp,
-	tests/casefiles/PlAddApp_detailed.pl,
-	tests/casefiles/PlAddApp_gettext_detailed.pl,
-	tests/casefiles/PlAddApp_gettext_simple.pl,
-	tests/casefiles/PlAddApp_multi_detailed.pl,
-	tests/casefiles/PlAddApp_multi_gettext_detailed.pl,
-	tests/casefiles/PlAddApp_multi_gettext_simple.pl,
-	tests/casefiles/PlAddApp_multi_simple.pl,
-	tests/casefiles/PlAddApp_simple.pl,
-	tests/casefiles/PlAddApp_single_detailed.pl,
-	tests/casefiles/PlAddApp_single_gettext_detailed.pl,
-	tests/casefiles/PlAddApp_single_gettext_simple.pl,
-	tests/casefiles/PlAddApp_single_simple.pl,
-	tests/casefiles/PyAddApp_detailed.py,
-	tests/casefiles/PyAddApp_gettext_detailed.py,
-	tests/casefiles/PyAddApp_gettext_simple.py,
-	tests/casefiles/PyAddApp_multi_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_detailed.py,
-	tests/casefiles/PyAddApp_multi_gettext_simple.py,
-	tests/casefiles/PyAddApp_multi_simple.py,
-	tests/casefiles/PyAddApp_simple.py,
-	tests/casefiles/PyAddApp_single_detailed.py,
-	tests/casefiles/PyAddApp_single_gettext_detailed.py,
-	tests/casefiles/PyAddApp_single_gettext_simple.py,
-	tests/casefiles/PyAddApp_single_simple.py, tests/test_codegen.py:
-	Add more tests for app code generation
-	[021f78af9555]
-
-	* codegen/__init__.py, codegen/cpp_codegen.py, tests/test_codegen.py:
-	Rename CPPCodeWriter.output_source to CPPCodeWriter.output_file
-	[d708a58267a3]
-
-2012-11-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/CPPAddApp_detailed.cpp,
-	tests/casefiles/CPPAddApp_gettext_detailed.cpp,
-	tests/casefiles/CPPAddApp_gettext_simple.cpp,
-	tests/casefiles/CPPAddApp_simple.cpp,
-	tests/casefiles/LispAddApp_detailed.lisp,
-	tests/casefiles/LispAddApp_gettext_detailed.lisp,
-	tests/casefiles/LispAddApp_gettext_simple.lisp,
-	tests/casefiles/LispAddApp_simple.lisp,
-	tests/casefiles/PlAddApp_detailed.pl,
-	tests/casefiles/PlAddApp_gettext_detailed.pl,
-	tests/casefiles/PlAddApp_gettext_simple.pl,
-	tests/casefiles/PlAddApp_simple.pl,
-	tests/casefiles/PyAddApp_detailed.py,
-	tests/casefiles/PyAddApp_gettext_detailed.py,
-	tests/casefiles/PyAddApp_gettext_simple.py,
-	tests/casefiles/PyAddApp_simple.py, tests/test_codegen.py:
-	Add test for app code generation
-	[d4a475e26fc5]
-
-2012-11-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, application.py:
-	Add more tooltips to properties window
-	[6213d466e7d2]
-
-	* widget_properties.py:
-	Added tooltip for DialogProperty
-	[d457dcb2e491]
-
-2012-10-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widget_properties.py:
-	Rework tooltip handling to allow to set of tooltips without calling
-	display()
-	[8366ad0117c4]
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s06.html, docs/html/ch03s07.html, docs/html/ch04.html,
-	docs/html/ch05.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html, docs/pdf/manual.pdf,
-	docs/src/manual.xml:
-	Minor layout changes in wxGlade manual
-	[bfbca28b9495]
-
-2012-10-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widget_properties.py:
-	Minor source documentation changes
-	[b62aa553df64]
-
-	* application.py, docs/html/apa.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch05.html,
-	docs/html/design_window.png, docs/html/design_window_empty_slot.png,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/html/properties_window.png,
-	docs/html/select_frame.png, docs/pdf/manual.pdf,
-	docs/src/design_window.png, docs/src/design_window_empty_slot.png,
-	docs/src/properties_window.png, docs/src/select_frame.png:
-	Enable sorting and capitalising code writer languages in
-	"Properties" window
-	[d6f337f53aa2]
-
-	* widget_properties.py:
-	Extent RadioProperty to sort and capitalise the choices
-	[53c99a8f359e]
-
-2012-10-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py:
-	Consolidate creation of file dialog wildcards
-	[62a6b7f55276]
-
-	* application.py, misc.py, widget_properties.py:
-	Write and use own function to capitalise first character.
-
-	This function don't change upper case abbreviations like XML and
-	XRC. Be carefully because this function may break i18n.
-	[486b631cf86a]
-
-2012-10-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* README.txt:
-	Minor update
-	[cd759433b243]
-
-2012-10-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/button/button.py:
-	Improve tooltip for wxButton
-	[c90cff67d98e]
-
-	* application.py, tests/test_gui.py:
-	Add test case for testing code generation in GUI
-	[a3b636b9f222]
-
-	* tests/__init__.py:
-	Separate setting of test specific options in a wxg (XML) file
-	[622ba804444f]
-
-2012-09-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* templates/Dialog with two buttons.wgt,
-	templates/Dialog_with_two_buttons.wgt:
-	Replace spaces in a template file by underscore
-	[461a9bc6ea67]
-
-2012-09-16  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, layout_option_property.py, widget_properties.py:
-	Change tooltip handling
-
-	 - mangled property names will not show anymore
-	 - tooltips will be shown at all elements of a property
-	[035e16478e27]
-
-2012-09-15  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Remove unused variable msg from command_line_code_generation()
-	[8f35f89490e7]
-
-2012-08-13  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s06.html, docs/html/ch03s07.html, docs/html/ch04.html,
-	docs/html/ch05.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html, docs/pdf/manual.pdf:
-	Rebuild documentation
-	[41313818bb7a]
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch05.html, docs/html/ch05s03.html, docs/html/index.html,
-	docs/html/pr01.html, docs/html/pr01s02.html, docs/html/pr01s03.html,
-	docs/html/properties_window.png, docs/pdf/manual.pdf,
-	docs/src/manual.xml, docs/src/properties_window.png:
-	Update and extend documentation
-	[4737d780ab66]
-
-2012-07-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/CalendarCtrl.cpp, tests/casefiles/CalendarCtrl.h,
-	tests/casefiles/CalendarCtrl.pl, tests/casefiles/CalendarCtrl.py,
-	tests/casefiles/CalendarCtrl.wxg, tests/casefiles/CalendarCtrl.xrc,
-	tests/test_codegen.py:
-	Add test code for wxCalendarCtrl
-	[0bfbfe01fca7]
-
-2012-07-08  Eric McKeeth  <Eric McKeeth>
-
-	* widgets/calendar_ctrl/perl_codegen.py:
-	Add Perl code generator for wxCalendarCtrl
-
-	Special thanks to Eric for sharing his code.
-	[9756a246126b]
-
-2012-06-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/cpp_codegen.py:
-	Fix typos introduces in last commit :-(
-	[26a8c0791097]
-
-	* NEWS.txt, codegen/cpp_codegen.py, tests/casefiles/CPPOgg1.h,
-	tests/casefiles/CPPOgg2_MyDialog.h,
-	tests/casefiles/CPPOgg2_MyFrame.h, tests/casefiles/CPPOgg3.h,
-	tests/casefiles/CPP_Preferences.h,
-	tests/casefiles/CPP_wxCalendarCtrl.h, tests/casefiles/FontColour.h,
-	tests/casefiles/Gauge.h, tests/casefiles/Grid.h:
-	Write isolation directives at beginning in C++ header files
-	[bf0292744c03]
-
-2012-06-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s06.html, docs/html/ch03s07.html, docs/html/ch04.html,
-	docs/html/ch05.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html, docs/pdf/manual.pdf,
-	docs/src/manual.xml:
-	Extend documentation about the various installation methods
-	[55914b697ea9]
-
-2012-06-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/test_codegen.py:
-	Fix regression in generate_code_id() for parameter id
-	[dc3cd635d687]
-
-2012-05-31  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Replace tabs by spaces introducted in 1090:c93d25c53d31 (thanks
-	Davorin)
-	[b7e9747cf820]
-
-2012-05-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/notebook/notebook.py:
-	Improve name generation of notebooks and notebook panes
-
-	Noetbook names as well as notebook pane names should be unique.
-	Deleted default names won't be reused.
-	[66bec3ea57c7]
-
-2012-05-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/__init__.py:
-	Adapt test suite to handle improved error handling well
-	[f752c17b6a6a]
-
-	* NEWS.txt, widgets/notebook/notebook.py:
-	Fix: Same default names for multiple notebooks (sf bug #2000566)
-	[d33686c3f223]
-
-2012-05-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py:
-	Update Copyright notice at code generators
-	[6bf0febe90b8]
-
-2012-05-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Use error() for printing error messages
-	[0bda2cf7f89c]
-
-	* application.py, errors.py, wxglade.py, xml_parse.py:
-	Improve error handling for non-existing and non-writable output
-	directories
-	[029b310aa249]
-
-2012-05-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* xml_parse.py:
-	Empty output path raises XmlParsingError during code generation
-	[ff1bfdb1a265]
-
-	* codegen/__init__.py:
-	Improve error handling of chmod after writing main output file
-	[14bb00b4fc49]
-
-2012-05-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/pl_codegen.py, tests/casefiles/CPPOgg1.cpp,
-	tests/casefiles/CPPOgg1.wxg, tests/casefiles/CPPOgg2.wxg,
-	tests/casefiles/CPPOgg2_MyDialog.cpp, tests/casefiles/CPPOgg3.cpp,
-	tests/casefiles/FontColour.pl, tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg1.wxg, tests/casefiles/LispOgg2.wxg,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg3.lisp, tests/casefiles/LispOgg3.wxg,
-	tests/casefiles/Perl_Preferences.pl, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg1.wxg, tests/casefiles/PlOgg2.wxg,
-	tests/casefiles/PlOgg2_MyDialog.pm,
-	tests/casefiles/PlOgg2_MyFrame.pm, tests/casefiles/PlOgg3.pl,
-	tests/casefiles/PyOgg1.py, tests/casefiles/PyOgg1.wxg,
-	tests/casefiles/PyOgg1_oldnamespace.py, tests/casefiles/PyOgg2.wxg,
-	tests/casefiles/PyOgg2_MyDialog.py, tests/casefiles/PyOgg3.py:
-	Fix regression for gettext handling in Perl code generator
-	[b664b2c06055]
-
-2012-05-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch05.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/pdf/manual.pdf, docs/src/manual.xml,
-	wxglade.py:
-	Improve searching for files credits.txt and license.txt
-
-	Both files were not found if wxGlade has been installed at
-	/opt/wxglade like suggested in manual.
-	[c93d25c53d31]
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Unify codegenerators a little bit more
-	[e3555a296146]
-
-	* codegen/__init__.py:
-	Minor changes for epydoc
-	[1cd403eda874]
-
-2012-05-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/cpp_codegen.py, tests/casefiles/CPPOgg1.cpp,
-	tests/casefiles/CPPOgg1.h, tests/casefiles/CPPOgg2_MyDialog.cpp,
-	tests/casefiles/CPPOgg2_MyDialog.h,
-	tests/casefiles/CPPOgg2_MyFrame.cpp,
-	tests/casefiles/CPPOgg2_MyFrame.h, tests/casefiles/CPPOgg2_main.cpp,
-	tests/casefiles/CPPOgg3.cpp, tests/casefiles/CPPOgg3.h,
-	tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CPP_Preferences.h,
-	tests/casefiles/CPP_wxCalendarCtrl.cpp,
-	tests/casefiles/CPP_wxCalendarCtrl.h,
-	tests/casefiles/FontColour.cpp, tests/casefiles/FontColour.h,
-	tests/casefiles/Gauge.cpp, tests/casefiles/Gauge.h,
-	tests/casefiles/Grid.cpp, tests/casefiles/Grid.h:
-	Write small example how to compile in all C++ source and header
-	files
-	[080087eecb51]
-
-	* tests/casefiles/CPPOgg1.cpp, tests/casefiles/CPPOgg1.h,
-	tests/casefiles/CPPOgg1.wxg, tests/casefiles/CPPOgg2.wxg,
-	tests/casefiles/CPPOgg2_MyDialog.h,
-	tests/casefiles/CPPOgg2_MyFrame.h, tests/casefiles/CPPOgg3.h:
-	Convert non-C++ statements into C++ statements to allow compiling
-
-	Now all C++ examples compile well.
-	[42da1e54f9c3]
-
-2012-05-10  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Move equal finalize() functions into code generator base class
-	[2985e0baa93f]
-
-2012-05-09  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/lisp_codegen.py, codegen/pl_codegen.py:
-	Minor code changes
-	[253c1da088ff]
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, tests/casefiles/FontColour.cpp,
-	tests/casefiles/FontColour.h, tests/casefiles/FontColour.lisp,
-	tests/casefiles/FontColour.pl, tests/casefiles/FontColour.py,
-	tests/casefiles/FontColour.wxg, tests/casefiles/FontColour.xrc,
-	tests/test_codegen.py:
-	Unify code generation for colours and fonts
-	[25652001602c]
-
-2012-05-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/Grid.cpp, tests/casefiles/Grid.lisp,
-	tests/casefiles/Grid.pl, tests/casefiles/Grid.py,
-	tests/casefiles/Grid.wxg, tests/casefiles/Grid.xrc:
-	Fix: Wrong attribute names
-	[ed32915f7ffb]
-
-	* tests/__init__.py, tests/casefiles/PyOgg1_oldnamespace.py,
-	tests/test_codegen.py:
-	Add one testcase for generating python code using old wx namespace
-	[84bdfe8dc96c]
-
-	* codegen/py_codegen.py:
-	Format flags written namespace independent by the python code
-	generator
-
-	Old version differs between old wx namespace and the new one
-	[96293ca249e6]
-
-	* widgets/menubar/codegen.py:
-	Cleanup obsolete for_version statement
-	[7c741f95be79]
-
-	* code_property.py:
-	Cleanup tooltips for extracode and extraproperties
-
-	This functionality is available at all code generators now
-	[a8c32472ba42]
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch05.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/man/manpage.xml, docs/pdf/manual.pdf,
-	docs/src/manual.xml:
-	Minor changes for current maintainer
-	[5cb97d02951e]
-
-2012-05-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py, tests/__init__.py,
-	tests/casefiles/CPPOgg1.cpp, tests/casefiles/CPPOgg1.h,
-	tests/casefiles/CPPOgg1.wxg, tests/casefiles/CPPOgg2.wxg,
-	tests/casefiles/CPPOgg2_MyDialog.cpp,
-	tests/casefiles/CPPOgg2_MyDialog.h,
-	tests/casefiles/CPPOgg2_MyFrame.cpp,
-	tests/casefiles/CPPOgg2_MyFrame.h, tests/casefiles/CPPOgg2_main.cpp,
-	tests/casefiles/CPPOgg3.cpp, tests/casefiles/CPPOgg3.h,
-	tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CPP_Preferences.h,
-	tests/casefiles/CPP_wxCalendarCtrl.cpp,
-	tests/casefiles/CPP_wxCalendarCtrl.h,
-	tests/casefiles/CPP_wxCalendarCtrl.wxg, tests/casefiles/Gauge.cpp,
-	tests/casefiles/Gauge.h, tests/casefiles/Gauge.lisp,
-	tests/casefiles/Gauge.pl, tests/casefiles/Gauge.py,
-	tests/casefiles/Gauge.wxg, tests/casefiles/Grid.cpp,
-	tests/casefiles/Grid.h, tests/casefiles/Grid.lisp,
-	tests/casefiles/Grid.pl, tests/casefiles/Grid.py,
-	tests/casefiles/Grid.wxg, tests/casefiles/Grid.xrc,
-	tests/casefiles/GridEvents.cpp, tests/casefiles/GridEvents.h,
-	tests/casefiles/GridEvents.lisp, tests/casefiles/GridEvents.pl,
-	tests/casefiles/GridEvents.py, tests/casefiles/GridEvents.wxg,
-	tests/casefiles/GridEvents.xrc, tests/casefiles/LispOgg1.lisp,
-	tests/casefiles/LispOgg1.wxg, tests/casefiles/LispOgg2.wxg,
-	tests/casefiles/LispOgg2_MyDialog.lisp,
-	tests/casefiles/LispOgg2_MyFrame.lisp,
-	tests/casefiles/LispOgg2_app.lisp, tests/casefiles/LispOgg3.lisp,
-	tests/casefiles/LispOgg3.wxg, tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Lisp_Preferences.wxg,
-	tests/casefiles/Lisp_wxBitmapButton.lisp,
-	tests/casefiles/Lisp_wxBitmapButton.wxg,
-	tests/casefiles/Notebook_w_tabs.wxg,
-	tests/casefiles/Notebook_wo_tabs.wxg,
-	tests/casefiles/Perl_Preferences.pl, tests/casefiles/PlOgg1.pl,
-	tests/casefiles/PlOgg1.wxg, tests/casefiles/PlOgg2.wxg,
-	tests/casefiles/PlOgg2_MyDialog.pm,
-	tests/casefiles/PlOgg2_MyFrame.pm, tests/casefiles/PlOgg2_app.pl,
-	tests/casefiles/PlOgg3.pl, tests/casefiles/Preferences.wxg,
-	tests/casefiles/PyOgg1.py, tests/casefiles/PyOgg1.wxg,
-	tests/casefiles/PyOgg2.wxg, tests/casefiles/PyOgg2_MyDialog.py,
-	tests/casefiles/PyOgg2_MyFrame.py, tests/casefiles/PyOgg2_app.py,
-	tests/casefiles/PyOgg3.py, tests/casefiles/Python_Preferences.py,
-	tests/test_codegen.py:
-	Rework and unify code generators. All code generators support
-	extracode and extraproperties now.
-
-	Sorry for the huge commit.
-	[31dd07530557]
-
-2012-04-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widgets/dialog/lisp_codegen.py, widgets/frame/lisp_codegen.py:
-	Fix: Lisp code generation for wxFrame and wxDialog
-	[baa3e7f42b61]
-
-2012-04-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, application.py:
-	Fix: Encoding detection for Mac OS X
-	[b48da20df8f4]
-
-2012-03-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* docs/html/ch03s07.html, docs/html/pr01s03.html:
-	Add two missing HTML files of the previously committed user manual
-	[b88235c2317b]
-
-	* Makefile, NEWS.txt, docs/html/apa.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch04s04.html,
-	docs/html/ch04s05.html, docs/html/ch04s06.html,
-	docs/html/ch04s07.html, docs/html/ch04s08.html,
-	docs/html/ch04s09.html, docs/html/ch04s10.html,
-	docs/html/ch04s11.html, docs/html/ch04s12.html,
-	docs/html/ch04s13.html, docs/html/ch04s14.html,
-	docs/html/ch04s15.html, docs/html/ch04s16.html,
-	docs/html/ch04s17.html, docs/html/ch04s18.html,
-	docs/html/ch04s19.html, docs/html/ch04s20.html,
-	docs/html/ch04s21.html, docs/html/ch04s22.html,
-	docs/html/ch04s23.html, docs/html/ch04s24.html,
-	docs/html/ch04s25.html, docs/html/ch04s26.html,
-	docs/html/ch04s27.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html,
-	docs/html/example_baseclasses.png,
-	docs/html/example_eventhandler.png,
-	docs/html/example_setproperty.png, docs/html/example_subclassed.png,
-	docs/html/example_variableassigment.png, docs/html/index.html,
-	docs/html/main_window.png, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html,
-	docs/html/properties_window.png,
-	docs/html/properties_window_tab_1.png,
-	docs/html/properties_window_tab_1_change.png,
-	docs/html/properties_window_tab_2.png,
-	docs/html/properties_window_tab_3.png,
-	docs/html/properties_window_tab_4.png,
-	docs/html/properties_window_tab_5.png, docs/pdf/manual.pdf,
-	docs/src/example_baseclasses.png, docs/src/example_eventhandler.png,
-	docs/src/example_setproperty.png, docs/src/example_subclassed.png,
-	docs/src/example_variableassigment.png, docs/src/main_window.png,
-	docs/src/manual.xml, docs/src/pdf.xsl,
-	docs/src/properties_window.png,
-	docs/src/properties_window_tab_1.png,
-	docs/src/properties_window_tab_1_change.png,
-	docs/src/properties_window_tab_2.png,
-	docs/src/properties_window_tab_3.png,
-	docs/src/properties_window_tab_4.png,
-	docs/src/properties_window_tab_5.png:
-	Update wxGlade user manual
-	[61123fcf21fb]
-
-2012-03-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/pl_codegen.py:
-	Add more constants ...
-	[a53d3c79174a]
-
-2012-03-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/pl_codegen.py, edit_sizers/perl_sizers_codegen.py,
-	tests/casefiles/GridEvents.pl, tests/casefiles/Perl_Preferences.pl:
-	Fix: Handling of wx constants in generated Perl code
-	[71a087c94365]
-
-	* tests/casefiles/Gauge.cpp, tests/casefiles/Gauge.h,
-	tests/casefiles/Gauge.lisp, tests/casefiles/Gauge.pl,
-	tests/casefiles/Gauge.py, tests/casefiles/Gauge.wxg,
-	tests/casefiles/Gauge.xrc, tests/test_codegen.py:
-	Add tests for wxGauge code generation
-	[300a4438fc64]
-
-2012-03-02  Johan Vromans  <Johan Vromans>
-
-	* widgets/gauge/lisp_codegen.py:
-	Fix: Lisp codegen for the Gauge widget was an exact copy of the Perl
-	codegen
-	[c62106cc8ee2]
-
-2012-02-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_windows.py:
-	Add tooltips for widgets properties "Id" and "Name"
-	[1aaeb0280d1f]
-
-2012-02-21  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade:
-	Add searching for a parallel Python module directory
-	[c2736dfcbf2b]
-
-2012-02-18  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* edit_sizers/perl_sizers_codegen.py,
-	tests/casefiles/Perl_Preferences.pl:
-	Generate Perl code for wxStaticBox() with wxID_ANY instead of -1
-	[6e6d590edffb]
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py,
-	tests/casefiles/GridEvents.lisp, tests/casefiles/GridEvents.pl,
-	tests/casefiles/GridEvents.py,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Lisp_wxBitmapButton.lisp,
-	tests/casefiles/Perl_Preferences.pl, tests/test_codegen.py:
-	Add generate_code_id() tests incl. minor code reorg in all
-	generate_code_id()
-
-	This change may also fix some wrong behaviour introduced by changing
-	the default widget id from -1 to wxID_ANY.
-	[c9a065b06e42]
-
-2012-02-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/lisp_codegen.py, tests/casefiles/GridEvents.lisp,
-	tests/test_codegen.py:
-	Fix: String formatting issue for event handlers in Lisp code
-	generator
-	[2f11a293bd25]
-
-	* tests/casefiles/GridEvents.cpp, tests/casefiles/GridEvents.h,
-	tests/casefiles/GridEvents.pl, tests/casefiles/GridEvents.py,
-	tests/casefiles/GridEvents.wxg, tests/casefiles/GridEvents.xrc,
-	tests/test_codegen.py:
-	Add small tests for wxGrid events (sf bug #1542195 - not
-	reproducible)
-	[6e132223ec97]
-
-	* tests/__init__.py:
-	Show differences for failed non GUI tests (solves buggy last commit)
-	[32a36ba06040]
-
-2012-02-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/__init__.py, tests/test_codegen.py, tests/test_gui.py:
-	Regorganise test code
-	[063b0f539d9e]
-
-	* wxglade.py:
-	Do not load wxversion if wx already loaded
-	[d6f3fef52a16]
-
-	* Makefile:
-	Adapt pylint settings in Makefile
-	[e25a986f109b]
-
-	* code_property.py, tree.py:
-	Reorg imports
-	[347d58962b18]
-
-2012-02-04  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/CPP_Preferences.h,
-	tests/casefiles/CPP_Preferences.wxg,
-	tests/casefiles/Perl_Preferences.pl,
-	tests/casefiles/Perl_Preferences.wxg, tests/test_codegen.py:
-	Split sources of test cases to generate working source files
-	[83f41edb5a25]
-
-	* NEWS.txt, codegen/py_codegen.py, edit_sizers/sizers_codegen.py,
-	edit_windows.py, tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/Python_Preferences.py:
-	Change default widget ID from -1 to wxID_ANY and adapt codegen
-	[31c5ee6a109b]
-
-2012-02-01  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Exclude test suite from full edtion Windows installer
-	[58fa8e7a8f02]
-
-2012-01-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/test_gui.py:
-	Split single GUI test in two different tests
-	[ce253b98aea3]
-
-	* wxglade.py:
-	Don't load wxversion twice
-
-	wxversion will be imported several times only if the test suite is
-	running.
-	[9fef90204404]
-
-	* Makefile, test.py, tests/__init__.py,
-	tests/casefiles/Notebook_w_tabs.wxg,
-	tests/casefiles/Notebook_wo_tabs.wxg, tests/test_gui.py:
-	Add first GUI test case
-	[541e8440e543]
-
-	* widgets/notebook/notebook.py:
-	Improve error message for import notebooks without tabs
-	[8e4513a78a48]
-
-2012-01-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* config.py, configdialog.py, main.py:
-	Move preferences dialog to own file to simplify handling e.g. for
-	test cases
-	[23e0e1fb35a6]
-
-	* main.py, tests/__init__.py, wxglade.py:
-	Split initialisation of wxGlade to simplify handling e.g. for test
-	cases
-	[1c0c070e0a3a]
-
-	* common.py:
-	Add platform variable
-
-	This variable is introduced to eliminate dependencies to wx (e.g.
-	wx.Platform) for non-interactive runs.
-	[4e9b0be6550f]
-
-	* NEWS.txt:
-	Minor update of NEWS file
-	[b07c89bd33ae]
-
-	* misc.py:
-	Remove code to support wxPython < 2.6
-	[e0dff9e3dbde]
-
-2012-01-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* widget_properties.py:
-	PEP8 changes and minor cleanups
-	[a20d0ba4d857]
-
-	* widgets/notebook/notebook.py:
-	[FIX] Prevent deleting last notebook tab (sf bug #3126974)
-	[fb14132b64b1]
-
-	* widget_properties.py:
-	Added parameter to prevent removing last entry in GridProperty
-	[2f2913cd61ab]
-
-2012-01-23  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* config.py, install/pyinstaller/wxglade-installer.iss:
-	Disable usage of KDE file dialogs for non GTK platforms
-	[976d795a4347]
-
-2012-01-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	Loading code generators loads only Python files (.py, .pyc, .pyo)
-	only now
-	[4df18386b820]
-
-2012-01-19  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Show better version string at windows installer welcome page
-	[c83de5013298]
-
-2012-01-17  Davorin Kunstelj  <Davorin Kunstelj>
-
-	* docs/man/manpage.xml:
-	[FIX] Attribute name mismatch in source of manual page
-	[61be9fe53cc6]
-
-2012-01-14  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/__init__.py, codegen/cpp_codegen.py,
-	codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py:
-	Rework code generation code to move common parts to
-	codegen/__init__.py and rework code generators partially to be more
-	eqal.
-	[83c5dfb7f8b2]
-
-2012-01-12  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* NEWS.txt, codegen/lisp_codegen.py:
-	[FIX] Prevent caching effects in Lisp code generator
-
-	The code generator remembers parts of earlier generated code without
-	initialisation of class_lines in initialize()
-	[4c4b457413b7]
-
-	* NEWS.txt:
-	Add stub for new version
-	[885d22f07b17]
-
-	* tests/casefiles/CPP_Preferences.cpp,
-	tests/casefiles/CPP_Preferences.h,
-	tests/casefiles/Lisp_Preferences.lisp,
-	tests/casefiles/Perl_Preferences.pl,
-	tests/casefiles/Preferences.wxg,
-	tests/casefiles/Python_Preferences.py, tests/test_codegen.py:
-	Add more test cases
-	[f7680a0b3189]
-
-2012-01-11  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py, install/pyinstaller/wxglade-installer.iss:
-	Set version numbers back to HG to start new development cycle
-	[46271e66718d]
-
-2012-01-08  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* .hgtags:
-	Added tag rel_0.6.5 for changeset 8f314df2d7c8
-	[742a6175a85f]
-
-	* common.py, install/pyinstaller/wxglade-installer.iss:
-	Bump version number to 0.6.5
-	[8f314df2d7c8] [rel_0.6.5]
-
-	* CHANGES.txt, NEWS.txt, README.txt:
-	Prerelease documentation updates
-	[98dd3bfd0589]
-
-	* docs/man/manpage.xml:
-	Minor manpage changes
-	[427f6be4dda3]
-
-2012-01-07  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* tests/casefiles/CPP_wxCalendarCtrl.cpp,
-	tests/casefiles/CPP_wxCalendarCtrl.h,
-	tests/casefiles/CPP_wxCalendarCtrl.wxg, tests/test_codegen.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/calendar_ctrl/codegen.py:
-	[FIX] Solve issue "C++ CalendarControl issues in 0.6.3" (sf bug
-	#2782306)
-	[6245cb4685cf]
-
-	* NEWS.txt, wxglade.py:
-	[FIX] Wrong parameters for CodeWriter() in
-	command_line_code_generation()
-
-	Bug was introduces with changeset changeset 1022 31fe078c5b0a.
-	[1fa4ee4ff0fb]
-
-	* common.py:
-	[FIX] Allow saving of generated code to filenames without directory
-	part
-	[49a1a7528bb0]
-
-	* CHANGES.txt, NEWS.txt, docs/ReleaseSteps.txt, install/pyinstaller
-	/wxglade-installer.iss, install/pyinstaller/wxglade.spec,
-	install/rpm/wxglade.spec, setup.py:
-	Add new file NEWS.txt to summarise release changes
-	[0fa0447f3545]
-
-	* wxglade.py:
-	Enable gettext for usage message
-	[d14a0777e5cf]
-
-	* docs/man/manpage.xml:
-	Update and extend manual page
-	[d545ac5762d5]
-
-2012-01-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* wxglade.py:
-	Change option handling as well as add --version and --help
-	[31fe078c5b0a]
-
-	* wxglade.py, xrc2wxg.py:
-	remove support for Python 2.2
-	[bf29904a8c6d]
-
-	* tree.py:
-	Remove unused import edit_windows
-	[c004543d13a1]
-
-2012-01-06  Davorin Kunstelj  <Davorin Kunstelj>
-
-	* widget_properties.py:
-	Added column sizes parameter to GridProperty init parameters
-	[0486ded17c35]
-
-	* widget_properties.py:
-	Added tooltip for CheckBoxProperty
-	[96c42f2c98b4]
-
-2012-01-06  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* application.py:
-	Remove code to support wxPython < 2.6 (forgotten part)
-	[1715decea9e6]
-
-2012-01-05  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Makefile, test.py, tests/__init__.py,
-	tests/casefiles/Lisp_wxBitmapButton.lisp,
-	tests/casefiles/Lisp_wxBitmapButton.wxg, tests/test_codegen.py:
-	Add small test suite
-	[2ddd10897c3a]
-
-	* codegen/lisp_codegen.py:
-	[FIX] Add missing path quotation to codegen.lisp_codegen
-	[5645b1c942ec]
-
-2012-01-03  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/lisp_codegen.py:
-	Remove needless print statement in Lisp code generator
-	[9c5c77444ded]
-
-	* codegen/lisp_codegen.py:
-	Replace tab characters by spaces in Lisp code generator
-	[595555ae462b]
-
-	* codegen/lisp_codegen.py:
-	[FIX] Wrong file extensions created by Lisp code generator
-	[53ba588400a7]
-
-	* common.py:
-	Minor documentation and code reorg in common.save_file()
-	[3c1b5b867e2e]
-
-2012-01-02  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* common.py:
-	Minor code reorg in common.load_code_writers()
-	[fcc60dde8f7e]
-
-	* install/update-po.py:
-	Merge with original file
-	[45bd73138365]
-
-	* widgets/combo_box/combo_box.py:
-	Remove duplicate code EditComboBox.create_widget()
-	[d7b4000211d4]
-
-	* about.py, application.py, common.py, config.py,
-	edit_sizers/edit_sizers.py, edit_windows.py, font_dialog.py,
-	main.py, misc.py, tree.py, widget_properties.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/menubar/menubar.py, widgets/notebook/notebook.py,
-	widgets/panel/panel.py, widgets/toolbar/toolbar.py, xml_parse.py:
-	Remove code to support wxPython < 2.6
-	[4aef6ad90356]
-
-	* main.py, misc.py:
-	Remove unused function misc.sizer_fixed_Insert()
-	[dbd92a3e6c34]
-
-	* Makefile:
-	Adapt pylint settings in Makefile
-	[d3afa362e510]
-
-	* misc.py:
-	Remove obsolete second "import wx"
-	[01ade77d0851]
-
-2011-12-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* main.py, wxglade.py:
-	Move "Using wxPython <wx version>" to main.py to eliminate "import
-	wx"
-	[bd1ffca4d46d]
-
-2011-12-30  Davorin Kunstelj  <Davorin Kunstelj>
-
-	* misc.py, res/preferences.wxg:
-	Adapt missed icon paths
-	[bdb3fc1536b4]
-
-2011-12-30  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/xrc_codegen.py,
-	edit_sizers/edit_sizers.py, main.py, misc.py, tree.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/lisp_codegen.py,
-	widgets/bitmap_button/perl_codegen.py, widgets/button/button.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/choice/perl_codegen.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py, widgets/gauge/gauge.py,
-	widgets/list_box/perl_codegen.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/list_ctrl/perl_codegen.py, widgets/menubar/menubar.py,
-	widgets/notebook/notebook.py, widgets/notebook/perl_codegen.py,
-	widgets/slider/slider.py, widgets/spin_button/spin_button.py,
-	widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/lisp_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/perl_codegen.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/toolbar/tool.py, widgets/toolbar/toolbar.py,
-	widgets/tree_ctrl/tree_ctrl.py:
-	Remove unused import and minor code elegancy changes
-	[73280bcc4cb7]
-
-2011-12-29  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* Makefile:
-	Adapt pylint settings in Makefile
-	[1f6b03bc7a1e]
-
-	* widgets/bitmap_button/lisp_codegen.py:
-	[FIX] Remove wasted wxButton_SetDefault statement
-
-	The perl code sizer doesn't have this statement too. Thereby
-	removed.
-	[f815424b0be7]
-
-	* common.py:
-	Change some initial paths for documentation purposes only
-
-	All effected path variables will be overwritten during
-	initialisation.
-	[e06603686a91]
-
-2011-12-28  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Add epydoc.conf to Windows installer exclude list
-	[0ad85ad3adac]
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Clean all possible wxGlade MUICache entries always
-	[707e3fca4bc2]
-
-	* widgets/panel/panel.py:
-	Adapt missed icon path
-	[f2d2b4d4fcbf]
-
-	* about.py, common.py, main.py, wxglade.py:
-	Continue introducing path variables e.g. credits and license file
-
-	This solves a bug preventing about dialog showing credits.txt and
-	license.txt. The location of both files differs depending packaging
-	method (Unix vs. Windows vs. running out of the devel directory).
-	[25b89f65c597]
-
-	* wxglade.py:
-	Minor reorg in determining wxGlade application directory
-	[a3d4cb8675d6]
-
-2011-12-27  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* about.py, codegen/lisp_codegen.py, codegen/pl_codegen.py, common.py,
-	configUI.py, edit_sizers/edit_sizers.py, main.py, misc.py,
-	template.py, tree.py, widgets/bitmap_button/codegen.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/menubar/menubar.py, widgets/panel/panel.py,
-	widgets/static_bitmap/codegen.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/toolbar.py, wxglade.py:
-	Add separate path variables for icons, docs, templates and widgets
-	[e7d5fb37af01]
-
-	* codegen/pl_codegen.py:
-	[FIX] Typo in printing exception details
-	[309045659f30]
-
-2011-12-26  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* setup.py:
-	Update Trove Categorization
-	[139778e454a2]
-
-	* config.py, docs/html/design_window.png, docs/html/main_window.png,
-	docs/html/preview_window.png, docs/html/properties_window.png,
-	docs/html/tree_window.png, docs/src/design_window.png,
-	docs/src/main_window.png, docs/src/manual.xml,
-	docs/src/preview_window.png, docs/src/properties_window.png,
-	docs/src/tree_window.png, edit_widget.py, msgdialog.py,
-	templates_ui.py, wxglade.py, xrc2wxg.py:
-	Just an update of the Unix file permissions
-	[d02e453a9cc9]
-
-	* Makefile, setup.py:
-	Use only shell script wxglade to start wxGlade at Unix
-	[a1c7f20870a2]
-
-	* wxglade:
-	Improve searching and executeing of wxglade.py in shell script
-	wxglade
-	[8c50367d4961]
-
-	* install/srcpkgs/make_wxglade_release.py:
-	Script has been replaced by setup.py in combination with Makefile
-	[5c9fbcc6beaf]
-
-	* Makefile, TODO.txt, configUI.py, setup.py:
-	No need for separately callable configUI.py (preferences dialog)
-
-	The preferences dialog is a menu item in the wxGlade GUI.
-	[840d1dbd8a8b]
-
-	* .hgignore:
-	Ignore files generated by Eric4 IDE too
-	[e18ee53ea945]
-
-	* Makefile:
-	Add maintainer-clean target to Makefile and extend BIN_FILES
-	[038b1ba36d9b]
-
-2011-12-25  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* setup.py:
-	Change package file names from wxglade-* to wxGlade-*
-	[4846d1760beb]
-
-	* setup.py:
-	Add source files of manpage and wxGlade manual to distribution
-	[d9dc684ae5d4]
-
-2011-12-24  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Extend Windows installer to clean MUICache registry entries
-
-	There are some pages with more information about the MUI cache
-	mechanisms: http://windowsir.blogspot.com/2005/12/mystery-of-
-	muicachesolved.html http://forensicartifacts.com/2010/08/registry-
-	muicache/
-	[e97476e65b80]
-
-	* common.py, install/pyinstaller/wxglade-installer.iss:
-	Set version numbers back to HG to start new development cycle
-	[dd4244ccee75]
-
-2011-12-20  Carsten Grohmann  <mail@carstengrohmann.de>
-
-	* .hgtags:
-	Added tag rel_0.6.4 for changeset d62eb65d431e
-	[f5d52c02c3f8]
-
-	* common.py, install/pyinstaller/wxglade-installer.iss,
-	install/pyinstaller/wxglade.spec:
-	Bump version number to 0.6.4
-	[d62eb65d431e] [rel_0.6.4]
-
-	* CHANGES.txt, README.txt, TODO.txt, changelog.style,
-	docs/BuildingInstaller.txt, docs/ReleaseSteps.txt,
-	install/README.txt:
-	Lot of documentation changes
-	[76577470d149]
-
-	* common.py:
-	[FIX] Algorithm to get the release tag checked the wrong changeset
-
-	The release tag isn't located at tip it's located at the revision
-	prior to the tip.
-	[0ee6881eb872]
-
-	* .hgtags:
-	Added tag rel_0.5 for changeset 6a8223539dd8
-	[a06615d14d69]
-
-	* .hgtags:
-	Removed tag v0.5
-	[469dea276a9d]
-
-2011-12-12  Carsten Grohmann  <Carsten Grohmann>
-
-	* Makefile:
-	Add PHONY targets
-	[e5d588f2c4ea]
-
-2011-12-11  Carsten Grohmann  <Carsten Grohmann>
-
-	* debian/changelog, debian/compat, debian/control, debian/copyright,
-	debian/dirs, debian/docs, debian/files, debian/manpage.xml,
-	debian/menu, debian/rules, debian/wxglade.1, install/pyinstaller
-	/wxglade-installer.iss:
-	Remove debian directory
-
-	The debian directory is used to build debian packages. It will be
-	maintainted by Debian / Ubuntu developers.
-	[eef624e584f9]
-
-	* codegen/lisp_codegen.py, codegen/pl_codegen.py:
-	Move some import statements to earlier positions
-	[1f13f842ee17]
-
-2011-12-08  Carsten Grohmann  <Carsten Grohmann>
-
-	* .hgignore:
-	Ignore more files
-	[266ee32c897c]
-
-	* Makefile, setup.py:
-	Add native Python build mechanism (setup.py) and integrate it into
-	Makefile
-	[676f14704f31]
-
-2011-11-25  Carsten Grohmann  <Carsten Grohmann>
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Improve start menu structure and exclude some unused docs
-	[3c3fa51d26ed]
-
-2011-11-18  Carsten Grohmann  <Carsten Grohmann>
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Add PDF manual to Inno-Setup installer
-	[9d8b2ae26672]
-
-	* docs/pdf/manual.pdf, docs/pdf/readme.txt:
-	Add manual PDF to support building on Windows without whole xml
-	toolchain
-	[cd7f6011bc25]
-
-	* Makefile, docs/Makefile:
-	Integrate docs Makefile in main Makefile
-	[61098ccf9262]
-
-2011-11-16  Carsten Grohmann  <Carsten Grohmann>
-
-	* docs/man/manpage.xml:
-	Copy manpage to docs directory
-	[a013cddee9a2]
-
-	* Makefile:
-	Rework Makefile
-	[9c933c647cb2]
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Add Makefile and setup.py to windows installer exclude list
-	[c40846689893]
-
-2011-11-11  Carsten Grohmann  <Carsten Grohmann>
-
-	* wxglade.py:
-	Cosmetic changes only
-	[9ff95f3c63e8]
-
-	* wxglade.py:
-	Print version string at startup too
-	[f23fe91c8bac]
-
-2011-11-10  Carsten Grohmann  <Carsten Grohmann>
-
-	* .hgignore:
-	Ignore temporary files created during build process
-	[f2f708d8c69f]
-
-	* install/pyinstaller/wxglade-SAE-installer.iss, install/pyinstaller
-	/wxglade-installer.iss:
-	Merge and unify installer scripts to reduce redundant code
-	[6e1fbf84463c]
-
-	* install/pyinstaller/hook-main.py, install/pyinstaller/wxglade.spec:
-	Add License statement
-	[3ef6512ff0db]
-
-2011-11-09  Carsten Grohmann  <Carsten Grohmann>
-
-	* install/README.txt, install/pyinstaller/wxglade-installer.iss:
-	Improve full edition installer
-
-	Add show and agree license Create start menu entries for various
-	documentation files Add conversion of some documentation files from
-	Unix EOL to Windows EOL style Show README.txt after installation has
-	been finished
-	[8970d2801499]
-
-2011-11-07  Carsten Grohmann  <Carsten Grohmann>
-
-	* install/pyinstaller/wxglade-SAE-installer.iss:
-	Add label "(Standalone Edition)" to some links and menu entries
-	[593e091c6312]
-
-2011-11-06  Carsten Grohmann  <Carsten Grohmann>
-
-	* install/pyinstaller/wxglade-installer.iss:
-	[FIX] Error at "Launch wxGlade" at the end of installer
-	[c6cc275479dc]
-
-2011-11-04  Carsten Grohmann  <Carsten Grohmann>
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Remove Python bytecode and empty app directory during deinstallation
-	[557f077e2e1c]
-
-2011-10-31  Carsten Grohmann  <Carsten Grohmann>
-
-	* .hgignore:
-	Ignore temporary directories created during build process
-	[04986689cc15]
-
-	* install/pyinstaller/wxglade-SAE-installer.iss:
-	Whitespace changes only
-	[d4df6c072a19]
-
-	* install/pyinstaller/wxglade-installer.iss:
-	Standard installer
-	[f2dea430de7d]
-
-	* install/pyinstaller/make_installer_script.py, install/pyinstaller
-	/wxglade-SAE-installer.iss, install/pyinstaller/wxglade-
-	installer.iss.template:
-	Rework existing installer to use with standalone edition
-	[0914445da61f]
-
-	* install/pyinstaller/hook-main.py, install/pyinstaller/wxglade.spec:
-	Rework and improve spec file used by pyinstaller to collect all
-	files
-	[60662246d607]
-
-2011-10-30  Carsten Grohmann  <Carsten Grohmann>
-
-	* common.py:
-	PEP8 and cosmetic code changes
-	[f7c56de72d14]
-
-	* common.py:
-	Change common.version to show "(standalone edition)" for frozen
-	installations
-	[ac4a91baffb1]
-
-2011-10-17  Carsten Grohmann  <Carsten Grohmann>
-
-	* install/srcpkgs/make_wxglade_release.py:
-	Position of dispatch function has changes in new mercurial versions
-	[bdc430fdce2e]
-
-	* install/rpm/wxglade.spec, wxglade.spec:
-	Relocate RPM spec file
-	[c947792e5a49]
-
-	* install/README.txt, install/pyinstaller/make_installer_script.py,
-	install/pyinstaller/mondrian.ico, install/pyinstaller/wxglade-
-	installer.iss.template, install/pyinstaller/wxglade.spec,
-	install/srcpkgs/make_wxglade_release.py, install/update-po.py:
-	Merge support files from wxglade-dist-scripts repo
-	[4c3d4812426c]
-
-	* .hgignore, epydoc.conf:
-	Change location of source documentation from htmldocs to
-	docs/apidocs
-	[5dfb90f92fd3]
-
-2011-10-14  Carsten Grohmann  <Carsten Grohmann>
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, font_dialog.py,
-	widgets/notebook/notebook.py:
-	Epydoc changes
-	[7cc34000a15d]
-
-	* codegen/__init__.py:
-	Make codegen to a package by adding __init__.py
-	[9153c50bb9de]
-
-2011-10-12  Carsten Grohmann  <Carsten Grohmann>
-
-	* codegen/py_codegen.py:
-	Epydoc changes
-	[b603d12e38ae]
-
-	* common.py:
-	Epydoc changes
-	[60ed85c79faa]
-
-2011-08-15  Carsten Grohmann  <Carsten Grohmann>
-
-	* codegen/py_codegen.py, xml_parse.py:
-	Epydoc changes
-	[b0247325407e]
-
-	* edit_sizers/lisp_sizers_codegen.py:
-	Whitespace changes only
-	[d04ce2c84f16]
-
-2011-08-14  Carsten Grohmann  <Carsten Grohmann>
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	edit_sizers/edit_sizers.py, widgets/bitmap_button/perl_codegen.py,
-	widgets/button/perl_codegen.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/checkbox/lisp_codegen.py, widgets/checkbox/perl_codegen.py,
-	widgets/choice/perl_codegen.py, widgets/combo_box/combo_box.py,
-	widgets/combo_box/perl_codegen.py,
-	widgets/custom_widget/perl_codegen.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/dialog/dialog.py, widgets/gauge/gauge.py,
-	widgets/gauge/perl_codegen.py, widgets/grid/grid.py,
-	widgets/grid/perl_codegen.py, widgets/list_box/perl_codegen.py,
-	widgets/list_ctrl/perl_codegen.py, widgets/menubar/perl_codegen.py,
-	widgets/panel/perl_codegen.py, widgets/radio_box/perl_codegen.py,
-	widgets/radio_button/perl_codegen.py,
-	widgets/slider/perl_codegen.py, widgets/spin_button/perl_codegen.py,
-	widgets/spin_ctrl/perl_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_line/perl_codegen.py,
-	widgets/static_text/perl_codegen.py,
-	widgets/text_ctrl/perl_codegen.py,
-	widgets/toggle_button/perl_codegen.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/perl_codegen.py, widgets/tree_ctrl/perl_codegen.py:
-	Some whitespace changes (e.g. remove tabs) only
-	[56561e6d2f1b]
-
-	* main.py:
-	Do not use wxversion in frozen installations
-	[c13addd13c4b]
-
-2011-08-08  Alberto Griggio  <griggio@fbk.eu>
-
-	* codegen/py_codegen.py:
-	Applied patch by Ramin Sabet to make generated Python code more
-	PEP8-compliant
-	[157dc78db748]
-
-2011-03-25  Alberto Griggio  <griggio@fbk.eu>
-
-	* edit_sizers/edit_sizers.py:
-	Fixed exception in edit_sizers.change_sizer (do not try to reparent
-	things without a GetParent method)
-
-	Thanks to Davorin Kunstelj for reporting the bug
-	[96ff5a770485]
-
-2010-08-27  Alberto Griggio  <griggio@fbk.eu>
-
-	* widget_properties.py:
-	Cleaned up multiple imports and added ComboBoxProperty tooltip.
-
-	Patch provided by Davorin Kunstelj
-	[783a09e9ee04]
-
-2010-06-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py:
-	The fix introduced in changeset 82b4f56b56c6 was actually broken.
-	This one should be better
-	[c21ba8ab8302]
-
-2010-06-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py:
-	Fixed str/unicode mixing issue that was causing code generation to
-	fail
-	[82b4f56b56c6]
-
-2010-01-05  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* po/fr.po:
-	added French translation by Guillaume Barthe
-	[cdc33fbee011]
-
-2010-01-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* xml_parse.py:
-	generate code using the StringIO module instead of cStringIO,
-	because the latter doesn't play nicely with Unicode
-
-	Thanks to all the people who reported the bug and suggested patches
-	[0124338e07a7]
-
-2009-12-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	C++ output: applied patch by Sander Cox to prevent double line
-	breaks to add up when no extra_code is present.
-	[726b87e1c4e2]
-
-2009-11-30  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* common.py:
-	fix stupid bug in determining the version number using mercurial
-
-	The code was catching only ImportError, but in fact there are more
-	things that can go wrong. Fixed by catching everything
-	[33ee9fcf0b2a]
-
-2009-09-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py:
-	fix for issue #1962327 (extra code property allows only ASCII text)
-	[d1260418a762]
-
-	* codegen/py_codegen.py, edit_sizers/sizers_codegen.py:
-	applied patch by Roel van Os: "Change initialization order to
-	improve tab order"
-	[7ee9265d7a91]
-
-2009-08-25  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* codegen/pl_codegen.py, widgets/menubar/perl_codegen.py:
-	applied patch by Johan Vromans to fix issue in Perl code generator
-
-	Here's a quick summary of the issue: """ If a menu entry has a name
-	that contains whitespace (or other non perl-identifier characters)
-	wxglade generates invalid hash keys. """
-	[8a5c6ed2b841]
-
-2009-06-13  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py, tree.py, widget_properties.py,
-	widgets/grid/grid.py:
-	Applied patch by Davorin Kunstelj to allow properties to be
-	"blocked" (locked down) when certain conditions are met
-	[0ad97073204c]
-
-2009-05-13  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* widgets/bitmap_button/bitmap_button.py:
-	Applied patch by Davorin Kunstelj to fix a tooltip mismatch on
-	bitmap buttons
-	[6115f364f5f0]
-
-	* widget_properties.py:
-	Applied patch by Davorin Kunstelj to not write disabled ComboBox
-	properties
-
-	I've changed the patch a little bit to be more compatible with the
-	old behaviour
-	[08ecf9da3935]
-
-2009-04-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* merged fixes to xrc2wxg
-	[f9709e9537f4]
-
-2009-04-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py:
-	Use Mercurial to determine the version number of wxGlade, if
-	possible
-	[297b63b0d5b9]
-
-	* about.py, application.py, clipboard.py, color_dialog.py, common.py,
-	edit_sizers/edit_sizers.py, edit_widget.py, edit_windows.py,
-	events_mixin.py, font_dialog.py, layout_option_property.py, main.py,
-	tree.py, widget_properties.py, xml_parse.py:
-	Code cleanup: removed unused imports
-
-	Patch submitted by Carsten Grohmann
-	[283762d13eff]
-
-	* Fixed an issue and updated some docstrings in the Python code
-	generator
-
-	Patch submitted by Carsten Grohmann
-	[ba92601b5172]
-
-2009-01-27  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* xrc2wxg.py:
-	Fix: when importing from XRC, add a scrollable property to
-	wx.ScrolledWindowS
-	[2d602d9b2041]
-
-2009-01-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* xrc2wxg.py:
-	fixed issue #2530409 (wxScrolledWindow could not be imported from
-	XRC)
-	[6badf24df629]
-
-2009-01-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/panel/codegen.py:
-	fix for bug #2498055
-	[2637ad7dccd6]
-
-2009-01-08  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* codegen/py_codegen.py:
-	merge backout
-	[a87d392bed04]
-
-	* codegen/py_codegen.py:
-	Backed out changeset 3529b9200ebd
-	[4d38c72b6e5c]
-
-2009-01-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py:
-	Moved language-specific properties of Application to separate tabs
-	[2149b6c38f33]
-
-	* application.py, codegen/cpp_codegen.py, tree.py, xml_parse.py:
-	Applied patch by Sander Cox to allow configuration of indentation
-	for C++ output
-	[e10a3eabc826]
-
-2008-12-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widget_properties.py:
-	bugfix: in SpinProperty, display() was sometimes called before
-	self.val was set
-	[830d60097cc9]
-
-	* common.py:
-	set common.version to 'HG' - version number is not meaningful
-	anymore
-	[2bd4ad97e93a]
-
-	* widget_properties.py:
-	bugfix: in RadioProperty, display() was sometimes called before
-	self.val was set
-	[7ecff3153908]
-
-2008-12-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/custom_widget/perl_codegen.py:
-	Applied patch by Geoff May: added option to specify a custom
-	constructor for CustomWidget
-	[b1aa20f4a566]
-
-2008-11-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py, common.py:
-	merged changes from home
-	[ffe38d73add4]
-
-2008-11-22  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py:
-	Fixed bug in common.generated_from() when code generation is invoked
-	from the command line
-	[be5d55a22479]
-
-	* codegen/py_codegen.py:
-	Fixed bug in python App code generation, introduced by 'wxID_ANY'
-	patch
-	[65f8ae127a49]
-
-	* widgets/custom_widget/custom_widget.py, widgets/panel/panel.py:
-	Fixed a couple of code formatting issues (lines longer than 80
-	characters)
-	[f0bbdde66d19]
-
-2008-11-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	applied submitted patch to generate wx.ID_ANY instead of -1 in
-	python code
-	[3529b9200ebd]
-
-2008-10-23  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* layout_option_property.py, widget_properties.py:
-	applied patch by Roel van Os to fix MacOSX-related bugs
-	[76ec6a75d5f7]
-
-2008-10-21  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* codegen/cpp_codegen.py:
-	fixed duplication of 'extra code' in C++ output
-	[e28754400002]
-
-2008-07-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* po/de.po, po/fr.po:
-	updated CHARSET for German and French translations
-	[443c06b371b8]
-
-2008-07-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/list_box/codegen.py:
-	avoid generation of <selection> if the list of choices is empty
-	[7d7ae7f7ab18]
-
-2008-04-24  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* codegen/py_codegen.py:
-	applied patch by Doug Evans to fix "duplicate frame extracode"
-	[60a635ee796e]
-
-2008-03-11  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* edit_sizers/edit_sizers.py:
-	fixed bug in GridSizer.set_cols
-
-	the number of *rows* was used instead of that of columns...
-	[40fcf52d3ee2]
-
-2008-02-14  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* tree.py, widgets/custom_widget/codegen.py:
-	fixed bug in preview when using CustomWidgets
-	[36d05465336e]
-
-	* widgets/custom_widget/lisp_codegen.py,
-	widgets/custom_widget/perl_codegen.py:
-	Applied patches by Johan Vromans to fix the Perl code generator for
-	Custom Widgets
-	[ce08c0a13c69]
-
-2008-02-01  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* .hgtags:
-	Added tag rel_0.6.3 for changeset d58a6f9c593a
-	[c5b0342899ac]
-
-	* common.py, widgets/dialog/dialog.py:
-	updated version number, some indentation changes to dialog.py
-	[d58a6f9c593a] [rel_0.6.3]
-
-2008-01-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/grid/codegen.py:
-	fixed bug #1876682
-	[42e197ce6ce0]
-
-	* widgets/grid/grid.py:
-	fixed indentation (only cosmetic change)
-	[97329288e88b]
-
-2008-01-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/dialog/codegen.py, widgets/frame/codegen.py:
-	fixed silly bug in xrc code generation
-	[c72e7a85232a]
-
-2007-12-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* .hgtags:
-	Added tag rel_0.6.2 for changeset 0ca2ea7b12e8
-	[ad8d5d2268ce]
-
-	* common.py:
-	updated version number to 0.6.2
-	[0ca2ea7b12e8] [rel_0.6.2]
-
-2007-12-23  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, edit_sizers/lisp_sizers_codegen.py,
-	edit_sizers/perl_sizers_codegen.py, edit_sizers/sizers_codegen.py,
-	widget_properties.py, widgets/dialog/codegen.py,
-	widgets/dialog/dialog.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py:
-	added "size hints" property to wxFrame and wxDialog
-	[7c3c542a1dc6]
-
-2007-12-08  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* update-po.py:
-	moved update-po.py to repository "wxglade-dist-scripts"
-	[300911d54fce]
-
-2007-12-06  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* wxglade.py:
-	fix for Python <= 2.3, where no built-in "sorted" exists
-	[1c8be6cb3bed]
-
-2007-11-27  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* common.py:
-	Merged i18n changes by Homin Lee
-	[e89bc8228b2f]
-
-2007-11-08  Homin Lee  <ff4500@gmail.com>
-
-	* update-po.py:
-	modifying... update-po.py
-	[f809b22058f3]
-
-	* update-po.py:
-	add update-po.py which based on mki18n.py from
-	http://wiki.wxpython.org/Internationalization
-	[411a98ae91be]
-
-	* po/ja.po:
-	add Japanese po from Japanese wxglade.mo
-	[b4dcdefcb8b9]
-
-2007-11-08  Administrator  <Administrator@suapapa>
-
-	* about.py, application.py, code_property.py, common.py, config.py,
-	edit_sizers/edit_sizers.py, edit_windows.py, events_mixin.py,
-	font_dialog.py, kdefiledialog.py, layout_option_property.py,
-	locale/ja/LC_MESSAGES/wxglade.mo, misc.py, template.py,
-	templates_ui.py, tree.py, widget_properties.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/button/button.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/checkbox/checkbox.py, widgets/choice/choice.py,
-	widgets/combo_box/combo_box.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/gauge/gauge.py, widgets/grid/grid.py,
-	widgets/list_box/list_box.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/menubar/menubar.py, widgets/notebook/notebook.py,
-	widgets/panel/panel.py, widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py, widgets/slider/slider.py,
-	widgets/spacer/spacer.py, widgets/spin_button/spin_button.py,
-	widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/static_line.py,
-	widgets/static_text/static_text.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/toolbar.py,
-	widgets/tree_ctrl/tree_ctrl.py, xml_parse.py:
-	add japanese mo, update scripts that unmanaged by gettext, add
-	dispName to Property obj. for non-us users.
-	[d8f38c06c1f4]
-
-2007-11-08  Homin Lee  <ff4500@gmail.com>
-
-	* po/ko.po:
-	update Korean translation
-	[71f6a305a260]
-
-2007-11-27  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* merge
-	[9a6365ba4dac]
-
-	* merged changes
-	[70c277847254]
-
-2007-11-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* merged rel 0.6.1
-	[5324f86989d1]
-
-	* widgets/choice/codegen.py, widgets/combo_box/codegen.py,
-	widgets/list_box/codegen.py:
-	fixed compilation problem when using non-standard empty arrays
-	[e16277bbd924]
-
-2007-11-27  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* codegen/cpp_codegen.py, common.py:
-	fixed very serious regression on cpp_codegen, updated version number
-
-	The problem was that old event handlers were not detected and
-	declared/defined again at each code generation. This was because
-	event handlers became virtual but I forgot to update the regexp that
-	matches them to reflect this :-(
-	[8244b1b39883]
-
-2007-10-25  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* .hgtags:
-	Added tag rel_0.6.1 for changeset 58d181f6df32
-	[a9fe1a6f8dbb]
-
-	* common.py:
-	changed version number to 0.6.1
-	[58d181f6df32] [rel_0.6.1]
-
-2007-10-22  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* application.py, main.py, tree.py, widget_properties.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/button/button.py,
-	widgets/button/button_stockitems.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/calendar_ctrl/codegen.py, widgets/combo_box/combo_box.py,
-	widgets/datepicker_ctrl/codegen.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/dialog/dialog.py, xml_parse.py:
-	removed tabs from source code
-	[cc3e62fac409]
-
-	* po/ko.po:
-	added korean translation
-
-	Thanks to Homin Lee for providing this!
-	[ba5a2da99345]
-
-2007-10-18  Alberto Griggio  <griggio@dit.unitn.it>
-
-	* widgets/menubar/codegen.py, widgets/menubar/lisp_codegen.py,
-	widgets/menubar/perl_codegen.py:
-	patch to fix problem in code generated for wxMenuBar on OS X
-	[263799dd5981]
-
-2007-10-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/frame/codegen.py, widgets/frame/perl_codegen.py:
-	fixed bug in layout of frames with explicit size on wx < 2.8
-	[c31fa443cb03]
-
-	* codegen/cpp_codegen.py:
-	fixed bug #180219 (changed std::cout to wxLogDebug)
-	[0c99ef15c856]
-
-	* widget_properties.py:
-	fixed bug #1800898 (no refresh when changing foreground/backround
-	color)
-	[c0d58dcca0cd]
-
-	* edit_windows.py:
-	fixed bug #1800895 (exception when clicking "has toolbar")
-	[22936a4c1fa3]
-
-	* widgets/calendar_ctrl/codegen.py:
-	fixed bug on python code generation
-	[112e3896f8f4]
-
-2007-09-23  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* .hgtags:
-	Added tag rel_0.6 for changeset c4316ac0d906
-	[46c000bd92b8]
-
-	* application.py, edit_sizers/edit_sizers.py, edit_windows.py:
-	fixed tab ordering of properties
-	[c4316ac0d906] [rel_0.6]
-
-2007-09-22  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* docs/index.html:
-	changed URL of user's manual (to use the on-line version)
-	[713ad7e89b05]
-
-	* widgets/static_text/static_text.py:
-	use wx.GenStaticText if available to implement labels
-
-	wx.StaticText is a weird widget, with odd behaviour wrt. key and
-	focus events. wx.GenStaticText is much better in this respect
-	[2f5d56ab95b5]
-
-2007-09-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py:
-	fixed bug #1797230
-	[ae837954dd04]
-
-2007-09-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, config.py, configUI.py,
-	res/preferences.wxg:
-	added option to include .wxg file name in generated source files
-
-	This was requested by SPE's author, for better integration with the
-	IDE
-	[4c5d4ad2544c]
-
-2007-09-09  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, config.py, configUI.py, res/preferences.wxg:
-	added code generation preference "write_timestamp"
-	[59cfa4bcad62]
-
-	* main.py:
-	fixed problems with "small_frames" on Ubuntu (actually, I think it's
-	on GNOME...)
-	[514a92bb5dc8]
-
-	* edit_sizers/edit_sizers.py:
-	update the "saved" flag of Application when removing an empty slot
-	[ffbd1b388e3c]
-
-2007-09-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/dialog/codegen.py, widgets/frame/codegen.py:
-	fixed cut-and-paste error (grr!!!)
-	[c2dde72fa386]
-
-	* widgets/dialog/codegen.py, widgets/frame/codegen.py:
-	fixed code generation for "icon" property when using special "var:"
-	and "code:" forms
-	[138080cdf6e2]
-
-	* config.py:
-	workaround for spinctrl bug on wxGTK 2.8.4.2
-	[33f3bb4f5378]
-
-	* xml_parse.py:
-	fixed encoding problem with non-western locales
-	[979fc80125ca]
-
-2007-09-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* tree.py:
-	fixed compatibility with python 2.3
-
-	In python 2.3, set is not a builtin, but needs to be aliased from
-	sets.Set
-	[94ccd9289dfd]
-
-	* res/templates_ui.wxg, template.py, templates_ui.py:
-	fixed compatibility problem with wx 2.6
-
-	wx.ID_EDIT was introduced in 2.8...
-	[4455d0b07db0]
-
-	* main.py:
-	fixed bug that made the tree and property windows disappear on win32
-	[7ed3aad42dd7]
-
-	* wxglade.py:
-	small formatting fix
-	[57f80092cf45]
-
-2007-09-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	fixed compatibility issue with wxPython 2.8.4.2
-	[c8cb0d602ee8]
-
-	* edit_sizers/edit_sizers.py:
-	fixed bug in change_sizer when changing to a wx.StaticBoxSizer
-	[b72e2bb66fd1]
-
-	* edit_sizers/edit_sizers.py, edit_windows.py:
-	fixed bug in 'setup_preview_menu' when using wxPython 2.8.4.2
-	[3827622f9bb3]
-
-2007-09-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_widget.py, widget_properties.py, widgets/ChoicesCodeHandler.py,
-	widgets/ChoicesProperty.py:
-	improved support for custom components
-
-	- made ChoicesProperty more general (for wxCheckListBox)
-	- made edit_widget a bit more flexible
-	[288058984a75]
-
-2007-09-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	fixed bug in event handler id generation
-	[550dd605d0c6]
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py:
-	fixed a bug in handling extracode
-
-	The extra code was not generated when the options "single file" and
-	"overwrite" were set
-	[f33e3c8cc5f1]
-
-	* code_property.py:
-	fixed a bug in ExtraPropertiesProperty
-	[b5d99ff756cd]
-
-	* code_property.py, codegen/cpp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py, edit_windows.py,
-	widget_properties.py:
-	Implemented "exraproperties" property.
-
-	This allows you to add more properties to the generated code for the
-	widgets. For each pair (name, value) in extraproperties for a
-	widget, a line
-
-	widget.SetName(value)
-
-	will be added in __set_properties. That is, the name of the property
-	is capitalized, and the value is taken as it is. This works for
-	Python, C++ and Perl. For XRC, the extra line would be
-
-	<name>value</name>
-
-	(notice that there is no capitalization).
-	[1ab3f55a072f]
-
-	* res/templates_ui.wxg, template.py, templates_ui.py:
-	small ui fix
-	[13cc255c2418]
-
-	* msgdialog.py, res/messagedialog.wxg, res/templates_ui.wxg,
-	templates_ui.py:
-	make bold labels use the default font size
-	[714b2487617a]
-
-	* config.py, main.py, misc.py, tree.py:
-	merged encoding fixes
-	[b9545315fbcc]
-
-	* config.py, kdefiledialog.py, main.py, misc.py, tree.py:
-	fixed some encoding problems (when using non-ascii filesystem paths)
-	[53ffc1a86fee]
-
-2007-08-31  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/lisp_codegen.py:
-	removed "generated from" in output file
-	[111e0efad8ea]
-
-	* codegen/xrc_codegen.py:
-	removed "generated from" in output
-	[f2796e295acd]
-
-	* widgets/grid/codegen.py:
-	implemented XRC code generation
-	[580284f3d914]
-
-	* widget_properties.py:
-	small ui improvement in CheckListProperty
-	[56eac4ede7c0]
-
-	* code_property.py:
-	small ui improvement
-	[b347a9639185]
-
-	* codegen/py_codegen.py:
-	improved warning messages
-	[3c98fd513cf4]
-
-	* codegen/cpp_codegen.py:
-	implemented "extracode" and "custom base classes" for C++ output
-	[065dee31c1d8]
-
-	* codegen/py_codegen.py:
-	added a couple of fixes for "extracode"
-	[c41111080ade]
-
-	* codegen/py_codegen.py:
-	fixed bug when not overwriting existing sources
-	[7feec9d408ca]
-
-	* application.py:
-	better implementation of check_codegen for XRC
-	[ffd88d9972b9]
-
-	* codegen/py_codegen.py, codegen/xrc_codegen.py, edit_windows.py,
-	widgets/notebook/notebook.py, widgets/panel/panel.py,
-	widgets/splitter_window/splitter_window.py:
-	added "custom base classes" support
-
-	It is now possible to specify custom base classes for wxGlade-
-	generated ones. At the moment, it works only for the Python code
-	generator, but I plan to implement it also for C++.
-
-	This feature is not really meant to be used unless the "overwrite
-	existing sources" option is set: if not, the generated code might be
-	incorrect.
-	[1c83f314dc14]
-
-	* codegen/xrc_codegen.py:
-	implemented 'extracode' property for XRC
-	[3e4582ec4214]
-
-	* code_property.py, main.py:
-	fixed a couple of UI glitches
-	[44629ce128b7]
-
-2007-08-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* code_property.py, codegen/py_codegen.py, edit_windows.py:
-	Added "extracode" property
-
-	This property allows the user to insert arbitrary code snippets in
-	the wxGlade-generated source files. This could be quite useful, for
-	instance to include files, define constants, etc.
-
-	At the moment, only the Python code generator has been updated to
-	support this. I plan to extend also the C++ one, for the others
-	patches are welcome...
-
-	Finally, you should use this feature only in "overwrite sources"
-	mode: if you don't, it should work for "easy" cases (when you really
-	insert only imports or constant declarations), but if you insert
-	more complex stuff the wxGlade "parsers" (quoted because they aren't
-	real parsers) will get fooled quite easily...
-	[bf5947e22cb5]
-
-	* template.py:
-	small fix in displaying template information
-	[0721e2801a82]
-
-2007-08-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py:
-	moved "import template" at the top level
-	[8017eb9f9403]
-
-	* main.py, res/templates_ui.wxg, template.py, templates_ui.py:
-	implemented template editing
-	[aca7f36428c0]
-
-	* main.py, template.py:
-	added first template management code
-
-	For now, it is only possible to delete custom (i.e. not bundled with
-	wxGlade) templates
-	[561fd0099c5b]
-
-	* templates/Dialog with two buttons.wgt:
-	A very simple example template
-	[ae1f7ea4259e]
-
-	* main.py, res/templates_ui.wxg, template.py, templates_ui.py,
-	tree.py:
-	improved templates support
-
-	Added dialogs and menu entries to create an app from a template, or
-	to save an app as a template
-
-	Still needs to be finished (e.g. editing/deleting existing templates
-	is not possible at the moment)
-	[496a5e090b4c]
-
-	* msgdialog.py, res/messagedialog.wxg:
-	improved message dialog
-	[044e48c1f238]
-
-	* template.py:
-	fixed line-wrapping
-	[387bc1f95d96]
-
-	* application.py, misc.py, msgdialog.py, res/messagedialog.wxg,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/dialog/codegen.py,
-	widgets/dialog/dialog.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/static_bitmap.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/toolbar.py:
-	better handling of relative paths for images
-
-	There was a problem in wxGlade: relative paths for icons (for
-	example in toolbars or frames) were accepted by the code generator,
-	but were not working well in the gui design and in preview. This
-	patch fixes the problem, by interpreting paths for images as
-	relative to the output path for the generated code
-	[58b4b14c758a]
-
-2007-08-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* .hgignore:
-	updated .hgignore
-	[eee361d8fd43]
-
-	* common.py, config.py, msgdialog.py, res/messagedialog.wxg:
-	better implementation of common.message, using a custom
-	MessageDialog
-	[848a601445c8]
-
-	* main.py, tree.py:
-	remember position of top-level windows when reloading an app
-	[e5d0ed7b172f]
-
-	* codegen/pl_codegen.py:
-	fixed wrong commit
-	[f879787d8ab5]
-
-	* application.py, codegen/lisp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, common.py, main.py, tree.py:
-	added notification of missing code generators
-
-	Every time a widget is added to the current design, or the output
-	language is changed, check that every widget has a suitable code
-	generator for the language, and if not warn the user
-	[0eba537c26b3]
-
-2007-08-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	applied patch to make event handlers virtual
-	[bba868ec70a1]
-
-2007-08-22  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* misc.py:
-	fixed small bug in selection markers
-	[d383d5a81ff0]
-
-2007-08-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py:
-	upadted version number to 0.6
-	[1a8f84be2b20]
-
-2007-08-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* Closed HEAD branch
-	[60f8cb53b21d]
-
-	* zmain.py, zwxglade.py:
-	Removed obsolete files
-	[9422bb9c3010]
-
-	* .cvsignore, codegen/.cvsignore, docs/.cvsignore,
-	docs/img/.cvsignore, edit_sizers/.cvsignore, icons/.cvsignore,
-	icons/gtk/.cvsignore, icons/msw/.cvsignore, widgets/.cvsignore,
-	widgets/bitmap_button/.cvsignore, widgets/button/.cvsignore,
-	widgets/calendar_ctrl/.cvsignore, widgets/checkbox/.cvsignore,
-	widgets/choice/.cvsignore, widgets/combo_box/.cvsignore,
-	widgets/custom_widget/.cvsignore,
-	widgets/datepicker_ctrl/.cvsignore, widgets/dialog/.cvsignore,
-	widgets/frame/.cvsignore, widgets/gauge/.cvsignore,
-	widgets/grid/.cvsignore, widgets/list_box/.cvsignore,
-	widgets/list_ctrl/.cvsignore, widgets/menubar/.cvsignore,
-	widgets/notebook/.cvsignore, widgets/panel/.cvsignore,
-	widgets/radio_box/.cvsignore, widgets/radio_button/.cvsignore,
-	widgets/slider/.cvsignore, widgets/spacer/.cvsignore,
-	widgets/spin_button/.cvsignore, widgets/spin_ctrl/.cvsignore,
-	widgets/splitter_window/.cvsignore,
-	widgets/static_bitmap/.cvsignore, widgets/static_line/.cvsignore,
-	widgets/static_text/.cvsignore, widgets/text_ctrl/.cvsignore,
-	widgets/toggle_button/.cvsignore, widgets/toolbar/.cvsignore,
-	widgets/tree_ctrl/.cvsignore, zmain.py, zwxglade.py:
-	merge after tagging v0.5
-	[e0fae539f01e] <HEAD>
-
-	* .hgtags:
-	Added tag v0.5 for changeset 6a8223539dd8
-	[2296d06486fe] <HEAD>
-
-	* zmain.py, zwxglade.py:
-	Removed obsolete files
-	[efc77c56a126] <HEAD>
-
-	* .hgignore:
-	Added .hgignore
-	[622ff1929ab9] <HEAD>
-
-	* .cvsignore, codegen/.cvsignore, docs/.cvsignore,
-	docs/img/.cvsignore, edit_sizers/.cvsignore, icons/.cvsignore,
-	icons/gtk/.cvsignore, icons/msw/.cvsignore, widgets/.cvsignore,
-	widgets/bitmap_button/.cvsignore, widgets/button/.cvsignore,
-	widgets/calendar_ctrl/.cvsignore, widgets/checkbox/.cvsignore,
-	widgets/choice/.cvsignore, widgets/combo_box/.cvsignore,
-	widgets/custom_widget/.cvsignore,
-	widgets/datepicker_ctrl/.cvsignore, widgets/dialog/.cvsignore,
-	widgets/frame/.cvsignore, widgets/gauge/.cvsignore,
-	widgets/grid/.cvsignore, widgets/list_box/.cvsignore,
-	widgets/list_ctrl/.cvsignore, widgets/menubar/.cvsignore,
-	widgets/notebook/.cvsignore, widgets/panel/.cvsignore,
-	widgets/radio_box/.cvsignore, widgets/radio_button/.cvsignore,
-	widgets/slider/.cvsignore, widgets/spacer/.cvsignore,
-	widgets/spin_button/.cvsignore, widgets/spin_ctrl/.cvsignore,
-	widgets/splitter_window/.cvsignore,
-	widgets/static_bitmap/.cvsignore, widgets/static_line/.cvsignore,
-	widgets/static_text/.cvsignore, widgets/text_ctrl/.cvsignore,
-	widgets/toggle_button/.cvsignore, widgets/toolbar/.cvsignore,
-	widgets/tree_ctrl/.cvsignore:
-	Removed .cvsignore files
-	[4d5c399c338d] <HEAD>
-
-	* codegen/pl_codegen.py:
-	Some code cleanup
-	[a7ba4564fea2] <HEAD>
-
-	* common.py, configUI.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	font_dialog.py, layout_option_property.py, main.py, misc.py,
-	widget_properties.py:
-	Several "visual" and usability improvements, like better icons,
-	better keyboard navigation, better preview support
-	[5f8a088a129b] <HEAD>
-
-	* widgets/bitmap_button/codegen.py, widgets/calendar_ctrl/codegen.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/gauge/gauge.py, widgets/menubar/menubar.py,
-	widgets/slider/slider.py, widgets/spacer/spacer.py,
-	widgets/static_line/static_line.py, widgets/toolbar/toolbar.py,
-	wxglade.py:
-	Some code cleanup
-	[2f8a7e7e45ba] <HEAD>
-
-	* codegen/py_codegen.py, widgets/notebook/codegen.py,
-	widgets/notebook/notebook.py, widgets/notebook/perl_codegen.py,
-	widgets/panel/codegen.py, widgets/panel/lisp_codegen.py,
-	widgets/panel/panel.py, widgets/panel/perl_codegen.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/splitter_window/splitter_window.py:
-	Improved multiple files code generation.
-
-	Now it is possible to generate classes living in subpackages
-	[6f3167a0372a] <HEAD>
-
-	* application.py, tree.py, widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py, xml_parse.py:
-	Better preview support for "cross-referencing" custom widgets.
-
-	Example: suppose you have a panel called MyPanel, and a frame with a
-	custom widget called MyPanel. Then wxGlade detects that the custom
-	widget is actually a MyPanel instance created before, and will
-	correctly use that in the preview
-	[1a791aa4eb11] <HEAD>
-
-2007-07-21  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* clipboard.py:
-	Set the busy cursor before pasting (since it can take some time...)
-	[5c9156fad1f2] <HEAD>
-
-	* edit_sizers/edit_sizers.py, widgets/panel/panel.py:
-	fixed a segfault when adding a sizer to a panel after having removed
-	the previous one
-	[ece932490171] <HEAD>
-
-2007-06-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	minor changes to keep lines shorter than 80 characters...
-	[cfc500e4e683] <HEAD>
-
-	* edit_sizers/edit_sizers.py:
-	fixed bug in change_sizer
-	[d53e11bb389a] <HEAD>
-
-2007-06-23  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/menubar/perl_codegen.py:
-	applied patch by Klaas Hartmann
-	[155ab9059158] <HEAD>
-
-2007-05-02  dinogen  <dinogen>
-
-	* configUI.py:
-	added a spacer because last entry are not well readable
-	[12e682665c01] <HEAD>
-
-2007-04-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* misc.py:
-	SelectionTags are created and destroyed every time they are
-	shown/hidden: this helps slowing down the rate at which GDI objects
-	usage increases over time (note: this is not a real fix for the
-	problem, I don't know enough about win32 gui to do it...)
-	[c8310ab7ff10] <HEAD>
-
-2007-04-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py, widgets/notebook/notebook.py:
-	fixed bug when deleting a page of a notebook
-	[0a496e6ad710] <HEAD>
-
-2007-04-12  guyru  <guyru>
-
-	* widgets/bitmap_button/bitmap_button.py:
-	fixed some bugs
-	[1b8f5cf86e4c] <HEAD>
-
-2007-04-10  guyru  <guyru>
-
-	* widgets/bitmap_button/codegen.py:
-	fixed cpp codegen
-	[a4256f84f9db] <HEAD>
-
-	* widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py:
-	added styles to bitmap button widget.
-	[8055b1da3be7] <HEAD>
-
-2007-04-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py:
-	changed version number
-	[85006d1d6401] <HEAD>
-
-	* edit_sizers/edit_sizers.py, widget_properties.py:
-	minor UI and code tweaks
-	[f44e6572ef4c] <HEAD>
-
-2007-04-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* credits.txt:
-	updated credits
-	[b24eb925d5fb] <HEAD>
-
-	* CHANGES.txt:
-	updated change log
-	[6a8223539dd8] [rel_0.5] <HEAD>
-
-	* application.py:
-	updated "for_version" property
-	[dafd07ccc015] <HEAD>
-
-	* common.py:
-	changed version number
-	[d4ac4711e37f] <HEAD>
-
-2007-04-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/button/codegen.py:
-	added XRC code generation for stock items
-	[67529af29478] <HEAD>
-
-	* widgets/button/codegen.py, widgets/button/lisp_codegen.py,
-	widgets/button/perl_codegen.py:
-	fixed code generation for stock items
-	[6ac2d1f087cf] <HEAD>
-
-2007-03-31  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/button/button.py:
-	fixed set_stockitem
-	[f9e3629c6504] <HEAD>
-
-	* widget_properties.py:
-	small code formatting change
-	[00ff9bc635c3] <HEAD>
-
-2007-03-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	applied some "cosmetic" patches
-	[f97220e6f9bb] <HEAD>
-
-2007-03-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/radio_box/radio_box.py:
-	fixed segfault with wx 2.8
-	[6c14f19b9954] <HEAD>
-
-	* misc.py:
-	removed deprecated wx.SystemSettings_GetSystemFont
-	[4ad2560c82bf] <HEAD>
-
-2007-03-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py:
-	fixed raise_all
-	[f0dd4131cbed] <HEAD>
-
-	* README.txt, __init__.py, about.py, application.py, clipboard.py,
-	codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, edit_sizers/__init__.py,
-	edit_sizers/edit_sizers.py, edit_sizers/sizers_codegen.py,
-	edit_windows.py, kdefiledialog.py, layout_option_property.py,
-	main.py, misc.py, template.py, tree.py, widget_properties.py,
-	widgets/ChoicesCodeHandler.py, widgets/ChoicesProperty.py,
-	widgets/MenuTree.py, widgets/__init__.py,
-	widgets/bitmap_button/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/button/__init__.py,
-	widgets/button/button.py, widgets/button/codegen.py,
-	widgets/calendar_ctrl/__init__.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/calendar_ctrl/codegen.py, widgets/checkbox/__init__.py,
-	widgets/checkbox/checkbox.py, widgets/checkbox/codegen.py,
-	widgets/choice/__init__.py, widgets/choice/choice.py,
-	widgets/choice/codegen.py, widgets/combo_box/__init__.py,
-	widgets/combo_box/codegen.py, widgets/combo_box/combo_box.py,
-	widgets/custom_widget/__init__.py, widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/datepicker_ctrl/__init__.py,
-	widgets/datepicker_ctrl/codegen.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/dialog/__init__.py, widgets/dialog/codegen.py,
-	widgets/dialog/dialog.py, widgets/frame/__init__.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/frame/lisp_codegen.py, widgets/frame/perl_codegen.py,
-	widgets/gauge/__init__.py, widgets/gauge/codegen.py,
-	widgets/gauge/gauge.py, widgets/grid/__init__.py,
-	widgets/grid/codegen.py, widgets/grid/grid.py,
-	widgets/list_box/__init__.py, widgets/list_box/codegen.py,
-	widgets/list_box/list_box.py, widgets/list_ctrl/__init__.py,
-	widgets/list_ctrl/codegen.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/menubar/__init__.py, widgets/menubar/codegen.py,
-	widgets/menubar/menubar.py, widgets/notebook/__init__.py,
-	widgets/notebook/codegen.py, widgets/notebook/notebook.py,
-	widgets/panel/__init__.py, widgets/panel/codegen.py,
-	widgets/panel/panel.py, widgets/radio_box/__init__.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/radio_box.py,
-	widgets/radio_button/__init__.py, widgets/radio_button/codegen.py,
-	widgets/radio_button/radio_button.py, widgets/slider/__init__.py,
-	widgets/slider/codegen.py, widgets/slider/slider.py,
-	widgets/spacer/__init__.py, widgets/spacer/codegen.py,
-	widgets/spacer/spacer.py, widgets/spin_button/__init__.py,
-	widgets/spin_ctrl/__init__.py, widgets/spin_ctrl/codegen.py,
-	widgets/spin_ctrl/spin_ctrl.py, widgets/splitter_window/__init__.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/__init__.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/lisp_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/__init__.py, widgets/static_line/codegen.py,
-	widgets/static_line/static_line.py, widgets/static_text/__init__.py,
-	widgets/static_text/codegen.py, widgets/static_text/static_text.py,
-	widgets/text_ctrl/__init__.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toggle_button/__init__.py,
-	widgets/toggle_button/codegen.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/__init__.py,
-	widgets/toolbar/codegen.py, widgets/toolbar/tool.py,
-	widgets/toolbar/toolbar.py, widgets/tree_ctrl/__init__.py,
-	widgets/tree_ctrl/codegen.py, widgets/tree_ctrl/tree_ctrl.py,
-	wxglade.py, xml_parse.py, xrc2wxg.py:
-	updated copyright notice
-	[365a0fc3894a] <HEAD>
-
-	* widget_properties.py, widgets/button/button.py,
-	widgets/button/button_stockitems.py, widgets/button/codegen.py,
-	widgets/button/lisp_codegen.py, widgets/button/perl_codegen.py:
-	Added patch by Johan Vromans to support stock buttons
-	[ec89b7c641f5] <HEAD>
-
-	* application.py, common.py, configUI.py, kdefiledialog.py:
-	fix for default path of DirDialog
-	[196949d3cf6a] <HEAD>
-
-2007-03-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widget_properties.py, widgets/list_box/list_box.py:
-	a couple of minor fixes...
-	[3267ed30a83d] <HEAD>
-
-	* widget_properties.py:
-	fixed SpinProperty crash with new wx 2.8
-	[6557868ce104] <HEAD>
-
-	* widgets/combo_box/combo_box.py:
-	updated indentation style
-	[60123762b4ab] <HEAD>
-
-	* widgets/panel/panel.py:
-	fix for hang using wxPython 2.8.1.1 on Ubuntu
-	[710c020fa587] <HEAD>
-
-	* main.py:
-	fixed raise_all bug
-	[0b876df97ef4] <HEAD>
-
-2007-03-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py:
-	applied patch to add a "Raise All" menu item
-	[a6ba91bbe3d6] <HEAD>
-
-	* widgets/menubar/perl_codegen.py:
-	applied patch to fix submenu generation problem...
-	[33d29ae8f245] <HEAD>
-
-	* main.py:
-	small reformatting changes...
-	[c696a6d572d9] <HEAD>
-
-	* codegen/py_codegen.py:
-	small change to the encoding line
-	[6b665fdebc68] <HEAD>
-
-2007-03-18  guyru  <guyru>
-
-	* template.py:
-	replaced tabs with regular spaces
-	[bce2c8e9e722] <HEAD>
-
-2007-03-09  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/splitter_window/splitter_window.py:
-	changed range of "sash pos" property to allow negative values
-	[33437978e3bc] <HEAD>
-
-	* codegen/pl_codegen.py:
-	Applied patch for event handlers
-	[7615d15332cd] <HEAD>
-
-2007-03-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py:
-	changed wxversion.select("2.6") to wxversion.ensureMinimal("2.6"),
-	fixed mixed tabs/spaces problem
-	[0d73711c924d] <HEAD>
-
-2007-02-13  guyru  <guyru>
-
-	* template.py:
-	fixed header tag
-	[6d6922ebab60] <HEAD>
-
-	* xml_parse.py:
-	some exception handling
-	[c058316135e3] <HEAD>
-
-	* main.py, template.py:
-	template info reading
-	[bb4c8225e7f5] <HEAD>
-
-2007-02-09  dinogen  <dinogen>
-
-	* po/de.po, po/fr.po:
-	i18n completed. Now translations.
-	[c845ef6881f6] <HEAD>
-
-	* credits.txt, po/messages.pot, widgets/gauge/gauge.py,
-	widgets/grid/grid.py, widgets/list_box/list_box.py,
-	widgets/list_ctrl/list_ctrl.py, widgets/menubar/menubar.py,
-	widgets/notebook/notebook.py, widgets/radio_button/radio_button.py,
-	widgets/slider/slider.py, widgets/spacer/lisp_codegen.py,
-	widgets/static_text/static_text.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/tree_ctrl/tree_ctrl.py:
-	i18n completed. Now translations.
-	[04b5be4ac461] <HEAD>
-
-2007-02-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* credits.txt:
-	updated credits
-	[6950dc2cd97f] <HEAD>
-
-	* license.txt:
-	updated copyright notice
-	[f915bd1e706a] <HEAD>
-
-	* main.py:
-	fixed small bug that prevented displaying help
-	[2a747c6b5bf3] <HEAD>
-
-	* edit_sizers/edit_sizers.py:
-	fixed bug that prevented changing from FlexGridSizer to GridSizer
-	[2da65087d5a5] <HEAD>
-
-2007-01-31  dinogen  <dinogen>
-
-	* misc.py, tree.py, widget_properties.py,
-	widgets/bitmap_button/bitmap_button.py, wxglade.py, xml_parse.py,
-	zmain.py:
-	correct fallback bug
-	[936ffa7ccdaf] <HEAD>
-
-2007-01-31  guyru  <guyru>
-
-	* application.py:
-	set the default value of is_template to false
-	[5fda610e6af1] <HEAD>
-
-	* credits.txt:
-	self credit :)
-	[757bf25bf32d] <HEAD>
-
-	* main.py, tree.py, xml_parse.py:
-	template handling
-	[fd9fe3501047] <HEAD>
-
-	* kdefiledialog.py:
-	removed extra ) in line 70
-	[bd3e73988b4d] <HEAD>
-
-	* locale/en/LC_MESSAGES/wxglade.mo, po/en.po:
-	fixed issue regarding starting up without an Italian locale.
-	[3b2f12d13924] <HEAD>
-
-2007-01-29  dinogen  <dinogen>
-
-	* edit_widget.py, edit_windows.py, events_mixin.py, font_dialog.py,
-	kdefiledialog.py, layout_option_property.py, main.py:
-	i18n
-	[ed289052a9e3] <HEAD>
-
-2007-01-27  dinogen  <dinogen>
-
-	* color_dialog.py, edit_sizers/edit_sizers.py,
-	locale/it/LC_MESSAGES/wxglade.mo, po/it.po:
-	preference dialog iternationalizated
-	[cbb40d18f9ad] <HEAD>
-
-	* clipboard.py:
-	stupid bug
-	[af59a751009d] <HEAD>
-
-	* about.py, clipboard.py, color_dialog.py, common.py, config.py,
-	configUI.py, locale/it/LC_MESSAGES/wxglade.mo, po/it.po,
-	po/messages.pot, wxglade.py:
-	locales added
-	[5b0f60584f4e] <HEAD>
-
-2007-01-26  dinogen  <dinogen>
-
-	* edit_sizers/edit_sizers.py, po/messages.po, po/messages.pot:
-	pp
-	[b3a774fcaa72] <HEAD>
-
-2007-01-19  dinogen  <dinogen>
-
-	* po/messages.po:
-	add i18n
-	[dceede7fdb1f] <HEAD>
-
-2007-01-18  dinogen  <dinogen>
-
-	* clipboard.py, color_dialog.py, common.py, config.py, configUI.py,
-	wxglade.py:
-	begin of localization
-	[a61a4237523c] <HEAD>
-
-2006-12-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, tree.py, xml_parse.py:
-	changed the UI of "use_new_namespace". Now the meaning is the
-	opposite: if checked, the old "from wxPython.wx import *" mechanism
-	will be used (unchecked by default)
-	[069350aabcce] <HEAD>
-
-2006-12-04  jkt  <jkt>
-
-	* main.py:
-	conform to wxPython 2.7
-	[1da5806b73ed] <HEAD>
-
-2006-12-02  guyru  <guyru>
-
-	* widgets/slider/slider.py:
-	added new styles and tooltips
-	[9da4ccd3b127] <HEAD>
-
-	* widgets/radio_button/radio_button.py:
-	*** empty log message ***
-	[faa363be3228] <HEAD>
-
-2006-12-02  jkt  <jkt>
-
-	* credits.txt:
-	autokudos
-	[2dbcb9b57a11] <HEAD>
-
-2006-12-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/lisp_sizers_codegen.py,
-	edit_sizers/perl_sizers_codegen.py, edit_sizers/sizers_codegen.py:
-	Better layout code generation, following Robin Dunn's comments
-	appearing here: http://lists.wxwidgets.org/cgi-bin/ezmlm-
-	cgi?11:mss:50516:200604:ckdkhmebfbadhedacofn
-	[8608f86031eb] <HEAD>
-
-	* application.py, common.py, configUI.py, edit_sizers/edit_sizers.py,
-	edit_windows.py, events_mixin.py, font_dialog.py,
-	layout_option_property.py, main.py, misc.py, tree.py,
-	widget_properties.py, widgets/button/button.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/checkbox/checkbox.py, widgets/combo_box/combo_box.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py, widgets/grid/grid.py,
-	widgets/list_ctrl/list_ctrl.py, widgets/menubar/menubar.py,
-	widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py,
-	widgets/static_line/static_line.py, widgets/toolbar/toolbar.py,
-	widgets/widgets.txt, xml_parse.py:
-	Transition to the new wx namespace completed (hopefully)
-	[3eebe336c131] <HEAD>
-
-2006-11-30  jkt  <jkt>
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py:
-	add "from <WXG_FILE>" to headers of generated code with compliments
-	to Stani of SPE fame who suggested this in http://sourceforge.net/ma
-	ilarchive/forum.php?thread_id=31139957&forum_id=10344
-	[5b29c569195e] <HEAD>
-
-2006-11-23  dinogen  <dinogen>
-
-	* edit_widget.py, edit_windows.py:
-	wx module
-	[f345c9927e2c] <HEAD>
-
-	* application.py:
-	Error on show_prop.
-	[1e2633e28835] <HEAD>
-
-2006-11-22  dinogen  <dinogen>
-
-	* config.py:
-	wx module
-	[67ff2e43a07d] <HEAD>
-
-	* application.py:
-	wx module
-	[d713ef29f425] <HEAD>
-
-2006-11-22  guyru  <guyru>
-
-	* widgets/gauge/gauge.py, widgets/list_box/list_box.py,
-	widgets/list_ctrl/list_ctrl.py:
-	added tooltips
-	[200e5ccc1974] <HEAD>
-
-	* widgets/datepicker_ctrl/datepicker_ctrl.py,
-	widgets/dialog/dialog.py:
-	tooltips
-	[6af2b6fc29b9] <HEAD>
-
-2006-11-21  dinogen  <dinogen>
-
-	* clipboard.py, color_dialog.py:
-	wx module
-	[38e3cd52aafb] <HEAD>
-
-2006-11-20  dinogen  <dinogen>
-
-	* application.py:
-	new module wx
-	[aa301fe00899] <HEAD>
-
-	* about.py:
-	wxPython to wx module
-	[ab7b91644ff0] <HEAD>
-
-2006-11-20  guyru  <guyru>
-
-	* widgets/calendar_ctrl/calendar_ctrl.py:
-	added tooltips and updated style labels
-	[6c172bccc7a6] <HEAD>
-
-	* widgets/combo_box/combo_box.py:
-	added tooltips and one more style
-	[2f188767fc47] <HEAD>
-
-2006-11-19  guyru  <guyru>
-
-	* widgets/button/button.py:
-	added tooltips for the checkbox properties. also added one more
-	style: wxNO_BORDER which creates flat buttons.
-	[c54938ad79e0] <HEAD>
-
-	* widget_properties.py:
-	added tooltips for the checkbox properties
-	[fe268b976a3d] <HEAD>
-
-2006-11-16  guyru  <guyru>
-
-	* widgets/checkbox/checkbox.py, widgets/radio_button/radio_button.py:
-	moved to the wxPython namespace
-	[cc3e12e463ee] <HEAD>
-
-	* widgets/radio_box/radio_box.py:
-	moved to the wxPython namespace
-	[0ef063ba38e9] <HEAD>
-
-	* widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/static_line.py:
-	moved to the wxPython namespace
-	[ad33931afc7f] <HEAD>
-
-	* widgets/list_ctrl/list_ctrl.py:
-	moved to the wxPython namespace
-	[760812f2d23e] <HEAD>
-
-	* widgets/tree_ctrl/tree_ctrl.py:
-	moved to the wxPython namespace
-	[d3f086f36229] <HEAD>
-
-	* widgets/grid/grid.py:
-	moved to the wxPython namespace
-	[f274fa4f6e51] <HEAD>
-
-	* widgets/custom_widget/custom_widget.py, widgets/spacer/spacer.py:
-	moved to the wxPython namespace
-	[26c8bb3a63fc] <HEAD>
-
-	* widgets/menubar/menubar.py:
-	moved to the wxPython namespace
-	[87858d5f007a] <HEAD>
-
-2006-11-15  guyru  <guyru>
-
-	* widgets/toolbar/toolbar.py:
-	moved to the wxPython namespace
-	[bf594a28fd04] <HEAD>
-
-	* widgets/datepicker_ctrl/datepicker_ctrl.py:
-	moved to the wxPython namespace
-	[2a4a30e812e8] <HEAD>
-
-2006-11-14  jkt  <jkt>
-
-	* widgets/choice/choice.py, widgets/combo_box/combo_box.py,
-	widgets/list_box/list_box.py:
-	convert from "import wxPython*" to "import wx" as wxPython namespace
-	is deprecated as of 2.7.1.1
-	[d924e2c29dac] <HEAD>
-
-2006-11-11  guyru  <guyru>
-
-	* widgets/calendar_ctrl/calendar_ctrl.py:
-	moved to the new syntax
-	[20103ffb4ef0] <HEAD>
-
-2006-11-07  jkt  <jkt>
-
-	* widgets/bitmap_button/bitmap_button.py, widgets/button/button.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/gauge/gauge.py, widgets/notebook/notebook.py,
-	widgets/panel/panel.py, widgets/slider/slider.py,
-	widgets/spin_button/spin_button.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_text/static_text.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/toggle_button/toggle_button.py:
-	convert from "import wxPython*" to "import wx" as wxPython namespace
-	is deprecated as of 2.7.1.1
-	[022e01730796] <HEAD>
-
-2006-11-02  guyru  <guyru>
-
-	* widgets/calendar_ctrl/calendar_ctrl.py:
-	moved most of the code to the new syntax, but still some old syntax
-	remains, although the module shouldn't have any problems
-	[72088dd75e26] <HEAD>
-
-2006-10-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/widgets.txt:
-	reoreded list to keep spacer at the end
-	[04609b3e7dda] <HEAD>
-
-	* icons/calendar_ctrl.xpm, icons/datepicker_ctrl.xpm:
-	better icons
-	[ed395b34cb58] <HEAD>
-
-2006-10-20  guyru  <guyru>
-
-	* icons/datepicker_ctrl.xpm, widgets/datepicker_ctrl/.cvsignore,
-	widgets/datepicker_ctrl/__init__.py,
-	widgets/datepicker_ctrl/codegen.py,
-	widgets/datepicker_ctrl/datepicker_ctrl.py, widgets/widgets.txt:
-	wxDatePickerCtrl support
-	[f481be54790e] <HEAD>
-
-	* widgets/calendar_ctrl/codegen.py:
-	fixed c++ code generation. missed wxDefaultDate
-	[46bf664d0b63] <HEAD>
-
-	* widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/calendar_ctrl/codegen.py:
-	various bug fixes, removed extra debugging code, fixed python code
-	generation
-	[9ca83e6f4d98] <HEAD>
-
-2006-10-19  guyru  <guyru>
-
-	* widgets/calendar_ctrl/codegen.py:
-	*** empty log message ***
-	[13afd7173eef] <HEAD>
-
-	* widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/calendar_ctrl/codegen.py:
-	bugfixes
-	[61c21b2153fc] <HEAD>
-
-2006-10-18  guyru  <guyru>
-
-	* widgets/calendar_ctrl/calendar_ctrl.py:
-	a small fix to the xml_builder
-	[4ab2a06cc8dc] <HEAD>
-
-2006-10-15  guyru  <guyru>
-
-	* widgets/calendar_ctrl/calendar_ctrl.py:
-	new icon
-	[785f3a6a73a4] <HEAD>
-
-	* icons/calendar_ctrl.xpm:
-	icon for wxCalendarCtrl
-	[1a1cbd116f98] <HEAD>
-
-	* widgets/calendar_ctrl/calendar_ctrl.py:
-	fixed some bugs
-	[cb4ab04cf759] <HEAD>
-
-2006-10-14  guyru  <guyru>
-
-	* widgets/calendar_ctrl/.cvsignore, widgets/calendar_ctrl/__init__.py,
-	widgets/calendar_ctrl/calendar_ctrl.py,
-	widgets/calendar_ctrl/codegen.py:
-	initial revision for calendar_ctrl. still has some bugs in the
-	codegen
-	[ded1870133e8] <HEAD>
-
-	* widgets/widgets.txt:
-	added calendar_ctrl
-	[bc85605794fd] <HEAD>
-
-	* epydoc.conf:
-	configuration file for the epydoc documentation generator
-	[a3e0c3ecb7d2] <HEAD>
-
-2006-10-12  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	patch for feature request #1228246
-	[2004c6c40b5f] <HEAD>
-
-2006-10-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/choice/choice.py, widgets/combo_box/combo_box.py:
-	fixed a size bug on win xp
-	[0207f89fca31] <HEAD>
-
-2006-10-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py, widgets/menubar/codegen.py, widgets/slider/codegen.py:
-	fixed some bugs
-	[06e77956f3aa] <HEAD>
-
-2006-07-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/menubar/codegen.py, widgets/toolbar/codegen.py:
-	Added event handler stubs code generation for C++ output
-	[642bb1f1b328] <HEAD>
-
-2006-05-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	fixed segfault and wxGridSizer removal problem
-	[3534205786c2] <HEAD>
-
-2006-05-13  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py:
-	updated version number
-	[03cac451726f] <HEAD>
-
-	* widget_properties.py:
-	fixed possible segfault
-	[63d94ec258fa] <HEAD>
-
-2006-05-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/menubar/menubar.py:
-	added apply button to the menu editor
-	[2dd0af6a8fa2] <HEAD>
-
-	* widgets/toolbar/toolbar.py:
-	added apply button to the toolbar editor
-	[66a92e626714] <HEAD>
-
-	* tree.py:
-	fixed small bug
-	[ce032c64fc46] <HEAD>
-
-2006-05-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, codegen/xrc_codegen.py, tree.py:
-	some bugs fixed
-	[02fea3ab3ca5] <HEAD>
-
-	* edit_sizers/edit_sizers.py:
-	fixed "change class" bug
-	[40b01b1fc692] <HEAD>
-
-2006-05-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py:
-	Fixed bug when both "separate file for each class" and "overwrite
-	existing sources" were used
-	[5b9c5a7aa2a3] <HEAD>
-
-	* application.py:
-	fixed "select top window" bug
-	[c4b636683fa3] <HEAD>
-
-2006-03-13  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py:
-	added wxversion select of wx2.6
-	[d442a779b4be] <HEAD>
-
-	* widgets/custom_widget/custom_widget.py:
-	applied patch #1447669
-	[ec0e07c46cd3] <HEAD>
-
-	* edit_windows.py:
-	applied patch #1447674
-	[83be2f0ca075] <HEAD>
-
-2006-03-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt:
-	added line of release of v0.4.1
-	[d78c49e2222e] <HEAD>
-
-	* common.py:
-	updated version number
-	[dbe512a98fb2] <HEAD>
-
-2006-02-21  georgesk  <georgesk>
-
-	* debian/changelog:
-	fixed the changelog
-	[0a499cd97a5e] <HEAD>
-
-	* debian/changelog:
-	adjusted the version number for the debian package
-	[684fdbb51b1b] <HEAD>
-
-2006-02-12  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py, codegen/lisp_codegen.py,
-	codegen/pl_codegen.py, codegen/py_codegen.py:
-	fixed multiple generation of event stubs
-	[c8d91ed1a0e3] <HEAD>
-
-2006-01-31  georgesk  <georgesk>
-
-	* debian/changelog, debian/menu, wxglade:
-	fixed a lot of bugs reported by debian users, see debian/Changelog
-	[774f21e98481] <HEAD>
-
-2006-01-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	commented out debug print statement
-	[406306f99d92] <HEAD>
-
-	* widget_properties.py:
-	fixed crash on windows (caused by spin properties losing focus...)
-	[9e8d3e0675d6] <HEAD>
-
-2005-12-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/panel/panel.py:
-	added option to prevent generating code for the custom class
-	[c1f0c60e19d2] <HEAD>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py, tree.py,
-	widget_properties.py, xml_parse.py:
-	added "sizerslot", i.e. keep empty slots when saving a project...
-	[9076ab9a81ac] <HEAD>
-
-2005-12-23  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/choice/codegen.py, widgets/combo_box/codegen.py:
-	fixed invalid SetSelection code generation
-	[a356f5d8abb7] <HEAD>
-
-2005-11-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* tree.py, widgets/panel/codegen.py, widgets/panel/panel.py,
-	widgets/panel/perl_codegen.py, xml_parse.py:
-	added option (to wxPanel) to disable code generation for custom
-	classes
-	[a0157f7db5ea] <HEAD>
-
-2005-10-27  georgesk  <georgesk>
-
-	* Makefile, debian/files:
-	fixed one bug about the deletion of .xvpics upon building the debian
-	package
-	[2c0a19a81aa2] <HEAD>
-
-2005-10-14  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py:
-	fixup wxGlade tag order for events
-	[69d02e5dde7e] <HEAD>
-
-	* widgets/menubar/perl_codegen.py:
-	import MenuHandler instead of inlining
-	[831d2cee2ead] <HEAD>
-
-	* widgets/menubar/perl_codegen.py:
-	import MenuHandler instead of inlining
-	[962a0edce280] <HEAD>
-
-	* codegen/pl_codegen.py:
-	notebooksizer for_version
-	[e79d4496c876] <HEAD>
-
-	* widgets/static_bitmap/perl_codegen.py:
-	discovered by 1255968 (wxFoo Wx::Foo)
-	[6e6e9384b123] <HEAD>
-
-2005-10-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, codegen/cpp_codegen.py, codegen/pl_codegen.py,
-	widgets/menubar/perl_codegen.py:
-	bugs fixed/added event handling support for perl output
-	[23a0e26009c7] <HEAD>
-
-2005-10-13  dinogen  <dinogen>
-
-	* edit_windows.py:
-	Fixed bug 1289473. Show Properties of widget under a wxNotebook.
-	[eecfb8e0c592] <HEAD>
-
-2005-10-08  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, application.py, codegen/pl_codegen.py, common.py:
-	some patches...
-	[b22a3f9108c3] <HEAD>
-
-2005-09-29  efuzzyone  <efuzzyone>
-
-	* application.py, edit_windows.py, events_mixin.py:
-	The name for events, widgets, classes, etc., now should allow
-	hyphen(-). This change was necessitated due to lisp, which has a
-	convention of allowing hyphen in names.
-	[a81a114a3a20] <HEAD>
-
-2005-09-27  efuzzyone  <efuzzyone>
-
-	* widgets/notebook/lisp_codegen.py:
-	Replace _ by - in variable names.
-	[42f4d56fc343] <HEAD>
-
-	* codegen/lisp_codegen.py:
-	Fixed wxEvtHandlerConnect to wxEvtHandler_Connect.
-	[b54bc0c2ee6b] <HEAD>
-
-2005-09-25  efuzzyone  <efuzzyone>
-
-	* widgets/frame/lisp_codegen.py, widgets/menubar/lisp_codegen.py,
-	widgets/toolbar/lisp_codegen.py:
-	Made several code improvements.
-	[435cdaf35029] <HEAD>
-
-	* codegen/lisp_codegen.py:
-	Made several improvements, also wrapped the program initialization
-	code with unwind-protect.
-	[cb9867f60820] <HEAD>
-
-2005-09-22  efuzzyone  <efuzzyone>
-
-	* widgets/checkbox/lisp_codegen.py, widgets/choice/lisp_codegen.py,
-	widgets/combo_box/lisp_codegen.py,
-	widgets/custom_widget/lisp_codegen.py,
-	widgets/dialog/lisp_codegen.py, widgets/frame/lisp_codegen.py,
-	widgets/gauge/lisp_codegen.py, widgets/grid/lisp_codegen.py,
-	widgets/list_box/lisp_codegen.py, widgets/list_ctrl/lisp_codegen.py,
-	widgets/menubar/lisp_codegen.py, widgets/notebook/lisp_codegen.py,
-	widgets/panel/lisp_codegen.py, widgets/radio_box/lisp_codegen.py,
-	widgets/radio_button/lisp_codegen.py,
-	widgets/slider/lisp_codegen.py, widgets/spacer/lisp_codegen.py,
-	widgets/spin_button/lisp_codegen.py,
-	widgets/spin_ctrl/lisp_codegen.py,
-	widgets/splitter_window/lisp_codegen.py:
-	Initial Revision for generating lisp code.
-	[50321ed75754] <HEAD>
-
-	* widgets/static_bitmap/lisp_codegen.py,
-	widgets/static_line/lisp_codegen.py:
-	Initial revision.
-	[b9925bf5f8e4] <HEAD>
-
-	* codegen/lisp_codegen.py, edit_sizers/lisp_sizers_codegen.py,
-	widgets/bitmap_button/lisp_codegen.py,
-	widgets/button/lisp_codegen.py, widgets/static_text/lisp_codegen.py,
-	widgets/text_ctrl/lisp_codegen.py,
-	widgets/toggle_button/lisp_codegen.py,
-	widgets/toolbar/lisp_codegen.py, widgets/tree_ctrl/lisp_codegen.py:
-	Initial revision.
-	[daee2d6a5b04] <HEAD>
-
-2005-08-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/pl_codegen.py:
-	fixed small bug
-	[d36591c7e103] <HEAD>
-
-2005-08-24  georgesk  <georgesk>
-
-	* Makefile, debian/changelog, debian/control, debian/postinst,
-	debian/rules, wxglade:
-	imported modifications made by Matthias Klose <doko@cs.tu-berlin.de>
-	[82d6c693b3f7] <HEAD>
-
-2005-08-23  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/frame/frame.py, widgets/splitter_window/splitter_window.py:
-	small bug fixed
-	[82046b9989ae] <HEAD>
-
-2005-08-23  georgesk  <georgesk>
-
-	* debian/changelog:
-	updated the dependancies
-	[130bc8dc8c17] <HEAD>
-
-	* debian/changelog, debian/control, debian/files:
-	updated the dependancies
-	[763642d4f8c1] <HEAD>
-
-2005-08-15  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/toolbar/perl_codegen.py, widgets/tree_ctrl/perl_codegen.py:
-	discovered by 1255968 (wxFoo Wx::Foo)
-	[2dca1369ed41] <HEAD>
-
-	* widgets/toggle_button/perl_codegen.py:
-	discovered by 1255968 (wxFoo Wx::Foo)
-	[0dc3b138c81a] <HEAD>
-
-	* widgets/bitmap_button/perl_codegen.py,
-	widgets/button/perl_codegen.py, widgets/checkbox/perl_codegen.py,
-	widgets/choice/perl_codegen.py, widgets/combo_box/perl_codegen.py,
-	widgets/gauge/perl_codegen.py, widgets/grid/perl_codegen.py,
-	widgets/list_box/perl_codegen.py, widgets/list_ctrl/perl_codegen.py,
-	widgets/menubar/perl_codegen.py, widgets/panel/perl_codegen.py,
-	widgets/radio_box/perl_codegen.py,
-	widgets/radio_button/perl_codegen.py,
-	widgets/slider/perl_codegen.py, widgets/spin_button/perl_codegen.py,
-	widgets/spin_ctrl/perl_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/static_line/perl_codegen.py,
-	widgets/static_text/perl_codegen.py,
-	widgets/text_ctrl/perl_codegen.py:
-	discovered by 1255968 (wxFoo Wx::Foo)
-	[d8f9cb50d461] <HEAD>
-
-	* widgets/notebook/perl_codegen.py:
-	bug related to 1255968 (1255968 fixed long ago)
-	[09fdc432f7fe] <HEAD>
-
-	* codegen/pl_codegen.py:
-	s/mkdir/makedirs/ -- pending bug 1255256
-	[279b7e9cefb0] <HEAD>
-
-2005-08-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/__init__.py:
-	added to please spe...
-	[70e1b588e455] <HEAD>
-
-2005-08-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/static_bitmap/perl_codegen.py:
-	fixed bug in the generated constructor
-	[9c34f33e058a] <HEAD>
-
-	* widgets/combo_box/combo_box.py:
-	added EVT_TEXT_ENTER event
-	[b3b814449101] <HEAD>
-
-2005-07-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, codegen/py_codegen.py, widgets/dialog/dialog.py,
-	widgets/frame/frame.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/panel/panel.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/tree_ctrl/tree_ctrl.py:
-	various bugfixes
-	[30970f46b902] <HEAD>
-
-2005-06-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	fixed bug #1218563
-	[8d4b6c7a15fb] <HEAD>
-
-	* codegen/py_codegen.py:
-	fixed bug #1218563
-	[a23688d570ec] <HEAD>
-
-2005-06-09  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	changed quote_str to generate a unicode object if the string
-	contains non-ascii chars
-	[c6f0e8750c59] <HEAD>
-
-2005-06-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	now SizerHandleButtons are based on generic buttons on all platforms
-	(better looking even with strange themes...)
-	[f24b4b6969be] <HEAD>
-
-2005-06-03  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/static_text/static_text.py:
-	applied patch to fix "empty label" bug
-	[c3796fa56410] <HEAD>
-
-2005-05-13  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	fixed wx2.6 segfault
-	[d90298bbf326] <HEAD>
-
-2005-05-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, README.txt, __init__.py, about.py, application.py,
-	clipboard.py, codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, credits.txt,
-	edit_sizers/__init__.py, edit_sizers/edit_sizers.py,
-	edit_sizers/sizers_codegen.py, edit_windows.py, license.txt,
-	main.py, misc.py, tree.py, widget_properties.py,
-	widgets/ChoicesCodeHandler.py, widgets/ChoicesProperty.py,
-	widgets/MenuTree.py, widgets/bitmap_button/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/button/__init__.py,
-	widgets/button/button.py, widgets/button/codegen.py,
-	widgets/checkbox/__init__.py, widgets/checkbox/checkbox.py,
-	widgets/checkbox/codegen.py, widgets/choice/__init__.py,
-	widgets/choice/choice.py, widgets/choice/codegen.py,
-	widgets/combo_box/__init__.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/combo_box.py, widgets/custom_widget/__init__.py,
-	widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py, widgets/dialog/__init__.py,
-	widgets/dialog/codegen.py, widgets/dialog/dialog.py,
-	widgets/frame/__init__.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/frame/perl_codegen.py,
-	widgets/gauge/__init__.py, widgets/gauge/codegen.py,
-	widgets/gauge/gauge.py, widgets/grid/__init__.py,
-	widgets/grid/codegen.py, widgets/grid/grid.py,
-	widgets/list_box/__init__.py, widgets/list_box/codegen.py,
-	widgets/list_box/list_box.py, widgets/list_ctrl/__init__.py,
-	widgets/list_ctrl/codegen.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/menubar/__init__.py, widgets/menubar/codegen.py,
-	widgets/menubar/menubar.py, widgets/notebook/__init__.py,
-	widgets/notebook/codegen.py, widgets/notebook/notebook.py,
-	widgets/panel/__init__.py, widgets/panel/codegen.py,
-	widgets/panel/panel.py, widgets/radio_box/__init__.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/radio_box.py,
-	widgets/radio_button/__init__.py, widgets/radio_button/codegen.py,
-	widgets/radio_button/radio_button.py, widgets/slider/__init__.py,
-	widgets/slider/codegen.py, widgets/slider/slider.py,
-	widgets/spacer/__init__.py, widgets/spacer/codegen.py,
-	widgets/spacer/spacer.py, widgets/spin_button/__init__.py,
-	widgets/spin_ctrl/__init__.py, widgets/spin_ctrl/codegen.py,
-	widgets/spin_ctrl/spin_ctrl.py, widgets/splitter_window/__init__.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/__init__.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/__init__.py, widgets/static_line/codegen.py,
-	widgets/static_line/static_line.py, widgets/static_text/__init__.py,
-	widgets/static_text/codegen.py, widgets/static_text/static_text.py,
-	widgets/text_ctrl/__init__.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toggle_button/__init__.py,
-	widgets/toggle_button/codegen.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/__init__.py,
-	widgets/toolbar/codegen.py, widgets/toolbar/tool.py,
-	widgets/toolbar/toolbar.py, widgets/tree_ctrl/__init__.py,
-	widgets/tree_ctrl/codegen.py, widgets/tree_ctrl/tree_ctrl.py,
-	wxglade.py, xml_parse.py, xrc2wxg.py:
-	updated copyright info - added wx2.6 compatibility
-	[c756f426c1ce] <HEAD>
-
-2005-04-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py, events_mixin.py:
-	small fixes (as usual ;-)
-	[953b32c04bc8] <HEAD>
-
-2005-04-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	fixed broken GridSizer layout
-	[c65bff823272] <HEAD>
-
-2005-04-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/toolbar/toolbar.py:
-	changed to unix eol
-	[e2a414ebb6ac] <HEAD>
-
-2005-04-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	fixed small bug
-	[148b2d47b72d] <HEAD>
-
-2005-04-09  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/toolbar/toolbar.py:
-	load empty bitmap if var:/code:
-	[d88587b60b42] <HEAD>
-
-	* widgets/bitmap_button/bitmap_button.py,
-	widgets/static_bitmap/static_bitmap.py:
-	load empty bitmap if var:/code:
-	[dfee061cbc7c] <HEAD>
-
-2005-04-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py, widget_properties.py,
-	widgets/panel/panel.py:
-	fixed segfault when adding a panel... (introduced by mistake some
-	weeks ago)
-	[8d8e47eb52d1] <HEAD>
-
-2005-04-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	widgets/grid/codegen.py:
-	fixed some various bugs...
-	[21530c7810f0] <HEAD>
-
-	* layout_option_property.py:
-	added layout_option_property to prepare for (possible)
-	wx.GridBagSizer support
-	[27fa1293dfae] <HEAD>
-
-2005-03-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/toolbar/perl_codegen.py:
-	applied patch #1169318
-	[6b5f29e3b7da] <HEAD>
-
-2005-03-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py, widgets/frame/codegen.py, xml_parse.py:
-	some bug fixes
-	[c701e69d0c21] <HEAD>
-
-2005-03-05  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* icons/gtk/refresh.xpm, icons/msw/refresh.xpm, main.py, tree.py:
-	implemented "refresh"
-	[a5f02c2e8705] <HEAD>
-
-2005-02-21  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/notebook/perl_codegen.py:
-	added missing new_signature
-	[59aa1657cc4c] <HEAD>
-
-2005-02-12  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py:
-	now when you select a different widget, the visible tab is preserved
-	(if possible)
-	[19adf2b6f932] <HEAD>
-
-2005-02-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py, widgets/dialog/dialog.py, widgets/frame/frame.py:
-	fixed title bug
-	[6c2964bcad08] <HEAD>
-
-2005-01-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py:
-	applied patch #1101182
-	[2c4d5a2dc166] <HEAD>
-
-	* config.py, main.py, misc.py, xrc2wxg.py:
-	fixed dir dialog bug and bug #1104006
-	[f9d8b03fe0d5] <HEAD>
-
-2005-01-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, main.py:
-	fixed small wxDirSelector bug
-	[2e7254cfe0f0] <HEAD>
-
-2005-01-10  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* about.py, codegen/cpp_codegen.py, codegen/py_codegen.py,
-	edit_sizers/edit_sizers.py, main.py, tree.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/notebook/notebook.py:
-	a lot of things... unfortunately I don't remeber any of them :-(
-	[56a9d961d496] <HEAD>
-
-2004-12-23  crazyinsomniac  <crazyinsomniac>
-
-	* zmain.py, zwxglade.py:
-	mdi allows for fullscreen, against slightly outdated
-	main.py/wxglade.py
-	[f0d277241132] <HEAD>
-
-2004-12-22  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/bitmap_button/perl_codegen.py:
-	add missing comma
-	[c6612e7d15ae] <HEAD>
-
-2004-12-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py:
-	fixed kde file dialog bug
-	[283f5d59bec0] <HEAD>
-
-2004-12-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/bitmap_button/codegen.py, widgets/static_bitmap/codegen.py,
-	widgets/toolbar/codegen.py:
-	minor code generation changes for 'code:' and 'var:'
-	[e8e77b0604ec] <HEAD>
-
-	* application.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	misc.py, widgets/menubar/menubar.py, widgets/panel/panel.py,
-	widgets/toolbar/toolbar.py:
-	some minor ui enhancements
-	[81af530199c1] <HEAD>
-
-2004-12-13  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py, widgets/grid/codegen.py,
-	widgets/list_ctrl/codegen.py, widgets/notebook/codegen.py,
-	widgets/spin_button/codegen.py, widgets/spin_ctrl/codegen.py,
-	widgets/splitter_window/codegen.py, widgets/tree_ctrl/codegen.py:
-	c++ event handling enhancements
-	[aa67443505b9] <HEAD>
-
-2004-12-12  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py:
-	build_untouched_content block_start re tweak (Cheetah bug)
-	[b7e3a6ecaa24] <HEAD>
-
-2004-12-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* README.txt:
-	updated email address
-	[12d29d1d2681] <HEAD>
-
-	* README.txt:
-	updated system requirements
-	[12bddc6dfeb8] <HEAD>
-
-2004-12-10  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* events_mixin.py:
-	event handling improvements
-	[ea01d8484ab5] <HEAD>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py,
-	widgets/menubar/codegen.py:
-	event handling improvements
-	[483a9e464b7f] <HEAD>
-
-	* application.py, events_mixin.py, main.py, widgets/MenuTree.py,
-	widgets/menubar/menubar.py, widgets/toolbar/tool.py,
-	widgets/toolbar/toolbar.py:
-	some event handling enhancements
-	[1af34079ea56] <HEAD>
-
-2004-12-08  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, docs/tutorial.html,
-	edit_windows.py, events_mixin.py, main.py, misc.py, tree.py,
-	widget_properties.py, widgets/MenuTree.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/button/button.py,
-	widgets/checkbox/checkbox.py, widgets/choice/choice.py,
-	widgets/combo_box/combo_box.py, widgets/frame/frame.py,
-	widgets/grid/codegen.py, widgets/grid/grid.py,
-	widgets/list_box/list_box.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/menubar/codegen.py, widgets/menubar/menubar.py,
-	widgets/notebook/notebook.py, widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py, widgets/slider/slider.py,
-	widgets/spin_button/spin_button.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/text_ctrl/text_ctrl.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/tool.py, widgets/toolbar/toolbar.py,
-	widgets/tree_ctrl/tree_ctrl.py, xml_parse.py:
-	first basic event handlers support
-	[d1ff6707f591] <HEAD>
-
-2004-11-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py:
-	fixed name validation regexp
-	[dd4ba1026e6d] <HEAD>
-
-	* widget_properties.py, widgets/menubar/menubar.py,
-	widgets/toolbar/toolbar.py:
-	possible fix for bug #1067586
-	[5ae44f888f06] <HEAD>
-
-2004-11-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	fixed: extra headers not inserted correctly when generating multiple
-	files
-	[b4954ca8b5ef] <HEAD>
-
-2004-11-08  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt:
-	updated version info
-	[03347c3f2a6a] <HEAD>
-
-	* common.py, wxglade.spec:
-	updated version number
-	[20456d457838] <HEAD>
-
-2004-11-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	made possible to Cancel insertion of slots/rows/columns
-	[14f3f23e2969] <HEAD>
-
-	* edit_windows.py:
-	fixed recently introduced "on_size" bug
-	[cae1db52bfab] <HEAD>
-
-2004-11-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, application.py, edit_sizers/edit_sizers.py,
-	edit_windows.py, widgets/panel/panel.py, wxglade.spec:
-	last changes before v0.3.5
-	[17af9f3f9d20] <HEAD>
-
-2004-11-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, credits.txt:
-	updated credits
-	[1c4d354b75bd] <HEAD>
-
-	* widgets/dialog/codegen.py, widgets/frame/codegen.py:
-	patch from Vaclav Slavik to support 'icon' property in XRC
-	[982b72e98767] <HEAD>
-
-2004-11-02  georgesk  <georgesk>
-
-	* codegen/py_codegen.py:
-	added the definition of the function _() to the code generated in
-	python when i18n is selected
-	[62e92abb96bf] <HEAD>
-
-	* Makefile, debian/changelog, debian/compat, debian/control,
-	debian/copyright, debian/dirs, debian/docs, debian/files,
-	debian/manpage.xml, debian/postinst, debian/rules, debian/wxglade.1,
-	wxglade:
-	added debianisation tools to the package. They can be activated by
-	running the command 'debuild'
-	[a79c5b93c482] <HEAD>
-
-2004-11-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* README.txt, about.py, application.py, common.py, config.py,
-	configUI.py, edit_windows.py, kdefiledialog.py, main.py, misc.py,
-	res/preferences.wxg, widget_properties.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/dialog/dialog.py,
-	widgets/menubar/menubar.py, widgets/static_bitmap/static_bitmap.py,
-	widgets/toolbar/toolbar.py, wxglade.py, wxglade.spec, xml_parse.py:
-	various tweaks and fixes for v0.3.5 release...
-	[14d31979076f] <HEAD>
-
-2004-11-01  georgesk  <georgesk>
-
-	* codegen/py_codegen.py:
-	improved slightly i18n support in generated python code
-	[c18a51041009] <HEAD>
-
-2004-10-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* wxglade.py:
-	support for windows entry point
-	[3c9b430a842d] <HEAD>
-
-	* wxglade.pyw:
-	entry point on windows
-	[e49dc385f2d4] <HEAD>
-
-2004-10-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/pl_codegen.py:
-	fixed windows line endings...
-	[9729b4d4a4ec] <HEAD>
-
-	* widgets/frame/codegen.py:
-	fixed wxMDIChildFrame C++ code bug
-	[707579ce628d] <HEAD>
-
-2004-10-26  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py:
-	replace :: with os.sep in filenames
-	[b8573561da20] <HEAD>
-
-2004-10-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* configUI.py, edit_sizers/edit_sizers.py, edit_windows.py, misc.py,
-	res/preferences.wxg, tree.py:
-	better handling of "duplicate names"
-	[e03dc4952306] <HEAD>
-
-2004-10-21  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py:
-	fixed file name problem when generating multiple files
-	[52e6fd4deb4e] <HEAD>
-
-	* edit_windows.py:
-	fixed set_size issue on wx >= 2.5
-	[840b740f9f6a] <HEAD>
-
-2004-10-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	fixed GridSizerBase.add_row bug
-	[2ff812c400e2] <HEAD>
-
-	* widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/menubar/menubar.py, widgets/panel/panel.py,
-	widgets/toolbar/toolbar.py:
-	fixed incorrect labeling in the tree when using custom class values
-	[212c2d47b4a7] <HEAD>
-
-2004-10-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/toolbar/toolbar.py:
-	fixed style problem
-	[a817867604b9] <HEAD>
-
-	* xml_parse.py:
-	patch for encoding problem
-	[6f684f972e11] <HEAD>
-
-	* widgets/frame/frame.py:
-	fixed segfault when removing a frame with a statusbar
-	[d5325098b4c5] <HEAD>
-
-	* edit_windows.py, widgets/menubar/menubar.py:
-	fixed segfault when removing a toplevel window from the popup menu
-	[db7fa19f054b] <HEAD>
-
-	* common.py, main.py:
-	small autosave enhancement
-	[193442c60e43] <HEAD>
-
-	* edit_windows.py:
-	fixed bug that made it possible to double-past a sizer into a
-	toplevel window
-	[0837473ed086] <HEAD>
-
-	* widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/menubar/menubar.py, widgets/radio_button/codegen.py,
-	widgets/radio_button/radio_button.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toolbar/toolbar.py:
-	fixed minor issues
-	[2ac44c750105] <HEAD>
-
-	* config.py, configUI.py, icons/spinbtn.xpm, main.py,
-	res/preferences.wxg:
-	some ui tweaks
-	[2c2b5c085b69] <HEAD>
-
-	* common.py, edit_sizers/edit_sizers.py, edit_widget.py,
-	edit_windows.py, widget_properties.py:
-	better edit_widget support
-	[14275c77ab9f] <HEAD>
-
-2004-10-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py, common.py, docs/tutorial.html,
-	edit_sizers/sizers_codegen.py, edit_windows.py, main.py, misc.py:
-	some minor enhancements...
-	[59fac1337962] <HEAD>
-
-	* widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/menubar/menubar.py, widgets/toolbar/toolbar.py:
-	better default class names for xrc output
-	[af859781dd07] <HEAD>
-
-	* CHANGES.txt, common.py, config.py, configUI.py, main.py,
-	res/preferences.wxg:
-	auto save support
-	[a9401ee609dc] <HEAD>
-
-2004-10-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	fixed wrong add_app code
-	[f2a6b5f07de5] <HEAD>
-
-2004-10-05  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, clipboard.py, codegen/py_codegen.py,
-	edit_sizers/edit_sizers.py, edit_windows.py, tree.py:
-	various bugs fixed (preview, change of position on a sizer, ...)
-	[d376adef66c2] <HEAD>
-
-2004-10-02  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/radio_button/radio_button.py:
-	now a radio button is displayed checked when thats its value
-	[9274d0ff621d] <HEAD>
-
-2004-09-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	fixed segfault when using grid sizers
-	[ec1e77efbec4] <HEAD>
-
-	* widgets/frame/frame.py:
-	fixed bug #1019325
-	[3fe94f7ab356] <HEAD>
-
-	* widgets/combo_box/combo_box.py:
-	added wxCB_SIMPLE style
-	[9024a011ee06] <HEAD>
-
-2004-09-28  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/spin_button/spin_button.py:
-	create_widget now has exception handling
-	[a877bad87104] <HEAD>
-
-	* widgets/button/button.py:
-	create_widget now exception handling
-	[97bfd3040a6f] <HEAD>
-
-	* widgets/button/button.py:
-	create_widget button now takes on style as specified by user
-	[31bbbd1bb55a] <HEAD>
-
-2004-09-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* tree.py, widgets/bitmap_button/bitmap_button.py,
-	widgets/static_bitmap/static_bitmap.py:
-	miscellaneous fixes
-	[f4dd937a330e] <HEAD>
-
-	* icons/closed_folder.xpm:
-	*** empty log message ***
-	[16ef67724693] <HEAD>
-
-	* main.py, widgets/dialog/dialog.py, widgets/menubar/menubar.py,
-	widgets/panel/panel.py, widgets/splitter_window/splitter_window.py,
-	xrc2wxg.py:
-	miscellaneous fixes
-	[3151aca2f366] <HEAD>
-
-2004-09-23  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/spin_button/spin_button.py:
-	add style
-	[6716fedf86e1] <HEAD>
-
-	* icons/spinbtn.xpm:
-	no message
-	[39f2c94dc885] <HEAD>
-
-	* widgets/spin_button/.cvsignore, widgets/spin_button/__init__.py,
-	widgets/spin_button/codegen.py, widgets/spin_button/perl_codegen.py,
-	widgets/spin_button/spin_button.py:
-	no message
-	[0671df6f4ab5] <HEAD>
-
-	* widgets/widgets.txt:
-	no message
-	[7bb99ab679bb] <HEAD>
-
-	* codegen/pl_codegen.py:
-	no message
-	[5b15986e9a32] <HEAD>
-
-	* codegen/pl_codegen.py:
-	put return $self after # end wxGlade
-	[a08f0e69c193] <HEAD>
-
-2004-09-22  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py:
-	missed a #
-	[5afd34367a56] <HEAD>
-
-	* codegen/pl_codegen.py:
-	perl_codegen's now loaded from widgets.txt, just like the rest
-	[5f55c774b2c5] <HEAD>
-
-2004-09-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py, widgets/menubar/menubar.py, widgets/panel/panel.py:
-	mac tweaks
-	[69f54317ff5d] <HEAD>
-
-2004-09-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, __init__.py, about.py, application.py, clipboard.py,
-	codegen/cpp_codegen.py, codegen/pl_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py, common.py,
-	credits.txt, edit_sizers/__init__.py, edit_sizers/edit_sizers.py,
-	edit_sizers/perl_sizers_codegen.py, edit_sizers/sizers_codegen.py,
-	edit_widget.py, edit_windows.py, main.py, misc.py, tree.py,
-	widget_properties.py, widgets/ChoicesCodeHandler.py,
-	widgets/ChoicesProperty.py, widgets/MenuTree.py,
-	widgets/bitmap_button/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/perl_codegen.py, widgets/button/__init__.py,
-	widgets/button/button.py, widgets/button/codegen.py,
-	widgets/button/perl_codegen.py, widgets/checkbox/__init__.py,
-	widgets/checkbox/checkbox.py, widgets/checkbox/codegen.py,
-	widgets/checkbox/perl_codegen.py, widgets/choice/__init__.py,
-	widgets/choice/choice.py, widgets/choice/codegen.py,
-	widgets/choice/perl_codegen.py, widgets/combo_box/__init__.py,
-	widgets/combo_box/codegen.py, widgets/combo_box/combo_box.py,
-	widgets/combo_box/perl_codegen.py,
-	widgets/custom_widget/__init__.py, widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/custom_widget/perl_codegen.py, widgets/dialog/__init__.py,
-	widgets/dialog/codegen.py, widgets/dialog/dialog.py,
-	widgets/dialog/perl_codegen.py, widgets/frame/__init__.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/frame/perl_codegen.py, widgets/gauge/__init__.py,
-	widgets/gauge/codegen.py, widgets/gauge/gauge.py,
-	widgets/gauge/perl_codegen.py, widgets/grid/__init__.py,
-	widgets/grid/codegen.py, widgets/grid/grid.py,
-	widgets/grid/perl_codegen.py, widgets/list_box/__init__.py,
-	widgets/list_box/codegen.py, widgets/list_box/list_box.py,
-	widgets/list_box/perl_codegen.py, widgets/list_ctrl/__init__.py,
-	widgets/list_ctrl/codegen.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/list_ctrl/perl_codegen.py, widgets/menubar/__init__.py,
-	widgets/menubar/codegen.py, widgets/menubar/menubar.py,
-	widgets/menubar/perl_codegen.py, widgets/notebook/__init__.py,
-	widgets/notebook/codegen.py, widgets/notebook/notebook.py,
-	widgets/notebook/perl_codegen.py, widgets/panel/__init__.py,
-	widgets/panel/codegen.py, widgets/panel/panel.py,
-	widgets/panel/perl_codegen.py, widgets/radio_box/__init__.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/perl_codegen.py,
-	widgets/radio_box/radio_box.py, widgets/radio_button/__init__.py,
-	widgets/radio_button/codegen.py,
-	widgets/radio_button/perl_codegen.py,
-	widgets/radio_button/radio_button.py, widgets/slider/__init__.py,
-	widgets/slider/codegen.py, widgets/slider/perl_codegen.py,
-	widgets/slider/slider.py, widgets/spacer/__init__.py,
-	widgets/spacer/codegen.py, widgets/spacer/perl_codegen.py,
-	widgets/spacer/spacer.py, widgets/spin_ctrl/__init__.py,
-	widgets/spin_ctrl/codegen.py, widgets/spin_ctrl/perl_codegen.py,
-	widgets/spin_ctrl/spin_ctrl.py, widgets/splitter_window/__init__.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/__init__.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/__init__.py, widgets/static_line/codegen.py,
-	widgets/static_line/perl_codegen.py,
-	widgets/static_line/static_line.py, widgets/static_text/__init__.py,
-	widgets/static_text/codegen.py, widgets/static_text/perl_codegen.py,
-	widgets/static_text/static_text.py, widgets/text_ctrl/__init__.py,
-	widgets/text_ctrl/codegen.py, widgets/text_ctrl/perl_codegen.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toggle_button/__init__.py,
-	widgets/toggle_button/codegen.py,
-	widgets/toggle_button/perl_codegen.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/__init__.py,
-	widgets/toolbar/codegen.py, widgets/toolbar/perl_codegen.py,
-	widgets/toolbar/tool.py, widgets/toolbar/toolbar.py,
-	widgets/tree_ctrl/__init__.py, widgets/tree_ctrl/codegen.py,
-	widgets/tree_ctrl/perl_codegen.py, widgets/tree_ctrl/tree_ctrl.py,
-	wxglade.py, xml_parse.py, xrc2wxg.py:
-	updated copyright information
-	[7da9a49e539c] <HEAD>
-
-	* common.py:
-	updated version number
-	[0becbca5675e] <HEAD>
-
-	* CHANGES.txt, edit_sizers/edit_sizers.py, edit_windows.py:
-	fixed bug when removing widgets from the popup menu (GTK2)
-	[5f12a2b7a57e] <HEAD>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py,
-	edit_sizers/sizers_codegen.py:
-	fix for staticbox bug
-	[4fc62b12aea6] <HEAD>
-
-	* wxglade.spec:
-	updated version number
-	[ded07f71202d] <HEAD>
-
-	* icons/wxg_file.ico:
-	icon for .wxg files
-	[0fe496090dd2] <HEAD>
-
-2004-09-17  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py, edit_sizers/perl_sizers_codegen.py:
-	fix staticbox order bug
-	[200dc46f2a54] <HEAD>
-
-2004-09-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/frame/codegen.py:
-	removed "fake" wxPanel from xrc code generation, as it is not
-	necessary anymore
-	[8f77c204289f] <HEAD>
-
-2004-09-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, common.py:
-	changed version number
-	[ae359ae40e78] <HEAD>
-
-2004-09-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* configUI.py, res/preferences.wxg:
-	*** empty log message ***
-	[651303f23d55] <HEAD>
-
-2004-09-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* tree.py, widget_properties.py, wxglade.py, wxglade.spec:
-	small fixes
-	[990386c26941] <HEAD>
-
-	* widgets/grid/codegen.py:
-	fixed bug with 2.5.2.8
-	[38a3cf7e2684] <HEAD>
-
-2004-08-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py, tree.py,
-	widgets/panel/codegen.py, xml_parse.py:
-	*** empty log message ***
-	[2afcc1cf44a9] <HEAD>
-
-2004-08-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py:
-	fixed bug in make_object_button
-	[0986cfe5e4ed] <HEAD>
-
-2004-08-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py:
-	fixed typo in wxFIXED_MINSIZE
-	[e80613119015] <HEAD>
-
-2004-08-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py:
-	"fix" for wxPython 2.5.2.x
-	[07d25e6ebb4d] <HEAD>
-
-2004-08-17  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/frame/perl_codegen.py, widgets/grid/perl_codegen.py,
-	widgets/panel/perl_codegen.py:
-	again with the CR+LF to LF tomfoolery
-	[5f91cb32a9fa] <HEAD>
-
-2004-08-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widget_properties.py, wxglade.py:
-	fixed small bugs
-	[18983b92d12b] <HEAD>
-
-2004-08-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py, main.py:
-	fixed bug in "_build_from_font"
-	[060cb8c2c0fe] <HEAD>
-
-2004-08-12  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, common.py, config.py, configUI.py,
-	edit_sizers/edit_sizers.py, edit_windows.py, res/preferences.wxg:
-	some small improvements...
-	[7279374bda0e] <HEAD>
-
-2004-08-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py, license.txt, widgets/list_box/codegen.py:
-	*** empty log message ***
-	[4db223aee897] <HEAD>
-
-2004-07-21  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/static_bitmap/codegen.py:
-	fixed style bug in python code
-	[a596e9067632] <HEAD>
-
-2004-07-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, common.py, widgets/menubar/codegen.py:
-	changed python code generator for menubar
-	[f3c8ed7d5e58] <HEAD>
-
-2004-07-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/tree_ctrl/tree_ctrl.py:
-	applied patch #985511
-	[f00818bbec5b] <HEAD>
-
-2004-06-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	applied patch #974995
-	[bc4991f906b2] <HEAD>
-
-2004-06-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widget_properties.py:
-	fixed ColorDialogProperty affecting grid in 0.3.3
-	[2ed4eb49dbf4] <HEAD>
-
-2004-06-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py:
-	fixed bug #966094
-	[2454e0a03560] <HEAD>
-
-2004-05-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* color_dialog.py:
-	fixed bug on 2.5 on windows
-	[15df45f2b9bf] <HEAD>
-
-2004-05-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_widget.py:
-	added from_xml option to add_widget_node
-	[7ca3093a6209] <HEAD>
-
-	* color_dialog.py, edit_widget.py, edit_windows.py,
-	widget_properties.py:
-	more bugfixes...
-	[6da32eb6287f] <HEAD>
-
-2004-05-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* config.py:
-	fixed for wrong bool conversion
-	[b0ccdf12e067] <HEAD>
-
-2004-05-12  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* font_dialog.py:
-	fixed 2.5 bug in choose_specific_font
-	[18a0752f1d88] <HEAD>
-
-	* edit_widget.py:
-	fixed small bug in increment_label
-	[0eb94acc9125] <HEAD>
-
-2004-05-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* xml_parse.py:
-	fixed composed.class.Name bug :-)
-	[a4bfd7c3d6ee] <HEAD>
-
-	* main.py:
-	fixed wx 2.5 incompatibility (wxSizer.Show(wxSizer, bool) not
-	working as expected...)
-	[097cdf4c2a90] <HEAD>
-
-	* font_dialog.py, widgets/custom_widget/custom_widget.py:
-	small fixes
-	[80507d81897c] <HEAD>
-
-2004-05-05  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, codegen/xrc_codegen.py, common.py, edit_windows.py,
-	widget_properties.py, widgets/button/button.py,
-	widgets/button/codegen.py, widgets/button/perl_codegen.py,
-	widgets/choice/choice.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/combo_box.py, widgets/frame/codegen.py,
-	widgets/list_box/list_box.py, widgets/list_ctrl/list_ctrl.py,
-	widgets/spin_ctrl/codegen.py:
-	fixes and tweaks in preparation for release 0.3.3
-	[a34801085654] <HEAD>
-
-2004-05-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/list_ctrl/list_ctrl.py:
-	removed obsolete wxLC_USER_TEXT style
-	[fb9a30022309] <HEAD>
-
-2004-04-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, edit_sizers/edit_sizers.py,
-	widgets/choice/choice.py:
-	fixes for wx2.5
-	[4582efc8c392] <HEAD>
-
-2004-04-21  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* __init__.py:
-	to turn wxGlade into a package
-	[ed7db4aca88a] <HEAD>
-
-	* edit_sizers/edit_sizers.py:
-	fixed segfault on wx2.5
-	[8ed0070394c3] <HEAD>
-
-2004-04-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/combo_box/combo_box.py:
-	fixed wx 2.5 incompatibility
-	[af8713eaa923] <HEAD>
-
-2004-03-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/splitter_window/codegen.py,
-	widgets/splitter_window/perl_codegen.py:
-	fixed splitter window layout bug
-	[c0f0a61d312e] <HEAD>
-
-2004-03-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/menubar/menubar.py:
-	fixed small bug
-	[0fe2178b422d] <HEAD>
-
-2004-03-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py, widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/frame/perl_codegen.py, widgets/text_ctrl/text_ctrl.py:
-	some bugfixes
-	[af41c4dfae96] <HEAD>
-
-2004-03-10  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* wxglade.spec:
-	first commit
-	[44e65bf534e1] <HEAD>
-
-2004-03-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, widgets/panel/panel.py:
-	fixed bug #880674
-	[a0123047e355] <HEAD>
-
-2004-03-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt:
-	update to version 0.3.2
-	[7591d042f862] <HEAD>
-
-2004-03-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py:
-	updated version number
-	[077f0532af62] <HEAD>
-
-	* credits.txt, docs/html/apa.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html,
-	docs/html/ch02s05.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html, docs/html/ch04.html,
-	docs/html/ch04s02.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/src/manual.xml:
-	user's manual update
-	[8a7b9086af66] <HEAD>
-
-2004-02-22  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* icons/wxglade_small.png:
-	changed to wxWidgets
-	[0272510f7220] <HEAD>
-
-2004-02-21  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* credits.txt:
-	changed wxWindows to wxWidgets
-	[7686cb9e98e1] <HEAD>
-
-	* common.py:
-	updated version number
-	[a00930cfb9bd] <HEAD>
-
-	* main.py:
-	removed drop targets for the tree and property windows as they make
-	wxGlade crash on win32
-	[2b15bb2bcc97] <HEAD>
-
-2004-02-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/MenuTree.py, widgets/menubar/codegen.py:
-	fixed submenu bug
-	[f16b04cd8cdd] <HEAD>
-
-2004-02-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, clipboard.py, main.py:
-	added drag&drop of wxg files for opening them
-	[cd5f378c846e] <HEAD>
-
-2004-02-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, docs/index.html:
-	new manual added
-	[7f5c545352ad] <HEAD>
-
-	* application.py, main.py:
-	fixed `relative paths' issue
-	[17259cbc9854] <HEAD>
-
-2004-02-09  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widget_properties.py:
-	made possible for GridProperty to be empty
-	[3fba24153bb2] <HEAD>
-
-2004-02-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt:
-	*** empty log message ***
-	[1efa6c398f02] <HEAD>
-
-2004-02-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* config.py:
-	applied patch #890587
-	[0a60987b18c2] <HEAD>
-
-2004-02-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/perl_codegen.py,
-	widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/perl_codegen.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/perl_codegen.py:
-	converted to unix EOL
-	[2c24d4b3fed8] <HEAD>
-
-2004-01-31  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/dialog/dialog.py, widgets/frame/frame.py:
-	changes to support var: and code: icons
-	[3787b2e1413c] <HEAD>
-
-2004-01-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* tree.py:
-	fixed wx 2.5 incompatibility
-	[91859644fd40] <HEAD>
-
-	* misc.py:
-	added global Ctrl+g shortcut
-	[58c334519245] <HEAD>
-
-2004-01-29  dinogen  <dinogen>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch05.html, docs/html/ch05s02.html, docs/html/ch05s03.html,
-	docs/html/ch05s04.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html, docs/src/manual.xml:
-	syntax error on manual
-	[0e4c816f2401] <HEAD>
-
-	* docs/manual.tex:
-	*** empty log message ***
-	[687a3aea9ef3] <HEAD>
-
-	* icons/icon16.xpm, widgets/frame/codegen.py:
-	wxglade 16x16 icon var and code in wxFrame
-	[b8f256d07a46] <HEAD>
-
-	* widgets/bitmap_button/codegen.py, widgets/static_bitmap/codegen.py,
-	widgets/toolbar/codegen.py:
-	wxglade icon in the bitmaps preview
-	[021a4218bacc] <HEAD>
-
-2004-01-28  dinogen  <dinogen>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch05.html, docs/html/ch05s02.html, docs/html/ch05s03.html,
-	docs/html/ch05s04.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html, docs/src/manual.xml:
-	reduction of subsetction
-	[e5db87747494] <HEAD>
-
-2004-01-27  dinogen  <dinogen>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch04s04.html,
-	docs/html/ch04s05.html, docs/html/ch04s06.html,
-	docs/html/ch04s07.html, docs/html/ch04s08.html,
-	docs/html/ch04s09.html, docs/html/ch04s10.html,
-	docs/html/ch04s11.html, docs/html/ch04s12.html,
-	docs/html/ch04s13.html, docs/html/ch04s14.html,
-	docs/html/ch04s15.html, docs/html/ch04s16.html,
-	docs/html/ch04s17.html, docs/html/ch04s18.html,
-	docs/html/ch04s19.html, docs/html/ch04s20.html,
-	docs/html/ch04s21.html, docs/html/ch04s22.html,
-	docs/html/ch04s23.html, docs/html/ch04s24.html,
-	docs/html/ch04s25.html, docs/html/ch04s26.html,
-	docs/html/ch04s27.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/ch05s04.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/src/manual.xml:
-	manual finish
-	[cc9b496b253a] <HEAD>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch04.html, docs/html/ch04s02.html,
-	docs/html/ch04s03.html, docs/html/ch04s04.html,
-	docs/html/ch04s05.html, docs/html/ch04s06.html,
-	docs/html/ch04s07.html, docs/html/ch04s08.html,
-	docs/html/ch04s09.html, docs/html/ch04s10.html,
-	docs/html/ch04s11.html, docs/html/ch04s12.html,
-	docs/html/ch04s13.html, docs/html/ch04s14.html,
-	docs/html/ch04s15.html, docs/html/ch04s16.html,
-	docs/html/ch04s17.html, docs/html/ch04s18.html,
-	docs/html/ch04s19.html, docs/html/ch04s20.html,
-	docs/html/ch04s21.html, docs/html/ch04s22.html,
-	docs/html/ch04s23.html, docs/html/ch04s24.html,
-	docs/html/ch04s25.html, docs/html/ch04s26.html,
-	docs/html/ch04s27.html, docs/html/ch05.html, docs/html/ch05s02.html,
-	docs/html/ch05s03.html, docs/html/index.html, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html, docs/src/manual.xml:
-	doc widgets section completed
-	[b3365b2fc347] <HEAD>
-
-2004-01-26  dinogen  <dinogen>
-
-	* docs/pdf/readme.txt:
-	added pdf dir but NOT the pdf file, it is too large.
-	[14e22877cd05] <HEAD>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch02s05.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/ch03s06.html, docs/html/ch03s07.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/src/manual.xml:
-	Widgets section in documentation
-	[08f1dcd1e3ce] <HEAD>
-
-2004-01-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* wxPyColourChooser/__init__.py, wxPyColourChooser/canvas.py,
-	wxPyColourChooser/intl.py, wxPyColourChooser/license/lgpl.txt,
-	wxPyColourChooser/license/wxwindowslib.txt,
-	wxPyColourChooser/pycolourbox.py,
-	wxPyColourChooser/pycolourchooser.py,
-	wxPyColourChooser/pycolourslider.py, wxPyColourChooser/pypalette.py:
-	Removed unneeded files
-	[bf3bb9da0506] <HEAD>
-
-	* CHANGES.txt, about.py, codegen/py_codegen.py, color_dialog.py,
-	config.py, edit_sizers/edit_sizers.py, font_dialog.py, main.py,
-	misc.py, tree.py, widgets/frame/frame.py,
-	widgets/splitter_window/splitter_window.py:
-	fixes and changes for 2.5 compatibility
-	[66917d1c9d2b] <HEAD>
-
-	* widgets/toolbar/codegen.py:
-	wrapped a long line
-	[e77d83646774] <HEAD>
-
-2004-01-20  dinogen  <dinogen>
-
-	* widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/perl_codegen.py,
-	widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/perl_codegen.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/perl_codegen.py:
-	added code\: tag to static_bitmap, bitmap_button and toolbar
-	[b442205ffac0] <HEAD>
-
-2004-01-20  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py, edit_sizers/perl_sizers_codegen.py,
-	widgets/button/perl_codegen.py, widgets/frame/perl_codegen.py,
-	widgets/panel/perl_codegen.py:
-	more \t tweaking *yawn*
-	[7677e40ee135] <HEAD>
-
-	* widgets/splitter_window/perl_codegen.py:
-	add new new_signature, fix bug #865338
-	[6eb71c554fc8] <HEAD>
-
-2004-01-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	fixed bug #878469
-	[95efe405c4b2] <HEAD>
-
-2004-01-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* about.py, application.py, codegen/py_codegen.py, misc.py, tree.py,
-	widgets/bitmap_button/codegen.py, widgets/static_bitmap/codegen.py,
-	widgets/toolbar/codegen.py, xml_parse.py:
-	new "use wx namespace" option for python output
-	[7b274863ac08] <HEAD>
-
-2004-01-08  dinogen  <dinogen>
-
-	* docs/src/manual.xml:
-	english corrected version
-	[0bc11548c7d8] <HEAD>
-
-2004-01-08  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	fixed `//*' bug
-	[0c752c51f059] <HEAD>
-
-2004-01-05  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py, widgets/frame/frame.py:
-	fixed small typo
-	[48cabc37bbd3] <HEAD>
-
-2003-12-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, xrc2wxg.py:
-	updated to xrc2wxg version 0.0.3
-	[31ab0e910ac9] <HEAD>
-
-2003-12-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/static_bitmap/codegen.py:
-	fixed new wx namespace bug
-	[1a2e9f2b43f4] <HEAD>
-
-	* widgets/bitmap_button/codegen.py:
-	fixed new wx namespace bug
-	[7c511b8c85a5] <HEAD>
-
-2003-12-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/menubar/codegen.py:
-	fixed new namespace bug
-	[3d09671d0bdf] <HEAD>
-
-2003-12-09  dinogen  <dinogen>
-
-	* widgets/static_bitmap/codegen.py:
-	static bitmap generation bug correct
-	[a4394e28fd11] <HEAD>
-
-2003-12-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, tree.py:
-	partially fixed bug #798041 (renaming)
-	[4aa4d408fab3] <HEAD>
-
-2003-12-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, widgets/panel/panel.py:
-	it is now possible to paste a sizer into a panel
-	[491470d72cd8] <HEAD>
-
-2003-12-03  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	fixed bug in generate_code_id
-	[132000b1627a] <HEAD>
-
-2003-11-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	fixed new wx namespace bug
-	[5bab01a607cc] <HEAD>
-
-2003-11-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/text_ctrl/text_ctrl.py:
-	added some styles
-	[11521660debb] <HEAD>
-
-	* codegen/py_codegen.py:
-	fixed new namespace bug (wxFont)
-	[6a6b8db559f0] <HEAD>
-
-	* application.py:
-	fixed preview bug (use_new_namespace)
-	[ead1a85ea5e1] <HEAD>
-
-2003-11-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* config.py:
-	wrapped a long line :)
-	[df37e3c5ee08] <HEAD>
-
-	* CHANGES.txt:
-	new wx namespace for python code generator
-	[8c8a18f6e0a1] <HEAD>
-
-	* common.py:
-	changed version number
-	[c6968b79c686] <HEAD>
-
-2003-11-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, codegen/py_codegen.py,
-	edit_sizers/sizers_codegen.py, widgets/bitmap_button/codegen.py,
-	widgets/button/codegen.py, widgets/checkbox/codegen.py,
-	widgets/choice/codegen.py, widgets/combo_box/codegen.py,
-	widgets/custom_widget/codegen.py, widgets/dialog/codegen.py,
-	widgets/frame/codegen.py, widgets/gauge/codegen.py,
-	widgets/grid/codegen.py, widgets/list_box/codegen.py,
-	widgets/list_ctrl/codegen.py, widgets/menubar/codegen.py,
-	widgets/notebook/codegen.py, widgets/panel/codegen.py,
-	widgets/radio_box/codegen.py, widgets/radio_button/codegen.py,
-	widgets/slider/codegen.py, widgets/spin_ctrl/codegen.py,
-	widgets/splitter_window/codegen.py,
-	widgets/static_bitmap/codegen.py, widgets/static_line/codegen.py,
-	widgets/static_text/codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/toggle_button/codegen.py, widgets/toolbar/codegen.py,
-	widgets/tree_ctrl/codegen.py:
-	support for new wxPython namespace
-	[c87db99bbdcd] <HEAD>
-
-	* configUI.py:
-	small UI fixes
-	[0427ae7c415f] <HEAD>
-
-2003-11-20  dinogen  <dinogen>
-
-	* config.py, configUI.py, res/preferences.wxg:
-	split config.py in configUI (base class) and config (derived class)
-	[d6d155e980b1] <HEAD>
-
-2003-11-18  dinogen  <dinogen>
-
-	* res/preferences.wxg:
-	wxg preference added
-	[f633369011c1] <HEAD>
-
-2003-11-13  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py:
-	fixed preview bug
-	[37307be4efe7] <HEAD>
-
-2003-10-30  dinogen  <dinogen>
-
-	* config.py, widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/custom_widget/perl_codegen.py:
-	custom widget w and h - variable default border
-	[326c0b730535] <HEAD>
-
-2003-10-29  lawson89  <lawson89>
-
-	* tree.py:
-	Fixes to address: (1) toplevel windows not brought to front on a
-	double click of node (2) doubleclick on expanded toplevel node
-	collapsed entire widget tree instead of just the node
-	[db953116f0d5] <HEAD>
-
-2003-10-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py, xml_parse.py:
-	added wxSHAPED and wxADJUST_MINSIZE flags
-	[06b49b52bd0b] <HEAD>
-
-2003-10-09  dinogen  <dinogen>
-
-	* docs/src/manual.xml:
-	*** empty log message ***
-	[c5aae736200d] <HEAD>
-
-2003-10-07  dinogen  <dinogen>
-
-	* docs/html/apa.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/ch03s05.html, docs/html/ch03s06.html,
-	docs/html/ch03s07.html, docs/html/index.html, docs/src/manual.xml:
-	*** empty log message ***
-	[373585b7c8a1] <HEAD>
-
-2003-10-02  dinogen  <dinogen>
-
-	* docs/Makefile, docs/html/apa.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch02s04.html, docs/html/ch03.html,
-	docs/html/ch03s02.html, docs/html/ch03s03.html,
-	docs/html/ch03s04.html, docs/html/ch03s05.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/src/manual.xml:
-	*** empty log message ***
-	[2046e0f1fdc9] <HEAD>
-
-2003-10-01  dinogen  <dinogen>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html,
-	docs/html/ch02s04.html, docs/html/ch03.html, docs/html/ch03s02.html,
-	docs/html/ch03s03.html, docs/html/ch03s04.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/html/properties_window_tab_1.png,
-	docs/html/properties_window_tab_2.png,
-	docs/html/properties_window_tab_3.png, docs/src/manual.xml,
-	docs/src/properties_window_tab_1.png,
-	docs/src/properties_window_tab_2.png,
-	docs/src/properties_window_tab_3.png:
-	*** empty log message ***
-	[6f25507c6b71] <HEAD>
-
-2003-09-24  dinogen  <dinogen>
-
-	* docs/src/manual.xml, edit_sizers/sizers_codegen.py:
-	fixed growing cols bug
-	[c0449a28c7e0] <HEAD>
-
-2003-09-11  dinogen  <dinogen>
-
-	* config.py, widgets/bitmap_button/bitmap_button.py,
-	widgets/button/button.py, widgets/checkbox/checkbox.py,
-	widgets/choice/choice.py, widgets/combo_box/combo_box.py,
-	widgets/radio_button/radio_button.py,
-	widgets/spin_ctrl/spin_ctrl.py, widgets/static_text/static_text.py,
-	widgets/text_ctrl/text_ctrl.py,
-	widgets/toggle_button/toggle_button.py:
-	added border default on config window for some widget
-	[39d21fa441ca] <HEAD>
-
-2003-09-09  dinogen  <dinogen>
-
-	* docs/html/ch02s04.html, docs/html/ch03s02.html,
-	docs/html/design_window.png, docs/html/design_window_empty_slot.png,
-	docs/html/label_menu.png, docs/html/sizer_menu.png:
-	*** empty log message ***
-	[f8139a0bec08] <HEAD>
-
-	* docs/src/design_window_empty_slot.png, docs/src/label_menu.png,
-	docs/src/select_frame.png, docs/src/sizer_menu.png,
-	docs/src/test.wxg:
-	added some section\
-	[b5e3edef32ca] <HEAD>
-
-	* docs/html/apa.html, docs/html/ch01.html, docs/html/ch01s02.html,
-	docs/html/ch01s03.html, docs/html/ch01s04.html,
-	docs/html/ch01s05.html, docs/html/ch01s06.html, docs/html/ch02.html,
-	docs/html/ch02s02.html, docs/html/ch02s03.html, docs/html/ch03.html,
-	docs/html/index.html, docs/html/pr01.html, docs/html/pr01s02.html,
-	docs/html/pr01s03.html, docs/src/design_window.png,
-	docs/src/manual.xml:
-	added some section
-	[d2cedbe6c619] <HEAD>
-
-2003-08-31  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/frame/codegen.py:
-	fixed icon path quoting bug
-	[6dfd4bbd469e] <HEAD>
-
-2003-08-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* misc.py:
-	fixed bug with menu icons on wxGTK 2.4.1.2
-	[13b4753e29b7] <HEAD>
-
-	* CHANGES.txt, common.py:
-	updated to 0.3.1
-	[80eabe0fd98b] <HEAD>
-
-	* codegen/pl_codegen.py:
-	removed some ^M (DOS eol)
-	[85886e9c585c] <HEAD>
-
-2003-08-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, common.py:
-	v0.3 released
-	[a8c88c0bfac5] <HEAD>
-
-2003-08-29  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py:
-	cleanup, locale multifile fixes, wxPySimpleApp fakery
-	[16741c2d2deb] <HEAD>
-
-2003-08-28  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py:
-	fixed "replace %s dependencies" not being replaced
-	[d44325282d04] <HEAD>
-
-	* codegen/pl_codegen.py:
-	quote_path patch (escape $ and @ cause its ")
-	[7b0bb62bc288] <HEAD>
-
-2003-08-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py:
-	minor cosmetic change (initial size of the property window)
-	[a3fb5262d998] <HEAD>
-
-2003-08-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/spacer/spacer.py:
-	minor UI tweak
-	[8201e98f1baa] <HEAD>
-
-2003-08-23  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py:
-	quote_str patch (escape $ and @ cause its ")
-	[553b4ad7135e] <HEAD>
-
-2003-08-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py:
-	changed version id
-	[f6819e323b5b] <HEAD>
-
-	* main.py:
-	silenced unimportant warning on py 2.3
-	[c6891100d90b] <HEAD>
-
-	* edit_sizers/edit_sizers.py:
-	small change
-	[2a8b13dff299] <HEAD>
-
-	* widgets/menubar/codegen.py, widgets/toolbar/codegen.py:
-	fixed preview bug
-	[33a13aabb12a] <HEAD>
-
-2003-08-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/radio_button/radio_button.py:
-	fixed bug #786266
-	[fc57944821a4] <HEAD>
-
-	* main.py:
-	fixed bug #786233
-	[bbecb73d8e44] <HEAD>
-
-2003-08-07  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py, widgets/menubar/codegen.py,
-	widgets/menubar/perl_codegen.py:
-	logic bug (if id has no val, set it to wxNewId())
-	[8e632c2585bb] <HEAD>
-
-2003-08-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py,
-	widgets/bitmap_button/perl_codegen.py, widgets/menubar/menubar.py,
-	xrc2wxg.py:
-	fixed bug #782767
-	[11a37a647329] <HEAD>
-
-2003-08-07  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/frame/frame.py, widgets/panel/panel.py:
-	added wxNO_BORDER as a style option
-	[84dcdf686d84] <HEAD>
-
-	* codegen/pl_codegen.py:
-	nonce tags now perl comments (#<...>), in case they're left over
-	[93e75b6152d7] <HEAD>
-
-2003-08-07  dinogen  <dinogen>
-
-	* docs/Makefile, docs/html/apa.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch03.html,
-	docs/html/design_window.png, docs/html/index.html,
-	docs/html/main_window.png, docs/html/pr01.html,
-	docs/html/pr01s02.html, docs/html/pr01s03.html,
-	docs/html/preview_window.png, docs/html/properties_window.png,
-	docs/html/select_frame.png, docs/html/tree_window.png,
-	docs/src/manual.xml:
-	Docs on tree windows
-	[dfd166e5aa73] <HEAD>
-
-2003-08-05  dinogen  <dinogen>
-
-	* docs/manual.xml, docs/manual_des.png, docs/manual_main.png,
-	docs/manual_preview.png, docs/manual_prop.png, docs/manual_tree.png:
-	qqq:wq
-	[a6e9003b814c] <HEAD>
-
-	* docs/Makefile, docs/html/apa.html, docs/html/ch01.html,
-	docs/html/ch01s02.html, docs/html/ch01s03.html,
-	docs/html/ch01s04.html, docs/html/ch01s05.html,
-	docs/html/ch01s06.html, docs/html/ch02.html, docs/html/ch02s02.html,
-	docs/html/ch02s03.html, docs/html/ch03.html, docs/html/index.html,
-	docs/html/pr01.html, docs/html/pr01s02.html, docs/html/pr01s03.html,
-	docs/src/design_window.png, docs/src/main_window.png,
-	docs/src/manual.xml, docs/src/preview_window.png,
-	docs/src/properties_window.png, docs/src/tree_window.png:
-	Nuova struttura docs
-	[c3f1c4eba7e3] <HEAD>
-
-	* docs/manual.xml:
-	Added xml file
-	[6f08a6633998] <HEAD>
-
-2003-08-03  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	better id code generation
-	[fdfcec35f3d7] <HEAD>
-
-2003-08-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/grid/grid.py, widgets/list_box/list_box.py,
-	widgets/list_ctrl/list_ctrl.py, widgets/menubar/perl_codegen.py,
-	widgets/spacer/spacer.py, widgets/static_bitmap/static_bitmap.py,
-	widgets/toolbar/toolbar.py, widgets/tree_ctrl/tree_ctrl.py:
-	fixed some python 2.3 warnings
-	[59cddf97cb0c] <HEAD>
-
-2003-07-31  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/toolbar/perl_codegen.py:
-	typo fix
-	[c79ea83d5071] <HEAD>
-
-2003-07-31  dinogen  <dinogen>
-
-	* docs/manual.tex:
-	Aggiunta sezione di exploring
-	[29f66cb4a7fd] <HEAD>
-
-2003-07-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* TODO.txt, application.py, main.py, misc.py, widgets/grid/grid.py,
-	xml_parse.py:
-	fixed some bugs
-	[6bdf8690a358] <HEAD>
-
-2003-07-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, codegen/pl_codegen.py,
-	widgets/bitmap_button/perl_codegen.py,
-	widgets/menubar/perl_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/toolbar/perl_codegen.py:
-	brought perl generator up to date
-	[3631803a55ff] <HEAD>
-
-	* codegen/py_codegen.py:
-	fixed comment
-	[f7d474e0bcc8] <HEAD>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py,
-	widgets/bitmap_button/codegen.py, widgets/static_bitmap/codegen.py,
-	widgets/toolbar/codegen.py:
-	fixed bug when escaping \ for pathnames
-	[614e2b1c344c] <HEAD>
-
-2003-07-23  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, config.py:
-	some bugs fixed
-	[4f7841fa6dcc] <HEAD>
-
-	* application.py, xml_parse.py:
-	fixes for preview when self.klass == self.base
-	[afe42205b63b] <HEAD>
-
-2003-07-22  dinogen  <dinogen>
-
-	* docs/manual.tex:
-	aggiustati termini nel quick start
-	[ad6ffd43b012] <HEAD>
-
-2003-07-22  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	generated ids are now globals
-	[621b22550e8a] <HEAD>
-
-2003-07-21  dinogen  <dinogen>
-
-	* docs/manual.tex:
-	Quick start completed
-	[404349ce655f] <HEAD>
-
-2003-07-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/frame/frame.py, widgets/toolbar/codegen.py:
-	fixed bugs
-	[c018a5e11850] <HEAD>
-
-2003-07-18  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/custom_widget/perl_codegen.py:
-	use CustomWidgetClass (temporary fix)
-	[9a4b1690f6e1] <HEAD>
-
-	* widgets/grid/perl_codegen.py:
-	another wxGrid constants fix
-	[7a0f6816f272] <HEAD>
-
-	* widgets/grid/perl_codegen.py:
-	wxGridSelectCells typo fix (thanks Jouke)
-	[eedebca95ff9] <HEAD>
-
-2003-07-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, codegen/cpp_codegen.py, codegen/py_codegen.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/static_bitmap.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/toolbar.py:
-	added support for var:variable_name in bitmap properties
-	[1ab1929eee4f] <HEAD>
-
-	* application.py:
-	fixed wxMDIChildFrame preview bug
-	[6264267ca01c] <HEAD>
-
-	* edit_windows.py:
-	fixed dialog units size bug
-	[8a4a86fb3162] <HEAD>
-
-2003-07-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/button/button.py, widgets/toggle_button/toggle_button.py:
-	fixed small label bug
-	[801563300741] <HEAD>
-
-2003-07-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, codegen/xrc_codegen.py, docs/tutorial.html,
-	edit_windows.py, widget_properties.py, xml_parse.py:
-	added subclass support to XRC output
-	[420d8ac4b812] <HEAD>
-
-2003-07-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, application.py, codegen/cpp_codegen.py,
-	codegen/py_codegen.py, docs/tutorial.html, tree.py, xml_parse.py:
-	new "overwrite" property of Application
-	[28790b833f54] <HEAD>
-
-2003-07-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py:
-	changed default encoding from 'latin-1' to the equivalent
-	'ISO-8859-1'
-	[3b03a60eca9e] <HEAD>
-
-2003-07-13  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py:
-	generate_code_id fix (and probably other minor bits)
-	[6e691c764983] <HEAD>
-
-2003-07-12  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* docs/tutorial.html:
-	added special form "name=?" for id properties
-	[dad1157b7c41] <HEAD>
-
-2003-07-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/pl_codegen.py:
-	added useless comment, only to avoid emacs font-lock going insane
-	[d6c34849ccb4] <HEAD>
-
-	* CHANGES.txt, codegen/cpp_codegen.py, codegen/py_codegen.py,
-	common.py, widgets/menubar/codegen.py, widgets/toolbar/codegen.py:
-	fixed a couple of bugs, added ID_SOMETHING=? support (automatic id
-	value generation)
-	[65e84f9c5caa] <HEAD>
-
-	* widgets/frame/frame.py:
-	fixed bug #769524
-	[798fbf8b45aa] <HEAD>
-
-2003-07-11  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py, widgets/bitmap_button/perl_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/toolbar/perl_codegen.py:
-	added quote_path and othe rminor bits
-	[62e119c249b1] <HEAD>
-
-2003-07-10  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py:
-	quote_str fix and other minor bits
-	[cb4906c810a5] <HEAD>
-
-2003-07-09  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/dialog/perl_codegen.py, widgets/panel/perl_codegen.py:
-	constructor signature fixes
-	[89308ab69121] <HEAD>
-
-	* codegen/pl_codegen.py, widgets/frame/perl_codegen.py,
-	widgets/panel/perl_codegen.py:
-	constructor signature fixes
-	[63d04bf38159] <HEAD>
-
-2003-07-08  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	widgets/menubar/codegen.py, widgets/radio_box/radio_box.py:
-	small bugfixes
-	[c7c53561ff94] <HEAD>
-
-	* widgets/menubar/codegen.py:
-	fixed radio/checkable menu items bug (c++ codegen)
-	[601a34c526a7] <HEAD>
-
-2003-07-06  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/splitter_window/perl_codegen.py:
-	minor bugfixes
-	[53e05b839f90] <HEAD>
-
-2003-07-05  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, application.py, codegen/cpp_codegen.py,
-	codegen/py_codegen.py, credits.txt, edit_windows.py:
-	fixed some bugs
-	[1e0853ca5d37] <HEAD>
-
-2003-06-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/.cvsignore, docs/.cvsignore, docs/img/.cvsignore,
-	edit_sizers/.cvsignore, icons/gtk/.cvsignore, icons/msw/.cvsignore,
-	widgets/.cvsignore, widgets/bitmap_button/.cvsignore,
-	widgets/button/.cvsignore, widgets/checkbox/.cvsignore,
-	widgets/choice/.cvsignore, widgets/combo_box/.cvsignore,
-	widgets/custom_widget/.cvsignore, widgets/dialog/.cvsignore,
-	widgets/frame/.cvsignore, widgets/gauge/.cvsignore,
-	widgets/grid/.cvsignore, widgets/list_box/.cvsignore,
-	widgets/list_ctrl/.cvsignore, widgets/menubar/.cvsignore,
-	widgets/notebook/.cvsignore, widgets/panel/.cvsignore,
-	widgets/radio_box/.cvsignore, widgets/radio_button/.cvsignore,
-	widgets/slider/.cvsignore, widgets/spacer/.cvsignore,
-	widgets/spin_ctrl/.cvsignore, widgets/splitter_window/.cvsignore,
-	widgets/static_bitmap/.cvsignore, widgets/static_line/.cvsignore,
-	widgets/static_text/.cvsignore, widgets/text_ctrl/.cvsignore,
-	widgets/toggle_button/.cvsignore, widgets/toolbar/.cvsignore,
-	widgets/tree_ctrl/.cvsignore:
-	added missing .cvsignore
-	[12cd6a30e69f] <HEAD>
-
-	* .cvsignore, icons/.cvsignore:
-	updated .cvsignore
-	[0747d6982e08] <HEAD>
-
-	* edit_sizers/edit_sizers.py:
-	fixed "layout()" bug on 2.4.0
-	[eaf1780fa049] <HEAD>
-
-2003-06-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* docs/tutorial.html:
-	small tweaks for xhtml compliance
-	[d547f265c945] <HEAD>
-
-2003-06-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* docs/tutorial.html:
-	small changes
-	[db494b40ec74] <HEAD>
-
-	* docs/tutorial.html:
-	small changes
-	[14b06db60d77] <HEAD>
-
-2003-06-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py, widget_properties.py, widgets/list_box/list_box.py,
-	widgets/panel/panel.py:
-	small tweaks
-	[38873597daad] <HEAD>
-
-2003-06-27  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/panel/perl_codegen.py:
-	added ScrolledWindow support
-	[8f7d5986ab68] <HEAD>
-
-	* codegen/pl_codegen.py:
-	minor bugfixes
-	[3753bbb55c30] <HEAD>
-
-2003-06-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	layout() function update
-	[5a1c0623c48d] <HEAD>
-
-	* docs/tech_notes.txt:
-	added coding conventions info
-	[43d75f0e5d04] <HEAD>
-
-	* CHANGES.txt, tree.py, widgets/panel/codegen.py,
-	widgets/panel/panel.py:
-	first scrolled window support
-	[a1a3b545bb18] <HEAD>
-
-2003-06-26  crazyinsomniac  <crazyinsomniac>
-
-	* widgets/frame/perl_codegen.py, widgets/toolbar/perl_codegen.py:
-	minor bugfixes
-	[57a1b98de9b9] <HEAD>
-
-	* edit_sizers/perl_sizers_codegen.py:
-	added a few missing semicolons (thanks Jouke)
-	[d932a43463ae] <HEAD>
-
-2003-06-25  crazyinsomniac  <crazyinsomniac>
-
-	* edit_sizers/perl_sizers_codegen.py,
-	widgets/bitmap_button/perl_codegen.py,
-	widgets/button/perl_codegen.py, widgets/checkbox/perl_codegen.py,
-	widgets/choice/perl_codegen.py, widgets/combo_box/perl_codegen.py,
-	widgets/frame/perl_codegen.py, widgets/gauge/perl_codegen.py,
-	widgets/grid/perl_codegen.py, widgets/list_box/perl_codegen.py,
-	widgets/list_ctrl/perl_codegen.py, widgets/notebook/perl_codegen.py,
-	widgets/panel/perl_codegen.py, widgets/radio_box/perl_codegen.py,
-	widgets/radio_button/perl_codegen.py,
-	widgets/slider/perl_codegen.py, widgets/spin_ctrl/perl_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_line/perl_codegen.py,
-	widgets/static_text/perl_codegen.py,
-	widgets/text_ctrl/perl_codegen.py,
-	widgets/toggle_button/perl_codegen.py,
-	widgets/toolbar/perl_codegen.py, widgets/tree_ctrl/perl_codegen.py:
-	minor fixes, some reformatting
-	[74b8ba8e7789] <HEAD>
-
-	* codegen/pl_codegen.py:
-	minor fixes, some reformatting
-	[cee0cac0d2a6] <HEAD>
-
-	* codegen/pl_codegen.py:
-	minor fixes, some reformatting
-	[d236d87116b9] <HEAD>
-
-2003-06-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py:
-	fixed a segfault due to a wxGTK wxRadioBox bug
-	[2ff2559c4c69] <HEAD>
-
-2003-06-24  crazyinsomniac  <crazyinsomniac>
-
-	* codegen/pl_codegen.py:
-	add_sizeritem cleanup
-	[b411e2902761] <HEAD>
-
-2003-06-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, codegen/py_codegen.py, edit_sizers/edit_sizers.py,
-	edit_windows.py, main.py, misc.py, widgets/notebook/notebook.py:
-	small tweaks
-	[297a8a1569a5] <HEAD>
-
-2003-06-24  lawson89  <lawson89>
-
-	* edit_widget.py:
-	removed some unused debug statements
-	[12bc314ef453] <HEAD>
-
-2003-06-23  crazyinsomniac  <crazyinsomniac>
-
-	* CHANGES.txt:
-	*** empty log message ***
-	[c765bb06d5d0] <HEAD>
-
-	* codegen/pl_codegen.py:
-	fixed dialog_units statements (apparently they are supported)
-	[d3efd9cff63d] <HEAD>
-
-	* codegen/pl_codegen.py:
-	fixed dialog_units statements (not supported in wxPerl)
-	[df0180634379] <HEAD>
-
-	* codegen/pl_codegen.py, edit_sizers/perl_sizers_codegen.py:
-	perl generator -- initial import into cvs
-	[8e82cbf1bdd4] <HEAD>
-
-	* widgets/button/perl_codegen.py,
-	widgets/radio_button/perl_codegen.py,
-	widgets/slider/perl_codegen.py, widgets/spacer/perl_codegen.py,
-	widgets/spin_ctrl/perl_codegen.py,
-	widgets/splitter_window/perl_codegen.py,
-	widgets/static_bitmap/perl_codegen.py,
-	widgets/static_line/perl_codegen.py,
-	widgets/static_text/perl_codegen.py,
-	widgets/text_ctrl/perl_codegen.py,
-	widgets/toggle_button/perl_codegen.py,
-	widgets/toolbar/perl_codegen.py, widgets/tree_ctrl/perl_codegen.py:
-	perl generator -- initial import into cvs
-	[963878ed13cc] <HEAD>
-
-	* widgets/checkbox/perl_codegen.py, widgets/choice/perl_codegen.py,
-	widgets/combo_box/perl_codegen.py,
-	widgets/custom_widget/perl_codegen.py,
-	widgets/dialog/perl_codegen.py, widgets/frame/perl_codegen.py,
-	widgets/gauge/perl_codegen.py, widgets/grid/perl_codegen.py,
-	widgets/list_box/perl_codegen.py, widgets/list_ctrl/perl_codegen.py,
-	widgets/menubar/perl_codegen.py, widgets/notebook/perl_codegen.py,
-	widgets/panel/perl_codegen.py, widgets/radio_box/perl_codegen.py:
-	perl generator -- initial import into cvs
-	[a80dd45fbd01] <HEAD>
-
-	* widgets/bitmap_button/perl_codegen.py:
-	perl generator -- initial import into cvs
-	[a47d5ae3cb10] <HEAD>
-
-2003-06-23  lawson89  <lawson89>
-
-	* edit_widget.py:
-	*** empty log message ***
-	[090915245d00] <HEAD>
-
-2003-06-21  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* .cvsignore, CHANGES.txt, application.py, codegen/cpp_codegen.py,
-	common.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	icons/.cvsignore, misc.py, widget_properties.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/button/button.py,
-	widgets/checkbox/checkbox.py, widgets/choice/choice.py,
-	widgets/combo_box/combo_box.py,
-	widgets/custom_widget/custom_widget.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/grid/grid.py,
-	widgets/list_box/list_box.py, widgets/menubar/menubar.py,
-	widgets/notebook/notebook.py, widgets/radio_box/radio_box.py,
-	widgets/radio_button/radio_button.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_text/static_text.py, widgets/text_ctrl/text_ctrl.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/tool.py,
-	widgets/toolbar/toolbar.py, xml_parse.py, xrc2wxg.py:
-	fixed a bunch of unicode bugs
-	[71ec7b17f08d] <HEAD>
-
-2003-06-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py:
-	changed 'Disable()' to 'Enable(0)' in the generated code
-	[2fec35b74b25] <HEAD>
-
-2003-06-07  dinogen  <dinogen>
-
-	* docs/manual.tex, docs/manual_des.png, docs/manual_main.png,
-	docs/manual_preview.png, docs/manual_prop.png, docs/manual_tree.png:
-	manual TEX added
-	[5b83838d11b7] <HEAD>
-
-2003-06-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, common.py:
-	*** empty log message ***
-	[061b2a997ec7] <HEAD>
-
-	* main.py:
-	ToggleButtonBox
-	[bf07afae6e26] <HEAD>
-
-2003-05-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* xrc2wxg.py:
-	fixed Unicode issue
-	[112899ba3570] <HEAD>
-
-	* widgets/static_bitmap/codegen.py, widgets/static_line/codegen.py,
-	widgets/static_text/codegen.py:
-	fixed XRC generator (removed 'attribute' property)
-	[fdbefb44fc6c] <HEAD>
-
-2003-05-22  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/splitter_window/codegen.py, widgets/toolbar/codegen.py:
-	updated XRC support to latest XRC from CVS
-	[8af5ea639d49] <HEAD>
-
-	* CHANGES.txt, common.py, config.py, credits.txt:
-	local widgets support
-	[7b6821ba2f0e] <HEAD>
-
-2003-05-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/xrc_codegen.py:
-	fixed silly bug
-	[1c6387640bf5] <HEAD>
-
-2003-05-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, docs/tutorial.html:
-	updated information
-	[eb70c965c04e] <HEAD>
-
-2003-05-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/xrc_codegen.py, widgets/menubar/codegen.py, xml_parse.py,
-	xrc2wxg.py:
-	small fixed (mostly unicode-related)
-	[c0c99bb092c1] <HEAD>
-
-2003-05-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py, widgets/notebook/codegen.py:
-	fixed small bugs
-	[0579489c3640] <HEAD>
-
-2003-05-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, edit_windows.py, icons/sizer.xpm,
-	widgets/dialog/codegen.py, widgets/dialog/dialog.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py, xml_parse.py:
-	last fixes for the upcoming 0.2.3
-	[aa2674b422e4] <HEAD>
-
-2003-05-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py, edit_sizers/edit_sizers.py, main.py:
-	small changes
-	[89b951014735] <HEAD>
-
-2003-05-13  dinogen  <dinogen>
-
-	* widgets/frame/codegen.py, widgets/frame/frame.py:
-	first write of icon property I have to test Cpp code generation.
-	[b2db421c2974] <HEAD>
-
-2003-05-13  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* about.py, application.py, clipboard.py, color_dialog.py, common.py,
-	config.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	font_dialog.py, main.py, misc.py, tree.py, widget_properties.py,
-	xrc2wxg.py:
-	small tweaks, and $Id:$ keyword
-	[1ed6e80aa715] <HEAD>
-
-	* CHANGES.txt, README.txt, TODO.txt, application.py,
-	codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, edit_sizers/__init__.py,
-	edit_sizers/sizers_codegen.py, widgets/ChoicesCodeHandler.py,
-	widgets/ChoicesProperty.py, widgets/MenuTree.py,
-	widgets/bitmap_button/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/button/__init__.py,
-	widgets/button/button.py, widgets/button/codegen.py,
-	widgets/checkbox/__init__.py, widgets/checkbox/checkbox.py,
-	widgets/checkbox/codegen.py, widgets/choice/__init__.py,
-	widgets/choice/choice.py, widgets/choice/codegen.py,
-	widgets/combo_box/__init__.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/combo_box.py, widgets/custom_widget/__init__.py,
-	widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py, widgets/dialog/__init__.py,
-	widgets/dialog/codegen.py, widgets/dialog/dialog.py,
-	widgets/frame/__init__.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/gauge/__init__.py,
-	widgets/gauge/codegen.py, widgets/gauge/gauge.py,
-	widgets/grid/__init__.py, widgets/grid/codegen.py,
-	widgets/grid/grid.py, widgets/list_box/__init__.py,
-	widgets/list_box/codegen.py, widgets/list_box/list_box.py,
-	widgets/list_ctrl/__init__.py, widgets/list_ctrl/codegen.py,
-	widgets/list_ctrl/list_ctrl.py, widgets/menubar/__init__.py,
-	widgets/menubar/codegen.py, widgets/menubar/menubar.py,
-	widgets/notebook/__init__.py, widgets/notebook/codegen.py,
-	widgets/notebook/notebook.py, widgets/panel/__init__.py,
-	widgets/panel/codegen.py, widgets/panel/panel.py,
-	widgets/radio_box/__init__.py, widgets/radio_box/codegen.py,
-	widgets/radio_box/radio_box.py, widgets/radio_button/__init__.py,
-	widgets/radio_button/codegen.py,
-	widgets/radio_button/radio_button.py, widgets/slider/__init__.py,
-	widgets/slider/codegen.py, widgets/slider/slider.py,
-	widgets/spacer/__init__.py, widgets/spacer/codegen.py,
-	widgets/spacer/spacer.py, widgets/spin_ctrl/__init__.py,
-	widgets/spin_ctrl/codegen.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/__init__.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/__init__.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/__init__.py, widgets/static_line/codegen.py,
-	widgets/static_line/static_line.py, widgets/static_text/__init__.py,
-	widgets/static_text/codegen.py, widgets/static_text/static_text.py,
-	widgets/text_ctrl/__init__.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toggle_button/__init__.py,
-	widgets/toggle_button/codegen.py,
-	widgets/toggle_button/toggle_button.py, widgets/toolbar/__init__.py,
-	widgets/toolbar/codegen.py, widgets/toolbar/tool.py,
-	widgets/toolbar/toolbar.py, widgets/tree_ctrl/__init__.py,
-	widgets/tree_ctrl/codegen.py, widgets/tree_ctrl/tree_ctrl.py,
-	wxglade.py, xml_parse.py, xrc2wxg.py:
-	small tweaks, and $Id:$ keyword
-	[045986c1a3ec] <HEAD>
-
-	* icons/wxglade.ico:
-	windows icon
-	[90408b6153f0] <HEAD>
-
-2003-05-10  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, codegen/xrc_codegen.py, widget_properties.py,
-	widgets/button/button.py, widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py, widgets/notebook/codegen.py,
-	xrc2wxg.py:
-	better custom widget support (and some minor fixes)
-	[85152aa04b45] <HEAD>
-
-2003-05-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, application.py, codegen/py_codegen.py, credits.txt,
-	edit_windows.py, misc.py, widgets/custom_widget/codegen.py,
-	widgets/frame/frame.py, widgets/menubar/codegen.py,
-	widgets/menubar/menubar.py, widgets/toolbar/codegen.py,
-	widgets/toolbar/toolbar.py, xml_parse.py:
-	added preview support
-	[0b48ebe999f2] <HEAD>
-
-2003-05-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py, widgets/notebook/notebook.py,
-	widgets/toolbar/codegen.py, widgets/toolbar/toolbar.py:
-	latest bugfixes before 0.2.2 release
-	[e6330e5c7443] <HEAD>
-
-2003-04-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py, misc.py:
-	*** empty log message ***
-	[f07a6baf310f] <HEAD>
-
-	* widgets/frame/frame.py, widgets/notebook/notebook.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/toolbar/codegen.py, widgets/toolbar/toolbar.py:
-	fixed small bugs and win32 incompatibilities
-	[6258a462feb4] <HEAD>
-
-2003-04-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/static_bitmap/codegen.py:
-	style property added
-	[666a585115a2] <HEAD>
-
-	* CHANGES.txt, codegen/py_codegen.py, config.py, credits.txt, main.py,
-	widgets/dialog/dialog.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/menubar/menubar.py,
-	widgets/notebook/notebook.py, widgets/panel/panel.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/static_bitmap.py, widgets/widgets.txt,
-	xrc2wxg.py:
-	toolbar support, some bugfixes and small updates
-	[5be5365a1a2c] <HEAD>
-
-	* icons/toolbar.xpm, widgets/toolbar/__init__.py,
-	widgets/toolbar/codegen.py, widgets/toolbar/tool.py,
-	widgets/toolbar/toolbar.py:
-	first toolbar support
-	[a5410e3d5d31] <HEAD>
-
-	* about.py, credits.txt:
-	updated credits and about box
-	[dcea0e413385] <HEAD>
-
-	* CHANGES.txt, credits.txt, edit_sizers/__init__.py,
-	edit_sizers/edit_sizers.py, edit_windows.py, main.py, tree.py,
-	widgets/custom_widget/custom_widget.py,
-	widgets/list_ctrl/list_ctrl.py, widgets/notebook/notebook.py,
-	widgets/panel/panel.py, widgets/splitter_window/splitter_window.py,
-	widgets/tree_ctrl/tree_ctrl.py, xml_parse.py:
-	bug fixes and new "virtual sizers" support
-	[fbf7fe706204] <HEAD>
-
-2003-04-23  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/panel/__init__.py:
-	new "virtual sizers" support
-	[a5e20cfa7270] <HEAD>
-
-2003-04-22  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	fixed bug in __set_properties code generation
-	[93e1388a5b64] <HEAD>
-
-2003-04-18  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* credits.txt:
-	updated credits
-	[44ac1e8684a4] <HEAD>
-
-	* codegen/cpp_codegen.py:
-	fix for "bug" #723115
-	[54e91bcb7d76] <HEAD>
-
-2003-04-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, common.py, config.py, credits.txt,
-	edit_sizers/edit_sizers.py, main.py, misc.py,
-	widgets/custom_widget/custom_widget.py, widgets/dialog/dialog.py,
-	widgets/frame/frame.py, widgets/menubar/menubar.py:
-	new preferences and some bugfixes/tweaks
-	[d8c3c36787b9] <HEAD>
-
-2003-04-13  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/MenuTree.py, widgets/menubar/codegen.py,
-	widgets/menubar/menubar.py:
-	added support for radio menu items
-	[675b15347ed7] <HEAD>
-
-2003-04-10  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	fixed bug #717863
-	[551de9f64860] <HEAD>
-
-	* main.py:
-	fixed bug #717595
-	[1fdc55b5e05c] <HEAD>
-
-2003-04-03  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/menubar/__init__.py, widgets/menubar/codegen.py,
-	widgets/menubar/menubar.py:
-	standalone menubar support
-	[cf9590d4a498] <HEAD>
-
-	* CHANGES.txt, codegen/cpp_codegen.py, codegen/py_codegen.py,
-	common.py, edit_sizers/sizers_codegen.py, edit_windows.py, tree.py,
-	widgets/bitmap_button/codegen.py, widgets/button/codegen.py,
-	widgets/checkbox/codegen.py, widgets/choice/codegen.py,
-	widgets/combo_box/codegen.py, widgets/custom_widget/codegen.py,
-	widgets/dialog/codegen.py, widgets/widgets.txt, xrc2wxg.py:
-	changed code generation API
-	[a30c61552ed8] <HEAD>
-
-	* widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/gauge/codegen.py, widgets/grid/codegen.py,
-	widgets/list_box/codegen.py, widgets/list_ctrl/codegen.py,
-	widgets/notebook/codegen.py, widgets/panel/codegen.py,
-	widgets/panel/panel.py, widgets/radio_box/codegen.py,
-	widgets/radio_button/codegen.py, widgets/slider/codegen.py,
-	widgets/spacer/codegen.py, widgets/spin_ctrl/codegen.py,
-	widgets/splitter_window/codegen.py,
-	widgets/static_bitmap/codegen.py, widgets/static_line/codegen.py,
-	widgets/static_text/codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/toggle_button/codegen.py, widgets/tree_ctrl/codegen.py:
-	changed code generation API
-	[3f0abca894b6] <HEAD>
-
-2003-03-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py, widget_properties.py, widgets/grid/grid.py:
-	fixed grid selection mode bug
-	[65e4519a64b0] <HEAD>
-
-2003-03-23  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/radio_box/radio_box.py:
-	fixed small bug in (title property)
-	[66ed495c937a] <HEAD>
-
-2003-03-21  dinogen  <dinogen>
-
-	* widgets/static_bitmap/codegen.py:
-	variable "prefix" used
-	[a77aaeae00d2] <HEAD>
-
-2003-03-21  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/bitmap_button/bitmap_button.py,
-	widgets/radio_button/radio_button.py,
-	widgets/spin_ctrl/spin_ctrl.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/toggle_button/toggle_button.py:
-	fixed small bugs in some property getter/setter
-	[03aadd9d7d17] <HEAD>
-
-	* application.py, edit_windows.py,
-	widgets/bitmap_button/bitmap_button.py, widgets/button/button.py,
-	widgets/grid/grid.py:
-	fixed bugs due to incorrect bool casts
-	[3ba3a4e81441] <HEAD>
-
-2003-03-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/dialog/dialog.py, widgets/grid/grid.py:
-	fixed small layout bugs
-	[0e10abcfba8f] <HEAD>
-
-	* CHANGES.txt, edit_windows.py:
-	fixed bug #706890
-	[bdc1145df701] <HEAD>
-
-2003-03-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	small changes
-	[975475dcd458] <HEAD>
-
-2003-03-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, edit_windows.py, widgets/frame/frame.py:
-	fixed small bugs
-	[87fbd4b48f3c] <HEAD>
-
-2003-03-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, config.py, main.py:
-	added config.preferences.buttons_per_row
-	[7d133bf92aa8] <HEAD>
-
-2003-03-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt:
-	added first (basic) support for wxListCtrl and wxTreeCtrl
-	[b33f0f97af2d] <HEAD>
-
-	* application.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/gauge/gauge.py, widgets/grid/grid.py,
-	widgets/list_box/list_box.py, widgets/notebook/notebook.py,
-	widgets/slider/slider.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/widgets.txt:
-	added wxTAB_TRAVERSAL style to scrolled wins that display properties
-	[bd182dde3dc4] <HEAD>
-
-	* icons/tree_ctrl.xpm, widgets/tree_ctrl/__init__.py,
-	widgets/tree_ctrl/codegen.py, widgets/tree_ctrl/tree_ctrl.py:
-	wxTreeCtrl support
-	[564db2e17d32] <HEAD>
-
-	* icons/list_ctrl.xpm, widgets/list_ctrl/__init__.py,
-	widgets/list_ctrl/codegen.py, widgets/list_ctrl/list_ctrl.py:
-	wxListCtrl support
-	[7d71d8aec07c] <HEAD>
-
-2003-03-10  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, widget_properties.py, widgets/choice/choice.py,
-	widgets/combo_box/combo_box.py,
-	widgets/custom_widget/custom_widget.py, widgets/grid/grid.py,
-	widgets/list_box/list_box.py, widgets/notebook/notebook.py,
-	widgets/radio_box/radio_box.py:
-	fixed bugs (see CHANGES.txt)
-	[c7b7ae3dcf0c] <HEAD>
-
-2003-03-09  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* wxPyColourChooser/pycolourbox.py,
-	wxPyColourChooser/pycolourchooser.py:
-	converted true/false to True/False
-	[15d2e82a6b28] <HEAD>
-
-2003-03-08  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, codegen/cpp_codegen.py, codegen/py_codegen.py:
-	fixed bug in the codegen modules (class decl regex)
-	[4f53f21af979] <HEAD>
-
-	* main.py, misc.py:
-	fixed bug in wxPython 2.4.0.2's wxSizer.Insert
-	[72153b987969] <HEAD>
-
-2003-03-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, color_dialog.py, edit_sizers/edit_sizers.py,
-	edit_windows.py, font_dialog.py, main.py, misc.py,
-	widget_properties.py:
-	bugfixes and improved performance and resources usage of the various
-	properties
-	[e2453269f0fc] <HEAD>
-
-2003-03-05  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/frame/frame.py:
-	experimental bugfixes for bugs 698071 and 698074
-	[2ed4eb036de5] <HEAD>
-
-2003-03-03  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* README.txt:
-	Added info about broken PyXML
-	[bbde78ee66b7] <HEAD>
-
-2003-02-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* wxglade.py:
-	commented out traceback print
-	[d5224b2a139e] <HEAD>
-
-2003-02-22  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widget_properties.py:
-	*** empty log message ***
-	[def414c6e8b9] <HEAD>
-
-	* edit_windows.py:
-	fixed bug in set_size when use_dialog_units preference is set
-	[94ecd3d8194e] <HEAD>
-
-	* tree.py:
-	fixed bug in right_click handler
-	[bd2e12ca15cf] <HEAD>
-
-	* edit_windows.py:
-	fixed bug in set_size when use_dialog_units preference is set
-	[5f0eed8b1c56] <HEAD>
-
-2003-02-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* config.py, tree.py, widget_properties.py:
-	fixed incompatibilities with python 2.3 due to new bool behaviour
-	[e9896c039d6d] <HEAD>
-
-2003-02-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, widget_properties.py:
-	minor layout tweaks for win32
-	[cbbb02664a69] <HEAD>
-
-2003-02-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/grid/grid.py:
-	fixed bug: 'create_grid' property not saved correctly
-	[a148c688fce4] <HEAD>
-
-2003-02-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, tree.py, xml_parse.py:
-	slightly improved error messages
-	[62d4ce052c8b] <HEAD>
-
-	* CHANGES.txt, application.py, codegen/cpp_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py, main.py, tree.py,
-	xml_parse.py:
-	slightly improved error messages
-	[40da132ff020] <HEAD>
-
-2003-02-12  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/notebook/notebook.py,
-	widgets/splitter_window/splitter_window.py:
-	fixed bug #685264
-	[7c158d098c43] <HEAD>
-
-2003-02-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt:
-	*** empty log message ***
-	[5fe8aa354995] <HEAD>
-
-2003-01-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/notebook/notebook.py,
-	widgets/splitter_window/splitter_window.py:
-	fixed bug in *Pane.GetBestSize
-	[b222920785e5] <HEAD>
-
-2003-01-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt:
-	updated changelog
-	[009e9d12c273] <HEAD>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py:
-	fixed bug in multi-files code generation
-	[c80a8c229011] <HEAD>
-
-	* docs/tutorial.html:
-	fixed some typos
-	[8fad2dc8fd9b] <HEAD>
-
-2003-01-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* docs/tutorial.html:
-	updated information and fixed typos
-	[313ddf82f0c0] <HEAD>
-
-	* config.py:
-	*** empty log message ***
-	[3ba5b3972768] <HEAD>
-
-	* README.txt, about.py, application.py, clipboard.py,
-	codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, config.py,
-	edit_sizers/__init__.py, edit_sizers/edit_sizers.py,
-	edit_sizers/sizers_codegen.py, edit_windows.py, license.txt,
-	main.py, misc.py, tree.py, widget_properties.py,
-	widgets/ChoicesCodeHandler.py, widgets/ChoicesProperty.py,
-	widgets/MenuTree.py, widgets/bitmap_button/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/button/__init__.py,
-	widgets/button/button.py, widgets/button/codegen.py,
-	widgets/checkbox/__init__.py, widgets/checkbox/checkbox.py,
-	widgets/checkbox/codegen.py, widgets/choice/__init__.py,
-	widgets/choice/choice.py, widgets/choice/codegen.py,
-	widgets/combo_box/__init__.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/combo_box.py, widgets/custom_widget/__init__.py,
-	widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py, widgets/dialog/__init__.py,
-	widgets/dialog/codegen.py, widgets/dialog/dialog.py,
-	widgets/frame/__init__.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/gauge/__init__.py,
-	widgets/gauge/codegen.py, widgets/gauge/gauge.py,
-	widgets/grid/__init__.py, widgets/grid/codegen.py,
-	widgets/grid/grid.py, widgets/list_box/__init__.py,
-	widgets/list_box/codegen.py, widgets/list_box/list_box.py,
-	widgets/notebook/__init__.py, widgets/notebook/codegen.py,
-	widgets/notebook/notebook.py, widgets/panel/__init__.py,
-	widgets/panel/codegen.py, widgets/panel/panel.py,
-	widgets/radio_box/__init__.py, widgets/radio_box/codegen.py,
-	widgets/radio_box/radio_box.py, widgets/radio_button/__init__.py,
-	widgets/radio_button/codegen.py,
-	widgets/radio_button/radio_button.py, widgets/slider/__init__.py,
-	widgets/slider/codegen.py, widgets/slider/slider.py,
-	widgets/spacer/__init__.py, widgets/spacer/codegen.py,
-	widgets/spacer/spacer.py, widgets/spin_ctrl/__init__.py,
-	widgets/spin_ctrl/codegen.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/__init__.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/__init__.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/__init__.py, widgets/static_line/codegen.py,
-	widgets/static_line/static_line.py, widgets/static_text/__init__.py,
-	widgets/static_text/codegen.py, widgets/static_text/static_text.py,
-	widgets/text_ctrl/__init__.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toggle_button/__init__.py,
-	widgets/toggle_button/codegen.py,
-	widgets/toggle_button/toggle_button.py, wxglade.py, xml_parse.py,
-	xrc2wxg.py:
-	update copyright notice
-	[778df94ddb11] <HEAD>
-
-	* CHANGES.txt, common.py, wxglade.py:
-	small changes before v0.1.2
-	[79a3ddb66894] <HEAD>
-
-2003-01-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widget_properties.py:
-	fixed wxPython 2.4.0.2 incompatibility causing segfault at startup
-	[a11b0bfe2071] <HEAD>
-
-2003-01-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	fixed serious bug introduced after v0.2
-	[784ad68412fc] <HEAD>
-
-2003-01-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py, edit_sizers/edit_sizers.py, main.py, tree.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py,
-	widgets/notebook/notebook.py, widgets/panel/panel.py,
-	widgets/splitter_window/splitter_window.py, wxglade.py:
-	better paths handling (now it should be OK to execute from any dir)
-	[d414ee4d35e0] <HEAD>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py,
-	widgets/bitmap_button/codegen.py, widgets/button/codegen.py,
-	widgets/checkbox/codegen.py, widgets/choice/codegen.py,
-	widgets/combo_box/codegen.py, widgets/dialog/codegen.py,
-	widgets/gauge/codegen.py, widgets/list_box/codegen.py,
-	widgets/notebook/codegen.py, widgets/radio_box/codegen.py,
-	widgets/radio_button/codegen.py, widgets/slider/codegen.py,
-	widgets/splitter_window/codegen.py,
-	widgets/static_bitmap/codegen.py, widgets/static_line/codegen.py,
-	widgets/static_text/codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/toggle_button/codegen.py:
-	some code cleanups
-	[bb283fa5ef7d] <HEAD>
-
-2003-01-17  dinogen  <dinogen>
-
-	* widgets/grid/__init__.py:
-	changed comment
-	[d6e66e8007c7] <HEAD>
-
-2003-01-03  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/static_bitmap/static_bitmap.py:
-	fix (?) for a win-specific bug (#661123)
-	[8816c903b97a] <HEAD>
-
-	* CHANGES.txt, application.py, codegen/cpp_codegen.py,
-	codegen/py_codegen.py, codegen/xrc_codegen.py, common.py, config.py,
-	edit_sizers/sizers_codegen.py, main.py, tree.py,
-	widgets/button/codegen.py, widgets/checkbox/codegen.py,
-	widgets/choice/codegen.py, widgets/combo_box/codegen.py,
-	widgets/dialog/codegen.py, widgets/frame/codegen.py,
-	widgets/grid/codegen.py, widgets/list_box/codegen.py,
-	widgets/notebook/codegen.py, widgets/radio_box/codegen.py,
-	widgets/radio_button/codegen.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/codegen.py, widgets/static_line/static_line.py,
-	widgets/static_text/codegen.py, widgets/static_text/static_text.py,
-	widgets/text_ctrl/codegen.py, widgets/toggle_button/codegen.py,
-	wxglade.py, xml_parse.py:
-	various tweaks to code generation:
-	  - customizable automatic backup
-	  - gettext support
-	  - "local" widgets
-	[12e83f90bc74] <HEAD>
-
-2002-12-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, edit_sizers/edit_sizers.py, edit_windows.py:
-	platform-specific bugfixes and improvements
-	[c5af71900208] <HEAD>
-
-2002-12-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* README.txt:
-	information updated
-	[f0dee1cce106] <HEAD>
-
-	* widgets/frame/frame.py:
-	workaround to avoid some segfaults on GTK
-	[1026f07f8a7d] <HEAD>
-
-	* docs/tutorial.html:
-	some corrections
-	[35d30ecbb3d7] <HEAD>
-
-2002-12-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* docs/tutorial.html:
-	more notes added
-	[8f6ce58423a3] <HEAD>
-
-2002-12-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py,
-	edit_sizers/edit_sizers.py, widgets/notebook/codegen.py,
-	widgets/splitter_window/codegen.py, wxglade.py:
-	more bugs fixed
-	[4c55033ce6dc] <HEAD>
-
-2002-12-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/custom_widget/custom_widget.py, widgets/grid/grid.py,
-	widgets/notebook/notebook.py:
-	fixed bug in get_property_handler caused by a typo
-	[2395aeaa1f32] <HEAD>
-
-	* CHANGES.txt:
-	fixed typo
-	[a89b80cb00d6] <HEAD>
-
-2002-12-23  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/static_text/static_text.py:
-	fixed bug impacting XRC output
-	[b3af068e6440] <HEAD>
-
-	* CHANGES.txt, application.py, main.py:
-	better error messages
-	[f3ed54e3f82d] <HEAD>
-
-2002-12-21  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/choice/choice.py, widgets/combo_box/combo_box.py,
-	widgets/custom_widget/custom_widget.py, widgets/grid/grid.py,
-	widgets/list_box/list_box.py, widgets/notebook/notebook.py,
-	widgets/radio_box/radio_box.py:
-	fixed bug in get_property_handler
-	[e6c3ce540a45] <HEAD>
-
-2002-12-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* application.py, main.py, misc.py, widget_properties.py,
-	widgets/choice/choice.py, widgets/combo_box/combo_box.py,
-	widgets/gauge/gauge.py, widgets/grid/grid.py,
-	widgets/list_box/list_box.py, widgets/slider/codegen.py,
-	widgets/spin_ctrl/codegen.py:
-	fixed bugs and/or wx 2.3.4 incompatibilities
-	[f408d3070687] <HEAD>
-
-2002-12-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/grid/codegen.py, widgets/grid/grid.py:
-	c++ code generation and some tweaks
-	[0008df576e6e] <HEAD>
-
-	* widget_properties.py:
-	small bugfix
-	[0b4af144c30a] <HEAD>
-
-2002-12-18  dinogen  <dinogen>
-
-	* widgets/grid/codegen.py, widgets/grid/grid.py:
-	codegen for wxgrid added
-	[8ad498d73d3c] <HEAD>
-
-2002-12-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* config.py, widget_properties.py, widgets/notebook/codegen.py:
-	small improvements
-	[3e062f204c4d] <HEAD>
-
-2002-12-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* about.py, main.py:
-	fixed path-related bug
-	[5fe0cdd0b501] <HEAD>
-
-	* widgets/splitter_window/splitter_window.py:
-	fixed wxPython 2.3.2.1 incompatibility
-	[51181fc972ca] <HEAD>
-
-2002-12-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* docs/img/custom_widget.gif, docs/img/sizer_slot.gif:
-	*** empty log message ***
-	[36b279877e50] <HEAD>
-
-	* CHANGES.txt, docs/tutorial.html:
-	tutorial updated
-	[90e2c9b58cc0] <HEAD>
-
-	* edit_sizers/__init__.py, edit_sizers/edit_sizers.py,
-	widgets/frame/frame.py:
-	automatically add a sizer to a frame
-	[b5d57d6a7d04] <HEAD>
-
-	* wxglade.py:
-	fixed help string
-	[3080b8779bc2] <HEAD>
-
-2002-12-11  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	added insert_row and insert_col to grid sizers
-	[53561a163b9a] <HEAD>
-
-	* xml_parse.py:
-	better handling of renames during paste
-	[d25a6262cd49] <HEAD>
-
-	* about.py, common.py, misc.py, widget_properties.py,
-	widgets/spin_ctrl/codegen.py, widgets/spin_ctrl/spin_ctrl.py,
-	wxglade.py:
-	fixed some minor bugs
-	[3212e80e7052] <HEAD>
-
-	* wxglade.py:
-	fixed potential sys.path problem
-	[5b5aa6b2f9f0] <HEAD>
-
-2002-12-10  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/bitmap_button/bitmap_button.py:
-	fixed bug on load_bitmap
-	[54f02a0e406e] <HEAD>
-
-	* widget_properties.py:
-	implemented "escaping" from text properties to undo changes
-	[45a96b324e4e] <HEAD>
-
-	* main.py:
-	safer _save_app
-	[9049c80564e2] <HEAD>
-
-	* common.py:
-	merged
-	[b9cc098948c7] <HEAD>
-
-	* edit_sizers/edit_sizers.py, edit_sizers/sizers_codegen.py:
-	SetSizeHints code generation
-	[4cb86a3805b7] <HEAD>
-
-	* color_dialog.py:
-	fixed bug on win32
-	[0ecef53d7524] <HEAD>
-
-2002-12-10  dinogen  <dinogen>
-
-	* widgets/grid/grid.py:
-	oops, an stupid error slops to me
-	[104c2172ce4b] <HEAD>
-
-	* widgets/grid/codegen.py, widgets/grid/grid.py:
-	Added columns property
-	[b022ec403acf] <HEAD>
-
-	* common.py, misc.py:
-	smart_split function moved.
-	[b2f2a9b67030] <HEAD>
-
-2002-12-08  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py:
-	"fixed" code generation bugs when a container class is renamed (and
-	we're in single file mode)
-	[f04ae26807a1] <HEAD>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py:
-	"fixed" code generation bugs when a container class is renamed (and
-	we're in single file mode)
-	[15ebc526e593] <HEAD>
-
-	* CHANGES.txt, application.py, docs/tutorial.html,
-	edit_sizers/edit_sizers.py:
-	bug fixes
-	[4e32d8332f73] <HEAD>
-
-	* about.py, credits.txt:
-	updated credits
-	[7f0c2b6fd3ea] <HEAD>
-
-	* wxglade.py:
-	fixed sys.path bug
-	[7c81dabf91a6] <HEAD>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, edit_windows.py, misc.py,
-	widget_properties.py:
-	changes due to new color and font properties
-	[6813583dde44] <HEAD>
-
-	* font_dialog.py:
-	new font dialog
-	[d52e19cb75d0] <HEAD>
-
-	* color_dialog.py:
-	new color chooser dialog
-	[96bbab1afc43] <HEAD>
-
-	* wxPyColourChooser/__init__.py, wxPyColourChooser/canvas.py,
-	wxPyColourChooser/intl.py, wxPyColourChooser/license/lgpl.txt,
-	wxPyColourChooser/license/wxwindowslib.txt,
-	wxPyColourChooser/pycolourbox.py,
-	wxPyColourChooser/pycolourchooser.py,
-	wxPyColourChooser/pycolourslider.py, wxPyColourChooser/pypalette.py:
-	wxPyColourChooser module by Michael Gilfix
-	[c3265170b70f] <HEAD>
-
-	* widgets/bitmap_button/bitmap_button.py, widgets/button/button.py,
-	widgets/combo_box/combo_box.py, widgets/notebook/codegen.py:
-	bug fixes
-	[bb5610b9b22a] <HEAD>
-
-2002-12-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/list_box/list_box.py, widgets/radio_box/radio_box.py:
-	small bugfixes
-	[46d6114a2906] <HEAD>
-
-	* widgets/notebook/notebook.py,
-	widgets/splitter_window/splitter_window.py:
-	fixed wxPanel style-related bugs that caused segfaults on win
-	[181460cf510f] <HEAD>
-
-	* widgets/panel/panel.py:
-	fixed style bug
-	[87705270190c] <HEAD>
-
-2002-12-03  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/combo_box/combo_box.py, widgets/panel/panel.py,
-	widgets/spin_ctrl/spin_ctrl.py:
-	fixed bug that caused a SEGFAULT on win
-	[b42cf7411e85] <HEAD>
-
-2002-12-03  dinogen  <dinogen>
-
-	* misc.py, widgets/grid/codegen.py, widgets/grid/grid.py:
-	columns names ok
-	[e2019009c3a8] <HEAD>
-
-2002-12-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* TODO.txt:
-	added autosave/backup to the TODO
-	[ca5f356f0ede] <HEAD>
-
-	* main.py, tree.py, widget_properties.py,
-	widgets/combo_box/combo_box.py:
-	fixed bugs
-	[9305b7c35703] <HEAD>
-
-2002-12-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/notebook/notebook.py:
-	fixed bug that caused segfaults occasionally
-	[c903c7427cae] <HEAD>
-
-	* widgets/combo_box/combo_box.py:
-	fixed bug in set_style
-	[614bd0f149c4] <HEAD>
-
-	* xrc2wxg.py:
-	custom classes support
-	[1191b7fb0198] <HEAD>
-
-	* icons/custom.xpm:
-	better icon
-	[2c22da59c067] <HEAD>
-
-2002-11-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py, widget_properties.py,
-	widgets/checkbox/checkbox.py, widgets/radio_button/radio_button.py:
-	bux fixes (again :)
-	[1e5c64360f11] <HEAD>
-
-	* tree.py:
-	fixed bug on change_node_pos
-	[7fa320cf2577] <HEAD>
-
-	* config.py, main.py:
-	added option to disable progress dialog on loading
-	[81633aeeeba3] <HEAD>
-
-	* widgets/panel/panel.py, xrc2wxg.py:
-	fixed bugs
-	[169c82adf8cf] <HEAD>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py:
-	fixed bug on SetItemMinSize when w or h are -1
-	[69c8cb8f6083] <HEAD>
-
-2002-11-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/panel/panel.py:
-	fixed resizing bug
-	[9d1504d7fc39] <HEAD>
-
-	* xml_parse.py:
-	made loading a wxg file more permissive
-	[579481c1d6be] <HEAD>
-
-	* xrc2wxg.py, xrc_import.py:
-	renamed xrc_import.py to xrc2wxg.py
-	[6bde32c209d4] <HEAD>
-
-2002-11-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* xrc_import.py:
-	first EXPERIMENTAL and probably BROKEN xrc to wxg converter
-	[bca5a48d2fb4] <HEAD>
-
-	* main.py:
-	better wxFileHistory support
-	[15d57c5ac4f4] <HEAD>
-
-	* widgets/frame/frame.py:
-	fixed menubar-related bugs
-	[1c8921ee398b] <HEAD>
-
-	* widget_properties.py:
-	fixed tab ordering in GridProperty buttons
-	[2e3151be5fdf] <HEAD>
-
-2002-11-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/frame/frame.py:
-	fixed bug on EditFrame.get_property_handler.MenuHandler
-	[3ff1b017e3fb] <HEAD>
-
-	* tree.py:
-	fixed bug on change_node_pos
-	[4d556fc4fcac] <HEAD>
-
-	* CHANGES.txt, edit_sizers/edit_sizers.py:
-	fixed bug on set_item_pos
-	[ab3616f376f8] <HEAD>
-
-	* README.txt, edit_sizers/edit_sizers.py, edit_windows.py,
-	widgets/grid/codegen.py, widgets/grid/grid.py:
-	fixed some small bugs
-	[65fdb71c32e3] <HEAD>
-
-2002-11-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* misc.py, widget_properties.py, widgets/grid/codegen.py,
-	widgets/grid/grid.py:
-	some small fixes
-	[fa181eeeae91] <HEAD>
-
-	* about.py:
-	added credits to Marcello
-	[5165ce435189] <HEAD>
-
-	* CHANGES.txt, codegen/py_codegen.py, common.py,
-	widgets/bitmap_button/codegen.py, widgets/button/codegen.py,
-	widgets/checkbox/codegen.py, widgets/choice/codegen.py,
-	widgets/combo_box/codegen.py, widgets/dialog/codegen.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/gauge/codegen.py, widgets/list_box/codegen.py,
-	widgets/notebook/codegen.py, widgets/panel/codegen.py,
-	widgets/radio_box/codegen.py, widgets/radio_button/codegen.py,
-	widgets/slider/codegen.py, widgets/spin_ctrl/codegen.py,
-	widgets/splitter_window/codegen.py,
-	widgets/static_bitmap/codegen.py, widgets/static_line/codegen.py,
-	widgets/static_text/codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/toggle_button/codegen.py, widgets/widgets.txt, xml_parse.py:
-	changed some code-generation details
-	[20513500bb0f] <HEAD>
-
-2002-11-26  dinogen  <dinogen>
-
-	* widgets/grid/codegen.py, widgets/grid/grid.py:
-	added selection property
-	[ad10a6199a88] <HEAD>
-
-	* widgets/grid/codegen.py, widgets/grid/grid.py:
-	grid label bg color property
-	[398054d9400d] <HEAD>
-
-	* widgets/grid/codegen.py:
-	Fixed VERY STUPID error in lines color
-	[1b5baf421be4] <HEAD>
-
-	* widgets/grid/codegen.py:
-	Grid lines colors, but code generation isn't ok yet.
-	[42c01141a409] <HEAD>
-
-2002-11-22  dinogen  <dinogen>
-
-	* widgets/grid/grid.py:
-	grid lines color added
-	[f02bd6bbd124] <HEAD>
-
-	* widgets/grid/codegen.py, widgets/grid/grid.py:
-	added resizing properties
-	[188f93efd4ff] <HEAD>
-
-	* widgets/widgets.txt:
-	extra module added for wxGrid
-	[0c06c80f2ddb] <HEAD>
-
-	* widgets/grid/codegen.py:
-	extra module added for wxGrid
-	[95433a824571] <HEAD>
-
-2002-11-21  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py, main.py, widgets/frame/frame.py,
-	widgets/notebook/notebook.py:
-	some bugs fixed
-	[c7c3e6605a5e] <HEAD>
-
-2002-11-21  dinogen  <dinogen>
-
-	* icons/grid.xpm:
-	icon added for grid widget
-	[d51302977a18] <HEAD>
-
-	* widgets/grid/__init__.py, widgets/grid/codegen.py,
-	widgets/grid/grid.py:
-	The grid module added
-	[f7b49fe6745b] <HEAD>
-
-2002-11-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py, wxglade.py:
-	fixed bug on relative paths
-	[ad0ae988fb15] <HEAD>
-
-	* icons/gauge.xpm, widgets/gauge/__init__.py,
-	widgets/gauge/codegen.py, widgets/gauge/gauge.py,
-	widgets/widgets.txt:
-	wxGauge support
-	[a853f05fd549] <HEAD>
-
-	* TODO.txt, icons/slider.xpm, widgets/custom_widget/custom_widget.py,
-	widgets/slider/codegen.py:
-	fixed bugs
-	[b83509d58efe] <HEAD>
-
-2002-11-17  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, codegen/py_codegen.py:
-	added import_modules argument to add_widget_handler
-	[c26d83528b2d] <HEAD>
-
-2002-11-12  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, README.txt, about.py, application.py, clipboard.py,
-	codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, config.py, credits.txt,
-	edit_sizers/__init__.py, edit_sizers/edit_sizers.py,
-	edit_sizers/sizers_codegen.py, edit_windows.py, license.txt,
-	main.py, misc.py, tree.py, widget_properties.py,
-	widgets/ChoicesCodeHandler.py, widgets/ChoicesProperty.py,
-	widgets/MenuTree.py, widgets/bitmap_button/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/button/__init__.py,
-	widgets/button/button.py, widgets/button/codegen.py,
-	widgets/checkbox/__init__.py, widgets/checkbox/checkbox.py,
-	widgets/checkbox/codegen.py, widgets/choice/__init__.py,
-	widgets/choice/choice.py, widgets/choice/codegen.py,
-	widgets/combo_box/__init__.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/combo_box.py, widgets/custom_widget/__init__.py,
-	widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py, widgets/dialog/__init__.py,
-	widgets/dialog/codegen.py, widgets/dialog/dialog.py,
-	widgets/frame/__init__.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/list_box/__init__.py,
-	widgets/list_box/codegen.py, widgets/list_box/list_box.py,
-	widgets/notebook/__init__.py, widgets/notebook/codegen.py,
-	widgets/notebook/notebook.py, widgets/panel/__init__.py,
-	widgets/panel/codegen.py, widgets/panel/panel.py,
-	widgets/radio_box/__init__.py, widgets/radio_box/codegen.py,
-	widgets/radio_box/radio_box.py, widgets/radio_button/__init__.py,
-	widgets/radio_button/codegen.py,
-	widgets/radio_button/radio_button.py, widgets/slider/__init__.py,
-	widgets/slider/codegen.py, widgets/slider/slider.py,
-	widgets/spacer/__init__.py, widgets/spacer/codegen.py,
-	widgets/spacer/spacer.py, widgets/spin_ctrl/__init__.py,
-	widgets/spin_ctrl/codegen.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/__init__.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/__init__.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/__init__.py, widgets/static_line/codegen.py,
-	widgets/static_line/static_line.py, widgets/static_text/__init__.py,
-	widgets/static_text/codegen.py, widgets/static_text/static_text.py,
-	widgets/text_ctrl/__init__.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toggle_button/__init__.py,
-	widgets/toggle_button/codegen.py,
-	widgets/toggle_button/toggle_button.py, wxglade.py, xml_parse.py:
-	change of license (MIT) to avoid troubles
-	[0ccbbe1138f8] <HEAD>
-
-2002-11-09  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, config.py, main.py, misc.py:
-	support for wxFileHistory on wxPython >= 2.3.3
-	[e7d0b1de52e2] <HEAD>
-
-2002-11-03  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, edit_sizers/edit_sizers.py, edit_windows.py, misc.py,
-	tree.py:
-	keyboard shortcuts for popup menus almost working
-	[fff1868af94a] <HEAD>
-
-	* widgets/bitmap_button/bitmap_button.py, widgets/panel/panel.py,
-	widgets/static_bitmap/static_bitmap.py:
-	some bugs fixed
-	[e0418250602e] <HEAD>
-
-2002-10-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/panel/codegen.py:
-	fixed C++ code generation bug
-	[a223154d9357] <HEAD>
-
-	* widgets/notebook/notebook.py,
-	widgets/splitter_window/splitter_window.py:
-	added style property
-	[a582e3ccc906] <HEAD>
-
-	* CHANGES.txt, icons/custom.xpm, widgets/custom_widget/__init__.py,
-	widgets/custom_widget/codegen.py,
-	widgets/custom_widget/custom_widget.py, widgets/widgets.txt:
-	custom widgets support
-	[18232398140e] <HEAD>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py:
-	fixed bug regarding notebook sizers
-	[14ba95c282ff] <HEAD>
-
-	* xml_parse.py:
-	fixed bug regarding encoding in CodeWriter
-	[b296334dce17] <HEAD>
-
-	* edit_windows.py:
-	fixed bug in on_set_focus
-	[855db952d01c] <HEAD>
-
-2002-10-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* misc.py:
-	simplified check_wx_version
-	[3f0f7e1012b3] <HEAD>
-
-	* CHANGES.txt, widgets/notebook/codegen.py:
-	fixed xrc code generation bug (usenotebooksizer)
-	[906a31718925] <HEAD>
-
-2002-10-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/cpp_codegen.py:
-	fixed bug when the output file exists but it doesn't contain any
-	class
-	[663d6797e366] <HEAD>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py:
-	fixed bug when the output file exists but it doesn't contain any
-	class
-	[d2c18b20a48d] <HEAD>
-
-	* application.py, edit_windows.py:
-	fixed bug concerning renaming of toplevel widgets
-	[bd7106ed2b16] <HEAD>
-
-2002-10-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, application.py, common.py, edit_windows.py, tree.py,
-	widget_properties.py, xml_parse.py:
-	added encoding property to Application objects
-	[9b64c32cf56d] <HEAD>
-
-	* main.py:
-	some layout tweaks
-	[147390bbc777] <HEAD>
-
-	* widgets/dialog/dialog.py, widgets/panel/__init__.py,
-	widgets/panel/codegen.py, widgets/panel/panel.py:
-	new EditTopLevelPanel class, to create panels without a container
-	frame/dialog
-	[ade56e5c8159] <HEAD>
-
-2002-10-22  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* icons/gtk/prefs.xpm, icons/msw/prefs.xpm:
-	preferences icon
-	[d484b99890e9] <HEAD>
-
-	* CHANGES.txt, application.py, config.py, edit_sizers/edit_sizers.py,
-	edit_windows.py, main.py, misc.py:
-	changes to allow user preferences
-	[d9af5c3494bd] <HEAD>
-
-2002-10-20  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py, edit_windows.py, misc.py:
-	lazy initialization of popup menus
-	[71e75ad97aa1] <HEAD>
-
-	* CHANGES.txt, edit_sizers/edit_sizers.py, edit_windows.py, main.py,
-	misc.py:
-	added icons for menu items and keyboard shortcuts for popup menus
-	(not on GTK yet)
-	[ced465c39fba] <HEAD>
-
-	* icons/gtk/about.xpm, icons/gtk/copy.xpm, icons/gtk/cut.xpm,
-	icons/gtk/exit.xpm, icons/gtk/generate.xpm, icons/gtk/new.xpm,
-	icons/gtk/open.xpm, icons/gtk/paste.xpm, icons/gtk/remove.xpm,
-	icons/gtk/save.xpm, icons/gtk/save_as.xpm, icons/gtk/tutorial.xpm,
-	icons/msw/copy.xpm, icons/msw/cut.xpm, icons/msw/exit.xpm,
-	icons/msw/generate.xpm, icons/msw/new.xpm, icons/msw/open.xpm,
-	icons/msw/paste.xpm, icons/msw/remove.xpm, icons/msw/save.xpm,
-	icons/msw/save_as.xpm, icons/msw/tutorial.xpm:
-	icons for menu items
-	[f305c60e5ca1] <HEAD>
-
-	* widgets/panel/codegen.py, widgets/panel/panel.py:
-	added style property
-	[3ecc8d3e0085] <HEAD>
-
-2002-10-19  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt:
-	*** empty log message ***
-	[6f3ca80dba06] <HEAD>
-
-	* about.py, main.py:
-	some layout tweaks
-	[b77f0d3bee22] <HEAD>
-
-	* docs/tutorial.html:
-	updated contents to mention new layout features (change of sizer
-	type, change of position inside a sizer)
-	[208a00a79ed9] <HEAD>
-
-	* widgets/splitter_window/splitter_window.py:
-	fixed 'style' property bug
-	[c2293f8ecca9] <HEAD>
-
-	* widgets/panel/codegen.py, widgets/panel/panel.py:
-	added 'style' property
-	[e53334a7705a] <HEAD>
-
-	* widget_properties.py, widgets/static_text/static_text.py,
-	widgets/text_ctrl/text_ctrl.py:
-	added 'multiline' option to TextProperty
-	[08843d6b7e9a] <HEAD>
-
-	* widgets/dialog/dialog.py:
-	fixed win32 bug
-	[7135d3434f45] <HEAD>
-
-2002-10-14  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py, tree.py, widget_properties.py:
-	small fixes
-	[03f161a574bf] <HEAD>
-
-2002-10-13  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/splitter_window/codegen.py,
-	widgets/splitter_window/splitter_window.py:
-	fixed 2.3.3 compatibility
-	[3c64724e37a4] <HEAD>
-
-	* widgets/combo_box/combo_box.py:
-	fixed segfault (why?) on win32
-	[15352d997db4] <HEAD>
-
-	* application.py, main.py, misc.py, widget_properties.py:
-	added check_wx_version function
-	[2d2d5d4eb775] <HEAD>
-
-	* edit_sizers/edit_sizers.py:
-	fixed bug on change_sizer
-	[9a5a9274193c] <HEAD>
-
-2002-10-12  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers/edit_sizers.py:
-	fixed bug on SizerBase.change_item_pos
-	[6543aec87215] <HEAD>
-
-	* edit_sizers/edit_sizers.py:
-	change_item_pos: added Refresh() call on Win32
-	[e5b53bb8b3ae] <HEAD>
-
-	* CHANGES.txt, TODO.txt, edit_sizers/edit_sizers.py, edit_windows.py,
-	tree.py:
-	added 'pos' property to change the position of a widget inside its
-	sizer
-	[264928eea8f6] <HEAD>
-
-2002-10-10  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, TODO.txt, edit_sizers/edit_sizers.py, edit_windows.py,
-	main.py, tree.py, widget_properties.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/button/button.py,
-	widgets/button/codegen.py, widgets/dialog/dialog.py,
-	widgets/spacer/spacer.py:
-	- added possibility to dynamically change the type of a sizer
-	- some bugs fixed
-	[52178fc1d766] <HEAD>
-
-2002-10-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* docs/img/box_sizer_button.gif, docs/img/button_button.gif,
-	docs/img/frame_button.gif, docs/img/notebook_button.gif,
-	docs/img/spacer_button.gif, docs/img/text_ctrl_button.gif,
-	docs/tutorial.html:
-	first CVS version
-	[1b1452e7d003] <HEAD>
-
-	* application.py, codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	main.py, widget_properties.py, widgets/bitmap_button/codegen.py,
-	widgets/notebook/notebook.py, widgets/slider/slider.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_line/static_line.py:
-	various bugs fixed. See CHANGES.txt
-	[ff897886631f] <HEAD>
-
-	* about.py:
-	new wxGlade logo
-	[9e847777225c] <HEAD>
-
-	* CHANGES.txt:
-	*** empty log message ***
-	[685b472e4578] <HEAD>
-
-2002-09-07  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* about.py:
-	added wxGlade logo
-	[c28930b8e716] <HEAD>
-
-	* TODO.txt:
-	updated the TODO list
-	[460bfa635963] <HEAD>
-
-	* common.py, main.py, tree.py:
-	fixed a couple of minor win32 bugs, changed the style of tree_frame
-	and property_frame
-	[2e7af3234962] <HEAD>
-
-	* icons/wxglade_small.png:
-	wxGlade logo
-	[fddec67fe79b] <HEAD>
-
-2002-09-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* README.txt:
-	new license (Python 2.2)
-	[7ed3eb760542] <HEAD>
-
-	* edit_sizers.py, widgets/frame.py:
-	*** empty log message ***
-	[78debef7ba27] <HEAD>
-
-	* CHANGES.txt, TODO.txt, about.py, application.py, clipboard.py,
-	codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, credits.txt,
-	edit_sizers/__init__.py, edit_sizers/edit_sizers.py,
-	edit_sizers/sizers_codegen.py, edit_windows.py,
-	icons/application.xpm, license.txt, main.py, misc.py, tree.py,
-	widget_properties.py, widgets/ChoicesCodeHandler.py,
-	widgets/ChoicesProperty.py, widgets/MenuTree.py,
-	widgets/bitmap_button.py, widgets/bitmap_button/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/button.py,
-	widgets/button/__init__.py, widgets/button/button.py,
-	widgets/button/codegen.py, widgets/checkbox.py,
-	widgets/checkbox/__init__.py, widgets/checkbox/checkbox.py,
-	widgets/checkbox/codegen.py, widgets/choice.py,
-	widgets/choice/__init__.py, widgets/choice/choice.py,
-	widgets/choice/codegen.py, widgets/combo_box.py,
-	widgets/combo_box/__init__.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/combo_box.py, widgets/dialog.py,
-	widgets/dialog/__init__.py, widgets/dialog/codegen.py,
-	widgets/dialog/dialog.py, widgets/frame/__init__.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/list_box.py, widgets/list_box/__init__.py,
-	widgets/list_box/codegen.py, widgets/list_box/list_box.py,
-	widgets/notebook.py, widgets/notebook/__init__.py,
-	widgets/notebook/codegen.py, widgets/notebook/notebook.py,
-	widgets/panel.py, widgets/panel/__init__.py,
-	widgets/panel/codegen.py, widgets/panel/panel.py,
-	widgets/radio_box.py, widgets/radio_box/__init__.py,
-	widgets/radio_box/codegen.py, widgets/radio_box/radio_box.py,
-	widgets/radio_button.py, widgets/radio_button/__init__.py,
-	widgets/radio_button/codegen.py,
-	widgets/radio_button/radio_button.py, widgets/slider.py,
-	widgets/slider/__init__.py, widgets/slider/codegen.py,
-	widgets/slider/slider.py, widgets/spacer.py,
-	widgets/spacer/__init__.py, widgets/spacer/codegen.py,
-	widgets/spacer/spacer.py, widgets/spin_ctrl.py,
-	widgets/spin_ctrl/__init__.py, widgets/spin_ctrl/codegen.py,
-	widgets/spin_ctrl/spin_ctrl.py, widgets/splitter_window.py,
-	widgets/splitter_window/__init__.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap.py, widgets/static_bitmap/__init__.py,
-	widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/static_bitmap.py, widgets/static_line.py,
-	widgets/static_line/__init__.py, widgets/static_line/codegen.py,
-	widgets/static_line/static_line.py, widgets/static_text.py,
-	widgets/static_text/__init__.py, widgets/static_text/codegen.py,
-	widgets/static_text/static_text.py, widgets/text_ctrl.py,
-	widgets/text_ctrl/__init__.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toggle_button.py,
-	widgets/toggle_button/__init__.py, widgets/toggle_button/codegen.py,
-	widgets/toggle_button/toggle_button.py, wxglade.py, xml_parse.py:
-	merged version 0.1.3
-	[0509dcc738d1] <HEAD>
-
-	* CHANGES.txt, README.txt, about.py, application.py, clipboard.py,
-	codegen/cpp_codegen.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, common.py, edit_sizers/__init__.py,
-	edit_sizers/edit_sizers.py, edit_sizers/sizers_codegen.py,
-	edit_windows.py, main.py, misc.py, tree.py, widget_properties.py,
-	widgets/ChoicesCodeHandler.py, widgets/ChoicesProperty.py,
-	widgets/MenuTree.py, widgets/bitmap_button/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/button/__init__.py,
-	widgets/button/button.py, widgets/button/codegen.py,
-	widgets/checkbox/__init__.py, widgets/checkbox/checkbox.py,
-	widgets/checkbox/codegen.py, widgets/choice/__init__.py,
-	widgets/choice/choice.py, widgets/choice/codegen.py,
-	widgets/combo_box/__init__.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/combo_box.py, widgets/dialog/__init__.py,
-	widgets/dialog/codegen.py, widgets/dialog/dialog.py,
-	widgets/frame/__init__.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/list_box/__init__.py,
-	widgets/list_box/codegen.py, widgets/list_box/list_box.py,
-	widgets/notebook/__init__.py, widgets/notebook/codegen.py,
-	widgets/notebook/notebook.py, widgets/panel/__init__.py,
-	widgets/panel/codegen.py, widgets/panel/panel.py,
-	widgets/radio_box/__init__.py, widgets/radio_box/codegen.py,
-	widgets/radio_box/radio_box.py, widgets/radio_button/__init__.py,
-	widgets/radio_button/codegen.py,
-	widgets/radio_button/radio_button.py, widgets/slider/__init__.py,
-	widgets/slider/codegen.py, widgets/slider/slider.py,
-	widgets/spacer/__init__.py, widgets/spacer/codegen.py,
-	widgets/spacer/spacer.py, widgets/spin_ctrl/__init__.py,
-	widgets/spin_ctrl/codegen.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/__init__.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/__init__.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/__init__.py, widgets/static_line/codegen.py,
-	widgets/static_line/static_line.py, widgets/static_text/__init__.py,
-	widgets/static_text/codegen.py, widgets/static_text/static_text.py,
-	widgets/text_ctrl/__init__.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toggle_button/__init__.py,
-	widgets/toggle_button/codegen.py,
-	widgets/toggle_button/toggle_button.py, wxglade.py, xml_parse.py:
-	new license (Python 2.2)
-	[e262b8909abd] <v0-1-3devel>
-
-	* widgets/radio_box/codegen.py:
-	small change to the C++ code generator
-	[2251197c8ac2] <v0-1-3devel>
-
-	* README.txt, license.txt:
-	new license (Python 2.2)
-	[e713bf481c8a] <v0-1-3devel>
-
-2002-08-27  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* TODO.txt:
-	updated with TabOrder
-	[fc56a8dc5cbb] <v0-1-3devel>
-
-	* CHANGES.txt, edit_sizers/sizers_codegen.py,
-	widgets/dialog/dialog.py, widgets/frame/frame.py:
-	bugs fixed
-	[d018a4496f31] <v0-1-3devel>
-
-	* codegen/py_codegen.py:
-	fixed bug on code generation for container widgets
-	[21a53d6bce9e] <v0-1-3devel>
-
-	* codegen/cpp_codegen.py, widgets/bitmap_button/codegen.py,
-	widgets/button/codegen.py, widgets/checkbox/codegen.py,
-	widgets/choice/codegen.py, widgets/combo_box/codegen.py,
-	widgets/list_box/codegen.py, widgets/notebook/codegen.py,
-	widgets/panel/codegen.py, widgets/radio_box/codegen.py,
-	widgets/radio_button/codegen.py, widgets/slider/codegen.py,
-	widgets/spin_ctrl/codegen.py, widgets/splitter_window/codegen.py,
-	widgets/static_bitmap/codegen.py, widgets/static_line/codegen.py,
-	widgets/static_text/codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/toggle_button/codegen.py:
-	fixed bug on C++ id code generation
-	[60c1b5cee423] <v0-1-3devel>
-
-2002-08-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt:
-	changed code generation to initialize widgets in the right order, so
-	as to preserve the tab traversal order
-	[443cce7b5440] <v0-1-3devel>
-
-	* codegen/cpp_codegen.py, codegen/py_codegen.py,
-	widgets/bitmap_button/codegen.py, widgets/button/codegen.py,
-	widgets/checkbox/codegen.py, widgets/choice/codegen.py,
-	widgets/combo_box/codegen.py, widgets/frame/codegen.py,
-	widgets/list_box/codegen.py, widgets/notebook/codegen.py,
-	widgets/panel/codegen.py, widgets/radio_box/codegen.py,
-	widgets/radio_button/codegen.py, widgets/slider/codegen.py,
-	widgets/spin_ctrl/codegen.py, widgets/splitter_window/codegen.py,
-	widgets/static_bitmap/codegen.py, widgets/static_line/codegen.py,
-	widgets/static_text/codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/toggle_button/codegen.py, xml_parse.py:
-	changed code generation to initialize widgets in the right order, so
-	as to preserve the tab traversal order
-	[9ba34dc7ffda] <v0-1-3devel>
-
-2002-08-16  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* about.py, edit_sizers/edit_sizers.py, edit_sizers/sizers_codegen.py,
-	main.py, widgets/spacer/spacer.py:
-	some bugs fixed
-	[f611b84cc23d] <v0-1-3devel>
-
-	* credits.txt:
-	updated credits
-	[e1b3ddbaf718] <v0-1-3devel>
-
-	* common.py, edit_windows.py, wxglade.py:
-	some bugs fixed
-	[92cfd1eb1a51] <v0-1-3devel>
-
-	* codegen/cpp_codegen.py, edit_sizers/sizers_codegen.py,
-	widgets/bitmap_button/codegen.py, widgets/button/codegen.py,
-	widgets/checkbox/codegen.py, widgets/choice/codegen.py,
-	widgets/combo_box/codegen.py:
-	experimental C++ code generator
-	[53d169256542] <v0-1-3devel>
-
-2002-08-15  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* codegen/py_codegen.py, edit_windows.py, main.py, wxglade.py:
-	tooltips and dialog units support
-	[7608f2814e4b] <v0-1-3devel>
-
-	* CHANGES.txt:
-	experimental C++ code generator and other things
-	[f0dc5ed7cf4f] <v0-1-3devel>
-
-	* widgets/dialog/codegen.py, widgets/dialog/dialog.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/list_box/codegen.py, widgets/notebook/codegen.py,
-	widgets/panel/codegen.py, widgets/radio_box/codegen.py,
-	widgets/radio_button/codegen.py, widgets/slider/codegen.py,
-	widgets/spacer/codegen.py, widgets/spin_ctrl/codegen.py,
-	widgets/splitter_window/codegen.py,
-	widgets/static_bitmap/codegen.py, widgets/static_line/codegen.py,
-	widgets/static_text/codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/toggle_button/codegen.py:
-	experimental C++ code generator
-	[9f9255a419f7] <v0-1-3devel>
-
-2002-08-12  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, application.py, codegen/py_codegen.py,
-	codegen/xrc_codegen.py, edit_sizers/edit_sizers.py, edit_windows.py,
-	main.py, widget_properties.py, widgets/bitmap_button/codegen.py,
-	widgets/button/codegen.py, widgets/checkbox/codegen.py,
-	widgets/choice/codegen.py, widgets/combo_box/codegen.py,
-	widgets/frame/codegen.py, widgets/list_box/codegen.py,
-	widgets/notebook/codegen.py, widgets/panel/codegen.py,
-	widgets/radio_box/codegen.py, widgets/radio_button/codegen.py,
-	widgets/slider/codegen.py, widgets/spin_ctrl/codegen.py,
-	widgets/splitter_window/codegen.py,
-	widgets/static_bitmap/codegen.py, widgets/static_line/codegen.py,
-	widgets/static_text/codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/toggle_button/codegen.py, xml_parse.py:
-	support for dialog units and other stuff
-	[0070a3bd90b8] <v0-1-3devel>
-
-2002-08-10  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* icons/application.xpm:
-	new icon
-	[1ce463aac14a] <v0-1-3devel>
-
-	* CHANGES.txt, TODO.txt, codegen/py_codegen.py,
-	edit_sizers/edit_sizers.py, edit_sizers/sizers_codegen.py,
-	widgets/bitmap_button/codegen.py, widgets/button/codegen.py,
-	widgets/checkbox/codegen.py, widgets/choice/codegen.py,
-	widgets/combo_box/codegen.py, widgets/frame/codegen.py,
-	widgets/list_box/codegen.py, widgets/notebook/codegen.py,
-	widgets/panel/codegen.py, widgets/radio_box/codegen.py,
-	widgets/radio_button/codegen.py, widgets/slider/codegen.py,
-	widgets/spin_ctrl/codegen.py, widgets/splitter_window/codegen.py,
-	widgets/static_bitmap/codegen.py, widgets/static_line/codegen.py,
-	widgets/static_text/codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toggle_button/codegen.py:
-	better python code generation
-	[b53b8036bb2d] <v0-1-3devel>
-
-	* codegen/xrc_codegen.py:
-	bugfixes
-	[2ccaa40d4a20] <v0-1-3devel>
-
-	* main.py, xml_parse.py:
-	bugfixes
-	[6f1199b777d7] <v0-1-3devel>
-
-2002-08-06  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/text_ctrl/text_ctrl.py:
-	fixed bug regarding style on GTK
-	[bdfbf0371733] <v0-1-3devel>
-
-	* CHANGES.txt, codegen/xrc_codegen.py, widgets/ChoicesCodeHandler.py,
-	widgets/choice/codegen.py, widgets/combo_box/codegen.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/list_box/codegen.py, widgets/notebook/codegen.py,
-	widgets/radio_box/codegen.py, widgets/slider/codegen.py,
-	widgets/spin_ctrl/codegen.py, widgets/splitter_window/codegen.py:
-	experimental (but apparently working) XRC code generator
-	[7290812cf462] <v0-1-3devel>
-
-	* application.py, codegen/py_codegen.py, edit_sizers/edit_sizers.py,
-	license.txt, main.py, tree.py, widget_properties.py, wxglade.py,
-	xml_parse.py:
-	mainly bugfixes
-	[5f911c7c5c0a] <v0-1-3devel>
-
-2002-08-04  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_sizers.py:
-	bugfix in EditFlexGridSizer
-	[d4dc06d1a7a1] <HEAD>
-
-	* edit_sizers/edit_sizers.py:
-	MANY bugs fixed
-	[13934c86ab9a] <v0-1-3devel>
-
-	* edit_sizers.py:
-	MANY bugs fixed
-	[dd57706a9149] <HEAD>
-
-	* codegen/py_codegen.py:
-	made sizers local to the __do_layout method
-	[f7c5356b20ec] <v0-1-3devel>
-
-	* CHANGES.txt, README.txt, TODO.txt, about.py, application.py,
-	common.py, edit_sizers/edit_sizers.py,
-	edit_sizers/sizers_codegen.py, main.py, widget_properties.py,
-	widgets/MenuTree.py, widgets/bitmap_button/codegen.py,
-	widgets/button/codegen.py, widgets/checkbox/codegen.py,
-	widgets/frame/codegen.py, widgets/frame/frame.py,
-	widgets/notebook/codegen.py, widgets/radio_box/codegen.py,
-	widgets/radio_button/codegen.py, widgets/static_bitmap/codegen.py,
-	widgets/static_text/codegen.py, widgets/text_ctrl/codegen.py,
-	widgets/toggle_button/codegen.py, wxglade.py, xml_parse.py:
-	various bugs fixed
-	[ec7baa1d9432] <v0-1-3devel>
-
-2002-08-03  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* icons/source.jpg:
-	*** empty log message ***
-	[9db1b91aefc2] <HEAD>
-
-	* README, README.txt:
-	renamed README to README.txt
-	[6ed021f15963] <HEAD>
-
-	* icons/source.jpg:
-	removed
-	[2fa4adf4008d] <v0-1-3devel>
-
-	* credits.txt:
-	credits to various people
-	[6bb27698c7ab] <v0-1-3devel>
-
-	* README, README.txt:
-	renamed README to README.txt
-	[f90589306f39] <v0-1-3devel>
-
-	* edit_sizers.py:
-	removed from v0-1-3devel branch
-	[214c75a5f5be] <v0-1-3devel>
-
-	* widget_properties.py:
-	fixed just introduced wxPython 2.3.2.1 incompatibility
-	[04e6fb592448] <HEAD>
-
-	* application.py, widget_properties.py:
-	fixed just introduced wxPython 2.3.2.1 incompatibility
-	[6e4c61feb45c] <v0-1-3devel>
-
-	* widgets/bitmap_button.py, widgets/button.py, widgets/checkbox.py,
-	widgets/choice.py, widgets/combo_box.py, widgets/dialog.py,
-	widgets/frame.py, widgets/list_box.py, widgets/notebook.py,
-	widgets/panel.py, widgets/radio_box.py, widgets/radio_button.py,
-	widgets/slider.py, widgets/spacer.py, widgets/spin_ctrl.py,
-	widgets/splitter_window.py, widgets/static_bitmap.py,
-	widgets/static_line.py, widgets/static_text.py,
-	widgets/text_ctrl.py, widgets/toggle_button.py:
-	removed from v0-1-3devel branch
-	[34fbe53a1f75] <v0-1-3devel>
-
-	* codegen/py_codegen.py, widget_properties.py:
-	fixed wxPython 2.3.3 incompatibilities
-	[21d1a2d8be1b] <v0-1-3devel>
-
-	* CHANGES.txt, application.py, codegen/py_codegen.py, common.py,
-	edit_sizers/__init__.py, edit_sizers/edit_sizers.py,
-	edit_sizers/sizers_codegen.py, edit_windows.py, main.py, misc.py,
-	tree.py, widgets/ChoicesCodeHandler.py, widgets/ChoicesProperty.py,
-	widgets/MenuTree.py, widgets/bitmap_button/__init__.py,
-	widgets/bitmap_button/bitmap_button.py,
-	widgets/bitmap_button/codegen.py, widgets/button/__init__.py,
-	widgets/button/button.py, widgets/button/codegen.py,
-	widgets/checkbox/__init__.py, widgets/checkbox/checkbox.py,
-	widgets/checkbox/codegen.py, widgets/choice/__init__.py,
-	widgets/choice/choice.py, widgets/choice/codegen.py,
-	widgets/combo_box/__init__.py, widgets/combo_box/codegen.py,
-	widgets/combo_box/combo_box.py, widgets/dialog/__init__.py,
-	widgets/dialog/codegen.py, widgets/dialog/dialog.py,
-	widgets/frame/__init__.py, widgets/frame/codegen.py,
-	widgets/frame/frame.py, widgets/list_box/__init__.py,
-	widgets/list_box/codegen.py, widgets/list_box/list_box.py,
-	widgets/notebook/__init__.py, widgets/notebook/codegen.py,
-	widgets/notebook/notebook.py, widgets/panel/__init__.py,
-	widgets/panel/codegen.py, widgets/panel/panel.py,
-	widgets/radio_box/__init__.py, widgets/radio_box/codegen.py,
-	widgets/radio_box/radio_box.py, widgets/radio_button/__init__.py,
-	widgets/radio_button/codegen.py,
-	widgets/radio_button/radio_button.py, widgets/slider/__init__.py,
-	widgets/slider/codegen.py, widgets/slider/slider.py,
-	widgets/spacer/__init__.py, widgets/spacer/codegen.py,
-	widgets/spacer/spacer.py, widgets/spin_ctrl/__init__.py,
-	widgets/spin_ctrl/codegen.py, widgets/spin_ctrl/spin_ctrl.py,
-	widgets/splitter_window/__init__.py,
-	widgets/splitter_window/codegen.py,
-	widgets/splitter_window/splitter_window.py,
-	widgets/static_bitmap/__init__.py, widgets/static_bitmap/codegen.py,
-	widgets/static_bitmap/static_bitmap.py,
-	widgets/static_line/__init__.py, widgets/static_line/codegen.py,
-	widgets/static_line/static_line.py, widgets/static_text/__init__.py,
-	widgets/static_text/codegen.py, widgets/static_text/static_text.py,
-	widgets/text_ctrl/__init__.py, widgets/text_ctrl/codegen.py,
-	widgets/text_ctrl/text_ctrl.py, widgets/toggle_button/__init__.py,
-	widgets/toggle_button/codegen.py,
-	widgets/toggle_button/toggle_button.py, wxglade.py, xml_parse.py:
-	v0-1-3devel branch
-	[63afc819555c] <v0-1-3devel>
-
-	* CHANGES.txt, codegen/py_codegen.py, edit_sizers.py, edit_windows.py,
-	main.py, widget_properties.py, widgets/frame.py:
-	fixed wxPython 2.3.3 incompatibilities
-	[512c1bf2da07] <HEAD>
-
-2002-08-03  repo convert  <repo convert>
-
-	* creating branch v0-1-3devel from HEAD
-	[18974a6234ac] <v0-1-3devel>
-
-2002-08-02  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* widgets/frame.py:
-	experimental bugfix for menubar-related segfaults on GTK
-	[61a2dc22befa] <HEAD>
-
-2002-08-01  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* README:
-	first version on cvs
-	[95b4dbb1faf3] <HEAD>
-
-	* CHANGES.txt, clipboard.py, edit_sizers.py, edit_windows.py,
-	widget_properties.py, widgets/bitmap_button.py,
-	widgets/radio_box.py, widgets/splitter_window.py,
-	widgets/static_bitmap.py:
-	various bugs fixed
-	[b98ccd96d56b] <HEAD>
-
-	* clipboard.py:
-	fixed bug in the previous bugfix :(
-	[b274ccf1737d] <HEAD>
-
-	* CHANGES.txt, TODO.txt:
-	updated contents
-	[0c27f6ec47fe] <HEAD>
-
-	* widgets/dialog.py:
-	changed create_widget to use a default style for the dialog
-	[ab75b622c10d] <HEAD>
-
-	* xml_parse.py:
-	added code to rename copied widgets properly
-	[860b42530e1d] <HEAD>
-
-	* tree.py:
-	fixed small bug
-	[5c0f013c9169] <HEAD>
-
-	* clipboard.py:
-	"confinement" of the option:flag:border:xml_str string before
-	putting it inside the Clipboard
-	[cd6c11e252c2] <HEAD>
-
-	* CHANGES.txt:
-	changes updated
-	[11cf80c6af24] <HEAD>
-
-2002-08-01  marco_bari  <marco_bari>
-
-	* CHANGES.txt:
-	clipboard.py updated
-	[4847b52fb9f7] <HEAD>
-
-2002-07-31  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* TODO.txt:
-	updated status
-	[7c83326ce73b] <HEAD>
-
-	* edit_sizers.py, xml_parse.py:
-	cut & paste of non-toplevel sizers
-	[62075566f8fd] <HEAD>
-
-	* common.py, edit_sizers.py, edit_windows.py, misc.py,
-	widget_properties.py, widgets/bitmap_button.py, widgets/button.py,
-	widgets/checkbox.py, widgets/choice.py, widgets/combo_box.py,
-	widgets/dialog.py, widgets/frame.py, widgets/list_box.py,
-	widgets/notebook.py, widgets/panel.py, widgets/radio_box.py,
-	widgets/radio_button.py, widgets/slider.py, widgets/spin_ctrl.py,
-	widgets/splitter_window.py, widgets/static_bitmap.py,
-	widgets/static_text.py, widgets/text_ctrl.py,
-	widgets/toggle_button.py:
-	removed obsolete misc.Sizer
-	[c4436cadadf8] <HEAD>
-
-2002-07-30  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* CHANGES.txt, edit_sizers.py, widget_properties.py,
-	widgets/notebook.py, widgets/slider.py, widgets/splitter_window.py,
-	widgets/static_line.py, xml_parse.py:
-	xml_builder cleanup and some bugfixes
-	[1f6b867a8fc8] <HEAD>
-
-	* CHANGES.txt, TODO.txt, about.py, edit_sizers.py, edit_windows.py,
-	misc.py, tree.py, widgets/notebook.py, widgets/panel.py,
-	widgets/splitter_window.py:
-	minor bugfixes
-	[7be70f9fff82] <HEAD>
-
-2002-07-30  marco_bari  <marco_bari>
-
-	* clipboard.py:
-	Now wxGlade's clipboard uses wxTheClipboard.
-	[6ccc3ed8b762] <HEAD>
-
-2002-07-29  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* main.py, tree.py:
-	prevented auto-expansion of tree nodes during app loading
-	[183962c7b8cf] <HEAD>
-
-	* widget_properties.py:
-	fixed bug in _enabler
-	[b07afcdde743] <HEAD>
-
-2002-07-29  marco_bari  <marco_bari>
-
-	* edit_sizers.py:
-	Corrected create_widget bug with static boxes.
-	[97b240539f17] <HEAD>
-
-2002-07-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py, widgets/notebook.py, widgets/panel.py,
-	widgets/splitter_window.py:
-	some bug fixes
-	[71d61c8e1dd5] <HEAD>
-
-	* common.py, edit_windows.py, main.py, tree.py,
-	widgets/bitmap_button.py, widgets/button.py, widgets/checkbox.py,
-	widgets/choice.py, widgets/combo_box.py, widgets/dialog.py,
-	widgets/frame.py, widgets/list_box.py, widgets/notebook.py,
-	widgets/panel.py, widgets/radio_box.py, widgets/radio_button.py,
-	widgets/slider.py, widgets/spacer.py, widgets/spin_ctrl.py,
-	widgets/splitter_window.py, widgets/static_bitmap.py,
-	widgets/static_line.py, widgets/static_text.py,
-	widgets/text_ctrl.py, widgets/toggle_button.py:
-	"create_widget" migration almost working
-	[8c95c975b96b] <HEAD>
-
-	* about.py:
-	updated credits
-	[505ec37e1cf1] <HEAD>
-
-2002-07-28  marco_bari  <marco_bari>
-
-	* wxglade.py:
-	Added built-in function bool.
-	[aca8b4bd1c2c] <HEAD>
-
-	* widgets/bitmap_button.py, widgets/button.py, widgets/checkbox.py,
-	widgets/choice.py, widgets/combo_box.py, widgets/dialog.py,
-	widgets/frame.py, widgets/list_box.py, widgets/notebook.py,
-	widgets/panel.py, widgets/slider.py, widgets/spacer.py,
-	widgets/spin_ctrl.py, widgets/static_bitmap.py,
-	widgets/static_line.py, widgets/static_text.py,
-	widgets/text_ctrl.py, widgets/toggle_button.py:
-	Corrected self.parent bug in create_widget.
-	[b85ecfdd4ba0] <HEAD>
-
-2002-07-28  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* TODO.txt, edit_sizers.py, edit_windows.py, tree.py,
-	widget_properties.py:
-	nearer to the end of "create_widget" migration
-	[8e178af19280] <HEAD>
-
-2002-07-27  marco_bari  <marco_bari>
-
-	* widgets/bitmap_button.py, widgets/button.py, widgets/checkbox.py,
-	widgets/choice.py, widgets/combo_box.py, widgets/dialog.py,
-	widgets/frame.py, widgets/list_box.py, widgets/notebook.py,
-	widgets/panel.py, widgets/radio_box.py, widgets/radio_button.py,
-	widgets/slider.py, widgets/spacer.py, widgets/spin_ctrl.py,
-	widgets/static_bitmap.py, widgets/static_line.py,
-	widgets/static_text.py, widgets/text_ctrl.py,
-	widgets/toggle_button.py:
-	Added (partial) support to new widget interface.
-	[85875de3273e] <HEAD>
-
-2002-07-26  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py, edit_sizers.py, edit_windows.py, misc.py, tree.py,
-	widgets/button.py, widgets/frame.py, xml_parse.py:
-	something working again
-	[bd1bd2027fd4] <HEAD>
-
-2002-07-25  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* common.py, edit_sizers.py, edit_windows.py, main.py, tree.py,
-	xml_parse.py:
-	show_widget support and some fixes
-	[0e6e2525efca] <HEAD>
-
-2002-07-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py:
-	Fix in TopLevelBase.set_sizer
-	[ecc66c7c1f76] <HEAD>
-
-	* edit_sizers.py:
-	create_widget initial support
-	[9bf33e37d745] <HEAD>
-
-2002-07-24  marco_bari  <marco_bari>
-
-	* widgets/checkbox.py:
-	Added support for "create_widget"
-	[29408ed43330] <HEAD>
-
-	* widgets/bitmap_button.py:
-	Added support for "create_widget"
-	[19c6aa22690f] <HEAD>
-
-	* widgets/button.py:
-	*** empty log message ***
-	[db3c0d3388b6] <HEAD>
-
-	* widgets/button.py:
-	Support for 'create_widget'
-	[6a4146ce8130] <HEAD>
-
-2002-07-24  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* edit_windows.py:
-	added self.widget, show_widget, create_widget,
-	finish_widget_creation
-	[6a84844707f3] <HEAD>
-
-2002-07-22  Alberto Griggio  <agriggio@users.sourceforge.net>
-
-	* TODO.txt:
-	fixed some typos
-	[6010f5ba83eb] <HEAD>
-
-	* wxglade.py:
-	Merge from vendor branch agriggio: First version on CVS
-	[d9ca64534402] <HEAD>
-
-	* .cvsignore, CHANGES.txt, TODO.txt, about.py, clipboard.py,
-	codegen/py_codegen.py, common.py, docs/tech_notes.txt,
-	edit_sizers.py, edit_windows.py, icons/.cvsignore,
-	icons/application.xpm, icons/bitmap_button.xpm, icons/button.xpm,
-	icons/checkbox.xpm, icons/choice.xpm, icons/combo_box.xpm,
-	icons/dialog.xpm, icons/frame.xpm, icons/grid_sizer.xpm,
-	icons/icon.xpm, icons/list_box.xpm, icons/menubar.xpm,
-	icons/notebook.xpm, icons/panel.xpm, icons/radio_box.xpm,
-	icons/radio_button.xpm, icons/sizer.xpm, icons/slider.xpm,
-	icons/source.jpg, icons/spacer.xpm, icons/spin_ctrl.xpm,
-	icons/splitter_window.xpm, icons/static_bitmap.xpm,
-	icons/static_line.xpm, icons/static_text.xpm, icons/statusbar.xpm,
-	icons/text_ctrl.xpm, icons/toggle_button.xpm, license.txt, main.py,
-	misc.py, tree.py, widget_properties.py, widgets/ChoicesProperty.py,
-	widgets/bitmap_button.py, widgets/button.py, widgets/checkbox.py,
-	widgets/choice.py, widgets/combo_box.py, widgets/dialog.py,
-	widgets/frame.py, widgets/list_box.py, widgets/notebook.py,
-	widgets/panel.py, widgets/radio_box.py, widgets/radio_button.py,
-	widgets/slider.py, widgets/spacer.py, widgets/spin_ctrl.py,
-	widgets/splitter_window.py, widgets/static_bitmap.py,
-	widgets/static_line.py, widgets/static_text.py,
-	widgets/text_ctrl.py, widgets/toggle_button.py, widgets/widgets.txt,
-	wxglade.py, xml_parse.py:
-	First version on CVS
-	[73127b08b329] <agriggio>
-
-2002-07-22  repo convert  <repo convert>
-
-	* creating vendor branch agriggio
-	[ea6c66367e3e] <agriggio>
-
diff -Nru wxglade-0.9.6/clipboard.py wxglade-1.0.1/clipboard.py
--- wxglade-0.9.6/clipboard.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/clipboard.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -25,6 +25,10 @@
 sizer_data_format  = DataFormat("wxglade.sizer")   # a serialized sizer
 window_data_format = DataFormat("wxglade.window")  # a toplevel window
 
+menubar_data_format = DataFormat("wxglade.menubar")  # a serialized menubar
+toolbar_data_format = DataFormat("wxglade.toolbar")  # a serialized toolbar
+statusbar_data_format = DataFormat("wxglade.statusbar")  # a serialized statusbar
+
 
 _current_drag_source = None  # reference to drag start; used when dragging within application
 
@@ -38,10 +42,12 @@
     do = get_data_object(widget)
     set_drag_source(widget)
 
-    if isinstance(widget, edit_sizers.Sizer):
+    if widget.IS_SIZER:
         msg = "Move sizer to empty or populated slot to insert, to a sizer to append; hold Ctrl to copy"
-    elif widget._is_toplevel:
+    elif widget.IS_TOPLEVEL:
         msg = "Move window to application object; hold Ctrl to copy"
+    elif widget.WX_CLASS in ("wxToolBar", "wxMenuBar", "wxStatusBar"):
+        msg = "Move tool, menu or status bar to application object or frame; hold Ctrl to copy"
     else:
         msg = "Move control to empty or populated slot to insert, to a sizer to append; hold Ctrl to copy"
     common.main.user_message( msg )
@@ -54,6 +60,8 @@
 
 class DropTarget(wx.DropTarget):
     # widget drag & drop support; for tree and also for the design window
+    BITMAP_FILE_EXTENSIONS = ["BMP", "ICO", "CUR", "XBM", "XPM", "TIFF", "GIF", "PNG", "JPEG", "JPG",
+                              "PNM", "PCX", "PICT", "ICON", "ANI", "IFF", "TGA"]
     def __init__(self, window, toplevel=False):
         wx.DropTarget.__init__(self)
         self.window = window  # window should have methods: check_drop_compatibility, drop
@@ -65,13 +73,18 @@
     def _create_data_objects(self, toplevel=False):
         data_objects = {}
         data_object = wx.DataObjectComposite()
-        formats = [widget_data_format, sizer_data_format]
+        formats = [widget_data_format, sizer_data_format,
+                   menubar_data_format, toolbar_data_format, statusbar_data_format]
         if toplevel: formats.append(window_data_format)
         for fmt in formats:
             do = wx.CustomDataObject(fmt)
             data_objects[fmt.GetId()] = do
             data_object.Add(do)
 
+        # add a FileDataObject to allow dropping bitmaps onto slots
+        data_objects["file.bitmap"] = self.file_data_object = wx.FileDataObject()
+        data_object.Add(self.file_data_object)
+
         self.data_objects = data_objects
         self.data_object  = data_object
 
@@ -79,28 +92,44 @@
         if self.fmt is None:
             # unfortunately, there seems to be no way to identify the data format without actually receiving the data
             self.GetData()
-            self.fmt = self.data_object.GetReceivedFormat().GetId()
+            fmt = self.data_object.GetReceivedFormat()
+            
+            if fmt.GetType()==wx.DF_FILENAME:
+                # file being dragged
+                filenames = self.file_data_object.Filenames
+                if filenames:
+                    ext = os.path.splitext(filenames[0])[1].upper().lstrip(os.extsep)
+                    if ext in self.BITMAP_FILE_EXTENSIONS:
+                        self.fmt = "file.bitmap"
+            else:
+                self.fmt = fmt.GetId()
         return self.fmt
 
     def _check_compatibility(self, x,y):
         # check whether the dragged item is compatible to the widget at position (x,y)
-        widget = self.window.find_widget_by_pos(x,y)
+        widget = self.window.find_editor_by_pos(x,y)
         if widget is None:
             return (False, "No widget found")
 
-        if not widget.is_sizer and not widget._is_toplevel and getattr(widget,"sizer",None):  # for a toplevel window, sizer is the child
+        if _current_drag_source is None:
+            # drag from outside
+            fmt = self._get_received_format()
+            if not fmt: return (False, "Incompatible file type")
+            fmt = fmt.split(".")[-1]
+            if fmt == "bitmap":
+                return widget.check_compatibility(None, fmt)
+
+        if not widget.IS_SIZER and not widget.IS_TOPLEVEL and getattr(widget,"sizer",None):  # for a toplevel window, sizer is the child
             if widget.sizer._IS_GRIDBAG and not isinstance(widget, edit_sizers.SizerSlot):
                 # for GridBagSizer we have cells, so we don't shift items
                 return (False, "Can only paste into empty slots")
 
         if _current_drag_source is not None:
             # drag within application: avoid dragging of an item on itself or it's child
-            if widget.node is _current_drag_source.node:            return (False, "Can't paste item on itself")
-            if widget.node.has_ancestor(_current_drag_source.node): return (False, "Can't paste item into itself")
+            if widget is _current_drag_source:            return (False, "Can't paste item on itself")
+            if widget.has_ancestor(_current_drag_source): return (False, "Can't paste item into itself")
             return widget.check_compatibility(_current_drag_source)
 
-        # drag from outside
-        fmt = self._get_received_format().split(".")[-1]
         return widget.check_compatibility(None, fmt)
 
     def OnDragOver(self, x,y, default):
@@ -108,19 +137,26 @@
         # check only if position changed
         if not self._last_check or x!=self._last_check[0] or y!=self._last_check[1]:
             self._last_check = (x,y, self._check_compatibility(x, y)[0] )
-        return self._last_check[2] and default or wx.DragNone
+        ret = self._last_check[2] and default or wx.DragNone
+        self._last_on_drag_over = ret
+        return ret
 
     def OnData(self, x,y,default):
         compatible, message = self._check_compatibility(x,y)
         if not compatible: return wx.DragCancel
 
-        dst_widget = self.window.find_widget_by_pos(x,y)
+        # workaround for wxPython 4.1
+        if default == wx.DragNone and hasattr(self, "_last_on_drag_over"):
+            default = self._last_on_drag_over
+
+        copy = (default==wx.DragCopy)
+
+        src_widget = None
+        dst_widget = self.window.find_editor_by_pos(x,y)
 
         if _current_drag_source:
             src_widget = _current_drag_source  # was set in begin_drag
-            src_node = src_widget.node
 
-            copy = (default==wx.DragCopy)
             if not copy and _current_drag_source is misc.focused_widget:
                 if hasattr(_current_drag_source, "parent"):
                     misc.set_focused_widget(_current_drag_source.parent)
@@ -134,20 +170,47 @@
             dst_widget = dst_widget.children[-1] # the slot
         elif compatible=="Slot":
             # insert a slot or fill empty slot
-            pos = dst_widget.pos
-            dst_widget.sizer._insert_slot(pos)
-            dst_widget = dst_widget.sizer.children[pos] # the slot
+            index = dst_widget.index
+            dst_widget.sizer._insert_slot(index)
+            dst_widget = dst_widget.sizer.children[index] # the slot
+        elif compatible=="Reorder":
+            # a toplevel dragged onto another toplevel
+            # internal drag: just re-order; external drag: paste before
+            src_index = common.root.children.index(src_widget)
+            dst_index = common.root.children.index(dst_widget)
+            common.root.children.insert(dst_index, src_widget)
+            if src_index>dst_index:
+                del common.root.children[src_index+1]
+            else:
+                del common.root.children[src_index]
+            common.app_tree.SortChildren(common.root.item)  # this does sort one level only
+            return default
+
+        fmt = self._get_received_format()
+        self.fmt = None
+        # non-wxglade file dropped #####################################################################################
+        if fmt=="file.bitmap":
+            bitmap = self.file_data_object.GetFilenames()[0]
+            if not os.path.isfile(bitmap): return wx.DragCancel
+            if dst_widget.IS_SLOT:
+                # fill slot with a StaticBitmap 
+                import widgets.static_bitmap.static_bitmap
+                new_widget = widgets.static_bitmap.static_bitmap.builder(dst_widget.parent, dst_widget.index, bitmap)
+                misc.rebuild_tree(new_widget)
+                return default
+            # set attribute value
+            dst_widget.set_attribute(fmt, bitmap)
+            return default
 
+        # use cut and paste functionality from clipboard to do the actual work #########################################
         if not hasattr(dst_widget, "clipboard_paste"):
             return wx.DragCancel
 
-        # use cut and paste functionality from clipboard to do the actual work #########################################
-        fmt = self._get_received_format()
         data = self.data_objects[fmt].GetData()  # the data as string
         self.fmt = None
         if wx.Platform=="__WXMAC__":
-            # delay action, as otherwise there will be a segmentation fault; 50ms seems to be enough
-            wx.CallLater(50, self._OnData, _current_drag_source, src_widget, dst_widget, data, copy)
+            # delay action, as otherwise there will be a segmentation fault; 50ms were too short sometimes
+            wx.CallLater(100, self._OnData, _current_drag_source, src_widget, dst_widget, data, copy)
         else:
             wx.CallAfter(self._OnData, _current_drag_source, src_widget, dst_widget, data, copy)
 
@@ -161,8 +224,6 @@
         else:
             dst_widget.clipboard_paste(data)
 
-        common.app_tree.expand(dst_widget.node)
-
     def OnLeave(self):
         self.fmt = None
 
@@ -170,9 +231,15 @@
 def get_data_object(widget):
     data = dump_widget(widget)
     # make a data object
-    if isinstance(widget, edit_sizers.Sizer):
+    if widget.IS_SIZER:
         do = wx.CustomDataObject(sizer_data_format)
-    elif getattr(widget, "_is_toplevel", False):
+    elif widget.WX_CLASS=="wxMenuBar":
+        do = wx.CustomDataObject(menubar_data_format)
+    elif widget.WX_CLASS=="wxToolBar":
+        do = wx.CustomDataObject(toolbar_data_format)
+    elif widget.WX_CLASS=="wxStatusBar":
+        do = wx.CustomDataObject(statusbar_data_format)
+    elif widget.IS_TOPLEVEL:
         do = wx.CustomDataObject(window_data_format)
     else:
         do = wx.CustomDataObject(widget_data_format)
@@ -186,7 +253,7 @@
 def dump_widget(widget):
     "build the XML string and pickle it together with the layout properties"
     xml_unicode = []
-    widget.node.write(xml_unicode, 0)
+    widget.write(xml_unicode, 0)
     flag = option = span = border = None
     flag = widget.properties.get("flag")
     if flag is not None: flag = flag.get_string_value()
@@ -244,7 +311,6 @@
         return False
 
 
-#def paste(parent, sizer, pos, clipboard_data=None):
 def paste(widget):
     """Copies a widget (and all its children) from the clipboard to the given
     destination (parent, sizer and position inside the sizer). Returns True on success."""
@@ -255,7 +321,8 @@
 
     try:
         data_object = None
-        for fmt in [widget_data_format,sizer_data_format,window_data_format]:
+        for fmt in [widget_data_format, sizer_data_format, window_data_format,
+                    menubar_data_format, toolbar_data_format, statusbar_data_format]:
             if wx.TheClipboard.IsSupported(fmt):
                 data_object = wx.CustomDataObject(fmt)
                 break
@@ -278,7 +345,7 @@
         misc.error_message("Paste failed")
 
 
-def _paste(parent, sizer, pos, clipboard_data):
+def _paste(parent, index, clipboard_data):
     "parse XML and insert widget"
     option, span, flag, border, xml_unicode = clipboard2widget( clipboard_data )
     if not xml_unicode: return False
@@ -287,10 +354,13 @@
         wx.BeginBusyCursor()
         # widget representation is still unicode, but parser need UTF8
         xml_utf8 = xml_unicode.encode('utf8')
-        parser = xml_parse.ClipboardXmlWidgetBuilder(parent, sizer, pos, option, span, flag, border)
+        parser = xml_parse.ClipboardXmlWidgetBuilder(parent, index, option, span, flag, border)
         with parent and parent.frozen() or misc.dummy_contextmanager():
             parser.parse_string(xml_utf8)
-        common.app_tree.saved = False
+            if parent and hasattr(parent, "on_child_pasted"):
+                parent.on_child_pasted()  # trigger e.g. re-sizing of the children
+        freeze = parser._object_counter>80  # for more objects, we freeze the Tree during re-build
+        misc.rebuild_tree( parser.top_obj, freeze=freeze )
         return True  # Widget hierarchy pasted.
     except xml_parse.XmlParsingError:
         if config.debugging: raise
diff -Nru wxglade-0.9.6/codegen/cpp_codegen.py wxglade-1.0.1/codegen/cpp_codegen.py
--- wxglade-0.9.6/codegen/cpp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/codegen/cpp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,29 +1,18 @@
 """\
 C++ code generator
 
-How the code is generated: every time the end of an object is reached during
-the parsing of the xml tree, either the function 'add_object' or the function
-'add_class' is called: the latter when the object is a toplevel one, the former
-when it is not. In the last case, 'add_object' calls the appropriate ``writer''
-function for the specific object, found in the 'obj_builders' dict. Such
-function accepts one argument, the CodeObject representing the object for
-which the code has to be written, and returns 3 lists of strings, representing
-the lines to add to the '__init__', '__set_properties' and '__do_layout'
-methods of the parent object.
-
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2012-2016 Carsten Grohmann
-@copyright: 2017-2018 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 
-import os.path, re
+import os.path, re, logging
 
-from codegen import BaseLangCodeWriter, BaseSourceFileContent, BaseWidgetHandler, _replace_tag
+from codegen import BaseLangCodeWriter, BaseSourceFileContent, _replace_tag
 from codegen import ClassLines as BaseClassLines
-import config, compat, misc
-import wcodegen
+import config, wcodegen
 
 
 class SourceFileContent(BaseSourceFileContent):
@@ -133,6 +122,7 @@
         inside_comment = False
         tmp_in = self._load_file(filename)
         out_lines = []
+        check_old_methods = []  # list of indices with set_properties or do_layout
         for line in tmp_in:
             comment_index = line.find('/*')
             if not inside_comment and comment_index != -1 and comment_index > line.find('//'):
@@ -152,7 +142,7 @@
                     self.new_classes_inserted = True
                 self.class_name = result.group(1)
                 self.class_name = self.format_classname(self.class_name)
-                self.classes[self.class_name] = 1  # add the found class to the list of classes of this module
+                self.classes.add( self.class_name )  # add the found class to the list of classes of this module
                 out_lines.append(line)
             elif not inside_block:
                 result = self.rec_block_start.match(line)
@@ -167,6 +157,10 @@
                         which_class = self.format_classname(which_class)
                     self.spaces[which_class] = spaces
                     inside_block = True
+                    if which_block in ("do_layout","set_properties"):
+                        # probably to be removed
+                        check_old_methods.append( len(out_lines) )
+
                     out_lines.append( '<%swxGlade replace %s %s>' %
                                       (self.nonce, result.group('classname'), result.group('block') ) )
                 else:
@@ -179,7 +173,7 @@
                             prev_was_handler = True
                             which_handler = result.group('handler')
                             which_class = self.class_name
-                            self.event_handlers.setdefault(which_class, {})[which_handler] = 1
+                            self.event_handlers.setdefault( which_class, set() ).add( which_handler )
                         else:
                             if prev_was_handler:
                                 # add extra event handlers here...
@@ -214,6 +208,13 @@
             # if we are here, the previous ``version'' of the file did not contain any class, so we must add the
             # new_classes tag at the end of the file
             out_lines.append('<%swxGlade insert new_classes>' % self.nonce)
+
+        # when moving from 0.9 to 1.0: remove empty methods "do_layout" and "set_properties"
+        while check_old_methods:
+            i = check_old_methods.pop(-1)
+            if out_lines[i+1].strip()=='}':  # just end of block -> remove incl. trailing empty lines
+                self._remove_method(out_lines, i-2, i+1)
+
         # set the ``persistent'' content of the file
         if is_header:
             self.header_content = out_lines
@@ -227,22 +228,6 @@
 
 
 
-class WidgetHandler(BaseWidgetHandler):
-    "Interface the various code generators for the widgets must implement"
-
-    constructor    = []  # 'signature' of the widget's constructor
-    import_modules = []  # If not None, list of extra header file, in the form <header.h> or "header.h"
-
-    def __init__(self):
-        BaseWidgetHandler.__init__(self)
-        self.constructor = []
-
-    def get_ids_code(self, obj):
-        """Handler for the code of the ids enum of toplevel objects.
-        Returns a list of strings containing the code to generate.
-        Usually the default implementation is ok (i.e. there are no extra lines to add)"""
-        return []
-
 class ClassLines(BaseClassLines):
     """Stores the lines of C++ code for a custom class"""
     def __init__(self):
@@ -251,7 +236,7 @@
         self.sub_objs = [] # List of 2-tuples (type, name) of the sub-objects; attributes of the toplevel object
         self.extra_code_h   = [] # Extra header code to output
         self.extra_code_cpp = [] # Extra source code to output
-        self.dependencies = []     # List not dictionary
+        self.dependencies = set()
 
 
 class CPPCodeWriter(BaseLangCodeWriter, wcodegen.CppMixin):
@@ -262,7 +247,7 @@
     last_generated_id: Last generated Id number (wxNewId() is not used yet)
     tmpl_init_gettext: Template for inclusion of i18n headers and defining APP_CATALOG constant or None
 
-    @see: L{BaseLangCodeWriter}"""
+    see: BaseLangCodeWriter"""
     ClassLines = ClassLines
     _code_statements = {
         'backgroundcolour': "%(objname)sSetBackgroundColour(%(value)s);\n",
@@ -295,27 +280,13 @@
 
     shebang = '// -*- C++ -*-\n//\n'
     tmpl_cfunc_end = '}\n\n'
-    tmpl_name_do_layout = 'do_layout'
-    tmpl_name_set_properties = 'set_properties'
+
     tmpl_sizeritem = '%s->Add(%s, %s, %s, %s);\n'
+    tmpl_sizeritem_button = '%s->AddButton(%s)\n'
     tmpl_gridbagsizeritem = '%s->Add(%s, wxGBPosition%s, wxGBSpan%s, %s, %s);\n'
     tmpl_gridbagsizerspacer = '%s->Add(%s, %s, wxGBPosition%s, wxGBSpan%s, %s, %s);\n'
     tmpl_spacersize = '%s, %s'
 
-    tmpl_ctor_call_layout = '\n' \
-                            '%(tab)sset_properties();\n' \
-                            '%(tab)sdo_layout();\n'
-
-    tmpl_func_do_layout = '\n' \
-                          'void %(klass)s::do_layout()\n{\n' \
-                          '%(content)s' \
-                          '}\n\n'
-
-    tmpl_func_set_properties = '\n' \
-                          'void %(klass)s::set_properties()\n{\n' \
-                          '%(content)s' \
-                          '}\n\n'
-
     tmpl_appfile = """\
 %(overwrite)s\
 %(header_lines)s\
@@ -409,12 +380,20 @@
         else:
             name = os.path.splitext(out_path)[0]
             self.output_name = name
-            if not self._overwrite and self._file_exists(name + "." + self.header_extension):
-                # the file exists, we must keep all the lines not inside a wxGlade block.
-                # NOTE: this may cause troubles if out_path is not a valid source file, so be careful!
+
+            if not self._overwrite:
+                header_exists = self._file_exists(name + "." + self.header_extension)
+                source_exists = self._file_exists(name + "." + self.source_extension)
+                if (header_exists and not source_exists) or (source_exists and not header_exists):
+                    ret = _("To keep existing user code, both header and source file must exist.\n"
+                            "(files '%s...'")
+                    return ret%name
+
+            if not self._overwrite and header_exists:
+                # keep all the lines not inside a wxGlade block.
                 self.previous_source = SourceFileContent(name, self)
             else:
-                # if the file doesn't exist, create it and write the ``intro''
+                # if the file doesn't exist, create it and write the intro
                 self.previous_source = None
                 self.output_header = []
                 self.output_file   = []
@@ -470,12 +449,12 @@
                 tag = match.groups()
                 if tag[2] == 'dependencies':
                     #self._logger.debug('writing dependencies')
-                    deps = []
+                    deps = set()
                     for code in self.classes.values():
-                        deps.extend(code.dependencies)
+                        deps.update(code.dependencies)
                     lines = self._format_dependencies( deps )
                 elif tag[2] == 'methods':
-                    lines = '%svoid set_properties();\n%svoid do_layout();\n' % (self.tabs(1), self.tabs(1))
+                    lines = ''
                 else:
                     lines = '// content of this block (%s) not found: did you rename this class?\n' % tag[2]
                 self.previous_source.replace_header(tag[0], lines)
@@ -502,9 +481,9 @@
             self.output_header.append('\n#endif // %s\n' % oh)
 
             # write the list of include files
-            deps = []
+            deps = set()
             for code in self.classes.values():
-                deps.extend(code.dependencies)
+                deps.update(code.dependencies)
             code = self._format_dependencies( deps )
             self.output_header_replace( '<%swxGlade replace  dependencies>' % self.nonce, code )
 
@@ -525,52 +504,47 @@
         BaseLangCodeWriter.add_app(self, app_attrs, top_win)
 
     def add_class(self, code_obj):
-        # shortcuts
-        base = code_obj.base
-        klass = code_obj.klass
-        fmt_klass = self.cn_class(klass)
+        assert code_obj not in self.classes
+        try:
+            builder = self.obj_builders[code_obj.WX_CLASS]
+        except KeyError:
+            logging.error('%s', code_obj)
+            # this is an error, let the exception be raised; the details are logged by the global exception handler
+            raise
+        ret = self.classes[code_obj] = self.ClassLines()  # ClassLines will collect the code lines incl. children
+        return ret
 
-        if klass in self.classes and self.classes[klass].done:
-            return  # the code has already been generated
+    def finalize_class(self, code_obj):
+        # write the collected code for the class and its children
+        base = code_obj.WX_CLASS
+        klass = self.classes[code_obj]
+        classname = code_obj.klass
+        fmt_klass = self.cn_class(classname)
 
         if self.multiple_files:
             # let's see if the file to generate exists, and in this case create a SourceFileContent instance
-            filename = os.path.join(self.out_dir, klass.replace('::', '_') + "." + self.header_extension)
+            filename = os.path.join(self.out_dir, classname.replace('::', '_') + "." + self.header_extension)
             if self._overwrite or not self._file_exists(filename):
                 prev_src = None
             else:
-                prev_src = SourceFileContent( os.path.join(self.out_dir, klass), self )
+                prev_src = SourceFileContent( os.path.join(self.out_dir, classname), self )
         else:
             # in this case, previous_source is the SourceFileContent instance
             # that keeps info about the single file to generate
             prev_src = self.previous_source
 
-        try:
-            builder = self.obj_builders[base]
-            mycn = getattr(builder, 'cn', self.cn)
-            mycn_f = getattr(builder, 'cn_f', self.cn_f)
-        except KeyError:
-            self._logger.error('%s', code_obj)
-            # this is an error, let the exception be raised; the details are logged by the global exception handler
-            raise
-
-        if prev_src and klass in prev_src.classes:
+        if prev_src and classname in prev_src.classes:
             is_new = False
         else:
             # this class wasn't in the previous version of the source (if any)
             is_new = True
 
-        header_buffer = []
-        source_buffer = []
-        hwrite = header_buffer.append
-        swrite = source_buffer.append
-
-        if not klass in self.classes:
-            # if the class body was empty, create an empty ClassLines
-            self.classes[klass] = self.ClassLines()
+        builder = self.obj_builders[base]
+        mycn = getattr(builder, 'cn', self.cn)
+        mycn_f = getattr(builder, 'cn_f', self.cn_f)
 
         # collect all event handlers
-        event_handlers = self.classes[klass].event_handlers
+        event_handlers = klass.event_handlers
         for win_id, evt, handler, evt_type in builder.get_event_handlers(code_obj):
             event_handlers.append((win_id, mycn(evt), handler, evt_type))
 
@@ -579,18 +553,18 @@
         if extra_code:
             extra_code = re.sub(r'\\n', '\n', extra_code)
             extra_code = re.split(re.compile(r'^###\s*$', re.M), extra_code, 1)
-            self.classes[klass].extra_code_h.append(extra_code[0])
+            klass.extra_code_h.append(extra_code[0].rstrip())
             if len(extra_code) > 1:
-                self.classes[klass].extra_code_cpp.append(extra_code[1])
+                klass.extra_code_cpp.append(extra_code[1].rstrip())
             if not is_new:
                 self.warning( '%s has extra code, but you are not overwriting existing sources:'
                               ' please check that the resulting code is correct!' % code_obj.name )
 
         if not self.multiple_files:
-            if self.classes[klass].extra_code_h:
-                self._current_extra_code_h.append( "".join( self.classes[klass].extra_code_h[::-1] ) )
-            if self.classes[klass].extra_code_cpp:
-                self._current_extra_code_cpp.append( "".join( self.classes[klass].extra_code_cpp[::-1] ) )
+            if klass.extra_code_h:
+                self._current_extra_code_h.append( "\n".join( klass.extra_code_h[::-1] ) )
+            if klass.extra_code_cpp:
+                self._current_extra_code_cpp.append( "\n".join( klass.extra_code_cpp[::-1] ) )
 
         default_sign = [('wxWindow*', 'parent'), ('wxWindowID', 'id')]
         sign = getattr(builder, 'constructor', default_sign)
@@ -610,9 +584,13 @@
         sign_inst = ', '.join([t[1] for t in sign])
 
         # custom base classes support
-        custom_base = getattr(code_obj, 'custom_base', code_obj.properties.get('custom_base', None))
-        if custom_base and not custom_base.strip():
-            custom_base = None
+        custom_base = code_obj.check_prop_nodefault('custom_base') and code_obj.custom_base.strip() or None
+
+        # the header and code lines
+        header_buffer = []
+        source_buffer = []
+        hwrite = header_buffer.append
+        swrite = source_buffer.append
 
         # generate constructor code
         if is_new:
@@ -632,7 +610,7 @@
             # the first thing to add it the enum of the various ids
             if self._mark_blocks:
                 hwrite(self.tabs(1) + '// begin wxGlade: %s::ids\n' % fmt_klass)
-            ids = self.classes[klass].ids
+            ids = klass.ids
 
             # let's try to see if there are extra ids to add to the enum
             if hasattr(builder, 'get_ids_code'):
@@ -648,18 +626,11 @@
             # constructor prototype
             hwrite(self.tabs(1) + '%s(%s);\n' % (fmt_klass, sign_decl1))
             hwrite('\nprivate:\n')
-            # set_properties and do_layout prototypes
-            if self._mark_blocks:
-                hwrite(self.tabs(1) + '// begin wxGlade: %s::methods\n' % fmt_klass)
-            hwrite(self.tabs(1) + 'void set_properties();\n')
-            hwrite(self.tabs(1) + 'void do_layout();\n')
-            if self._mark_blocks:
-                hwrite(self.tabs(1) + '// end wxGlade\n')
             # declarations of the attributes
             hwrite('\n')
             hwrite('protected:\n')
             hwrite(self.tabs(1) + '// begin wxGlade: %s::attributes\n' % fmt_klass)
-            for o_type, o_name in self.classes[klass].sub_objs:
+            for o_type, o_name in klass.sub_objs:
                 hwrite(self.tabs(1) + '%s* %s;\n' % (o_type, o_name))
             hwrite(self.tabs(1) + '// end wxGlade\n')
 
@@ -667,18 +638,18 @@
                 t = self.tabs(1)
                 hwrite('\n' + t + 'DECLARE_EVENT_TABLE();\n')
                 hwrite('\npublic:\n')
-                already_there = {}
+                already_there = set()
                 for win_id, evt, handler, evt_type in event_handlers:
                     if handler not in already_there:
-                        hwrite('%svoid %s(%s &event); // wxGlade: <event_handler>\n' % (t, handler, evt_type))
-                        already_there[handler] = 1
+                        hwrite('%svirtual void %s(%s &event); // wxGlade: <event_handler>\n' % (t, handler, evt_type))
+                        already_there.add( handler )
 
             hwrite('}; // wxGlade: end class\n\n')
 
         elif prev_src:
             if self._mark_blocks:
                 hwrite(self.tabs(1) + '// begin wxGlade: %s::ids\n' % fmt_klass)
-            ids = self.classes[klass].ids
+            ids = klass.ids
 
             # let's try to see if there are extra ids to add to the enum
             if hasattr(builder, 'get_ids_code'):
@@ -691,31 +662,24 @@
                 hwrite(self.tabs(1) + '};\n')
             if self._mark_blocks:
                 hwrite(self.tabs(1) + '// end wxGlade\n')
-            tag = '<%swxGlade replace %s ids>' % (self.nonce, klass)
+            tag = '<%swxGlade replace %s ids>' % (self.nonce, classname)
             if not prev_src.replace_header( tag, "".join(header_buffer) ):
                 # no ids tag found, issue a warning and do nothing
                 self.warning("wxGlade ids block not found for %s, ids declarations code NOT generated" % code_obj.name)
-            header_buffer = []
-            if self._mark_blocks:
-                header_buffer.append( self.tabs(1) + '// begin wxGlade: %s::methods\n' % fmt_klass )
-            header_buffer.append( self.tabs(1) + 'void set_properties();\n' )
-            header_buffer.append( self.tabs(1) + 'void do_layout();\n' )
-            if self._mark_blocks:
-                header_buffer.append( self.tabs(1) + '// end wxGlade\n' )
-            tag = '<%swxGlade replace %s methods>' % (self.nonce, klass)
-            if not prev_src.replace_header(tag, "".join(header_buffer)):
-                # no methods tag found, issue a warning and do nothing
-                self.warning(
-                    "wxGlade methods block not found for %s, methods declarations code NOT generated" % code_obj.name )
+
+            # remove methods block if in old file
+            tag = '<%swxGlade replace %s methods>' % (self.nonce, classname)
+            prev_src.replace_header(tag, [])
+
             header_buffer = []
             hwrite = header_buffer.append
             if self._mark_blocks:
                 hwrite(self.tabs(1) + '// begin wxGlade: %s::attributes\n' % fmt_klass)
-            for o_type, o_name in self.classes[klass].sub_objs:
+            for o_type, o_name in klass.sub_objs:
                 hwrite(self.tabs(1) + '%s* %s;\n' % (o_type, o_name))
             if self._mark_blocks:
                 hwrite(self.tabs(1) + '// end wxGlade\n')
-            tag = '<%swxGlade replace %s attributes>' % (self.nonce, klass)
+            tag = '<%swxGlade replace %s attributes>' % (self.nonce, classname)
             if not prev_src.replace_header(tag, "".join(header_buffer)):
                 # no attributes tag found, issue a warning and do nothing
                 self.warning( "wxGlade attributes block not found for %s, attributes declarations code NOT generated" %
@@ -724,21 +688,22 @@
             header_buffer = []
             hwrite = header_buffer.append
             if event_handlers:
-                already_there = prev_src.event_handlers.get(klass, {})
+                already_there = prev_src.event_handlers.get(classname, set())
                 t = self.tabs(1)
                 for win_id, evt, handler, evt_type in event_handlers:
                     if handler not in already_there:
-                        hwrite('%svoid %s(%s &event); // wxGlade: <event_handler>\n' % (t, handler, evt_type))
-                        already_there[handler] = 1
-                if klass not in prev_src.event_table_def:
+                        hwrite('%svirtual void %s(%s &event); // wxGlade: <event_handler>\n' % (t, handler, evt_type))
+                        already_there.add( handler )
+                if classname not in prev_src.event_table_def:
                     hwrite('\nprotected:\n')
                     hwrite(self.tabs(1) + 'DECLARE_EVENT_TABLE()\n')
-            tag = '<%swxGlade event_handlers %s>' % (self.nonce, klass)
+            tag = '<%swxGlade event_handlers %s>' % (self.nonce, classname)
             if not prev_src.replace_header( tag, "".join(header_buffer) ):
                 # no attributes tag found, issue a warning and do nothing
                 self.warning( "wxGlade events block not found for %s, event table code NOT generated" % code_obj.name )
 
         # source file
+        tab = self.tabs(1)
         # set the window's style
         style_p = code_obj.properties.get("style")
         if style_p and style_p.value_set != style_p.default_value:
@@ -757,28 +722,43 @@
                     if rest:
                         base += ", " + rest
 
-            swrite('\n%s::%s(%s):\n%s%s\n{\n' % (fmt_klass, fmt_klass, sign_decl2, self.tabs(1), base) )
+            swrite('\n%s::%s(%s):\n%s%s\n{\n' % (fmt_klass, fmt_klass, sign_decl2, tab, base) )
+
         if self._mark_blocks:
-            swrite(self.tabs(1) + '// begin wxGlade: %s::%s\n' % (fmt_klass, fmt_klass))
+            swrite(tab + '// begin wxGlade: %s::%s\n' % (fmt_klass, fmt_klass))
+
+        # the optional initial code from the code properties
+        if not self.preview and code_obj.check_prop("extracode_pre"):
+            for l in code_obj.properties["extracode_pre"].get_lines():
+                swrite(tab + l)
 
         # set size here to avoid problems with splitter windows
         if 'size' in code_obj.properties and code_obj.properties["size"].is_active():
-            swrite( self.tabs(1) + self.generate_code_size(code_obj) )
+            swrite( tab + self.generate_code_size(code_obj) )
 
-        tab = self.tabs(1)
-        init_lines = self.classes[klass].init
-        parents_init = self.classes[klass].parents_init
-        parents_init.reverse()
-        for l in parents_init:
+        for l in builder.get_properties_code(code_obj):
             swrite(tab + l)
-        for l in init_lines:
+
+        for l in klass.init:
             swrite(tab + l)
 
-        # now check if there are extra lines to add to the constructor
-        if hasattr(builder, 'get_init_code'):
-            for l in builder.get_init_code(code_obj):
+        if klass.final:
+            swrite(tab + "\n")
+            for l in klass.final:
+                swrite(tab + l)
+
+        for l in builder.get_layout_code(code_obj):
+            swrite(tab + l)
+
+        # the optional final code from the code properties
+        if not self.preview and code_obj.check_prop("extracode_post"):
+            for l in code_obj.properties["extracode_post"].get_lines():
                 swrite(tab + l)
 
+        # now check if there are extra lines to add to the constructor
+        for l in builder.get_init_code(code_obj):
+            swrite(tab + l)
+
         swrite( self.tmpl_ctor_call_layout % {'tab':tab} )
 
         if self._mark_blocks:
@@ -793,46 +773,18 @@
         if prev_src and not is_new:
             # replace the lines inside the ctor wxGlade block
             # with the new ones
-            tag = '<%swxGlade replace %s %s>' % (self.nonce, klass, klass)
+            tag = '<%swxGlade replace %s %s>' % (self.nonce, classname, classname)
             if not prev_src.replace( tag, "".join(source_buffer) ):
                 # no constructor tag found, issue a warning and do nothing
                 self.warning( "wxGlade %s::%s block not found, relative code NOT generated" % (fmt_klass, fmt_klass) )
             source_buffer = []
             swrite = source_buffer.append
 
-        # generate code for __set_properties()
-        code_lines = self.generate_code_set_properties( builder, code_obj, is_new, tab )
-        source_buffer.extend(code_lines)
-
-        # replace code inside existing __set_properties() function
-        if prev_src and not is_new:
-            # replace the lines inside the set_properties wxGlade block with the new ones
-            tag = '<%swxGlade replace %s set_properties>' % (self.nonce, klass)
-            if not prev_src.replace( tag, "".join(source_buffer) ):
-                # no set_properties tag found, issue a warning and do nothing
-                self.warning( "wxGlade %s::set_properties block not found, relative code NOT generated" % fmt_klass )
-            source_buffer = []
-            swrite = source_buffer.append
-
-        # generate code for __do_layout()
-        code_lines = self.generate_code_do_layout( builder, code_obj, is_new, tab )
-        source_buffer.extend(code_lines)
-
-        # replace code inside existing do_layout() function
-        if prev_src and not is_new:
-            # replace the lines inside the do_layout wxGlade block with the new ones
-            tag = '<%swxGlade replace %s %s>' % (self.nonce, klass, 'do_layout')
-            if not prev_src.replace(tag, "".join(source_buffer)):
-                # no do_layout tag found, issue a warning and do nothing
-                self.warning( "wxGlade do_layout block not found for %s, do_layout code NOT generated" % code_obj.name )
-            source_buffer = []
-            swrite = source_buffer.append
-
         # generate code for event table
         code_lines = self.generate_code_event_table( code_obj, is_new, tab, prev_src, event_handlers )
 
         if prev_src and not is_new:
-            tag = '<%swxGlade replace %s event_table>' % (self.nonce, klass)
+            tag = '<%swxGlade replace %s event_table>' % (self.nonce, classname)
             if not prev_src.replace( tag, "".join(code_lines) ):
                 # no constructor tag found, issue a warning and do nothing
                 self.warning( "wxGlade %s::event_table block not found, relative code NOT generated" % fmt_klass )
@@ -844,16 +796,13 @@
 
         # replace code inside existing event handlers
         if prev_src and not is_new:
-            tag = '<%swxGlade add %s event handlers>' % (self.nonce, klass)
+            tag = '<%swxGlade add %s event handlers>' % (self.nonce, classname)
             if not prev_src.replace( tag, "".join(code_lines) ):
                 # no constructor tag found, issue a warning and do nothing
                 self.warning( "wxGlade %s event handlers marker not found, relative code NOT generated" % fmt_klass )
         else:
             source_buffer.extend(code_lines)
 
-        # the code has been generated
-        self.classes[klass].done = True
-
         if not self.multiple_files and prev_src:
             # if this is a new class, add its code to the new_classes list of the SourceFileContent instance
             if is_new:
@@ -862,23 +811,22 @@
 
         if self.multiple_files:
             if base in self.obj_builders:
-                self.classes[klass].dependencies.extend( getattr(self.obj_builders[base], 'import_modules', []) )
+                klass.dependencies.update( getattr(self.obj_builders[base], 'import_modules', []) )
 
             if prev_src:
                 tag = '<%swxGlade insert new_classes>' % self.nonce
                 prev_src.replace_header(tag, "")
 
                 # insert the module dependencies of this class
-                extra_modules = self.classes[klass].dependencies
                 # WARNING: there's a double space '  ' between 'replace' and 'dependencies' in the tag below,
                 # because there is no class name (see SourceFileContent, line ~147)
                 tag = '<%swxGlade replace  dependencies>' % self.nonce
-                code = self._format_dependencies(extra_modules)
+                code = self._format_dependencies(klass.dependencies)
                 prev_src.replace_header(tag, code)
 
                 # insert the extra code of this class
-                extra_code_h = "".join(self.classes[klass].extra_code_h[::-1])
-                extra_code_cpp = "".join(self.classes[klass].extra_code_cpp[::-1])
+                extra_code_h = "".join(klass.extra_code_h[::-1])
+                extra_code_cpp = "".join(klass.extra_code_cpp[::-1])
                 # if there's extra code but we are not overwriting existing sources, warn the user
                 if extra_code_h or extra_code_cpp:
                     self.warning( '%s (or one of its children) has extra code classes, but you are not overwriting '
@@ -891,15 +839,15 @@
                 prev_src.replace(tag, extra_code_cpp)
 
                 # store the new file contents to disk
-                name = os.path.join(self.out_dir, klass)
+                name = os.path.join(self.out_dir, classname)
                 self.save_file( name +"."+ self.header_extension, "".join(prev_src.header_content), content_only=True )
                 self.save_file( name +"."+ self.source_extension, "".join(prev_src.content), content_only=True )
 
                 return
 
             # create the new source file
-            header_file = os.path.join(self.out_dir, klass + "." + self.header_extension)
-            source_file = os.path.join(self.out_dir, klass + "." + self.source_extension)
+            header_file = os.path.join(self.out_dir, classname + "." + self.header_extension)
+            source_file = os.path.join(self.out_dir, classname + "." + self.source_extension)
             hout = []
             sout = []
 
@@ -915,13 +863,12 @@
             hout.append('\n')
 
             # write the module dependencies for this class
-            extra_modules = self.classes[klass].dependencies
-            code = self._format_dependencies(extra_modules)
+            code = self._format_dependencies(klass.dependencies)
             hout.append(code)
             hout.append('\n')
 
             # insert the extra code of this class
-            extra_code_h = "".join(self.classes[klass].extra_code_h[::-1])
+            extra_code_h = "".join(klass.extra_code_h[::-1])
             extra_code_h = self._tagcontent('::extracode', extra_code_h)
             hout.append(extra_code_h)
             hout.append('\n')
@@ -937,7 +884,7 @@
             sout.append('#include "%s"\n\n' % os.path.basename(header_file))
 
             # insert the extra code of this class
-            extra_code_cpp = "".join(self.classes[klass].extra_code_cpp[::-1])
+            extra_code_cpp = "".join(klass.extra_code_cpp[::-1])
             extra_code_cpp = self._tagcontent('::extracode', extra_code_cpp)
             sout.append(extra_code_cpp)
             sout.append('\n')
@@ -954,67 +901,65 @@
             self.output_header.extend(header_buffer)
             self.output_file.extend(source_buffer)
 
-    def add_object(self, sub_obj):
-        # get top level source code object and the widget builder instance
-        klass, builder = self._add_object_init(sub_obj)
-        if not klass or not builder:
-            return
+    def add_object(self, klass, parent, parent_builder, obj):
+        # get the widget builder instance
+        builder = self._get_object_builder(klass, obj)
+        if not builder: return None
 
         try:
-            init, ids, props, layout = builder.get_code(sub_obj)
+            init, ids, final = builder.get_code(obj)
         except:
-            print(sub_obj)
+            print(obj)
             raise  # this shouldn't happen
 
-        if not sub_obj.is_sizer:  # the object is a wxWindow instance
-            if "extracode_pre" in sub_obj.properties and sub_obj.extracode_pre:
-                init = sub_obj.properties["extracode_pre"].get_lines() + init
-            if "extracode_post" in sub_obj.properties and sub_obj.extracode_post:
-                init += sub_obj.properties["extracode_post"].get_lines()
-
-            if sub_obj.node.children and not sub_obj.is_toplevel:
-                init.reverse()
-                klass.parents_init.extend(init)
-            else:
-                klass.init.extend(init)
+        if not obj.IS_SIZER:  # the object is a wxWindow instance
+            if obj.check_prop_truth("extracode_pre"):
+                init = obj.properties["extracode_pre"].get_lines() + init
+            if obj.check_prop_truth("extracode_post"):
+                init += obj.properties["extracode_post"].get_lines()
+            if obj.check_prop_truth('extraproperties'):  # insert these only after extracode_post
+                init += self.generate_code_extraproperties(obj)
 
             mycn = getattr(builder, 'cn', self.cn)
-            for win_id, evt, handler, evt_type in builder.get_event_handlers(sub_obj):
+            for win_id, evt, handler, evt_type in builder.get_event_handlers(obj):
                 klass.event_handlers.append( (win_id, mycn(evt), handler, evt_type) )
 
             # try to see if there's some extra code to add to this class
-            extra_code = getattr(builder, 'extracode', getattr(sub_obj, 'extracode', "") or "" )
+            extra_code = getattr(builder, 'extracode', getattr(obj, 'extracode', "") or "" )
             if extra_code:
                 extra_code = re.sub(r'\\n', '\n', extra_code)
                 extra_code = re.split(re.compile(r'^###\s*$', re.M), extra_code, 1)
-                klass.extra_code_h.append(extra_code[0])
+                klass.extra_code_h.append(extra_code[0].rstrip())
                 if len(extra_code) > 1:
-                    klass.extra_code_cpp.append(extra_code[1])
+                    klass.extra_code_cpp.append(extra_code[1].rstrip())
                 # if we are not overwriting existing source, warn the user about the presence of extra code
                 if not self.multiple_files and self.previous_source:
                     self.warning( '%s has extra code, but you are not overwriting existing sources: please check '
-                                  'that the resulting code is correct!' % sub_obj.name )
+                                  'that the resulting code is correct!' % obj.name )
 
             klass.ids.extend(ids)
-            if sub_obj.klass != 'spacer':
-                # attribute is a special property which control whether sub_obj must be accessible as an attribute of
-                # top_obj, or as a local variable in the do_layout method
-                if self.store_as_attr(sub_obj):
-                    klass.sub_objs.append((sub_obj.klass, sub_obj.name))
-        elif sub_obj.klass != "sizerslot":
-            # the object is a sizer
-            if self.store_as_attr(sub_obj):
-                klass.sub_objs.append((sub_obj.klass, sub_obj.name))
-            klass.sizers_init.extend(init)
-
-        klass.props.extend(props)
-        klass.layout.extend(layout)
-        if self.multiple_files and (sub_obj.is_toplevel and sub_obj.base != sub_obj.klass):
-            klass.dependencies.append(sub_obj.klass)
+
+        if self.store_as_attr(obj):
+            if obj.check_prop("instance_class"):
+                klassname = obj.instance_class
+            else:
+                klassname = obj.get_prop_value("class", obj.WX_CLASS)
+            klass.sub_objs.append( (klassname, obj.name) )
+
+        klass.init.extend(init)
+
+        if parent_builder:  # add to sizer or notebook
+            klass.init.extend( parent_builder.get_code_per_child(parent, obj) )
+
+
+        klass.final[:0] = final
+        if self.multiple_files and obj.IS_CLASS:
+            klass.dependencies.append(obj.klass)
         else:
-            if sub_obj.base in self.obj_builders:
-                headers = getattr(self.obj_builders[sub_obj.base], 'import_modules', [])
-                klass.dependencies.extend(headers)
+            if obj.WX_CLASS in self.obj_builders:
+                headers = getattr(self.obj_builders[obj.WX_CLASS], 'import_modules', [])
+                klass.dependencies.update(headers)
+        return builder
 
     def generate_code_event_handler(self, code_obj, is_new, tab, prev_src, event_handlers):
         """Generate the event handler stubs
@@ -1024,7 +969,7 @@
             tab: Indentation of function body (str)
             prev_src: Previous source code (SourceFileContent)
             event_handlers: List of event handlers
-        @see: L{tmpl_func_event_stub}"""
+        see: tmpl_func_event_stub"""
         code_lines = []
         swrite = code_lines.append
 
@@ -1041,14 +986,14 @@
 """
 
         if prev_src:
-            already_there = prev_src.event_handlers.get(code_obj.klass, {})
+            already_there = prev_src.event_handlers.get(code_obj.klass, set())
         else:
-            already_there = {}
+            already_there = set()
 
         for win_id, event, handler, evt_type in event_handlers:
             if handler not in already_there:
                 swrite( tmpl_handler % {'evt_type': evt_type, 'handler': handler, 'klass': code_obj.klass, 'tab': tab} )
-                already_there[handler] = 1
+                already_there.add( handler )
         if is_new or not prev_src:
             swrite('\n\n')
         swrite('// wxGlade: add %s event handlers\n' % code_obj.klass)
@@ -1077,11 +1022,15 @@
             has_event_table = False
 
         if is_new or not has_event_table:
-            write('\nBEGIN_EVENT_TABLE(%s, %s)\n' % (code_obj.klass, code_obj.base))
+            write('\nBEGIN_EVENT_TABLE(%s, %s)\n' % (code_obj.klass, code_obj.WX_CLASS))
         write(tab + '// begin wxGlade: %s::event_table\n' % code_obj.klass)
 
-        for win_id, event, handler, evt_type in event_handlers:
-            if win_id is None: continue
+        for obj, event, handler, evt_type in event_handlers:
+            if obj is None: continue
+            if isinstance(obj, str):
+                win_id = obj
+            else:
+                win_id = self.generate_code_id(obj)[1]
             if 'EVT_NAVIGATION_KEY' in event:
                 tmpl = '%(tab)s%(event)s(%(klass)s::%(handler)s)\n'
             else:
@@ -1099,15 +1048,14 @@
         if id is None:
             id = obj.window_id
         if not id:
-            if obj is not None and "stockitem" in obj.properties and obj.stockitem:
+            if obj is not None and obj.check_prop_truth("stockitem"):
                 return '', "wxID_" + obj.stockitem
             return '', 'wxID_ANY'
         id = str(id)
         tokens = id.split('=', 1)
-        if len(tokens) == 2:
-            name, val = tokens
-        else:
+        if len(tokens) != 2:
             return '', tokens[0]   # we assume name is declared elsewhere
+        name, val = tokens
         if not name:
             return '', val
         name = name.strip()
@@ -1124,48 +1072,40 @@
 
     def generate_code_size(self, obj):
         objname = self.format_generic_access(obj)
-        if obj.is_toplevel:
+        if obj.IS_CLASS:
             name2 = 'this'
         else:
             name2 = obj.name
         size = obj.properties["size"].get_string_value()
         use_dialog_units = (size[-1] == 'd')
-        if not obj.parent:
-            method = 'SetSize'
-        else:
-            method = 'SetMinSize'
+        method = 'SetMinSize'  if obj.parent_window else  'SetSize'
+
         if use_dialog_units:
             return '%s%s(wxDLG_UNIT(%s, wxSize(%s)));\n' % (objname, method, name2, size[:-1])
-        else:
-            return '%s%s(wxSize(%s));\n' % (objname, method, size)
+        return '%s%s(wxSize(%s));\n' % (objname, method, size)
 
     def quote_path(self, s):
-        path = super(CPPCodeWriter, self).quote_path(s)
-        # path starts and ends with double quotes already
-        return 'wxT(%s)' % path
+        return 'wxT(%s)' % super(CPPCodeWriter, self).quote_path(s)
 
     def _quote_str(self, s):
         if self._use_gettext:
             return '_("%s")' % s
-        else:
-            return 'wxT("%s")' % s
+        return 'wxT("%s")' % s
 
     def format_generic_access(self, obj):
-        if obj.is_toplevel:
+        if obj.IS_CLASS:
             return ''
-        else:
-            return '%s->' % obj.name
+        return '%s->' % obj.name
 
     def _format_dependencies(self, dependencies):
         "Format a list of header files for the dependencies output"
         dep_list = []
-        for dependency in sorted( set(dependencies) ):  # unique and sorted
+        for dependency in sorted(dependencies):  # unique and sorted
             if dependency and ('"' != dependency[0] != '<'):
                 dep_list.append('#include "%s.h"\n' % dependency)
             else:
                 dep_list.append('#include %s\n' % dependency)
-        code = self._tagcontent( '::dependencies', dep_list )
-        return code
+        return self._tagcontent( '::dependencies', dep_list )
 
 writer = CPPCodeWriter()  # The code writer is an instance of CPPCodeWriter
 
diff -Nru wxglade-0.9.6/codegen/__init__.py wxglade-1.0.1/codegen/__init__.py
--- wxglade-0.9.6/codegen/__init__.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/codegen/__init__.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,18 +1,21 @@
+# -*- coding: LATIN1 -*-
 """Common code used by all code generators
 
 @copyright: 2011-2016 Carsten Grohmann
-@copyright: 2017 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import copy, logging, os, os.path, random, re, sys, time
 
-import common, config, compat, errors, misc
-import new_properties as np
+import common, config, compat, misc
 import wcodegen
+from collections import OrderedDict
 
 
 def _replace_tag(lst, tag, content):
+    # used before writing generated code to file: replace placeholder tag with content
+    # an example tag: '<15535320686269365730972wxGlade extra_modules>\n'
     ret = False
     add_line = False
     if not tag in lst and not tag.endswith("\n"):
@@ -49,11 +52,10 @@
      rec_event_handler: Regexp to match event handlers"""
 
     def __init__(self, name, code_writer):
-        # initialise instance logger
-        self._logger = logging.getLogger(self.__class__.__name__)
+        self.OK = False
 
         # initialise instance
-        self.classes = {}                  # Classes declared in the file
+        self.classes = set()               # Classes declared in the file
         self.class_name = None             # Name of the current processed class
         self.content = []                  # Content of the source file, if it existed before this session of code gen.
         self.event_handlers = {}           # List of event handlers for each class
@@ -66,8 +68,14 @@
         self.nonce = code_writer.nonce
         self.out_dir = code_writer.out_dir
         self.multiple_files = code_writer.multiple_files
-        if not self.content:
+
+        try:
             self.build_untouched_content()
+            self.OK = True
+        except UnicodeDecodeError:
+            # file could not be read and OK will remain False
+            # this will be checked in writer.init_files and returned via writer.new_project to application.generate_code
+            pass
 
     def replace(self, tag, content):
         return _replace_tag(self.content, tag, content)
@@ -75,9 +83,17 @@
     def build_untouched_content(self):
         """Builds a string with the contents of the file that must be left as is, and replaces the wxGlade blocks
         with tags that in turn will be replaced by the new wxGlade blocks"""
+        # the derived classes must implement the language specific parsing
         self.class_name = None
         self.new_classes_inserted = False
 
+    def _remove_method(self, out_lines, i0, i1):
+        # helper for derived classes at end of _build_untouched to remove empty methods
+        del out_lines[i0:i1+1]
+        # remove trailing empty lines
+        while len(out_lines)>i0 and not out_lines[i0].strip():
+            del out_lines[i0]
+
     def format_classname(self, class_name):
         "Format class name read from existing source file; may be overwritten in derived class"
         return class_name
@@ -86,10 +102,6 @@
         "True if the line is the marker for class end"
         return line.strip().startswith('# end of class ')
 
-    def is_import_line(self, line):
-        "True if the line imports wx; may be overwritten in derived class"
-        return False
-
     def _load_file(self, filename):
         "Load a file and return the content. The read source file will be decoded to unicode automatically."
         # Separated for debugging purposes
@@ -97,86 +109,34 @@
 
         encoding = self.code_writer.app_encoding
         if encoding:
-            try:
-                lines = [line.decode(encoding) for line in lines]
-            except UnicodeDecodeError:
-                raise errors.WxgReadSourceFileUnicodeError(filename)
-
+            # UnicodeDecodeError will be handled in application.generate_code
+            lines = [line.decode(encoding) for line in lines]
         return lines
 
-    def __getstate__(self):
-        state = self.__dict__.copy()
-        del state['_logger']
-        return state
-
-    def __setstate__(self, state):
-        self.__dict__.update(state)
-
-        # re-initialise logger instance deleted from __getstate__
-        self._logger = logging.getLogger(self.__class__.__name__)
-
-
-
-class BaseWidgetHandler(object):
-    "Interface the various code generators for the widgets must implement"
-
-    import_modules = []  # List of modules to import (eg. ['use Wx::Grid;\n'])
-
-    def __init__(self):
-        "Initialise instance variables"
-        self.import_modules = []
-
-    def get_code(self, obj):
-        """Handler for normal widgets (non-toplevel): returns 3 lists of strings, init, properties and layout,
-        that contain the code for the corresponding methods of the class to generate"""
-        return [], [], []
-
-    def get_properties_code(self, obj):
-        """Handler for the code of the set_properties method of toplevel objects.
-        Returns a list of strings containing the code to generate"""
-        return []
-
-    def get_init_code(self, obj):
-        """Handler for the code of the constructor of toplevel objects.
-        Returns a list of strings containing the code to generate.
-        Usually the default implementation is ok (i.e. there are no extra lines to add).
-        The generated lines are appended at the end of the constructor."""
-        return []
-
-    def get_layout_code(self, obj):
-        """Handler for the code of the do_layout method of toplevel objects.
-        Returns a list of strings containing the code to generate.
-        Usually the default implementation is ok (i.e. there are no extra lines to add)."""
-        return []
-
 
 class ClassLines(object):
     "Stores the lines of source code for a custom class"
     def __init__(self):
         self.child_order = []
-        self.dependencies = {}    # Names of the modules this class depends on
+        self.dependencies = set() # Names of the modules this class depends on
         self.deps = []
-        self.event_handlers = []  # Lines to bind events (see L{wcodegen.BaseWidgetWriter.get_event_handlers()})
+        self.event_handlers = []  # Lines to bind events (see wcodegen.BaseWidgetWriter.get_event_handlers())
         self.extra_code = []      # Extra code to output before this class
         self.done = False         # If True, the code for this class has already been generated
+        # XXX refactor init and final into init_code, final_code?
         self.init = []            # Lines of code to insert in the __init__ method (for children widgets)
-        self.init_lines = {}
-        self.layout = []          # Lines to insert in the __do_layout method
-        self.parents_init = []    # Lines to insert in the __init__ for container widgets (panels, splitters, ...)
-        self.props = []           # Lines to insert in the __set_properties method
-        self.sizers_init = []     # Lines related to sizer objects declarations
+        self.final = []  # to be inserted after children, e.g. Add or AddPage for sizers / notebooks
 
 
 class BaseLangCodeWriter(wcodegen.BaseCodeWriter):
     """Dictionary of objects used to generate the code in a given language.
 
+    XXX the following is outdated:
     A code writer object *must* implement those interface and set those variables:
       - init_lang(), init_files(), finalize()
       - wcodegen.BaseLanguageMixin.language
-      - add_app(), add_class(), add_object()
-      - add_property_handler()
-      - add_sizeritem(}
-      - add_widget_handler()
+      - add_app(), add_class(), add_object(), finalize_class()
+      - register_widget_code_generator()
       - generate_code_background(), generate_code_font(), generate_code_foreground()
       - generate_code_id()
       - generate_code_size()
@@ -200,11 +160,9 @@
                                (see app_mapping, add_app())
 
      for_version:             wx version we are generating code for (e.g. (2, 8) )
-     blacklisted_widgets:     Don't add those widgets to sizers because they are not supported for the requested
-                               wx version or there is no code generator available.
 
-     classes:                 Dictionary that maps the lines of code of a class to the name of such class:
-                               the lines are divided in 3 categories: '__init__', '__set_properties' and '__do_layout'
+     classes:                 Dictionary that maps the lines of code of a class to the name of such class
+
      dependencies:            Module dependencies of all classes
 
      header_lines:            Lines common to all the generated files (import of wxCL, ...)
@@ -212,7 +170,7 @@
      curr_tab:                Current indentation level
      indent_amount:           An indentation level is  indent_symbol*indent_amount;
                                will be initialised with config.default_indent_amount
-     indent_symbol:           Character to use for indentation; will be initialised with L{config.default_indent_symbol}
+     indent_symbol:           Character to use for indentation; will be initialised with config.default_indent_symbol
 
      nonce:                   Random number used to be sure that the replaced tags in the sources are the right ones
                               (see BaseSourceFileContent, add_class and create_nonce)
@@ -229,7 +187,6 @@
                               previous version of the source to generate
      _app_added:             True after wxApp instance has been generated
      _current_extra_code:    Set of lines for extra code to add to the current file
-     _current_extra_modules: Set of lines of extra modules to add to the current file
 
      _overwrite:             If True, overwrite any previous version of the source file instead of updating only
                               the wxGlade blocks;  will be initialised with config.default_overwrite
@@ -239,10 +196,7 @@
                               (E.g. _property_writers['wxRadioBox'] = {'choices', choices_handler})
 
      _textdomain:            gettext textdomain (see _use_gettext)
-     _use_gettext:           If True, enable gettext support; will be initialised with config.default_use_gettext
-
-     _widget_extra_modules:  Map of widget class names to a list of extra modules needed for the widget
-                              (e.g. C{'wxGrid': 'from wxLisp.grid import *\\n'})."""
+     _use_gettext:           If True, enable gettext support; will be initialised with config.default_use_gettext"""
 
     _code_statements = {}
     """Language specific code templates for for small statements.
@@ -250,8 +204,8 @@
     The statements are stored in a dictionary. The property names are the keys.
     
     The keys may have one of two different extensions: 
-     - "C{_<major version>X}"               e.g. "C{tooltip_3X}" to generate tooltips source code for wxWidgets 3.x
-     - "C{_<major version><minor version>}" e.g. "C{wxcolour_28}" to generate source code for wxWidgets 2.8 only
+     - "_<major version>X"               e.g. "tooltip_3X" to generate tooltips source code for wxWidgets 3.x
+     - "_<major version><minor version>" e.g. "wxcolour_28" to generate source code for wxWidgets 2.8 only
 
     The extensions will be evaluated from most specific to generic.
 
@@ -293,17 +247,8 @@
     tmpl_func_empty = ''           # Statement for an empty function e.g. "pass" for Python or "return;" for perl
     tmpl_empty_string = '""'       # Template for an empty string.
 
-    tmpl_name_do_layout = ''       # Name of the function __do_layout() in wxGlade begin tag
-    tmpl_func_do_layout = ''       # Statement for the    __do_layout() function;
-                                   #  -> see generate_code_do_layout():
-
     tmpl_func_event_stub = ''      # Statement for a event handler stub -> see generate_code_event_handler()_
 
-    tmpl_name_set_properties = ''  # Name of the function __set_properties() in wxGlade begin tag
-    tmpl_func_set_properties = ''  # Statement for the    __set_properties() function
-                                   #  -> see generate_code_set_properties():
-
-
     # Template of the "generated by ..." message ;see create_generated_by(); save_file()
     tmpl_generated_by = "%(comment_sign)s %(generated_by)s\n%(comment_sign)s\n"
 
@@ -311,7 +256,7 @@
     tmpl_overwrite = "%(comment_sign)s This is an automatically generated file.\n" \
                      "%(comment_sign)s Manual changes will be overwritten without warning!\n\n"
 
-    tmpl_sizeritem = ''           # Template for adding a widget to a sizer; see add_sizeritem()
+    tmpl_sizeritem = ''           # Template for adding a widget to a sizer
     tmpl_spacersize = '(%s, %s)'  # Python and Lisp need the braces
     tmpl_style = ''               # Template for setting style in constructor; see _format_style()
     tmpl_toplevel_style = ''      # same for a toplevel object
@@ -342,15 +287,14 @@
         self.app_filename = None
         self.app_mapping = {}
         self.app_name = None
-        self.classes = {}
+        self.classes = OrderedDict()
         self.curr_tab = 0
-        self.dependencies = {}
-        self.for_version = config.for_version
+        self.dependencies = set()
+        self.for_version = config.for_version_min
         self.header_lines = []
         self.indent_symbol = config.default_indent_symbol
         self.indent_amount = config.default_indent_amount
         self.is_template = 0
-        self.blacklisted_widgets = {}
         self.lang_mapping = {}
         self.multiple_files = False
 
@@ -363,12 +307,10 @@
         self.previous_source = None
         self._app_added = False
         self._current_extra_code = []
-        self._current_extra_modules = {}
         self._overwrite = config.default_overwrite
         self._mark_blocks = True # YYY config.mark_blocks
         self._textdomain = 'app'
         self._use_gettext = config.default_use_gettext
-        self._widget_extra_modules = {}
 
     def new_project(self, app, out_path=None, preview=False):
         "Initialise generic and language independent code generator settings; see init_lang(), init_files()"
@@ -406,7 +348,7 @@
         else:
             self.multiple_files = app.multiple_files
             self._overwrite = app.overwrite
-            self._mark_blocks = True if self._overwrite else app.mark_blocks
+            self._mark_blocks = True if not self._overwrite else app.mark_blocks
             self._use_gettext = app.use_gettext
 
         if not preview:
@@ -422,9 +364,8 @@
         self.out_dir = os.path.normpath( os.path.expanduser(self.out_dir.strip()) )
         self.preview = preview
 
-        self.init_lang(app)      # call initialisation of language specific settings
-        self.check_values()            # check the validity of the set values
-        self.init_files(self.out_dir)  # call initialisation of the file handling
+        # any of the following could return an error as string
+        return self.init_lang(app) or self.check_values() or self.init_files(self.out_dir)
 
     def init_lang(self, app_attrs):
         "Initialise language specific settings; overwrite this function in the derived class"
@@ -436,148 +377,87 @@
         if self.multiple_files:
             self.previous_source = None
             if not os.path.isdir(out_path):
-                raise errors.WxgOutputPathIsNotDirectory(out_path)
+                return _("Output path is not a directory")
             self.out_dir = out_path
         else:
             if os.path.isdir(out_path):
-                raise errors.WxgOutputPathIsDirectory(out_path)
+                return _("Output path is a directory")
             if not self._overwrite and self._file_exists(out_path):
                 # the file exists, we must keep all the lines not inside a
                 # wxGlade block. NOTE: this may cause troubles if out_path is
                 # not a valid source file, so be careful!
                 self.previous_source = self.SourceFileContent(out_path, self)
+                if not self.previous_source.OK:
+                    return _("Encoding error in existing file (UnicodeDecodeError) '%s'"%out_path)
             else:
                 # if the file doesn't exist, create it and write the ``intro''
                 self.previous_source = None
                 self.output_file = []
                 self.output_file_name = out_path
                 self.output_file.extend( self.header_lines )
-                self.output_file.append('<%swxGlade extra_modules>\n' % self.nonce)
                 self.output_file.append('\n')
                 self.output_file.append('<%swxGlade replace dependencies>\n' % self.nonce)
                 self.output_file.append('<%swxGlade replace extracode>\n' % self.nonce)
+        return None
 
     def output_file_replace(self, tag, content):
         _replace_tag(self.output_file, tag, content)
 
     def check_values(self):
-        "Check the validity of the set application values. Raises exceptions for errors; see module errors"
-        # XXX implement without exceptions
-        # Check if the values of use_multiple_files and out_path agree
-        if self.multiple_files:
-            if not os.path.isdir(self.out_dir):
-                raise errors.WxgOutputDirectoryNotExist(self.out_dir)
-            if not os.access(self.out_dir, os.W_OK):
-                raise errors.WxgOutputDirectoryNotWritable(self.out_dir)
-        else:
-            if os.path.isdir(self.out_dir):
-                raise errors.WxgOutputPathIsDirectory(self.out_dir)
-            directory = os.path.dirname(self.out_dir)
-            if directory:
-                if not os.path.isdir(directory):
-                    raise errors.WxgOutputDirectoryNotExist(directory)
-                if not os.access(directory, os.W_OK):
-                    raise errors.WxgOutputDirectoryNotWritable(directory)
+        "Check the validity of output directory/file name"
+        out_dir = self.out_dir
+        if not self.multiple_files:
+            if os.path.isdir(out_dir):
+                return "Output path is directory, not file"
+            out_dir = os.path.dirname(out_dir)
+
+        if out_dir:
+            if not os.path.isdir(out_dir):
+                return "Output directory does not exist"
+            if not os.access(out_dir, os.W_OK):
+                return "Output directory is not writable"
 
         # It's not possible to generate code from a template directly
         if self.is_template:
-            raise errors.WxgTemplateCodegenNotPossible
+            return 'Code generation from a template is not possible'
 
-    def _generate_code(self, node):
-        # for anything except application.Application
-        import tree
-        obj = node.widget
-        topl = self.toplevel
-
-        if isinstance(node, tree.SlotNode):
-            # empty sizer slot
-            szr = self.sizers[-1]
-            if not szr._IS_GRIDBAG:
-                self.add_spacer(topl, szr, None)
-            return
-        elif node.widget.classname=="spacer":
-            # add a spacer
-            szr = self.sizers[-1]
-            self.add_spacer(topl, szr, obj, obj.proportion, obj.properties["flag"].get_string_value(), obj.border )
-            return
-
-        obj.is_toplevel = node.is_toplevel  # this is from the position in the data structure
+        return None
 
-        if obj.is_sizer:
-            self.sizers.append(obj)
+    def _generate_code(self, parent_klass, parent, parent_builder, obj):
+        # recursively generate code, for anything except application.Application
+        # for toplevel widgets or with class different from wx... a class will be added
+
+        if obj.IS_SLOT or obj.WX_CLASS=="spacer":
+            if obj.WX_CLASS:  # "slot" has no code generator, but "sizerslot" or "spacer" needs to be added
+                self.add_object(parent_klass, parent, parent_builder, obj)
+            return
 
-        can_be_toplevel = obj.__class__.__name__ in common.toplevels
+        # XXX check: set obj.IS_CLASS again?
+        obj.IS_CLASS = IS_CLASS = obj.IS_TOPLEVEL or (not self.preview and obj.check_prop_truth("class"))
+        # first the item
+        klass = IS_CLASS and self.add_class(obj) or None
+        if not obj.IS_TOPLEVEL:
+            builder = self.add_object(parent_klass, parent, parent_builder, obj)
+        else:
+            builder = None
+
+        # then the children
+        for child in obj.get_all_children():
+            self._generate_code(klass or parent_klass, obj, builder, child)
 
-        old_class = old_base = None
-        # XXX check for alternatives
-        # classname is used only for 'EditTopLevelScrolledWindow' vs. 'EditTopLevelPanel'
-        classname = getattr(obj, '_classname', obj.__class__.__name__)
-        base = common.class_names[classname]
-        if base!=obj.base:
-            old_base = obj.base
-            obj.base = base
-        
-        if (not self.toplevels or obj.klass != obj.base) and can_be_toplevel:
-            obj.is_toplevel = True
-            # for panel objects, if the user sets a custom class but (s)he doesn't want the code to be generated...
-            if obj.check_prop("no_custom_class") and obj.no_custom_class and not self.preview:
-                obj.is_toplevel = False
-        elif self.preview and not can_be_toplevel and obj.base != 'CustomWidget':
-            # if this is a custom class, but not a toplevel one, for the preview we have to use the "real" class
-            # CustomWidgets handle this in a special way (see widgets/custom_widget/codegen.py)
-            old_class = obj.properties["klass"].get()
-            obj.properties["klass"].set(obj.base) # XXX handle this in a different way
-
-        if obj.is_toplevel:  # XXX as long as generate_code is called with 
-            self.toplevels.append(obj)
-
-        # children first
-        for c in node.children or []:
-            self._generate_code(c)
-
-        # clean up stacks
-        if obj.is_toplevel: del self.toplevels[-1]
-        if obj.is_sizer:    del self.sizers[-1]
-
-        # then the item
-        if obj.is_toplevel and not obj.is_sizer:  # XXX as long as generate_code is called with 
-            self.add_class(obj)
-        if self.toplevels:
-            self.add_object(obj)
-
-        # check whether the object belongs to some sizer; if applicable, add it to the sizer at the top of the stack
-        parent = node.parent.widget
-        if parent.is_sizer:
-            flag = obj.properties["flag"].get_string_value()  # as string, joined with "|"
-            self.add_sizeritem(topl, parent, obj, obj.proportion, flag, obj.border)
-
-        # XXX handle this in a different way
-        if old_class is not None:
-            obj.properties["klass"].set(old_class)
-        if old_base is not None:
-            obj.base = old_base
+        if IS_CLASS:
+            self.finalize_class(obj)
 
     def generate_code(self, root, widget=None):
+        "entry point for recursive code generation via _generate_code()"
         # root must be application.Application instance for now
-        self.class_names = {}
-        self.toplevels = []
-        self.sizers = []
         for c in root.children or []:
-            if widget is not None and c is not widget.node: continue # for preview
-            self._generate_code(c)
-        #if isinstance(root, application.Application):
-        topwin = [c.widget for c in root.children if c.widget.name==root.widget.top_window]
-        if topwin:
-            topwin = topwin[0]
-        elif root.children:
-            topwin = root.children[0].widget
-        else:
-            topwin = None
-        self.add_app(root.widget, topwin)
-
-    @property
-    def toplevel(self):
-        return self.toplevels and self.toplevels[-1] or None
+            if widget is not None and c is not widget: continue # for preview
+            self._generate_code(None, None, None, c)
+        if not root.IS_ROOT or self.preview: return
+        topwin = [c for c in root.children if c.name==root.top_window]
+        topwin = topwin and topwin[0] or root.children and root.children[0] or None
+        self.add_app(root, topwin)
 
     def finalize(self):
         "Code generator finalization function"
@@ -588,12 +468,9 @@
             else:
                 code = ""
             self.previous_source.replace( '<%swxGlade insert new_classes>' % self.nonce, code )
-            code = "".join(sorted(self._current_extra_modules.keys()))
-            self.previous_source.replace( '<%swxGlade extra_modules>\n' % self.nonce, code )
 
             # module dependencies of all classes
-            dep_list = sorted( self.dependencies.keys() )
-            code = self._tagcontent('dependencies', dep_list)
+            code = self._tagcontent( 'dependencies', sorted(self.dependencies) )
             self.previous_source.replace( '<%swxGlade replace dependencies>' % self.nonce, code )
 
             # extra code (see the 'extracode' property of top-level widgets)
@@ -611,12 +488,8 @@
             self.save_file( self.previous_source.name, content, content_only=True )
 
         elif not self.multiple_files:
-            code = "".join(sorted(self._current_extra_modules.keys()))
-            self.output_file_replace( '<%swxGlade extra_modules>\n' % self.nonce, code )
-
             # module dependencies of all classes
-            dep_list = sorted( self.dependencies.keys() )
-            code = self._tagcontent('dependencies', dep_list)
+            code = self._tagcontent( 'dependencies', sorted(self.dependencies) )
             self.output_file_replace( '<%swxGlade replace dependencies>' % self.nonce, code )
 
             # extra code (see the 'extracode' property of top-level widgets)
@@ -626,8 +499,12 @@
             self.save_file(self.output_file_name, self.output_file, self._app_added)
             self.output_file = None
 
-    def clean_up(self, root):
-        pass
+    def clean_up(self, obj):
+        if hasattr(obj, "xrc"):
+            del obj.xrc
+        obj.restore_properties()
+        for c in obj.children or []:
+            self.clean_up(c)
 
     def add_app(self, app, top_win):
         """Generates the code for a wxApp instance.
@@ -638,7 +515,7 @@
 
         This fallback mechanism works bidirectional.
 
-        L{app_mapping} will be reset to default values and updated with L{lang_mapping}.
+        app_mapping will be reset to default values and updated with lang_mapping.
 
         see: tmpl_appfile, tmpl_detailed, tmpl_gettext_detailed, tmpl_simple, tmpl_gettext_simple, app_mapping,
              lang_mapping"""
@@ -649,16 +526,14 @@
             # overwrite apps file always
             prev_src = None
 
-        # do nothing if the file exists
-        if prev_src:
-            return
+        # do nothing if the file exists; this should be changed
+        if prev_src: return
 
         klass = app.klass
 
         # top window and application name are mandatory
-        if not app.top_window:
-            return
-        
+        if not top_win: return
+
         # get and fill language dependent template
         tmpl = self._get_app_template(app, top_win)
         if not tmpl: return
@@ -666,15 +541,16 @@
         self._app_added = True
 
         # map to substitute template variables
+        cls = top_win.get_instantiation_class(formatter=None, cls_formatter=self.cn_class, preview=self.preview)
         self.app_mapping = {'comment_sign': self.comment_sign,
                             'header_lines': ''.join(self.header_lines),
                             'klass': self.cn_class(klass), 'name': self.app_name,
                             'overwrite': self.tmpl_overwrite % {'comment_sign': self.comment_sign},
                             'tab': self.tabs(1),
                             'textdomain': self._textdomain,
-                            'top_win_class': self.cn_class(top_win and top_win.klass or None),
+                            'top_win_class': cls,
                             'top_win_module': top_win and top_win.klass.replace('::', '_'),
-                            'top_win': app.top_window }
+                            'top_win': top_win.name }
 
         # extend default mapping with language specific mapping
         if self.lang_mapping:
@@ -691,15 +567,26 @@
             self.output_file.append(code)
 
     def add_class(self, code_obj):
-        """Add class behaves very differently for XRC output than for other languages (i.e. python):
-        since custom classes are not supported in XRC, this has effect only for true toplevel widgets,
-        i.e. frames and dialogs. For other kinds of widgets, this is equivalent to add_object"""
-        # shortcuts
-        base = code_obj.base
+        """Add an object for that a Python/C++/... class will be generated.
+        This is done for each toplevel element as well as for elements with a custom class property.
+        See the _is_class(code_obj) method above."""
         klass = code_obj.klass
 
-        if klass in self.classes and self.classes[klass].done:
-            return  # the code has already been generated
+        assert code_obj not in self.classes
+
+        try:
+            builder = self.obj_builders[code_obj.WX_CLASS]
+        except KeyError:
+            logging.error('%s', code_obj)
+            # this is an error, let the exception be raised the details are logged by the global exception handler
+            raise
+
+        ret = self.classes[code_obj] = self.ClassLines()
+        return ret
+
+    def finalize_class(self, code_obj):
+        "Finalize and write the code for the class that was started with add_class(code_obj)."
+        klass = code_obj.klass
 
         if self.multiple_files:
             # let's see if the file to generate exists, and in this case create a SourceFileContent instance
@@ -708,20 +595,25 @@
                 prev_src = None
             else:
                 prev_src = self.SourceFileContent(filename, self)
-            self._current_extra_modules = {}
         else:
-            # in this case, previous_source is the SourceFileContent instance
-            # that keeps info about the single file to generate
+            # previous_source is the SourceFileContent instance that keeps info about the single file to generate
             prev_src = self.previous_source
 
-        try:
-            builder = self.obj_builders[base]
-            mycn = getattr(builder, 'cn', self.cn)
-            mycn_f = getattr(builder, 'cn_f', self.cn_f)
-        except KeyError:
-            self._logger.error('%s', code_obj)
-            # this is an error, let the exception be raised the details are logged by the global exception handler
-            raise
+        builder = self.obj_builders[code_obj.WX_CLASS]
+        mycn = getattr(builder, 'cn', self.cn)
+
+        # collect all event handlers
+        event_handlers = self.classes[code_obj].event_handlers
+        for obj, evt, handler, evt_type in builder.get_event_handlers(code_obj):
+            event_handlers.append((obj, mycn(evt), handler, evt_type))
+
+        # try to see if there's some extra code to add to this class
+        if not self.preview:
+            extra_code = getattr(builder, 'extracode', getattr(code_obj, 'extracode', "") or "")
+            if extra_code and not extra_code in self.classes[code_obj].extra_code:
+                self.classes[code_obj].extra_code.append(extra_code)
+            # Don't add extra_code to self._current_extra_code here, that is  handled later.
+            # Otherwise we'll emit duplicate extra code for frames.
 
         if prev_src and klass in prev_src.classes:
             is_new = False
@@ -730,41 +622,15 @@
             # this class wasn't in the previous version of the source (if any)
             is_new = True
             indentation = self.tabs(self.indent_level_func_body)
-            mods = getattr(builder, 'extra_modules', [])
-            if mods:
-                for m in mods:
-                    self._current_extra_modules[m] = 1
 
+        # the code lines
         obuffer = []
-
-        if not klass in self.classes:
-            # if the class body was empty, create an empty ClassLines
-            self.classes[klass] = self.ClassLines()
-
-        # collect all event handlers
-        event_handlers = self.classes[klass].event_handlers
-        for win_id, evt, handler, evt_type in builder.get_event_handlers(code_obj):
-            event_handlers.append((win_id, mycn(evt), handler, evt_type))
-
-        # try to see if there's some extra code to add to this class
-        if not self.preview:
-            extra_code = getattr(builder, 'extracode', getattr(code_obj, 'extracode', "") or "")
-            if extra_code and not extra_code in self.classes[klass].extra_code:
-                self.classes[klass].extra_code.append(extra_code)
-            # Don't add extra_code to self._current_extra_code here, that is  handled later.
-            # Otherwise we'll emit duplicate extra code for frames.
-
         tab = indentation
 
         # generate code for first constructor stage
         code_lines = self.generate_code_ctor(code_obj, is_new, tab)
         obuffer.extend(code_lines)
 
-        # now check if there are extra lines to add to the constructor
-        if hasattr(builder, 'get_init_code'):
-            for l in builder.get_init_code(code_obj):
-                obuffer.append(tab+l)
-
         obuffer.append( self.tmpl_ctor_call_layout % {'tab':tab} )
 
         # generate code for binding events
@@ -775,50 +641,22 @@
             # end tag
             obuffer.append( '%s%s end wxGlade\n' % (tab, self.comment_sign) )
 
-            # write class function end statement
-            if self.tmpl_cfunc_end and is_new:
-                obuffer.append( self.tmpl_cfunc_end%{'tab':tab} )
+        # write class function end statement
+        if self.tmpl_cfunc_end and is_new:
+            obuffer.append( self.tmpl_cfunc_end%{'tab':tab} )
 
         # end of ctor generation
 
         # replace code inside existing constructor block
         if prev_src and not is_new:
-            # replace the lines inside the ctor wxGlade block
-            # with the new ones
+            # replace the lines inside the ctor wxGlade block with the new ones
             tag = '<%swxGlade replace %s %s>' % (self.nonce, klass, self.name_ctor)
             if not prev_src.replace(tag, obuffer):
                 # no __init__ tag found, issue a warning and do nothing
-                self.warning( "wxGlade %(ctor)s block not found for %(name)s, %(ctor)s code "
-                              "NOT generated" % { 'name': code_obj.name, 'ctor': self.name_ctor } )
-            obuffer = []
-
-        # generate code for __set_properties()
-        code_lines = self.generate_code_set_properties( builder, code_obj, is_new, tab )
-        obuffer.extend(code_lines)
-
-        # replace code inside existing __set_properties() function
-        if prev_src and not is_new:
-            # replace the lines inside the __set_properties wxGlade block
-            # with the new ones
-            tag = '<%swxGlade replace %s %s>' % (self.nonce, klass, '__set_properties')
-            if not prev_src.replace(tag, obuffer):
-                # no __set_properties tag found, issue a warning and do nothing
-                self.warning( "wxGlade __set_properties block not found for %s, "
-                              "__set_properties code NOT generated" % code_obj.name )
+                tmpl = "wxGlade %(ctor)s block not found for %(name)s, %(ctor)s code NOT generated"
+                self.warning( tmpl % { 'name': code_obj.name, 'ctor': self.name_ctor } )
             obuffer = []
 
-        # generate code for __do_layout()
-        code_lines = self.generate_code_do_layout( builder, code_obj, is_new, tab )
-        obuffer.extend(code_lines)
-
-        # replace code inside existing __do_layout() function
-        if prev_src and not is_new:
-            # replace the lines inside the __do_layout wxGlade block with the new ones
-            tag = '<%swxGlade replace %s %s>' % (self.nonce, klass, '__do_layout')
-            if not prev_src.replace(tag, obuffer):
-                # no __do_layout tag found, issue a warning and do nothing
-                self.warning("wxGlade __do_layout block not found for %s, __do_layout code NOT generated"%code_obj.name)
-
         # generate code for event handler stubs
         code_lines = self.generate_code_event_handler( code_obj, is_new, tab, prev_src, event_handlers )
 
@@ -832,9 +670,6 @@
         else:
             obuffer.extend(code_lines)
 
-        # the code has been generated
-        self.classes[klass].done = True
-
         # write "end of class" statement
         if self.tmpl_class_end and self._mark_blocks:
             obuffer.append( self.tmpl_class_end % { 'klass': self.cn_class(klass), 'comment': self.comment_sign } )
@@ -842,22 +677,17 @@
             obuffer.append( self.tmpl_class_end_nomarker )
 
         if self.multiple_files:
+            dep_list = sorted( self.classes[code_obj].dependencies | self.dependencies )  # module dependencies of class
             if prev_src:
                 prev_src.replace('<%swxGlade insert new_classes>' % self.nonce, "")
 
-                # insert the extra modules
-                prev_src.replace( '<%swxGlade extra_modules>\n' % self.nonce, list(self._current_extra_modules.keys()) )
-
                 # insert the module dependencies of this class
-                dep_list = list( self.classes[klass].dependencies.keys() )
-                dep_list.extend(self.dependencies.keys())
-                dep_list.sort()
                 code = self._tagcontent('dependencies', dep_list)
                 prev_src.replace('<%swxGlade replace dependencies>' % self.nonce, code)
                 prev_src.replace('<%swxGlade replace %s dependencies>' % (self.nonce, klass), code)  # for Perl
 
                 # insert the extra code of this class
-                extra_code = self.classes[klass].extra_code[::-1]
+                extra_code = self.classes[code_obj].extra_code[::-1]
                 code = self._tagcontent('extracode', extra_code)
                 prev_src.replace('<%swxGlade replace extracode>' % self.nonce, code)
 
@@ -873,14 +703,11 @@
             out.extend( self.header_lines )
 
             # write the module dependencies for this class
-            dep_list = list( self.classes[klass].dependencies.keys() )
-            dep_list.extend(self.dependencies.keys())
-            dep_list.sort()
             code = self._tagcontent('dependencies', dep_list, True)
             out.append(code)
 
             # insert the extra code of this class
-            code = self._tagcontent( 'extracode', self.classes[klass].extra_code[::-1], True )
+            code = self._tagcontent( 'extracode', reversed(self.classes[code_obj].extra_code), True )
             out.append(code)
 
             # write the class body
@@ -888,109 +715,84 @@
             # store the contents to filename
             self.save_file(filename, out)
         else:  # not self.multiple_files
-            for dep in self.classes[klass].dependencies:
-                self._current_extra_modules[dep] = 1
+            self.dependencies.update( self.classes[code_obj].dependencies )
+            extra_code = [l for l in reversed(self.classes[code_obj].extra_code) if not l in self._current_extra_code]
             if prev_src:
                 # if this is a new class, add its code to the new_classes list of the SourceFileContent instance
                 if is_new:
                     prev_src.new_classes.append("".join(obuffer))
-                elif self.classes[klass].extra_code:
-                    self._current_extra_code.extend(self.classes[klass].extra_code[::-1])
-                return
+                else:
+                    self._current_extra_code.extend(extra_code)
             else:
                 # write the class body onto the single source file
-                if self.classes[klass].extra_code:
-                    self._current_extra_code.extend(self.classes[klass].extra_code[::-1])
-                for line in obuffer:
-                    self.output_file.append(line)
-
-    def add_object(self, sub_obj):
-        """Adds the code to build 'sub_obj' to the class body of 'top_obj';
-        see _add_object_init(), add_object_format_name()"""
-        #sub_obj.name = self._format_name(sub_obj.name)
-        #sub_obj.parent.name = self._format_name(sub_obj.parent.name)
-
-        # get top level source code object and the widget builder instance
-        klass, builder = self._add_object_init(sub_obj)
-        if not klass or not builder:
-            return
+                self._current_extra_code.extend(extra_code)
+                self.output_file.extend(obuffer)
+
+    def add_object(self, parent_klass, parent, parent_builder, obj):
+        """Adds the code to build 'obj' to the class body in parent_klass. (Not called for toplevel elements.)"""
+
+        builder = self._get_object_builder(parent_klass, obj)
+        if not builder: return None
 
         try:
-            init, props, layout = builder.get_code(sub_obj)
+            init, final = builder.get_code(obj)
         except:
-            self._logger.error('%s', sub_obj)
+            logging.error('%s', obj)
             # this is an error, let the exception be raised the details are logged by the global exception handler
+            # XXX create handler
             raise
 
-        if not sub_obj.is_sizer:  # the object is a wxWindow instance
-            if sub_obj.node.children and not sub_obj.is_toplevel:
-                init.reverse()  # parents_init will be reversed in the end
-                klass.parents_init.extend(init)
-            else:
-                klass.init.extend(init)
-
+        if not obj.IS_SIZER and not obj.IS_CLASS:  # the object is a wxWindow instance
             if not self.preview:
-                if "extracode_pre" in sub_obj.properties and sub_obj.extracode_pre:
-                    init = sub_obj.properties["extracode_pre"].get_lines() + init
-                if "extracode_post" in sub_obj.properties and sub_obj.extracode_post:
-                    init += sub_obj.properties["extracode_post"].get_lines()
-
-            # Add a dependency of the current object on its parent
-            klass.deps.append((sub_obj, sub_obj.parent))
-            klass.child_order.append(sub_obj)
-            klass.init_lines[sub_obj] = init
+                if obj.check_prop_truth("extracode_pre"):
+                    init = obj.properties["extracode_pre"].get_lines() + init
+                if obj.check_prop_truth("extracode_post"):
+                    init += obj.properties["extracode_post"].get_lines()
+                if obj.check_prop_truth('extraproperties'):  # insert these only after extracode_post
+                    init += self.generate_code_extraproperties(obj)
 
             mycn = getattr(builder, 'cn', self.cn)
-            for win_id, evt, handler, evt_type in builder.get_event_handlers(sub_obj):
-                klass.event_handlers.append( (win_id, mycn(evt), handler, evt_type) )
+            for obj_, evt, handler, evt_type in builder.get_event_handlers(obj):
+                parent_klass.event_handlers.append( (obj_, mycn(evt), handler, evt_type) )
 
             # try to see if there's some extra code to add to this class
             if not self.preview:
-                extra_code = getattr(builder, 'extracode', getattr(sub_obj, 'extracode', "") or "" )
-                if extra_code and not extra_code in klass.extra_code:
-                    klass.extra_code.append(extra_code)
-        else:  # the object is a sizer
-            klass.sizers_init.extend(init)
-
-        klass.props.extend(props)
-        klass.layout.extend(layout)
-        if self.multiple_files and (sub_obj.is_toplevel and sub_obj.base != sub_obj.klass):
-            key = self._format_import(sub_obj.klass)
-            klass.dependencies[key] = 1
-        for dep in getattr(self.obj_builders.get(sub_obj.base), 'import_modules', []):
-            klass.dependencies[dep] = 1
+                extra_code = getattr(builder, 'extracode', getattr(obj, 'extracode', "") or "" )
+                extra_code = extra_code.rstrip()
+                if extra_code and not extra_code in parent_klass.extra_code:
+                    parent_klass.extra_code.append(extra_code)
+
+        if init:
+            parent_klass.init.append("\n")
+            parent_klass.init.extend(init)
+
+        if parent_builder:  # add to sizer or notebook
+            parent_klass.init.extend( parent_builder.get_code_per_child(parent, obj) )
+
+        if final:
+            parent_klass.final.insert(0, "\n")
+            parent_klass.final[:0] = final
+        if self.multiple_files and obj.IS_CLASS:
+            key = self._format_import(obj.klass)
+            parent_klass.dependencies.add( key )
+        import_modules = getattr(self.obj_builders.get(obj.WX_CLASS), 'import_modules', [])
+        parent_klass.dependencies.update( import_modules )
+        return builder
 
-    def _add_object_init(self, sub_obj):
-        """Perform some initial actions for L{add_object()}
-        
-        Widgets without code generator or widget that are not supporting the
-        requested wx version are blacklisted at L{blacklisted_widgets}.
-
-        @return: Top level source code object and the widget builder instance or C{None, None} in case of errors."""
-        # initialise internal variables first
-        klass = None
-        builder = None
-
-        # Check for proper source code instance
-        top_obj = self.toplevel
-        if top_obj.klass in self.classes:
-            klass = self.classes[top_obj.klass]
-        else:
-            klass = self.classes[top_obj.klass] = self.ClassLines()
+    def _get_object_builder(self, parent_klass, obj):
+        "Perform some checks and return the code builder"
 
         # Check for widget builder object
         try:
-            builder = self.obj_builders[sub_obj.base]
+            builder = self.obj_builders[obj.WX_CLASS]
         except KeyError:
             # no code generator found: write a comment about it
-            name = getattr(sub_obj, "name", "None")
+            name = getattr(obj, "name", "None")
             name = self._format_name(name)
-            msg = _('Code for instance "%s" of "%s" not generated: no suitable writer found') % (name, sub_obj.klass )
-            self._source_warning(klass, msg, sub_obj)
+            msg = _('Code for instance "%s" of "%s" not generated: no suitable writer found') % (name, obj.WX_CLASS )
+            self._source_warning(parent_klass, msg, obj)
             self.warning(msg)
-            # ignore widget later too
-            self.blacklisted_widgets[sub_obj] = 1
-            return None, None
+            return None
 
         # check for supported versions
         if hasattr(builder, 'is_widget_supported'):
@@ -1002,88 +804,23 @@
             msg = _('Code for instance "%(name)s" of "%(klass)s" was\n'
                     'not created, because the widget is not available for wx version %(requested_version)s.\n'
                     'It is available for wx versions %(supported_versions)s only.') % {
-                        'name':  self._format_name(sub_obj.name), 'klass': sub_obj.klass,
+                        'name':  self._format_name(obj.name), 'klass': obj.klass,
                         'requested_version':  str(misc.format_for_version(self.for_version)),
                         'supported_versions': ', '.join(supported_versions) }
-            self._source_warning(klass, msg, sub_obj)
+            self._source_warning(parent_klass, msg, obj)
             self.warning(msg)
-            # ignore widget later too
-            self.blacklisted_widgets[sub_obj] = 1
-            return None, None
-
-        return klass, builder
-
-    def add_property_handler(self, property_name, handler, widget_name=None):
-        """Sets a function to parse a portion of XML to get the value of the property property_name.
-        If widget_name is not None, the function is called only if the property in inside a widget whose class is
-        widget_name."""
-        if not widget_name:
-            self.global_property_writers[property_name] = handler
-        else:
-            try:
-                self._property_writers[widget_name][property_name] = handler
-            except KeyError:
-                self._property_writers[widget_name] = {property_name: handler}
-
-    def add_sizeritem(self, toplevel, sizer, obj, option, flag, border):
-        """Writes the code to add the object 'obj' to the sizer 'sizer' in the 'toplevel' object.
-        All widgets in L{blacklisted_widgets} are ignored; template is self.tmpl_sizeritem"""
-
-        # don't process widgets listed in blacklisted_widgets
-        if obj in self.blacklisted_widgets:
-            return
-
-        # the name attribute of a spacer is already formatted "<width>, <height>".
-        # This string can simply inserted in Add() call.
-        obj_name = self._format_classattr(obj)
-
-        if toplevel.klass in self.classes:
-            klass = self.classes[toplevel.klass]
-        else:
-            klass = self.classes[toplevel.klass] = self.ClassLines()
-
-        # check if sizer has to store as a class attribute
-        sizer_name = self._format_classattr(sizer)
-
-        flag = self.cn_f(flag) or '0'
-
-        if sizer.klass!="wxGridBagSizer":
-            stmt = self.tmpl_sizeritem % ( sizer_name, obj_name, option, flag, border )
-        else:
-            pos = sizer._get_row_col(obj.pos)
-            stmt = self.tmpl_gridbagsizeritem % ( sizer_name, obj_name, pos, obj.span, flag, border )
-
-        klass.layout.append(stmt)
+            return None
 
-    def add_spacer(self, toplevel, sizer, obj=None, proportion=0, flag='0', border=0):
-        # add spacer
-        if toplevel.klass in self.classes:
-            klass = self.classes[toplevel.klass]
-        else:
-            klass = self.classes[toplevel.klass] = self.ClassLines()
-        sizer_name = self._format_classattr(sizer)
-        if obj is not None:
-            size = (obj.width, obj.height)
-        else:
-            size = (0, 0)
-        flag = self.cn_f(flag) or '0'
-        if sizer.klass!="wxGridBagSizer":
-            size = self.tmpl_spacersize%size
-            stmt = self.tmpl_sizeritem % ( sizer_name, size, proportion,flag, border )
-        else:
-            # GridBagSizer
-            pos = sizer._get_row_col(obj.pos)
-            stmt = self.tmpl_gridbagsizerspacer % ( sizer_name, size[0], size[1], pos, obj.span, flag, border )
-        klass.layout.append( stmt )
+        return builder
 
-    def add_widget_handler(self, widget_name, handler, *args, **kwds):
+    def register_widget_code_generator(self, widget_name, handler, *args, **kwds):
         self.obj_builders[widget_name] = handler
 
     def create_generated_by(self):
         "Create I{generated by wxGlade} string without leading comment characters and without tailing new lines"
         generated_from = ''
-        if config.preferences.write_generated_from and common.app_tree and common.app_tree.app.filename:
-            generated_from = ' from "%s"' % common.app_tree.app.filename
+        if config.preferences.write_generated_from and common.app_tree and common.root.filename:
+            generated_from = ' from "%s"' % common.root.filename
 
         if config.preferences.write_timestamp:
             msg = 'generated by wxGlade %s on %s%s' % ( config.version, time.asctime(), generated_from )
@@ -1098,19 +835,8 @@
         nonce = '%s%s' % ( str(time.time()).replace('.', ''), random.randrange(10 ** 6, 10 ** 7) )
         return nonce
 
-    def get_property_handler(self, property_name, widget_name):
-        """Return the widget specific property handler;
-        @see: L{add_property_handler}, L{global_property_writers}, L{_property_writers}"""
-        try:
-            cls = self._property_writers[widget_name][property_name]
-        except KeyError:
-            cls = self.global_property_writers.get(property_name, None)
-        if cls:
-            return cls()
-        return None
-
     def generate_code_background(self, obj):
-        "Returns the code fragment that sets the background colour of the given object; @see: L{_get_colour()}"
+        "Returns the code fragment that sets the background colour of the given object; see: _get_colour()"
         # check if there is an code template for this property
         tmpl = self._get_code_statement('backgroundcolour')
         if not tmpl:
@@ -1127,48 +853,6 @@
         "Generate constructor code for top-level object (CodeObject instance); is_new: create a new file?"
         return []
 
-    #def generate_code_disabled(self, obj):
-        #"Returns the code fragment that disables the given object."
-        #return self._generic_code(obj, 'disabled')
-
-    def generate_code_do_layout(self, builder, code_obj, is_new, tab):
-        """Generate code for the function C{__do_layout()}.
-
-        If C{is_new} is set, this function returns list of source code for the whole function.
-        Otherwise it returns just the function body framed by "begin wxGlade" and "end wxGlade".
-
-        @param builder: Widget specific builder
-        @param code_obj: Object to generate code for (CodeObject)
-        @param is_new: Indicates if previous source code exists
-
-        see tmpl_name_do_layout, tmpl_func_do_layout, tmpl_func_empty; _generate_function()"""
-        code_lines = []
-        write = code_lines.append
-
-        # generate content of function body first
-        layout_lines = self.classes[code_obj.klass].layout
-        sizers_init_lines = self.classes[code_obj.klass].sizers_init
-
-        # check if there are extra layout lines to add
-        if hasattr(builder, 'get_layout_code'):
-            extra_layout_lines = builder.get_layout_code(code_obj)
-        else:
-            extra_layout_lines = []
-
-        if layout_lines or sizers_init_lines or extra_layout_lines:
-            sizers_init_lines.reverse()
-            for l in sizers_init_lines:
-                write(l)
-            for l in layout_lines:
-                write(l)
-            for l in extra_layout_lines:
-                write(l)
-
-        code_lines = self._generate_function( code_obj, is_new, tab, self.tmpl_name_do_layout,
-                                              self.tmpl_func_do_layout, code_lines )
-
-        return code_lines
-
     def generate_code_event_bind(self, code_obj, tab, event_handlers):
         "Generate code to bind events for 'code_obj'; event_handlers is a list of event handlers (str,str,str)"
         return []
@@ -1183,11 +867,11 @@
         write = code_lines.append
 
         if prev_src and not is_new:
-            already_there = prev_src.event_handlers.get(code_obj.klass, {})
+            already_there = prev_src.event_handlers.get(code_obj.klass, set())
         else:
-            already_there = {}
+            already_there = set()
 
-        for win_id, event, handler, unused in event_handlers:
+        for obj, event, handler, unused in event_handlers:
             # don't create handler twice
             if handler in already_there:
                 continue
@@ -1196,29 +880,24 @@
             if self.language in ('python', 'lisp') and not (prev_src and not is_new):
                 write('\n')
             write(self.tmpl_func_event_stub % {'tab': tab, 'klass': self.cn_class(code_obj.klass), 'handler': handler })
-            already_there[handler] = 1
+            already_there.add( handler )
 
         return code_lines
 
     def generate_code_extraproperties(self, obj):
         "Returns a list of code fragments that set extra properties for the given object"
         tmpl = self._get_code_statement('extraproperties')
-        if not tmpl:
-            return []
+        if not tmpl: return []
         objname = self.format_generic_access(obj)
+        klass = self.cn_class( obj.get_prop_value("class", obj.WX_CLASS) )
 
         ret = []
-        for name, value in sorted(obj.extraproperties):
+        for name, value in obj.extraproperties:
             name_cap = name[0].upper() + name[1:]
-            stmt = tmpl % { 'klass': self.cn_class(obj.klass), 'objname': objname, 'propname': name,
-                            'propname_cap': name_cap, 'value': value }
+            stmt = tmpl % { 'klass':klass, 'objname':objname, 'propname':name, 'propname_cap':name_cap, 'value':value }
             ret.append(stmt)
         return ret
 
-    #def generate_code_focused(self, obj):
-        #"Returns the code fragment that get the focus to the given object"
-        #return self._generic_code(obj, 'focused')
-
     def generate_code_font(self, obj):
         "Returns the code fragment that sets the font of the given object"
         stmt = None
@@ -1250,7 +929,7 @@
         return stmt
 
     def generate_code_foreground(self, obj):
-        "Returns the code fragment that sets the foreground colour of the given object; @see: L{_get_colour()}"
+        "Returns the code fragment that sets the foreground colour of the given object; see: _get_colour()"
         # check if there is an code template for this property
         tmpl = self._get_code_statement('foregroundcolour' )
         if not tmpl:
@@ -1263,72 +942,39 @@
         stmt = tmpl % { 'objname':objname, 'value':color }
         return stmt
 
-    #def generate_code_hidden(self, obj):
-        #"Returns the code fragment that hides the given object"
-        #return self._generic_code(obj, 'hidden')
-
     def generate_code_id(self, obj, id=None):
         """Generate the code for the widget ID.
 
-        The parameter C{id} is evaluated first. An empty string for C{id} returns C{'', 'wxID_ANY'}.
+        The parameter id is evaluated first. An empty string for id returns ('', 'wxID_ANY').
 
         Returns a tuple of two string. The two strings are:
          1. A line to the declare the variable. It's empty if the object id is a constant
          2. The value of the id
 
-        @param obj: An instance of L{xml_parse.CodeObject}
-        @param id:  Widget ID definition as String."""
+        obj: An instance of xml_parse.CodeObject
+        id:  Widget ID definition as String."""
         raise NotImplementedError
 
-    def generate_code_set_properties(self, builder, code_obj, is_new, tab):
-        """Generate code for the function C{__set_properties()}.
-
-        If C{is_new} is set, this function returns a list of source code for the whole function.
-        Otherwise it returns just the function body framed by "begin wxGlade" and "end wxGlade".
-
-        @param builder: Widget specific builder
-        @param code_obj: Object to generate code for (CodeObject instance)
-        @param is_new: Indicates if previous source code exists
-
-        see tmpl_name_set_properties, tmpl_func_set_properties, tmpl_func_empty; _generate_function()"""
-        # check if there are property lines to add
-        _get_properties = getattr( builder, 'get_properties_code', self.generate_common_properties )
-        property_lines = _get_properties(code_obj)
-        property_lines.extend(self.classes[code_obj.klass].props)
-
-        code_lines = self._generate_function( code_obj, is_new, tab,
-                                              self.tmpl_name_set_properties, self.tmpl_func_set_properties,
-                                              property_lines )
-
-        return code_lines
-
     def generate_code_size(self, obj):
         "Returns the code fragment that sets the size of the given object."
         raise NotImplementedError
 
-    #def generate_code_tooltip(self, obj):
-        #"Returns the code fragment that sets the tooltip of the given object."
-        #return self._generic_code(obj, 'tooltip')
-
-    def generate_common_properties(self, widget):
+    def generate_code_common_properties(self, widget):
         """generates the code for various properties common to all widgets (background and foreground colours, font,...)
         returns a list of strings containing the generated code"""
         out = []
-        props = [p.name for p in widget.get_properties() if p.is_active()]
-        if widget.check_prop('size') and widget.base!='wxFrame':
+        if widget.check_prop('size') and not widget.IS_CLASS:
             out.append(self.generate_code_size(widget))
-        if widget.check_prop('background'): out.append(self.generate_code_background(widget))
-        if widget.check_prop('foreground'): out.append(self.generate_code_foreground(widget))
-        if widget.check_prop('font'):       out.append(self.generate_code_font(widget))
+        if widget.check_prop_truth('background'): out.append(self.generate_code_background(widget))
+        if widget.check_prop_truth('foreground'): out.append(self.generate_code_foreground(widget))
+        if widget.check_prop('font'):             out.append(self.generate_code_font(widget))
         # tooltip
-        if widget.check_prop('tooltip')  and widget.tooltip:   out.append( self._generic_code(widget, 'tooltip') )
+        if widget.check_prop('tooltip')  and widget.tooltip:  out.append( self._generic_code(widget, 'tooltip') )
         # trivial boolean properties
         if widget.check_prop('disabled') and widget.disabled: out.append( self._generic_code(widget, 'disabled') )
         if widget.check_prop('focused' ) and widget.focused:  out.append( self._generic_code(widget, 'focused') )
         if widget.check_prop('hidden'  ) and widget.hidden:   out.append( self._generic_code(widget, 'hidden') )
 
-        if widget.check_prop('extraproperties') and not self.preview:
-            out.extend(self.generate_code_extraproperties(widget))
         out = [l for l in out if l is not None]
         return out
 
@@ -1408,12 +1054,9 @@
             if isinstance(line, compat.unicode):
                 return line.encode(self.app_encoding)
             return line
-        try:
-            tmp = [encode(line) for line in tmp if line]
-        except UnicodeEncodeError as inst:
-            raise errors.WxgOutputUnicodeError( self.app_encoding,
-                                                inst.object[inst.start:inst.end].encode('unicode-escape'),
-                                                inst.start, inst.end )
+
+        # UnicodeEncodeError will be handled in application.generate_code
+        tmp = [encode(line) for line in tmp if line]
 
         # check for necessary sub directories e.g. for Perl or Python modules
         dirname = os.path.dirname(filename)
@@ -1421,16 +1064,17 @@
             try:
                 os.makedirs(dirname)
             except:
-                self._logger.exception( _('Can not create output directory "%s"'), dirname )
+                logging.exception( _('Can not create output directory "%s"'), dirname )
 
         # save the file now
         try:
             common.save_file(filename, tmp, 'codegen')
-        except (errors.WxgBaseException, EnvironmentError):
-            # EnvironmentError's will be caught at a higher level
+        except (UnicodeEncodeError, EnvironmentError):
+            # these will be handled inside application.generate_code
             raise
         except:
-            self._logger.exception(_('Internal Error'))
+            if config.debugging: raise
+            logging.exception(_('Internal Error'))
         if mainfile and sys.platform in ['linux2', 'darwin']:
             try:
                 # make the file executable
@@ -1439,11 +1083,13 @@
                 # this isn't necessarily a bad error
                 self.warning(_('Changing permission of file "%s" failed: %s') % (filename, str(e)))
 
+        logging.info('Generated %s', filename)
+
     def store_as_attr(self, obj):
         """Returns True if 'obj' should be added as an attribute of its parent's class,
-        False if it should be created as a local variable of C{__do_layout}.
+        False if it should be created as a local variable.
         
-        The function returns True of the object klass is listed in L{classattr_always}.
+        The function returns True of the object klass is listed in classattr_always.
 
         The function returns True for all widgets except sizers, if
          - the property exists and is an integer greater equal 1
@@ -1453,16 +1099,15 @@
         The function returns True for sizers, if
          - the property exists and is an integer greater equal 1
 
-        @see: L{classattr_always}
+        see: classattr_always
         """
-        if obj.klass in self.classattr_always:
+        if not obj.IS_NAMED: return False
+        if obj.WX_CLASS in self.classattr_always:
             return True
         if 'attribute' in obj.properties:
             return obj.attribute
 
-        if obj.is_sizer:
-            return False
-        if obj.classname in ("wxStaticText","wxHyperlinkCtrl","wxStaticBitmap","wxStaticLine"):
+        if obj.WX_CLASS in ("wxStaticText","wxHyperlinkCtrl","wxStaticBitmap","wxStaticLine"):
             return False
         return True  # this is the default
 
@@ -1473,7 +1118,7 @@
     def warning(self, msg):
         "Show a warning message"
         if self._show_warnings:
-            self._logger.warning(msg)
+            logging.warning(msg)
 
     def _remove_tag_re(self, source, re_string):
         "Remove all tags that match the regular expression"
@@ -1488,9 +1133,9 @@
         This may happen if we're not generating multiple files, and one of the container class names is changed.
 
         The indentation of the string depends values detected during the initial parsing of the source file.
-        Those values are stored in L{BaseSourceFileContent.spaces}.
+        Those values are stored in BaseSourceFileContent.spaces.
 
-        @param source: Source content string with tags to replace"""
+        source: Source content string with tags to replace"""
 
         tags = re.compile( r'(<%swxGlade replace ([a-zA-Z_]\w*) +[.\w]+>)' % self.nonce)
         for i,line in enumerate(source.content):
@@ -1509,7 +1154,6 @@
             else:
                 command = ""
             comment = comment % {'command':command, 'comment_sign':self.comment_sign, 'indent':indent }
-            #source = source.replace(tag[0], comment)
             source.content[i] = comment
 
     def _do_replace_backslashes(self, match):
@@ -1522,8 +1166,7 @@
         # \" -> \\"
         if match.group(0).startswith('\\'):
             return '\\\"'
-        else:
-            return '\\"'
+        return '\\"'
 
     def _file_exists(self, filename):
         "Check if the file exists; separated for debugging purposes"
@@ -1534,7 +1177,7 @@
         return name
 
     def _format_classattr(self, obj):
-        "Format the object name to store as a class attribute; obj: Instance of L{xml_parse.CodeObject}"
+        "Format the object name to store as a class attribute; obj: Instance of xml_parse.CodeObject"
         if not obj:
             return ''
         elif not getattr(obj, 'name', None):
@@ -1556,8 +1199,8 @@
 
     def _format_style(self, style, code_obj):
         """Return the formatted styles to insert into constructor code.
-        The function just returned L{tmpl_style}. Write a derived version implementation if more logic is needed."""
-        if code_obj.is_toplevel:
+        The function just returned tmpl_style. Write a derived version implementation if more logic is needed."""
+        if code_obj.IS_TOPLEVEL or (not self.preview and code_obj.check_prop_truth("class")):
             if style:
                 return self.tmpl_toplevel_style
             return self.tmpl_toplevel_style0
@@ -1568,12 +1211,12 @@
     def _generic_code(self, obj, prop_name):
         """Create a code statement for calling a method e.g. to hide a widget.
 
-        @param obj:       Instance of L{xml_parse.CodeObject}
-        @param prop_name: Name of the property to set
+        obj:       Instance of xml_parse.CodeObject
+        prop_name: Name of the property to set
 
-        @return: Code statement or None
+        returns Code statement or None
 
-        @see: L{_code_statements}"""
+        see: _code_statements"""
 
         value = obj.properties[prop_name].get_value()
         if isinstance(value, compat.basestring): value = self.quote_str(obj.tooltip)
@@ -1584,18 +1227,17 @@
 
     def _get_code_statement(self, prop_name):
         """Return non-formatted code statement related to prop_name.
-        This function handled the properties extensions described in L{_code_statements}.
+        This function handled the properties extensions described in _code_statements.
 
-        @param prop_name: Name of the property to set
-        @return: Code statement or None
+        prop_name: Name of the property to set
+        returns Code statement or None
 
-        @see: L{_code_statements}"""
+        see: _code_statements"""
 
         prop_name_major = '%s_%d' % ( prop_name, self.for_version[0] )
         prop_name_detailed = '%s_%d%d' % ( prop_name, self.for_version[0], self.for_version[1] )
 
-        # check if there is an code template for this prop_name
-        # most specific to generic
+        # check if there is an code template for this prop_name most specific to generic
         if prop_name_detailed in self._code_statements:
             prop_name_use = prop_name_detailed
         elif prop_name_major in self._code_statements:
@@ -1609,7 +1251,7 @@
 
     def format_generic_access(self, obj):
         """Format a generic and language specific access to the given object.
-        For example: C{self}, C{$self} or C{$self->}."""
+        For example: 'self'}, '$self' or '$self->'."""
         raise NotImplementedError
 
     def _get_colour(self, colourvalue):
@@ -1687,7 +1329,7 @@
         def repl(matchobj):
             dec = ord(matchobj.group(0))
             if dec > 127:
-                return b'\u00' + ('%x'% dec).encode()
+                return b'\\u00' + ('%x'% dec).encode()
             return matchobj.group(0)
 
         s = re.sub(b'[\\x80-\\xFF]{1}', repl, s)
@@ -1699,12 +1341,12 @@
         
         The message msg will be split into single lines and every line will be properly formatted.
         
-        @param klass: Instance of L{ClassLines} to add the code in
-        @param msg:   Multiline message
+        klass: Instance of ClassLines to add the code in
+        msg:   Multiline message
         
-        @param sub_obj: Object to generate code for (CodeObject instance)
+        sub_obj: Object to generate code for (CodeObject instance)
         
-        @see: L{_format_comment()}"""
+        see: _format_comment()"""
         code_lines = []
 
         # add leading empty line
@@ -1722,13 +1364,7 @@
         code_lines.append('\n')
 
         # Add warning message to source code
-        # TODO: Remove next three lines after C++ code gen uses dependencies like Python, Perl and Lisp
-        if self.language == 'C++':
-            klass.init.extend(code_lines)
-        else:
-            klass.deps.append((sub_obj, sub_obj.parent))
-            klass.child_order.append(sub_obj)
-            klass.init_lines[sub_obj] = code_lines
+        klass.init.extend(code_lines)
 
     def _string_to_colour(self, s):
         """Convert a colour values out of a hex string to comma separated decimal values.
@@ -1741,25 +1377,24 @@
         return '%d, %d, %d' % ( int(s[1:3], 16), int(s[3:5], 16), int(s[5:], 16) )
 
     def _tagcontent(self, tag, content, newline=False):
-        """Returns content embedded between C{begin wxGlade} and C{end wxGlade} sequence.
+        """Returns content embedded between 'begin wxGlade' and 'end wxGlade' sequence.
 
-        @return: Embedded content string
-        @param tag: used in C{begin wxGlade} statement to indicate different blocks
-        @param content: Content to enter as string or list of strings
-        @param newline: Add a tailing empty line?"""
+        returns: Embedded content string
+        tag:     used in 'begin wxGlade' statement to indicate different blocks
+        content: Content to enter as string or list of strings
+        newline: Add a tailing empty line?"""
         code_list = []
         if self._mark_blocks:
             code_list.append( '%s begin wxGlade: %s' % (self.comment_sign, tag) )
-        if isinstance(content, list):
-            for entry in content:
-                code_list.append(entry.rstrip())
-        elif isinstance(content, compat.basestring):
+        if isinstance(content, compat.basestring):
             # don't append empty content
             _content = content.rstrip()
             if _content:
                 code_list.append(_content)
-        else:
-            raise AssertionError('Unknown content type: %s' % type(content))
+        else:  # list or iterator
+            for entry in content:
+                code_list.append(entry.rstrip())
+
         if self._mark_blocks:
             code_list.append( '%s end wxGlade' % self.comment_sign )
         # newline for "end wxGlade" line
@@ -1770,25 +1405,5 @@
 
     def copy(self):
         """Return a deep copy of the current instance.
-        The instance will be reinitialised with defaults automatically in L{__setstate__()}."""
-        new_codegen = copy.deepcopy(self)
-        return new_codegen
-
-    def __getstate__(self):
-        """Return the state dict of this instance except the L{_logger} and the L{classes} attributes.
-        Both attributes caused copy errors due to file locking resp. weak references in XML SAX module."""
-        state = self.__dict__.copy()
-        del state['_logger']
-        del state['classes']
-        return state
-
-    def __setstate__(self, state):
-        """Update the instance using values from dict 'state'.
-        The code generator will be reinitialised after the state has been updated; see L{new_project()}"""
-
-        self.__dict__.update(state)
-
-        # re-initialise logger instance deleted from __getstate__ and instance variables
-        self._logger = logging.getLogger(self.__class__.__name__)
-        #self.new_project()
-
+        The instance will be reinitialised with defaults automatically in __setstate__()."""
+        return copy.deepcopy(self)
diff -Nru wxglade-0.9.6/codegen/lisp_codegen.py wxglade-1.0.1/codegen/lisp_codegen.py
--- wxglade-0.9.6/codegen/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/codegen/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,18 +1,9 @@
 """\
 Lisp code generator
 
-How the code is generated: every time the end of an object is reached during
-the parsing of the xml tree, either the function 'add_object' or the function
-'add_class' is called: the latter when the object is a toplevel one, the former
-when it is not. In the last case, 'add_object' calls the appropriate ``writer''
-function for the specific object, found in the 'obj_builders' dict. Such
-function accepts one argument, the CodeObject representing the object for
-which the code has to be written, and returns 3 lists of strings, representing
-the lines to add to the '__init__', '__set_properties' and '__do_layout'
-methods of the parent object.
-
 @copyright: 2005 Surendra K Singhi <efuzzyone@users.sourceforge.net>
 @copyright: 2012-2016 Carsten Grohmann
+@copyright: 2019 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -20,8 +11,7 @@
 import os.path
 import re
 
-from codegen import BaseLangCodeWriter, BaseSourceFileContent, BaseWidgetHandler
-import errors
+from codegen import BaseLangCodeWriter, BaseSourceFileContent
 import wcodegen
 
 
@@ -67,6 +57,7 @@
         triple_quote_str = None
         tmp_in = self._load_file(self.name)
         out_lines = []
+        check_old_methods = []  # list of indices with set_properties or do_layout
         for line in tmp_in:
             quote_index = -1
             if not inside_triple_quote:
@@ -97,7 +88,7 @@
                     self.new_classes_inserted = True
                 self.class_name = result.group(1)
                 self.class_name = self.format_classname(self.class_name)
-                self.classes[self.class_name] = 1  # add the found class to the list of classes of this module
+                self.classes.add( self.class_name )  # add the found class to the list of classes of this module
                 out_lines.append(line)
             elif not inside_block:
                 result = self.rec_block_start.match(line)
@@ -115,21 +106,20 @@
                     if not self.class_name:
                         out_lines.append( '<%swxGlade replace %s>' % (self.nonce, which_block) )
                     else:
+                        if which_block in ("__do_layout","__set_properties"):
+                            # probably to be removed
+                            check_old_methods.append( len(out_lines) )
                         out_lines.append( '<%swxGlade replace %s %s>' % (self.nonce, which_class, which_block) )
                 else:
                     result = self.rec_event_handler.match(line)
                     if not inside_triple_quote and result:
                         which_handler = result.group('handler')
                         which_class = self.format_classname(result.group('class'))
-                        self.event_handlers.setdefault(
-                            which_class, {})[which_handler] = 1
+                        self.event_handlers.setdefault( which_class, set() ).add( which_handler )
                     if self.class_name and self.is_end_of_class(line):
                         # add extra event handlers here...
                         out_lines.append( '<%swxGlade event_handlers %s>' % (self.nonce, self.class_name) )
                     out_lines.append(line)
-                    if self.is_import_line(line):
-                        # add a tag to allow extra modules
-                        out_lines.append( '<%swxGlade extra_modules>\n' % self.nonce )
             else:
                 # ignore all the lines inside a wxGlade block
                 if self.rec_block_end.match(line):
@@ -138,17 +128,15 @@
             # if we are here, the previous ``version'' of the file did not contain any class, so we must add the
             # new_classes tag at the end of the file
             out_lines.append('<%swxGlade insert new_classes>' % self.nonce)
-        # set the ``persistent'' content of the file
-        self.content = out_lines
-
-    def is_import_line(self, line):
-        return line.startswith('(use-package :wx')
 
+        # when moving from 0.9 to 1.0: remove empty methods "do_layout" and "set_properties"
+        while check_old_methods:
+            i = check_old_methods.pop(-1)
+            if out_lines[i+1].strip()==')':  # just end of block -> remove incl. trailing empty lines
+                self._remove_method(out_lines, i-1, i+1)
 
-
-class WidgetHandler(BaseWidgetHandler):
-    pass
-
+        # set the ``persistent'' content of the file
+        self.content = out_lines
 
 
 class LispCodeWriter(BaseLangCodeWriter, wcodegen.LispMixin):
@@ -172,12 +160,6 @@
     class_separator = '.'
     classattr_always = ['wxBoxSizer', 'wxStaticBoxSizer', 'wxGridSizer', 'wxFlexGridSizer']
 
-    #global_property_writers = {
-        #'font':            BaseLangCodeWriter.FontPropertyHandler,
-        #'events':          BaseLangCodeWriter.EventsPropertyHandler,
-        #'extraproperties': BaseLangCodeWriter.ExtraPropertiesPropertyHandler,
-        #}
-
     indent_level_func_body = 2
 
     name_ctor = '__init__'
@@ -186,19 +168,13 @@
 
     SourceFileContent = SourceFileContent
 
-    tmpl_name_do_layout = '__do_layout'
-    tmpl_name_set_properties = '__set_properties'
+    tmpl_sizeritem = '(wxSizer_AddWindow (%s obj) (%s obj) %s %s %s nil)\n'  # will be overwritten and restored
 
     tmpl_cfunc_end = '%(tab)s)\n'
 
     tmpl_class_end = '\n%(comment)s end of class %(klass)s\n\n\n'
     tmpl_class_end_nomarker = '\n\n\n'
 
-    tmpl_func_do_layout = '\n' \
-                          '(defmethod do-layout ((obj %(klass)s))\n' \
-                          '%(content)s' \
-                          '%(tab)s)\n'
-
     tmpl_func_event_stub = """\
 (defun %(handler)s (function data event) ;;; wxGlade: %(klass)s.<event_handler>
 %(tab)s(print "Event handler '%(handler)s' not implemented!")
@@ -206,11 +182,6 @@
 %(tab)s%(tab)s(wxEvent:wxEvent_Skip event)))
 """
 
-    tmpl_func_set_properties = '\n' \
-                          '(defmethod set-properties ((obj %(klass)s))\n' \
-                          '%(content)s' \
-                          '%(tab)s)\n'
-
     tmpl_func_empty = '%(tab)spass\n'
 
     tmpl_appfile = """\
@@ -285,7 +256,7 @@
             ret = self.tmpl_detailed
         if ret:
             if not self._mark_blocks:
-                ret.replace(";;; end of class %(klass)s\n", "")
+                ret = ret.replace(";;; end of class %(klass)s\n", "")
             return ret
         
         # check for templates for simple startup code
@@ -293,6 +264,7 @@
             return self.tmpl_gettext_simple
         elif not klass and not self._use_gettext:
             return self.tmpl_simple
+
     def init_lang(self, app_attrs):
         self.class_lines = []
 
@@ -302,21 +274,15 @@
             """(ffi:default-foreign-language :stdc)\n\n""",
             ]
 
-        self.dependencies = {
-            '(use-package :wxCL)':         1,
-            '(use-package :wxFrame)':      1,
-            '(use-package :wx_main)':      1,
-            '(use-package :wx_wrapper)':   1,
-            '(use-package :wxWindow)':     1,
-            '(use-package :wxColour)':     1,
-            '(use-package :wxEvtHandler)': 1,
-            '(use-package :wxEvent)':      1,
-            }
+        self.dependencies = {'(use-package :wxCL)', '(use-package :wxFrame)', '(use-package :wx_main)',
+            '(use-package :wx_wrapper)', '(use-package :wxWindow)',
+            '(use-package :wxColour)', '(use-package :wxEvtHandler)', '(use-package :wxEvent)'}
 
     def check_values(self):
-        BaseLangCodeWriter.check_values(self)
-        if self.for_version > (2, 8):
-            raise errors.WxgLispWx3NotSupported("%d.%d" % self.for_version)
+        error = BaseLangCodeWriter.check_values(self)
+        if not error and self.for_version > (2, 8):
+            return "Generating Lisp code is only supported for wx version 2.8"
+        return None
 
     def add_app(self, app, top_win_class):
         top_win = app.top_window
@@ -327,84 +293,61 @@
         self.lang_mapping = { 'top_win': self._format_name(top_win), }
         BaseLangCodeWriter.add_app(self, app, top_win_class)
 
-    def add_object(self, sub_obj):
+    def add_object(self, parent_klass, parent, parent_builder, obj):
+        # get the widget builder instance
+
         # the lisp code gen add some hard coded depedencies
         # TODO: Move the hard coded dependencies to the widgets resp. sizers
 
-        # XXX temporarily disabled...
-        #sub_obj.name = self._format_name(sub_obj.name)
-        #sub_obj.parent.name = self._format_name(sub_obj.parent.name)
-
-        # get top level source code object and the widget builder instance
-        klass, builder = self._add_object_init(sub_obj)
-        if not klass or not builder:
-            return
-
-        if sub_obj.name not in ("spacer","sizerslot"):
-            self.class_lines.append( self._format_name(sub_obj.name) )
-        if (sub_obj.klass == "wxBoxSizer"  or sub_obj.klass == "wxStaticBoxSizer" or
-            sub_obj.klass == "wxGridSizer" or sub_obj.klass == "wxFlexGridSizer"):
-            self.dependencies['(use-package :wxSizer)'] = 1
-        else:
-            if sub_obj.klass not in ("spacer", "sizerslot"):
-                key = '(use-package :%s)' % sub_obj.klass
-                self.dependencies[key] = 1
-
-        if sub_obj.klass == "wxMenuBar":
-            self.dependencies['(use-package :wxMenu)'] = 1
-
-        BaseLangCodeWriter.add_object(self, sub_obj)
-
-    def add_sizeritem(self, toplevel, sizer, obj, option, flag, border):
-        # XXX remove this hack
-        if obj.is_sizer:
-            self.tmpl_sizeritem = '(wxSizer_AddSizer (%s obj) (%s obj) %s %s %s nil)\n'
+        builder = self._get_object_builder(parent_klass, obj)
+        if not builder: return None
+
+        if obj.IS_NAMED:
+            self.class_lines.append( self._format_name(obj.name) )
+        if obj.WX_CLASS in ("wxBoxSizer", "wxStaticBoxSizer", "wxGridSizer", "wxFlexGridSizer"):
+            self.dependencies.add( '(use-package :wxSizer)' )
         else:
-            self.tmpl_sizeritem = '(wxSizer_AddWindow (%s obj) (%s obj) %s %s %s nil)\n'
+            if obj.WX_CLASS not in ("spacer", "sizerslot"):
+                self.dependencies.add( '(use-package :%s)'%obj.get_instantiation_class() )
 
-        BaseLangCodeWriter.add_sizeritem( self, toplevel, sizer, obj, option, flag, border )
+        if obj.WX_CLASS == "wxMenuBar":
+            self.dependencies.add( '(use-package :wxMenu)' )
 
-    def add_spacer(self, toplevel, sizer, obj=None, proportion=0, flag='0', border=0):
-        # XXX remove this hack
-        self.tmpl_sizeritem = '(wxSizer_AddWindow (%s obj) (%s obj) %s %s %s nil)\n'
-        BaseLangCodeWriter.add_spacer(self, toplevel, sizer, obj, proportion, flag, border)
+        return BaseLangCodeWriter.add_object(self, parent_klass, parent, parent_builder, obj)
 
     def generate_code_background(self, obj):
-        self.dependencies['(use-package :wxColour)'] = 1
+        self.dependencies.add( '(use-package :wxColour)' )
         return BaseLangCodeWriter.generate_code_background(self, obj)
 
     def generate_code_ctor(self, code_obj, is_new, tab):
         code_lines = []
         write = code_lines.append
 
-        builder = self.obj_builders[code_obj.base]
+        builder = self.obj_builders[code_obj.WX_CLASS]
         mycn = getattr(builder, 'cn', self.cn)
         mycn_f = getattr(builder, 'cn_f', self.cn_f)
 
         # custom base classes support
-        custom_base = getattr( code_obj, 'custom_base', code_obj.properties.get('custom_base', None) )
-        if self.preview or (custom_base and not custom_base.strip()):
-            custom_base = None
+        custom_base = code_obj.check_prop_nodefault('custom_base') and code_obj.custom_base.strip() or None
 
         # generate constructor code
         if is_new:
-            base = mycn(code_obj.base)
-            klass = code_obj.klass
-            write('\n(defclass %s()\n' % klass)
+            base = mycn(code_obj.WX_CLASS)
+            write('\n(defclass %s()\n' % code_obj.klass)
             write(tab + "((top-window :initform nil :accessor slot-top-window)")
             for l in self.class_lines:
                 write("\n")
                 write(tab + "(" + l + " :initform nil :accessor slot-" + l + ")")
             write("))\n")
 
-            write("\n(defun make-%s ()\n" % klass)
-            write(tab + "(let ((obj (make-instance '%s)))\n" % klass)
+            write("\n(defun make-%s ()\n" % code_obj.klass)
+            write(tab + "(let ((obj (make-instance '%s)))\n" % code_obj.klass)
             write(tab + "  (init obj)\n")
             write(tab + "  (set-properties obj)\n")
             write(tab + "  (do-layout obj)\n")
             write(tab + "  obj))\n")
 
-            write('\n(defmethod init ((obj %s))\n' % klass)
+            write('\n(defmethod init ((obj %s))\n' % code_obj.klass)
             write("\"Method creates the objects contained in the class.\"\n")
 
         elif custom_base:
@@ -419,6 +362,11 @@
                                             'function':self.name_ctor, 'klass':self.cn_class(code_obj.klass),
                                             'tab':tab} )
 
+        # the optional initial code from the code properties
+        if not self.preview and code_obj.check_prop("extracode_pre"):
+            for l in code_obj.properties["extracode_pre"].get_lines():
+                write(tab + l)
+
         style_p = code_obj.properties.get("style")
         if style_p and style_p.value_set != style_p.default_value:
             m_style = mycn_f( style_p.get_string_value() )
@@ -430,33 +378,32 @@
         if 'size' in code_obj.properties and code_obj.properties["size"].is_active():
             write( tab + self.generate_code_size(code_obj) )
 
-        # classes[code_obj.klass].deps now contains a mapping of child to
-        # parent for all children we processed...
-        object_order = []
-        for obj in self.classes[code_obj.klass].child_order:
-            # Don't add it again if already present
-            if obj in object_order:
-                continue
-
-            object_order.append(obj)
-
-            # Insert parent and ancestor objects before the current object
-            current_object = obj
-            for child, parent in self.classes[code_obj.klass].deps[:]:
-                if child is current_object:
-                    if parent not in object_order:
-                        idx = object_order.index(current_object)
-                        object_order.insert(idx, parent)
-                    current_object = parent
-
-                    # We processed the dependency: remove it
-                    self.classes[code_obj.klass].deps.remove((child, parent))
-
-        # Write out the initialisation in the order we just generated
-        for obj in object_order:
-            if obj in self.classes[code_obj.klass].init_lines:
-                for l in self.classes[code_obj.klass].init_lines[obj]:
-                    write(tab + l)
+        for l in builder.get_properties_code(code_obj):
+            write(tab + l)
+
+        if code_obj.check_prop_truth('extraproperties'):
+            for l in builder.generate_code_extraproperties(code_obj):
+                write(tab + l)
+
+        # the initial and final code for the contained elements
+        for l in self.classes[code_obj].init:
+            write(tab + l)
+        if self.classes[code_obj].final:
+            write(tab + "\n")
+            for l in self.classes[code_obj].final:
+                write(tab + l)
+
+        # now check if there is initial and final code for the element itself
+        for l in builder.get_init_code(code_obj):
+            write(tab+l)
+
+        for l in builder.get_layout_code(code_obj):
+            write(tab + l)
+
+        # the optional final code from the code properties
+        if not self.preview and code_obj.check_prop("extracode_post"):
+            for l in code_obj.properties["extracode_post"].get_lines():
+                write(tab + l)
 
         return code_lines
 
@@ -467,10 +414,8 @@
         if event_handlers:
             write('\n')
 
-        for win_id, event, handler, unused in event_handlers:
-            if win_id.startswith('#'):
-                win_id = win_id[1:]
-            win_id = self._format_name(win_id)
+        for obj, event, handler, unused in event_handlers:
+            win_id = self._format_name('obj.%s' % obj.name if not obj.IS_CLASS else 'obj')
 
             write( "%(tab)s(wxEvtHandler_Connect (slot-top-window obj) %(win_id)s (exp%(event)s)\n%(tab2)s" \
                    "(wxClosure_Create #'%(handler)s obj))\n" % 
@@ -479,25 +424,24 @@
         return code_lines
 
     def generate_code_font(self, obj):
-        self.dependencies['(use-package :wxFont)'] = 1
+        self.dependencies.add( '(use-package :wxFont)' )
         return BaseLangCodeWriter.generate_code_font(self, obj)
 
     def generate_code_foreground(self, obj):
-        self.dependencies['(use-package :wxColour)'] = 1
+        self.dependencies.add( '(use-package :wxColour)' )
         return BaseLangCodeWriter.generate_code_foreground(self, obj)
 
     def generate_code_id(self, obj, id=None):
         if id is None:
             id = obj.window_id
         if not id:
-            if obj is not None and "stockitem" in obj.properties and obj.stockitem:
+            if obj is not None and obj.check_prop_truth("stockitem"):
                 return '', self.cn("wxID_" + obj.stockitem)
             return '', self.cn('wxID_ANY')
         tokens = id.split('=', 1)
-        if len(tokens) == 2:
-            name, val = tokens
-        else:
+        if len(tokens) != 2:
             return '', self.cn(tokens[0])   # we assume name is declared elsewhere
+        name, val = tokens
         if not name:
             return '', self.cn(val)
         name = name.strip()
@@ -515,14 +459,11 @@
         objname = self.format_generic_access(obj)
         size = obj.properties["size"].get_string_value()
         use_dialog_units = (size[-1] == 'd')
-        if not obj.parent:
-            method = 'wxWindow_SetSize'
-        else:
-            method = 'SetMinSize'
+        method = 'SetMinSize'  if obj.parent_window else  'wxWindow_SetSize'
+
         if use_dialog_units:
             return '(%s %s(%s(%s (%s))))\n' % ( method, objname, self.cn('wxDLG_SZE'), objname, size[:-1] )
-        else:
-            return '%s.%s((%s))\n' % (objname, method, size)
+        return '%s.%s((%s))\n' % (objname, method, size)
 
     def _quote_str(self, s):
         if self._use_gettext:
@@ -530,9 +471,6 @@
         else:
             return '"%s"' % s
 
-    def add_object_format_name(self, name):
-        return '#obj.%s' % name
-
     def _format_classattr(self, obj):
         res = BaseLangCodeWriter._format_classattr(self, obj)
         if not res:
@@ -541,7 +479,7 @@
             return obj.name
         # spacer.name is "<width>, <height>" already, but wxLisp expect
         # a tuple instead of two single values
-        elif obj.klass in ('spacer','sizerslot'):
+        elif obj.WX_CLASS in ('spacer','sizerslot'):
             return '(%s)' % obj.name
         # wxList use class attributes always (unfortunately)
 #        elif self.store_as_attr(obj):
@@ -550,11 +488,10 @@
         return 'slot-%s' % self._format_name(obj.name)
 
     def _format_import(self, klass):
-        stmt = '(require "%s")\n' % klass
-        return stmt
+        return '(require "%s")\n' % klass
 
     def _format_style(self, style, code_obj):
-        builder = self.obj_builders[code_obj.base]
+        builder = self.obj_builders[code_obj.WX_CLASS]
         mycn_f = getattr(builder, 'cn_f', self.cn_f)
 
         if not style: return ''
@@ -562,34 +499,31 @@
         if not style: return ''
         style = style.strip().replace('.', '')
 
-        if code_obj.base == "wxFrame":
+        if code_obj.WX_CLASS == "wxFrame":
             stmt = '%%(tab)s(setf (slot-top-window obj) (wxFrame_create nil wxID_ANY \"\" -1 -1 -1 -1 %s))\n' % style
-        elif code_obj.base == "wxDialog":
+        elif code_obj.WX_CLASS == "wxDialog":
             stmt = '%%(tab)s(setf (slot-top-window obj) (wxDialog_create nil wxID_ANY \"\" -1 -1 -1 -1 %s))\n' % style
-            self.dependencies['(use-package :wxButton)'] = 1
+            self.dependencies.add( '(use-package :wxButton)' )
         else:
             stmt = ''
 
         return stmt
 
     def _get_class_filename(self, klass):
-        filename = os.path.join( self.out_dir, klass.replace('.', '_') + '.lisp' )
-        return filename
+        return os.path.join( self.out_dir, klass.replace('.', '_') + '.lisp' )
 
     def format_generic_access(self, obj):
-        if obj.is_toplevel:
+        if obj.IS_CLASS:
             return '(slot-top-window obj)'
-        else:
-            obj_name = self._format_name(obj.name)
-            if self.store_as_attr(obj):
-                return '(slot-%s obj)' % obj_name
-            else:
-                return obj_name
+        obj_name = self._format_name(obj.name)
+        if self.store_as_attr(obj):
+            return '(slot-%s obj)' % obj_name
+        return obj_name
 
     def _format_name(self, name):
         return name.replace('_', '-')
 
 
-writer = LispCodeWriter()  # The code writer is an instance of L{LispCodeWriter}.
+writer = LispCodeWriter()  # The code writer is an instance of LispCodeWriter.
 
 language = writer.language  # Language generated by this code generator
diff -Nru wxglade-0.9.6/codegen/perl_codegen.py wxglade-1.0.1/codegen/perl_codegen.py
--- wxglade-0.9.6/codegen/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/codegen/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,28 +1,16 @@
 """\
 Perl code generator
 
-How the code is generated: every time the end of an object is reached during
-the parsing of the xml tree, either the function 'add_object' or the function
-'add_class' is called: the latter when the object is a toplevel one, the former
-when it is not. In the last case, 'add_object' calls the appropriate ``writer''
-function for the specific object, found in the 'obj_builders' dict. Such
-function accepts one argument, the CodeObject representing the object for
-which the code has to be written, and returns 3 lists of strings, representing
-the lines to add to the '__init__', '__set_properties' and '__do_layout'
-methods of the parent object.
-
-Like all other perl parts, based on the pre-existing python generators
-
 @copyright: 2002-2004 D.H. aka crazyinsomniac on sourceforge.net
 @copyright: 2012-2016 Carsten Grohmann
-@copyright: 2017 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import os, os.path, re
-from codegen import BaseLangCodeWriter, BaseSourceFileContent, BaseWidgetHandler
-import wcodegen
-import compat
+from codegen import BaseLangCodeWriter, BaseSourceFileContent
+import wcodegen, compat
+import logging
 
 
 class SourceFileContent(BaseSourceFileContent):
@@ -60,16 +48,13 @@
         r'\s*$'                                 # tailing spaces
         )
 
+    # Regexp to match Perl's Plain Old Documentation format; see: manpage perlpod
     rec_pod = re.compile(
         r'^\s*'                                 # leading spaces
         r'=[A-Za-z_]+\w*'                       # match POD statement
         r'.*$'                                  # any character till eol
         )
-    """\
-    Regexp to match Perl's Plain Old Documentation format
 
-    @see: manpage perlpod
-    """
 
     def build_untouched_content(self):
         """\
@@ -88,6 +73,7 @@
         inside_pod = False
         tmp_in = self._load_file(self.name)
         out_lines = []
+        check_old_methods = []  # list of indices with set_properties or do_layout
         for line in tmp_in:
             result = self.rec_pod.match(line)
             if result:
@@ -101,14 +87,12 @@
             result = self.rec_class_decl.match(line)
             if result:
                 if not self.class_name:
-                    # this is the first class declared in the file: insert the
-                    # new ones before this
+                    # this is the first class declared in the file: insert the new ones before this
                     out_lines.append( '<%swxGlade insert new_classes>' % self.nonce )
                     self.new_classes_inserted = True
                 self.class_name = result.group(1)
                 self.class_name = self.format_classname(self.class_name)
-                self.classes[self.class_name] = 1  # add the found class to the list
-                                              # of classes of this module
+                self.classes.add( self.class_name )  # add the found class to the list of classes of this module
                 out_lines.append(line)
             elif not inside_block:
                 result = self.rec_block_start.match(line)
@@ -126,42 +110,37 @@
                     if not self.class_name:
                         out_lines.append( '<%swxGlade replace %s>' % (self.nonce, which_block) )
                     else:
+                        if which_block in ("__do_layout","__set_properties"):
+                            # probably to be removed
+                            check_old_methods.append( len(out_lines) )
                         out_lines.append( '<%swxGlade replace %s %s>' % (self.nonce, which_class, which_block) )
                 else:
                     result = self.rec_event_handler.match(line)
                     if result:
                         which_handler = result.group('handler')
                         which_class = self.format_classname(result.group('class'))
-                        self.event_handlers.setdefault(
-                            which_class, {})[which_handler] = 1
+                        self.event_handlers.setdefault( which_class, set() ).add( which_handler )
                     if self.class_name and self.is_end_of_class(line):
                         # add extra event handlers here...
                         out_lines.append( '<%swxGlade event_handlers %s>' % (self.nonce, self.class_name) )
                     out_lines.append(line)
-                    if self.is_import_line(line):
-                        # add a tag to allow extra modules
-                        out_lines.append( '<%swxGlade extra_modules>\n' % self.nonce )
             else:
                 # ignore all the lines inside a wxGlade block
                 if self.rec_block_end.match(line):
-##                     self._logger.debug('end block')
                     inside_block = False
         if not self.new_classes_inserted:
             # if we are here, the previous ``version'' of the file did not contain any class, so we must add the
             # new_classes tag at the end of the file
             out_lines.append( '<%swxGlade insert new_classes>' % self.nonce )
-        # set the ``persistent'' content of the file
-        self.content = out_lines
-
-    def is_import_line(self, line):
-        return line.lstrip().startswith('use Wx')
-
 
+        # when moving from 0.9 to 1.0: remove empty methods "do_layout" and "set_properties"
+        while check_old_methods:
+            i = check_old_methods.pop(-1)
+            if out_lines[i+1].strip()=='}':  # just end of block -> remove incl. trailing empty lines
+                self._remove_method(out_lines, i-2, i+1)
 
-class WidgetHandler(BaseWidgetHandler):
-    "Interface the various code generators for the widgets must implement"
-    new_signature = []  # Constructor signature ($self->SUPER::new(@stuff)); see PerlCodeWriter.new_defaults
-
+        # set the ``persistent'' content of the file
+        self.content = out_lines
 
 
 class PerlCodeWriter(BaseLangCodeWriter, wcodegen.PerlMixin):
@@ -202,9 +181,6 @@
 
     SourceFileContent = SourceFileContent
 
-    tmpl_name_do_layout = '__do_layout'
-    tmpl_name_set_properties = '__set_properties'
-
     tmpl_cfunc_end = '%(tab)sreturn $self;\n' \
                      '\n' \
                      '}\n' \
@@ -213,16 +189,6 @@
     tmpl_class_end = '\n%(comment)s end of class %(klass)s\n\n1;\n\n'
     tmpl_class_end_nomarker = '\n\n1;\n\n'
 
-    tmpl_ctor_call_layout = '\n' \
-                            '%(tab)s$self->__set_properties();\n' \
-                            '%(tab)s$self->__do_layout();\n\n'
-
-    tmpl_func_do_layout = '\n' \
-                          'sub __do_layout {\n' \
-                          '%(tab)smy $self = shift;\n' \
-                          '%(content)s' \
-                          '}\n'
-
     tmpl_func_event_stub = """\
 
 sub %(handler)s {
@@ -235,12 +201,6 @@
 
 """
 
-    tmpl_func_set_properties = '\n' \
-                          'sub __set_properties {\n' \
-                          '%(tab)smy $self = shift;\n' \
-                          '%(content)s' \
-                          '}\n'
-
     tmpl_func_empty = '%(tab)sreturn;\n'
 
     tmpl_sizeritem = '%s->Add(%s, %s, %s, %s);\n'
@@ -344,25 +304,23 @@
         code_lines = []
         write = code_lines.append
 
-        builder = self.obj_builders[code_obj.base]
+        builder = self.obj_builders[code_obj.WX_CLASS]
         mycn = getattr(builder, 'cn', self.cn)
         mycn_f = getattr(builder, 'cn_f', self.cn_f)
 
         # custom base classes support
-        custom_base = getattr( code_obj, 'custom_base', code_obj.properties.get('custom_base', None) )
-        if self.preview or (custom_base and not custom_base.strip()):
-            custom_base = None
+        custom_base = code_obj.check_prop_nodefault('custom_base') and code_obj.custom_base.strip() or None
 
         new_signature = getattr(builder, 'new_signature', [])
 
         # generate constructor code
         if is_new:
             write('package %s;\n\n' % code_obj.klass)
-            write('use Wx qw[:everything];\nuse base qw(%s);\nuse strict;\n\n' % code_obj.base.replace('wx', 'Wx::', 1))
+            write('use Wx qw[:everything];\nuse base qw(%s);\nuse strict;\n\n' % code_obj.WX_CLASS.replace('wx', 'Wx::', 1))
 
             if self._use_gettext:
                 if self.multiple_files:
-                    self.classes[code_obj.klass].dependencies["use Wx::Locale gettext => '_T';\n"] = 1
+                    self.classes[code_obj].dependencies.add( "use Wx::Locale gettext => '_T';\n" )
                 else:
                     write("use Wx::Locale gettext => '_T';\n")
 
@@ -371,7 +329,7 @@
             # TODO: Don't add dependencies twice with Perl
 
             # write the module dependencies for this class (package)
-            dep_list = sorted( self.classes[code_obj.klass].dependencies.keys() )
+            dep_list = sorted( self.classes[code_obj].dependencies )
             if dep_list:
                 code = self._tagcontent('dependencies', dep_list, True)
                 write(code)
@@ -386,11 +344,10 @@
                         write(self.new_defaults[k])
             else:
                 new_signature = ['@_[1 .. $#_]']  # shift(@_)->SUPER::new(@_);
-                self._logger.info( "%s did not declare self.new_defaults ", code_obj.klass )
+                logging.info( "%s did not declare self.new_defaults ", code_obj.klass )
 
         elif custom_base:
-            # custom base classes set, but "overwrite existing sources" not
-            # set. Issue a warning about this
+            # custom base classes set, but "overwrite existing sources" not set. Issue a warning about this
             self.warning( '%s has custom base classes, but you are not overwriting existing sources: '
                           'please check that the resulting code is correct!' % code_obj.name )
 
@@ -400,6 +357,11 @@
                                            'function':self.name_ctor, 'klass':self.cn_class(code_obj.klass),
                                            'tab':tab} )
 
+        # the optional initial code from the code properties
+        if not self.preview and code_obj.check_prop("extracode_pre"):
+            for l in code_obj.properties["extracode_pre"].get_lines():
+                write(tab + l)
+
         style_p = code_obj.properties.get("style")
         if style_p and style_p.value_set != style_p.default_value:
             style = style_p.get_string_value()
@@ -412,56 +374,55 @@
         write(tab + '$self = $self->SUPER::new( %s );\n' % ", ".join(new_signature))
 
         # set size here to avoid problems with splitter windows
-        if 'size' in code_obj.properties and code_obj.properties["size"].is_active():
-            write( tab+ self.generate_code_size(code_obj) )
-
-        # classes[code_obj.klass].deps now contains a mapping of child to
-        # parent for all children we processed...
-        object_order = []
-        for obj in self.classes[code_obj.klass].child_order:
-            # Don't add it again if already present
-            if obj in object_order:
-                continue
+        if code_obj.check_prop('size'):
+            write( tab + self.generate_code_size(code_obj) )
 
-            object_order.append(obj)
+        for l in builder.get_properties_code(code_obj):
+            write(tab + l)
 
-            # Insert parent and ancestor objects before the current object
-            current_object = obj
-            for child, parent in self.classes[code_obj.klass].deps[:]:
-                if child is current_object:
-                    if parent not in object_order:
-                        idx = object_order.index(current_object)
-                        object_order.insert(idx, parent)
-                    current_object = parent
-
-                    # We processed the dependency: remove it
-                    self.classes[code_obj.klass].deps.remove((child, parent))
-
-        # Write out the initialisation in the order we just generated
-        for obj in object_order:
-            if obj in self.classes[code_obj.klass].init_lines:
-                for l in self.classes[code_obj.klass].init_lines[obj]:
-                    write(tab + l)
+        if code_obj.check_prop_truth('extraproperties'):
+            for l in builder.generate_code_extraproperties(code_obj):
+                write(tab + l)
+
+        # the initial and final code for the contained elements
+        for l in self.classes[code_obj].init:
+            write(tab + l)
+        if self.classes[code_obj].final:
+            write(tab + "\n")
+            for l in self.classes[code_obj].final:
+                write(tab + l)
+
+        # now check if there is initial and final code for the element itself
+        for l in builder.get_init_code(code_obj):
+            write(tab+l)
+
+        for l in builder.get_layout_code(code_obj):
+            write(tab + l)
+
+        # the optional final code from the code properties
+        if not self.preview and code_obj.check_prop("extracode_post"):
+            for l in code_obj.properties["extracode_post"].get_lines():
+                write(tab + l)
 
         return code_lines
 
     def generate_code_event_bind(self, code_obj, tab, event_handlers):
         code_lines = []
-        write = code_lines.append
 
-        for win_id, event, handler, unused in event_handlers:
-            if win_id.startswith('#'):
-                win_id = '$self->{%s}->GetId' % win_id[8:]
+        for obj, event, handler, unused in event_handlers:
+            if obj.name:
+                obj_id = '%s->GetId'%self.format_generic_access(obj) # e.g. '$self->{button_1}->GetId' or '$self->GetId'
+            else:
+                obj_id = self.generate_code_id(None, obj.id)[1] or '-1' # but this is wrong anyway...
 
             if 'EVT_NAVIGATION_KEY' in event:
                 tmpl = '''%(tab)s%(event)s($self, $self->can('%(handler)s'));\n'''
             else:
-                tmpl = '''%(tab)s%(event)s($self, %(win_id)s, $self->can('%(handler)s'));\n'''
-            details = { 'tab': tab, 'event': self.cn(event), 'handler': handler, 'win_id': win_id }
-            write(tmpl % details)
+                tmpl = '''%(tab)s%(event)s($self, %(obj_id)s, $self->can('%(handler)s'));\n'''
+            code_lines.append( tmpl % {'tab': tab, 'event': self.cn(event), 'handler': handler, 'obj_id': obj_id} )
 
         if event_handlers:
-            write('\n')
+            code_lines.append('\n')
 
         return code_lines
 
@@ -469,15 +430,14 @@
         if id is None:
             id = obj.window_id
         if not id:
-            if obj is not None and "stockitem" in obj.properties and obj.stockitem:
+            if obj is not None and obj.check_prop_truth("stockitem"):
                 return '', self.cn("wxID_" + obj.stockitem)
             return '', self.cn('wxID_ANY')
         id = str(id)
         tokens = id.split('=', 1)
-        if len(tokens) == 2:
-            name, val = tokens
-        else:
+        if len(tokens) != 2:
             return '', self.cn(tokens[0])   # we assume name is declared elsewhere
+        name, val = tokens
         if not name:
             return '', self.cn(val)
         name = name.strip()
@@ -493,35 +453,24 @@
         objname = self.format_generic_access(obj)
         size = obj.properties["size"].get_string_value()
         use_dialog_units = (size[-1] == 'd')
-        if not obj.parent:
-            method = 'SetSize'
-        else:
-            method = 'SetMinSize'
+        method = 'SetMinSize'  if obj.parent_window  else  'SetSize'
+
         if use_dialog_units:
-            return '%s->%s(%s->ConvertDialogSizeToPixels(Wx::Size->new(%s)));\n' % (
-                   objname,
-                   method,
-                   objname,
-                   size[:-1],
-                   )
-        else:
-            return '%s->%s(Wx::Size->new(%s));\n' % (objname, method, size)
+            return '%s->%s(%s->ConvertDialogSizeToPixels(Wx::Size->new(%s)));\n' % (objname, method, objname, size[:-1])
+        return '%s->%s(Wx::Size->new(%s));\n' % (objname, method, size)
 
     def _quote_str(self, s):
-        """\
-        Escape all unicode characters to there unicode code points in form
-        of \\uxxxx. The returned string is a pure ascii string.
-
+        """Escape all unicode characters to there unicode code points in form of \\uxxxx.
+        The returned string is a pure ascii string.
         Normal ascii characters like \\n or \\t won't be escaped.
 
-        @note: wxGlade don't handles file encoding well currently. Thereby
-               we escape all unicode characters.
+        note: wxGlade don't handles file encoding well currently. Thereby
+              we escape all unicode characters.
 
-        @note: The string 's' is encoded with L{self.app_encoding} already.
+        note: The string 's' is encoded with self.app_encoding already.
 
-        @see: L{BaseLangCodeWriter._quote_str} for additional details
-        @see: L{_recode_x80_xff()}
-        """
+        see: BaseLangCodeWriter._quote_str for additional details
+        see: _recode_x80_xff()"""
         s = s.replace('$', r'\$')
         s = s.replace('@', r'\@')
 
@@ -566,24 +515,22 @@
         elif obj.name.startswith('$'):
             return obj.name
         # spacer.name is "<width>, <height>" already
-        elif obj.klass == 'spacer':
+        elif obj.WX_CLASS == 'spacer':
             return obj.name
         # Perl stores sizers always in class attributes
-        elif self.store_as_attr(obj) or obj.is_sizer:
+        elif self.store_as_attr(obj) or obj.IS_SIZER:
             return '$self->{%s}' % obj.name
         return '$%s' % obj.name
 
     def _format_import(self, klass):
-        stmt = 'use %s;\n' % klass
-        return stmt
+        return 'use %s;\n' % klass
 
     def _get_class_filename(self, klass):
         "Returns the name for a Perl module (.pm) to store a single class in multi file projects"
-        filename = os.path.join( self.out_dir, klass.replace('::', os.sep) + '.pm' )
-        return filename
+        return os.path.join( self.out_dir, klass.replace('::', os.sep) + '.pm' )
 
     def format_generic_access(self, obj):
-        if obj.is_toplevel:
+        if obj.IS_CLASS:
             return '$self'
         return self._format_classattr(obj)
 
diff -Nru wxglade-0.9.6/codegen/py_codegen.py wxglade-1.0.1/codegen/py_codegen.py
--- wxglade-0.9.6/codegen/py_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/codegen/py_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,25 +1,15 @@
 """\
 Python code generator
 
-How the code is generated: every time the end of an object is reached during
-the parsing of the xml tree, either the function 'add_object' or the function
-'add_class' is called: the latter when the object is a toplevel one, the former
-when it is not. In the last case, 'add_object' calls the appropriate ``writer''
-function for the specific object, found in the 'obj_builders' dict. Such
-function accepts one argument, the CodeObject representing the object for
-which the code has to be written, and returns 3 lists of strings, representing
-the lines to add to the '__init__', '__set_properties' and '__do_layout'
-methods of the parent object.
-
 @copyright: John Dubery
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2012-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import os, os.path, random, re
-from codegen import BaseLangCodeWriter, BaseSourceFileContent, BaseWidgetHandler
+from codegen import BaseLangCodeWriter, BaseSourceFileContent
 import wcodegen
 import compat
 
@@ -29,32 +19,31 @@
     rec_block_start = re.compile(
         r'^(?P<spaces>\s*)'                     # leading spaces
         r'#\s*'                                 # comment sign
-        r'begin\s+wxGlade:\s*'                  # "begin wxGlade:" statement and tailing spaces
+        r'begin\s+wxGlade:\s*'                  # "begin wxGlade:" statement and trailing spaces
         r'(?P<classname>[a-zA-Z_]+\w*)??'       # class or function name (non-greedy)
         r'[.]?'                                 # separator between class and function / block (non-greedy)
         r'(?P<block>\w+)'                       # function / block name
-        r'\s*$' )                               # tailing spaces
+        r'\s*$' )                               # trailing spaces
 
     rec_block_end = re.compile(
         r'^\s*'                                 # leading spaces
         r'#\s*'                                 # comment sign
         r'end\s+wxGlade'                        # "end exGlade" statement
-        r'\s*$' )                               # tailing spaces
+        r'\s*$' )                               # trailing spaces
 
     # Less precise regex, but matches definitions with base classes having module qualified names.
     rec_class_decl = re.compile(
-        r'^\s*'                                        # leading spaces
-        r'class\s+([a-zA-Z_]\w*)\s*(\([\s\w.,]*\))?:'  # "class <name>" statement
+        r'^class\s+([a-zA-Z_]\w*)\s*(\([\s\w.,]*\))?:' # starting wihth "class <name>" statement
         r'\s*$' )                                      # tailing spaces
 
     rec_event_handler = re.compile(
         r'^\s+'                                            # leading spaces (mandatory)
         r'def\s+(?P<handler>[A-Za-z_]+\w*)'                # event handler name
         r'\s*'                                             # optional spaces
-        r'\(.*\):'                                         # function parameters
+        r'\(.*\)(?:\s*->\s*None)*:'                        # function parameters; optional PEP 3107 function annotations 
         r'\s*'                                             # optional spaces
         r'#\s*wxGlade:\s*(?P<class>\w+)\.<event_handler>'  # wxGlade event handler statement with class name
-        r'\s*$' )                                          # tailing spaces
+        r'\s*$' )                                          # trailing spaces
 
     def build_untouched_content(self):
         BaseSourceFileContent.build_untouched_content(self)
@@ -63,6 +52,7 @@
         triple_quote_str = None
         tmp_in = self._load_file(self.name)
         out_lines = []
+        check_old_methods = []  # list of indices with __set_properties or __do_layout
         for line in tmp_in:
             if line.endswith("\r\n"):  # normalize line ending for files on Windows
                 line = "%s\n"%line[:-2]
@@ -91,13 +81,12 @@
             result = self.rec_class_decl.match(line)
             if not inside_triple_quote and not inside_block and result:
                 if not self.class_name:
-                    # this is the first class declared in the file: insert the
-                    # new ones before this
+                    # this is the first class declared in the file: insert the new ones before this
                     out_lines.append('<%swxGlade insert new_classes>' % self.nonce)
                     self.new_classes_inserted = True
                 self.class_name = result.group(1)
                 self.class_name = self.format_classname(self.class_name)
-                self.classes[self.class_name] = 1  # add the found class to the list of classes of this module
+                self.classes.add( self.class_name )  # add the found class to the list of classes of this module
                 out_lines.append(line)
             elif not inside_block:
                 result = self.rec_block_start.match(line)
@@ -115,20 +104,20 @@
                     if not self.class_name:
                         out_lines.append('<%swxGlade replace %s>' % (self.nonce, which_block))
                     else:
+                        if which_block in ("__do_layout","__set_properties"):
+                            # probably to be removed
+                            check_old_methods.append( len(out_lines) )
                         out_lines.append('<%swxGlade replace %s %s>' % (self.nonce, which_class, which_block))
                 else:
                     result = self.rec_event_handler.match(line)
                     if not inside_triple_quote and result:
                         which_handler = result.group('handler')
                         which_class = self.format_classname(result.group('class'))
-                        self.event_handlers.setdefault(which_class, {})[which_handler] = 1
+                        self.event_handlers.setdefault( which_class, set() ).add( which_handler )
                     if self.class_name and self.is_end_of_class(line):
                         # add extra event handlers here...
                         out_lines.append('<%swxGlade event_handlers %s>' % (self.nonce, self.class_name))
                     out_lines.append(line)
-                    if self.is_import_line(line):
-                        # add a tag to allow extra modules
-                        out_lines.append('<%swxGlade extra_modules>\n' % self.nonce)
             else:
                 # ignore all the lines inside a wxGlade block
                 if self.rec_block_end.match(line):
@@ -137,12 +126,16 @@
             # if we are here, the previous ``version'' of the file did not  contain any class,
             # so we must add the new_classes tag at the end of the file
             out_lines.append('<%swxGlade insert new_classes>' % self.nonce)
+        
+        # when moving from 0.9 to 1.0: remove empty methods "__do_layout" and "__set_properties"
+        while check_old_methods:
+            i = check_old_methods.pop(-1)
+            if len(out_lines)==i+1 or not out_lines[i+1].strip() or out_lines[i+1].lstrip().startswith("def"):
+                self._remove_method(out_lines, i-1, i)
+
         # set the ``persistent'' content of the file
         self.content = out_lines #"".join(out_lines)
 
-    def is_import_line(self, line):
-        return line.startswith('import wx')
-
     def format_classname(self, class_name):
         """Format class name read from existing source file.
         If we're in a subpackage, we should include the package name in the class name."""
@@ -160,12 +153,6 @@
             return class_name
 
 
-
-class WidgetHandler(BaseWidgetHandler):
-    pass
-
-
-
 class PythonCodeWriter(BaseLangCodeWriter, wcodegen.PythonMixin):
     "Code writer class for writing Python code out of the designed GUI elements"
 
@@ -194,18 +181,19 @@
 
     name_ctor = '__init__'
 
-    shebang = '#!/usr/bin/env python\n'
+    if compat.PYTHON2:
+        shebang = '#!/usr/bin/env python\n'
+    else:
+        shebang = '#!/usr/bin/env python3\n'
 
     SourceFileContent = SourceFileContent
 
-    tmpl_name_do_layout = '__do_layout'
-    tmpl_name_set_properties = '__set_properties'
     tmpl_encoding = "# -*- coding: %s -*-\n#\n"
     tmpl_class_end = '\n%(comment)s end of class %(klass)s\n'
     tmpl_class_end_nomarker = '\n'
-    tmpl_ctor_call_layout = '\n%(tab)sself.__set_properties()\n%(tab)sself.__do_layout()\n'
     tmpl_func_empty = '%(tab)spass\n'
     tmpl_sizeritem = '%s.Add(%s, %s, %s, %s)\n'
+    tmpl_sizeritem_button = '%s.AddButton(%s)\n'
     tmpl_gridbagsizeritem = '%s.Add(%s, %s, %s, %s, %s)\n'
     if compat.IS_CLASSIC:
         tmpl_gridbagsizerspacer = '%s.Add((%s, %s), %s, %s, %s, %s)\n'
@@ -229,7 +217,7 @@
 
         if klass:
             # create application class
-            if top_win and top_win.base=="wxDialog":
+            if top_win and top_win.WX_CLASS=="wxDialog":
                 # use ShowModal()/Destroy for dialogs
                 show_code = ['%(tab)s%(tab)sself.%(top_win)s.ShowModal()',
                             '%(tab)s%(tab)sself.%(top_win)s.Destroy()']
@@ -259,7 +247,7 @@
                 ret.append( '%(tab)s%(name)s.MainLoop()' )
             else:
                 # use PySimpleApp
-                if top_win and top_win.base=="wxDialog":
+                if top_win and top_win.WX_CLASS=="wxDialog":
                     show_code = ['%(tab)s%(top_win)s.ShowModal()',
                                  '%(tab)s%(top_win)s.Destroy()']
                 else:
@@ -273,9 +261,6 @@
             ret.append('')
         return '\n'.join(ret)
 
-    def __init__(self):
-        BaseLangCodeWriter.__init__(self)
-
     def init_lang(self, app):
         if self.preview and compat.PYTHON2:
             self.header_lines.append('from __future__ import print_function\n')
@@ -290,33 +275,29 @@
             if self.multiple_files:
                 self.lang_mapping['import_gettext'] = 'import gettext\n'
             else:
-                self.dependencies['import gettext\n'] = 1
+                self.dependencies.add( 'import gettext\n' )
 
         BaseLangCodeWriter.add_app(self, app, top_win)
 
     def generate_code_ctor(self, code_obj, is_new, tab):
+        # generate code for the class constructor, including all children
         code_lines = []
-        write = code_lines.append
+        write = lambda s: code_lines.append(s if s.strip() else '\n')
 
-        builder = self.obj_builders[code_obj.base]
+        builder = self.obj_builders[code_obj.WX_CLASS]
         mycn = getattr(builder, 'cn', self.cn)
         mycn_f = getattr(builder, 'cn_f', self.cn_f)
-        fmt_klass = self.cn_class(code_obj.klass)
+        fmt_klass = self.cn_class( code_obj.get_prop_value("class", code_obj.WX_CLASS) )
 
         # custom base classes support
-        custom_base = getattr(code_obj, 'custom_base', getattr(code_obj, 'custom_base', None) )
-        if self.preview or (custom_base and not custom_base.strip()):
-            custom_base = None
+        custom_base = None
+        if code_obj.check_prop_nodefault('custom_base') and not self.preview:
+            custom_base = code_obj.custom_base.strip() or None
 
         # generate constructor code
         if is_new:
-            base = mycn(code_obj.base)
-            if custom_base:
-                base = ", ".join([b.strip() for b in custom_base.split(',')])
-            if self.preview and code_obj.klass == base:
-                klass = code_obj.klass + ('_%d' % random.randrange(10 ** 8, 10 ** 9))
-            else:
-                klass = code_obj.klass
+            base = mycn(code_obj.WX_CLASS)
+            if custom_base: base = ", ".join([b.strip() for b in custom_base.split(',')])
             write('\nclass %s(%s):\n' % (self.get_class(fmt_klass), base))
             write(self.tabs(1) + 'def __init__(self, *args, **kwds):\n')
         elif custom_base:
@@ -329,8 +310,13 @@
             write(self.tmpl_block_begin % {'class_separator': self.class_separator, 'comment_sign': self.comment_sign,
                                            'function':self.name_ctor, 'klass':fmt_klass, 'tab':tab} )
 
+        # the optional initial code from the code properties
+        if not self.preview and code_obj.check_prop("extracode_pre"):
+            for l in code_obj.properties["extracode_pre"].get_lines():
+                write(tab + l)
+
         style_p = code_obj.properties.get("style")
-        if style_p:# and style_p.value_set != style_p.default_value:
+        if style_p:
             style = style_p.get_string_value()
             m_style = mycn_f( style )
             stmt_style = self._format_style(style, code_obj)
@@ -346,71 +332,72 @@
                 else:
                     write(tab + '%s.__init__(self)\n' % b)
         else:
-            write(tab + '%s.__init__(self, *args, **kwds)\n' % mycn(code_obj.base))
+            write(tab + '%s.__init__(self, *args, **kwds)\n' % mycn(code_obj.WX_CLASS))
 
         # set size here to avoid problems with splitter windows
-        if 'size' in code_obj.properties and code_obj.properties["size"].is_active():
+        if code_obj.check_prop('size'):
             write( tab + self.generate_code_size(code_obj) )
 
-        # classes[code_obj.klass].deps now contains a mapping of child to parent for all children we processed...
-        object_order = []
-        for obj in self.classes[code_obj.klass].child_order:
-            # Don't add it again if already present
-            if obj in object_order:
-                continue
-
-            object_order.append(obj)
-
-            # Insert parent and ancestor objects before the current object
-            current_object = obj
-            for child, parent in self.classes[code_obj.klass].deps[:]:
-                if child is current_object:
-                    if parent not in object_order:
-                        idx = object_order.index(current_object)
-                        object_order.insert(idx, parent)
-                    current_object = parent
-
-                    # We processed the dependency: remove it
-                    self.classes[code_obj.klass].deps.remove((child, parent))
-
-        # Write out the initialisation in the order we just generated
-        for obj in object_order:
-            if obj in self.classes[code_obj.klass].init_lines:
-                for l in self.classes[code_obj.klass].init_lines[obj]:
-                    write(tab + l)
+        for l in builder.get_properties_code(code_obj):
+            write(tab + l)
 
-        return code_lines
+        if not self.preview and code_obj.check_prop_truth('extraproperties'):
+            for l in self.generate_code_extraproperties(code_obj):
+                write(tab + l)
+
+        # the initial and final code for the contained elements
+        for l in self.classes[code_obj].init:
+            write(tab + l)
+        if self.classes[code_obj].final:
+            write(tab + "\n")
+            for l in self.classes[code_obj].final:
+                write(tab + l)
+
+        # now check if there is initial and final code for the element itself
+        for l in builder.get_init_code(code_obj):
+            write(tab+l)
+
+        for l in builder.get_layout_code(code_obj):
+            write(tab + l)
+
+        # the optional final code from the code properties
+        if not self.preview and code_obj.check_prop("extracode_post"):
+            for l in code_obj.properties["extracode_post"].get_lines():
+                write(tab + l)
 
-    def generate_code_do_layout(self, builder, code_obj, is_new, tab):
-        # Python has two indentation levels
-        #  1st) for function declaration
-        #  2nd) for function body
-        self.tmpl_func_do_layout = '\n' + self.tabs(1) + 'def __do_layout(self):\n%(content)s'
-        return BaseLangCodeWriter.generate_code_do_layout( self, builder, code_obj, is_new, tab )
+        return code_lines
 
     def generate_code_event_bind(self, code_obj, tab, event_handlers):
         code_lines = []
-        write = code_lines.append
 
-        if event_handlers:
-            write('\n')
+        if event_handlers: code_lines.append('\n')
 
-        for win_id, event, handler, unused in event_handlers:
-            if win_id is None: continue  # bound already, the entry is just for creation of the method stub
-            if win_id.startswith('#'):
-                win_id = win_id[1:]
+        for obj, event, handler, unused in event_handlers:
+            if obj is None: continue  # bound already, the entry is just for creation of the method stub
+            if isinstance(obj, str):
+                obj_name_id = "id=%s"%obj  # mainly for toolbar
             else:
-                win_id = 'id=%s' % win_id
-            
+                obj_name_id = self.format_generic_access(obj)  # e.g. 'self.button_1' or 'self' for toplevels
+
             if not handler.startswith("lambda "):
                 handler = 'self.%s'%handler
 
             if 'EVT_NAVIGATION_KEY' in event:
                 tmpl = '%(tab)sself.Bind(%(event)s, %(handler)s)\n'
             else:
-                tmpl = '%(tab)sself.Bind(%(event)s, %(handler)s, %(win_id)s)\n'
-            details = {'tab':tab, 'event':self.cn(event), 'handler':handler, 'win_id':win_id}
-            write(tmpl % details)
+                tmpl = '%(tab)sself.Bind(%(event)s, %(handler)s, %(obj_name_id)s)\n'
+
+            lines = [tmpl % {'tab':tab, 'event':self.cn(event), 'handler':handler, 'obj_name_id':obj_name_id}]
+
+            if self.preview:
+                # for preview we add an exception handler as the event may be unknown for this wx version or at all
+                indent = self.tabs(1)  # one additional level
+                lines.insert(0, '%stry:\n'%tab)
+                lines[1] = indent + lines[1]  # indent by one level
+                lines.append( '%sexcept AttributeError:\n'%tab )
+                lines.append( '%s%sprint("unknown event %s")\n'%(indent, tab, event) )
+
+            code_lines += lines
 
         return code_lines
 
@@ -434,15 +421,14 @@
         if id is None:
             id = obj.window_id
         if not id:
-            if obj is not None and "stockitem" in obj.properties and obj.stockitem:
+            if obj is not None and obj.check_prop_truth("stockitem"):
                 return '', self.cn("wxID_" + obj.stockitem)
             return '', self.cn('wxID_ANY')
         id = str(id)
         tokens = id.split('=', 1)
-        if len(tokens) == 2:
-            name, val = tokens
-        else:
+        if len(tokens) != 2:
             return '', self.cn(tokens[0])   # we assume name is declared elsewhere
+        name, val = tokens
         if not name:
             return '', self.cn(val)
         name = name.strip()
@@ -456,20 +442,12 @@
             return '%s = %s\n' % (name, val), name
         return 'global %s; %s = %s\n' % (name, name, val), name
 
-    def generate_code_set_properties(self, builder, code_obj, is_new, tab):
-        # Python has two indentation levels
-        #  1st) for function declaration
-        #  2nd) for function body
-        self.tmpl_func_set_properties = '\n' + self.tabs(1) + 'def __set_properties(self):\n%(content)s'
-
-        return BaseLangCodeWriter.generate_code_set_properties( self, builder, code_obj, is_new, tab )
-
     def generate_code_size(self, obj, size=None):
         objname = self.format_generic_access(obj)
         if size is None:
             size = obj.properties["size"].get_string_value()
         use_dialog_units = (size[-1] == 'd')
-        if not obj.parent:
+        if not obj.parent_window:
             method = 'SetSize'
         else:
             method = 'SetMinSize'
@@ -482,20 +460,17 @@
             return '%s.%s((%s))\n' % (objname, method, size)
 
     def _quote_str(self, s):
-        """\
-        Escape all unicode characters to there unicode code points in form
-        of \\uxxxx. The returned string is a pure ascii string.
+        """Escape all unicode characters to there unicode code points in form of \\uxxxx.
+        The returned string is a pure ascii string.
 
         Normal ascii characters like \\n or \\t won't be escaped.
 
-        @note: wxGlade don't handles file encoding well currently. Thereby
-               we escape all unicode characters.
+        note: wxGlade don't handles file encoding well currently. Thereby we escape all unicode characters.
 
-        @note: The string 's' is encoded with L{self.app_encoding} already.
+        note: The string 's' is encoded with self.app_encoding already.
 
-        @see: L{BaseLangCodeWriter._quote_str} for additional details
-        @see: L{_recode_x80_xff()}
-        """
+        see: BaseLangCodeWriter._quote_str for additional details
+            _recode_x80_xff()"""
         # convert all strings to unicode first
         if not isinstance(s, compat.unicode):
             s = s.decode(self.app_encoding)
@@ -535,26 +510,23 @@
         elif obj.name.startswith('self.'):
             return obj.name
         # spacer.name is "<width>, <height>" already, but wxPython expect a tuple instead of two single values
-        elif obj.klass in ('spacer','sizerslot'):
+        elif obj.WX_CLASS in ('spacer','sizerslot'):
             return '(%s)' % obj.name
         elif self.store_as_attr(obj):
             return 'self.%s' % obj.name
         return obj.name
 
     def _format_import(self, klass):
-        stmt = 'from %s import %s\n' % (klass, self.get_class(klass))
-        return stmt
+        return 'from %s import %s\n' % (klass, self.get_class(klass))
 
     def _get_class_filename(self, klass):
-        filename = os.path.join( self.out_dir, klass.replace('.', os.sep) + '.py' )
-        return filename
+        return os.path.join( self.out_dir, klass.replace('.', os.sep) + '.py' )
 
     def format_generic_access(self, obj):
-        if obj.is_toplevel:
+        if obj.IS_CLASS:
             return 'self'
-        else:
-            return self._format_classattr(obj)
+        return self._format_classattr(obj)
 
 
-writer = PythonCodeWriter()  # The code writer is an instance of L{PythonCodeWriter}.
+writer = PythonCodeWriter()  # The code writer is an instance of PythonCodeWriter.
 language = writer.language   # Language generated by this code generator
diff -Nru wxglade-0.9.6/codegen/xrc_codegen.py wxglade-1.0.1/codegen/xrc_codegen.py
--- wxglade-0.9.6/codegen/xrc_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/codegen/xrc_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,20 +2,21 @@
 XRC code generator
 
 Generates the xml code for the app in XRC format.
-Calls the appropriate ``writers'' of the various objects. These functions
-return an instance of XrcObject
+Calls the appropriate ``writers'' of the various objects. These functions return an instance of XrcObject.
+To be done: write XRC directly instead of using BaseLangCodeWriter as base.
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2012-2016 Carsten Grohmann
+@copyright: 2019-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 from xml.sax.saxutils import escape, quoteattr
 from codegen import BaseLangCodeWriter
 from collections import OrderedDict
-import common, compat, errors
+import common, wcodegen
 import new_properties as np
-import wcodegen
+import logging
 
 
 class XrcObject(wcodegen.XrcWidgetCodeWriter):
@@ -40,32 +41,35 @@
 
     def warning(self, msg):
         "Show a warning message"
-        self._logger.warning(msg)
+        logging.warning(msg)
 
 
 
 class SizerItemXrcObject(XrcObject):
     "XrcObject to handle sizer items"
 
-    def __init__(self, obj, proportion, flag, border):
+    def __init__(self, xrc_obj, obj):
         XrcObject.__init__(self)
-        self.obj = obj  # the XrcObject representing the widget
-        self.proportion = proportion
-        self.flag = flag
-        self.border = border
+        self.xrc_obj = xrc_obj
+        self.obj = obj
 
     def write(self, output, ntabs, properties=None):
         tabs = self.tabs(ntabs)
         tabs1 = self.tabs(ntabs + 1)
         output.append(tabs + '<object class="sizeritem">\n')
-        if self.proportion != '0':
-            output.append(tabs1 + '<option>%s</option>\n' % self.proportion)
-        if self.flag and self.flag != '0':
-            output.append(tabs1 + '<flag>%s</flag>\n' % self.cn_f(self.flag))
-        if self.border != '0':
-            output.append(tabs1 + '<border>%s</border>\n' % self.border)
+        if self.obj.proportion:
+            output.append(tabs1 + '<option>%s</option>\n' % self.obj.proportion)
+        flag = self.obj.properties["flag"].get_string_value()
+        if flag and flag!='0':
+            output.append(tabs1 + '<flag>%s</flag>\n' % self.cn_f(flag))
+        if self.obj.border:
+            output.append(tabs1 + '<border>%s</border>\n' % self.obj.border)
+        if self.obj.parent._IS_GRIDBAG:
+            cellpos = self.obj.parent._get_row_col(self.obj.index)
+            output.append( tabs1 + '<cellpos>%d,%d</cellpos>\n' % cellpos )
+            output.append( tabs1 + '<cellspan>%d,%d</cellspan>\n' % self.obj.span )
         # write the widget
-        self.obj.write(output, ntabs + 1)
+        self.xrc_obj.write(output, ntabs + 1)
         output.append(tabs + '</object>\n')
 
 
@@ -73,24 +77,33 @@
 class SpacerXrcObject(XrcObject):
     "XrcObject to handle widgets"
 
-    def __init__(self, size_str, option, flag, border):
+    def __init__(self, obj):
         XrcObject.__init__(self)
-        self.size_str = size_str
-        self.proportion = option
-        self.flag = flag
-        self.border = border
+        self.obj = obj
 
     def write(self, output, ntabs):
+        obj = self.obj
+
         tabs = self.tabs(ntabs)
         tabs1 = self.tabs(ntabs + 1)
-        output.append(tabs + '<object class="spacer">\n')
-        output.append(tabs1 + '<size>%s</size>\n' % self.size_str.strip())
-        if self.proportion != '0':
-            output.append(tabs1 + '<option>%s</option>\n' % self.proportion)
-        if self.flag and self.flag != '0':
-            output.append(tabs1 + '<flag>%s</flag>\n' % self.cn_f(self.flag))
-        if self.border != '0':
-            output.append(tabs1 + '<border>%s</border>\n' % self.border)
+
+        if obj is None or obj.name == "spacer":
+            output.append( tabs + '<object class="spacer">\n' )
+        else:
+            output.append( tabs + '<object class="spacer" name=%s>\n'%quoteattr(obj.name) )
+        if obj is not None:
+            # a real spacer
+            output.append( tabs1 + '<size>%s, %s</size>\n' % (obj.width, obj.height) )
+            if obj.proportion:
+                output.append(tabs1 + '<option>%s</option>\n' % obj.proportion)
+            if obj.flag:
+                flag = obj.properties["flag"].get_string_value()
+                output.append(tabs1 + '<flag>%s</flag>\n' % self.cn_f(flag))
+            if obj.border:
+                output.append(tabs1 + '<border>%s</border>\n' % obj.border)
+        else:
+            # just an empty sizer slot
+            output.append( tabs1 + '<size>0, 0</size>\n' )
         output.append(tabs + '</object>\n')
 
 
@@ -99,11 +112,16 @@
     "Standard XrcObject for every widget, used if no specific XrcObject is available"
 
     def __init__(self, widget):
-        XrcObject.__init__(self, widget.klass)
+        #classname = widget.get_prop_value("class", widget.WX_CLASS)  # the 0.9 implementation
+        if widget.IS_SIZER:
+            classname = widget.WX_CLASS
+        else:
+            classname = widget.get_instantiation_class()
+        XrcObject.__init__(self, classname)
         self.widget = widget
         self.name = widget.name
-        self.klass = widget.base  # custom classes aren't allowed in XRC
-        self.subclass = widget.klass
+        self.klass = widget.WX_CLASS
+        self.subclass = classname
 
     def write_property(self, name, val, output, ntabs):
         if not val:
@@ -137,7 +155,7 @@
                 return common.format_xml_prop(name, u'', ntabs, stock_id=art_id)
 
         elif val.startswith('code:') or val.startswith('empty:') or val.startswith('var:'):
-            self._logger.warn( _('XRC: Unsupported bitmap statement "%s" for %s "%s"'), val, self.klass, self.name )
+            logging.warn( _('XRC: Unsupported bitmap statement "%s" for %s "%s"'), val, self.klass, self.name )
             return None
 
         return common.format_xml_prop(name, val, ntabs)
@@ -149,7 +167,7 @@
             del properties["name"]
         else:
             name = self.name
-        if self.widget.is_sizer:
+        if self.widget.IS_SIZER:
             output.append(self.tabs(ntabs) + '<object class=%s>\n' % quoteattr(self.klass))
         else:
             if self.subclass and self.subclass != self.klass:
@@ -248,7 +266,7 @@
         self.code_obj = code_obj
 
     def write(self, output, ntabs):
-        msg = 'code generator for %s objects not available' % self.code_obj.base
+        msg = 'code generator for %s objects not available' % self.code_obj.WX_CLASS
         self.warning('%s' % msg)
         output.append( '%s%s\n' % (self.tabs(ntabs), self._format_comment(msg)) )
 
@@ -290,7 +308,7 @@
     def init_lang(self, app):
         # for now we handle only single-file code generation
         if self.multiple_files:
-            raise errors.WxgXRCMultipleFilesNotSupported()
+            return "XRC code cannot be split into multiple files"
 
         # overwrite existing sources always
         self._overwrite = True
@@ -310,27 +328,53 @@
         self.save_file( self.output_file_name, self.out_file )
         self.out_file = None
 
-    def _clean_up_node(self, node):
-        if hasattr(node.widget, "xrc"):
-            del node.widget.xrc
-        for c in node.children or []:
-            self._clean_up_node(c)
-
-    def clean_up(self, root):
-        # root is a Tree node
-        self._clean_up_node(root)
+    def generate_code(self, root, widget=None):
+        "entry point for recursive code generation via _generate_code()"
+        # root must be application.Application instance for now
+        for c in root.children or []:
+            if widget is not None and c is not widget: continue # for preview
+            self._generate_code(None, None, None, c)
+
+    def _generate_code(self, klass, parent, parent_builder, obj):
+        # XXX old implementation from __init__.py before re-factoring 'real' code generation
+        # recursively generate code, for anything except application.Application
+        # for toplevel widgets or with class different from wx... a class will be added
+
+        if obj.IS_SLOT or obj.WX_CLASS=="spacer":
+            if obj.WX_CLASS:  # "slot" has no code generator, but "sizerslot" or "spacer" needs to be added
+                self.add_object(obj)
+                self.add_sizeritem(obj.parent_class_object, obj.parent, obj)
+            return
+
+        parent = obj.parent
+        parent_class_object = obj.parent_class_object  # used for adding to this object's sizer
 
-    def add_app(self, app, top_win_class):
-        "In the case of XRC output, there's no wxApp code to generate"
-        pass
+        obj.IS_CLASS = IS_CLASS = obj.check_prop_truth("class")
+
+        # first the item
+        if IS_CLASS:
+            self.add_class(obj)
+        if not obj.IS_TOPLEVEL:
+            added = self.add_object(obj)  # added can be False if the widget is not supported
+        else:
+            added = False
+
+        # then the children
+        for child in obj.get_all_children():
+            assert obj.children.count(child)<=1
+            self._generate_code(None, None, None, child)  # XRCCodeWriter does not use the other args
+
+        # check whether the object belongs to some sizer; if applicable, add it to the sizer at the top of the stack
+        if added and parent.IS_SIZER:
+            if obj.WX_CLASS not in ("spacer",):  # spacer and slot are adding itself to the sizer
+                self.add_sizeritem(parent_class_object, parent, obj)
 
     def add_object(self, sub_obj):
         "Adds the object sub_obj to the XRC tree. The first argument is unused."
         # what we need in XRC is not top_obj, but sub_obj's true parent we don't need the sizer, but the window
-        top_obj = sub_obj.node.parent.widget
-        while top_obj.is_sizer:
-            top_obj = top_obj.node.parent.widget
-        builder = self.obj_builders.get( sub_obj.base, DefaultXrcObject )
+
+        top_obj = sub_obj.parent_window
+        builder = self.obj_builders.get( sub_obj.WX_CLASS, DefaultXrcObject )
         try:
             # check whether we already created the xrc_obj
             xrc_obj = sub_obj.xrc
@@ -342,22 +386,18 @@
             # (if it was there, i.e. the object is not a sizer), because this isn't a true toplevel object
             if sub_obj in self.xrc_objects:
                 del self.xrc_objects[sub_obj]
-        # let's see if sub_obj's parent already has an XrcObject: if so, it's temporarily stored in self.xrc_objects
-        if top_obj in self.xrc_objects:
-            top_xrc = self.xrc_objects[top_obj]
-        else:
-            # ...otherwise, create it and store it in the self.xrc_objects dict
-            top_xrc = self.obj_builders.get( top_obj.base, DefaultXrcObject )(top_obj)
+        if not getattr(top_obj, "xrc"):
+            # create XrcObject and store it in the self.xrc_objects dict
+            top_xrc = self.obj_builders.get( top_obj.WX_CLASS, DefaultXrcObject )(top_obj)
             top_obj.xrc = top_xrc
             self.xrc_objects[top_obj] = top_xrc
         top_obj.xrc.children.append(xrc_obj)
+        return True
 
-    def add_sizeritem(self, unused, sizer, obj, option, flag, border):
+    def add_sizeritem(self, unused, sizer, obj):
         "Adds a sizeritem to the XRC tree. The first argument is unused."
         # what we need in XRC is not toplevel, but sub_obj's true parent
-        toplevel = obj.node.parent.widget
-        while toplevel.is_sizer:
-            toplevel = toplevel.node.parent.widget
+        toplevel = obj.parent_window
 
         top_xrc = toplevel.xrc
         obj_xrc = obj.xrc
@@ -365,40 +405,26 @@
             sizer_xrc = sizer.xrc
         except AttributeError:
             # if the sizer has not an XrcObject yet, create it now
-            sizer_xrc = self.obj_builders.get( sizer.base, DefaultXrcObject )(sizer)
+            sizer_xrc = self.obj_builders.get( sizer.WX_CLASS, DefaultXrcObject )(sizer)
             sizer.xrc = sizer_xrc
         # we now have to move the children from 'toplevel' to 'sizer'
         index = top_xrc.children.index(obj_xrc)
-        if obj.klass == 'spacer':
-            w = obj.properties.get('width', '0')
-            h = obj.properties.get('height', '0')
-            obj_xrc = SpacerXrcObject( '%s, %s' % (w, h), str(option), str(flag), str(border) )
-            sizer.xrc.children.append(obj_xrc)
-        elif obj.klass == 'sizerslot':
-            obj_xrc = SpacerXrcObject( '0, 0', '0', '0', '0' )
-            sizer.xrc.children.append(obj_xrc)
+        if obj.WX_CLASS == 'spacer':
+            sizer.xrc.children.append( SpacerXrcObject(obj) )
+        elif obj.WX_CLASS == 'sizerslot':
+            if not sizer._IS_GRIDBAG:
+                sizer.xrc.children.append( SpacerXrcObject(None) )
         else:
-            sizeritem_xrc = SizerItemXrcObject( obj_xrc, str(option), str(flag), str(border) )
+            sizeritem_xrc = SizerItemXrcObject( obj_xrc, obj )
             sizer.xrc.children.append(sizeritem_xrc)
         del top_xrc.children[index]
 
-    def add_spacer(self, topl, sizer, obj=None, option=0, flag='0', border=0):
-        if obj is not None:
-            w = obj.width
-            h = obj.height
-        else:
-            h = w = 0
-        obj_xrc = SpacerXrcObject( '%s, %s' % (w,h), str(option), str(flag), str(border) )
-        if not hasattr(sizer, "xrc"):  # if the sizer has not an XrcObject yet, create it now
-            sizer.xrc = self.obj_builders.get( sizer.base, DefaultXrcObject )(sizer)
-        sizer.xrc.children.append(obj_xrc)
-
     def add_class(self, code_obj):
         """Add class behaves very differently for XRC output than for other languages (i.e. python):
         since custom classes are not supported in XRC, this has effect only for true toplevel widgets, i.e. frames and
         dialogs. For other kinds of widgets, this is equivalent to add_object"""
         if not code_obj in self.xrc_objects:
-            builder = self.obj_builders.get( code_obj.base, DefaultXrcObject )
+            builder = self.obj_builders.get( code_obj.WX_CLASS, DefaultXrcObject )
             xrc_obj = builder(code_obj)
             code_obj.xrc = xrc_obj
             # add the xrc_obj to the dict of the toplevel ones
diff -Nru wxglade-0.9.6/color_dialog.py wxglade-1.0.1/color_dialog.py
--- wxglade-0.9.6/color_dialog.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/color_dialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2007 Marcello Semboli
 @copyright: 2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/common.py wxglade-1.0.1/common.py
--- wxglade-0.9.6/common.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/common.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2013-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -21,20 +21,22 @@
 import logging, os, os.path, sys, tempfile
 from xml.sax.saxutils import escape, quoteattr
 
-import config, compat, plugins
+import config, compat, plugins, misc
 
 
-widgets = {}          # all widgets: EditWidget class name -> factory(parent, sizer, pos)
+widget_classes = {}   # EditWidget class name -> EditWidget class
+widgets = {}          # all widgets: EditWidget class name -> factory(parent, index)
 widgets_from_xml = {} # Factory functions to build objects from a XML file
 
 class_names = {} # maps the name of the classes used by wxGlade to the correspondent classes of wxWindows
-toplevels = {}   # names of the Edit classes that can be toplevels, i.e. class declaration will be generated in the code
 
 # references to windows:
 main = None            # main window
 palette = None         # the panel which contains the various buttons to add the different widgets
 property_panel = None  # panel for editing the current widgets properties
 app_tree = None        # widget hierarchy of the application; root is application itself; a tree.WidgetTree instance
+shell = None           # will be created only when selecting from the help menu
+root = None
 
 # these will be set when clicking an item on the palette window:
 adding_widget = False # If True, the user is adding a widget to some sizer
@@ -53,34 +55,17 @@
 ########################################################################################################################
 # application initialization
 
+# Dictionary of language name -> BaseLangCodeWriter objects used to generate the code in a given language.
 code_writers = {}
-"""Dictionary of language name -> BaseLangCodeWriter objects used to generate the code in a given language.
-
-@note: A code writer object must implement this interface:
- - new_project(out_path, multi_files)
- - language
- - setup
- - add_widget_handler(widget_name, handler[, properties_handler])
- - add_property_handler(property_name, handler[, widget_name])
- - add_object(top_obj, sub_obj)
- - add_class(obj)
- - add_sizeritem(toplevel, sizer, obj_name, option, flag, border)
- - add_app(app_attrs, top_win_class)
- - ...
-"""
 
 
 def init_codegen():
     """Load available code generators, built-in and user widgets as well as sizers
 
-    @return: In GUI-Mode: a dict with module sections as key and assigned list of wxBitmapButtons, the dict is empty
-             in batch mode.
-    @rtype:  OrderedDict
-
-    @see: L{load_config()}
-    @see: L{load_code_writers()}
-    @see: L{load_widgets()}
-    @see: L{load_sizers()}"""
+    Returns OrderedDict with module sections as key and assigned list of wxBitmapButtons in GUI mode.
+    The dict is empty in batch mode.
+
+    see: load_config() load_code_writers(), load_widgets(), load_sizers()"""
     # process generic related style attributes
     style_attrs_to_sets(config.widget_config['generic_styles'])
     load_config()
@@ -88,6 +73,10 @@
     all_widgets = load_widgets()
     sizer_buttons = load_sizers()
 
+    # initialize preview code generator
+    preview_codegen = code_writers["preview"] = code_writers["python"].copy()
+    preview_codegen.for_version = compat.version
+
     # merge sizer buttons
     for section in sizer_buttons:
         if section not in all_widgets:
@@ -100,7 +89,8 @@
 
 def load_code_writers():
     "Fills the common.code_writers dictionary: to do so, loads the modules found in the 'codegen/' subdir"
-    logging.info('Load code generators:')
+    if config.use_gui:
+        logging.info('Load code generators:')
     codegen_path = os.path.join(config.wxglade_path, 'codegen')
     sys.path.insert(0, codegen_path)
     for module in os.listdir(codegen_path):
@@ -129,7 +119,7 @@
 
 
 def load_config():
-    "Load widget configuration;  @see: L{plugins.load_widgets_from_dir()}"
+    "Load widget configuration;  see: plugins.load_widgets_from_dir()"
     # load the "built-in" and "user" widgets
     plugins.load_widgets_from_dir( config.widgets_path,                  'wconfig' )
     plugins.load_widgets_from_dir( config.preferences.local_widget_path, 'wconfig' )
@@ -140,7 +130,8 @@
 def load_sizers():
     """Load and initialise the sizer support modules into ordered dict instance.
     See edit_sizers.edit_sizers.init_all."""
-    logging.info('Load sizer generators:')
+    if config.use_gui:
+        logging.info('Load sizer generators:')
     for lang in code_writers.keys():
         module_name = 'edit_sizers.%s_sizers_codegen' % code_writers[lang].lang_prefix
         try:
@@ -172,9 +163,9 @@
 
     Scans the built-in and user widget directories to find the installed widgets and loads it.
 
-    @rtype: OrderedDict
+    returns OrderedDict
 
-    @see: L{plugins.load_widgets_from_dir()} for more details e.g. the structure of the dictionary."""
+    see: plugins.load_widgets_from_dir() for more details e.g. the structure of the dictionary."""
     # load the "built-in" and "user" widgets
     core_buttons  = plugins.load_widgets_from_dir(config.widgets_path, default_section=_('Core widgets'))
     local_buttons = plugins.load_widgets_from_dir(config.preferences.local_widget_path,
@@ -224,8 +215,9 @@
 def add_toplevel_object(event):
     "Adds a toplevel widget (Frame or Dialog) to the current app"
     palette.reset_togglebuttons()
-    widgets[refs[event.GetId()]](None, None, 0)
-    app_tree.app.saved = False
+    editor = widgets[refs[event.GetId()]](root, 0)
+    if editor is None: return
+    misc.rebuild_tree(widget=editor, recursive=editor.children, focus=True)
 
 
 ########################################################################################################################
@@ -238,7 +230,7 @@
 
     Icons with a relative path will be loaded from config.icon_path.
 
-    widget: (name of) the widget the button will add to the app
+    widget: (name of) the widget the button will add to the app 
     icon_path: Path to the icon_path used for the button
     toplevel: True if the widget is a toplevel object (frame, dialog)
     tip: Tool tip to display
@@ -252,6 +244,7 @@
     if not os.path.isabs(icon_path):
         icon_path = os.path.join(config.icons_path, icon_path)
     bmp = misc.get_xpm_bitmap(icon_path)
+    label = widget.replace('Edit', '')
     if compat.version < (3,0):
         # old wx version: use BitmapButton
         tmp = wx.BitmapButton(palette, -1, bmp, size=(31,31))
@@ -260,16 +253,25 @@
         else:
             tmp.Bind(wx.EVT_BUTTON, add_toplevel_object)
     else:
+        # for more recent versions, we support config options to display icons and/or labels
         if not toplevel:
-            tmp = wx.ToggleButton(palette, -1, size=(31,31))
+            if not config.preferences.show_palette_labels:
+                # icons only -> set size
+                tmp = wx.ToggleButton(palette, -1, size=(31,31), name=label)
+            else:
+                tmp = wx.ToggleButton(palette, -1, label, name=label )
             tmp.Bind(wx.EVT_TOGGLEBUTTON, add_object)
         else:
-            tmp = wx.Button(palette, -1, size=(31,31))
+            if not config.preferences.show_palette_labels:
+                tmp = wx.Button(palette, -1, size=(31,31), name=label)
+            else:
+                tmp = wx.Button(palette, -1, label, name=label )
             tmp.Bind(wx.EVT_BUTTON, add_toplevel_object)
-        tmp.SetBitmap( bmp )
+        if config.preferences.show_palette_icons:
+            tmp.SetBitmap( bmp )
     refs[tmp.GetId()] = widget
     if not tip:
-        tip = _('Add a %s') % widget.replace(_('Edit'), '')
+        tip = _('Add a %s') % label
     tmp.SetToolTip(wx.ToolTip(tip))
 
     WidgetTree.images[widget] = icon_path
@@ -281,32 +283,27 @@
     """Decode the item to a Unicode string. The encoding to UTF-8 will be done later.
 
     Non-string items will be converted to string automatically.
-    If no encoding given, app_tree.app.encoding or 'UFT-8' will be used."""
+    If no encoding given, root.encoding or 'UFT-8' will be used."""
     if not isinstance(item, compat.basestring):
         item = str(item)
     if isinstance(item, compat.unicode):
         return item
-    encoding = encoding or (app_tree and app_tree.app.encoding) or "UTF-8"
+    encoding = encoding or (app_tree and root.encoding) or "UTF-8"
     item = item.decode(encoding)
     return item
 
 
-def register(lang, klass_name, code_writer, property_name=None, property_handler=None, widget_name=None):
-    """Initialise and register widget code generator instance. The property handler will registered additionally.
+def register(lang, klass_name, code_writer):
+    """Initialise and register widget code generator instance.
 
     lang:             Code code_writer language
     klass_name:       wxWidget class name
     code_writer:      Code generator class
-    property_name:    Property name
-    property_handler: Property handler
-    widget_name:      Widget name
 
-    see: L{codegen.BaseLangCodeWriter.add_widget_handler(), codegen.BaseLangCodeWriter.add_property_handler()"""
+    see: codegen.BaseLangCodeWriter.register_widget_code_generator()"""
     codegen = code_writers[lang]
     if codegen:
-        codegen.add_widget_handler(klass_name, code_writer)
-        if property_name and property_handler:
-            codegen.add_property_handler(property_name, property_handler, widget_name)
+        codegen.register_widget_code_generator(klass_name, code_writer)
 
 
 ########################################################################################################################
@@ -372,11 +369,12 @@
 
     outfile = None
     try:
-        if os.path.isfile(filename):
-            with open(filename, 'r') as infile:
-                win_line_ending = infile.readline().endswith("\r\n")
-        else:
-            win_line_ending = sys.platform.startswith("win")
+        if which=="codegen":
+            if os.path.isfile(filename):
+                with open(filename, 'rb') as infile:
+                    win_line_ending = infile.readline().endswith(b"\r\n")
+            else:
+                win_line_ending = sys.platform.startswith("win")
 
         if need_backup:
             backup_name = filename + config.preferences.backup_suffix
@@ -392,7 +390,7 @@
 
         outfile = open(filename, 'wb')
         for line in content:
-            if win_line_ending:
+            if which=="codegen" and win_line_ending:
                 line = line.replace(b"\n", b"\r\n")
             outfile.write(line)
         outfile.close()
@@ -405,9 +403,9 @@
 # files and paths
 
 def get_name_for_autosave(filename=None):
-    "Return filename for the automatic backup of named file or current file (app_tree.app.filename)"
+    "Return filename for the automatic backup of named file or current file (root.filename)"
     if not filename:
-        filename = app_tree.app.filename
+        filename = root.filename
     if not filename:
         path, name = config.home_path, ""
     else:
@@ -430,13 +428,13 @@
 
 def autosave_current():
     "Save automatic backup copy for the current and un-saved design;  returns 0: error; 1: no changes to save; 2: saved"
-    if app_tree.app.saved:
+    if root.saved:
         return 1            # do nothing in this case...
 
     autosave_name = get_name_for_autosave()
     try:
         outfile = _Writer(autosave_name)
-        app_tree.write(outfile)
+        root.write(outfile)
         outfile.close()
     except EnvironmentError as details:
         logging.warning( _('Saving the autosave file "%s" failed: %s'), autosave_name, details )
@@ -445,7 +443,7 @@
 
 
 def remove_autosaved(filename=None):
-    "Remove the automatic backup;  @see: L{get_name_for_autosave()}"
+    "Remove the automatic backup;  see: get_name_for_autosave()"
     autosave_name = get_name_for_autosave(filename)
     if os.path.exists(autosave_name):
         try:
@@ -456,7 +454,7 @@
 
 def check_autosaved(filename):
     "Returns True if there are an automatic backup for filename"
-    if filename is not None and filename == app_tree.app.filename:
+    if filename is not None and filename == root.filename:
         # this happens when reloading, no auto-save-restoring in this case...
         return False
     autosave_name = get_name_for_autosave(filename)
@@ -507,7 +505,7 @@
 
 
 def init_paths(options):
-    "Set all wxGlade related paths; the paths will be stored in L{config}."
+    "Set all wxGlade related paths; the paths will be stored in config."
     # use directory of the exe in case of frozen packages e.g. PyInstaller or py2exe
     if hasattr(sys, 'frozen'):
         wxglade_path = os.path.dirname(sys.argv[0])
@@ -735,7 +733,7 @@
 
 
 def save_preferences():
-    "Save current settings as well as the file history;  @see: L{config.history_file} and L{config.use_file_history}"
+    "Save current settings as well as the file history; see: config.history_file and config.use_file_history"
     # let the exception be raised
     path = os.path.dirname(config.rc_file)
     if not os.path.isdir(path):
@@ -757,7 +755,7 @@
 
 
 def load_file_history():
-    "Loads the file history and returns a list of paths;  @see: L{config.history_file} and L{config.use_file_history}"
+    "Loads the file history and returns a list of paths; see: config.history_file and config.use_file_history"
     try:
         infile = codecs.open(config.history_file, encoding='utf-8')
         lines = infile.readlines()
@@ -785,6 +783,11 @@
         'default_border': False,
         'default_border_size': 3,
         'show_sizer_handle': True,
+        'show_palette_icons': True,
+        'show_palette_labels': False,
+        'show_gridproperty_editors': False,
+        'use_checkboxes_workaround': False,
+        'no_checkbox_label_colours':False,
         'allow_duplicate_names': False,
         'autosave': True,
         'autosave_delay': 120,  # in seconds
@@ -881,7 +884,7 @@
 
     returns: Style dictionary with modified attributes"""
     for style_name in styles.keys():
-        for attr in ['combination', 'exclude', 'include', 'require', ]:
+        for attr in ['combination', 'exclude', 'include', 'require', 'disabled']:
             try:
                 styles[style_name][attr] = set(styles[style_name][attr].split('|'))
             except (AttributeError, KeyError):
diff -Nru wxglade-0.9.6/compat.py wxglade-1.0.1/compat.py
--- wxglade-0.9.6/compat.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/compat.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,7 +2,7 @@
 Compatibility code to run with different versions of wxPython
 
 @copyright: 2013-2016 Carsten Grohmann
-@copyright: 2017-2018 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -40,18 +40,14 @@
     """
     Wrapper for wxSizerItem.SetWindow() resp. wxSizerItem.AssignWindow()
 
-    wxSizerItem.SetWindow() is deprecated since wxPython 2.9 use
-    wxSizerItem.AssignWindow() instead.
+    wxSizerItem.SetWindow() is deprecated since wxPython 2.9 use wxSizerItem.AssignWindow() instead.
 
-    Depending on the wxPython version L{SizerItem_SetWindow28()} or
-    L{SizerItem_AssignWindow()} will be used.
+    Depending on the wxPython version SizerItem_SetWindow28() or SizerItem_AssignWindow() will be used.
 
-    @param item:   Instance of wxSizerItem
-    @param window: Instance of wxWindow
+    item:   Instance of wxSizerItem
+    window: Instance of wxWindow
 
-    @see: L{SizerItem_SetWindow()}
-    @see: L{SizerItem_SetWindow28()}
-    @see: L{SizerItem_AssignWindow()}
+    see: SizerItem_SetWindow(), SizerItem_SetWindow28(), SizerItem_AssignWindow()
     """
     item.AssignWindow(window)
 
@@ -60,19 +56,14 @@
     """
     Wrapper for wxSizerItem.SetWindow() resp. wxSizerItem.AssignWindow()
 
-    wxSizerItem.SetWindow() is deprecated since wxPython 2.9 use
-    wxSizerItem.AssignWindow() instead.
+    wxSizerItem.SetWindow() is deprecated since wxPython 2.9 use wxSizerItem.AssignWindow() instead.
 
-    Depending on the wxPython version L{SizerItem_SetWindow28()} or
-    L{SizerItem_AssignWindow()} will be used.
+    Depending on the wxPython version SizerItem_SetWindow28() or SizerItem_AssignWindow() will be used.
 
-    @param item:   Instance of wxSizerItem
-    @param window: Instance of wxWindow
+    item:   Instance of wxSizerItem
+    window: Instance of wxWindow
 
-    @see: L{SizerItem_SetWindow()}
-    @see: L{SizerItem_SetWindow28()}
-    @see: L{SizerItem_AssignWindow()}
-    """
+    see: SizerItem_SetWindow(), SizerItem_SetWindow28(), SizerItem_AssignWindow()"""
     item.SetWindow(window)
 
 
@@ -80,12 +71,10 @@
     """
     Wrapper for wxSizerItem.SetSizer() resp. wxSizerItem.AssignSizer()
 
-    wxSizerItem.SetSizer() is deprecated since wxPython 2.9 use
-    wxSizerItem.AssignSizer() instead.
+    wxSizerItem.SetSizer() is deprecated since wxPython 2.9 use wxSizerItem.AssignSizer() instead.
 
-    @param item:  Instance of wxSizerItem
-    @param sizer: Instance of wxSizer
-    """
+    item:  Instance of wxSizerItem
+    sizer: Instance of wxSizer"""
     # don't use for now, as this causes crashes in e.g. change_sizer
     #if hasattr(item, 'AssignSizer'):
         #item.AssignSizer(sizer)
@@ -206,6 +195,27 @@
         widget.Hide()
         wx.CallAfter(_Destroy, widget)
 
+def wxWindow_SendSizeEventToParent28(item, flags=0):
+    """\
+    Implementation of wxWindow.SendSizeEventToParent for wxPython 2.8
+
+    @param item:  Instance of wxWindow
+    @param flags: flags parameter for SendSizeEvent (ignored)
+    """
+    parent = item.GetParent()
+    if parent and not parent.IsBeingDeleted():
+        parent.SendSizeEvent()
+
+
+def wxWindow_SendSizeEventToParent3(item, flags=0):
+    """\
+    Wrapper of wxWindow.SendSizeEventToParent
+
+    @param item:  Instance of wxWindow
+    @param flags: flags parameter for SendSizeEvent
+    """
+    item.SendSizeEventToParent(flags)
+
 
 # Set different functions depending on the active wxPython version
 if wx.VERSION[:2] >= (2, 9):
@@ -213,11 +223,13 @@
     GridSizer_GetCols = GridSizer_GetCols3
     SizerItem_SetWindow = SizerItem_AssignWindow
     wxWindow_IsEnabled = wxWindow_IsThisEnabled
+    wxWindow_SendSizeEventToParent = wxWindow_SendSizeEventToParent3
 else:
     GridSizer_GetRows = GridSizer_GetRows28
     GridSizer_GetCols = GridSizer_GetCols28
     SizerItem_SetWindow = SizerItem_SetWindow28
     wxWindow_IsEnabled = wxWindow_IsEnabled28
+    wxWindow_SendSizeEventToParent = wxWindow_SendSizeEventToParent28
 
 
 import wx.grid
@@ -243,6 +255,7 @@
     def SetToolTip(c, s):
         c.SetToolTipString(s)
     wx_EmptyBitmap = wx.EmptyBitmap
+    wx_EmptyImage = wx.EmptyImage
     wx_EmptyIcon = wx.EmptyIcon
     wx_NamedColour = wx.NamedColour
     def ConvertPixelsToDialog(widget, size):
@@ -250,6 +263,8 @@
 
     ListCtrl_SetStringItem    = wx.ListCtrl.SetStringItem
     ListCtrl_InsertStringItem = wx.ListCtrl.InsertStringItem
+    ListCtrl_InsertImageItem = wx.ListCtrl.InsertImageItem
+
     def SetCursor(window, cursor):
         window.SetCursor(wx.StockCursor(cursor))
         
@@ -273,6 +288,7 @@
     def SetToolTip(c, s):
         c.SetToolTip(s)
     wx_EmptyBitmap = wx.Bitmap
+    wx_EmptyImage = wx.Image
     wx_EmptyIcon = wx.Icon
     wx_NamedColour = wx.Colour
     def ConvertPixelsToDialog(widget, size):
@@ -280,6 +296,8 @@
 
     ListCtrl_SetStringItem    = wx.ListCtrl.SetItem
     ListCtrl_InsertStringItem = wx.ListCtrl.InsertItem
+    ListCtrl_InsertImageItem = wx.ListCtrl.InsertItem
+
     def SetCursor(window, cursor):
         window.SetCursor(wx.Cursor(cursor))
 
diff -Nru wxglade-0.9.6/config.py wxglade-1.0.1/config.py
--- wxglade-0.9.6/config.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/config.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,19 +1,29 @@
 """
 Configuration related stuff
 
-@note: Don't place code with gettext or dependencies to other wxGlade
-       parts here!
+note: Don't place code with gettext or dependencies to other wxGlade parts here!
 
-@see: L{preferencesdialog}
+see: preferencesdialog
 @copyright: 2007 Alberto Griggio
 @copyright: 2013-2016 Carsten Grohmann
-@copyright: 2017-2018 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import os, sys
 
 
+debugging = ('WINGDB_ACTIVE' in os.environ)  # if True, at many places exceptions will be raised instead of handled
+use_freeze_thaw = False
+if sys.platform=="win32":
+    use_freeze_thaw = True  # for debugging, you may want to set this to False
+open_design_window = debugging  # if True, wxGlade will open the design window when started with a command line argument
+use_gui = True   # If True, wxGlade runs in "GUI" mode, if False, in "batch" mode for generating code only
+inform_screen_reader = None  # set if program starts for the first time and a screen reader is installed
+
+testing = False  # to be set by the testing framework
+
+
 # default configuration values #########################################################################################
 default_app_name = 'app'           # application name
 
@@ -35,7 +45,7 @@
 default_overwrite = 1        # value for overwriting existing sources
 default_use_gettext = False  # value to usage of gettext
 
-for_version = (2, 8) # version to generate code for
+for_version_min = (2, 8) # min version to generate code for
 
 
 # these paths, file names and strings will be set during initialisation: ###############################################
@@ -62,14 +72,11 @@
 history_file = ''                    # Path to the history file, if used
 log_file = ''                        # Path to wxGlade log file
 
-
-
-use_gui = True                 # If True, wxGlade runs in "GUI" mode, if False, in "batch" mode for generating code only
 use_file_history =  True       # Flag to use a file history
 
 
 backed_up = {}      # Set of file names already backed up during this session (a dictionary);  see: common.save_file()
-preferences = None  # User preferences;  @type: common.Preferences   @see: L{common.Preferences}
+preferences = None  # User preferences; type common.Preferences
 
 
 label_width = 96     # width of labels in Property window
@@ -77,9 +84,6 @@
 tooltip_time = 3    # Number of seconds a tooltip will be shown
 tooltip_width = 50  # Maximum width to split tooltips into
 
-debugging = ('WINGDB_ACTIVE' in os.environ)  # if True, at many places exceptions will be raised instead of handled
-testing = False  # to be set by the testing framework
-
 ########################################################################################################################
 # Dictionary to store widget generic widget details like tooltips, different names, ...
 # see below for examples and documentation
@@ -93,10 +97,13 @@
         'wxBOTTOM': { 'desc': _('Apply the border to the bottom.') },
         'wxLEFT':   { 'desc': _('Apply the border to the left.') },
         'wxRIGHT':  { 'desc': _('Apply the border to the right.') },
-        'wxALIGN_LEFT':   {'desc': _('Align the item to the left.') },
-        'wxALIGN_RIGHT':  {'desc': _('Align the item to the right.') },
+        'wxALIGN_LEFT':   {'desc': _('Align the item to the left.'),
+                           'exclude': 'wxALIGN_CENTER_HORIZONTAL|wxALIGN_RIGHT|wxALIGN_CENTER'},
+        'wxALIGN_RIGHT':  {'desc': _('Align the item to the right.'),
+                           'exclude': 'wxALIGN_CENTER_HORIZONTAL|wxALIGN_LEFT|wxALIGN_CENTER'},
         'wxALIGN_CENTER': { 'desc': _('Centre the item (horizontally).'),
-                            'combination': 'wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL' },
+                            'combination': 'wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL',
+                            'exclude': 'wxALIGN_RIGHT|wxALIGN_LEFT'},
         'wxALIGN_CENTRE': { 'desc': _('Centre the item (horizontally).'),
                             'synonym': 'wxALIGN_CENTER',
                             'rename_to': 'wxALIGN_CENTER',
@@ -107,7 +114,8 @@
         'wxALIGN_CENTRE_VERTICAL':   { 'desc': _('Centre the item vertically.'),
                                        'synonym': 'wxALIGN_CENTER_VERTICAL',
                                        'rename_to': 'wxALIGN_CENTER_VERTICAL' },
-        'wxALIGN_CENTER_HORIZONTAL': { 'desc': _('Centre the item horizontally.') },
+        'wxALIGN_CENTER_HORIZONTAL': { 'desc': _('Centre the item horizontally.'),
+                                       'exclude': 'wxALIGN_RIGHT|wxALIGN_LEFT'},
         'wxALIGN_CENTRE_HORIZONTAL': { 'desc': _('Centre the item horizontally.'),
                                        'synonym': 'wxALIGN_CENTER_HORIZONTAL',
                                        'rename_to': 'wxALIGN_CENTER_HORIZONTAL' },
@@ -128,7 +136,7 @@
                                                       "the window even if it isn't visible. This makes it "
                                                       "possible to dynamically show and hide controls "
                                                       "without resizing parent dialog, for example. "
-                                                      "This function is new since wxWidgets version 2.8."),
+                                                      "This function is new since wxWidgets version 2.8.8."),
                                             'supported_by': ('wx3',) },
 
         # generic styles from wxWindow
@@ -152,40 +160,41 @@
 
         # Generic border styles
         'wxBORDER_DEFAULT': { 'desc': _('The window class will decide the kind of border to show, if any.'),
-                              'supported_by': ('wx3',) },
-        'wxSIMPLE_BORDER':  { 'desc': _('Displays a thin border around the window. '
-                                        'wxSIMPLE_BORDER is the old name for this style.'),
-                              'rename_to': 'wxBORDER_SIMPLE' },
-        'wxBORDER_SIMPLE':  { 'desc': _('Displays a thin border around the window. '
-                                        'wxSIMPLE_BORDER is the old name for this style.') },
-        'wxSUNKEN_BORDER':  { 'desc': _('Displays a sunken border. wxSUNKEN_BORDER is the old name for this style.'),
-                              'rename_to': 'wxBORDER_SUNKEN' },
-        'wxBORDER_SUNKEN':  { 'desc': _('Displays a sunken border. wxSUNKEN_BORDER is the old name for this style.') },
-        'wxRAISED_BORDER':  { 'desc': _('Displays a raised border. wxRAISED_BORDER is the old name for this style.'),
-                              'rename_to': 'wxBORDER_RAISED' },
-        'wxBORDER_RAISED':  { 'desc': _('Displays a raised border. wxRAISED_BORDER is the old name for this style.') },
-        'wxSTATIC_BORDER':  { 'desc': _('Displays a border suitable for a static control. '
-                                        'wxSTATIC_BORDER is the old name for this style. Windows only.'),
-                              'rename_to': 'wxBORDER_STATIC' },
-        'wxBORDER_STATIC':  { 'desc': _('Displays a border suitable for a static control. '
-                                        'wxSTATIC_BORDER is the old name for this style. Windows only.') },
+                              'supported_by': ('wx3',),
+                              'exclude': 'wxBORDER_NONE|wxBORDER_STATIC|wxBORDER_SIMPLE|wxBORDER_RAISED|wxBORDER_SUNKEN|wxBORDER_DOUBLE|wxBORDER_THEME'},
+        'wxBORDER_SIMPLE':  { 'desc': _('Displays a thin border around the window.'),
+                              'exclude': 'wxBORDER_DEFAULT|wxBORDER_NONE|wxBORDER_STATIC|wxBORDER_RAISED|wxBORDER_SUNKEN|wxBORDER_DOUBLE|wxBORDER_THEME'},
+        'wxBORDER_SUNKEN':  { 'desc': _('Displays a sunken border.'),
+                              'exclude': 'wxBORDER_DEFAULT|wxBORDER_NONE|wxBORDER_STATIC|wxBORDER_SIMPLE|wxBORDER_RAISED|wxBORDER_DOUBLE|wxBORDER_THEME'},
+        'wxBORDER_RAISED':  { 'desc': _('Displays a raised border.'),
+                              'exclude': 'wxBORDER_DEFAULT|wxBORDER_NONE|wxBORDER_STATIC|wxBORDER_SIMPLE|wxBORDER_SUNKEN|wxBORDER_DOUBLE|wxBORDER_THEME'},
+        'wxBORDER_STATIC':  { 'desc': _('Displays a border suitable for a static control. Windows only.'),
+                              'exclude': 'wxBORDER_DEFAULT|wxBORDER_NONE|wxBORDER_SIMPLE|wxBORDER_RAISED|wxBORDER_SUNKEN|wxBORDER_DOUBLE|wxBORDER_THEME'},
         'wxBORDER_THEME':   { 'desc': _('Displays a native border suitable for a control, on the current platform. '
                                         'On Windows XP or Vista, this will be a themed border; '
                                         'on most other platforms a sunken border will be used. '
                                         'For more information for themed borders on Windows, please see Themed borders '
-                                        'on Windows.') },
-        'wxNO_BORDER': { 'desc': _('Displays no border, overriding the default border '
-                                   'style for the window. wxNO_BORDER is the old name for this style.'),
-                         'rename_to': 'wxBORDER_NONE' },
-        'wxBORDER_NONE': { 'desc': _('Displays no border, overriding the default border style for the window.'
-                                     ' wxNO_BORDER is the old name for this style.'),
+                                        'on Windows.'),
+                              'exclude': 'wxBORDER_DEFAULT|wxBORDER_NONE|wxBORDER_STATIC|wxBORDER_SIMPLE|wxBORDER_RAISED|wxBORDER_SUNKEN|wxBORDER_DOUBLE'},
+        'wxBORDER_NONE': { 'desc': _('Displays no border, overriding the default border style for the window.'),
+                           'exclude': 'wxBORDER_DEFAULT|wxBORDER_STATIC|wxBORDER_SIMPLE|wxBORDER_RAISED|wxBORDER_SUNKEN|wxBORDER_DOUBLE|wxBORDER_THEME'
         },
-        'wxDOUBLE_BORDER': { 'desc':_('Displays a double border. wxDOUBLE_BORDER is the old name for this style. '
-                                      'Windows and Mac only.'),
+        # obsolete border style
+        'wxBORDER_DOUBLE': { 'desc':_('Displays a double border. Windows and Mac only.'),
+                             'obsolete': _('since wx3.0'),
+                             'supported_by': ('wx2',),
+                             'exclude': 'wxBORDER_DEFAULT|wxBORDER_STATIC|wxBORDER_SIMPLE|wxBORDER_RAISED|wxBORDER_SUNKEN|wxBORDER_THEME'},
+
+        # old border style names
+        'wxSIMPLE_BORDER':  { 'desc': _('Displays a thin border around the window.'), 'rename_to': 'wxBORDER_SIMPLE' },
+        'wxSUNKEN_BORDER':  { 'desc': _('Displays a sunken border.'), 'rename_to': 'wxBORDER_SUNKEN' },
+        'wxRAISED_BORDER':  { 'desc': _('Displays a raised border.'), 'rename_to': 'wxBORDER_RAISED' },
+        'wxSTATIC_BORDER':  { 'desc': _('Displays a border suitable for a static control. Windows only.'),
+                              'rename_to': 'wxBORDER_STATIC' },
+        'wxNO_BORDER': { 'desc': _('Displays no border, overriding the default border style for the window.'),
+                         'rename_to': 'wxBORDER_NONE' },
+        'wxDOUBLE_BORDER': { 'desc':_('Displays a double border. Windows and Mac only.'),
                              'rename_to': 'wxBORDER_DOUBLE' },
-        'wxBORDER_DOUBLE': { 'desc':_('Displays a double border. wxDOUBLE_BORDER is the old name for this style. '
-                                      'Windows and Mac only.'),
-                             'obsolete': _('since wx3.0') },
 
         # wxDialog styles
         'wxNO_3D': { 'desc': _('Under Windows, specifies that the child controls should not have 3D borders unless '
diff -Nru wxglade-0.9.6/CONTRIBUTING.txt wxglade-1.0.1/CONTRIBUTING.txt
--- wxglade-0.9.6/CONTRIBUTING.txt	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/CONTRIBUTING.txt	2020-12-31 14:04:48.000000000 +0000
@@ -13,7 +13,7 @@
 - Class names are usually CamelCase - variables, functions and method names
   are lower_case_with_unserscores
 - Constants are ``UPPER_CASE``
-- Source lines are at most 79 characters long
+- Source lines are at most 120 characters long
 - Class bodies are usually ended by a ``# end of class ClassName`` comment
 - Source files use Unix EOL conventions (LF) if possible. In any case, please
   don't mix Unix and Windows EOLs
diff -Nru wxglade-0.9.6/debian/changelog wxglade-1.0.1/debian/changelog
--- wxglade-0.9.6/debian/changelog	2020-12-13 16:38:15.000000000 +0000
+++ wxglade-1.0.1/debian/changelog	2021-01-28 19:09:34.000000000 +0000
@@ -1,3 +1,12 @@
+wxglade (1.0.1-1) unstable; urgency=medium
+
+  * new upstream version
+  * updated the debian patches
+  * modified wxglade.install to use icons/wxglade.png
+  * added a debian patch to fix wxGlade.desktop
+
+ -- Georges Khaznadar <georgesk@debian.org>  Thu, 28 Jan 2021 20:09:34 +0100
+
 wxglade (0.9.6-2) unstable; urgency=medium
 
   * removed Matthias Klose as uploader. Closes: #977267
diff -Nru wxglade-0.9.6/debian/patches/desktopfile.patch wxglade-1.0.1/debian/patches/desktopfile.patch
--- wxglade-0.9.6/debian/patches/desktopfile.patch	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/debian/patches/desktopfile.patch	2021-01-28 19:09:34.000000000 +0000
@@ -0,0 +1,13 @@
+Index: wxglade/wxGlade.desktop
+===================================================================
+--- wxglade.orig/wxGlade.desktop
++++ wxglade/wxGlade.desktop
+@@ -5,7 +5,7 @@ Name=wxGlade
+ Comment=A GUI designer written in Python with the popular GUI toolkit wxPython
+ Exec=wxglade %f
+ Terminal=false
+-Icon=wxglade.xpm
++Icon=wxglade
+ Type=Application
+ Categories=Development;GUIDesigner;
+ GenericName=wxGlade
diff -Nru wxglade-0.9.6/debian/patches/series wxglade-1.0.1/debian/patches/series
--- wxglade-0.9.6/debian/patches/series	2018-04-01 19:09:59.000000000 +0000
+++ wxglade-1.0.1/debian/patches/series	2021-01-28 19:09:34.000000000 +0000
@@ -1,2 +1,3 @@
 wxglade.patch
 delPythonMagicNumber.patch
+desktopfile.patch
diff -Nru wxglade-0.9.6/debian/patches/wxglade.patch wxglade-1.0.1/debian/patches/wxglade.patch
--- wxglade-0.9.6/debian/patches/wxglade.patch	2020-06-14 15:58:40.000000000 +0000
+++ wxglade-1.0.1/debian/patches/wxglade.patch	2021-01-28 19:09:34.000000000 +0000
@@ -3,12 +3,12 @@
 ===================================================================
 --- wxglade.orig/wxglade
 +++ wxglade/wxglade
-@@ -16,70 +16,5 @@
- # Keep this up to date with version.py and sphinx/conf.py
- WXG_VERSION="0.9.6"
+@@ -18,69 +18,5 @@ WXG_VERSION="1.0.1"
+ 
+ CURR_DIR=$(dirname "$0")
  
 -# search order for Python interpreter
--INTERPRETER_LIST="python3 python2 \
+-INTERPRETER_LIST="${CURR_DIR}/python python3 python2 \
 -                  python2.7 python27 \
 -                  python"
 -
@@ -42,7 +42,6 @@
 -
 -  # search wxglade.py
 -  # dist-packages is only used in Debian and Debian derivates
--  CURR_DIR=$(dirname "$0")
 -  for DIR in \
 -     "${CURR_DIR}" \
 -     "${WXG_MODULE_PATH}" \
@@ -74,4 +73,4 @@
 -
  # exec wxGlade
 -exec "${PYTHON_BIN}" "${WXG_BINARY}" "$@"
-+exec python3 /usr/share/wxglade/wxglade.py "$@"
++exec  python3 /usr/share/wxglade/wxglade.py "$@"
diff -Nru wxglade-0.9.6/debian/wxglade.install wxglade-1.0.1/debian/wxglade.install
--- wxglade-0.9.6/debian/wxglade.install	2018-04-01 19:09:59.000000000 +0000
+++ wxglade-1.0.1/debian/wxglade.install	2021-01-28 19:09:34.000000000 +0000
@@ -16,4 +16,4 @@
 
 wxglade	  	usr/bin
 
-icons/wxglade.xpm usr/share/pixmaps
+icons/wxglade.png usr/share/pixmaps
diff -Nru wxglade-0.9.6/debian/wxglade.manpages wxglade-1.0.1/debian/wxglade.manpages
--- wxglade-0.9.6/debian/wxglade.manpages	2018-04-01 19:09:59.000000000 +0000
+++ wxglade-1.0.1/debian/wxglade.manpages	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-docs_old/man/wxglade.1
diff -Nru wxglade-0.9.6/_dialogs28.py wxglade-1.0.1/_dialogs28.py
--- wxglade-0.9.6/_dialogs28.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/_dialogs28.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,149 @@
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 1.0.0a8 on Sun Oct  4 22:16:24 2020
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import compat
+# end wxGlade
+
+
+class MakeRowColGrowableDlg(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MakeRowColGrowableDlg.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetTitle("Make row and/or column growable")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        static_text_1 = wx.StaticText(self, wx.ID_ANY, "You have set a widget's layout to EXPAND.\n\nThe containing row and column are not growable.\nSo EXPAND does not have an effect.")
+        sizer_1.Add(static_text_1, 0, wx.ALL | wx.EXPAND, 8)
+
+        sizer_2 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, "Make growable"), wx.VERTICAL)
+        sizer_1.Add(sizer_2, 1, wx.ALL | wx.EXPAND, 6)
+
+        self.cb_row_growable = wx.CheckBox(self, wx.ID_ANY, "Row")
+        sizer_2.Add(self.cb_row_growable, 0, wx.ALL, 4)
+
+        self.cb_col_growable = wx.CheckBox(self, wx.ID_ANY, "Column")
+        sizer_2.Add(self.cb_col_growable, 0, wx.ALL, 4)
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 2)
+
+        self.cb_dont_show_again = wx.CheckBox(self, wx.ID_ANY, "Don't show this dialog again")
+        sizer_3.Add(self.cb_dont_show_again, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 5)
+
+        sizer_3.Add((20, 20), 1, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.button_OK = wx.Button(self, wx.ID_OK, "")
+        sizer_3.Add(self.button_OK, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MakeRowColGrowableDlg
+
+class SelectArtDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: SelectArtDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetSize((300, 600))
+        self.SetTitle("ART selector")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        label_1 = wx.StaticText(self, wx.ID_ANY, "Select row and hit OK or Enter:")
+        sizer_1.Add(label_1, 0, wx.ALL, 8)
+
+        self.art_names = ["NEW", "FILE_OPEN", "FILE_SAVE", "FILE_SAVE_AS", "NEW_DIR", "FOLDER_OPEN",
+        "CUT", "COPY", "PASTE", "UNDO", "REDO",
+        "PLUS", "MINUS", "CLOSE", "QUIT", "PRINT", "DELETE", "HELP",
+        "FIND", "FIND_AND_REPLACE", "ADD_BOOKMARK", "DEL_BOOKMARK",
+        "GO_FORWARD", "GO_BACK", "GO_UP", "GO_DOWN", "GO_HOME", "GOTO_FIRST", "GOTO_LAST", "GO_TO_PARENT", "GO_DIR_UP",
+        "LIST_VIEW", "REPORT_VIEW",
+        "NORMAL_FILE", "EXECUTABLE_FILE", "FOLDER",
+        "HELP_BOOK", "HELP_FOLDER", "HELP_PAGE", "HELP_SIDE_PANEL", "HELP_SETTINGS",
+        "TICK_MARK", "CROSS_MARK",
+        "MISSING_IMAGE",
+        "HARDDISK", "FLOPPY", "CDROM",
+        "ERROR", "QUESTION", "WARNING", "INFORMATION", "TIP"]
+        # not for 2.8: "GOTO_FIRST", "GOTO_LAST", "PLUS", "MINUS"
+
+        self.art_list = wx.ImageList(16, 16)
+
+        self.listctrl = wx.ListCtrl(self, wx.ID_ANY, style=wx.LC_HRULES | wx.LC_REPORT | wx.LC_VRULES)
+        self.listctrl.InsertColumn(0, "Image", format=wx.LIST_FORMAT_LEFT, width=50)
+        self.listctrl.InsertColumn(1, "Name", format=wx.LIST_FORMAT_LEFT, width=200)
+
+        for i, name in enumerate(self.art_names):
+            art_id = getattr(wx, "ART_%s"%name, wx.ART_MISSING_IMAGE)
+            bmp = wx.ArtProvider.GetBitmap(art_id, wx.ART_TOOLBAR, (16,16))
+            self.art_list.Add(bmp)
+
+        self.listctrl.SetImageList(self.art_list, wx.IMAGE_LIST_SMALL)
+        for i, name in enumerate(self.art_names):
+            compat.ListCtrl_InsertImageItem(self.listctrl, i,i)  # i is index into ImageList
+            compat.ListCtrl_SetStringItem(self.listctrl, i, 1, name)
+
+
+        #index = self.list.InsertItem(self.list.GetItemCount(), data[0], self.idx1)
+        sizer_1.Add(self.listctrl, 1, wx.ALL | wx.EXPAND, 4)
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 4)
+
+        label_2 = wx.StaticText(self, wx.ID_ANY, "Width")
+        sizer_3.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 4)
+
+        self.spin_width = wx.SpinCtrl(self, wx.ID_ANY, "24", min=1, max=100)
+        sizer_3.Add(self.spin_width, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 3)
+
+        label_3 = wx.StaticText(self, wx.ID_ANY, "Height")
+        sizer_3.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 6)
+
+        self.spin_height = wx.SpinCtrl(self, wx.ID_ANY, "24", min=1, max=100)
+        sizer_3.Add(self.spin_height, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 3)
+
+        label_4 = wx.StaticText(self, wx.ID_ANY, "pixels")
+        sizer_3.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 6)
+
+        static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(static_line_1, 0, wx.EXPAND, 0)
+
+        sizer_2 = wx.StdDialogButtonSizer()
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT | wx.ALL, 8)
+
+        self.button_OK = wx.Button(self, wx.ID_OK, "")
+        self.button_OK.SetDefault()
+        sizer_2.AddButton(self.button_OK)
+
+        self.button_CANCEL = wx.Button(self, wx.ID_CANCEL, "")
+        sizer_2.AddButton(self.button_CANCEL)
+
+        sizer_2.Realize()
+
+        self.SetSizer(sizer_1)
+
+        self.SetAffirmativeId(self.button_OK.GetId())
+        self.SetEscapeId(self.button_CANCEL.GetId())
+
+        self.Layout()
+        if compat.version[0]==2:
+            sizer_3.GetItem(self.spin_width).SetMinSize((60,-1))
+            sizer_3.GetItem(self.spin_height).SetMinSize((60,-1))
+
+        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, lambda evt: self.EndModal(wx.ID_OK), self.listctrl)
+        # end wxGlade
+
+# end of class SelectArtDialog
diff -Nru wxglade-0.9.6/_dialogs.py wxglade-1.0.1/_dialogs.py
--- wxglade-0.9.6/_dialogs.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/_dialogs.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,149 @@
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 1.0.0a8 on Sun Oct  4 22:16:15 2020
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import compat
+# end wxGlade
+
+
+class MakeRowColGrowableDlg(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MakeRowColGrowableDlg.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetTitle("Make row and/or column growable")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        static_text_1 = wx.StaticText(self, wx.ID_ANY, "You have set a widget's layout to EXPAND.\n\nThe containing row and column are not growable.\nSo EXPAND does not have an effect.")
+        sizer_1.Add(static_text_1, 0, wx.ALL | wx.EXPAND, 8)
+
+        sizer_2 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, "Make growable"), wx.VERTICAL)
+        sizer_1.Add(sizer_2, 1, wx.ALL | wx.EXPAND, 6)
+
+        self.cb_row_growable = wx.CheckBox(self, wx.ID_ANY, "Row")
+        sizer_2.Add(self.cb_row_growable, 0, wx.ALL, 4)
+
+        self.cb_col_growable = wx.CheckBox(self, wx.ID_ANY, "Column")
+        sizer_2.Add(self.cb_col_growable, 0, wx.ALL, 4)
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 2)
+
+        self.cb_dont_show_again = wx.CheckBox(self, wx.ID_ANY, "Don't show this dialog again")
+        sizer_3.Add(self.cb_dont_show_again, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 5)
+
+        sizer_3.Add((20, 20), 1, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.button_OK = wx.Button(self, wx.ID_OK, "")
+        sizer_3.Add(self.button_OK, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MakeRowColGrowableDlg
+
+class SelectArtDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: SelectArtDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetSize((300, 600))
+        self.SetTitle("ART selector")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        label_1 = wx.StaticText(self, wx.ID_ANY, "Select row and hit OK or Enter:")
+        sizer_1.Add(label_1, 0, wx.ALL, 8)
+
+        self.art_names = ["NEW", "FILE_OPEN", "FILE_SAVE", "FILE_SAVE_AS", "NEW_DIR", "FOLDER_OPEN",
+        "CUT", "COPY", "PASTE", "UNDO", "REDO",
+        "PLUS", "MINUS", "CLOSE", "QUIT", "PRINT", "DELETE", "HELP",
+        "FIND", "FIND_AND_REPLACE", "ADD_BOOKMARK", "DEL_BOOKMARK",
+        "GO_FORWARD", "GO_BACK", "GO_UP", "GO_DOWN", "GO_HOME", "GOTO_FIRST", "GOTO_LAST", "GO_TO_PARENT", "GO_DIR_UP",
+        "LIST_VIEW", "REPORT_VIEW",
+        "NORMAL_FILE", "EXECUTABLE_FILE", "FOLDER",
+        "HELP_BOOK", "HELP_FOLDER", "HELP_PAGE", "HELP_SIDE_PANEL", "HELP_SETTINGS",
+        "TICK_MARK", "CROSS_MARK",
+        "MISSING_IMAGE",
+        "HARDDISK", "FLOPPY", "CDROM",
+        "ERROR", "QUESTION", "WARNING", "INFORMATION", "TIP"]
+        # not for 2.8: "GOTO_FIRST", "GOTO_LAST", "PLUS", "MINUS"
+
+        self.art_list = wx.ImageList(16, 16)
+
+        self.listctrl = wx.ListCtrl(self, wx.ID_ANY, style=wx.LC_HRULES | wx.LC_REPORT | wx.LC_VRULES)
+        self.listctrl.AppendColumn("Image", format=wx.LIST_FORMAT_LEFT, width=50)
+        self.listctrl.AppendColumn("Name", format=wx.LIST_FORMAT_LEFT, width=200)
+
+        for i, name in enumerate(self.art_names):
+            art_id = getattr(wx, "ART_%s"%name, wx.ART_MISSING_IMAGE)
+            bmp = wx.ArtProvider.GetBitmap(art_id, wx.ART_TOOLBAR, (16,16))
+            self.art_list.Add(bmp)
+
+        self.listctrl.SetImageList(self.art_list, wx.IMAGE_LIST_SMALL)
+        for i, name in enumerate(self.art_names):
+            compat.ListCtrl_InsertImageItem(self.listctrl, i,i)  # i is index into ImageList
+            compat.ListCtrl_SetStringItem(self.listctrl, i, 1, name)
+
+
+        #index = self.list.InsertItem(self.list.GetItemCount(), data[0], self.idx1)
+        sizer_1.Add(self.listctrl, 1, wx.ALL | wx.EXPAND, 4)
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 4)
+
+        label_2 = wx.StaticText(self, wx.ID_ANY, "Width")
+        sizer_3.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 4)
+
+        self.spin_width = wx.SpinCtrl(self, wx.ID_ANY, "24", min=1, max=100)
+        sizer_3.Add(self.spin_width, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 3)
+
+        label_3 = wx.StaticText(self, wx.ID_ANY, "Height")
+        sizer_3.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 6)
+
+        self.spin_height = wx.SpinCtrl(self, wx.ID_ANY, "24", min=1, max=100)
+        sizer_3.Add(self.spin_height, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 3)
+
+        label_4 = wx.StaticText(self, wx.ID_ANY, "pixels")
+        sizer_3.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 6)
+
+        static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(static_line_1, 0, wx.EXPAND, 0)
+
+        sizer_2 = wx.StdDialogButtonSizer()
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT | wx.ALL, 8)
+
+        self.button_OK = wx.Button(self, wx.ID_OK, "")
+        self.button_OK.SetDefault()
+        sizer_2.AddButton(self.button_OK)
+
+        self.button_CANCEL = wx.Button(self, wx.ID_CANCEL, "")
+        sizer_2.AddButton(self.button_CANCEL)
+
+        sizer_2.Realize()
+
+        self.SetSizer(sizer_1)
+
+        self.SetAffirmativeId(self.button_OK.GetId())
+        self.SetEscapeId(self.button_CANCEL.GetId())
+
+        self.Layout()
+        if compat.version[0]==2:
+            sizer_3.GetItem(self.spin_width).SetMinSize((60,-1))
+            sizer_3.GetItem(self.spin_height).SetMinSize((60,-1))
+
+        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, lambda evt: self.EndModal(wx.ID_OK), self.listctrl)
+        # end wxGlade
+
+# end of class SelectArtDialog
diff -Nru wxglade-0.9.6/dialogs.py wxglade-1.0.1/dialogs.py
--- wxglade-0.9.6/dialogs.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/dialogs.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,147 @@
+# -*- coding: UTF-8 -*-
+"""Dialogs to ask users during widget initialisation triggered by an graphical
+user interaction.
+
+@copyright: 2014-2016 Carsten Grohmann
+@copyright: 2019-2020 Dietmar Schwertberger
+@license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY"""
+
+import compat
+import wx
+
+
+# import the raw dialogs as generated by wxGlade
+from _dialogs import *
+
+
+class WidgetStyleSelectionDialog(wx.Dialog):
+    "User dialog to select a style during widget creation"
+    def __init__(self, dlg_title, box_label, choices, options=None, defaults=None):
+        """Initialise the dialog and draw the content
+
+        dlg_title: Dialog title
+        box_label: Label of the draw around the listed choices
+        choices: Choices to select one (string list)
+        options: see uses of the dialog"""
+        pos = wx.GetMousePosition()
+        wx.Dialog.__init__(self, None, -1, dlg_title, pos)
+
+        szr = wx.BoxSizer(wx.VERTICAL)
+
+        if box_label:
+            self.box = wx.RadioBox( self, wx.ID_ANY, box_label, wx.DefaultPosition, wx.DefaultSize,choices.split('|'),
+                                    1, style=wx.RA_SPECIFY_COLS )
+            self.box.SetSelection(0)
+            self.Bind(wx.EVT_RADIOBOX, self.on_choice)
+            szr.Add(self.box, 5, wx.ALL | wx.EXPAND, 10)
+
+        if options:
+            self._check_option_dependencies(options)
+            self.option_controls = []
+            self.option_values = []
+            for o, option in enumerate(self.options):
+                # calculate border flags
+                #flags = wx.LEFT | wx.RIGHT
+                #if not self.dependencies[o]:   flags |= wx.TOP
+                #if not self.dependencies[o+1]: flags |= wx.BOTTOM
+                flags = wx.ALL
+                # create and add the option controls
+                if option[0]=="Text":
+                    label = option[1]
+                    hsizer = wx.BoxSizer(wx.HORIZONTAL)
+                    hsizer.Add(wx.StaticText(self, -1, label), 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 4)
+                    ctrl = wx.TextCtrl(self, -1, option[1])
+                    value = defaults and defaults[o] or ""
+                    ctrl.SetValue(value)
+                    hsizer.Add(ctrl, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 4)
+                    szr.Add(hsizer, 0, flags|wx.EXPAND, 4)
+                    ctrl.Bind(wx.EVT_TEXT, self.callback)
+                elif option[0]=="Checkbox":
+                    ctrl = wx.CheckBox(self, -1, option[1])
+                    value = defaults and defaults[o]
+                    ctrl.SetValue(value)
+                    szr.Add(ctrl, 0, flags, 8)
+                    ctrl.Bind(wx.EVT_CHECKBOX, self.callback)
+                elif option[0]=="Spin":
+                    label, range_ = option[1:]
+                    hsizer = wx.BoxSizer(wx.HORIZONTAL)
+                    hsizer.Add(wx.StaticText(self, -1, label), 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 4)
+                    mi_, ma_ = range_
+                    value = defaults and defaults[o] or 1
+                    ctrl = wx.SpinCtrl(self, -1, str(value), min=mi_, max=ma_, initial=value)
+                    hsizer.Add(ctrl, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 4)
+                    szr.Add(hsizer, 0, flags|wx.EXPAND, 4)
+                    ctrl.Bind(wx.EVT_SPINCTRL, self.callback)
+                self.option_controls.append(ctrl)
+                self.option_values.append( value )
+            self.active = [True]*len(self.options)
+            self._activate(1)
+
+            line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL)
+            szr.Add(line, 0, wx.EXPAND|wx.TOP|wx.LEFT, 5)
+
+        # buttons
+        btnbox = wx.StdDialogButtonSizer()
+        btnOK = wx.Button(self, wx.ID_OK)
+        btnOK.SetDefault()
+        btnCANCEL = wx.Button(self, wx.ID_CANCEL)
+        btnbox.AddButton(btnOK)
+        btnbox.AddButton(btnCANCEL)
+        btnbox.Realize()
+        szr.Add(btnbox, 0, wx.ALL|wx.ALIGN_CENTER, 8)
+
+        self.SetAutoLayout(True)
+        self.SetSizer(szr)
+        szr.Fit(self)
+
+    def on_choice(self, event):
+        # this can be overridden
+        event.Skip()
+
+    def _check_option_dependencies(self, options):
+        # if an option string starts with ">", it depends on the previous option
+        self.dependencies = [False]*len(options)
+        self.options = []
+        for o, option in enumerate(options):
+            if isinstance(option, compat.basestring):
+                # string -> checkbox
+                if option.startswith(">"):
+                    self.dependencies[o] = True
+                    option = option[1:]
+                if option[0]=="?":
+                    self.options.append( ("Text", option[1:]) )
+                else:
+                    self.options.append( ("Checkbox", option) )
+            elif len(option)==2:
+                # (string, range) -> spin control
+                label = option[0]
+                if label.startswith(">"):
+                    self.dependencies[o] = True
+                    label = label[1:]
+                self.options.append( ("Spin", label, option[1]) )
+        self.dependencies.append(None)  # dummy
+
+    def _activate(self, i):
+        # de-/activate controls based on the preceding options
+        for i in range(i, len(self.options)):
+            if self.dependencies[i] and (not self.active[i-1] or not self.option_values[i-1]):
+                activate = False
+            else:
+                activate = True
+            if activate!=self.active[i]:
+                self.option_controls[i].Enable(activate)
+                self.active[i] = activate
+
+    def callback(self, event):
+        # update values and enable / disable dependent options
+        ctrl = event.GetEventObject()
+        i = self.option_controls.index(ctrl)
+        self.option_values[i] = ctrl.GetValue()
+        self._activate(i+1)
+
+    def get_selection(self):
+        "Return the selected choice."
+        return self.box.GetStringSelection()
+
+    def get_options(self):
+        return self.option_values
diff -Nru wxglade-0.9.6/docs/html/acknowledgements.html wxglade-1.0.1/docs/html/acknowledgements.html
--- wxglade-0.9.6/docs/html/acknowledgements.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/acknowledgements.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>License and Acknowledgements &#8212; wxGlade 0.9.5 documentation</title>
+    <title>License and Acknowledgements &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -24,7 +24,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
-    <link rel="prev" title="Further reading" href="further_reading.html" /> 
+    <link rel="prev" title="Reference: Keyboard and Mouse Actions" href="reference.html" /> 
   </head>
   <body>
     <div class="related" role="navigation" aria-label="related navigation">
@@ -34,9 +34,9 @@
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="further_reading.html" title="Further reading"
+          <a href="reference.html" title="Reference: Keyboard and Mouse Actions"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -54,7 +54,7 @@
 <div><ul class="simple">
 <li>Copyright (c) 2002-2007 Alberto Griggio</li>
 <li>Copyright (c) 2011-2016 Carsten Grohmann</li>
-<li>Copyright (c) 2016-2019 Dietmar Schwertberger</li>
+<li>Copyright (c) 2016-2020 Dietmar Schwertberger</li>
 </ul>
 </div></blockquote>
 <p><strong>Use and distribution of wxGlade is governed by the MIT license:</strong></p>
@@ -97,8 +97,8 @@
 </ul>
 
   <h4>Previous topic</h4>
-  <p class="topless"><a href="further_reading.html"
-                        title="previous chapter">Further reading</a></p>
+  <p class="topless"><a href="reference.html"
+                        title="previous chapter">Reference: Keyboard and Mouse Actions</a></p>
   <div role="note" aria-label="source link">
     <h3>This Page</h3>
     <ul class="this-page-menu">
@@ -127,9 +127,9 @@
           <a href="genindex.html" title="General Index"
              >index</a></li>
         <li class="right" >
-          <a href="further_reading.html" title="Further reading"
+          <a href="reference.html" title="Reference: Keyboard and Mouse Actions"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/bitmaps.html wxglade-1.0.1/docs/html/bitmaps.html
--- wxglade-0.9.6/docs/html/bitmaps.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/bitmaps.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Bitmaps &#8212; wxGlade 0.9.5 documentation</title>
+    <title>Bitmaps &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -24,7 +24,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
-    <link rel="next" title="Custom Widget" href="custom_widgets.html" />
+    <link rel="next" title="Further reading" href="further_reading.html" />
     <link rel="prev" title="Menu, Status Bar, Tool Bar" href="menu_status_tool.html" /> 
   </head>
   <body>
@@ -35,12 +35,12 @@
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="custom_widgets.html" title="Custom Widget"
+          <a href="further_reading.html" title="Further reading"
              accesskey="N">next</a> |</li>
         <li class="right" >
           <a href="menu_status_tool.html" title="Menu, Status Bar, Tool Bar"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -290,8 +290,8 @@
   <p class="topless"><a href="menu_status_tool.html"
                         title="previous chapter">Menu, Status Bar, Tool Bar</a></p>
   <h4>Next topic</h4>
-  <p class="topless"><a href="custom_widgets.html"
-                        title="next chapter">Custom Widget</a></p>
+  <p class="topless"><a href="further_reading.html"
+                        title="next chapter">Further reading</a></p>
   <div role="note" aria-label="source link">
     <h3>This Page</h3>
     <ul class="this-page-menu">
@@ -320,12 +320,12 @@
           <a href="genindex.html" title="General Index"
              >index</a></li>
         <li class="right" >
-          <a href="custom_widgets.html" title="Custom Widget"
+          <a href="further_reading.html" title="Further reading"
              >next</a> |</li>
         <li class="right" >
           <a href="menu_status_tool.html" title="Menu, Status Bar, Tool Bar"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/.buildinfo wxglade-1.0.1/docs/html/.buildinfo
--- wxglade-0.9.6/docs/html/.buildinfo	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/.buildinfo	2020-12-31 14:04:48.000000000 +0000
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 41b5a6c7a450d164f1d1e45dda55674b
+config: 7d4cdcb4538601bf50540feaa68921c5
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff -Nru wxglade-0.9.6/docs/html/custom_widgets.html wxglade-1.0.1/docs/html/custom_widgets.html
--- wxglade-0.9.6/docs/html/custom_widgets.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/custom_widgets.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Custom Widget &#8212; wxGlade 0.9.5 documentation</title>
+    <title>Custom Widget &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -24,8 +24,8 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
-    <link rel="next" title="Reference: Keyboard and Mouse Actions" href="reference.html" />
-    <link rel="prev" title="Bitmaps" href="bitmaps.html" /> 
+    <link rel="next" title="Menu, Status Bar, Tool Bar" href="menu_status_tool.html" />
+    <link rel="prev" title="Dialogs" href="dialogs.html" /> 
   </head>
   <body>
     <div class="related" role="navigation" aria-label="related navigation">
@@ -35,12 +35,12 @@
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="reference.html" title="Reference: Keyboard and Mouse Actions"
+          <a href="menu_status_tool.html" title="Menu, Status Bar, Tool Bar"
              accesskey="N">next</a> |</li>
         <li class="right" >
-          <a href="bitmaps.html" title="Bitmaps"
+          <a href="dialogs.html" title="Dialogs"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -63,9 +63,9 @@
 </colgroup>
 <tbody valign="top">
 <tr class="row-odd"><td><strong>Properties -&gt; Common:</strong> <br/> <br/>
-Property “Class” is the name of the class that will be instantiated. <br/>
+Property “Instance Class” is the name of the class that will be instantiated. <br/>
 In this example: <span class="guilabel">wx.html.HtmlWindow</span></td>
-<td><a class="reference internal" href="_images/CustomWidgetPropertiesCommon.png"><img alt="CustomWidgetPropertiesCommon" class="align-middle" src="_images/CustomWidgetPropertiesCommon.png" style="width: 300px;" /></a></td>
+<td><a class="reference internal" href="_images/CustomWidgetPropertiesCommon.png"><img alt="Instance class: wx.html.HtmlWindow" class="align-middle" src="_images/CustomWidgetPropertiesCommon.png" style="width: 300px;" /></a></td>
 </tr>
 <tr class="row-even"><td><strong>Properties -&gt; Widget:</strong> <br/> <br/>
 The arguments for instantiation of the class.
@@ -74,7 +74,7 @@
 </tr>
 <tr class="row-odd"><td><strong>Properties -&gt; Code:</strong> <br/> <br/>
 Enter the import statement here, if required.</td>
-<td><a class="reference internal" href="_images/CustomWidgetPropertiesCode.png"><img alt="CustomWidgetPropertiesCode" class="align-middle" src="_images/CustomWidgetPropertiesCode.png" style="width: 300px;" /></a></td>
+<td><a class="reference internal" href="_images/CustomWidgetPropertiesCode.png"><img alt="import wx.html" class="align-middle" src="_images/CustomWidgetPropertiesCode.png" style="width: 300px;" /></a></td>
 </tr>
 </tbody>
 </table>
@@ -93,8 +93,8 @@
 <dl class="docutils">
 <dt>The files can be found in the folder <code class="docutils literal"><span class="pre">wxglade/examples/html</span></code>:</dt>
 <dd><ul class="first last simple">
-<li><a class="reference external" href="../../examples/html/html_example.wxg">matplotlib_example.wxg</a></li>
-<li><a class="reference external" href="../../examples/html/html_example.py">matplotlib_example.py</a></li>
+<li><a class="reference external" href="../../examples/html/html_example.wxg">html_example.wxg</a></li>
+<li><a class="reference external" href="../../examples/html/html_example.py">html_example.py</a></li>
 </ul>
 </dd>
 </dl>
@@ -141,7 +141,7 @@
 <tbody valign="top">
 <tr class="row-odd"><td><strong>Properties -&gt; Common:</strong> <br/> <br/>
 The class <span class="guilabel">FigureCanvas</span> will be instantiated.</td>
-<td><a class="reference internal" href="_images/matplotlib_class.png"><img alt="Class name" class="align-middle" src="_images/matplotlib_class.png" style="width: 460px;" /></a></td>
+<td><a class="reference internal" href="_images/matplotlib_class.png"><img alt="Instance class: FigureCanvas" class="align-middle" src="_images/matplotlib_class.png" style="width: 460px;" /></a></td>
 </tr>
 <tr class="row-even"><td><strong>Properties -&gt; Widget:</strong> <br/> <br/>
 The class will be instantiated with the arguments <span class="guilabel">$parent</span>, <span class="guilabel">$id</span> and <span class="guilabel">figure</span>. <br/>
@@ -253,11 +253,11 @@
 </ul>
 
   <h4>Previous topic</h4>
-  <p class="topless"><a href="bitmaps.html"
-                        title="previous chapter">Bitmaps</a></p>
+  <p class="topless"><a href="dialogs.html"
+                        title="previous chapter">Dialogs</a></p>
   <h4>Next topic</h4>
-  <p class="topless"><a href="reference.html"
-                        title="next chapter">Reference: Keyboard and Mouse Actions</a></p>
+  <p class="topless"><a href="menu_status_tool.html"
+                        title="next chapter">Menu, Status Bar, Tool Bar</a></p>
   <div role="note" aria-label="source link">
     <h3>This Page</h3>
     <ul class="this-page-menu">
@@ -286,12 +286,12 @@
           <a href="genindex.html" title="General Index"
              >index</a></li>
         <li class="right" >
-          <a href="reference.html" title="Reference: Keyboard and Mouse Actions"
+          <a href="menu_status_tool.html" title="Menu, Status Bar, Tool Bar"
              >next</a> |</li>
         <li class="right" >
-          <a href="bitmaps.html" title="Bitmaps"
+          <a href="dialogs.html" title="Dialogs"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/dialogs.html wxglade-1.0.1/docs/html/dialogs.html
--- wxglade-0.9.6/docs/html/dialogs.html	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/docs/html/dialogs.html	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,174 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Dialogs &#8212; wxGlade 1.0.0 documentation</title>
+    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    './',
+        VERSION:     '1.0.0',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true,
+        SOURCELINK_SUFFIX: '.txt'
+      };
+    </script>
+    <script type="text/javascript" src="_static/jquery.js"></script>
+    <script type="text/javascript" src="_static/underscore.js"></script>
+    <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="next" title="Custom Widget" href="custom_widgets.html" />
+    <link rel="prev" title="Create and Use Source Code" href="source_code.html" /> 
+  </head>
+  <body>
+    <div class="related" role="navigation" aria-label="related navigation">
+      <h3>Navigation</h3>
+      <ul>
+        <li class="right" style="margin-right: 10px">
+          <a href="genindex.html" title="General Index"
+             accesskey="I">index</a></li>
+        <li class="right" >
+          <a href="custom_widgets.html" title="Custom Widget"
+             accesskey="N">next</a> |</li>
+        <li class="right" >
+          <a href="source_code.html" title="Create and Use Source Code"
+             accesskey="P">previous</a> |</li>
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
+      </ul>
+    </div>  
+
+    <div class="document">
+      <div class="documentwrapper">
+        <div class="bodywrapper">
+          <div class="body" role="main">
+            
+  <div class="section" id="dialogs">
+<h1>Dialogs<a class="headerlink" href="#dialogs" title="Permalink to this headline">¶</a></h1>
+<p>Most applications consist of a ‘permanent’ main window - typically a frame - and ‘temporary’ dialogs.</p>
+<p>See <code class="docutils literal"><span class="pre">wxglade/examples/dialog</span></code> for an example application how to create and use dialogs.
+The example opens the dialog on pressing a button or selecting a menu entry.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="100%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><a class="first last reference internal image-reference" href="_images/DialogExample.png"><img alt="screenshot from running examples/dialog/dialog.py with the dialog open" src="_images/DialogExample.png" style="width: 200px;" /></a>
+</td>
+</tr>
+</tbody>
+</table>
+<p>When you add a new dialog <img alt="dialog" src="_images/dialog.png" />, you will be offered to add some default buttons like <span class="guilabel">OK</span> and <span class="guilabel">Cancel</span>:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="100%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><a class="first last reference internal image-reference" href="_images/NewDialog.png"><img alt="screenshot for new dialog" src="_images/NewDialog.png" style="height: 200px;" /></a>
+</td>
+</tr>
+</tbody>
+</table>
+<p>These will be placed in a <span class="guilabel">StdDialogButtonSizer</span> which will arrange the buttons such that the ordering matches
+the OS style guide.</p>
+<p>Also, the buttons will use <span class="guilabel">StockItems</span> and e.g. <code class="code docutils literal"><span class="pre">button.SetDefault</span></code>,
+<code class="code docutils literal"><span class="pre">dialog.SetAffirmativeId</span></code> and <code class="code docutils literal"><span class="pre">dialog.SetEscapeId</span></code> will be called.</p>
+<p>These are the generated lines of code that are specific for stock item buttons and using them in a dialog:</p>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">sizer_2</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">StdDialogButtonSizer</span><span class="p">()</span>
+<span class="o">...</span>
+<span class="bp">self</span><span class="o">.</span><span class="n">button_OK</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">Button</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_OK</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
+<span class="bp">self</span><span class="o">.</span><span class="n">button_OK</span><span class="o">.</span><span class="n">SetDefault</span><span class="p">()</span>
+<span class="n">sizer_2</span><span class="o">.</span><span class="n">AddButton</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">button_OK</span><span class="p">)</span>
+
+<span class="bp">self</span><span class="o">.</span><span class="n">button_CANCEL</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">Button</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_CANCEL</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
+<span class="n">sizer_2</span><span class="o">.</span><span class="n">AddButton</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">button_CANCEL</span><span class="p">)</span>
+
+<span class="n">sizer_2</span><span class="o">.</span><span class="n">Realize</span><span class="p">()</span>
+<span class="o">...</span>
+<span class="bp">self</span><span class="o">.</span><span class="n">SetAffirmativeId</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">button_OK</span><span class="o">.</span><span class="n">GetId</span><span class="p">())</span>   <span class="c1"># select this button when Enter is hit</span>
+<span class="bp">self</span><span class="o">.</span><span class="n">SetEscapeId</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">button_CANCEL</span><span class="o">.</span><span class="n">GetId</span><span class="p">())</span>    <span class="c1"># select this button when Escape is hit</span>
+</pre></div>
+</div>
+<p>The dialog is created and used like this:</p>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="k">with</span> <span class="n">MyDialog</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="k">as</span> <span class="n">dlg</span><span class="p">:</span>
+    <span class="c1"># fill dialog widgets with values here</span>
+    <span class="c1"># show as modal dialog</span>
+    <span class="k">if</span> <span class="n">dlg</span><span class="o">.</span><span class="n">ShowModal</span><span class="p">()</span> <span class="o">==</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_OK</span><span class="p">:</span>
+        <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;User has hit OK&quot;</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>Please note that the dialog in the example file does not have the size property defined.
+Therefore the dialog will be created with the minimum size that fits the content.</p>
+<dl class="docutils">
+<dt>The files can be found in the folder <code class="docutils literal"><span class="pre">wxglade/examples/dialog</span></code>:</dt>
+<dd><ul class="first last simple">
+<li><a class="reference external" href="../../examples/dialog/dialog.wxg">dialog.wxg</a></li>
+<li><a class="reference external" href="../../examples/dialog/dialog.py">dialog.py</a></li>
+</ul>
+</dd>
+</dl>
+</div>
+
+
+          </div>
+        </div>
+      </div>
+      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
+        <div class="sphinxsidebarwrapper">
+            <p class="logo"><a href="index.html">
+              <img class="logo" src="_static/wxglade.png" alt="Logo"/>
+            </a></p>
+  <h4>Previous topic</h4>
+  <p class="topless"><a href="source_code.html"
+                        title="previous chapter">Create and Use Source Code</a></p>
+  <h4>Next topic</h4>
+  <p class="topless"><a href="custom_widgets.html"
+                        title="next chapter">Custom Widget</a></p>
+  <div role="note" aria-label="source link">
+    <h3>This Page</h3>
+    <ul class="this-page-menu">
+      <li><a href="_sources/dialogs.rst.txt"
+            rel="nofollow">Show Source</a></li>
+    </ul>
+   </div>
+<div id="searchbox" style="display: none" role="search">
+  <h3>Quick search</h3>
+    <form class="search" action="search.html" method="get">
+      <div><input type="text" name="q" /></div>
+      <div><input type="submit" value="Go" /></div>
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+</div>
+<script type="text/javascript">$('#searchbox').show(0);</script>
+        </div>
+      </div>
+      <div class="clearer"></div>
+    </div>
+    <div class="related" role="navigation" aria-label="related navigation">
+      <h3>Navigation</h3>
+      <ul>
+        <li class="right" style="margin-right: 10px">
+          <a href="genindex.html" title="General Index"
+             >index</a></li>
+        <li class="right" >
+          <a href="custom_widgets.html" title="Custom Widget"
+             >next</a> |</li>
+        <li class="right" >
+          <a href="source_code.html" title="Create and Use Source Code"
+             >previous</a> |</li>
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
+      </ul>
+    </div>
+    <div class="footer" role="contentinfo">
+        &#169; Copyright 2017-2020, Dietmar Schwertberger.
+      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.6.4.
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff -Nru wxglade-0.9.6/docs/html/further_reading.html wxglade-1.0.1/docs/html/further_reading.html
--- wxglade-0.9.6/docs/html/further_reading.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/further_reading.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Further reading &#8212; wxGlade 0.9.5 documentation</title>
+    <title>Further reading &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -24,8 +24,8 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
-    <link rel="next" title="License and Acknowledgements" href="acknowledgements.html" />
-    <link rel="prev" title="Reference: Keyboard and Mouse Actions" href="reference.html" /> 
+    <link rel="next" title="Reference: Keyboard and Mouse Actions" href="reference.html" />
+    <link rel="prev" title="Bitmaps" href="bitmaps.html" /> 
   </head>
   <body>
     <div class="related" role="navigation" aria-label="related navigation">
@@ -35,12 +35,12 @@
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="acknowledgements.html" title="License and Acknowledgements"
+          <a href="reference.html" title="Reference: Keyboard and Mouse Actions"
              accesskey="N">next</a> |</li>
         <li class="right" >
-          <a href="reference.html" title="Reference: Keyboard and Mouse Actions"
+          <a href="bitmaps.html" title="Bitmaps"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -53,20 +53,26 @@
 <h1>Further reading<a class="headerlink" href="#further-reading" title="Permalink to this headline">¶</a></h1>
 <blockquote>
 <div><ul class="simple">
-<li>Download wxPython Phoenix including the <strong>html documentation</strong>, demo and source archive from <a class="reference external" href="https://pypi.python.org/pypi/wxPython">https://pypi.python.org/pypi/wxPython</a> .</li>
-<li>Unpack the demo directory from the source archive and run demo.py .</li>
+<li>Run the <strong>wxPython demo</strong> to explore the widgets and see example code for each. See note below where to find it.</li>
+<li>Have a look at the <strong>wxPython API documentation</strong> at <a class="reference external" href="https://docs.wxpython.org/">https://docs.wxpython.org/</a></li>
+<li>Have a look at the <strong>Overview Documents</strong> at <a class="reference external" href="https://docs.wxpython.org/Overviews.html">https://docs.wxpython.org/Overviews.html</a> .</li>
 <li>Get the <strong>book</strong> <a class="reference external" href="https://www.amazon.com/gp/product/1932394621?ie=UTF8&amp;tag=wxpython-20&amp;linkCode=as2&amp;camp=1789&amp;creative=9325&amp;creativeASIN=1932394621">wxPython in Action</a>
 by Noel Rappin and Robin Dunn. It’s written for the Classic wxPython version, but most of it is still applicable.</li>
-<li>Bookmark the <strong>wxPython Phoenix API documentation</strong> at <a class="reference external" href="https://wxpython.org/Phoenix/docs/html/main.html">https://wxpython.org/Phoenix/docs/html/main.html</a> .</li>
-<li>Have a look at the <strong>Overview Documents</strong> at <a class="reference external" href="https://wxpython.org/Phoenix/docs/html/Overviews.html">https://wxpython.org/Phoenix/docs/html/Overviews.html</a> .</li>
 <li>If you have been using wxPython before already, bookmark the comparison of <strong>wxPython Phoenix vs. the older Classic</strong> version at <a class="reference external" href="https://wxpython.org/Phoenix/docs/html/classic_vs_phoenix.html">https://wxpython.org/Phoenix/docs/html/classic_vs_phoenix.html</a> .</li>
+<li>For <strong>wxPython</strong> specific questions you can find help at the <strong>discussion site</strong> <a class="reference external" href="https://discuss.wxpython.org/">https://discuss.wxpython.org/</a></li>
+<li>For <strong>wxGlade</strong> specific questions please ask on the <strong>mailing list</strong> or report a bug on the <strong>issue tracker</strong>.
+Both are linked from the help menu.</li>
 </ul>
 </div></blockquote>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
-<p class="last">The demo is the most important resource for exploring the available controls!</p>
+<p class="last"><strong>The wxPython demo is the most important resource for exploring the available controls!</strong>
+<br/>
+If you don’t have the demo, have a look here: <a class="reference external" href="https://extras.wxpython.org/wxPython4/extras/">https://extras.wxpython.org/wxPython4/extras/</a>
+<br/>
+Go to the subdirectory matching your wxPython version and download the demo archive. <br/>
+Then run demo.py</p>
 </div>
-<p>Maybe also have a look at the samples directory.</p>
 </div>
 
 
@@ -79,11 +85,11 @@
               <img class="logo" src="_static/wxglade.png" alt="Logo"/>
             </a></p>
   <h4>Previous topic</h4>
-  <p class="topless"><a href="reference.html"
-                        title="previous chapter">Reference: Keyboard and Mouse Actions</a></p>
+  <p class="topless"><a href="bitmaps.html"
+                        title="previous chapter">Bitmaps</a></p>
   <h4>Next topic</h4>
-  <p class="topless"><a href="acknowledgements.html"
-                        title="next chapter">License and Acknowledgements</a></p>
+  <p class="topless"><a href="reference.html"
+                        title="next chapter">Reference: Keyboard and Mouse Actions</a></p>
   <div role="note" aria-label="source link">
     <h3>This Page</h3>
     <ul class="this-page-menu">
@@ -112,12 +118,12 @@
           <a href="genindex.html" title="General Index"
              >index</a></li>
         <li class="right" >
-          <a href="acknowledgements.html" title="License and Acknowledgements"
+          <a href="reference.html" title="Reference: Keyboard and Mouse Actions"
              >next</a> |</li>
         <li class="right" >
-          <a href="reference.html" title="Reference: Keyboard and Mouse Actions"
+          <a href="bitmaps.html" title="Bitmaps"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/genindex.html wxglade-1.0.1/docs/html/genindex.html
--- wxglade-0.9.6/docs/html/genindex.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/genindex.html	2020-12-31 14:04:48.000000000 +0000
@@ -6,14 +6,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Index &#8212; wxGlade 0.9.5 documentation</title>
+    <title>Index &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -33,7 +33,7 @@
         <li class="right" style="margin-right: 10px">
           <a href="#" title="General Index"
              accesskey="I">index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -81,7 +81,7 @@
         <li class="right" style="margin-right: 10px">
           <a href="#" title="General Index"
              >index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_01.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_01.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_02.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_02.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_02_Tree.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_02_Tree.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_03_preview.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_03_preview.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_06_ApplicationKeepUserCode.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_06_ApplicationKeepUserCode.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_06_ApplicationProperties.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_06_ApplicationProperties.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_06_preview.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_06_preview.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_06_PythonCode.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_06_PythonCode.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_06_Screenshot.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_06_Screenshot.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_06_sizers.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_06_sizers.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_06_tree.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_06_tree.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/CalculatorFlexGridSizerDesign.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/CalculatorFlexGridSizerDesign.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/CalculatorFlexGridSizerTree.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/CalculatorFlexGridSizerTree.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_GridSizer_InsertSlot.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_GridSizer_InsertSlot.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_AddedSlot_Design.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_AddedSlot_Design.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_AddedSlot.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_AddedSlot.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_Adding.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_Adding.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_AddSlot.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_AddSlot.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_CutPanel.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_CutPanel.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_Design.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_Design.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_DragNDrop_Done_Design.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_DragNDrop_Done_Design.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_DragNDrop_Done.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_DragNDrop_Done.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_DragNDrop.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_DragNDrop.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_FrameSlot.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_FrameSlot.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_Pasted.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_Pasted.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_Preview.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_Preview.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_Renaming.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_Renaming.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Notebook_Tree.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Notebook_Tree.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Radio.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Radio.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Spacers2.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Spacers2.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Spacers_Design0.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Spacers_Design0.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Spacers_Design.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Spacers_Design.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Spacers_Properties.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Spacers_Properties.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Calculator_Spacers_Tree.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Calculator_Spacers_Tree.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/CustomWidgetPropertiesCode.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/CustomWidgetPropertiesCode.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/CustomWidgetPropertiesCommon.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/CustomWidgetPropertiesCommon.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/CustomWidgetProperties.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/CustomWidgetProperties.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/DialogExample.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/DialogExample.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/dialog.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/dialog.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/FlexGridSizerDlg.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/FlexGridSizerDlg.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/FlexGridSizer_Properties.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/FlexGridSizer_Properties.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/MenuLambdaEventHandlers.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/MenuLambdaEventHandlers.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/NewDialog.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/NewDialog.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/NewFrame_CalculatorFrame.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/NewFrame_CalculatorFrame.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/NewSizer_CalculatorHorizontal.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/NewSizer_CalculatorHorizontal.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/NewSizer_CalculatorVertical.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/NewSizer_CalculatorVertical.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/SizerHandle.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/SizerHandle.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Toplevel_App.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Toplevel_App.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/Toplevel_Frame.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/Toplevel_Frame.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/wDesign.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/wDesign.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/wPalette.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/wPalette.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/wProperties.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/wProperties.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs/html/_images/wTree.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs/html/_images/wTree.png differ
diff -Nru wxglade-0.9.6/docs/html/index.html wxglade-1.0.1/docs/html/index.html
--- wxglade-0.9.6/docs/html/index.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/index.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Welcome to wxGlade’s documentation! &#8212; wxGlade 0.9.5 documentation</title>
+    <title>Welcome to wxGlade’s documentation! &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -24,7 +24,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
-    <link rel="next" title="wxGlade Overview" href="intro.html" /> 
+    <link rel="next" title="wxGlade Overview and Quick Start" href="intro.html" /> 
   </head>
   <body>
     <div class="related" role="navigation" aria-label="related navigation">
@@ -34,9 +34,9 @@
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="intro.html" title="wxGlade Overview"
+          <a href="intro.html" title="wxGlade Overview and Quick Start"
              accesskey="N">next</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="#">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -51,8 +51,10 @@
 <div class="toctree-wrapper compound">
 <p class="caption"><span class="caption-text">Contents:</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="intro.html">wxGlade Overview</a><ul>
+<li class="toctree-l1"><a class="reference internal" href="intro.html">wxGlade Overview and Quick Start</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="intro.html#installing-wxglade">Installing wxGlade</a></li>
 <li class="toctree-l2"><a class="reference internal" href="intro.html#running-wxglade">Running wxGlade</a></li>
+<li class="toctree-l2"><a class="reference internal" href="intro.html#accessibility">Accessibility</a></li>
 <li class="toctree-l2"><a class="reference internal" href="intro.html#program-windows">Program Windows</a></li>
 <li class="toctree-l2"><a class="reference internal" href="intro.html#examples">Examples</a></li>
 </ul>
@@ -62,7 +64,6 @@
 <li class="toctree-l2"><a class="reference internal" href="wxbasics.html#sizers-layout-managers">Sizers (Layout Managers)</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="wxbasics.html#sizer-examples">Sizer Examples</a></li>
 <li class="toctree-l3"><a class="reference internal" href="wxbasics.html#example-application-calculator-window">Example application: Calculator window</a></li>
-<li class="toctree-l3"><a class="reference internal" href="wxbasics.html#wxglade-requirements-and-restrictions">wxGlade Requirements and Restrictions</a></li>
 </ul>
 </li>
 </ul>
@@ -101,8 +102,20 @@
 <li class="toctree-l2"><a class="reference internal" href="source_code.html#hints-and-tips">Hints and Tips</a></li>
 </ul>
 </li>
+<li class="toctree-l1"><a class="reference internal" href="dialogs.html">Dialogs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="custom_widgets.html">Custom Widget</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="custom_widgets.html#custom-constructor">Custom constructor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_widgets.html#example-matplotlib-matplotlib-canvas-quick-and-dirty">Example ‘matplotlib’: matplotlib canvas, quick and dirty</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_widgets.html#example-matplotlib2-matplotlib-canvas-well-structured">Example ‘matplotlib2’: matplotlib canvas, well structured</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_widgets.html#example-matplotlib3-matplotlib-canvas-comprehensive-embedding-example">Example ‘matplotlib3’: matplotlib canvas, comprehensive embedding example</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_widgets.html#more-examples">More Examples</a></li>
+</ul>
+</li>
 <li class="toctree-l1"><a class="reference internal" href="menu_status_tool.html">Menu, Status Bar, Tool Bar</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="menu_status_tool.html#menu-editor">Menu Editor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="menu_status_tool.html#menu-editor">Menu Editor</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="menu_status_tool.html#lambda-event-handlers">Lambda Event Handlers</a></li>
+</ul>
+</li>
 <li class="toctree-l2"><a class="reference internal" href="menu_status_tool.html#status-bar-editor">Status Bar Editor</a></li>
 <li class="toctree-l2"><a class="reference internal" href="menu_status_tool.html#tool-bar-editor">Tool Bar Editor</a></li>
 </ul>
@@ -116,16 +129,8 @@
 <li class="toctree-l2"><a class="reference internal" href="bitmaps.html#customizing-bitmap-loading">Customizing Bitmap loading</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="custom_widgets.html">Custom Widget</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="custom_widgets.html#custom-constructor">Custom constructor</a></li>
-<li class="toctree-l2"><a class="reference internal" href="custom_widgets.html#example-matplotlib-matplotlib-canvas-quick-and-dirty">Example ‘matplotlib’: matplotlib canvas, quick and dirty</a></li>
-<li class="toctree-l2"><a class="reference internal" href="custom_widgets.html#example-matplotlib2-matplotlib-canvas-well-structured">Example ‘matplotlib2’: matplotlib canvas, well structured</a></li>
-<li class="toctree-l2"><a class="reference internal" href="custom_widgets.html#example-matplotlib3-matplotlib-canvas-comprehensive-embedding-example">Example ‘matplotlib3’: matplotlib canvas, comprehensive embedding example</a></li>
-<li class="toctree-l2"><a class="reference internal" href="custom_widgets.html#more-examples">More Examples</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="reference.html">Reference: Keyboard and Mouse Actions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="further_reading.html">Further reading</a></li>
+<li class="toctree-l1"><a class="reference internal" href="reference.html">Reference: Keyboard and Mouse Actions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="acknowledgements.html">License and Acknowledgements</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="acknowledgements.html#wxglade-license-agreement">wxGlade License Agreement</a></li>
 <li class="toctree-l2"><a class="reference internal" href="acknowledgements.html#acknowledgements">Acknowledgements</a></li>
@@ -146,7 +151,7 @@
             </a></p>
   <h4>Next topic</h4>
   <p class="topless"><a href="intro.html"
-                        title="next chapter">wxGlade Overview</a></p>
+                        title="next chapter">wxGlade Overview and Quick Start</a></p>
   <div role="note" aria-label="source link">
     <h3>This Page</h3>
     <ul class="this-page-menu">
@@ -175,9 +180,9 @@
           <a href="genindex.html" title="General Index"
              >index</a></li>
         <li class="right" >
-          <a href="intro.html" title="wxGlade Overview"
+          <a href="intro.html" title="wxGlade Overview and Quick Start"
              >next</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="#">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/intro.html wxglade-1.0.1/docs/html/intro.html
--- wxglade-0.9.6/docs/html/intro.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/intro.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>wxGlade Overview &#8212; wxGlade 0.9.5 documentation</title>
+    <title>wxGlade Overview and Quick Start &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="index.html" title="Welcome to wxGlade’s documentation!"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -49,15 +49,17 @@
         <div class="bodywrapper">
           <div class="body" role="main">
             
-  <div class="section" id="wxglade-overview">
-<h1>wxGlade Overview<a class="headerlink" href="#wxglade-overview" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="running-wxglade">
-<h2>Running wxGlade<a class="headerlink" href="#running-wxglade" title="Permalink to this headline">¶</a></h2>
-<p><strong>Start:</strong>
-To run wxGlade, start the wxglade.py or wxglade.pyw program file with the Python interpreter.</p>
-<p><strong>Other Prerequisites:</strong>
-On Windows, the win32 extensions should be installed: <a class="reference external" href="https://sourceforge.net/projects/pywin32/">https://sourceforge.net/projects/pywin32/</a>
-If they are available, wxGlade will register for .wxg files such that you can open them via double-click.</p>
+  <div class="section" id="wxglade-overview-and-quick-start">
+<h1>wxGlade Overview and Quick Start<a class="headerlink" href="#wxglade-overview-and-quick-start" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="installing-wxglade">
+<h2>Installing wxGlade<a class="headerlink" href="#installing-wxglade" title="Permalink to this headline">¶</a></h2>
+<p>For some Linux flavors there are system packages for wxGlade.</p>
+<p>Other than that, there is no real installation.
+Just download the latest released version as zip archive from <a class="reference external" href="https://sourceforge.net/projects/wxglade/files/wxglade/">https://sourceforge.net/projects/wxglade/files/wxglade/</a>
+or from the git release page at <a class="reference external" href="https://github.com/wxGlade/wxGlade/releases">https://github.com/wxGlade/wxGlade/releases</a></p>
+<p>Unpack the archive to a known location and maybe add it to the path.</p>
+<p>If you are familiar with git, you may instead just clone the repository from <a class="reference external" href="https://github.com/wxGlade/wxGlade.git">https://github.com/wxGlade/wxGlade.git</a></p>
+<p>The master branch should be stable enough for your work and I appreciate bug reports.</p>
 <dl class="docutils">
 <dt><strong>Supported Python and wxPython Versions:</strong></dt>
 <dd><ul class="first last simple">
@@ -67,12 +69,38 @@
 </ul>
 </dd>
 </dl>
+<p><strong>Other Prerequisites:</strong>
+On Windows, the win32 extensions should be installed: <a class="reference external" href="https://pypi.org/project/pywin32/">https://pypi.org/project/pywin32/</a>
+If they are available, wxGlade will register for .wxg files such that you can open them via double-click.</p>
+</div>
+<div class="section" id="running-wxglade">
+<h2>Running wxGlade<a class="headerlink" href="#running-wxglade" title="Permalink to this headline">¶</a></h2>
+<p>To start the program, change directory to the installation directory and enter <code class="code docutils literal"><span class="pre">python3</span> <span class="pre">wxglade.py</span></code>
+or <code class="code docutils literal"><span class="pre">python</span> <span class="pre">wxglade.py</span></code> in your shell or use whatever is required to start a python application on your platform.</p>
+<p>You may want to add a desktop shortcut to run the <code class="docutils literal"><span class="pre">wxGlade.py</span></code> file (or the <code class="docutils literal"><span class="pre">wxGlade.pyw</span></code> file).</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
-<p class="last">For the best user experience, run wxGlade with your target wxPython revision (i.e. 2.8 or 3.0).
-If you use a different revision, the <em>Design</em> and <em>Preview</em> window might not look identical to your final
+<p>For the best user experience, run wxGlade with your target wxPython revision (e.g. 2.8, 3.0, 4.0, 4.1).</p>
+<p class="last">If you use a different revision, the <em>Design</em> and <em>Preview</em> window might not look identical to your final
 program, as some styles are not supported under all revisions.</p>
 </div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>If you want to build a GUI for wxPython <em>Classic</em> (&lt;=3.0) or <em>Phoenix</em> (&gt;=4.0):
+Start wxGlade in your target version - if it runs under <em>Phoenix</em>, it will create <em>Phoenix</em> code.</p>
+<p class="last">The <code class="docutils literal"><span class="pre">.wxg</span></code> file format is not affected by this.
+So you may use a single <code class="docutils literal"><span class="pre">.wxg</span></code> file to generate code for both <em>Classic</em> and <em>Phoenix</em>.
+The generated code should always run under both Python 2.7 and Python 3.</p>
+</div>
+</div>
+<div class="section" id="accessibility">
+<h2>Accessibility<a class="headerlink" href="#accessibility" title="Permalink to this headline">¶</a></h2>
+<p>wxGlade attempts to be accessible not only via mouse and screen but also via keyboard and screen readers.</p>
+<p>Keep in mind for your own applications that accessibility and usability go hand in hand.
+Keep your user intefaces simple and straightforward.</p>
+<p>If you are using a screen reader like NVDA or JAWS:</p>
+<p>Go to “Edit -&gt; Preferences… -&gt; Accessibility” to enable better compatibility.</p>
+<p>If you observe problems, please provide feedback via the mailing list or the Github issue tracker.</p>
 </div>
 <div class="section" id="program-windows">
 <h2>Program Windows<a class="headerlink" href="#program-windows" title="Permalink to this headline">¶</a></h2>
@@ -89,30 +117,38 @@
 <col width="80%" />
 </colgroup>
 <tbody valign="top">
-<tr class="row-odd"><td><a class="reference internal" href="_images/wPalette.png"><img alt="wPalette" class="align-middle" src="_images/wPalette.png" style="width: 200px;" /></a></td>
+<tr class="row-odd"><td><a class="reference internal" href="_images/wPalette.png"><img alt="Press F4 to focus the Palette panel" class="align-middle" src="_images/wPalette.png" style="width: 200px;" /></a></td>
 <td>Main window <strong>Palette</strong> panel: <br/> <br/>
 There is an icon for each window and control type that can be added to a project.</td>
 </tr>
-<tr class="row-even"><td><a class="reference internal" href="_images/wTree.png"><img alt="wTree" class="align-middle" src="_images/wTree.png" style="width: 200px;" /></a></td>
+<tr class="row-even"><td><a class="reference internal" href="_images/wTree.png"><img alt="Press F2 to focus the Tree view control" class="align-middle" src="_images/wTree.png" style="width: 200px;" /></a></td>
 <td>Main window <strong>Tree</strong> view control: <br/> <br/>
 This tree visualizes and allows editing the structure of the project with it’s
 application, windows, sizers and controls. <br/>
-On selection of an item, it’s properties will be shown in the <em>Properties</em> notebook.</td>
+On selection of an item, it’s properties will be shown in the <em>Properties</em> notebook.
+<br/> <br/>
+Press <code class="kbd docutils literal"><span class="pre">F2</span></code> to focus the <strong>Tree</strong> view control.</td>
 </tr>
-<tr class="row-odd"><td><a class="reference internal" href="_images/wProperties.png"><img alt="wProperties" class="align-middle" src="_images/wProperties.png" style="width: 200px;" /></a></td>
+<tr class="row-odd"><td><a class="reference internal" href="_images/wProperties.png"><img alt="Press F3 to focus the Properties notebook; see reference section for more shortcuts" class="align-middle" src="_images/wProperties.png" style="width: 200px;" /></a></td>
 <td>Main window <strong>Properties</strong> notebook: <br/> <br/>
 This lets you display and edit the properties of applications, windows and controls. <br/>
-To edit an item, select it in the <em>Tree</em> or <em>Design</em> window.</td>
+To edit an item, select it in the <em>Tree</em> or <em>Design</em> window.
+<br/> <br/>
+Press <code class="kbd docutils literal"><span class="pre">F3</span></code> to focus the <strong>Properties</strong> notebook; see reference section for more shortcuts.</td>
 </tr>
-<tr class="row-even"><td><a class="reference internal" href="_images/wDesign.png"><img alt="wDesign" class="align-middle" src="_images/wDesign.png" style="width: 200px;" /></a></td>
+<tr class="row-even"><td><a class="reference internal" href="_images/wDesign.png"><img alt="Press F6 to show the Design window" class="align-middle" src="_images/wDesign.png" style="width: 200px;" /></a></td>
 <td><strong>Design</strong> window: <br/> <br/>
 This one visualizes the design of the window. It is not 100% identical to the final window. <br/>
-To open this window, double-click a window’s icon in the <em>Tree</em> window.</td>
+To open this window, double-click a window’s icon in the <em>Tree</em> window.
+<br/> <br/>
+Press <code class="kbd docutils literal"><span class="pre">F6</span></code> to show the <strong>Design</strong> window.</td>
 </tr>
 <tr class="row-odd"><td>&#160;</td>
 <td><strong>Preview</strong> window <br/> <br/>
 A preview of the current window. <br/>
-It should look 100% identical to the window when it is used in the application.</td>
+It should look 100% identical to the window when it is used in the application.
+<br/> <br/>
+Press <code class="kbd docutils literal"><span class="pre">F5</span></code> for the <strong>Preview</strong> window.</td>
 </tr>
 </tbody>
 </table>
@@ -147,6 +183,7 @@
 <p>There are additional examples in <code class="docutils literal"><span class="pre">wxglade/examples</span></code> showing how to use the CustomWidget to integrate some widgets that are not directly supported by wxGlade. The wxGlade design window will only display a placeholder for these.</p>
 <blockquote>
 <div><ul class="simple">
+<li><code class="docutils literal"><span class="pre">dialog</span></code>: create a dialog; show it on a button press or menu item selection; retrieve the result</li>
 <li><code class="docutils literal"><span class="pre">html</span></code>: use <code class="code docutils literal"><span class="pre">wx.html.HtmlWindow</span></code> to display simple HTML pages</li>
 <li><code class="docutils literal"><span class="pre">html2</span></code>: use <code class="code docutils literal"><span class="pre">wx.html2.WebView</span></code> to display HTML with Javascript and CSS (not available on wxPython 2.8)</li>
 <li><code class="docutils literal"><span class="pre">lib_plot</span></code>: use <code class="code docutils literal"><span class="pre">wx.lib.plot.PlotCanvas</span></code> for plotting</li>
@@ -172,8 +209,10 @@
             </a></p>
   <h3><a href="index.html">Table Of Contents</a></h3>
   <ul>
-<li><a class="reference internal" href="#">wxGlade Overview</a><ul>
+<li><a class="reference internal" href="#">wxGlade Overview and Quick Start</a><ul>
+<li><a class="reference internal" href="#installing-wxglade">Installing wxGlade</a></li>
 <li><a class="reference internal" href="#running-wxglade">Running wxGlade</a></li>
+<li><a class="reference internal" href="#accessibility">Accessibility</a></li>
 <li><a class="reference internal" href="#program-windows">Program Windows</a></li>
 <li><a class="reference internal" href="#examples">Examples</a></li>
 </ul>
@@ -219,7 +258,7 @@
         <li class="right" >
           <a href="index.html" title="Welcome to wxGlade’s documentation!"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/menu_status_tool.html wxglade-1.0.1/docs/html/menu_status_tool.html
--- wxglade-0.9.6/docs/html/menu_status_tool.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/menu_status_tool.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Menu, Status Bar, Tool Bar &#8212; wxGlade 0.9.5 documentation</title>
+    <title>Menu, Status Bar, Tool Bar &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -25,7 +25,7 @@
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
     <link rel="next" title="Bitmaps" href="bitmaps.html" />
-    <link rel="prev" title="Create and Use Source Code" href="source_code.html" /> 
+    <link rel="prev" title="Custom Widget" href="custom_widgets.html" /> 
   </head>
   <body>
     <div class="related" role="navigation" aria-label="related navigation">
@@ -38,9 +38,9 @@
           <a href="bitmaps.html" title="Bitmaps"
              accesskey="N">next</a> |</li>
         <li class="right" >
-          <a href="source_code.html" title="Create and Use Source Code"
+          <a href="custom_widgets.html" title="Custom Widget"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -193,10 +193,28 @@
 </ul>
 </dd>
 </dl>
+<div class="section" id="lambda-event-handlers">
+<h3>Lambda Event Handlers<a class="headerlink" href="#lambda-event-handlers" title="Permalink to this headline">¶</a></h3>
+<p>When creating Python code, you may also specify a lambda function as event handler.</p>
+<p>E.g. you may want to have three menu items named <code class="code docutils literal"><span class="pre">Insert</span> <span class="pre">A</span></code>, <code class="code docutils literal"><span class="pre">Insert</span> <span class="pre">B</span></code> and <code class="code docutils literal"><span class="pre">Insert</span> <span class="pre">C</span></code>.
+Instead of three separate handlers, you may enter three lambda functions that will call the same method or function
+with different arguments each:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="100%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><img alt="lambda evt: self.on_menu_insert_abc(&quot;A&quot;)" class="first last" src="_images/MenuLambdaEventHandlers.png" />
+</td>
+</tr>
+</tbody>
+</table>
+<p>Of course you need to implement a method <code class="code docutils literal"><span class="pre">on_menu_insert_abc</span></code>.</p>
+</div>
 </div>
 <div class="section" id="status-bar-editor">
 <h2>Status Bar Editor<a class="headerlink" href="#status-bar-editor" title="Permalink to this headline">¶</a></h2>
-<p>To attach a status bar to a frame, go to <em>Properties -&gt; Widget</em> and check <span class="guilabel">Has StatusBar</span>.
+<p>To attach a status bar to a frame, go to <em>Properties -&gt; Widget</em> and check cHas StatusBar`.
 This will add a statusbar icon to the <em>Tree</em> window, just below the frame’s icon.
 (Similar to <span class="guilabel">Has MenuBar</span> in the first screenshot on this page.)</p>
 <p>To add/remove fields to the status bar, go to <em>Properties -&gt; Widget -&gt; Fields</em> and use
@@ -239,7 +257,10 @@
   <h3><a href="index.html">Table Of Contents</a></h3>
   <ul>
 <li><a class="reference internal" href="#">Menu, Status Bar, Tool Bar</a><ul>
-<li><a class="reference internal" href="#menu-editor">Menu Editor</a></li>
+<li><a class="reference internal" href="#menu-editor">Menu Editor</a><ul>
+<li><a class="reference internal" href="#lambda-event-handlers">Lambda Event Handlers</a></li>
+</ul>
+</li>
 <li><a class="reference internal" href="#status-bar-editor">Status Bar Editor</a></li>
 <li><a class="reference internal" href="#tool-bar-editor">Tool Bar Editor</a></li>
 </ul>
@@ -247,8 +268,8 @@
 </ul>
 
   <h4>Previous topic</h4>
-  <p class="topless"><a href="source_code.html"
-                        title="previous chapter">Create and Use Source Code</a></p>
+  <p class="topless"><a href="custom_widgets.html"
+                        title="previous chapter">Custom Widget</a></p>
   <h4>Next topic</h4>
   <p class="topless"><a href="bitmaps.html"
                         title="next chapter">Bitmaps</a></p>
@@ -283,9 +304,9 @@
           <a href="bitmaps.html" title="Bitmaps"
              >next</a> |</li>
         <li class="right" >
-          <a href="source_code.html" title="Create and Use Source Code"
+          <a href="custom_widgets.html" title="Custom Widget"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/reference.html wxglade-1.0.1/docs/html/reference.html
--- wxglade-0.9.6/docs/html/reference.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/reference.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Reference: Keyboard and Mouse Actions &#8212; wxGlade 0.9.5 documentation</title>
+    <title>Reference: Keyboard and Mouse Actions &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -24,8 +24,8 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
-    <link rel="next" title="Further reading" href="further_reading.html" />
-    <link rel="prev" title="Custom Widget" href="custom_widgets.html" /> 
+    <link rel="next" title="License and Acknowledgements" href="acknowledgements.html" />
+    <link rel="prev" title="Further reading" href="further_reading.html" /> 
   </head>
   <body>
     <div class="related" role="navigation" aria-label="related navigation">
@@ -35,12 +35,12 @@
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="further_reading.html" title="Further reading"
+          <a href="acknowledgements.html" title="License and Acknowledgements"
              accesskey="N">next</a> |</li>
         <li class="right" >
-          <a href="custom_widgets.html" title="Custom Widget"
+          <a href="further_reading.html" title="Further reading"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -51,6 +51,58 @@
             
   <div class="section" id="reference-keyboard-and-mouse-actions">
 <h1>Reference: Keyboard and Mouse Actions<a class="headerlink" href="#reference-keyboard-and-mouse-actions" title="Permalink to this headline">¶</a></h1>
+<p>On <em>Classic</em> versions of wxPython, the keyboard shortcuts will not work in the <em>Preview</em> window.</p>
+<p><strong>Main Window / All</strong></p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="47%" />
+<col width="53%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head" rowspan="2">Key/Mouse</th>
+<th class="head" rowspan="2">Action</th>
+</tr>
+<tr class="row-even"></tr>
+</thead>
+<tbody valign="top">
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">F2</span></code></td>
+<td>Go to <em>Tree</em> control in main window</td>
+</tr>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">F3</span></code></td>
+<td>Go to <em>Properties</em> control in main window</td>
+</tr>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">F8</span></code> or <code class="kbd docutils literal"><span class="pre">Ctrl-M</span></code></td>
+<td>Go to <em>Properties -&gt; Common</em></td>
+</tr>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">F9</span></code> or <code class="kbd docutils literal"><span class="pre">Ctrl-L</span></code></td>
+<td>Go to <em>Properties -&gt; Layout</em></td>
+</tr>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">F10</span></code> or <code class="kbd docutils literal"><span class="pre">Ctrl-W</span></code></td>
+<td>Go to <em>Properties -&gt; Widget</em></td>
+</tr>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">F11</span></code> or <code class="kbd docutils literal"><span class="pre">Ctrl-E</span></code></td>
+<td>Go to <em>Properties -&gt; Events</em></td>
+</tr>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">F12</span></code> or <code class="kbd docutils literal"><span class="pre">Ctrl-D</span></code></td>
+<td>Go to <em>Properties -&gt; CoDe</em></td>
+</tr>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">F4</span></code></td>
+<td>Go to <em>Palette</em> control in main window</td>
+</tr>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">F5</span></code></td>
+<td>Show/Refresh <em>Preview</em> Window</td>
+</tr>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">F6</span></code></td>
+<td>Show/Hide <em>Design</em> Window</td>
+</tr>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Ctrl+S</span></code></td>
+<td>Save file</td>
+</tr>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Ctrl+G</span></code></td>
+<td>Generate Code</td>
+</tr>
+</tbody>
+</table>
 <p><strong>Tree control in the main window:</strong></p>
 <table border="1" class="docutils">
 <colgroup>
@@ -64,12 +116,24 @@
 <tr class="row-even"></tr>
 </thead>
 <tbody valign="top">
-<tr class="row-odd"><td>Double Click on toplevel control like Frame</td>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">F2</span></code></td>
+<td>Edit control name (and label for some controls)</td>
+</tr>
+<tr class="row-even"><td>Double Click on toplevel control like Frame</td>
 <td>Show Design Window Expand child items</td>
 </tr>
-<tr class="row-even"><td>Cursor Up/Down</td>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Enter</span></code> on toplevel window</td>
+<td>Show design window</td>
+</tr>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Arrow</span> <span class="pre">up/down</span></code></td>
 <td>Navigate through tree</td>
 </tr>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Arrow</span> <span class="pre">right/left</span></code></td>
+<td>Expand / collapse</td>
+</tr>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Enter</span></code> on empty slot</td>
+<td>Add item to slot</td>
+</tr>
 <tr class="row-odd"><td>Right Click on Application right after loading</td>
 <td>Expand all items</td>
 </tr>
@@ -85,9 +149,6 @@
 <tr class="row-odd"><td>Ctrl Drag &amp; Drop</td>
 <td>Copy item(s) to another slot</td>
 </tr>
-<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">F2</span></code></td>
-<td>Edit control name (and label for some controls)</td>
-</tr>
 </tbody>
 </table>
 <p><strong>Tree view and Design window</strong></p>
@@ -143,21 +204,21 @@
 <tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Alt-A</span></code></td>
 <td>Apply changes</td>
 </tr>
-<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Ctrl-I</span></code></td>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Ctrl-I</span></code> or <code class="kbd docutils literal"><span class="pre">Alt-I</span></code></td>
 <td>Insert entry</td>
 </tr>
-<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Ctrl-A</span></code></td>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Ctrl-A</span></code> or <code class="kbd docutils literal"><span class="pre">Alt-D</span></code></td>
 <td>Add entry</td>
 </tr>
-<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Ctrl-R</span></code></td>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Ctrl-R</span></code> or <code class="kbd docutils literal"><span class="pre">Alt-R</span></code></td>
 <td>Remove entry</td>
 </tr>
-<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Alt-A</span></code></td>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Ctrl-T</span></code> or <code class="kbd docutils literal"><span class="pre">Alt-T</span></code></td>
 <td>Reset / discard changes</td>
 </tr>
 </tbody>
 </table>
-<p><strong>Menu Editor</strong></p>
+<p><strong>Palette in the main window:</strong></p>
 <table border="1" class="docutils">
 <colgroup>
 <col width="47%" />
@@ -170,12 +231,21 @@
 <tr class="row-even"></tr>
 </thead>
 <tbody valign="top">
-<tr class="row-odd"><td>Arrow up/down</td>
-<td>go to previous/next menu item</td>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Arrow</span> <span class="pre">up/down</span></code></td>
+<td>Navigate between rows</td>
+</tr>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Arrow</span> <span class="pre">right/left</span></code>,
+<code class="kbd docutils literal"><span class="pre">Tab</span></code>, <code class="kbd docutils literal"><span class="pre">Pos1</span></code>, <code class="kbd docutils literal"><span class="pre">End</span></code></td>
+<td>Navigate within row</td>
+</tr>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">W</span></code>, <code class="kbd docutils literal"><span class="pre">C</span></code>, <code class="kbd docutils literal"><span class="pre">B</span></code>, <code class="kbd docutils literal"><span class="pre">I</span></code>,
+<code class="kbd docutils literal"><span class="pre">N</span></code>, <code class="kbd docutils literal"><span class="pre">D</span></code>, <code class="kbd docutils literal"><span class="pre">T</span></code>, <code class="kbd docutils literal"><span class="pre">M</span></code>,
+<code class="kbd docutils literal"><span class="pre">R</span></code>, <code class="kbd docutils literal"><span class="pre">S</span></code></td>
+<td>Navigate to row</td>
 </tr>
 </tbody>
 </table>
-<p><strong>Main Window / All</strong></p>
+<p><strong>Menu and Toolbar Editors</strong></p>
 <table border="1" class="docutils">
 <colgroup>
 <col width="47%" />
@@ -188,30 +258,21 @@
 <tr class="row-even"></tr>
 </thead>
 <tbody valign="top">
-<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">F2</span></code></td>
-<td>Show <em>Tree</em> Window</td>
-</tr>
-<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">F3</span></code></td>
-<td>Show <em>Properties</em> Window</td>
-</tr>
-<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">F4</span></code></td>
-<td>Show <em>Palette</em> Window</td>
-</tr>
-<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">F5</span></code></td>
-<td>Show/Refresh <em>Preview</em> Window</td>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Arrow</span> <span class="pre">up/down</span></code></td>
+<td>go to previous/next menu item</td>
 </tr>
-<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">F6</span></code></td>
-<td>Show/Hide <em>Design</em> Window</td>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Alt-A</span></code> or <code class="kbd docutils literal"><span class="pre">Alt-Enter</span></code>
+or <code class="kbd docutils literal"><span class="pre">Ctrl-Enter</span></code></td>
+<td>OK / accept changes and close dialog</td>
 </tr>
-<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Ctrl+S</span></code></td>
-<td>Save file</td>
+<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Alt-C</span></code> or <code class="kbd docutils literal"><span class="pre">Alt-F4</span></code></td>
+<td>Cancel / discard changes and close dialog</td>
 </tr>
-<tr class="row-odd"><td><code class="kbd docutils literal"><span class="pre">Ctrl+G</span></code></td>
-<td>Generate Code</td>
+<tr class="row-even"><td><code class="kbd docutils literal"><span class="pre">Alt-Arrow</span> <span class="pre">up/down/left/right</span></code></td>
+<td>move item up/down/left/right</td>
 </tr>
 </tbody>
 </table>
-<p>On <em>Classic</em> versions of wxPython, the keyboard shortcuts will not work in the <em>Preview</em> window.</p>
 <p>Some more keyboard shortcuts can be found in the menus.</p>
 </div>
 
@@ -225,11 +286,11 @@
               <img class="logo" src="_static/wxglade.png" alt="Logo"/>
             </a></p>
   <h4>Previous topic</h4>
-  <p class="topless"><a href="custom_widgets.html"
-                        title="previous chapter">Custom Widget</a></p>
-  <h4>Next topic</h4>
   <p class="topless"><a href="further_reading.html"
-                        title="next chapter">Further reading</a></p>
+                        title="previous chapter">Further reading</a></p>
+  <h4>Next topic</h4>
+  <p class="topless"><a href="acknowledgements.html"
+                        title="next chapter">License and Acknowledgements</a></p>
   <div role="note" aria-label="source link">
     <h3>This Page</h3>
     <ul class="this-page-menu">
@@ -258,12 +319,12 @@
           <a href="genindex.html" title="General Index"
              >index</a></li>
         <li class="right" >
-          <a href="further_reading.html" title="Further reading"
+          <a href="acknowledgements.html" title="License and Acknowledgements"
              >next</a> |</li>
         <li class="right" >
-          <a href="custom_widgets.html" title="Custom Widget"
+          <a href="further_reading.html" title="Further reading"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/search.html wxglade-1.0.1/docs/html/search.html
--- wxglade-0.9.6/docs/html/search.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/search.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Search &#8212; wxGlade 0.9.5 documentation</title>
+    <title>Search &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -40,7 +40,7 @@
         <li class="right" style="margin-right: 10px">
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -91,7 +91,7 @@
         <li class="right" style="margin-right: 10px">
           <a href="genindex.html" title="General Index"
              >index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/searchindex.js wxglade-1.0.1/docs/html/searchindex.js
--- wxglade-0.9.6/docs/html/searchindex.js	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/searchindex.js	2020-12-31 14:04:48.000000000 +0000
@@ -1 +1 @@
-Search.setIndex({docnames:["acknowledgements","bitmaps","custom_widgets","further_reading","index","intro","menu_status_tool","reference","source_code","tutorial","wxbasics"],envversion:53,filenames:["acknowledgements.rst","bitmaps.rst","custom_widgets.rst","further_reading.rst","index.rst","intro.rst","menu_status_tool.rst","reference.rst","source_code.rst","tutorial.rst","wxbasics.rst"],objects:{},objnames:{},objtypes:{},terms:{"1x1":2,"20start":10,"3x3":10,"case":[1,6,8,9,10],"catch":8,"class":[1,2,6,8,9],"default":[2,6,8,9],"export":2,"final":[4,5],"float":8,"function":[1,2,4],"import":[1,2,3,4,6],"new":[1,2,7,9],"return":[1,8],"static":[9,10],"switch":5,"true":[6,8],"try":[1,9,10],"var":4,"while":[],AND:0,BUT:0,FOR:0,For:[1,2,5,6,7,8,9,10],Has:6,IDE:8,NOT:0,One:[],THE:0,The:[0,2,3,5,6,8,9,10],There:[1,2,4,5,8,10],USE:0,Use:[0,4,10],WITH:0,With:10,__do_layout:8,__file__:1,__init__:[1,6,8],__main__:8,__name__:8,__set_properti:8,_meipass:1,abl:8,abov:[0,1,2,8,9,10],absolut:1,abspath:1,access:[1,6,8],accomplish:[],accordingli:[8,9],achiev:8,acknowledg:4,action:[0,3,4,5,8],activ:9,actual:[8,9,10],add:[4,6,7,8],add_subplot:2,added:[5,9],adding:7,addit:[5,8],addition:8,adjac:9,adjust:4,advantag:2,after:[6,7,9],again:9,agreement:4,agw:[2,5],alberto:0,align:[4,10],align_cent:8,align_center_vert:8,all:[0,2,5,7,8,9,10],all_widget:5,allcontrols_28:[],allcontrols_30:[],allow:[5,8,9,10],allwidget:5,allwidgets_28:[5,6],allwidgets_30:5,almost:[6,9,10],alongsid:10,alreadi:[3,6,9],also:[2,3,5,8,9,10],alt:[1,7],altern:[8,9,10],alwai:[8,10],ani:[0,2,6,8,9],anonym:8,anoth:[2,7,8,9,10],anyth:[5,8,9],api:3,app:8,append:[6,7],appendtext:8,appli:[6,7,9],applic:[1,2,3,4,5,6,7,9],approach:[2,8],appropri:8,arang:2,archiv:3,area:9,arg:[1,6,8],argument:[2,8],aris:0,around:[2,5,9,10],arrang:[5,10],arrow:[7,9],art:4,artclient:1,artid:1,artprovid:1,assign:[6,8],associ:0,attach:6,attribut:[6,8],author:0,automat:9,avail:[2,3,5,6,9,10],avoid:9,awai:8,awar:[1,8],axes:2,back:8,backend:2,backend_wxagg:2,background:[8,9],backup:8,bar:[4,5,8,9],base:[],base_path:1,basic:[2,4,8],becaus:9,becom:10,been:[3,10],befor:[2,3,5,7,9],begin:[2,6,8],being:8,below:[1,6],best:[5,8,10],better:[2,5,8,9,10],between:[2,5,7,9,10],beyond:9,bin:8,bind:[0,6,8],bit:[2,5,9],bitmap:4,block:2,blue:[9,10],boilerpl:8,book:3,bookmark:3,border:[9,10],both:9,bottom:[6,8,9,10],bound:8,box:[9,10],boxsiz:[8,9,10],bradlei:[],breakpoint:8,brendan:1,btn_execut:8,btn_reset:8,build:2,bundl:1,busi:[2,8,10],button:[1,2,5,6,8,9,10],button_1:[8,9],button_execut:9,button_reset:9,calcul:[4,6,8],calculator_gui:[6,8],calculator_main:[6,8],calculatorfram:[6,8,9],call:[1,2,6,8,10],can:[2,5,6,7,8,9,10],cannnot:10,canva:[4,5],carsten:0,catalog:8,categori:[],caus:9,cell:10,center:[9,10],centr:10,certain:9,chang:[4,6,7,8,10],charg:0,check:[6,8,9],checkbox:9,child:[7,10],children:10,chm:[],choic:[8,9],chunk:1,circl:2,claim:0,classic:[3,5,7],classic_vs_phoenix:3,cleaner:2,clear:[6,8],click:[1,5,6,7,8,9],close:6,code:[2,4,5,6,7,9,10],col:9,color:[8,9,10],colour:[8,9],column:[9,10],com:[],combin:9,common:[2,8,9],comparison:3,compat:5,complet:[8,9],complex:2,comprehens:[4,10],concept:4,condit:0,connect:0,consist:[5,9],consol:8,construct:10,constructor:4,contain:[2,6,8,9,10],content:[4,8,9,10],context:9,contract:0,control:[3,5,6,7,8,9,10],copi:[0,2,4,7],copyright:0,could:[2,8,9],cours:[2,8,9],courtesi:1,creat:[1,2,4,5,6,10],creation:[0,8],css:[2,5],ctrl:[1,5,7,8,9],curiou:9,current:[5,9],cursor:7,custom:[4,5],custom_widget:[],customis:1,customwidget:[2,5],customwidgetproperti:[],customwidgetpropertiescod:[],customwidgetpropertiescommon:[],cut:9,d4d0c8:9,damag:0,dash:10,data:[1,8,10],date:5,deactiv:8,deal:0,debugg:8,def:[1,6,8],default_frame_styl:[6,8],defin:[2,8,9],definit:8,del:[7,9],delet:9,deliv:8,demo:3,demonstr:[2,5,8],depend:[1,8,9],deriv:6,describ:10,design:[2,5,7,9,10],desir:9,dev:1,develop:[0,8],dialog:[1,8,9],did:[2,9],dietmar:0,differ:[5,8,9,10],direct:[9,10],directli:[2,5,6,8,9],directori:[1,3,9],dirnam:1,dirti:[4,5],disabl:6,discard:7,dispatch:8,displai:[2,5,8,9],distribut:0,doc:[1,3],document:[0,3,10],doe:[2,9],doesn:9,doing:5,don:[8,9,10],done:[6,9],doubl:[5,7],down:7,download:3,drag:[1,2,5,7,9],draggabl:5,draw:2,driven:8,drop:[7,9],dunn:[0,3],dure:8,each:[5,8,9,10],easi:10,easier:2,easiest:8,easili:6,edg:[9,10],edit:[4,5,6,7],editor:[4,7,9],editori:[],effect:9,either:[6,9,10],element:[8,9],elif:8,els:[1,5,8],emb:[2,5],embed:[4,5],empti:[4,6,7,8,9],emptybitmap:1,enabl:[6,9],end:[2,6,8],enter:[1,2,8,9],entri:[6,7],env:8,environ:1,equal:10,equival:10,error:8,especi:8,etc:8,even:9,event:[0,2,4,6,9,10],event_handl:[6,8],ever:10,everi:8,evt_button:8,evt_menu:6,evt_text:8,exact:9,exampl:[1,4,6,9],except:[1,8],excurs:4,execut:[1,8,9],execute_button:8,exercis:6,exist:9,exit:6,expand:[7,8,9,10],experi:5,explain:[5,8],explor:3,express:0,extend:[2,8],extens:5,extra:2,extracod:2,factor:9,fail:8,fals:6,far:8,faster:9,featur:[8,9],field:[1,6,9,10],fifth:9,figur:2,figurecanva:2,figurecanvaswxagg:2,file:[0,2,4,5,6,7,8,9],fill:[6,9,10],find:10,finish:[],first:[2,4,6,8,10],fit:[0,9],fith:9,five:10,fix:[6,9,10],flexgrid:9,flexgrids:[9,10],flexibl:10,flow:8,fold:8,folder:[2,8,9],follow:[0,6,8,9],font:9,forget:[],forward:8,found:[1,2,7,8,9],fourth:10,frame:[5,6,7,8,9,10],frame_menubar:6,free:[0,8],from:[0,2,3,4,6,7,8,9],full:[5,8],fulli:[],furnish:0,further:[0,4],gap:9,gener:[2,4,5,6,7],geometri:10,get:[1,2,3,9,10],get_bitmap1:1,get_bitmap2:1,getattr:1,getbitmap:1,getid:6,getselect:8,gettext:8,getvalu:8,github:[],give:6,given:[1,10],glue:8,going:[8,9],good:8,govern:0,grant:0,graphic:2,grei:9,grew:9,grid:[2,4,10],gridbags:[9,10],gridsiz:[9,10],griggio:0,grohmann:0,grow:[6,9,10],growabl:9,growth:9,gui:[2,8,9,10],guid:10,guilabel:[],hand:[8,10],handl:[2,8,9,10],handler:[2,4,6,9],happen:[8,9],has:[2,6,9,10],hatch:9,have:[1,2,3,5,6,8,9,10],head:[2,9],height:[1,2,9],hello:10,help:8,here:[2,6,8,9],herebi:0,hide:7,hierarch:10,hierarchi:6,highlight:9,hint:4,hit:[5,6,8,9],hold:[1,9],holder:0,home:10,horizont:[8,9,10],how:[1,2,5,8,9,10],html2:[2,5],html:[1,2,3,5],htmlwindow:[2,5],http:[1,3,5,10],i_reset:6,icon:[1,5,6,9,10],id_ani:[2,6,8],ident:5,identifi:8,imag:[1,2,5],imagepanel:2,implement:[0,1,2,4,6],impli:0,impos:10,includ:[0,2,3,5,6,9,10],indent:6,indic:10,individu:10,infinit:8,inform:10,initi:[0,6,8],input:[9,10],insert:[1,2,6,7,8,9],insid:9,instal:[2,5,8],instanc:[2,9],instanti:2,instead:[2,9],integr:[2,5,10],intend:10,interest:2,interfac:[8,10],intern:[9,10],interpret:5,introspect:8,invent:0,invis:[9,10],invok:8,item:[2,5,6,7,9,10],its:[9,10],javascript:[2,5],join:1,just:[1,2,6,8,9,10],keep:[4,6,9],kei:[1,7,9],keyboard:[4,5],keyerror:1,keypad:8,kind:0,know:9,knowledg:10,kwarg:1,kwd:[6,8],label:[4,6,7,10],label_1:8,label_2:8,label_3:8,label_4:8,lai:9,lambda:8,languag:8,last:[8,9],later:[9,10],latter:[6,8],layer:2,layout:[4,5,8],learn:8,least:2,left:[9,10],less:5,let:[5,8],level:2,liabil:0,liabl:0,lib:[2,5],lib_plot:[2,5],librari:[0,10],licens:4,like:[2,6,7,8,9,10],limit:0,line:[2,7,8,9,10],list:[1,6,7],liter:1,littl:10,load:[4,7],locat:1,log:[8,9],logic:[2,6,8,9,10],look:[2,3,5,6,8,9,10],loop:8,lot:[8,9],mac:9,made:10,magic:2,mai:[1,2,5,8,9,10],main:[2,3,5,7,8,9,10],main_panel:[],mainli:10,mainloop:8,maintain:[2,10],mainten:0,majordimens:8,make:[2,9,10],manag:[4,8],mani:9,mark:8,marker:8,match:10,matplotlib2:[4,5],matplotlib3:[4,5],matplotlib:[4,5],matplotlib_ax:2,matplotlib_canva:2,matplotlib_exampl:2,matplotlib_figur:2,matplotlib_gui:2,matplotlibcanva:2,mayb:[3,9,10],meaning:9,menu:[4,5,7,8,9],menubar:6,merchant:0,merg:0,mess:10,messag:8,method:[4,8],middl:10,might:[5,8,9],min:1,minimum:9,miscellan:[],mit:0,mode:[7,9],modif:7,modifi:[0,8,9],modul:[2,8],more:[1,4,5,6,7,8,9,10],most:[2,3,5,8],mous:[4,5,8],move:[7,9],movement:8,much:9,multipl:[7,9,10],must:[],my_bitmap_path:1,myapp:8,mybitmap:1,myfram:[6,8],name:[2,4,6,7,8],navig:7,nb_top:[],need:[1,2,6,8,9,10],neg:6,nest:10,net:5,never:10,newli:9,newstyl:[],next:[4,7,8],node:9,noel:3,non:[1,2,8,9,10],none:8,noninfring:0,normal:[],note:[9,10],notebook:[4,5,7,8,10],notebook_1_pane_1:9,noth:8,notic:0,now:[6,8,9],number:[8,9],numpi:2,object:[5,8],obtain:[0,1],obviou:10,occupi:9,offer:8,often:[],old:9,older:3,on_button_press:8,on_buttonsdfasdf_press:[],on_execute_button_click:[6,8],on_menu_file_exit:6,on_menu_file_reset:6,on_reset_button_click:[6,8],onc:2,one:[1,2,5,8,9,10],oninit:8,onli:[2,5,8,9],open:[5,6,9],oper:[8,9],option:[1,8,9],org:[1,3,10],orient:9,origin:1,other:[0,5,6,8,9,10],otherwis:0,our:[1,6,8,9],out:[0,5,9],output:[8,10],over:10,overrid:4,overview:[3,4,10],overwrit:8,own:[8,10],page:[2,5,6,8,9,10],palett:[5,7,9],pane:9,panel:[5,8,9,10],panel_1:[2,8],panel_image_left:[],parent:[2,8],part:[4,6,8],particular:0,past:9,path:4,perfect:9,perl:1,permiss:0,permit:0,perpendicular:9,person:0,peter:[],phoenix:[0,3,5,8],pixel:10,place:[4,7,9,10],placehold:[2,5],placement:[9,10],platform:9,pleas:[8,9],plot:[2,5],plotcanva:[2,5],plotter:2,plu:[5,10],png:1,point:[8,9],portion:0,posit:10,possibl:9,practic:8,prefer:8,prerequisit:[4,5],present:9,press:[5,6,8,9],preview:[2,5,7,9,10],previou:[7,8,9,10],previous:5,primit:2,print:[6,8],probabl:[2,5],problem:9,profession:8,program:[4,8],programmat:6,project:[0,1,2,4,5,8,10],prompt:2,properti:[2,4,5,6,7,8,10],proport:4,prototyp:2,provid:[0,10],publish:0,purpos:[0,8],put:10,py_shel:[2,5],pyinstal:1,pypi:3,python:[0,1,2,3,5,8,9],pyw:5,pywin32:5,qualifi:[],quick:[4,5],ra_specify_row:8,radio:[6,9],radiobox:8,radiobox_oper:[8,9],rappin:3,rather:2,read:[4,8,9],readabl:[2,10],readm:5,readonli:[],realli:9,receiv:8,recent:5,recommend:8,red:9,refer:[1,4,5],refresh:7,regist:[5,8],rel:1,relat:8,relative_path:1,releas:[],remain:4,remap:1,rememb:9,remov:[6,7],renam:8,repeat:9,replac:[1,2,8],report:8,requir:[2,4,5,6,8],resembl:10,reset:[6,7,8,9],resiz:10,resourc:[1,3],resource_path:1,respons:10,restrict:[0,4],result:[2,6,8,9,10],result_text:[],revis:5,right:[0,2,7,9,10],robin:[0,3],robust:8,root:8,row:[4,10],run:[2,3,4,8,9],runtim:1,same:[2,6,8,9,10],sampl:3,sash:[5,9],save:[7,8,9],schwertberg:0,screenshot:[5,6,8,9],script:8,second:[9,10],section:[5,8,9],see:[1,2,5,8,9,10],select:[2,5,6,8,9],self:[1,2,6,8],sell:0,separ:[5,8,9],set:[2,6,8,9,10],setbackgroundcolour:8,setdefault:8,setmenubar:6,setselect:8,setsiz:8,settitl:8,settopwindow:8,setvalu:8,sever:[1,4],shall:0,share:1,shell:[2,5],shift:9,shortcut:[5,7],should:[5,6,8,9],show:[2,5,7,8,10],shown:[2,5,9],side:[8,10],similar:[6,8,10],simon:1,simpl:[2,5,6,8,9],simplebook:[],simplest:10,sin:2,sine:2,singl:[1,2,7,8,9,10],six:[9,10],size:[1,5,6,9,10],sizer:[4,5,7,8],sizer_1:8,sizer_2:8,sizer_3:[8,9],sizer_4:8,sizer_5:8,sizer_6:8,sizer_7:8,skip:[6,8],slightli:9,slot:[7,9,10],small:9,softwar:0,some:[1,2,5,7,8,9,10],sometim:[1,2,9],sooner:10,sourc:[3,4,5,6,9],sourceforg:5,space:[6,9,10],spacer:4,span:[9,10],special:2,specifi:[1,10],speedmet:[2,5],split:5,splitter:10,stack:10,stackoverflow:1,stai:[7,9],standard:[1,2],start:[5,6,8,9,10],statement:[2,4],static_line_1:8,staticboxs:10,staticlin:8,statictext:[8,9],statu:[4,5,8,9],statusbar:6,stderr:8,step:[4,5],still:[3,8],store:[6,8],str:8,structur:[4,5,6,8,10],stub:8,style:[5,6,8,9],subfold:2,subject:0,sublicens:0,submenu:6,subplot:2,substanti:0,summari:4,suppli:2,support:[2,5,6,7,8,9],surpris:10,surround:9,syntax:1,sys:1,system:8,sytem:8,tab:[7,8,9],taken:1,target:5,te_multilin:8,te_readonli:8,teach:10,team:0,templat:8,temporari:1,test:5,testmenu:[],text:[8,9],text_result:[6,8,9],text_value1:[8,9],text_value2:[8,9],textcontrol:9,textctrl:[8,9],than:[5,8,9],thank:0,thei:[5,8,10],them:[5,8,9,10],therefor:2,thi:[0,1,2,5,6,8,9,10],thing:[2,8,9,10],third:[9,10],those:10,though:10,three:[5,9,10],through:[7,9],time:[6,8,9],tip:4,titl:9,tkinter:10,too:[8,9],tool:[4,5,8,9],toolbar:[6,9],toolkit:10,top:[8,9,10],toplevel:[4,5,7,9,10],tort:0,tradit:8,tree:[5,6,7,8,9,10],trivial:[2,8],turn:[6,9],tutori:[4,8],two:[2,6,8,9,10],txt:5,txt_ctrl_3:9,type:[5,6,9],unchang:8,uncheck:9,under:5,uniqu:8,unix:6,unpack:3,until:0,usag:1,use:[0,1,2,5,6,8,9,10],used:[2,5,10],useful:9,user:[4,5,6,9,10],uses:[8,10],using:[1,2,3,8,9,10],usr:[1,8],usual:[2,8,9,10],utf:8,valid:8,validate_valu:8,valu:[6,8,9,10],value1:8,value2:8,variabl:4,veri:2,versa:9,version:[1,2,3,5,7,9],vertic:[8,9,10],via:[5,8],vice:9,view:[5,7,8,9],visibl:9,visit:10,visual:[5,6,9,10],wai:[2,8,10],want:[2,5,8,9,10],warranti:0,webview:[2,5],well:[4,5,8],were:[2,5,8],what:9,when:[5,6,7,8,9,10],whenev:8,where:[6,8,9],whether:0,which:[1,2,8,9,10],whole:[2,9],whom:0,widget:[1,4,5,6,7,8,10],width:[1,2,9],wiki:10,win32:5,window:[2,4,6,7],wing:8,within:[1,2,8,10],without:[0,2,9,10],work:[1,5,7,8,9],world:10,would:[1,2,6,8,9],wrapper:[2,10],write:2,written:[3,6,8,10],wrong:9,wrote:8,www:10,wxalign_center_horizont:9,wxalign_center_vert:9,wxart_go_up:1,wxart_oth:1,wxartprovid:4,wxbitmap:1,wxbitmap_type_ani:1,wxexpand:4,wxg:[2,5,6,8,9],wxglade:[2,6,8,9],wxglade_tmp_menu:6,wxleft:9,wxnb_top:9,wxpython:[0,1,2,3,5,7,8,10],wxright:9,wxstatictext:9,wxte_multilin:9,wxte_readonli:9,wxtextctrl:[],wxwidget:[0,8,10],xxx:8,yellow:8,yet:[6,8,9],you:[1,2,3,5,6,8,9,10],your:[1,2,5,8,9,10],yourself:8,zerodivisionerror:8,zip:[],zoom:2},titles:["License and Acknowledgements","Bitmaps","Custom Widget","Further reading"," Welcome to wxGlade\u2019s documentation!","wxGlade Overview","Menu, Status Bar, Tool Bar","Reference: Keyboard and Mouse Actions","Create and Use Source Code","Tutorial Project: Calculator","wx Basics"],titleterms:{"class":[],"final":9,"function":8,"import":8,"var":1,There:9,Use:[8,9],acknowledg:0,action:7,add:9,adjust:9,agreement:0,align:9,applic:[8,10],art:1,bar:6,base:[],basic:[9,10],bitmap:1,calcul:[9,10],canva:2,chang:9,code:[1,8],comprehens:2,concept:10,constructor:2,copi:9,creat:[8,9],custom:[1,2],dirti:2,document:4,edit:[8,9],editor:6,embed:2,empti:1,event:8,exampl:[2,5,8,10],excurs:9,file:1,first:9,from:1,further:[3,9],gener:8,grid:9,handler:8,hint:8,implement:8,keep:8,keyboard:7,label:9,layout:[9,10],licens:0,load:1,manag:10,matplotlib2:2,matplotlib3:2,matplotlib:2,menu:6,method:9,more:2,mous:7,name:[1,9],next:9,notebook:9,overrid:8,overview:5,part:9,path:1,place:8,prerequisit:8,program:5,project:9,properti:9,proport:9,quick:2,read:3,refer:7,remain:9,requir:10,restrict:10,row:9,run:5,sever:9,sizer:[9,10],sourc:8,spacer:9,statement:1,statu:6,step:9,structur:[2,9],summari:9,tip:8,titl:4,tool:6,toplevel:8,tutori:9,user:8,variabl:1,welcom:4,well:2,widget:[2,9],window:[5,8,9,10],wxartprovid:1,wxexpand:9,wxglade:[0,4,5,10]}})
\ No newline at end of file
+Search.setIndex({docnames:["acknowledgements","bitmaps","custom_widgets","dialogs","further_reading","index","intro","menu_status_tool","reference","source_code","tutorial","wxbasics"],envversion:53,filenames:["acknowledgements.rst","bitmaps.rst","custom_widgets.rst","dialogs.rst","further_reading.rst","index.rst","intro.rst","menu_status_tool.rst","reference.rst","source_code.rst","tutorial.rst","wxbasics.rst"],objects:{},objnames:{},objtypes:{},terms:{"1x1":2,"20start":11,"3x3":11,"case":[1,7,9,10,11],"catch":9,"class":[1,2,7,9,10],"default":[2,3,7,9,10],"export":2,"final":[5,6],"float":9,"function":[1,2,5,7],"import":[1,2,4,5,7,11],"new":[1,2,3,8,10,11],"return":[1,9],"static":[10,11],"switch":6,"true":[7,9],"try":[1,10,11],"var":5,"while":11,AND:0,BUT:0,FOR:0,For:[1,2,4,6,7,8,9,10,11],Has:7,IDE:9,NOT:0,THE:0,The:[0,2,3,4,6,7,9,10,11],Then:[4,10,11],There:[1,2,5,6,9,11],These:3,USE:0,Use:[0,5,11],WITH:0,With:11,__file__:1,__init__:[1,7,9],__main__:9,__name__:9,_meipass:1,abl:9,abov:[0,1,2,9,10,11],absolut:1,abspath:1,accept:8,access:[1,5,7,9],accordingli:[9,10],achiev:9,acknowledg:5,action:[0,4,5,6,9],activ:10,actual:[9,10,11],add:[3,5,6,7,8,9],add_subplot:2,addbutton:3,added:[6,10],addgrowablecol:9,addgrowablerow:9,adding:[8,10],addit:[6,9],addition:9,addpag:9,adjac:10,adjust:5,advantag:2,affect:6,after:[7,8,10],agreement:5,agw:[2,6],alberto:0,align:[5,11],align_center_horizont:9,align_center_vert:9,all:[0,2,6,8,9,10,11],all_widget:6,allow:[6,9,10,11],allwidget:6,allwidgets_28:[6,7],allwidgets_30:6,almost:[7,10],alongsid:11,alreadi:[4,7,10],also:[2,3,6,7,9,10,11],alt:[1,8],altern:[9,10,11],alwai:[6,9,10,11],ani:[0,2,7,9,10],anonym:9,anoth:[2,8,9,10,11],anyth:[6,9,10],api:[4,11],app:9,append:[7,8],appendtext:9,appli:[7,8,10],applic:[1,2,3,4,5,6,7,8,10],appreci:6,approach:[2,9],arang:2,archiv:[4,6,11],area:10,arg:[1,7,9],argument:[2,7,9],aris:0,around:[2,6,10,11],arrang:[3,6,10,11],arrow:[8,10],art:5,artclient:1,artid:1,artprovid:1,ask:[4,10],assign:[7,9],associ:0,attach:7,attempt:6,attribut:[7,9],author:0,automat:10,avail:[2,4,6,7,10,11],avoid:10,awai:9,awar:[1,9],axes:2,back:[9,10],backend:2,backend_wxagg:2,background:[9,10],backup:9,bag:11,bar:[5,6,9,10],base_path:1,basic:[2,5,9],becaus:10,becom:11,been:[4,11],befor:[2,4,6,8,10],begin:[2,7,9],being:9,below:[1,4,7],best:[6,9,10,11],better:[2,6,9,10,11],between:[2,6,8,10,11],beyond:10,bin:9,bind:[0,7,9],bit:[2,6,10],bitmap:5,block:2,blue:[10,11],boilerpl:9,book:4,bookmark:4,border:[10,11],both:[4,6,10],bottom:[7,10,11],bound:9,box:[10,11],boxsiz:[9,10,11],branch:6,breakpoint:9,brendan:1,bug:[4,6],build:[2,6],bundl:1,busi:[2,9,11],button:[1,2,3,6,7,9,10,11],button_1:[9,10],button_cancel:3,button_execut:[9,10],button_ok:3,button_reset:[9,10],calcul:[5,7,9],calculator_gui:[7,9],calculator_main:[7,9],calculatorfram:[7,9,10],call:[1,2,3,7,9,11],can:[2,3,4,6,7,8,9,10,11],cancel:[3,8],canva:[5,6],carsten:0,caus:10,cell:11,center:[10,11],centr:11,certain:10,cha:7,chang:[5,6,7,8,9,11],charg:0,check:[7,9,10],checkbox:10,child:[8,10],children:10,choic:[9,10],chunk:1,circl:2,claim:0,classic:[4,6,8],classic_vs_phoenix:4,cleaner:2,clear:[7,9],click:[1,6,7,8,9,10],clipboard:10,clone:6,close:[7,8],code:[2,3,4,5,6,7,8,10,11],col:10,collaps:8,color:[9,10,11],colour:[9,10],column:[10,11],com:6,combin:10,common:[2,8,9,10],comparison:4,compat:6,complet:[9,10],complex:2,complic:11,comprehens:[5,11],concept:5,condit:0,connect:0,consist:[3,6,10],consol:9,constructor:5,contain:[2,7,9,10,11],content:[3,5,9,10,11],context:10,contract:0,control:[4,6,7,8,9,10,11],copi:[0,2,5,8],copyright:0,correct:10,could:[2,9,10],cours:[2,7,9,10],courtesi:1,creat:[1,2,3,5,6,7,11],creation:0,css:[2,6],ctrl:[1,6,8,9,10],curiou:10,current:[6,10],custom:[5,6],customis:1,customwidget:[2,6],cut:10,damag:0,dash:11,data:[1,9],date:6,deactiv:9,deal:0,debugg:9,def:[1,7,9],default_frame_styl:[7,9],defin:[2,3,9,10],del:[8,10],delet:10,deliv:9,demo:[4,11],demonstr:[2,6,9],depend:[1,9,10],deriv:7,describ:11,design:[2,6,8,10,11],desir:10,desktop:6,dev:1,develop:[0,9],dialog:[1,5,6,8,9,10,11],did:[2,10],dietmar:0,differ:[6,7,9,10,11],direct:10,directli:[2,6,7,9,10],directori:[1,6,10],dirnam:1,dirti:[5,6],disabl:7,disappear:10,discard:8,discuss:4,dispatch:9,displai:[2,6,9,10],distribut:0,dlg:3,doc:[1,4,11],document:[0,4,11],doe:[2,3,10],doesn:10,doing:6,don:[4,9,10,11],done:[7,10],doubl:[6,8],down:8,download:[4,6,11],drag:[1,2,6,8,10],draggabl:6,draw:2,driven:9,drop:[8,10],dunn:[0,4],dure:9,each:[4,6,7,9,10,11],easi:[10,11],easier:2,easiest:9,easili:7,edg:[10,11],edit:[5,6,7,8],editor:[5,8,10],effect:10,either:[7,10,11],element:[9,10],elif:9,els:[1,6,9],emb:[2,6],embed:[5,6],empti:[5,7,8,9,10],emptybitmap:1,enabl:[6,7,10],end:[2,7,8,9],enough:6,enter:[1,2,3,6,7,8,9,10],entri:[3,7,8],env:9,environ:1,equal:11,equival:11,error:9,escap:3,especi:[9,10],etc:9,event:[0,2,5,8,10,11],event_handl:[7,9],ever:[10,11],everi:9,evt_button:9,evt_menu:7,evt_text:9,exact:10,exampl:[1,3,4,5,7,10],except:[1,9],excurs:5,execut:[1,9,10],execute_button:9,exercis:7,exist:10,exit:7,expand:[8,9,10,11],experi:6,explain:[6,9],explor:[4,11],express:0,extend:[2,9,10],extens:6,extra:[2,4,11],extracod:2,f10:8,f11:8,f12:8,factor:10,fail:9,fals:7,familiar:[6,10],far:9,faster:10,fastest:10,featur:[9,10],feedback:6,field:[1,7,10,11],fifth:10,figur:2,figurecanva:2,figurecanvaswxagg:2,file:[0,2,3,5,6,7,8,9,10],fill:[3,7,10,11],find:[4,10,11],first:[2,5,7,9,11],fit:[0,3,10],fith:10,five:[10,11],fix:[7,10,11],flavor:6,flexgrid:10,flexgrids:[9,10,11],flexibl:11,flow:9,focu:6,fold:9,folder:[2,3,9,10],follow:[0,7,9,10],font:10,format:6,forward:9,found:[1,2,3,8,9,10],fourth:11,frame:[3,6,7,8,9,10,11],frame_menubar:7,frame_slot:10,free:[0,9],from:[0,2,4,5,6,7,8,9,10],full:[6,9],furnish:0,further:[0,5],gap:10,gener:[2,3,5,6,7,8],geometri:[10,11],get:[1,2,4,9,10,11],get_bitmap1:1,get_bitmap2:1,getattr:1,getbitmap:1,getid:[3,7],getselect:9,getvalu:9,git:6,github:6,give:7,given:[1,11],glue:9,going:[9,10],good:[9,10],govern:0,grant:0,graphic:2,grei:10,grew:10,grid:[2,5,11],grid_sizer_1:9,gridbags:[10,11],gridsiz:[10,11],griggio:0,grohmann:0,grow:[7,10,11],growabl:10,growth:10,gui:[2,6,9,10,11],guid:[3,11],hand:[6,9],handl:[2,9,10,11],handler:[2,5,10],happen:[9,10],has:[2,3,7,10,11],hatch:10,have:[1,2,3,4,6,7,9,10,11],head:[2,10],height:[1,2,10],hello:11,help:[4,9],here:[2,3,4,7,9,10,11],herebi:0,hide:8,hierarch:[10,11],hierarchi:7,highlight:10,hint:5,hit:[3,6,7,9,10],hold:[1,10],holder:0,home:11,horizont:[9,10,11],how:[1,2,3,6,9,10,11],html2:[2,6],html:[1,2,4,6],html_exampl:2,htmlwindow:[2,6],http:[1,4,6,11],i_reset:7,icon:[1,6,7,10,11],id_ani:[2,7,9],id_cancel:3,id_ok:3,ident:6,identifi:9,imag:[1,2,6],imagepanel:2,implement:[0,1,2,5,7],impli:0,includ:[0,2,6,7,10,11],indent:7,indic:11,individu:11,infinit:9,inform:11,initi:[0,7,9],input:[10,11],insert:[1,2,7,8,9,10],insid:10,instal:[2,5],instanc:[2,10],instanti:2,instead:[2,6,7,10],intefac:6,integr:[2,6,11],intend:11,interest:2,interfac:[9,10,11],intern:10,introspect:9,invent:0,invis:11,invok:9,issu:[4,6],item:[2,3,6,7,8,10,11],its:[10,11],javascript:[2,6],jaw:6,join:1,just:[1,2,6,7,9,10,11],keep:[5,6,7,10],kei:[1,8,10],keyboard:[5,6,10],keyerror:1,keypad:9,kind:0,know:10,knowledg:11,known:6,kwarg:1,kwd:[7,9],label:[5,7,8,11],label_1:9,label_2:9,label_3:9,label_4:9,lai:10,lambda:[5,9],languag:9,last:[9,10],later:[10,11],latest:6,latter:[7,9],layer:2,layout:[5,6,8,9],learn:9,least:[2,11],leav:10,left:[8,10,11],less:6,let:[6,9],level:2,liabil:0,liabl:0,lib:[2,6],lib_plot:[2,6],librari:[0,11],licens:5,like:[2,3,6,7,8,9,10,11],limit:0,line:[2,3,8,9,10,11],link:4,linux:6,list:[1,4,6,7,8],liter:1,littl:11,load:[5,8],locat:[1,6],log:[9,10],logic:[2,7,9,10,11],look:[2,4,6,7,9,10,11],loop:9,lot:[9,10],mac:10,made:11,magic:2,mai:[1,2,6,7,9,10,11],mail:[4,6],main:[2,3,6,8,9,10,11],mainli:[10,11],mainloop:9,maintain:[2,10,11],mainten:0,majordimens:9,make:[2,10,11],manag:[5,9,10],mani:10,mark:9,marker:9,master:6,match:[3,4,10,11],matplotlib2:[5,6],matplotlib3:[5,6],matplotlib:[5,6],matplotlib_ax:2,matplotlib_canva:2,matplotlib_exampl:2,matplotlib_figur:2,matplotlib_gui:2,matplotlibcanva:2,mayb:[6,10,11],meaning:10,menu:[3,4,5,6,8,9,10],menubar:7,merchant:0,merg:0,mess:[10,11],messag:9,method:[5,7,9],middl:11,might:[6,9,10],min:1,mind:[6,10],minimum:[3,10,11],mit:0,modal:3,mode:[8,10],modif:8,modifi:[0,9,10],modul:[2,9],more:[1,5,6,7,8,9,10,11],most:[2,3,4,6,9,11],mous:[5,6,9,10],move:[8,10],movement:9,much:10,multipl:[8,10,11],my_bitmap_path:1,myapp:9,mybitmap:1,mydialog:3,myfram:[7,9],name:[2,5,7,8,9],navig:[8,10],need:[1,2,7,9,10,11],neg:7,nest:[10,11],net:6,never:[10,11],newli:10,next:[5,8,9],node:10,noel:4,non:[1,2,9,10,11],none:9,noninfring:0,note:[3,4,10,11],notebook:[5,6,8,9],notebook_1:9,notebook_1_pane_1:[9,10],noth:9,notic:0,now:[7,9,10],number:[9,10],numpi:2,nvda:6,object:[6,9],observ:6,obtain:[0,1],obviou:11,occupi:10,odd:10,offer:[3,9],old:10,older:4,on_button_press:9,on_execute_button_click:[7,9],on_menu_file_exit:7,on_menu_file_reset:7,on_menu_insert_abc:7,on_reset_button_click:[7,9],onc:[2,10],one:[1,2,6,9,10,11],ones:11,oninit:9,onli:[2,6,9,10],open:[3,6,7,10],oper:[9,10],option:[1,9,10],order:3,org:[1,4,6,11],orient:10,origin:1,other:[0,6,7,9,10,11],otherwis:0,our:[1,7,9,10],out:[0,6,10],output:[9,11],over:11,overrid:5,overview:[4,5,11],overwrit:9,own:[6,9,11],packag:6,page:[2,6,7,9,10,11],pair:10,palett:[6,8,10],panel:[6,9,10],panel_1:[2,9,10],parent:[2,9],part:[5,7,9],particular:0,past:10,path:[5,6],perfect:10,perl:1,perman:3,permiss:0,permit:0,perpendicular:10,person:0,phoenix:[0,4,6,9],pixel:[10,11],place:[3,5,8,10,11],placehold:[2,6],placement:[10,11],platform:[6,10],pleas:[3,4,6,9,10,11],plot:[2,6],plotcanva:[2,6],plotter:2,plu:[6,11],png:1,point:[9,10],portion:0,pos1:8,posit:11,possibl:10,power:11,practic:9,prefer:[6,9],prerequisit:[5,6],present:10,press:[3,6,7,9,10],preview:[2,6,8,10,11],previou:[8,9,10,11],previous:6,primit:2,print:[3,7,9],probabl:[2,6,10,11],problem:[6,10],profession:9,program:[5,9],programmat:7,project:[0,1,2,5,6,9,11],prompt:2,properti:[2,3,5,6,7,8,9,11],proport:5,prototyp:2,provid:[0,6,11],publish:0,purpos:[0,9],put:11,py_shel:[2,6],pyinstal:1,pypi:6,python3:6,python:[0,1,2,6,7,9,10,11],pyw:6,pywin32:6,question:4,quick:5,ra_specify_row:9,radio:[7,10,11],radiobox:9,radiobox_oper:[9,10],rappin:4,rare:11,rather:2,read:[5,9,10],readabl:[2,11],reader:6,readm:6,real:6,realiz:3,realli:10,receiv:9,recent:6,recommend:9,red:[9,10],refer:[1,5,6],refresh:8,regist:[6,9],rel:1,relat:9,relative_path:1,releas:6,remain:5,remap:1,rememb:10,remov:[7,8,9,10],renam:[9,10],repeat:10,replac:[1,2,9],report:[4,6,9],repositori:6,requir:[2,6,7,9,11],resembl:[10,11],reset:[7,8,9,10],resiz:11,resourc:[1,4,11],resource_path:1,respons:11,restrict:0,result:[2,6,7,9,10,11],retriev:6,revis:6,right:[0,2,8,10,11],robin:[0,4],robust:9,root:9,row:[5,8,11],run:[2,4,5,9,10,11],runtim:1,same:[2,7,9,10,11],sash:[6,10],save:[8,9,10],schwertberg:0,screen:6,screenshot:[6,7,9,10],script:9,second:[10,11],section:[6,9,10,11],see:[1,2,3,4,6,9,10,11],select:[2,3,6,7,9,10],self:[1,2,3,7,9],sell:0,separ:[6,7,9,10],set:[2,7,9,10,11],setaffirmativeid:3,setbackgroundcolour:9,setdefault:[3,9],setescapeid:3,setmenubar:7,setselect:9,setsiz:9,settitl:9,settopwindow:9,setvalu:9,sever:[1,5],shall:0,share:1,shell:[2,6],shift:10,shortcut:[6,8],should:[6,7,9,10],show:[2,3,6,8,9,11],showmod:3,shown:[2,6,10],side:[9,11],similar:[7,9,11],simon:1,simpl:[2,6,7,9,10],simplest:[10,11],sin:2,sine:2,singl:[1,2,6,8,9,10],site:4,six:[10,11],size:[1,3,6,7,10,11],sizer:[5,6,8,9],sizer_1:9,sizer_2:[3,10],sizer_6:9,skip:[7,9],slightli:10,slot:[8,10,11],small:10,softwar:0,some:[1,2,3,6,8,9,10,11],sometim:[1,2,10],sooner:11,sourc:[5,6,7,10,11],sourceforg:6,space:[7,10,11],spacer:5,span:[10,11],special:2,specif:[3,4],specifi:[1,7,11],speedmet:[2,6],split:6,splitter:10,stabl:6,stack:11,stackoverflow:1,stai:[8,10],standard:[1,2],start:[5,7,9,10,11],statement:[2,5],static_line_1:10,staticboxs:11,statictext:[9,10],statu:[5,6,9,10],statusbar:7,stddialogbuttons:3,stderr:9,step:[5,6],still:[4,9],stock:3,stockitem:3,store:[7,9],str:9,straightforward:6,structur:[5,6,7,9,11],stub:9,style:[3,6,7,9,10],subdirectori:[4,11],subfold:2,subject:0,sublicens:0,submenu:7,subplot:2,substanti:0,summari:5,suppli:2,support:[2,6,7,8,9,10],sure:11,surround:10,syntax:1,sys:1,system:[6,9,10],sytem:9,tab:[8,9,10],take:10,taken:1,target:6,teach:11,team:0,templat:9,temporari:[1,3],test:6,text:[9,10,11],text_log:[9,10],text_result:[7,9,10],text_value1:[9,10],text_value2:[9,10],textcontrol:10,textctrl:[9,10],than:[6,9,10],thank:0,thei:[6,9,10,11],theight:10,them:[3,6,9,10,11],therefor:[2,3],thi:[0,1,2,3,6,7,9,10,11],thing:[2,9,10,11],third:[10,11],those:11,though:11,three:[6,7,10,11],through:[8,10,11],time:[7,9,10],tip:5,titl:10,tkinter:[10,11],too:[9,10],tool:[5,6,9,10],toolbar:[7,8,10],toolkit:11,top:[10,11],toplevel:[5,6,8,10],tort:0,tracker:[4,6],tradit:9,tree:[6,7,8,9,10,11],trivial:[2,9],turn:[7,10],tutori:[5,9],two:[2,7,9,10,11],txt:6,txt_ctrl_3:10,type:[6,7,10],typic:[3,11],unchang:9,uncheck:10,under:6,uniqu:9,unix:7,unpack:[6,11],until:0,usabl:6,usag:1,use:[0,1,2,3,6,7,9,10,11],used:[2,3,6,11],user:[3,5,6,7,10,11],uses:[9,11],using:[1,2,3,4,6,9,10,11],usr:[1,9],usual:[2,9,10,11],utf:9,valid:9,validate_valu:9,valu:[3,7,9,10,11],value1:9,value2:9,variabl:5,veri:2,versa:10,version:[1,2,4,6,8,10,11],vertic:[9,10,11],via:[6,9],vice:10,view:[6,8,9,10],visibl:10,visit:11,visual:[6,7,10,11],wai:[2,9,10,11],want:[2,6,7,9,10,11],warranti:0,webview:[2,6],well:[5,6,9],were:[2,6,9],what:10,whatev:6,when:[3,6,7,8,9,10,11],whenev:9,where:[4,7,9,10],whether:0,which:[1,2,3,9,10,11],whole:[2,10],whom:0,widget:[1,3,4,5,6,7,8,9,11],width:[1,2,10],wiki:11,win32:6,window:[2,3,5,7,8],wing:9,within:[1,2,8,9,11],without:[0,2,10,11],work:[1,6,8,9,10,11],world:11,would:[1,2,7,9,10],wrapper:[2,11],write:2,written:[4,7,9,11],wrong:10,wrote:9,www:11,wxalign_center_horizont:10,wxalign_center_vert:10,wxart_go_up:1,wxart_oth:1,wxartprovid:5,wxbitmap:1,wxbitmap_type_ani:1,wxexpand:5,wxg:[2,3,6,7,9,10],wxglade:[2,3,4,7,9,10,11],wxglade_tmp_menu:7,wxleft:10,wxnb_top:10,wxpython4:[4,11],wxpython:[0,1,2,4,6,8,9,11],wxright:10,wxstatictext:10,wxsys_colour_btnfac:10,wxte_multilin:10,wxte_readonli:10,wxwidget:[0,9,11],xxx:9,yellow:9,yet:[7,9,10],you:[1,2,3,4,6,7,9,10,11],your:[1,2,4,6,9,10,11],yourself:9,zerodivisionerror:9,zip:6,zoom:2},titles:["License and Acknowledgements","Bitmaps","Custom Widget","Dialogs","Further reading"," Welcome to wxGlade\u2019s documentation!","wxGlade Overview and Quick Start","Menu, Status Bar, Tool Bar","Reference: Keyboard and Mouse Actions","Create and Use Source Code","Tutorial Project: Calculator","wx Basics"],titleterms:{"final":10,"function":9,"import":9,"var":1,There:10,Use:[9,10],access:6,acknowledg:0,action:8,add:10,adjust:10,agreement:0,align:10,applic:[9,11],art:1,bar:7,basic:[10,11],bitmap:1,calcul:[10,11],canva:2,chang:10,code:[1,9],comprehens:2,concept:11,constructor:2,copi:10,creat:[9,10],custom:[1,2],dialog:3,dirti:2,document:5,edit:[9,10],editor:7,embed:2,empti:1,event:[7,9],exampl:[2,6,9,11],excurs:10,file:1,first:10,from:1,further:[4,10],gener:9,grid:10,handler:[7,9],hint:9,implement:9,instal:6,keep:9,keyboard:8,label:10,lambda:7,layout:[10,11],licens:0,load:1,manag:11,matplotlib2:2,matplotlib3:2,matplotlib:2,menu:7,method:10,more:2,mous:8,name:[1,10],next:10,notebook:10,overrid:9,overview:6,part:10,path:1,place:9,prerequisit:9,program:6,project:10,properti:10,proport:10,quick:[2,6],read:4,refer:8,remain:10,row:10,run:6,sever:10,sizer:[10,11],sourc:9,spacer:10,start:6,statement:1,statu:7,step:10,structur:[2,10],summari:10,tip:9,titl:5,tool:7,toplevel:9,tutori:10,user:9,variabl:1,welcom:5,well:2,widget:[2,10],window:[6,9,10,11],wxartprovid:1,wxexpand:10,wxglade:[0,5,6]}})
\ No newline at end of file
diff -Nru wxglade-0.9.6/docs/html/source_code.html wxglade-1.0.1/docs/html/source_code.html
--- wxglade-0.9.6/docs/html/source_code.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/source_code.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Create and Use Source Code &#8212; wxGlade 0.9.5 documentation</title>
+    <title>Create and Use Source Code &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -24,7 +24,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
-    <link rel="next" title="Menu, Status Bar, Tool Bar" href="menu_status_tool.html" />
+    <link rel="next" title="Dialogs" href="dialogs.html" />
     <link rel="prev" title="Tutorial Project: Calculator" href="tutorial.html" /> 
   </head>
   <body>
@@ -35,12 +35,12 @@
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="menu_status_tool.html" title="Menu, Status Bar, Tool Bar"
+          <a href="dialogs.html" title="Dialogs"
              accesskey="N">next</a> |</li>
         <li class="right" >
           <a href="tutorial.html" title="Tutorial Project: Calculator"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -63,7 +63,7 @@
 <div><ul class="simple">
 <li>Python code for wxWidgets 3.0 or Phoenix</li>
 <li>all code in a single file</li>
-<li>output file name “Calculator.py”</li>
+<li>output file name “Calculator_GUI.py”</li>
 <li>an application should be created, not just the window</li>
 </ul>
 </div></blockquote>
@@ -73,13 +73,13 @@
 <col width="100%" />
 </colgroup>
 <tbody valign="top">
-<tr class="row-odd"><td><a class="first last reference internal image-reference" href="_images/Calculator_06_ApplicationProperties.png"><img alt="Application Properties" src="_images/Calculator_06_ApplicationProperties.png" style="width: 200px;" /></a>
+<tr class="row-odd"><td><a class="first last reference internal image-reference" href="_images/Calculator_06_ApplicationProperties.png"><img alt="Application Properties: Name: app, Class: MyApp, Single file, Python, 3.0, Output path: Calculator_GUI.py" src="_images/Calculator_06_ApplicationProperties.png" style="width: 200px;" /></a>
 </td>
 </tr>
 </tbody>
 </table>
 <p>To actually create the source code, press the button “Generate Source” or hit <code class="kbd docutils literal"><span class="pre">Ctrl-G</span></code>.</p>
-<p>The <strong>generated source</strong> looks like this:</p>
+<p>The <strong>generated source</strong> looks like this (some lines removed at the red lines):</p>
 <table border="1" class="docutils">
 <colgroup>
 <col width="100%" />
@@ -98,8 +98,8 @@
 <p>By default, also boilerplate code for a basic application will be created.
 <br/>
 The Properties could look like these:</p>
-<img alt="wxGlade title" src="_images/Toplevel_App.png" />
-<img alt="wxGlade title" src="_images/Toplevel_Frame.png" />
+<img alt="Application Properties: Name: app, Class: MyApp, Top window: frame" src="_images/Toplevel_App.png" />
+<img alt="Frame Properties: Name: frame, Class: CalculatorFrame" src="_images/Toplevel_Frame.png" />
 <p>The toplevel window will be invoked from the generated application code:</p>
 <div class="highlight-default"><div class="highlight"><pre><span></span><span class="k">class</span> <span class="nc">MyApp</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">App</span><span class="p">):</span>
     <span class="k">def</span> <span class="nf">OnInit</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -121,71 +121,71 @@
 </div>
 <div class="section" id="code-for-windows">
 <h2>Code for Windows<a class="headerlink" href="#code-for-windows" title="Permalink to this headline">¶</a></h2>
-<p>This is the full code for our main window <code class="code docutils literal"><span class="pre">CalculatorFrame</span></code>.</p>
-<p>The code is separated into creation of controls, definition of properties and layout generation:</p>
+<p>This is the full Python code for our main window <code class="code docutils literal"><span class="pre">CalculatorFrame</span></code>:</p>
 <div class="highlight-default"><div class="highlight"><pre><span></span><span class="k">class</span> <span class="nc">CalculatorFrame</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">Frame</span><span class="p">):</span>
     <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kwds</span><span class="p">):</span>
         <span class="c1"># begin wxGlade: CalculatorFrame.__init__</span>
-        <span class="n">kwds</span><span class="p">[</span><span class="s2">&quot;style&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">DEFAULT_FRAME_STYLE</span>
+        <span class="n">kwds</span><span class="p">[</span><span class="s2">&quot;style&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">kwds</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;style&quot;</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span> <span class="o">|</span> <span class="n">wx</span><span class="o">.</span><span class="n">DEFAULT_FRAME_STYLE</span>
         <span class="n">wx</span><span class="o">.</span><span class="n">Frame</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kwds</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">Panel</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">text_value1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">TextCtrl</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">radiobox_operator</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">RadioBox</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">,</span>
-            <span class="n">choices</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;+&quot;</span><span class="p">,</span> <span class="s2">&quot;-&quot;</span><span class="p">,</span> <span class="s2">&quot;*&quot;</span><span class="p">,</span> <span class="s2">&quot;/&quot;</span><span class="p">],</span> <span class="n">majorDimension</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span> <span class="n">style</span><span class="o">=</span><span class="n">wx</span><span class="o">.</span><span class="n">RA_SPECIFY_ROWS</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">text_value2</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">TextCtrl</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">text_result</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">TextCtrl</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">,</span>
-            <span class="n">style</span><span class="o">=</span><span class="n">wx</span><span class="o">.</span><span class="n">TE_MULTILINE</span> <span class="o">|</span> <span class="n">wx</span><span class="o">.</span><span class="n">TE_READONLY</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">btn_execute</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">Button</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Execute&quot;</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">btn_reset</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">Button</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Reset&quot;</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">SetSize</span><span class="p">((</span><span class="mi">400</span><span class="p">,</span> <span class="mi">300</span><span class="p">))</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">SetTitle</span><span class="p">(</span><span class="s2">&quot;Calculator&quot;</span><span class="p">)</span>
 
-        <span class="bp">self</span><span class="o">.</span><span class="n">__set_properties</span><span class="p">()</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">__do_layout</span><span class="p">()</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">notebook_1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">Notebook</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">)</span>
 
-        <span class="c1"># end wxGlade</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">Panel</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">notebook_1</span><span class="o">.</span><span class="n">AddPage</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="s2">&quot;Calculate&quot;</span><span class="p">)</span>
 
-    <span class="k">def</span> <span class="nf">__set_properties</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="c1"># begin wxGlade: CalculatorFrame.__set_properties</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">SetTitle</span><span class="p">(</span><span class="s2">&quot;Calculator&quot;</span><span class="p">)</span>
+        <span class="n">sizer_1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">BoxSizer</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">VERTICAL</span><span class="p">)</span>
+
+        <span class="n">grid_sizer_1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">FlexGridSizer</span><span class="p">(</span><span class="mi">4</span><span class="p">,</span> <span class="mi">2</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+        <span class="n">sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">grid_sizer_1</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+        <span class="n">label_1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">StaticText</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Value 1:&quot;</span><span class="p">)</span>
+        <span class="n">grid_sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">label_1</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALIGN_CENTER_VERTICAL</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">text_value1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">TextCtrl</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
+        <span class="n">grid_sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">text_value1</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+        <span class="n">label_4</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">StaticText</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Operator:&quot;</span><span class="p">)</span>
+        <span class="n">grid_sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">label_4</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALIGN_CENTER_VERTICAL</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">radiobox_operator</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">RadioBox</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">,</span> <span class="n">choices</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;+&quot;</span><span class="p">,</span> <span class="s2">&quot;-&quot;</span><span class="p">,</span> <span class="s2">&quot;*&quot;</span><span class="p">,</span> <span class="s2">&quot;/&quot;</span><span class="p">],</span> <span class="n">majorDimension</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span> <span class="n">style</span><span class="o">=</span><span class="n">wx</span><span class="o">.</span><span class="n">RA_SPECIFY_ROWS</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">radiobox_operator</span><span class="o">.</span><span class="n">SetSelection</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
+        <span class="n">grid_sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">radiobox_operator</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALIGN_CENTER_VERTICAL</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+        <span class="n">label_2</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">StaticText</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Value 2:&quot;</span><span class="p">)</span>
+        <span class="n">grid_sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">label_2</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALIGN_CENTER_VERTICAL</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">text_value2</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">TextCtrl</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
+        <span class="n">grid_sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">text_value2</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+        <span class="n">label_3</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">StaticText</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Result:&quot;</span><span class="p">)</span>
+        <span class="n">grid_sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">label_3</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">text_result</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">TextCtrl</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">text_result</span><span class="o">.</span><span class="n">SetBackgroundColour</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">Colour</span><span class="p">(</span><span class="mi">212</span><span class="p">,</span> <span class="mi">208</span><span class="p">,</span> <span class="mi">200</span><span class="p">))</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">btn_execute</span><span class="o">.</span><span class="n">SetDefault</span><span class="p">()</span>
-        <span class="c1"># end wxGlade</span>
+        <span class="n">grid_sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">text_result</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
 
-    <span class="k">def</span> <span class="nf">__do_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="c1"># begin wxGlade: CalculatorFrame.__do_layout</span>
-        <span class="n">sizer_1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">BoxSizer</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">VERTICAL</span><span class="p">)</span>
-        <span class="n">sizer_2</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">BoxSizer</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">VERTICAL</span><span class="p">)</span>
         <span class="n">sizer_6</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">BoxSizer</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">HORIZONTAL</span><span class="p">)</span>
-        <span class="n">sizer_5</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">BoxSizer</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">HORIZONTAL</span><span class="p">)</span>
-        <span class="n">sizer_4</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">BoxSizer</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">HORIZONTAL</span><span class="p">)</span>
-        <span class="n">sizer_7</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">BoxSizer</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">HORIZONTAL</span><span class="p">)</span>
-        <span class="n">sizer_3</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">BoxSizer</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">HORIZONTAL</span><span class="p">)</span>
-        <span class="n">label_1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">StaticText</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Value 1:&quot;</span><span class="p">)</span>
-        <span class="n">sizer_3</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">label_1</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALIGN_CENTER_VERTICAL</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">sizer_3</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">text_value1</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">sizer_2</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">sizer_3</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">label_4</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">StaticText</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Operator:&quot;</span><span class="p">)</span>
-        <span class="n">sizer_7</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">label_4</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALIGN_CENTER_VERTICAL</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">sizer_7</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">radiobox_operator</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">sizer_2</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">sizer_7</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">label_2</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">StaticText</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Value 2:&quot;</span><span class="p">)</span>
-        <span class="n">sizer_4</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">label_2</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALIGN_CENTER_VERTICAL</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">sizer_4</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">text_value2</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">sizer_2</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">sizer_4</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">static_line_1</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">StaticLine</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">)</span>
-        <span class="n">sizer_2</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">static_line_1</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">BOTTOM</span> <span class="o">|</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span> <span class="o">|</span> <span class="n">wx</span><span class="o">.</span><span class="n">TOP</span><span class="p">,</span> <span class="mi">5</span><span class="p">)</span>
-        <span class="n">label_3</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">StaticText</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Result:&quot;</span><span class="p">)</span>
-        <span class="n">sizer_5</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">label_3</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">sizer_5</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">text_result</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">sizer_2</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">sizer_5</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="n">sizer_6</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">btn_execute</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALL</span><span class="p">,</span> <span class="mi">5</span><span class="p">)</span>
-        <span class="n">sizer_6</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">btn_reset</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALL</span><span class="p">,</span> <span class="mi">5</span><span class="p">)</span>
-        <span class="n">sizer_2</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">sizer_6</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALIGN_CENTER</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="o">.</span><span class="n">SetSizer</span><span class="p">(</span><span class="n">sizer_2</span><span class="p">)</span>
-        <span class="n">sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">panel_1</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">EXPAND</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">SetSizer</span><span class="p">(</span><span class="n">sizer_1</span><span class="p">)</span>
+        <span class="n">sizer_1</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">sizer_6</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALIGN_CENTER_HORIZONTAL</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">button_execute</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">Button</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Execute&quot;</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">button_execute</span><span class="o">.</span><span class="n">SetDefault</span><span class="p">()</span>
+        <span class="n">sizer_6</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">button_execute</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALL</span><span class="p">,</span> <span class="mi">5</span><span class="p">)</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">button_reset</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">Button</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;Reset&quot;</span><span class="p">)</span>
+        <span class="n">sizer_6</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">button_reset</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ALL</span><span class="p">,</span> <span class="mi">5</span><span class="p">)</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">text_log</span> <span class="o">=</span> <span class="n">wx</span><span class="o">.</span><span class="n">TextCtrl</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notebook_1</span><span class="p">,</span> <span class="n">wx</span><span class="o">.</span><span class="n">ID_ANY</span><span class="p">,</span> <span class="s2">&quot;1+1 = 2&quot;</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">text_log</span><span class="o">.</span><span class="n">SetBackgroundColour</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">Colour</span><span class="p">(</span><span class="mi">212</span><span class="p">,</span> <span class="mi">208</span><span class="p">,</span> <span class="mi">200</span><span class="p">))</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">notebook_1</span><span class="o">.</span><span class="n">AddPage</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">text_log</span><span class="p">,</span> <span class="s2">&quot;Log&quot;</span><span class="p">)</span>
+
+        <span class="n">grid_sizer_1</span><span class="o">.</span><span class="n">AddGrowableRow</span><span class="p">(</span><span class="mi">3</span><span class="p">)</span>
+        <span class="n">grid_sizer_1</span><span class="o">.</span><span class="n">AddGrowableCol</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">notebook_1_pane_1</span><span class="o">.</span><span class="n">SetSizer</span><span class="p">(</span><span class="n">sizer_1</span><span class="p">)</span>
+
         <span class="bp">self</span><span class="o">.</span><span class="n">Layout</span><span class="p">()</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">SetSize</span><span class="p">((</span><span class="mi">400</span><span class="p">,</span> <span class="mi">300</span><span class="p">))</span>
         <span class="c1"># end wxGlade</span>
 </pre></div>
 </div>
@@ -278,7 +278,7 @@
 <dl class="docutils">
 <dt>There are two ways to implement functionality for your application:</dt>
 <dd><ul class="first last simple">
-<li>Directly edit the code file()s) written by wxGlade.</li>
+<li>Directly edit the code file(s) written by wxGlade.</li>
 <li>Import the generated module(s) and override class and event handler in your own code files.</li>
 </ul>
 </dd>
@@ -292,7 +292,7 @@
 <col width="100%" />
 </colgroup>
 <tbody valign="top">
-<tr class="row-odd"><td><a class="first last reference internal image-reference" href="_images/Calculator_06_ApplicationKeepUserCode.png"><img alt="Option: Keep User Code" src="_images/Calculator_06_ApplicationKeepUserCode.png" style="width: 200px;" /></a>
+<tr class="row-odd"><td><a class="first last reference internal image-reference" href="_images/Calculator_06_ApplicationKeepUserCode.png"><img alt="Application Properties: Keep User Code checked" src="_images/Calculator_06_ApplicationKeepUserCode.png" style="width: 200px;" /></a>
 </td>
 </tr>
 </tbody>
@@ -370,7 +370,6 @@
 <span class="c1"># -*- coding: UTF-8 -*-</span>
 
 <span class="kn">import</span> <span class="nn">wx</span>
-<span class="kn">import</span> <span class="nn">gettext</span>
 <span class="kn">from</span> <span class="nn">Calculator_GUI</span> <span class="k">import</span> <span class="n">CalculatorFrame</span>
 
 
@@ -405,7 +404,6 @@
 
 
 <span class="k">if</span> <span class="vm">__name__</span> <span class="o">==</span> <span class="s2">&quot;__main__&quot;</span><span class="p">:</span>
-    <span class="n">gettext</span><span class="o">.</span><span class="n">install</span><span class="p">(</span><span class="s2">&quot;app&quot;</span><span class="p">)</span> <span class="c1"># replace with the appropriate catalog name</span>
     <span class="n">app</span> <span class="o">=</span> <span class="n">MyApp</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
     <span class="n">app</span><span class="o">.</span><span class="n">MainLoop</span><span class="p">()</span>
 </pre></div>
@@ -488,8 +486,8 @@
   <p class="topless"><a href="tutorial.html"
                         title="previous chapter">Tutorial Project: Calculator</a></p>
   <h4>Next topic</h4>
-  <p class="topless"><a href="menu_status_tool.html"
-                        title="next chapter">Menu, Status Bar, Tool Bar</a></p>
+  <p class="topless"><a href="dialogs.html"
+                        title="next chapter">Dialogs</a></p>
   <div role="note" aria-label="source link">
     <h3>This Page</h3>
     <ul class="this-page-menu">
@@ -518,12 +516,12 @@
           <a href="genindex.html" title="General Index"
              >index</a></li>
         <li class="right" >
-          <a href="menu_status_tool.html" title="Menu, Status Bar, Tool Bar"
+          <a href="dialogs.html" title="Dialogs"
              >next</a> |</li>
         <li class="right" >
           <a href="tutorial.html" title="Tutorial Project: Calculator"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/tutorial.html wxglade-1.0.1/docs/html/tutorial.html
--- wxglade-0.9.6/docs/html/tutorial.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/tutorial.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Tutorial Project: Calculator &#8212; wxGlade 0.9.5 documentation</title>
+    <title>Tutorial Project: Calculator &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -40,7 +40,7 @@
         <li class="right" >
           <a href="wxbasics.html" title="wx Basics"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -61,28 +61,38 @@
 <li><strong>Add the frame</strong>:<ul>
 <li>click on the Frame icon <img alt="frame" src="_images/frame.png" /> on the “Windows” line of the <em>Palette</em> panels</li>
 <li>as class name, enter <span class="guilabel">CalculatorFrame</span>: <a class="reference internal" href="_images/NewFrame_CalculatorFrame.png"><img alt="New Frame dialog" src="_images/NewFrame_CalculatorFrame.png" style="width: 30px;" /></a></li>
+<li>leave “Add panel and sizer” checked</li>
 </ul>
 </li>
-<li>A frame with a sizer <img alt="sizer" src="_images/sizer.png" /> and one slot is now visible in the <em>Tree</em> view and the <em>Design</em> window
+<li>A frame with a panel and a sizer <img alt="sizer" src="_images/sizer.png" /> with one slot is now visible in the <em>Tree</em> view and the <em>Design</em> window
 (there the slot is visualized by a hatched area)</li>
-<li>It would be possible to place controls directly on the frame, but usually a <strong>panel</strong> is added first, as a frame is really just a frame around the other things. <br/>
-To add the panel:<ul>
-<li>in the <em>Palette</em> of the main window (again on the “Windows” line) click on the Panel icon <img alt="panel" src="_images/panel.png" />
-to start the placement</li>
-<li>in the <em>Tree</em> view or the <em>Design</em> window, click in the slot to place the panel there</li>
+<li>To extend the <strong>vertical box sizer</strong> to six slots:<ul>
+<li>go to the slot in the <em>Tree</em> view or the <em>Design</em> window</li>
+<li>use right mouse click “Add slots” or hit <code class="kbd docutils literal"><span class="pre">Ctrl-Shift-A</span></code></li>
+<li>select <span class="guilabel">5</span> and hit <span class="guilabel">OK</span></li>
+<li>alternatively you may hit <code class="kbd docutils literal"><span class="pre">Ctrl-A</span></code> five times</li>
 </ul>
 </li>
-<li>On the panel we need a <strong>vertical box sizer</strong> with six slots:<ul>
+</ol>
+<ol class="arabic simple" start="6">
+<li>Now add a <strong>horizontal box sizer</strong> to the first slot:<ul>
 <li>in the <em>Palette</em> on the “Sizer” line click on the BoxSizer icon <img alt="sizer" src="_images/sizer.png" /> to start the placement</li>
-<li>in the <em>Tree</em> view or the <em>Design</em> window, click on the panel to place the sizer there</li>
+<li>in the <em>Tree</em> view or the <em>Design</em> window, click on the first slot to place the sizer there</li>
 <li>a dialog will open</li>
-<li>set “Orientation”  to <span class="guilabel">Vertical</span> and the number of slots to <span class="guilabel">6</span>  <a class="reference internal" href="_images/NewSizer_CalculatorVertical.png"><img alt="New Sizer dialog" src="_images/NewSizer_CalculatorVertical.png" style="width: 30px;" /></a></li>
+<li>set “Orientation”  to <span class="guilabel">Horizontal</span> and the number of slots to <span class="guilabel">2</span>  <a class="reference internal" href="_images/NewSizer_CalculatorHorizontal.png"><img alt="New Sizer dialog" src="_images/NewSizer_CalculatorHorizontal.png" style="width: 30px;" /></a></li>
 </ul>
 </li>
-<li>Now add a <strong>horizontal box sizer</strong> to the first slot: do as before, but keep “Orientation” as <span class="guilabel">Horizontal</span>
-and set the number of slots to <span class="guilabel">2</span></li>
-<li>Place a <strong>StaticText</strong> <img alt="static_text" src="_images/static_text.png" /> as label (found on the “Static” line of <em>Palette</em>) in the top left slot and a <strong>TextControl</strong> <img alt="text_ctrl" src="_images/text_ctrl.png" /> (found on the “Inputs” line) in the right</li>
+<li>Place a <strong>StaticText</strong> <img alt="static_text" src="_images/static_text.png" /> as label (found on the “Static” line of <em>Palette</em>) in the top left slot.
+You will be asked to enter a label text. Enter <span class="guilabel">Value 1:</span> for this.</li>
+<li>Place a <strong>TextControl</strong> <img alt="text_ctrl" src="_images/text_ctrl.png" /> (found on the “Inputs” line) in the top right slot</li>
 </ol>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">It would be possible to place sizer and controls directly on the frame, but usually a panel is added first,
+as a frame is really just a frame around the other things. <br/>
+Especially for Windows, always add a panel to have correct background colours and keyboard navigation
+between widgets (using the <code class="kbd docutils literal"><span class="pre">Tab</span></code> key)</p>
+</div>
 </div>
 <div class="section" id="adjust-properties">
 <h3>Adjust properties:<a class="headerlink" href="#adjust-properties" title="Permalink to this headline">¶</a></h3>
@@ -97,19 +107,18 @@
 </tr>
 </tbody>
 </table>
-<p>The label does not yet display anything useful and the window title is not meaningful. <br/>
+<p>The window title is not meaningful. <br/>
 Also, layout and alignment need to be changed, but we’ll change this later on.</p>
 <p><strong>So, some properties of the label and the text need to be modified:</strong></p>
 <ol class="arabic simple">
-<li>Select the label in the <em>Tree</em> view or the <em>Design</em> window.</li>
+<li>Select the frame in the <em>Tree</em> or the <em>Design</em> window.</li>
 <li>If not yet visible, make the <em>Properties</em> notebook of the main window visible by dragging the sashes
 (the separators between the three parts of the main window).</li>
-<li>In the <em>Properties</em> notebook of the main window:<ul>
-<li>Edit the label to display <span class="guilabel">Value 1:</span> by entering this on the editor’s notebook tab “Widget”. <br/>
-(You could also edit the label directly in the <em>Tree</em> window by clicking into the label and/or pressing <code class="kbd docutils literal"><span class="pre">F2</span></code>.)</li>
-</ul>
-</li>
-<li>Select the frame in the <em>Tree</em> and go to <em>Properties -&gt; Widget -&gt; Title</em> and change it from <span class="guilabel">frame</span> to <span class="guilabel">Calculator</span>.</li>
+<li>Go to <em>Properties -&gt; Widget -&gt; Title</em> and change it from <span class="guilabel">frame</span> to <span class="guilabel">Calculator</span>.</li>
+</ol>
+<blockquote>
+<div>(You could also edit the title directly in the <em>Tree</em> window by clicking into the label and/or pressing <code class="kbd docutils literal"><span class="pre">F2</span></code>.)</div></blockquote>
+<ol class="arabic simple" start="4">
 <li>You may want to define a default size for the frame: <br/>
 Go to <em>Properties -&gt; Common -&gt; Size</em> and set it to <span class="guilabel">400,300</span>. <br/>
 Without this, the frame will be created with the minimum possible size to fit all controls.</li>
@@ -152,7 +161,7 @@
 <li>then hit <code class="kbd docutils literal"><span class="pre">Ctrl-V</span></code> (or use the context menu)</li>
 </ul>
 </div></blockquote>
-<p>You may of course copy in the <em>Design</em> window and paste in the <em>Tree</em> or vice versa.</p>
+<p>You may of course copy in the <em>Design</em> window and paste into the <em>Tree</em> or vice versa.</p>
 <ul class="simple">
 <li><strong>Drag &amp; Drop in Design Window:</strong></li>
 </ul>
@@ -183,17 +192,18 @@
 <li>Go to <em>Properties -&gt; Widget</em></li>
 <li>In the section “Style”, enable <span class="guilabel">wxTE_MULTILINE</span> and <span class="guilabel">wxTE_READONLY</span></li>
 <li>Go to <em>Properties -&gt; Common</em></li>
-<li>Click the “…” button right to <span class="guilabel">Background</span> and select grey colour or <br/>
-just enter <span class="guilabel">#d4d0c8</span> into the text control.</li>
+<li>Click the “…” button right to <span class="guilabel">Background</span> and select
+<span class="guilabel">System Colour: wxSYS_COLOUR_BTNFACE</span> or <br/>
+another colour or just enter <span class="guilabel">wxSYS_COLOUR_BTNFACE</span> into the text control.</li>
 </ol>
 </div></blockquote>
 <p>The last step is to have a grey background.
 For single line read-only text controls, this is done automatically by wx, but not with multiple lines.</p>
 <p><strong>In the next steps fill the remaining slots of the main sizer:</strong></p>
 <ul class="simple">
-<li>insert a two-slot horizontal sizer with a label and a radio box into SLOT 2 <img alt="radio_box" src="_images/radio_box.png" /></li>
-<li>place a horizontal line into SLOT 4 <img alt="static_line" src="_images/static_line.png" /></li>
-<li>insert a two-slot horizontal sizer with two buttons into SLOT 6 <img alt="button" src="_images/button.png" /></li>
+<li>insert a two-slot horizontal sizer with a label <span class="guilabel">Operator:</span> and a radio box into SLOT 1 <img alt="radio_box" src="_images/radio_box.png" /></li>
+<li>place a horizontal line into SLOT 3 <img alt="static_line" src="_images/static_line.png" /></li>
+<li>insert a two-slot horizontal sizer with two buttons into SLOT 5 <img alt="button" src="_images/button.png" /></li>
 <li>For the first button, select the checkbox <em>Properties -&gt; Widget -&gt; Default</em>. <br/>
 This will make this button the default one, i.e. when the user hits Enter it will have the same effect as
 pressing this default button.</li>
@@ -234,7 +244,7 @@
 <ul class="simple">
 <li>Set the names of the text controls to <span class="guilabel">text_value1</span>, <span class="guilabel">text_value2</span> and <span class="guilabel">text_result</span>.</li>
 <li>Set the name of the radio box to <span class="guilabel">radiobox_operator</span></li>
-<li>Set the labels to <span class="guilabel">Value 1:</span>, <span class="guilabel">Operator:</span>, <span class="guilabel">Value 2:</span> and <span class="guilabel">Result:</span></li>
+<li>Set the labels to <span class="guilabel">Value 2:</span> and <span class="guilabel">Result:</span></li>
 <li>Set the name of the first button to <span class="guilabel">button_execute</span> and the label to <span class="guilabel">Execute</span>.</li>
 <li>Set the name of the second button to <span class="guilabel">button_reset</span> and the label to <span class="guilabel">Reset</span>.</li>
 </ul>
@@ -278,9 +288,10 @@
 </tbody>
 </table>
 <p>So all elements are there, but the layout is not yet what we want to have:</p>
-<ol class="arabic simple">
-<li>We want the rows with the values, operators and buttons <strong>not to grow vertically</strong>:<ul>
-<li>select one of the horizontal sizers (e.g. <span class="guilabel">sizer_3</span> around <span class="guilabel">Value 1</span>)</li>
+<ol class="arabic">
+<li><p class="first">We want the rows with the values, operators and buttons <strong>not to grow vertically</strong>:</p>
+<ul class="simple">
+<li>select one of the horizontal sizers (e.g. <span class="guilabel">sizer_2</span> around <span class="guilabel">Value 1</span>)</li>
 <li>set <em>Properties -&gt; Layout -&gt; Proportion</em> to <span class="guilabel">0</span></li>
 <li>select the next of the sizers (e.g. around <span class="guilabel">Operator</span>)</li>
 <li>either set <em>Properties -&gt; Layout -&gt; Proportion</em> to <span class="guilabel">0</span>
@@ -288,33 +299,39 @@
 <li>do the same for the remaining sizers (e.g. around <span class="guilabel">Value 2</span> and the buttons)</li>
 </ul>
 </li>
-<li>We want the text controls to <strong>grow horizontally</strong> to fill the available space:<ul>
-<li>select one of the text controls (e.g. text_value1)</li>
+<li><p class="first">We want the text controls to <strong>grow horizontally</strong> to fill the available space:</p>
+<ul class="simple">
+<li>select one of the text controls (e.g. <span class="guilabel">text_value1</span>)</li>
 <li>set <em>Properties -&gt; Layout -&gt; Proportion</em> to <span class="guilabel">1</span></li>
 <li>do the same for the other controls, either by modifying the Proportion properties
 or by hitting <code class="kbd docutils literal"><span class="pre">Ctrl-Y</span></code> to apply the last change to the selected control</li>
 </ul>
 </li>
-<li>The labels <span class="guilabel">Value 1</span>, <span class="guilabel">Operator</span> and <span class="guilabel">Value 2</span> should better
-<strong>align vertically</strong> with their text controls:<ul>
+<li><p class="first">The labels <span class="guilabel">Value 1</span>, <span class="guilabel">Operator</span> and <span class="guilabel">Value 2</span> should better
+<strong>align vertically</strong> with their text controls:</p>
+<ul class="simple">
 <li>select label</li>
 <li>set the checkbox <em>Properties -&gt; Layout -&gt; Alignment -&gt;</em> <span class="guilabel">wxALIGN_CENTER_VERTICAL</span></li>
 <li>do the same for the other two labels</li>
 </ul>
 </li>
-<li>We want the Result text control to <strong>fill the available vertical space</strong>:<ul>
+<li><p class="first">We want the Result text control to <strong>fill the available vertical space</strong>:</p>
+<ul class="simple">
 <li>select text control</li>
 <li>set the checkbox <em>Properties -&gt; Layout -&gt; Alignment -&gt;</em> <span class="guilabel">wxEXPAND</span></li>
 </ul>
 </li>
-<li>We want the buttons at the bottom to be <strong>centered</strong>; so the layout of the sizer around them needs to be set:<ul>
+<li><p class="first">We want the buttons at the bottom to be <strong>centered</strong>; so the layout of the sizer around them needs to be set:</p>
+<ul class="simple">
+<li>select sizer</li>
 <li>go to <em>Properties -&gt; Layout -&gt; Alignment</em></li>
 <li>de-select the checkbox <span class="guilabel">wxEXPAND</span></li>
 <li>select the checkbox <span class="guilabel">wxALIGN_CENTER_HORIZONTAL</span></li>
 </ul>
 </li>
-<li>We want a small <strong>border</strong> above and beyond the horizontal line and around each of the buttons:<ul>
-<li>select the horizontal line</li>
+<li><p class="first">We want a small <strong>border above and beyond</strong> the horizontal line and around each of the buttons:</p>
+<ul class="simple">
+<li>select the horizontal line <span class="guilabel">static_line_1</span></li>
 <li>set <em>Properties -&gt; Layout -&gt; Border</em> to <span class="guilabel">5</span></li>
 <li>uncheck <em>Properties -&gt; Layout -&gt; Border -&gt;</em> <span class="guilabel">wxLEFT</span> and <span class="guilabel">wxRIGHT</span></li>
 <li>select the first button</li>
@@ -322,6 +339,14 @@
 <li>do the same with the second button (e.g. by selecting it and then hitting <code class="kbd docutils literal"><span class="pre">Ctrl-Y</span></code>)</li>
 </ul>
 </li>
+<li><p class="first">We want a small <strong>border around</strong> beyond the pairs of label and value:</p>
+<ul class="simple">
+<li>select the horizontal sizer <span class="guilabel">sizer_2</span> around the first line</li>
+<li>set <em>Properties -&gt; Layout -&gt; Border</em> to <span class="guilabel">4</span></li>
+<li>do the same with the sizers around <span class="guilabel">Operator</span> and <span class="guilabel">Value 2</span></li>
+</ul>
+<p>(e.g. by selecting it and then hitting <code class="kbd docutils literal"><span class="pre">Ctrl-Y</span></code>)</p>
+</li>
 </ol>
 <p>At this point, it’s time for a <strong>preview</strong>: <br/>
 Select “Preview” from the context menu or the main menu or from the <em>Properties</em> notebook when the frame is selected.
@@ -389,70 +414,72 @@
 </div>
 <div class="section" id="part-3-add-a-notebook">
 <h2>Part 3: Add a Notebook<a class="headerlink" href="#part-3-add-a-notebook" title="Permalink to this headline">¶</a></h2>
-<p>For many applications it’s desirable to place the GUI elements on a notebook control. For our calculator e.g. we may want to have the controls on the first page and a log on the second page:</p>
+<p>For many applications it’s desirable to place the GUI elements on a notebook control.
+For our calculator e.g. we may want to have the controls on the first page and a log on the second page:</p>
 <table border="1" class="docutils">
 <colgroup>
 <col width="100%" />
 </colgroup>
 <tbody valign="top">
 <tr class="row-odd"><td><a class="first reference internal image-reference" href="_images/Calculator_Notebook_Design.png"><img alt="Calculator with a notebook: Design Window" src="_images/Calculator_Notebook_Design.png" style="height: 120px;" /></a>
-<a class="reference internal image-reference" href="_images/Calculator_Notebook_Preview.png"><img alt="Calculator with a notebook: Preview, page 2" src="_images/Calculator_Notebook_Preview.png" style="height: 120px;" /></a>
 <a class="last reference internal image-reference" href="_images/Calculator_Notebook_Tree.png"><img alt="Calculator with a notebook: Tree Window" src="_images/Calculator_Notebook_Tree.png" style="height: 120px;" /></a>
 </td>
 </tr>
 </tbody>
 </table>
-<p>A notebook can only be added to an empty sizer slot. In our case, we want to keep the existing controls. So we add a slot to the toplevel sizer, create the notebook there and then move the controls to the first notebook page. After that we delete the empty slot.</p>
-<p><strong>Create a slot for the notebook:</strong></p>
+<p>A notebook can be added to an empty sizer slot or as direct child of a frame, splitter or another notebook.
+In our case, we want to keep the existing controls.
+So we cut the panel sizer, add a notebook and then paste the panel to the first notebook page.</p>
+<p><strong>Cut the toplevel panel:</strong></p>
 <ul class="simple">
-<li>Go to the toplevel sizer and select “Add Slot”:</li>
+<li>Go to the toplevel panel <span class="guilabel">panel_1</span> in the <em>Tree</em> view or the <em>Design</em> window
+and select “Cut” or hit <code class="kbd docutils literal"><span class="pre">Ctrl-X</span></code>:</li>
 </ul>
 <table border="1" class="docutils">
 <colgroup>
 <col width="100%" />
 </colgroup>
 <tbody valign="top">
-<tr class="row-odd"><td><a class="reference internal" href="_images/Calculator_Notebook_AddSlot.png"><img alt="Add Slot for Notebook" src="_images/Calculator_Notebook_AddSlot.png" style="height: 120px;" /></a>
--&gt; the slot will be at the bottom:
-<a class="reference internal" href="_images/Calculator_Notebook_AddedSlot.png"><img alt="Slot for Notebook" src="_images/Calculator_Notebook_AddedSlot.png" style="height: 120px;" /></a>
-<a class="reference internal" href="_images/Calculator_Notebook_AddedSlot_Design.png"><img alt="Slot for Notebook" src="_images/Calculator_Notebook_AddedSlot_Design.png" style="height: 120px;" /></a></td>
+<tr class="row-odd"><td><a class="reference internal" href="_images/Calculator_Notebook_CutPanel.png"><img alt="Right mouse click on panel -&gt; &quot;Cut&quot;" src="_images/Calculator_Notebook_CutPanel.png" style="height: 120px;" /></a></td>
+</tr>
+</tbody>
+</table>
+<p>The panel and it’s children are now on the clipboard and can be pasted back later.
+The frame does not have a child now; this is visualized by an empty slot. Note that in the Tree view
+this <span class="guilabel">SLOT</span> looks different from a sizer slot:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="100%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><a class="reference internal" href="_images/Calculator_Notebook_FrameSlot.png"><img alt="Frame without child, visualized with just an empty SLOT" src="_images/Calculator_Notebook_FrameSlot.png" style="height: 120px;" /></a></td>
 </tr>
 </tbody>
 </table>
 <p><strong>Add a notebook:</strong></p>
 <ul class="simple">
 <li>click on the Notebook icon <img alt="notebook" src="_images/notebook.png" /> in the section “Containers” of the <em>Palette</em> panel to start placing a notebook</li>
-<li>click on the hatched area in the <em>Design</em> window or on the sizer slot <img alt="sizer_slot" src="_images/sizer_slot.png" /> in the <em>Tree</em> control of the
+<li>click on the hatched area in the <em>Design</em> window or on the frame’s slot <a href="#id2"><span class="problematic" id="id3">|frame_slot|</span></a> in the <em>Tree</em> control of the
 main window</li>
-<li>in the dialog, select <span class="guilabel">wxNB_TOP</span> to place the notebook tabs at the top</li>
+<li>in the dialog, select <span class="guilabel">wxNB_TOP</span> to place the notebook tabs at the top;
+keep “Pages” <span class="guilabel">1</span> and uncheck <span class="guilabel">Add panels</span>.</li>
 </ul>
-<p>The newly created notebook will have one page already, which consists of just a panel. It will have a default name like <span class="guilabel">notebook_1_pane_1</span>.</p>
-<p><strong>Fill the first page:</strong></p>
-<p>Move the existing controls to the first notebook page:</p>
+<p>The newly created notebook will have one page already, which does not contain anything.
+It will have a default name like <span class="guilabel">notebook_1_pane_1</span>.</p>
+<p><strong>Paste the panel to the notebook page:</strong></p>
+<blockquote>
+<div><ul class="simple">
+<li>Go to the empty notebook page <span class="guilabel">[notebook_1_pane_1]</span> in the <em>Tree</em> view or the <em>Design</em> window
+and select “Paste” or hit <code class="kbd docutils literal"><span class="pre">Ctrl-V</span></code>:</li>
+</ul>
+</div></blockquote>
+<p>The panel including sizer and all controls is now the first page of the notebook:</p>
 <table border="1" class="docutils">
 <colgroup>
-<col width="50%" />
-<col width="50%" />
+<col width="100%" />
 </colgroup>
 <tbody valign="top">
-<tr class="row-odd"><td><ul class="first last simple">
-<li>drag the containing sizer to the notebook pane <br/>
-(i.e. the panel for the first page) <br/> <br/>
-(alternatively, use Cut &amp; Paste)</li>
-</ul>
-</td>
-<td><a class="reference internal" href="_images/Calculator_Notebook_DragNDrop.png"><img alt="Drag main_sizer to notebook_1_pane_1" src="_images/Calculator_Notebook_DragNDrop.png" style="height: 120px;" /></a></td>
-</tr>
-<tr class="row-even"><td><ul class="first last simple">
-<li>delete the old, empty panel <br/>
-and then the empty slot:</li>
-</ul>
-</td>
-<td><a class="reference internal" href="_images/Calculator_Notebook_DragNDrop_Done.png"><img alt="After dragging main_sizer to notebook_1_pane_1; the original panel is empty now" src="_images/Calculator_Notebook_DragNDrop_Done.png" style="height: 120px;" /></a></td>
-</tr>
-<tr class="row-odd"><td><br/> The <em>Design</em> window should look like this, <br/>
-i.e. it has a notebook, but with only a single page:</td>
-<td><a class="reference internal" href="_images/Calculator_Notebook_DragNDrop_Done_Design.png"><img alt="Design window with single notebook page" src="_images/Calculator_Notebook_DragNDrop_Done_Design.png" style="height: 120px;" /></a></td>
+<tr class="row-odd"><td><a class="reference internal" href="_images/Calculator_Notebook_Pasted.png"><img alt="Calculator_Notebook_Pasted" src="_images/Calculator_Notebook_Pasted.png" style="height: 120px;" /></a></td>
 </tr>
 </tbody>
 </table>
@@ -477,14 +504,40 @@
 </tr>
 </tbody>
 </table>
+<p>Alternatively, you may select “Add Notebook Tab” in the <em>Tree</em> view or the <em>Design</em> window and rename the tabs in
+the <em>Tree</em> view. E.g. by changing <span class="guilabel">[notebook_1_pane_1] panel_1</span> to <span class="guilabel">[Calculator] panel_1</span>.</p>
+<p>Once you are familiar with the <em>Tree</em> view, this is the fastest way.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="100%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><a class="reference internal" href="_images/Calculator_Notebook_Renaming.png"><img alt="Calculator_Notebook_Renaming" src="_images/Calculator_Notebook_Renaming.png" style="height: 120px;" /></a></td>
+</tr>
+<tr class="row-even"><td><a class="reference internal" href="_images/Calculator_Notebook_Adding.png"><img alt="Calculator_Notebook_Adding" src="_images/Calculator_Notebook_Adding.png" style="height: 120px;" /></a></td>
+</tr>
+</tbody>
+</table>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">After adding a page to a notebook, this will contain a panel by default.
+You may delete this if you want e.g. to place a splitter on the page or e.g. a text control that should fill the
+whole page.</p>
+</div>
 <p><strong>Fill the second page:</strong></p>
-<p>You should know how to do this by now:</p>
+<p>There are two ways to place the text control on the second page:</p>
+<ol class="arabic simple">
+<li>Add a single-slot sizer to the notebook page panel. Then place the text control in the sizer slot.</li>
+<li>Remove the panel from the notebook page and add a text control instead.</li>
+</ol>
+<p>Here we will take the second option:</p>
 <ul class="simple">
-<li>add a sizer to the notebook pane (with a single slot)</li>
-<li>add a text control to the sizer slot</li>
-<li>set the layout: a “Proportion” of <span class="guilabel">1</span> and <span class="guilabel">wxEXPAND</span> such that the text control will fill the whole page</li>
+<li>remove the panel (which probably has the name <span class="guilabel">notebook_1_pane_1</span>)</li>
+<li>the empty page will be displayed in the <em>Tree</em> view as <span class="guilabel">PAGE 1</span></li>
+<li>add a text control to <span class="guilabel">PAGE 1</span></li>
 <li>set the widget style to <span class="guilabel">wxTE_MULTILINE</span> and <span class="guilabel">wxTE_READONLY</span></li>
-<li>set the widget background color to <span class="guilabel">#d4d0c8</span></li>
+<li>set the widget background color to <span class="guilabel">wxSYS_COLOUR_BTNFACE</span></li>
+<li>rename to <span class="guilabel">text_log</span></li>
 </ul>
 <p>This file can be found in the folder <code class="docutils literal"><span class="pre">wxglade/examples/Calculator</span></code>:
 <a class="reference external" href="../../examples/Calculator/Calculator-04-Notebook.wxg">Calculator-04-Notebook.wxg</a></p>
@@ -509,7 +562,8 @@
 <td><a class="reference internal" href="_images/Calculator_Spacers_Design0.png"><img alt="Calculator with empty slots for spacers" src="_images/Calculator_Spacers_Design0.png" style="width: 180px;" /></a></td>
 </tr>
 <tr class="row-even"><td><ul class="first last simple">
-<li>insert spacers into these slots <br/> (e.g. with “Width” <span class="guilabel">20</span> and “Height” <span class="guilabel">0</span>)</li>
+<li>insert spacers <img alt="spacer" src="_images/spacer.png" /> into these slots <br/> (e.g. with “Width” <span class="guilabel">20</span> and
+“Height” <span class="guilabel">20</span>)</li>
 <li>set “Proportion” to <span class="guilabel">1</span> <br/>
 to make them grow</li>
 </ul>
@@ -523,10 +577,10 @@
 the settings to make the spacers grow:</td>
 <td><a class="reference internal" href="_images/Calculator_Spacers_Properties.png"><img alt="Spacer Properties" src="_images/Calculator_Spacers_Properties.png" style="width: 180px;" /></a></td>
 </tr>
-<tr class="row-odd"><td>As the spacers have a height of 0, you will not see them in the design window. <br/> <br/>
-If you don’t like this, you may actually set the “Height” property to a different value and
-maybe even set <span class="guilabel">EXPAND</span>. For the actual window this will not make a difference,
-as the spacers are invisible, but the spacers will be visible in the <em>Design</em> window:</td>
+<tr class="row-odd"><td>As the spacers have a height of <span class="guilabel">20</span>, they’re now looking a bit odd in the <em>Design</em> window. <br/>
+You may want to make them disappear by setting the theight to <span class="guilabel">0</span> or to fill the available space
+by checking <span class="guilabel">EXPAND</span>. <br/>
+For the actual window this will not make a difference in this case.</td>
 <td><a class="reference internal" href="_images/Calculator_Spacers2.png"><img alt="One spacer with height 10 and one with 20" src="_images/Calculator_Spacers2.png" style="width: 180px;" /></a></td>
 </tr>
 </tbody>
@@ -548,7 +602,7 @@
 <li><em>GridBagSizer</em>: a grid that allows items to span multiple rows or columns. <br/>
 The editing logic is a bit different from the other sizers.</li>
 </ul>
-<p>For our calculator we need the FlexGridSizer as the first column is fixed and the second column should grow.
+<p>For our calculator we need the <em>FlexGridSizer</em> as the first column is fixed and the second column should grow.
 The result will look like this:</p>
 <table border="1" class="docutils">
 <colgroup>
@@ -565,16 +619,16 @@
 if your current file is too different, e.g. because you did not complete Part 4 above.)</p>
 <ul class="simple">
 <li>Insert/add a slot to the vertical sizer inside the notebook and panel: <br/>
-<a class="reference internal" href="_images/Calculator_GridSizer_InsertSlot.png"><img alt="InsertSlot into vertical sizer" src="_images/Calculator_GridSizer_InsertSlot.png" style="height: 80px;" /></a></li>
+<a class="reference internal" href="_images/Calculator_GridSizer_InsertSlot.png"><img alt="InsertSlot into vertical sizer: right mouse click on sizer XXX" src="_images/Calculator_GridSizer_InsertSlot.png" style="height: 80px;" /></a></li>
 <li>Add a GridSizer <img alt="grid_sizer" src="_images/grid_sizer.png" /> to this slot</li>
 <li>In the grid sizer dialog, select <span class="guilabel">FlexGrid</span>, <span class="guilabel">4</span> rows and <span class="guilabel">2</span> cols: <br/>
 <a class="reference internal" href="_images/FlexGridSizerDlg.png"><img alt="FlexGridSizer Dialog" src="_images/FlexGridSizerDlg.png" style="height: 80px;" /></a></li>
-<li>Move the labels and controls to the slots of the newly created sizer</li>
-<li>Delete the old sizer</li>
+<li>Move the labels and controls to the slots of the newly created sizer.</li>
+<li>Delete the old sizers and spacers.</li>
 <li>In <em>Properties -&gt; Grid</em>: make column 2 and row 4 growable: <br/>
 <a class="reference internal" href="_images/FlexGridSizer_Properties.png"><img alt="FlexGridSizer Properties" src="_images/FlexGridSizer_Properties.png" style="height: 80px;" /></a></li>
 <li>To make the text controls <span class="guilabel">text_value1</span> and <span class="guilabel">text_value2</span> actually fill the growable column: <br/>
-activate <em>Properties -&gt; Layout -&gt; Alignment -&gt;</em> <span class="guilabel">wxEXPAND</span> for both of them</li>
+activate <em>Properties -&gt; Layout -&gt; Alignment -&gt;</em> <span class="guilabel">wxEXPAND</span> for both of them.</li>
 </ul>
 <p>The logic with <span class="guilabel">wxEXPAND</span> is a bit different than with non-grid sizers.
 If it is active, the control will grow horizontally and vertically.
@@ -605,6 +659,17 @@
 </li>
 </ul>
 </div></blockquote>
+<p>Please keep in mind how to create a good structure:</p>
+<blockquote>
+<div><ul class="simple">
+<li>Always use the simplest available sizers.
+Usually you will need mainly box sizers and maybe one or two FlexGridSizers.</li>
+<li>Use nested sizers to match the hierarchical / logical structure of your project. This will make it easy
+to re-arrange things to find the best user interface.</li>
+<li>Never ever try to use a grid sizer as main sizer of a window trying to resemble pixel placement or
+Tkinter’s grid geometry manager. This is a mess to create and maintain.</li>
+</ul>
+</div></blockquote>
 </div>
 <div class="section" id="next-steps">
 <h2>Next steps<a class="headerlink" href="#next-steps" title="Permalink to this headline">¶</a></h2>
@@ -690,7 +755,7 @@
         <li class="right" >
           <a href="wxbasics.html" title="wx Basics"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/html/wxbasics.html wxglade-1.0.1/docs/html/wxbasics.html
--- wxglade-0.9.6/docs/html/wxbasics.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/html/wxbasics.html	2020-12-31 14:04:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>wx Basics &#8212; wxGlade 0.9.5 documentation</title>
+    <title>wx Basics &#8212; wxGlade 1.0.0 documentation</title>
     <link rel="stylesheet" href="_static/classic.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.9.5',
+        VERSION:     '1.0.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -25,7 +25,7 @@
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
     <link rel="next" title="Tutorial Project: Calculator" href="tutorial.html" />
-    <link rel="prev" title="wxGlade Overview" href="intro.html" /> 
+    <link rel="prev" title="wxGlade Overview and Quick Start" href="intro.html" /> 
   </head>
   <body>
     <div class="related" role="navigation" aria-label="related navigation">
@@ -38,9 +38,9 @@
           <a href="tutorial.html" title="Tutorial Project: Calculator"
              accesskey="N">next</a> |</li>
         <li class="right" >
-          <a href="intro.html" title="wxGlade Overview"
+          <a href="intro.html" title="wxGlade Overview and Quick Start"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -58,6 +58,7 @@
 <dt>You may want to visit these pages for more information:</dt>
 <dd><ul class="first last simple">
 <li>The wxPython home page: <a class="reference external" href="https://wxpython.org/">https://wxpython.org/</a></li>
+<li>The <strong>wxPython API</strong> documentation: <a class="reference external" href="https://docs.wxpython.org/">https://docs.wxpython.org/</a></li>
 <li>An overview including a <cite>Hello World</cite> application example: <a class="reference external" href="https://wxpython.org/pages/overview/">https://wxpython.org/pages/overview/</a></li>
 <li>A more comprehensive <cite>Getting Started</cite> guide: <a class="reference external" href="https://wiki.wxpython.org/Getting%20Started">https://wiki.wxpython.org/Getting%20Started</a></li>
 <li>The wxWidgets home page: <a class="reference external" href="https://www.wxwidgets.org/">https://www.wxwidgets.org/</a></li>
@@ -67,15 +68,25 @@
 <p>The wxGlade documentation is intended to be readable without previous wx knowledge.
 It will teach you how to create windows, handle events and how to integrate with your ‘business logic’ code.
 Sooner or later you will have to look into the wx documentation, though.</p>
+<p>If you are new to wx/Python, make sure that you work through this documentation at least up to and including section
+“Create and Use Source Code”.</p>
+<p>Also please note that the <strong>wxPython demo</strong> is probably most important resource for exploring the available controls!
+The demo has examples and example code for most widgets, including the more complicated and powerful ones like the
+grid control.</p>
+<p>If you don’t have the demo, have a look here: <a class="reference external" href="https://extras.wxpython.org/wxPython4/extras/">https://extras.wxpython.org/wxPython4/extras/</a> <br/>
+Go to the subdirectory matching your wxPython version and download the demo archive. <br/>
+Then unpack the archive and run <code class="docutils literal"><span class="pre">demo.py</span></code>.</p>
 </div>
 <div class="section" id="sizers-layout-managers">
 <h2>Sizers (Layout Managers)<a class="headerlink" href="#sizers-layout-managers" title="Permalink to this headline">¶</a></h2>
 <dl class="docutils">
-<dt>With wxWidgets/wxPython and similar toolkits, usually controls are not placed at pixel positions on their windows, but the layout of a window is managed by <em>sizers</em>.</dt>
+<dt>With wxWidgets / wxPython and similar toolkits, usually controls are not placed at pixel positions on their windows, but the layout of a window is managed by <em>sizers</em>.</dt>
 <dd><ul class="first last simple">
 <li>There are <em>horizontal box sizers</em>, <em>vertical box sizers</em> and <em>grid sizers</em>.</li>
 <li>The <em>box sizers</em> may have a label and a box around them. In that case they’re called <em>static box sizers</em>.</li>
 <li>Each sizer and contained sizer items can be fixed size or grow to fill the available space, e.g. when the window is resized.</li>
+<li>Typically in a main window or frame the sizer makes the contents fill the available space, while dialogs will
+be sized to the minimum required space.</li>
 </ul>
 </dd>
 </dl>
@@ -200,7 +211,9 @@
 </tr>
 </tbody>
 </table>
-<p>This window is managed by <font color="green"> <strong>one vertical box sizer with six slots</strong> </font> for the five rows, plus a horizontal line and five <font color="blue"> <strong>horizontal box sizers</strong> </font> for the horizontally arranged controls they contain (e.g. one label and one button):</p>
+<p>This window is managed by <font color="green"> <strong>one vertical box sizer with six slots</strong> </font> for the five rows,
+plus a horizontal line and five <font color="blue"> <strong>horizontal box sizers</strong> </font> for the horizontally arranged controls
+they contain (i.e. label plus text control, label plus radio box or button plus button):</p>
 <table border="1" class="docutils align-center">
 <colgroup>
 <col width="50%" />
@@ -214,8 +227,9 @@
 The inputs for Value 1 and 2 are set to grow horizontally;
 the Result output is growing horizontally and EXPANDing vertically.</td>
 <td>In the <em>Tree</em> window, you can see the hierarchical structure: <br/>
-<a class="reference internal" href="_images/Calculator_06_tree.png"><img alt="Calculator_06_tree" class="align-middle" src="_images/Calculator_06_tree.png" style="width: 200px;" /></a> <br/>
-Note that horizontal and vertical sizers are <br/> visualized with different icons: <img alt="sizer_h" src="_images/sizer_h.png" /> <img alt="sizer" src="_images/sizer.png" /> .</td>
+<a class="reference internal" href="_images/Calculator_06_tree.png"><img alt="Calculator_06_tree" class="align-middle" src="_images/Calculator_06_tree.png" style="width: 200px;" /></a> <br/> <br/>
+Note that <font color="blue"> horizontal </font> and <font color="green"> vertical </font> sizers are <br/>
+visualized with different icons: <img alt="sizer_h" src="_images/sizer_h.png" /> <img alt="sizer" src="_images/sizer.png" /> .</td>
 </tr>
 </tbody>
 </table>
@@ -227,24 +241,12 @@
 Usually you will need mainly box sizers and maybe one or two FlexGridSizers.</li>
 <li>Use nested sizers to match the hierarchical / logical structure of your project. This will make it easy
 to re-arrange things to find the best user interface.</li>
-<li>Never ever try to use a GridBagSizer as main sizer of a window trying to resemble pixel placement or
+<li><strong>Never ever try to use a Grid(Bag)Sizer as main sizer</strong> of a window trying to resemble pixel placement or
 Tkinter’s grid geometry manager. This is a mess to create and maintain.
-Actually, a GridBagSizer is almost never needed.</li>
+Actually, a GridBagSizer is rarely needed.</li>
 </ul>
 </div>
 </div>
-<div class="section" id="wxglade-requirements-and-restrictions">
-<h3>wxGlade Requirements and Restrictions<a class="headerlink" href="#wxglade-requirements-and-restrictions" title="Permalink to this headline">¶</a></h3>
-<p>The user interface and internal data structures of wxGlade impose some restrictions on the structure of a window.
-A frame or panel cannnot have a widget as direct child. They always need a toplevel sizer first. So don’t be surprised to see constructions like these:</p>
-<blockquote>
-<div><ul class="simple">
-<li>frame -&gt; sizer with single slot -&gt; panel -&gt; sizer ….</li>
-<li>frame -&gt; sizer with single slot -&gt; notebook -&gt; …</li>
-</ul>
-</div></blockquote>
-<p>On the other hand, a notebook or a splitter can have widgets as direct children.</p>
-</div>
 </div>
 </div>
 
@@ -264,7 +266,6 @@
 <li><a class="reference internal" href="#sizers-layout-managers">Sizers (Layout Managers)</a><ul>
 <li><a class="reference internal" href="#sizer-examples">Sizer Examples</a></li>
 <li><a class="reference internal" href="#example-application-calculator-window">Example application: Calculator window</a></li>
-<li><a class="reference internal" href="#wxglade-requirements-and-restrictions">wxGlade Requirements and Restrictions</a></li>
 </ul>
 </li>
 </ul>
@@ -273,7 +274,7 @@
 
   <h4>Previous topic</h4>
   <p class="topless"><a href="intro.html"
-                        title="previous chapter">wxGlade Overview</a></p>
+                        title="previous chapter">wxGlade Overview and Quick Start</a></p>
   <h4>Next topic</h4>
   <p class="topless"><a href="tutorial.html"
                         title="next chapter">Tutorial Project: Calculator</a></p>
@@ -308,9 +309,9 @@
           <a href="tutorial.html" title="Tutorial Project: Calculator"
              >next</a> |</li>
         <li class="right" >
-          <a href="intro.html" title="wxGlade Overview"
+          <a href="intro.html" title="wxGlade Overview and Quick Start"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 0.9.5 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="index.html">wxGlade 1.0.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
diff -Nru wxglade-0.9.6/docs/Todo.txt wxglade-1.0.1/docs/Todo.txt
--- wxglade-0.9.6/docs/Todo.txt	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs/Todo.txt	2020-12-31 14:04:48.000000000 +0000
@@ -1,18 +1,26 @@
 
 User Interface:
- * better icons for GridSizers and grid sizer slots (3x3)
- * multiple selections in Tree window -> allow editing properties for multiple widgets at the same time
- * support events from the base classes and the addition of any event as text (-> rev. 1.0)
- * implement undo/re-do; use this for GUI scripting (testing)
- * better avoid overlapping / invisible design window; maybe do the same for the main windows
+ * easy selection of events from the base classes (-> rev. 1.1)
+ * implement undo/re-do; use this for GUI scripting (testing) (-> rev. 1.1)
+ * better avoid overlapping / invisible design window; same for dialogs with "Pin"
  * code properties: use stc and resize dynamically (-> rev. 1.0)
- * toolbar and maybe menu editor: add Drop target for images (-> rev. 1.0)
- * grid properties: implement validation in 'on_cell_changing'
  * Frame, Notebook, Calendar: re-create on style change, depending on changed flags and platform
    e.g. on MacOS and GTK the main Frame styles can't be modified (see patch_recreate.txt)
+ * remove config.preferences.show_progress and always show ProgressDialog?
+ * add DirPicker for output path selection
+Not by me, but maybe someone contributes:
+ * toolbar and maybe menu editor: add Drop target for images (-> rev. 1.0)
  * add a template manager for (custom) widgets or complete parts of a design?
- * remove config.preferences.show_progress and always show ProgressDialog
 done:
+ * better icons for GridSizers and grid sizer slots (3x3); merged cells for GridBagSizer
+ * grid properties: implement validation in 'on_cell_changing'
+ * allow dropping of bitmaps onto slots
+ * allow the addition of any event as text
+ * allow re-ordering toplevel windows by drag and drop
+ * better accessibility for palete, grid properties and other property editors
+ * pasting of menu and tool bars to/from application and frame
+ * when Layout-Expand inside a grid sizer is checked -> add dialog to report and make growable
+ * flex grid sizers: add menu items for growable row/col
  * Notebook: add context menu entries 'add page' / 'remove page'
  * Splitter: ask user whether to add panels
  * flush properties before saving
@@ -23,15 +31,19 @@
  * use Freeze/Thaw on updates
  * grid property editors: support clipboard
 probably not:
+ * multiple selections in Tree window -> allow editing properties for multiple widgets at the same time
  * change the user interface towards ribbons, property grid and a single frame instead of separate windows?
  * alternatively, use WrapSizer for the Palette window (-> rev. 0.9)
 
 
 Code generation:
- * improve readability of the generated code (-> rev. 1.0)
- * better integrate automatic and user generated code (-> rev. 1.0)
- * Code (property): read user code from file?
-done:
+ * better integrate automatic and user generated code (-> rev. 1.1)
+Contribution required:
+ * C++ dynamic event binding:  https://docs.wxwidgets.org/3.0/overview_events.html#overview_events_bind
+done:
+ * generate code sizer.Fit(frame) for toplevel frames without size property and frame->panel->sizer
+ * make C++ event handlers virtual void again
+ * improve readability of the generated code
  * option to switch off code generation random facts like: "# generated by wxGlade 0.6.8"
  * option to remove all the BEGIN/END wxGlade comments in the generated code (only with overwrite True)
  * refactor code generation (direct generation instead of XML parser)
@@ -39,7 +51,10 @@
  * Code property: split into global, local/private and post-init
  * Python: allow lambda functions as event handlers
 probably not:
- * add a preview tab for the generated code? (-> no)
+ * refactor xrc_codegen.py to write XRC directly, not via separate hierarchy of XrcObjects
+   (only if someone else will do it)
+ * add a preview tab for the generated code? (no, what would be the use case?)
+ * Code (property): read user code from file?
 
 
 File Format:
@@ -49,20 +64,20 @@
 
 
 Internal:
+ * use the History instead of the logging facilities
+ * add more test cases for editing
+done:
+ * simplified error handling for code generation
  * separate items and tree
  * use a structure of EditBase instances as main data structure; use tree only for the representation
-   then remove workaround changeset 2840 (9c2a9ce615f7) again
- * move Tree.names[tplevel_node] to the toplevel items
+ * use consistent names
+    editor, parent, child: EditBase instances; with parent and children[...] attributes
+                           (some methods still have 'widget' in their name)
+    widget: actual wx Widgets
+    item: TreeCtrl items
+ * use .children for all, including a sizer; drop virtual_sizer, just keep children in .children
  * attributes for all elements (upper or lower case?): IS_ROOT, IS_SIZER, IS_VIRTUAL, IS_GRIDBAG, IS_SLOT,
    IS_TOPLEVEL, IS_TOPLEVEL_WINDOW, CAN_PREVIEW?, WX_CLASS?
- * use consistent names? e.g.:
-    node: tree nodes
-    item: EditBase instances; with parent and children[...] attributes
-    widget: actual wx Widgets
-  * use .children for all, including a sizer
-    use .virtual_sizer for e.g. Splitter and Notebook, but keep the actual children in .children
- * use the History instead of the logging facilities
-done:
  * refactor edit_sizers and ManagedBase
  * refactor Property handling
 
@@ -71,33 +86,42 @@
 
 
 Widgets:
-done:
+ * StaticBoxSizer: add font property; use StaticBox for Design window and set font if the user changes it
+   when font is active, generate code using StaticBox
+ * ToolBar: optional (attribute) names
+ * ToolBar: support adding controls; TOOL_STYLE_BUTTON, TOOL_STYLE_SEPARATOR, TOOL_STYLE_CONTROL
+ * StaticBitmap: support wxGenericStaticBitmap once it supports SetScaleMode
+ * wxBitmapComboBox
+done:
+ * Dialog: support SetAffirmativeId, SetEscapeId
+ * add wxRESERVE_SPACE_EVEN_IF_HIDDEN for managed widgets
+ * MenuBar: don't create widget on Mac OS
  * Panel: use ScrolledWindow only when "Scrolled" is checked
 
+
 Additional Widgets:
- * lib.buttons (feature request #45 Add support for generic buttons) (-> rev. 1.0)
+ * lib.buttons (feature request #45 Add support for generic buttons) (-> rev. 1.1)
  * stc.StyledTextCtrl
  * MediaCtrl?
  * ColourPickerCtrl, FontPickerCtrl?
  * FilePickerCtrl, DirPickerCtrl?
- * Simplebook, Choicebook
+ * Simplebook, Choicebook (example for Simplebook is supplied already)
  * ListBook, CheckListBox?
  * FoldPanelBar, AGWInfoBar?
  * LedBarGraph?
 done:
+ * StdDialogButtonSizer
  * GridBagSizer
  * WrapSizer
  * SpinCtrlDouble
  * SearchCtrl
 probably not:
- * StdDialogButtonSizer
  * Ribbons
  * matplotlib (example is supplied already)
  * Py (shell) (example is supplied already)
  * html2 (example is supplied already)
 
 
-
 Bitmaps:
  * better user interface (popup dialog?)
 done:
@@ -107,6 +131,7 @@
 
 
 Widget properties etc.:
+ * all: support SetMinSize / SetMaxSize
  * RadioBox: tooltips per button
 done:
  * StaticText: Wrap
@@ -117,7 +142,16 @@
  * better dialog code
 
 
+Documentation:
+ * add structure examples (e.g. Panel as own class, Instance Class)
+done:
+ * update for 1.0 (one window, no sizers between Frame and Panel)
+ * add Dialog documentation
+ * Note "Repeat and Re-do"
+
+
 Development process:
+done:
  * move to GitHub
 
 
diff -Nru wxglade-0.9.6/docs_old/BuildingInstaller.txt wxglade-1.0.1/docs_old/BuildingInstaller.txt
--- wxglade-0.9.6/docs_old/BuildingInstaller.txt	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/BuildingInstaller.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-Building a wxGlade Installer HOWTO
-----------------------------------
-
-Alberto Griggio  2007/04/20
-Carsten Grohmann 2015/08/04
-
-1. Setup PyInstaller
---------------------
-
-Install the current version of PyInstaller from http://www.pyinstaller.org.
-Follow the instruction published at PyInstallers homepage.
-
-This procedure is tested using PyInstaller versions 2.1
-
-Check if pyinstaller well configured
-Type:
-pyinstaller --version
-
-The result should be 2.n
-
-2. Generate an executable
--------------------------
-
-- Open a command prompt and change into source base directory
-
-- To generate the version file "version.py" manually with content below:
-  #
-  # This is an automatically generated file. Manual changes will be
-  # overwritten without warning.
-  #
-
-  __version__ = "<release version>"
-
-- Generate binary for standalone edition
-  Type:
-  install\pyinstaller\build.bat
-
-  If everything works, you should now have two new subdirectories
-  "build" and "dist".
-
-- Now you should have a working executable in "dist/bdist", called
-  "wxglade.exe".
-
-  If it works, you can move on to the next step
-
-3. Generate an installer
-------------------------
-
-- Download and install Inno Setup from here:
-  http://www.jrsoftware.org/isinfo.php
-
-- To create the installer for the Standalone Edition open
-  "wxglade-SAE-installer.iss" with Inno Setup and run it.
-
-- To create the regular installer open "wxglade-installer.iss" with Inno
-  Setup and run it.
-
-- If everything works, you should have the installer executables in the
-  "dist" directory. "wxGlade-SAE-<version>-setup.exe" is the installer of the
-  Standalone Edition. And "wxGlade-<version>-setup.exe" is the regular
-  installer.
-
-- All done!
diff -Nru wxglade-0.9.6/docs_old/html/abbreviations.html wxglade-1.0.1/docs_old/html/abbreviations.html
--- wxglade-0.9.6/docs_old/html/abbreviations.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/abbreviations.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Appendix A. Glossary of Terms, Abbreviations, and Acronyms</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="incomplete_and_outdated.html" title="Incomplete and outdated parts"><link rel="next" href="copyright.html" title="Appendix B. Copyrights, Licenses and Trademarks"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix A. Glossary of Terms, Abbreviations, and Acronyms</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="incomplete_and_outdated.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="copyright.html">Next</a></td></tr></table><hr></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a name="abbreviations"></a>Appendix A. Glossary of Terms, Abbreviations, and Acronyms</h1></div></div></div><p>The following abbreviations are used in this manual: </p><div class="variablelist"><dl class="variablelist"><dt><span class="term">API</span></dt><dd><p>Application Programming Interface</p><p>It's a standardized implementation-independent programming
-            interface.</p></dd><dt><span class="term">Escape sequence</span></dt><dd><p>Escape sequences are used to define certain special
-            characters within string literals. Escape sequences starts mostly
-            with a backslash (<span class="quote">“<span class="quote">\</span>”</span>).</p></dd><dt><span class="term">gettext</span></dt><dd><p>Widespread internationalisation (i18n) and localisation
-            system.</p></dd><dt><span class="term"><span class="emphasis"><em>GUI</em></span></span></dt><dd><p>Graphical User Interface</p></dd><dt><span class="term">i18n</span></dt><dd><p>Numeronym for internationalisation support.</p><p>Internationalisation means adapting software to different
-            languages, regional differences, ...</p></dd><dt><span class="term">Managed Widget</span></dt><dd><p>Normal widget with a parent object</p></dd><dt><span class="term">Non-Managed Widget</span></dt><dd><p>Synonym for lop-level widget</p></dd><dt><span class="term"><span class="emphasis"><em>OS</em></span></span></dt><dd><p>Operating system</p></dd><dt><span class="term">OS X</span></dt><dd><p>is a graphical UNIX operating system developed by Apple Inc.
-            OS X is certified by The Open Group.</p></dd><dt><span class="term">Python</span></dt><dd><p>Python is a general-purpose, high-level programming
-            language.</p></dd><dt><span class="term">SAE</span></dt><dd><p>Standalone Edition</p></dd><dt><span class="term">Top-level widget</span></dt><dd><p>Top-level widgets like <code class="classname">wxFrame</code> or
-            <code class="classname">wxDialog</code> don't have a parent object.</p></dd><dt><span class="term">Unix</span></dt><dd><p>is a multitasking, multi-user operation system. Today the
-            trademark <span class="quote">“<span class="quote">UNIX</span>”</span> is owned by The Open Group.
-            Operating systems complaint with <span class="quote">“<span class="quote">Single UNIX
-            Specification</span>”</span> and certified by The Open Group are called
-            <span class="quote">“<span class="quote">UNIX</span>”</span>.</p><p>Unix-like operating systems behaves similar to
-            <span class="quote">“<span class="quote">UNIX</span>”</span> operating systems. They are not certified by
-            The Open Group.</p><p>This document use the term <span class="quote">“<span class="quote">Unix</span>”</span> for certified
-            <span class="quote">“<span class="quote">UNIX</span>”</span> operating systems as well as
-            <span class="quote">“<span class="quote">Unix-like</span>”</span> operating systems. Linux is an Unix-like
-            operating system.</p></dd><dt><span class="term">UTF-8</span></dt><dd><p>Universal Character Set Transformation Format - 8-bit</p><p>Character encoding with the capability to encode all
-            possible characters</p></dd><dt><span class="term">wxg</span></dt><dd><p>File extension used by wxGlade to store the design / project
-            in a XML file.</p></dd><dt><span class="term"><span class="emphasis"><em>wx</em></span></span></dt><dd><p>abbreviation for <acronym class="acronym">wxWidgets</acronym></p></dd><dt><span class="term">wxPython</span></dt><dd><p>is a wrapper for wxWidgets of the Python programming
-            language.</p></dd><dt><span class="term">wxWidgets</span></dt><dd><p>wxWidgets a widget toolkit and tools library for creating
-            graphical user interfaces (GUIs) for cross-platform
-            applications.</p><p>wxWidgets is open source and written in C++.</p></dd><dt><span class="term"><span class="emphasis"><em>WYSIWYG</em></span></span></dt><dd><p>What You See Is What You Get.</p></dd><dt><span class="term"><span class="emphasis"><em>X11</em></span></span></dt><dd><p>The X Window System version 11.</p></dd><dt><span class="term">XRC</span></dt><dd><p>XML-based system for describing wxWidgets resources like
-            dialogs, menus or toolbars.</p><p>Those resources are loaded into the application at
-            run-time.</p></dd></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="incomplete_and_outdated.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="copyright.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Incomplete and outdated parts </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix B. Copyrights, Licenses and Trademarks</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/codegen_bitmap_path.html wxglade-1.0.1/docs_old/html/codegen_bitmap_path.html
--- wxglade-0.9.6/docs_old/html/codegen_bitmap_path.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/codegen_bitmap_path.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Specifying the Path of Bitmaps</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="supported_widgets.html" title="Chapter 6. Supported widgets"><link rel="prev" href="supported_widgets.html" title="Chapter 6. Supported widgets"><link rel="next" href="star_bars.html" title="Menubar, Statusbar and Toolbar"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Specifying the Path of Bitmaps</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="supported_widgets.html">Prev</a> </td><th width="60%" align="center">Chapter 6. Supported widgets</th><td width="20%" align="right"> <a accesskey="n" href="star_bars.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="codegen_bitmap_path"></a>Specifying the Path of Bitmaps</h2></div></div></div><p>You need to specify a bitmap in some widgets. This can be done in
-      several ways:</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191127424"></a>Bitmap Path</h3></div></div></div><p>Specify the path to the bitmap file.</p><p>Usually you can type an absolute path in a text box or browse
-        for a bitmap with a file dialog.</p><div class="example"><a name="idm139900191125904"></a><p class="title"><b>Example 6.1. <code class="classname">wxBitmap</code> object with the typed string
-          as bitmap path</b></p><div class="example-contents"><p>Input:</p><p><strong class="userinput"><code>/usr/share/icons/application.png</code></strong></p><p>produces in C++:</p><pre class="programlisting">wxBitmap("/usr/share/icons/application.png", wxBITMAP_TYPE_ANY)</pre></div></div><br class="example-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191122288"></a>statement <span class="quote">“<span class="quote"><code class="code">var:</code></span>”</span></h3></div></div></div><p>Syntax: <span class="emphasis"><em>var:&lt;variable name&gt;</em></span></p><p>You can enter a variable name using the
-        <span class="emphasis"><em>var:</em></span> tag in the text box. In Perl code generation
-        a <span class="quote">“<span class="quote">$</span>”</span> sign is added if you omit it.</p><div class="example"><a name="idm139900191119392"></a><p class="title"><b>Example 6.2. <code class="classname">wxBitmap</code> object with the variable name
-          as bitmap path</b></p><div class="example-contents"><p>Input:</p><p><strong class="userinput"><code>var:my_bitmap_path</code></strong></p><p>produces in C++:</p><pre class="programlisting">wxBitmap(my_bitmap_path, wxBITMAP_TYPE_ANY)</pre></div></div><br class="example-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191115856"></a>statement <span class="quote">“<span class="quote"><code class="code">empty:</code></span>”</span></h3></div></div></div><p>Syntax:
-        <span class="emphasis"><em>empty:&lt;width&gt;,&lt;height&gt;</em></span></p><p>Creates an empty bitmap of the specified size. It's recommended
-        to use a minimal size of 1, 1.</p><div class="example"><a name="idm139900191113696"></a><p class="title"><b>Example 6.3. Create an empty <code class="classname">wxBitmap</code> with width of
-          32 and height of 32</b></p><div class="example-contents"><p>Input:</p><p><strong class="userinput"><code>empty:32,32</code></strong></p><p>produces in Python:</p><pre class="programlisting">wx.EmptyBitmap(32, 32)</pre><p>produces in C++:</p><pre class="programlisting">wxBitmap(32, 32)</pre></div></div><br class="example-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191108784"></a>statement <span class="quote">“<span class="quote"><code class="code">art:</code></span>”</span></h3></div></div></div><p>Syntax: <span class="emphasis"><em>art:&lt;ArtID&gt;,&lt;ArtClient&gt;</em></span>
-        or
-        <span class="emphasis"><em>art:&lt;ArtID&gt;,&lt;ArtClient&gt;,&lt;width&gt;,&lt;height&gt;</em></span></p><p>Create a bitmap using wxArtProvider.</p><div class="example"><a name="idm139900191106272"></a><p class="title"><b>Example 6.4. Create a bitmap using wxArtProvider</b></p><div class="example-contents"><p>Input:</p><p><strong class="userinput"><code>art:wxART_GO_UP,wxART_OTHER,32,32</code></strong></p><p>produces in Perl:</p><pre class="programlisting">Wx::ArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, Wx::Size-&gt;new(32, 32))</pre></div></div><br class="example-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191102848"></a>statement <span class="quote">“<span class="quote"><code class="code">code:</code></span>”</span></h3></div></div></div><p>Syntax: <span class="emphasis"><em>code:&lt;code chunk to return a
-        wxBitmap&gt;</em></span></p><p>You can enter a code chunk returning a
-        <code class="classname">wxBitmap</code>, by using the
-        <span class="emphasis"><em>code:</em></span> tag. This inserts verbatim the code you
-        enter in brackets and nothing more.</p><div class="example"><a name="idm139900191099808"></a><p class="title"><b>Example 6.5. <code class="classname">wxSomeWidget</code> needs a
-          <code class="classname">wxBitmap</code> as an argument</b></p><div class="example-contents"><p>Input:</p><p><strong class="userinput"><code>code:if (x == 0) get_bitmap1() else
-          get_bitmap2();</code></strong></p><p>produces in C++:</p><pre class="programlisting">wxSomeWidget((if (x == 0) get_bitmap1() else get_bitmap2();), option1, option2)</pre></div></div><br class="example-break"><p>If you use the <code class="code">code:</code> tags like shown above the
-        preview window shows a fixed size empty bitmap instead.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>Refer to <a class="xref" href="ui_properties_window.html#ui_code_properties" title="Code Properties">the section called “Code Properties”</a> for a
-          description of declaration and assignment of additional functions
-          and variables.</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="supported_widgets.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="supported_widgets.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="star_bars.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 6. Supported widgets </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Menubar, Statusbar and Toolbar</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/configure_wxglade.html wxglade-1.0.1/docs_old/html/configure_wxglade.html
--- wxglade-0.9.6/docs_old/html/configure_wxglade.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/configure_wxglade.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Configuring wxGlade</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="running_wxglade.html" title="Chapter 3. Running wxGlade"><link rel="prev" href="invocation_cmdline.html" title="Command Line Invocation"><link rel="next" href="deprecated_features.html" title="Deprecated Features"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Configuring wxGlade</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="invocation_cmdline.html">Prev</a> </td><th width="60%" align="center">Chapter 3. Running wxGlade</th><td width="20%" align="right"> <a accesskey="n" href="deprecated_features.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="configure_wxglade"></a>Configuring wxGlade</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="preferences"></a>Preferences Dialog</h3></div></div></div><p>You can access the Preferences Dialog with the menu <span class="guimenu">View</span> → <span class="guimenuitem">Preferences</span>. You can choose some decoration options, like whether
-        to show icons in menus or not. For example, you can modify the number
-        of buttons in the Main Palette. If you type a value of 15 or 30, you
-        get a long toolbar-like Main Palette. You can also choose the default
-        path where you save wxGlade files or generate source code.</p><p>Another useful option is to enable a default border of 3 around
-        some widgets. In many cases this can be useful to have set.</p><p>You need to restart wxGlade for changes to take effect.</p><div class="figure"><a name="idm139900191680864"></a><p class="title"><b>Figure 3.1. wxGlade preferences dialog</b></p><div class="figure-contents"><div class="mediaobject"><img src="preferences.png" width="531" alt="wxGlade preferences dialog"></div></div></div><br class="figure-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191678224"></a>Environment Variables</h3></div></div></div><p>wxGlade supports only one environment variable
-        <span class="quote">“<span class="quote">WXGLADE_CONFIG_PATH</span>”</span>.</p><p>If you want to store the whole configuration data inclusive user
-        generated templates and log files in a non-default directory, then
-        store the full path of the alternative directory in the environment
-        variable <span class="quote">“<span class="quote">WXGLADE_CONFIG_PATH</span>”</span> and start wxGlade with the
-        new environment.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="config_files"></a>Configuration Files</h3></div></div></div><p>wxGlade stores several internal information like configuration
-        settings and log files in an own directory. The location of this
-        directory varies between different operating systems. On Unix wxGlade
-        uses <code class="filename">~/.wxglade</code>. On Microsoft Windows the
-        information will be stored in
-        <code class="filename">C:/Users/&lt;username&gt;/AppData/Roaming</code>.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>Some components of the path will be translated to the users'
-          language on Microsoft Windows automatically and transparently in the
-          Windows Explorer and other graphical applications. Other
-          applications show the original names. The translation behaviour
-          depends on the API used by the application developer.</p></div><p>The configuration file is a simple text file and contains user
-        settings. It's named <code class="filename">.wxgladerc</code> on Unix or
-        <code class="filename">wxglade.ini</code> on Microsoft Windows. Be careful with
-        manual changes.</p><p>The configuration directory contains also a list of recently
-        used files in <code class="filename">file_history.txt</code>.</p><p>wxGlade writes always a small error log file
-        <code class="filename">wxglade.log</code>. It's also stored inside this
-        directory. The file size is limited to 100 KB and wxGlade will keep at
-        most two log files <code class="filename">wxglade.log</code> and
-        <code class="filename">wxglade.log.1</code>. The roll over from
-        <code class="filename">wxglade.log</code> to <code class="filename">wxglade.log.1</code>
-        will occur if the file size limit is reached. An already existing file
-        <code class="filename">wxglade.log.1</code> will be deleted automatically. The
-        log file is an UTF-8 encoded text file.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="invocation_cmdline.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="running_wxglade.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="deprecated_features.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Command Line Invocation </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Deprecated Features</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/contributing.html wxglade-1.0.1/docs_old/html/contributing.html
--- wxglade-0.9.6/docs_old/html/contributing.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/contributing.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Contributing to wxGlade</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="technical_notes.html" title="Chapter 7. wxGlade technical notes"><link rel="prev" href="technical_notes.html" title="Chapter 7. wxGlade technical notes"><link rel="next" href="incomplete_and_outdated.html" title="Incomplete and outdated parts"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Contributing to wxGlade</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="technical_notes.html">Prev</a> </td><th width="60%" align="center">Chapter 7. wxGlade technical notes</th><td width="20%" align="right"> <a accesskey="n" href="incomplete_and_outdated.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="contributing"></a>Contributing to wxGlade</h2></div></div></div><p>You are, of course, free to make any changes/additions you want to
-      wxGlade, in whatever way you like.</p><p>If you decide to contribute them back, however, here are some
-      simple (stylistic) rules to follow: note that these are only general
-      indications, if you think they don't fit somewhere, feel free to ignore
-      them.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190895696"></a>Coding conventions</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Class names are usually CamelCase - variables, functions
-              and method names are lower_case_with_unserscores</p></li><li class="listitem"><p>Constants are UPPER_CASE</p></li><li class="listitem"><p>Source lines are at most 79 characters long</p></li><li class="listitem"><p>Class bodies are usually ended by a <span class="quote">“<span class="quote"><code class="code"><code class="code">#
-              end of class ClassName</code></code></span>”</span> comment</p></li><li class="listitem"><p>Source files use Unix EOL conventions (LF) if possible. In
-              any case, please don't mix Unix and Windows EOLs</p></li><li class="listitem"><p>Put your copyright info whenever appropriate</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190888896"></a>Testing</h3></div></div></div><p>Please write tests for significant changes and run the test
-        suite before committing changes.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190887632"></a>Commit Messages</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Use the present tense (<span class="quote">“<span class="quote">Add feature</span>”</span> not
-              <span class="quote">“<span class="quote">Added feature</span>”</span>)</p></li><li class="listitem"><p>Use the imperative mood (<span class="quote">“<span class="quote">Move cursor to...</span>”</span>
-              not <span class="quote">“<span class="quote">Moves cursor to...</span>”</span>)</p></li><li class="listitem"><p>Limit the first line to 72 characters or less</p></li><li class="listitem"><p>Reference issues and pull requests liberally</p></li></ul></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="technical_notes.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="technical_notes.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="incomplete_and_outdated.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 7. wxGlade technical notes </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Incomplete and outdated parts</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/copyright.html wxglade-1.0.1/docs_old/html/copyright.html
--- wxglade-0.9.6/docs_old/html/copyright.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/copyright.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Appendix B. Copyrights, Licenses and Trademarks</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="abbreviations.html" title="Appendix A. Glossary of Terms, Abbreviations, and Acronyms"><link rel="next" href="license_mit.html" title="wxGlade License Agreement"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix B. Copyrights, Licenses and Trademarks</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="abbreviations.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="license_mit.html">Next</a></td></tr></table><hr></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a name="copyright"></a>Appendix B. Copyrights, Licenses and Trademarks</h1></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idm139900190769280"></a>Copyrights</h2></div></div></div><p>wxGlade is copyright 2002-2007 by Alberto Griggio and 2011-2016 by
-      Carsten Grohmann. Use and distribution of wxGlade is governed by the MIT
-      license, located in <a class="xref" href="license_mit.html" title="wxGlade License Agreement">the section called “wxGlade License Agreement”</a>.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="abbreviations.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="license_mit.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Appendix A. Glossary of Terms, Abbreviations, and Acronyms </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> wxGlade License Agreement</td></tr></table></div></body></html>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/custom_widget_SM_design1.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/custom_widget_SM_design1.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/custom_widget_SM_design2.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/custom_widget_SM_design2.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/custom_widget_SM_preview.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/custom_widget_SM_preview.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/custom_widget_SM_tree.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/custom_widget_SM_tree.png differ
diff -Nru wxglade-0.9.6/docs_old/html/deprecated_features.html wxglade-1.0.1/docs_old/html/deprecated_features.html
--- wxglade-0.9.6/docs_old/html/deprecated_features.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/deprecated_features.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Deprecated Features</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="running_wxglade.html" title="Chapter 3. Running wxGlade"><link rel="prev" href="configure_wxglade.html" title="Configuring wxGlade"><link rel="next" href="troubleshooting.html" title="Troubleshooting and Error Handling"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Deprecated Features</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="configure_wxglade.html">Prev</a> </td><th width="60%" align="center">Chapter 3. Running wxGlade</th><td width="20%" align="right"> <a accesskey="n" href="troubleshooting.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="deprecated_features"></a>Deprecated Features</h2></div></div></div><p>This section lists deprecated features of wxGlade. These features
-      will be removed from a future version of wxGlade.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191662496"></a><span class="quote">“<span class="quote"><span class="guilabel">Overwrite existing
-        sources</span></span>”</span></h3></div></div></div><p>wxGlade can change the own code inside existing source files to
-        reflect changed designs. This feature have some limitations e.g. in
-        case of name and dependencies changes. Thereby it's recommended to
-        overwrite existing sources always and extend derived classes with your
-        functionality.</p><p>The pro and cons are discussed detailed in <a class="xref" href="next_steps.html#shared_control" title="Shared Control">the section called “Shared Control”</a>.</p><p>This feature isn't removed currently to stay backward
-        compatible.</p><div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Warning</h3><p>Don't use this feature for new projects.</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="configure_wxglade.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="running_wxglade.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="troubleshooting.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Configuring wxGlade </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Troubleshooting and Error Handling</td></tr></table></div></body></html>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/design_window_empty_slot.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/design_window_empty_slot.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/design_window.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/design_window.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/error_dialog.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/error_dialog.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/example_baseclasses.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/example_baseclasses.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/example_eventhandler.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/example_eventhandler.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/example_setproperty.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/example_setproperty.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/example_subclassed.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/example_subclassed.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/example_variableassigment.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/example_variableassigment.png differ
diff -Nru wxglade-0.9.6/docs_old/html/icon.html wxglade-1.0.1/docs_old/html/icon.html
--- wxglade-0.9.6/docs_old/html/icon.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/icon.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Appendix C. The wxGlade Icon</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="trademarks.html" title="Trademarks"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix C. The wxGlade Icon</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="trademarks.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a name="icon"></a>Appendix C. The wxGlade Icon</h1></div></div></div><div class="mediaobject"><img src="mondrian_200x200.png"></div><p>The wxGlade logo is a homage to Piet Mondrian a Dutch
-    painter.</p><p>The icon looks like a typical Mondrian painting. It has the
-    characteristic solid horizontal and vertical black lines as well as areas
-    filled with the three primary colours yellow, red and blue.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="trademarks.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">Trademarks </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/incomplete_and_outdated.html wxglade-1.0.1/docs_old/html/incomplete_and_outdated.html
--- wxglade-0.9.6/docs_old/html/incomplete_and_outdated.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/incomplete_and_outdated.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Incomplete and outdated parts</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="technical_notes.html" title="Chapter 7. wxGlade technical notes"><link rel="prev" href="contributing.html" title="Contributing to wxGlade"><link rel="next" href="abbreviations.html" title="Appendix A. Glossary of Terms, Abbreviations, and Acronyms"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Incomplete and outdated parts</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="contributing.html">Prev</a> </td><th width="60%" align="center">Chapter 7. wxGlade technical notes</th><td width="20%" align="right"> <a accesskey="n" href="abbreviations.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="incomplete_and_outdated"></a>Incomplete and outdated parts</h2></div></div></div><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Caution</h3><p>The remaining content in this section has not been updated since
-        July 2002. It's likely be very outdated in some parts.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190879824"></a>Startup</h3></div></div></div><p>The program starts from the function
-        <span class="quote">“<span class="quote"><code class="function">main</code></span>”</span> in the module
-        <span class="quote">“<span class="quote"><code class="function">main</code></span>”</span>: this creates an instance of
-        wxGlade (a subclass of <code class="classname">wxApp</code>), which in turn
-        creates a <code class="classname">wxGladeFrame</code>: this is the main window
-        of the app, i.e. the one with the palette of buttons. The
-        initialization of <code class="classname">wxGladeFrame</code> consists of
-        three steps:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Creation of the three frames of the app, the palette itself,
-            the tree and the property window</p></li><li class="listitem"><p>Loading of the code generator modules. The
-            <span class="quote">“<span class="quote"><code class="filename">codegen/</code></span>”</span> subdirectory is
-            scanned to find the available code generators: when a python
-            module is found, the app tries to load it and to access its
-            'writer' attribute: if this is successfully accomplished, such
-            'writer' object is considered a valid code generator, and is
-            inserted into the 'common.code_writers' dictionary (the key used
-            is the 'language' attribute of the writer itself)</p></li><li class="listitem"><p>Loading of the widget and sizer modules. To load the
-            widgets, the file
-            <span class="quote">“<span class="quote"><code class="filename">widgets/widgets.txt</code></span>”</span> is read,
-            and the app tries to import every widget module listed on such
-            file. For every module successfully imported, the
-            <span class="quote">“<span class="quote"><code class="methodname">initialize</code></span>”</span> function is
-            then called: this function sets up the builder and code generator
-            functions for a particular widget (explained later), and returns a
-            <code class="classname">wxBitmapButton</code> instance to be added to the
-            main palette. The loading of the sizers is more or less the same,
-            except that all the sizers are in the same module,
-            <span class="quote">“<span class="quote"><code class="function">edit_sizers</code></span>”</span>, and the
-            initialization function (called
-            <span class="quote">“<span class="quote"><code class="function">init_gui</code></span>”</span>) returns a list of
-            <code class="classname">wxBitmapButton</code> objects</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190867488"></a>Adding a top-level Widget</h3></div></div></div><p>When the user clicks on a button of a top-level widget (a Frame
-        or a Dialog), the method
-        <span class="quote">“<span class="quote"><code class="methodname">add_toplevel_object</code></span>”</span> of
-        <code class="classname">wxGladeFrame</code> is called: this is responsible for
-        the addition of the widget to the application. This happens in this
-        way:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>the name of the class of the widget to add is obtained: this
-            is done with the use of the
-            <span class="quote">“<span class="quote"><code class="code">common.refs</code></span>”</span> dictionary, which maps the
-            ids of the buttons of the palette to the class names of the
-            widgets.</p></li><li class="listitem"><p>with the name just obtained, the appropriate factory
-            function for the widget to add is got from the
-            <span class="quote">“<span class="quote"><code class="code">common.widgets</code></span>”</span> dictionary. This
-            function must accept three parameters: a reference to the parent
-            widget (<code class="code">None</code> in this case), a reference to the sizer
-            to which the widget will be added (again <code class="code">None</code> for
-            top-level windows) and the zero-based position inside the sizer
-            (once again, this is unused for top-level windows)</p></li><li class="listitem"><p>the call of the factory function actually builds the widgets
-            and inserts it in the <span class="quote">“<span class="quote"><code class="code">common.app_tree</code></span>”</span>
-            tree with a call to its method
-            <span class="quote">“<span class="quote"><code class="methodname">insert</code></span>”</span>. The
-            <span class="quote">“<span class="quote"><code class="filename">__init__</code></span>”</span> method of the widget
-            also builds all the Properties of the object and stores them in
-            the 'self.properties' dictionary</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190857744"></a>Adding a top-level Sizer</h3></div></div></div><p>This is similar to the addition of a top-level widget, but the
-        action is performed in two steps:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>when the user clicks on the button in the palette, the
-            method <span class="quote">“<span class="quote"><code class="methodname">add_object</code></span>”</span> of
-            <code class="classname">wxGladeFrame</code> is called: this sets the
-            global variables <span class="quote">“<span class="quote"><code class="code">common.adding_widget</code></span>”</span>
-            and <span class="quote">“<span class="quote"><code class="code">common.adding_sizer</code></span>”</span> to
-            <code class="code">True</code>, and stores the class name of the sizer to add
-            in the global <span class="quote">“<span class="quote"><code class="code">common.widget_to_add</code></span>”</span>
-            (the name is obtained from the
-            <span class="quote">“<span class="quote"><code class="code">common.refs</code></span>”</span> dictionary as described
-            above)</p></li><li class="listitem"><p>when the user left-clicks the mouse inside the previously
-            added top-level widget, its <span class="quote">“<span class="quote"><code class="code">drop_sizer</code></span>”</span>
-            method is called, which is responsible of the addition of the
-            sizer: it calls the factory function for the sizer (passing self
-            as the first argument), which will build the object and add it to
-            the tree</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190850048"></a>Adding a Normal Widget/Sizer</h3></div></div></div><p>This step is more or less the same as step 3:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="quote">“<span class="quote"><code class="code">wxGladeFrame.add_object</code></span>”</span> is
-            called in response to a button click</p></li><li class="listitem"><p>when the user ``drops'' the widget inside a slot in a sizer,
-            the method <span class="quote">“<span class="quote"><code class="function">on_drop_widget</code></span>”</span> of
-            <code class="code">edit_sizers.SizerSlot</code> is called, which in turn calls
-            the appropriate factory function with arguments
-            <span class="quote">“<span class="quote"><code class="code">self.parent</code></span>”</span>,
-            <span class="quote">“<span class="quote"><code class="code">self.sizer</code></span>”</span> and
-            <span class="quote">“<span class="quote"><code class="code">self.pos</code></span>”</span> (i.e. the parent, sizer and
-            position inside the sizer of the slot that will be replaced).
-            Factory functions of non-top-level objects call, apart from
-            <span class="quote">“<span class="quote"><code class="code">common.app_tree.insert</code></span>”</span> to insert the
-            object in the tree, the method
-            <span class="quote">“<span class="quote"><code class="methodname">add_item</code></span>”</span> of
-            <span class="quote">“<span class="quote"><code class="classname">edit_sizers.SizerBase</code></span>”</span>, to
-            add the object to the sizer and to remove the slot. For managed
-            widgets/sizers, the
-            <span class="quote">“<span class="quote"><code class="methodname">__init__</code></span>”</span> method also
-            builds the Properties which control the layout of the object
-            inside a sizer, and stores them in the
-            <span class="quote">“<span class="quote"><code class="code">self.sizer_properties</code></span>”</span>
-            dictionary.</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190840544"></a>Changing the Value of a Property</h3></div></div></div><p>When the user selects a widget the property window changes to
-        display the properties of the selected object: this is done by the
-        functions <span class="quote">“<span class="quote"><code class="methodname">show_properties</code></span>”</span> of
-        <code class="classname">edit_windows.EditBase</code> and
-        <code class="classname">edit_sizers.SizerBase</code>, which are called inside
-        two event handlers for focus and tree selection events.</p><p>When the value of a Property is changed, its setter function is
-        called to update the aspect/layout of the widget the Property belongs
-        to: such function is obtained from a call to the widget's
-        <span class="quote">“<span class="quote"><code class="methodname">__getitem__</code></span>”</span> method, which must
-        return a 2-tuple (getter, setter) for the Property</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190836592"></a>Saving the Design</h3></div></div></div><p>This operation is performed by the
-        <span class="quote">“<span class="quote"><code class="code">common.app_tree</code></span>”</span> Tree: for every Node of
-        the tree, an <span class="quote">“<span class="quote">object</span>”</span> XML element is generated, with the
-        following attributes: name, class, base (class). Each object contains
-        an element for each Property (generated by the
-        <span class="quote">“<span class="quote"><code class="methodname">write</code></span>”</span> method of Property) and
-        then an <span class="quote">“<span class="quote">object</span>”</span> element for all its sub-widgets and/or
-        sizers. Properties in the <span class="quote">“<span class="quote"><code class="code">sizer_properties</code></span>”</span>
-        dictionary are treated in a different way, as well as the children of
-        a sizer, which are sub-elements of
-        <span class="quote">“<span class="quote"><code class="code">sizeritem</code></span>”</span> objects: see the source code for
-        details.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190832192"></a>Loading an App from a XML file</h3></div></div></div><p>This is done by
-        <span class="quote">“<span class="quote"><code class="classname">xml_parse.XmlWidgetBuilder</code></span>”</span>, a
-        subclass of
-        <code class="classname">xml.sax.handler.ContentHandler</code>.</p><p>Basically, the steps involved are the following:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>when the start of an <span class="quote">“<span class="quote">object</span>”</span> element is
-            reached, a <code class="classname">XMLWidgetObject</code> instance is
-            created and pushed onto a stack of the objects created: such
-            object in turn calls the appropriate ``XML builder'' function (got
-            from the <span class="quote">“<span class="quote"><code class="code">common.widgets_from_xml</code></span>”</span>
-            dictionary) that creates the widget: this function is similar to
-            the factory function used to build the widget during an
-            interactive session, see the code for details and
-            differences</p></li><li class="listitem"><p>when the end of an <span class="quote">“<span class="quote">object</span>”</span> element is reached,
-            the object at the top of the stack is removed, and its widget (see
-            the source of <code class="classname">XmlWidgetObject</code>) is laid
-            out</p></li><li class="listitem"><p>when the end of a Property element is reached, the
-            appropriate setter function of the owner of the Property is
-            called. This is the default behaviour, suitable for simple
-            properties. For more complex properties, whose XML representation
-            consists of more sub-elements, each widget can define a particular
-            handler: see for example <code class="classname">FontHandler</code> in
-            <code class="classname">edit_windows.WindowBase</code></p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190822992"></a>Generating the Source Code</h3></div></div></div><p>This section is the result of a cut &amp; paste of the comment
-        at the beginning of
-        <span class="quote">“<span class="quote"><code class="filename">codegen/py_codegen.py</code></span>”</span>. It is
-        *VERY* incomplete. The <code class="classname">ContentHandler</code> subclass
-        which drives the code generation is
-        <code class="classname">xml_parse.CodeWriter</code>.</p><p>How the code is generated: every time the end of an object is
-        reached during the parsing of the XML tree, either the function
-        <span class="quote">“<span class="quote"><code class="methodname">add_object</code></span>”</span> or the function
-        <span class="quote">“<span class="quote"><code class="methodname">add_class</code></span>”</span> is called: the
-        latter when the object is a top-level one, the former when it is not.
-        In the last case, <span class="quote">“<span class="quote"><code class="methodname">add_object</code></span>”</span>
-        calls the appropriate ``writer'' function for the specific object,
-        found in the <span class="quote">“<span class="quote"><code class="code">obj_builders</code></span>”</span> dictionary. Such
-        function accepts one argument, the <code class="classname">CodeObject</code>
-        representing the object for which the code has to be written, and
-        returns 3 lists of strings, representing the lines to add to the
-        <span class="quote">“<span class="quote"><code class="methodname">__init__</code></span>”</span>,
-        <span class="quote">“<span class="quote"><code class="methodname">__set_properties</code></span>”</span> and
-        <span class="quote">“<span class="quote"><code class="methodname">__do_layout</code></span>”</span> methods of the
-        parent object.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>The lines in the
-          <span class="quote">“<span class="quote"><code class="methodname">__init__</code></span>”</span> list will be added
-          in reverse order.</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="contributing.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="technical_notes.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="abbreviations.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Contributing to wxGlade </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix A. Glossary of Terms, Abbreviations, and Acronyms</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/incorporated.html wxglade-1.0.1/docs_old/html/incorporated.html
--- wxglade-0.9.6/docs_old/html/incorporated.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/incorporated.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Licenses and Acknowledgements for Incorporated Software</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="copyright.html" title="Appendix B. Copyrights, Licenses and Trademarks"><link rel="prev" href="trademarks.html" title="Trademarks"><link rel="next" href="icon.html" title="Appendix C. The wxGlade Icon"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Licenses and Acknowledgements for Incorporated Software</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="trademarks.html">Prev</a> </td><th width="60%" align="center">Appendix B. Copyrights, Licenses and Trademarks</th><td width="20%" align="right"> <a accesskey="n" href="icon.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="incorporated"></a>Licenses and Acknowledgements for Incorporated Software</h2></div></div></div><p>This section lists licenses and acknowledgements for third-party
-      software incorporated in wxGlade.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm140596859325328"></a>OrderedDict</h3></div></div></div><p>The O<code class="classname">rderedDict</code> class version 1.1 has
-        been integrated. The class is downloaded from <a class="ulink" href="http://pypi.python.org/pypi/ordereddict" target="_top">http://pypi.python.org/pypi/ordereddict</a>
-        and contains following notice:</p><div class="literallayout"><p>Copyright (c) 2009 Raymond Hettinger<br>
-<br>
-Permission is hereby granted, free of charge, to any person<br>
-obtaining a copy of this software and associated documentation files<br>
-(the "Software"), to deal in the Software without restriction,<br>
-including without limitation the rights to use, copy, modify, merge,<br>
-publish, distribute, sublicense, and/or sell copies of the Software,<br>
-and to permit persons to whom the Software is furnished to do so,<br>
-subject to the following conditions:<br>
-<br>
-    The above copyright notice and this permission notice shall be<br>
-    included in all copies or substantial portions of the Software.<br>
-<br>
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,<br>
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES<br>
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND<br>
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT<br>
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,<br>
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING<br>
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR<br>
-    OTHER DEALINGS IN THE SOFTWARE.</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="trademarks.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="copyright.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="icon.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Trademarks </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix C. The wxGlade Icon</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/index.html wxglade-1.0.1/docs_old/html/index.html
--- wxglade-0.9.6/docs_old/html/index.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/index.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>wxGlade manual</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="next" href="preface.html" title="Preface"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">wxGlade manual</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="preface.html">Next</a></td></tr></table><hr></div><div class="book"><div class="titlepage"><div><div><h1 class="title"><a name="idm139900197074688"></a>wxGlade manual</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Marcello</span> <span class="surname">Semboli</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Alberto</span> <span class="surname">Griggio</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Carsten</span> <span class="surname">Grohmann</span></h3></div></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="preface"><a href="preface.html">Preface</a></span></dt><dd><dl><dt><span class="section"><a href="preface.html#preface_contact">Contact</a></span></dt><dt><span class="section"><a href="preface_license.html">License</a></span></dt></dl></dd><dt><span class="chapter"><a href="start.html">1. Getting Started</a></span></dt><dd><dl><dt><span class="section"><a href="start.html#what_is_wxglade">What is wxGlade?</a></span></dt><dd><dl><dt><span class="section"><a href="start.html#idm139900197115856">What can you do with wxGlade?</a></span></dt><dt><span class="section"><a href="start.html#idm139900197237360">What is wxGlade NOT?</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="installation.html">2. Installation</a></span></dt><dd><dl><dt><span class="section"><a href="installation.html#requirements">Requirements and Supported Platforms</a></span></dt><dt><span class="section"><a href="installing.html">Installing wxGlade</a></span></dt><dd><dl><dt><span class="section"><a href="installing.html#idm139900197214688">Requirements for Building Own Packages</a></span></dt><dt><span class="section"><a href="installing.html#idm139900197212176">Download</a></span></dt><dt><span class="section"><a href="installing.html#idm139900197204320">Installing on Microsoft Windows</a></span></dt><dt><span class="section"><a href="installing.html#idm139900197201808">Installing on Unix/Unix-like Operating Systems</a></span></dt><dt><span class="section"><a href="installing.html#installation_from_source">Installing from Source</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="running_wxglade.html">3. Running wxGlade</a></span></dt><dd><dl><dt><span class="section"><a href="running_wxglade.html#known_platforms">Known Platforms</a></span></dt><dt><span class="section"><a href="languages.html">Languages</a></span></dt><dt><span class="section"><a href="invocation_cmdline.html">Command Line Invocation</a></span></dt><dt><span class="section"><a href="configure_wxglade.html">Configuring wxGlade</a></span></dt><dd><dl><dt><span class="section"><a href="configure_wxglade.html#preferences">Preferences Dialog</a></span></dt><dt><span class="section"><a href="configure_wxglade.html#idm139900191678224">Environment Variables</a></span></dt><dt><span class="section"><a href="configure_wxglade.html#config_files">Configuration Files</a></span></dt></dl></dd><dt><span class="section"><a href="deprecated_features.html">Deprecated Features</a></span></dt><dd><dl><dt><span class="section"><a href="deprecated_features.html#idm139900191662496"><span class="quote">“<span class="quote"><span class="guilabel">Overwrite existing
-        sources</span></span>”</span></a></span></dt></dl></dd><dt><span class="section"><a href="troubleshooting.html">Troubleshooting and Error Handling</a></span></dt><dd><dl><dt><span class="section"><a href="troubleshooting.html#idm139900191657376">Troubleshooting</a></span></dt><dt><span class="section"><a href="troubleshooting.html#idm139900191651728">Error Messages</a></span></dt><dt><span class="section"><a href="troubleshooting.html#report_bugs">How to Report a Bug</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="working_with_wxglade.html">4. Working with wxGlade</a></span></dt><dd><dl><dt><span class="section"><a href="working_with_wxglade.html#idm139900191581312">First Steps</a></span></dt><dd><dl><dt><span class="section"><a href="working_with_wxglade.html#idm139900191578736">Quick Example</a></span></dt></dl></dd><dt><span class="section"><a href="next_steps.html">Next Steps</a></span></dt><dd><dl><dt><span class="section"><a href="next_steps.html#idm139900191555952">Escape Sequences</a></span></dt><dt><span class="section"><a href="next_steps.html#best_practice">Best Practice</a></span></dt><dt><span class="section"><a href="next_steps.html#idm139900191533040">Language Specific Peculiarities</a></span></dt><dt><span class="section"><a href="next_steps.html#using.source.code.section">Using the Source Code</a></span></dt><dt><span class="section"><a href="next_steps.html#idm139900191447792">Handling XRC Files</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="ui.html">5. wxGlade User Interface</a></span></dt><dd><dl><dt><span class="section"><a href="ui.html#ui_palette_window">Main Palette</a></span></dt><dt><span class="section"><a href="ui_tree_window.html">Tree Window</a></span></dt><dt><span class="section"><a href="ui_design_window.html">Design Window</a></span></dt><dt><span class="section"><a href="ui_properties_window.html">Properties Window</a></span></dt><dd><dl><dt><span class="section"><a href="ui_properties_window.html#ui_application_properties">Application Properties</a></span></dt><dt><span class="section"><a href="ui_properties_window.html#idm139900191337920">Common Properties</a></span></dt><dt><span class="section"><a href="ui_properties_window.html#layout_properties">Layout Properties</a></span></dt><dt><span class="section"><a href="ui_properties_window.html#idm139900191275232">Widget Properties</a></span></dt><dt><span class="section"><a href="ui_properties_window.html#idm139900191259264">Styles</a></span></dt><dt><span class="section"><a href="ui_properties_window.html#idm139900191254192">Events Properties</a></span></dt><dt><span class="section"><a href="ui_properties_window.html#ui_code_properties">Code Properties</a></span></dt></dl></dd><dt><span class="section"><a href="ui_menu.html">The wxGlade Menu</a></span></dt><dd><dl><dt><span class="section"><a href="ui_menu.html#ui_file_menu">The FILE Menu</a></span></dt><dt><span class="section"><a href="ui_menu.html#ui_view_menu">The VIEW Menu</a></span></dt><dt><span class="section"><a href="ui_menu.html#ui_help_menu">The HELP Menu</a></span></dt></dl></dd><dt><span class="section"><a href="ui_shortcuts.html">Shortcuts</a></span></dt></dl></dd><dt><span class="chapter"><a href="supported_widgets.html">6. Supported widgets</a></span></dt><dd><dl><dt><span class="section"><a href="supported_widgets.html#idm139900191171952">Introduction</a></span></dt><dt><span class="section"><a href="codegen_bitmap_path.html">Specifying the Path of Bitmaps</a></span></dt><dd><dl><dt><span class="section"><a href="codegen_bitmap_path.html#idm139900191127424">Bitmap Path</a></span></dt><dt><span class="section"><a href="codegen_bitmap_path.html#idm139900191122288">statement <span class="quote">“<span class="quote"><code class="code">var:</code></span>”</span></a></span></dt><dt><span class="section"><a href="codegen_bitmap_path.html#idm139900191115856">statement <span class="quote">“<span class="quote"><code class="code">empty:</code></span>”</span></a></span></dt><dt><span class="section"><a href="codegen_bitmap_path.html#idm139900191108784">statement <span class="quote">“<span class="quote"><code class="code">art:</code></span>”</span></a></span></dt><dt><span class="section"><a href="codegen_bitmap_path.html#idm139900191102848">statement <span class="quote">“<span class="quote"><code class="code">code:</code></span>”</span></a></span></dt></dl></dd><dt><span class="section"><a href="star_bars.html">Menubar, Statusbar and Toolbar</a></span></dt><dd><dl><dt><span class="section"><a href="star_bars.html#idm139900191092432">Introduction</a></span></dt><dt><span class="section"><a href="star_bars.html#idm139900191086784">Menu</a></span></dt><dt><span class="section"><a href="star_bars.html#idm139900191076560">Statusbar</a></span></dt><dt><span class="section"><a href="star_bars.html#idm139900191072064">Toolbar</a></span></dt></dl></dd><dt><span class="section"><a href="widget_list.html">Widget List</a></span></dt><dd><dl><dt><span class="section"><a href="widget_list.html#idm139900191061664">Frame</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191059248">Dialog or Panel</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191056480">Panel</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191054496">Splitter Window</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191051328">Notebook</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191048960">Buttons</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191036448">Calendar Control</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191034160">Check List Box</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191031792">Check Box</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191029408">Choice</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191026976">Combo Box</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191023312">Date Picker Control</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191021024">Gauge</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191018656">Generic Calendar Control</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191016368">Grid</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191014528">Hyperlink Control</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191012880">List Box</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191010448">List Control</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191008160">Property Grid Manager</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191005872">Radio Box</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191002512">Slider</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900191000128">Spin Control</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900190997744">Static Line</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900190995328">Static Bitmap</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900190992320">Static Text</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900190989888">Text Control</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900190987520">Tree Control</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900190985232">Custom Widget</a></span></dt><dt><span class="section"><a href="widget_list.html#idm139900190945968">Spacer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="technical_notes.html">7. wxGlade technical notes</a></span></dt><dd><dl><dt><span class="section"><a href="technical_notes.html#idm139900190941904">Installing and Designing own Widget Plugins</a></span></dt><dd><dl><dt><span class="section"><a href="technical_notes.html#idm139900190939840">Widgets Packages</a></span></dt><dt><span class="section"><a href="technical_notes.html#idm139900190931312">Create a ZIP Package</a></span></dt><dt><span class="section"><a href="technical_notes.html#idm139900190927760">Installing Widget Plugins Locally</a></span></dt><dt><span class="section"><a href="technical_notes.html#idm139900190921024">Designing own Widget Plugins</a></span></dt></dl></dd><dt><span class="section"><a href="contributing.html">Contributing to wxGlade</a></span></dt><dd><dl><dt><span class="section"><a href="contributing.html#idm139900190895696">Coding conventions</a></span></dt><dt><span class="section"><a href="contributing.html#idm139900190888896">Testing</a></span></dt><dt><span class="section"><a href="contributing.html#idm139900190887632">Commit Messages</a></span></dt></dl></dd><dt><span class="section"><a href="incomplete_and_outdated.html">Incomplete and outdated parts</a></span></dt><dd><dl><dt><span class="section"><a href="incomplete_and_outdated.html#idm139900190879824">Startup</a></span></dt><dt><span class="section"><a href="incomplete_and_outdated.html#idm139900190867488">Adding a top-level Widget</a></span></dt><dt><span class="section"><a href="incomplete_and_outdated.html#idm139900190857744">Adding a top-level Sizer</a></span></dt><dt><span class="section"><a href="incomplete_and_outdated.html#idm139900190850048">Adding a Normal Widget/Sizer</a></span></dt><dt><span class="section"><a href="incomplete_and_outdated.html#idm139900190840544">Changing the Value of a Property</a></span></dt><dt><span class="section"><a href="incomplete_and_outdated.html#idm139900190836592">Saving the Design</a></span></dt><dt><span class="section"><a href="incomplete_and_outdated.html#idm139900190832192">Loading an App from a XML file</a></span></dt><dt><span class="section"><a href="incomplete_and_outdated.html#idm139900190822992">Generating the Source Code</a></span></dt></dl></dd></dl></dd><dt><span class="appendix"><a href="abbreviations.html">A. Glossary of Terms, Abbreviations, and Acronyms</a></span></dt><dt><span class="appendix"><a href="copyright.html">B. Copyrights, Licenses and Trademarks</a></span></dt><dd><dl><dt><span class="section"><a href="copyright.html#idm139900190769280">Copyrights</a></span></dt><dt><span class="section"><a href="license_mit.html">wxGlade License Agreement</a></span></dt><dt><span class="section"><a href="trademarks.html">Trademarks</a></span></dt></dl></dd><dt><span class="appendix"><a href="icon.html">C. The wxGlade Icon</a></span></dt></dl></div><div class="list-of-figures"><p><b>List of Figures</b></p><dl><dt>1.1. <a href="start.html#idm139900193934928">wxGlade windows</a></dt><dt>2.1. <a href="installing.html#idm139900191725520">Starting wxGlade on Windows at C:\Program
-            Files\wxGlade</a></dt><dt>2.2. <a href="installing.html#idm139900191711872">Starting wxGlade on Linux at
-            /opt/wxglade/bin/wxglade</a></dt><dt>3.1. <a href="configure_wxglade.html#idm139900191680864">wxGlade preferences dialog</a></dt><dt>3.2. <a href="troubleshooting.html#idm139900191589760">An error dialog example</a></dt><dt>5.1. <a href="ui.html#idm139900191435696">The Main Palette</a></dt><dt>5.2. <a href="ui_tree_window.html#idm139900191426896">The Tree Window</a></dt><dt>5.3. <a href="ui_tree_window.html#label_menu.fig">The menu for a widget</a></dt><dt>5.4. <a href="ui_tree_window.html#sizer_menu.fig">The menu for a sizer</a></dt><dt>5.5. <a href="ui_design_window.html#idm139900191414848">The Design Window</a></dt><dt>5.6. <a href="ui_properties_window.html#properties_window_application.fig">Project Properties - Application settings</a></dt><dt>5.7. <a href="ui_properties_window.html#idm139900191349904">Project Properties - Language settings</a></dt><dt>5.8. <a href="ui_properties_window.html#properties_window_tab_1.fig">Common Properties</a></dt><dt>5.9. <a href="ui_properties_window.html#properties_window_tab_1_change.fig">Changing Common Properties</a></dt><dt>5.10. <a href="ui_properties_window.html#idm139900191325776">Common Properties - A subclassed widget (default
-                behaviour)</a></dt><dt>5.11. <a href="ui_properties_window.html#example_baseclasses.fig">Common Properties - Base class(es) entry</a></dt><dt>5.12. <a href="ui_properties_window.html#idm139900191302336">Common Properties - Variable assignment</a></dt><dt>5.13. <a href="ui_properties_window.html#properties_window_tab_2.fig">Layout Properties</a></dt><dt>5.14. <a href="ui_properties_window.html#properties_window_tab_3.fig">Widget Properties</a></dt><dt>5.15. <a href="ui_properties_window.html#idm139900191267696">Widget Properties - Don't generate code for this
-          class</a></dt><dt>5.16. <a href="ui_properties_window.html#idm139900191256560">Widget Properties - Styles Tooltip</a></dt><dt>5.17. <a href="ui_properties_window.html#idm139900191252272">Events Properties</a></dt><dt>5.18. <a href="ui_properties_window.html#idm139900191249760">Events Properties - Event handler name added</a></dt><dt>5.19. <a href="ui_properties_window.html#idm139900191241680">Code Properties - Extra code and extra properties</a></dt><dt>5.20. <a href="ui_properties_window.html#idm139900191228992">Code Properties - Set extra property</a></dt><dt>6.1. <a href="star_bars.html#idm139900191079200">Menu editor</a></dt><dt>6.2. <a href="star_bars.html#idm139900191074704">Statusbar properties</a></dt><dt>6.3. <a href="star_bars.html#idm139900191065776">Toolbar editor</a></dt><dt>6.4. <a href="widget_list.html#idm139900190980464">Widget Properties for a Custom Widget</a></dt><dt>6.5. <a href="widget_list.html#idm139900190957744">Widget Tree</a></dt><dt>6.6. <a href="widget_list.html#idm139900190955360">SpeedMeter Properties</a></dt><dt>6.7. <a href="widget_list.html#idm139900190951472">Preview</a></dt></dl></div><div class="list-of-tables"><p><b>List of Tables</b></p><dl><dt>4.1. <a href="next_steps.html#idm139900191482912">Interaction between properties to generate different types
-            of start code</a></dt></dl></div><div class="list-of-examples"><p><b>List of Examples</b></p><dl><dt>2.1. <a href="installing.html#idm139900191717024">Installing wxGlade at /opt/wxglade</a></dt><dt>4.1. <a href="next_steps.html#idm139900191542768">Correct entered wx constant</a></dt><dt>4.2. <a href="next_steps.html#idm139900191459024">Detailed application start code in Perl</a></dt><dt>4.3. <a href="next_steps.html#idm139900191456192">Simplified application start code in Perl</a></dt><dt>4.4. <a href="next_steps.html#idm139900191451680">Compiling a single file C++ project on Linux</a></dt><dt>4.5. <a href="next_steps.html#idm139900191450000">Compiling a multi file C++ project on Linux</a></dt><dt>4.6. <a href="next_steps.html#idm139900191445568">Converting a XRC file into a wxGlade project</a></dt><dt>4.7. <a href="next_steps.html#idm139900191440624">wxPython code to load and show a XRC resource</a></dt><dt>5.1. <a href="ui_properties_window.html#idm139900191323168">Generated Python code of a subclassed widget</a></dt><dt>5.2. <a href="ui_properties_window.html#idm139900191313984">Generated Python code of a widget with two base
-                classes</a></dt><dt>5.3. <a href="ui_properties_window.html#idm139900191299824">Generated Python code for a variable assignment</a></dt><dt>5.4. <a href="ui_properties_window.html#idm139900191247248">Generated Python code of an <span class="command">EVT_TEXT</span> event
-          handler stub at line 12</a></dt><dt>5.5. <a href="ui_properties_window.html#idm139900191226480">Generated Python code for setting property
-          <span class="command">MaxLength</span> to <span class="command">10</span> at line
-          14</a></dt><dt>6.1. <a href="codegen_bitmap_path.html#idm139900191125904"><code class="classname">wxBitmap</code> object with the typed string
-          as bitmap path</a></dt><dt>6.2. <a href="codegen_bitmap_path.html#idm139900191119392"><code class="classname">wxBitmap</code> object with the variable name
-          as bitmap path</a></dt><dt>6.3. <a href="codegen_bitmap_path.html#idm139900191113696">Create an empty <code class="classname">wxBitmap</code> with width of
-          32 and height of 32</a></dt><dt>6.4. <a href="codegen_bitmap_path.html#idm139900191106272">Create a bitmap using wxArtProvider</a></dt><dt>6.5. <a href="codegen_bitmap_path.html#idm139900191099808"><code class="classname">wxSomeWidget</code> needs a
-          <code class="classname">wxBitmap</code> as an argument</a></dt><dt>6.6. <a href="widget_list.html#idm139900190963440">Generated C++ code for the custom widget shown
-            above</a></dt><dt>6.7. <a href="widget_list.html#idm139900190958512">Widget Custom Widget - AGW SpeedMeter</a></dt><dt>7.1. <a href="technical_notes.html#idm139900190935520">Directory package</a></dt><dt>7.2. <a href="technical_notes.html#idm139900190933552">ZIP package</a></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="preface.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> Preface</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/installation.html wxglade-1.0.1/docs_old/html/installation.html
--- wxglade-0.9.6/docs_old/html/installation.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/installation.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 2. Installation</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="start.html" title="Chapter 1. Getting Started"><link rel="next" href="installing.html" title="Installing wxGlade"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 2. Installation</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="start.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="installing.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="installation"></a>Chapter 2. Installation</h1></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="requirements"></a>Requirements and Supported Platforms</h2></div></div></div><p>wxGlade has been run on Microsoft Windows, Linux, OS X because
-      it's written in Python using wxPython. wxGlade can be run on any
-      platform that supports Python and wxPython.</p><p>The requirements to run wxGlade are:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Python 2.7, Python 3.1 or later</p></li><li class="listitem"><p>wxPython 2.8 or 3.0</p><p>Sometimes the wxPython module <span class="quote">“<span class="quote">wxversion</span>”</span> is
-          packaged separately e.g. in Debian. Please install the
-          <span class="quote">“<span class="quote">wxversion</span>”</span> package manually in such case</p></li><li class="listitem"><p>wxWidgets 2.8 or 3.0, the wxWidgets are often bundled with
-          wxPython</p></li></ul></div><p>wxWidgets is available at <a class="ulink" href="http://www.wxwidgets.org" target="_top">http://www.wxwidgets.org</a> and
-      wxPython at <a class="ulink" href="http://www.wxpython.org" target="_top">http://www.wxpython.org</a>.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="start.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="installing.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 1. Getting Started </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Installing wxGlade</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/installing.html wxglade-1.0.1/docs_old/html/installing.html
--- wxglade-0.9.6/docs_old/html/installing.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/installing.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Installing wxGlade</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="installation.html" title="Chapter 2. Installation"><link rel="prev" href="installation.html" title="Chapter 2. Installation"><link rel="next" href="running_wxglade.html" title="Chapter 3. Running wxGlade"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Installing wxGlade</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="installation.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Installation</th><td width="20%" align="right"> <a accesskey="n" href="running_wxglade.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="installing"></a>Installing wxGlade</h2></div></div></div><p>wxGlade is available in four different package types:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>the sources packages (<code class="filename">.zip</code> and
-          <code class="filename">.tar.gz</code>)</p></li><li class="listitem"><p>the full installer on Microsoft Windows
-          (<code class="filename">wxGlade-&lt;VERSION&gt;-setup.exe</code>)</p></li><li class="listitem"><p>the installer of the Standalone Edition on Microsoft Windows
-          (<code class="filename">wxGlade-SAE-&lt;VERSION&gt;-setup.exe</code>)</p></li><li class="listitem"><p>current development version</p></li></ol></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900197214688"></a>Requirements for Building Own Packages</h3></div></div></div><p>You need listed additional packages for building wxGlade
-        packages from the Mercurial repository:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>setuptools</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900197212176"></a>Download</h3></div></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900197211504"></a>Official Release Packages</h4></div></div></div><p>All stable version are available for downloading at <a class="ulink" href="https://sourceforge.net/projects/wxglade/" target="_top">https://sourceforge.net/projects/wxglade/</a>.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900197209680"></a>Development Versions</h4></div></div></div><p>wxGlade manages source code in a <a class="ulink" href="http://mercurial.selenic.com" target="_top">Mercurial</a> repository
-          hosted on <a class="ulink" href="https://bitbucket.org" target="_top">Bitbucket.org</a>.
-          You can fetch the whole repository from <a class="ulink" href="https://bitbucket.org/wxglade/wxglade" target="_top">https://bitbucket.org/wxglade/wxglade</a>
-          using anonymous Mercurial (<span class="command"><strong>hg</strong></span>) access.</p><p>Alternatively you can download different source tarballs from
-          <a class="ulink" href="https://bitbucket.org/wxglade/wxglade/downloads" target="_top">https://bitbucket.org/wxglade/wxglade/downloads</a>.</p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900197204320"></a>Installing on Microsoft Windows</h3></div></div></div><p>The full installer requires a local installation Python and
-        wxPython. The wxWidgets are usually bundled with wxPython on Microsoft
-        Windows. Thereby you don't need to install wxWidgets
-        separately.</p><p>The Standalone Edition doesn't need additional packages. It's
-        includes already the required parts of Python, wxPython and
-        wxWidgets.</p><p>The installation process is quite simple. Just download the
-        installer binary, execute it and follow the instructions.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900197201808"></a>Installing on Unix/Unix-like Operating Systems</h3></div></div></div><p>Current Linux distributions provide wxGlade packages already.
-        Use the distribution specific install mechanism to install the wxGlade
-        package and all dependencies.</p><p>Install wxGlade from the source package like described in <a class="xref" href="installing.html#installation_from_source" title="Installing from Source">the section called “Installing from Source”</a> if your distribution
-        doesn't provide any package or the package is out-of-date.</p><p>On Unix systems wxGlade will be started using the shell script
-        <span class="command"><strong>wxglade</strong></span>. The script search the system for Python 2
-        and finally executes the Python interpreter to start wxGlade.</p><p>You can set the environment variable <code class="envar">PYTHON_BIN</code>,
-        if the shell script <span class="command"><strong>wxglade</strong></span> doesn't find Python or
-        if you want to use a non-default interpreter.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="installation_from_source"></a>Installing from Source</h3></div></div></div><p>The installation from scratch requires Python, wxPython and
-        wxWidgets. Install these three components first. You can use already
-        packaged versions of those components for your operating system.
-        Otherwise read the installation documentation of the missing
-        components and follow the instructions.</p><p>Download a source package or a development package in a first
-        step.</p><p>You can install wxGlade from source in three different
-        ways.</p><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="installation_single_user"></a>Single User Installation (Extract and Run)</h4></div></div></div><div class="sidebar"><div class="titlepage"><div><div><p class="title"><b></b></p></div></div></div><p>In short:</p><p>Just download the archive of current version as a .zip file
-            or a .tar.gz file, extract the archive into a empty directory and
-            execute <span class="command"><strong>wxglade</strong></span> on Unix or
-            <span class="command"><strong>wxglade.pyw</strong></span> on Windows to start wxGlade.</p></div><p>The <span class="quote">“<span class="quote">Single User Installation</span>”</span> is a simplified
-          installation without using native package like
-          <code class="filename">.msi</code> or <code class="filename">.exe</code> files on
-          Microsoft Windows or <code class="filename">.rpm</code>,
-          <code class="filename">.pkg</code> and <code class="filename">.deb</code> on Linux.
-          It's to provide a simple way for running wxGlade without the need of
-          installation privileges.</p><p>The dependencies listed in <a class="xref" href="installation.html#requirements" title="Requirements and Supported Platforms">the section called “Requirements and Supported Platforms”</a> have been
-          satisfied.</p><p>The source packages and the development packages have the same
-          structure. They have a top-level directory and all wxGlade files are
-          under those top-level directory. Extract the package into the user's
-          home directory. Take care that the directory structure of the
-          archive will be preserved. Rename the top-level directory to
-          wxGlade. That's shorter and simpler to use.</p><p>Change into the new created directory. Execute the
-          <span class="command"><strong>wxglade</strong></span> file on Unix operating systems or
-          <span class="command"><strong>wxglade.pyw</strong></span> on Microsoft Windows to start
-          wxGlade. Feel free to create a shortcut on your desktop.</p><p>That's all. Installations below users home directory don't
-          require administrative permissions.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191729824"></a>Multi User Installation - Variant A on Windows and
-          Unix</h4></div></div></div><p>The first variant of a multi user installation is very similar
-          to <a class="xref" href="installing.html#installation_single_user" title="Single User Installation (Extract and Run)">the section called “Single User Installation (Extract and Run)”</a> except the
-          installation directory. And probably you need administrative
-          permissions. You could extract the wxGlade source package e.g. into
-          <span class="command"><strong>C:\Program Files\wxGlade</strong></span> on Microsoft Windows or
-          into <span class="command"><strong>/opt/wxGlade</strong></span> on Unix. Execute the
-          <span class="command"><strong>wxglade</strong></span> file on Unix operating systems or
-          <span class="command"><strong>wxglade.pyw</strong></span> on Microsoft Windows to start
-          wxGlade.</p><div class="figure"><a name="idm139900191725520"></a><p class="title"><b>Figure 2.1. Starting wxGlade on Windows at C:\Program
-            Files\wxGlade</b></p><div class="figure-contents"><div class="mediaobject"><img src="wxglade_start_on_windows.png" width="531" alt="Starting wxGlade on Windows at C:\Program Files\wxGlade"></div></div></div><br class="figure-break"></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191722880"></a>Multi User Installation - Variant B on Unix</h4></div></div></div><p>The second installation method is only supported Unix
-          operating systems.</p><p>Extract the downloaded package into a temporary directory.
-          Open a terminal window, change into the temporary directory and
-          install wxGlade using execute the Python setup script
-          <span class="command"><strong>setup.py</strong></span> as follow:</p><p><span class="command"><strong>python2 setup.py install --root &lt;DESTINATION
-          DIRECTORY&gt;</strong></span></p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>Parameters shown in angle brackets (e.g.,
-            <span class="quote">“<span class="quote"><em class="parameter"><code>&lt;parameter&gt;</code></em></span>”</span>) are
-            required.</p><p>Parameters shown in square brackets (e.g.,
-            <span class="quote">“<span class="quote"><em class="parameter"><code>[parameter]</code></em></span>”</span>) are optional.
-            If not given, wxGlade will use suitable defaults.</p></div><div class="example"><a name="idm139900191717024"></a><p class="title"><b>Example 2.1. Installing wxGlade at /opt/wxglade</b></p><div class="example-contents"><pre class="screen"># python2 setup.py install --root /opt/wxGlade
-running install
-running build
-running build_py
-running build_scripts
-running install_lib
-creating /opt/wxGlade
-creating /opt/wxGlade/usr
-creating /opt/wxGlade/usr/lib
-creating /opt/wxGlade/usr/lib/python2.7
-[...]
-writing manifest file 'wxGlade.egg-info/SOURCES.txt'
-Copying wxGlade.egg-info to /opt/wxGlade/usr/lib/python2.7/site-packages/wxGlade-0.7.1rc1-py2.7.egg-info
-running install_scripts
-creating /opt/wxGlade/usr/bin
-copying build/scripts-2.7/wxglade -&gt; /opt/wxGlade/usr/bin
-changing mode of /opt/wxGlade/usr/bin/wxglade to 755
-</pre></div></div><br class="example-break"><p>Once the installation has finished the wxGlade main script
-          <span class="command"><strong>wxglade </strong></span>is located at <span class="command"><strong>&lt;install
-          directory&gt;/usr/bin</strong></span>.</p><p>Execute the script <span class="command"><strong>&lt;install
-          directory&gt;/usr/bin/wxglade</strong></span> to start wxGlade</p><div class="figure"><a name="idm139900191711872"></a><p class="title"><b>Figure 2.2. Starting wxGlade on Linux at
-            /opt/wxglade/bin/wxglade</b></p><div class="figure-contents"><div class="mediaobject"><img src="wxglade_start_on_linux.png" width="531" alt="Starting wxGlade on Linux at /opt/wxglade/bin/wxglade"></div></div></div><br class="figure-break"></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="installation.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="installation.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="running_wxglade.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 2. Installation </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 3. Running wxGlade</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/invocation_cmdline.html wxglade-1.0.1/docs_old/html/invocation_cmdline.html
--- wxglade-0.9.6/docs_old/html/invocation_cmdline.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/invocation_cmdline.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Command Line Invocation</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="running_wxglade.html" title="Chapter 3. Running wxGlade"><link rel="prev" href="languages.html" title="Languages"><link rel="next" href="configure_wxglade.html" title="Configuring wxGlade"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Command Line Invocation</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="languages.html">Prev</a> </td><th width="60%" align="center">Chapter 3. Running wxGlade</th><td width="20%" align="right"> <a accesskey="n" href="configure_wxglade.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="invocation_cmdline"></a>Command Line Invocation</h2></div></div></div><p>You can run wxGlade without parameters to start the GUI with an
-      empty project as follows:</p><p><span class="command"><strong>wxglade</strong></span></p><p>Run wxGlade GUI on an existing project specifying the
-      <code class="filename">.wxg</code> file as follow:</p><p><span class="command"><strong>wxglade &lt;WXG File&gt;</strong></span></p><p>If you only want to generate the code without starting the GUI,
-      use the <code class="option">-g</code> or <code class="option">--generate-code</code> option
-      with the language as argument as follows:</p><p><span class="command"><strong>wxglade -g &lt;LANGUAGE&gt; &lt;WXG
-      File&gt;</strong></span></p><p><span class="command"><strong>wxglade --generate-code=&lt;LANGUAGE&gt; &lt;WXG
-      File&gt;</strong></span></p><p>Possible values for LANGUAGE are "XRC", "python", "perl", "lisp"
-      or "C++".</p><p>You can also specify the destination of the generated code with
-      <code class="option">-o</code> or <code class="option">--output</code> option:</p><p><span class="command"><strong>wxglade -g &lt;LANGUAGE&gt; -o &lt;DESTINATION&gt;
-      &lt;WXG File&gt;</strong></span></p><p>The DESTINATION argument can be a file or a directory.</p><p>Complete command line description:</p><pre class="screen"># wxglade --help
-Usage: wxglade &lt;WXG File&gt;             start the wxGlade GUI
- or:   wxglade &lt;Options&gt; &lt;WXG File&gt;   generate code from command line
- or:   wxglade --version              show programs version number and exit
- or:   wxglade -h|--help              show this help message and exit
-
-Options:
-  --version             show program's version number and exit
-  -h, --help            show this help message and exit
-  -g LANG, --generate-code=LANG
-                        (required) output language, valid languages are: C++,
-                        XRC, lisp, perl, python
-  -o PATH, --output=PATH
-                        (optional) output file in single-file mode or output
-                        directory in multi-file mode
-
-Example: Generate Python code out of myapp.wxg
-
-   wxglade -o output.py -g python myapp.wxg
-
-Report bugs to:    &lt;wxglade-general@lists.sourceforge.net&gt; or at
-                   &lt;https://sourceforge.net/projects/wxglade/&gt;
-wxGlade home page: &lt;http://wxglade.sourceforge.net/&gt;
-</pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>Use <span class="command"><strong>wxglade.pyw</strong></span> instead of
-        <span class="command"><strong>wxglade</strong></span> on Microsoft Windows.</p><p>Parameters shown in angle brackets (e.g.,
-        <span class="quote">“<span class="quote"><em class="parameter"><code>&lt;parameter&gt;</code></em></span>”</span>) are
-        required.</p><p>Parameters shown in angle brackets (e.g.,
-        <span class="quote">“<span class="quote"><em class="parameter"><code>&lt;parameter&gt;</code></em></span>”</span>) are
-        required.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="languages.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="running_wxglade.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="configure_wxglade.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Languages </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Configuring wxGlade</td></tr></table></div></body></html>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/label_menu.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/label_menu.png differ
diff -Nru wxglade-0.9.6/docs_old/html/languages.html wxglade-1.0.1/docs_old/html/languages.html
--- wxglade-0.9.6/docs_old/html/languages.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/languages.html	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Languages</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="running_wxglade.html" title="Chapter 3. Running wxGlade"><link rel="prev" href="running_wxglade.html" title="Chapter 3. Running wxGlade"><link rel="next" href="invocation_cmdline.html" title="Command Line Invocation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Languages</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="running_wxglade.html">Prev</a> </td><th width="60%" align="center">Chapter 3. Running wxGlade</th><td width="20%" align="right"> <a accesskey="n" href="invocation_cmdline.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="languages"></a>Languages</h2></div></div></div><p>wxGlade uses English only, currently.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="running_wxglade.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="running_wxglade.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="invocation_cmdline.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 3. Running wxGlade </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Command Line Invocation</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/license_mit.html wxglade-1.0.1/docs_old/html/license_mit.html
--- wxglade-0.9.6/docs_old/html/license_mit.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/license_mit.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>wxGlade License Agreement</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="copyright.html" title="Appendix B. Copyrights, Licenses and Trademarks"><link rel="prev" href="copyright.html" title="Appendix B. Copyrights, Licenses and Trademarks"><link rel="next" href="trademarks.html" title="Trademarks"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">wxGlade License Agreement</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="copyright.html">Prev</a> </td><th width="60%" align="center">Appendix B. Copyrights, Licenses and Trademarks</th><td width="20%" align="right"> <a accesskey="n" href="trademarks.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="license_mit"></a>wxGlade License Agreement</h2></div></div></div><p>Copyright (c) 2002-2007 Alberto Griggio.</p><p>Copyright (c) 2011-2016 Carsten Grohmann.</p><p>Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation files
-      (the "Software"), to deal in the Software without restriction, including
-      without limitation the rights to use, copy, modify, merge, publish,
-      distribute, sublicense and/or sell copies of the Software, and to permit
-      persons to whom the Software is furnished to do so, subject to the
-      following conditions:</p><p>The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.</p><p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-      IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-      TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-      SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="copyright.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="copyright.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="trademarks.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Appendix B. Copyrights, Licenses and Trademarks </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Trademarks</td></tr></table></div></body></html>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/main_window.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/main_window.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/mondrian_200x200.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/mondrian_200x200.png differ
diff -Nru wxglade-0.9.6/docs_old/html/next_steps.html wxglade-1.0.1/docs_old/html/next_steps.html
--- wxglade-0.9.6/docs_old/html/next_steps.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/next_steps.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Next Steps</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="working_with_wxglade.html" title="Chapter 4. Working with wxGlade"><link rel="prev" href="working_with_wxglade.html" title="Chapter 4. Working with wxGlade"><link rel="next" href="ui.html" title="Chapter 5. wxGlade User Interface"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Next Steps</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="working_with_wxglade.html">Prev</a> </td><th width="60%" align="center">Chapter 4. Working with wxGlade</th><td width="20%" align="right"> <a accesskey="n" href="ui.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="next_steps"></a>Next Steps</h2></div></div></div><p>This section covers advanced topics like the handling of
-      automatically generated source files or escaping of special characters
-      like newline characters or tab characters.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191555952"></a>Escape Sequences</h3></div></div></div><p>Escape sequences are used to define certain special characters
-        within string literals. wxGlade supports escape sequences generally.
-        The only exception is the null byte
-        (<span class="quote">“<span class="quote"><span class="emphasis"><em>0</em></span></span>”</span>) and the escape sequence
-        (<span class="quote">“<span class="quote"><span class="emphasis"><em>\0</em></span></span>”</span>) belonging to it. wxGlade
-        can't handle null bytes.</p><p>Escape sequences like <span class="quote">“<span class="quote"><span class="emphasis"><em>\n</em></span></span>”</span> or
-        <span class="quote">“<span class="quote"><span class="emphasis"><em>\t</em></span></span>”</span> will not touched by wxGlade.
-        Thereby the generated source code contains exactly the same sequence
-        as entered. The language interpreter or compiler will interpret and
-        probably convert the sequence into control characters. For example
-        <span class="quote">“<span class="quote"><span class="emphasis"><em>\n</em></span></span>”</span> will be converted into a line
-        break.</p><p>Escape sequences with at least two leading backslashes e.g.
-        <span class="quote">“<span class="quote"><span class="emphasis"><em>\\n</em></span></span>”</span> will be escaped to show exact
-        the same sequence and don't convert it into control characters.
-        Question marks especially double quotes will be escaped also.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="best_practice"></a>Best Practice</h3></div></div></div><p>These recommendations should help to improve the usability and
-        maintainability of code generated by wxGlade. They combine the
-        experience of many wxGlade users.</p><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191548656"></a>Overwrite Existing Sources</h4></div></div></div><p>wxGlade is able to change the own code inside existing source
-          files to reflect changed designs.</p><p>This feature has some limitations. They are detailed discusses
-          in <a class="xref" href="next_steps.html#shared_control" title="Shared Control">the section called “Shared Control”</a>.</p><p>It's common coding practice to separate and encapsulate
-          individual responsibilities. Using a derived class to extend the
-          code e.g. with GUI logic would follow this practice.</p><div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Warning</h3><p>This feature is deprecated and will be removed from a
-              future version of wxGlade. Thereby it's advised not to use this
-              feature for new projects. Details about all deprecated features
-              are shown in <a class="xref" href="deprecated_features.html" title="Deprecated Features">the section called “Deprecated Features”</a>.</p></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191544160"></a>Use the C++ naming convention</h4></div></div></div><p>Use the C++ names for all wx identifiers like classes, colours
-          or events of the wx framework. Please don't enter identifiers
-          already formatted in a language specific form. wxGlade is able to
-          transform the entered original identifiers in language-specific
-          terms. You can use your own style for your object certainly.</p><div class="example"><a name="idm139900191542768"></a><p class="title"><b>Example 4.1. Correct entered wx constant</b></p><div class="example-contents"><p>Enter <span class="quote">“<span class="quote"><span class="command"><strong>wxID_CANCEL</strong></span></span>”</span> even for
-            wxPython instead of
-            <span class="quote">“<span class="quote"><span class="command"><strong>wx.ID_CANCEL</strong></span></span>”</span></p></div></div><br class="example-break"></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191540112"></a>Use UTF-8 encoding</h4></div></div></div><p>It's generally recommended to use Unicode encoding for all
-          non-ASCII character sets.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191538848"></a>Use Gettext Support</h4></div></div></div><p>Enable internationalisation support. There are no
-          disadvantages if internationalization is active but not used.</p><p>It's hard to add i18n and Unicode afterwards from project
-          point of view.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191537072"></a>Naming Conventions</h4></div></div></div><p>The wxWidgets are written in C++ and follow the C++ naming
-          convention. This naming convention may differ from the language
-          specific and / or project specific naming convention.</p><p>For consistency's sake, it's recommended to use the wxWidgets
-          style.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191535232"></a>Prevent Language Specific Statements</h4></div></div></div><p>Usage of language specific codes e.g. for
-          <span class="quote">“<span class="quote"><span class="guilabel">Extra code for this widget</span></span>”</span> or in
-          generic input fields complicated changing the output language later
-          e.g. to re-use GUI elements in another project too.</p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191533040"></a>Language Specific Peculiarities</h3></div></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191532400"></a>Python</h4></div></div></div><p>It's not recommended to use nested classed and functions in
-          combination with disabled feature <span class="quote">“<span class="quote"><span class="guilabel">Overwrite
-          existing sources</span></span>”</span>. Use derived classes to
-          implement your functionality. See <a class="xref" href="next_steps.html#best_practice" title="Best Practice">the section called “Best Practice”</a> also.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191529792"></a>Lisp</h4></div></div></div><p>The Lisp code generated by wxGlade may or may not working with
-          a current Lisp dialect. Help to improve the Lisp support is really
-          welcome.</p><p>Unsupported features in Lisp:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Unicode support</p></li><li class="listitem"><p>Support for wxWidgets 3.0</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191526160"></a>XRC</h4></div></div></div><p>The XRC code writer doesn't supports all bitmap path tags
-          described in <a class="xref" href="codegen_bitmap_path.html" title="Specifying the Path of Bitmaps">the section called “Specifying the Path of Bitmaps”</a>.</p><p>Just the <span class="quote">“<span class="quote"><code class="code">art:</code></span>”</span> statement is
-          supported. The remaining bitmap tags will irgnored.</p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="using.source.code.section"></a>Using the Source Code</h3></div></div></div><p>There are a lot of options to control the source code generation
-        process. They are bundled in the
-        <span class="quote">“<span class="quote"><span class="guilabel">Application</span></span>”</span> page of the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window (see <a class="xref" href="ui_properties_window.html#properties_window_application.fig" title="Figure 5.6. Project Properties - Application settings">Figure 5.6, “Project Properties - Application settings”</a>). Let's talk about three
-        of those options -<span class="quote">“<span class="quote"><span class="guilabel">Single file</span></span>”</span>,
-        <span class="quote">“<span class="quote"><span class="guilabel">Separate file for each class</span></span>”</span> and
-        <span class="quote">“<span class="quote"><span class="guilabel">Overwrite existing sources</span></span>”</span>.</p><p>The first two options triggers wxGlade to generate one file with
-        all classes inside or multiple files - one per class/widget. The
-        <span class="quote">“<span class="quote"><span class="guilabel">Single file</span></span>”</span>option includes source
-        and header file for C++ certainly.</p><p>The third option <span class="quote">“<span class="quote"><span class="guilabel">Overwrite existing
-        sources</span></span>”</span> is just about control - <span class="quote">“<span class="quote">Full control
-        by wxGlade</span>”</span> and <span class="quote">“<span class="quote">Shared control</span>”</span>. It separated the
-        two ways to work with wxGlade.</p><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="full_control"></a>Full Control by
-          wxGlade</h4></div></div></div><p>If <span class="quote">“<span class="quote"><span class="guilabel">Overwrite existing
-          sources</span></span>”</span> is set, wxGlade will re-generated all
-          source files and drop potential manual changes. You've to include
-          the generated source files and use derived classes for implementing
-          changes.</p><p>The files written by wxGlade are consistent always. Also if
-          e.g. classes or attributes are renamed. Rewriting the whole files is
-          less error-prone in comparison with <a class="xref" href="next_steps.html#shared_control" title="Shared Control">the section called “Shared Control”</a>. That is the advantages of this
-          method.</p><p>This method is the recommended one.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="shared_control"></a>Shared Control</h4></div></div></div><p>Manual changes in the source files won't be overwritten if
-          <span class="quote">“<span class="quote"><span class="guilabel">Overwrite existing sources</span></span>”</span> isn't
-          set. You can safely edit the source code of the generated class.
-          This is because wxGlade marks the untouchable code with the special
-          comments <span class="quote">“<span class="quote"><span class="command"><strong>begin wxGlade</strong></span></span>”</span> and
-          <span class="quote">“<span class="quote"><span class="command"><strong>end wxGlade</strong></span></span>”</span>. So you can edit all
-          you need outside these two tags. When you make changes in your
-          forms, a new code generation will not modify the user code. wxGlade
-          is applying most of the changes but not all.</p><p>The source code modifications by wxGlade may incomplete
-          after:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>renaming classes and attributes</p></li><li class="listitem"><p>changes in dependencies are not updated in all use
-              cases</p></li><li class="listitem"><p>changing the base classes or replace a single base class
-              by multipe base classes or vis-a-vis</p></li><li class="listitem"><p>nested classed and functions</p></li><li class="listitem"><p>if the percent sign (<span class="quote">“<span class="quote">%</span>”</span>) have been added
-              manually</p></li><li class="listitem"><p>removing event handlers</p></li></ul></div><p>Additionally there are some internal flaws like the
-          inconsistent design of the begin and end markers, just compare the
-          event handler code generated for Perl and Python. Improving the
-          handling internally would break the backward compatibility.</p><div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Warning</h3><p>This feature is deprecated and will be removed from a future
-            version of wxGlade. Thereby it's advised not to use this feature
-            for new projects. Details about all deprecated features are shown
-            in <a class="xref" href="deprecated_features.html" title="Deprecated Features">the section called “Deprecated Features”</a>.</p></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="output.path.filenames.section"></a>Output Path and Filenames</h4></div></div></div><p><span class="quote">“<span class="quote"><span class="guilabel">Output path</span></span>”</span> specifies the
-          name of the output file for <span class="quote">“<span class="quote"><span class="guilabel">Single
-          file</span></span>”</span> projects or the output directory for
-          multi-file projects (<span class="quote">“<span class="quote"><span class="guilabel">Separate file for each
-          class</span></span>”</span>).</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="automatically.created.wxapp.instance.section"></a>Automatically Created <code class="classname">wxApp</code>
-          Instances</h4></div></div></div><p>wxGlade can create additional code to start an instance of
-          projects <span class="quote">“<span class="quote"><span class="guilabel">Top window</span></span>”</span>.</p><p>There are two types of application start code:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>simplified application start code</p></li><li class="listitem"><p>detailed application start code</p></li></ul></div><p>The application start code generation is controlled by three
-          properties:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p><span class="guilabel">Name</span></p></li><li class="listitem"><p><span class="guilabel">Class</span></p></li><li class="listitem"><p><span class="guilabel">Top window</span></p></li></ol></div><p>Those properties are explained in <a class="xref" href="ui_properties_window.html#ui_application_properties" title="Application Properties">the section called “Application Properties”</a>. Different combinations
-          of those attributes generated different application start code. The
-          table below shows the type of application start code resulting from
-          different combinations of the three properties. The
-          <span class="quote">“<span class="quote"><span class="guilabel">Enable gettext support</span></span>”</span> property
-          just triggers i18n-enabled source code.</p><div class="table"><a name="idm139900191482912"></a><p class="title"><b>Table 4.1. Interaction between properties to generate different types
-            of start code</b></p><div class="table-contents"><table class="table" summary="Interaction between properties to generate different types
-            of start code" border="1"><colgroup><col><col><col><col></colgroup><thead><tr><th align="left"><span class="guilabel">Name</span></th><th align="left"><span class="guilabel">Class</span></th><th align="left"><span class="guilabel">Top window</span></th><th align="left"><span class="guilabel">Type of application start code
-                  to generate</span></th></tr></thead><tbody><tr><td>not selected</td><td>not selected</td><td>not selected</td><td>not generated</td></tr><tr><td>selected</td><td>not selected</td><td>not selected</td><td>not generated</td></tr><tr><td>not selected</td><td>selected</td><td>not selected</td><td>not generated</td></tr><tr><td>selected</td><td>selected</td><td>not selected</td><td>not generated</td></tr><tr><td>selected</td><td>not selected</td><td>selected</td><td>simplified start code</td></tr><tr><td>not selected</td><td>selected</td><td>selected</td><td>not generated</td></tr><tr><td>selected</td><td>selected</td><td>selected</td><td>detailed start code</td></tr></tbody></table></div></div><br class="table-break"><p>The application start code of a multi-file project will be
-          recreated every time the code generation is running.</p><p>In opposition the application start code of single-file
-          projects will not updated if the name of the <span class="quote">“<span class="quote"><span class="guilabel">Top
-          window</span></span>”</span> has changed and <span class="quote">“<span class="quote"><span class="guilabel">Overwrite
-          existing sources</span></span>”</span> is not set.</p><div class="example"><a name="idm139900191459024"></a><p class="title"><b>Example 4.2. Detailed application start code in Perl</b></p><div class="example-contents"><pre class="programlisting">package MyApp;
-
-use base qw(Wx::App);
-use strict;
-
-sub OnInit {
-    my( $self ) = shift;
-
-    Wx::InitAllImageHandlers();
-
-    my $frame_1 = MyFrame-&gt;new();
-
-    $self-&gt;SetTopWindow($frame_1);
-    $frame_1-&gt;Show(1);
-
-    return 1;
-}
-# end of class MyApp
-
-package main;
-unless(caller){
-    my $local = Wx::Locale-&gt;new("English", "en", "en"); # replace with ??
-    $local-&gt;AddCatalog("app"); # replace with the appropriate catalog name
-
-    my $app = MyApp-&gt;new();
-    $app-&gt;MainLoop();
-}</pre></div></div><p><br class="example-break"></p><div class="example"><a name="idm139900191456192"></a><p class="title"><b>Example 4.3. Simplified application start code in Perl</b></p><div class="example-contents"><pre class="programlisting">package main;
-
-unless(caller){
-    my $local = Wx::Locale-&gt;new("English", "en", "en"); # replace with ??
-    $local-&gt;AddCatalog("PlOgg1_app"); # replace with the appropriate catalog name
-
-    local *Wx::App::OnInit = sub{1};
-    my $PlOgg1_app = Wx::App-&gt;new();
-    Wx::InitAllImageHandlers();
-
-    my $Mp3_To_Ogg = PlOgg1_MyDialog-&gt;new();
-
-    $PlOgg1_app-&gt;SetTopWindow($Mp3_To_Ogg);
-    $Mp3_To_Ogg-&gt;Show(1);
-    $PlOgg1_app-&gt;MainLoop();
-}</pre></div></div><br class="example-break"></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191453536"></a>Compiling C++ Code</h4></div></div></div><p>You can compile your wxGlade project after the generation of
-          the C++ source and header files. The following examples demonstrate
-          compiling on Linux command line using <span class="command"><strong>g++</strong></span>.</p><div class="example"><a name="idm139900191451680"></a><p class="title"><b>Example 4.4. Compiling a single file C++ project on Linux</b></p><div class="example-contents"><pre class="screen"># g++ FontColour.cpp $(wx-config --libs) $(wx-config --cxxflags) -o FontColour
-
-# ll FontColour*
--rwxr-xr-x 1 carsten carsten 72493 Jun 15 09:22 FontColour
--rwxr-xr-x 1 carsten carsten  1785 Mai 11 19:24 FontColour.cpp
--rwxr-xr-x 1 carsten carsten  1089 Jun 11 07:09 FontColour.h</pre></div></div><br class="example-break"><div class="example"><a name="idm139900191450000"></a><p class="title"><b>Example 4.5. Compiling a multi file C++ project on Linux</b></p><div class="example-contents"><pre class="screen"># g++  CPPOgg2_main.cpp $(wx-config --libs) $(wx-config --cxxflags) \
-  -o CPPOgg2_main CPPOgg2_MyDialog.cpp CPPOgg2_MyFrame.cpp
-
-# ll CPPOgg2*
--rwxr-xr-x 1 carsten carsten 108354 Jun 15 09:33 CPPOgg2_main
--rwxr-xr-x 1 carsten carsten    844 Mai 11 19:25 CPPOgg2_main.cpp
--rw-r--r-- 1 carsten carsten   5287 Mai 18 19:06 CPPOgg2_MyDialog.cpp
--rw-r--r-- 1 carsten carsten   1829 Jun 11 07:11 CPPOgg2_MyDialog.h
--rw-r--r-- 1 carsten carsten   1785 Mai 11 19:25 CPPOgg2_MyFrame.cpp
--rw-r--r-- 1 carsten carsten   1290 Jun 11 07:10 CPPOgg2_MyFrame.h</pre></div></div><br class="example-break"></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191447792"></a>Handling XRC Files</h3></div></div></div><p>wxGlade is able to save projects as XRC files and to convert XRC
-        files into wxGlade projects.</p><p>One way for converting XRC files is the usage of the Python
-        script <span class="command"><strong>xrc2wxg.py</strong></span> at command line. The script is
-        part of wxGlade.</p><div class="example"><a name="idm139900191445568"></a><p class="title"><b>Example 4.6. Converting a XRC file into a wxGlade project</b></p><div class="example-contents"><pre class="screen"># ./xrc2wxg.py FontColour.xrc
-
-# ls -l FontColour.*
--rw-r--r-- 1 carsten carsten 5554 Dez  4 20:36 FontColour.wxg
--rw-r--r-- 1 carsten carsten 4992 Dez  4 20:13 FontColour.xrc</pre></div></div><br class="example-break"><p>The <span class="quote">“<span class="quote"><span class="guimenu">File</span></span>”</span> menu provides a menu
-        item <span class="quote">“<span class="quote"><span class="guimenuitem">Import from XRC...</span></span>”</span> to
-        import and open a XRC file directly.</p><p>The following example shows how to load and show the frame
-        <span class="quote">“<span class="quote">Main</span>”</span> from XRC file
-        <code class="filename">test.xrc</code>.</p><div class="example"><a name="idm139900191440624"></a><p class="title"><b>Example 4.7. wxPython code to load and show a XRC resource</b></p><div class="example-contents"><pre class="programlisting">#!/usr/bin/env python2
-
-import wx
-from wx import xrc
-
-GUI_FILENAME = "test.xrc"
-GUI_MAINFRAME_NAME = "Main"
-
-class MyApp(wx.App):
-    def OnInit(self):
-        self.res = xrc.XmlResource(GUI_FILENAME)
-        self.frame = self.res.LoadFrame(None, GUI_MAINFRAME_NAME)
-        self.frame.Show()
-        return True
-
-if __name__ == "__main__":
-    app = MyApp()
-    app.MainLoop()</pre></div></div><br class="example-break"></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="working_with_wxglade.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="working_with_wxglade.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ui.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 4. Working with wxGlade </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 5. wxGlade User Interface</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/preface.html wxglade-1.0.1/docs_old/html/preface.html
--- wxglade-0.9.6/docs_old/html/preface.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/preface.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Preface</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="index.html" title="wxGlade manual"><link rel="next" href="preface_license.html" title="License"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Preface</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="preface_license.html">Next</a></td></tr></table><hr></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a name="preface"></a>Preface</h1></div></div></div><p>This manual describes the program wxGlade, initially written by
-    Alberto Griggio. wxGlade is a Python, Perl, Lisp, C++ and XRC Graphical
-    User Interface (<span class="quote">“<span class="quote">GUI</span>”</span>) editor for Unix and Microsoft Windows.
-    Each of the chapters in this manual is designed as a tutorial for using
-    wxGlade and a reference for widgets supported until now.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="preface_contact"></a>Contact</h2></div></div></div><p>Check the project homepage <a class="ulink" href="http://wxglade.sourceforge.net" target="_top">http://wxglade.sourceforge.net</a>
-      for the mailing list to discuss the project. Use the lists for
-      questions, proposals, bug reports and collaboration. Information,
-      support and bug reports can be addressed to the wxGlade mailing list
-      too.</p><p>Any kind of feedback is always welcome.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="preface_license.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">wxGlade manual </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> License</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/preface_license.html wxglade-1.0.1/docs_old/html/preface_license.html
--- wxglade-0.9.6/docs_old/html/preface_license.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/preface_license.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>License</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="preface.html" title="Preface"><link rel="prev" href="preface.html" title="Preface"><link rel="next" href="start.html" title="Chapter 1. Getting Started"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">License</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="preface.html">Prev</a> </td><th width="60%" align="center">Preface</th><td width="20%" align="right"> <a accesskey="n" href="start.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="preface_license"></a>License</h2></div></div></div><p>wxGlade is copyright 2002-2007 by Alberto Griggio and 2011-2016 by
-      Carsten Grohmann.</p><p>Use and distribution of wxGlade is governed by the MIT license,
-      located in <a class="xref" href="license_mit.html" title="wxGlade License Agreement">the section called “wxGlade License Agreement”</a>.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="preface.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="preface.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="start.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Preface </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 1. Getting Started</td></tr></table></div></body></html>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/preferences.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/preferences.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/preview_window.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/preview_window.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_custom_widget.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_custom_widget.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_menu_editor.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_menu_editor.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_toolbar_editor.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_toolbar_editor.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_window_application.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_window_application.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_window_settings.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_window_settings.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_window_statusbar.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_window_statusbar.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_window_tab_1_change.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_window_tab_1_change.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_window_tab_1.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_window_tab_1.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_window_tab_2.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_window_tab_2.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_window_tab_3_dont_generate_code.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_window_tab_3_dont_generate_code.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_window_tab_3.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_window_tab_3.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_window_tab_4.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_window_tab_4.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/properties_window_tab_5.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/properties_window_tab_5.png differ
diff -Nru wxglade-0.9.6/docs_old/html/running_wxglade.html wxglade-1.0.1/docs_old/html/running_wxglade.html
--- wxglade-0.9.6/docs_old/html/running_wxglade.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/running_wxglade.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 3. Running wxGlade</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="installing.html" title="Installing wxGlade"><link rel="next" href="languages.html" title="Languages"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 3. Running wxGlade</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="installing.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="languages.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="running_wxglade"></a>Chapter 3. Running wxGlade</h1></div></div></div><p>Once the installation of wxGlade is finished successfully, you can
-    start wxGlade either by clicking on the desktop icon, selecting the
-    program from the <span class="quote">“<span class="quote">Start Menu</span>”</span> or on a command line as
-    described in <a class="xref" href="invocation_cmdline.html" title="Command Line Invocation">the section called “Command Line Invocation”</a>.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="known_platforms"></a>Known Platforms</h2></div></div></div><p>wxGlade works on most Unix platforms and Microsoft Windows.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="installing.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="languages.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Installing wxGlade </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Languages</td></tr></table></div></body></html>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/select_frame.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/select_frame.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/sizer_menu.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/sizer_menu.png differ
diff -Nru wxglade-0.9.6/docs_old/html/star_bars.html wxglade-1.0.1/docs_old/html/star_bars.html
--- wxglade-0.9.6/docs_old/html/star_bars.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/star_bars.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Menubar, Statusbar and Toolbar</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="supported_widgets.html" title="Chapter 6. Supported widgets"><link rel="prev" href="codegen_bitmap_path.html" title="Specifying the Path of Bitmaps"><link rel="next" href="widget_list.html" title="Widget List"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Menubar, Statusbar and Toolbar</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="codegen_bitmap_path.html">Prev</a> </td><th width="60%" align="center">Chapter 6. Supported widgets</th><td width="20%" align="right"> <a accesskey="n" href="widget_list.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="star_bars"></a>Menubar, Statusbar and Toolbar</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191092432"></a>Introduction</h3></div></div></div><p>wxGlade helps you to design the menu, the tool bar and the
-        status bar for your application.</p><p>There are two ways to integrate the three elements into a
-        wxGlade project:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Create standalone widgets by clicking the corresponding
-            button in the main window.</p></li><li class="listitem"><p>Associated with a <code class="classname">wxFrame</code>by selecting
-            the related checkboxes in the <code class="classname">wxFrame</code>
-            properties window.</p></li></ol></div><p>Associated bars will be integrated automatically to the right
-        place. On the other side standalone widgets have to integrate the
-        elements later manually in design after the source code has been
-        generated.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191086784"></a>Menu</h3></div></div></div><p>In the menu <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span>
-        window click on the <span class="quote">“<span class="quote"><span class="guibutton">Edit
-        menus...</span></span>”</span> button. A dialog will let you edit your
-        menu. Use the <span class="quote">“<span class="quote"><span class="guibutton">Add</span></span>”</span> button to add
-        items to the menu; enter the label, an optional name and help string.
-        You can use numbers or variable names as the item id. If you use a
-        variable name, you have to provide extra code in the generated source
-        code.</p><p>Choose the type of the item: Normal, Checkable or Radio.</p><p>You can move menu items with
-        <span class="quote">“<span class="quote"><span class="guibutton">Up</span></span>”</span> and
-        <span class="quote">“<span class="quote"><span class="guibutton">Down</span></span>”</span> buttons, and you can modify
-        the hierarchy of the menu with
-        <span class="quote">“<span class="quote"><span class="guibutton">&lt;</span></span>”</span> and
-        <span class="quote">“<span class="quote"><span class="guibutton">&gt;</span></span>”</span> buttons.</p><div class="figure"><a name="idm139900191079200"></a><p class="title"><b>Figure 6.1. Menu editor</b></p><div class="figure-contents"><div class="mediaobject"><img src="properties_menu_editor.png" width="531" alt="Menu editor"></div></div></div><br class="figure-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191076560"></a>Statusbar</h3></div></div></div><p>In the <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you
-        can edit the list of fields and their size.</p><div class="figure"><a name="idm139900191074704"></a><p class="title"><b>Figure 6.2. Statusbar properties</b></p><div class="figure-contents"><div class="mediaobject"><img src="properties_window_statusbar.png" width="283" alt="Statusbar properties"></div></div></div><br class="figure-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191072064"></a>Toolbar</h3></div></div></div><p>You can edit the toolbar style and bitmap size in the properties
-        window.</p><p>Click on the <span class="quote">“<span class="quote">Edit tools...</span>”</span> button to edit the
-        toolbar buttons. Use the <span class="quote">“<span class="quote">Add</span>”</span> button to add buttons to
-        the toolbar; enter the label, an optional name and help string. You
-        can use numbers or variable names as the button id. If you use a
-        variable name, you have to provide extra code in the generated source
-        code.</p><p>Choose the type of the button: Normal, Checkable or
-        Radio.</p><p>You can move toolbar buttons with
-        <span class="quote">“<span class="quote"><span class="guibutton">Up</span></span>”</span> and
-        <span class="quote">“<span class="quote"><span class="guibutton">Down</span></span>”</span> buttons.</p><p>You have to enter two bitmaps, one for normal status and the
-        other for the pushed status.</p><p>Refer to <a class="xref" href="codegen_bitmap_path.html" title="Specifying the Path of Bitmaps">the section called “Specifying the Path of Bitmaps”</a> for bitmap path
-        specifications.</p><div class="figure"><a name="idm139900191065776"></a><p class="title"><b>Figure 6.3. Toolbar editor</b></p><div class="figure-contents"><div class="mediaobject"><img src="properties_toolbar_editor.png" width="354" alt="Toolbar editor"></div></div></div><br class="figure-break"></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="codegen_bitmap_path.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="supported_widgets.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="widget_list.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Specifying the Path of Bitmaps </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Widget List</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/start.html wxglade-1.0.1/docs_old/html/start.html
--- wxglade-0.9.6/docs_old/html/start.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/start.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 1. Getting Started</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="preface_license.html" title="License"><link rel="next" href="installation.html" title="Chapter 2. Installation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. Getting Started</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="preface_license.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="installation.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="start"></a>Chapter 1. Getting Started</h1></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="what_is_wxglade"></a>What is wxGlade?</h2></div></div></div><p>wxGlade is an open source graphical user interface builder written
-      in Python using popular widget toolkit wxWidgets.</p><div class="figure"><a name="idm139900193934928"></a><p class="title"><b>Figure 1.1. wxGlade windows</b></p><div class="figure-contents"><div class="mediaobject"><img src="wxglade.png" width="531" alt="wxGlade windows"></div></div></div><br class="figure-break"><p>wxGlade allows to create graphical user interfaces using
-      wxWidgets. The designer can arrange different widgets using a drag and
-      drop WYSIWYG editor. This simplifies the creation of a graphical user
-      interface in comparison with manual coded graphical user
-      interfaces.</p><p>wxGlade is able to generate source code for Python, Perl, Lisp,
-      C++ and XRC based on the designed GUI.</p><p>As you can guess by the name, its model is Glade, the famous
-      GTK+/GNOME GUI builder, with which wxGlade shares the philosophy and the
-      look &amp; feel (but not a line of code).</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900197115856"></a>What can you do with wxGlade?</h3></div></div></div><p>With wxGlade you can:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Design the whole GUI of your application inclusive simple or
-            complex dialogs as well as menu bars, different kinds of buttons
-            and text widgets, bitmaps, ...</p></li><li class="listitem"><p>Use the graphical editor for editing, cutting and pasting
-            widgets</p></li><li class="listitem"><p>Convert your design in source code of your favorite
-            language</p></li><li class="listitem"><p>Run wxGlade on a wide variety of operation systems since it
-            is written in Python</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900197237360"></a>What is wxGlade NOT?</h3></div></div></div><p>wxGlade is not a full featured IDE and will never be one.
-        wxGlade is just a graphical user interface builder. The generated code
-        does nothing apart from displaying the created widgets.</p><p>If you are looking for a complete IDE, maybe <a class="ulink" href="http://eric-ide.python-projects.org" target="_top">Eric Python IDE</a>,
-        <a class="ulink" href="???" target="_top">PyCharm</a>, <a class="ulink" href="http://www.codeblocks.org" target="_top">Code::Blocks</a> or one of the
-        many other IDEs the right tool.</p><p> wxGlade isn't a tool to learn programming with wxWidgets. You
-        can't use wxGlade if you do not have any basic understanding of
-        programming. You need to know the basics of wxWidgets, as well as the
-        basics of C++, Python, Perl or Lisp.</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="preface_license.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="installation.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">License </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 2. Installation</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/supported_widgets.html wxglade-1.0.1/docs_old/html/supported_widgets.html
--- wxglade-0.9.6/docs_old/html/supported_widgets.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/supported_widgets.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 6. Supported widgets</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="ui_shortcuts.html" title="Shortcuts"><link rel="next" href="codegen_bitmap_path.html" title="Specifying the Path of Bitmaps"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 6. Supported widgets</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ui_shortcuts.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="codegen_bitmap_path.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="supported_widgets"></a>Chapter 6. Supported widgets</h1></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idm139900191171952"></a>Introduction</h2></div></div></div><p>wxGlade supports a number of widgets and helps you to edit the
-      visual look and properties of each one.</p><div class="informaltable"><table class="informaltable" border="1"><colgroup><col><col><col><col></colgroup><thead><tr><th align="center">Containers</th><th align="center">Layout Widgets</th><th align="center">Common Widgets</th><th align="center">Menu bar / Status Bar / Tool bar</th></tr></thead><tbody><tr valign="top"><td valign="top"><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>wxDialog</p></li><li class="listitem"><p>wxFrame</p></li><li class="listitem"><p>wxNotebook</p></li><li class="listitem"><p>wxPanel</p></li><li class="listitem"><p>wxScrolledWindow</p></li><li class="listitem"><p>wxSplitterWindow</p></li></ul></div></td><td valign="top"><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>wxBoxSizer</p></li><li class="listitem"><p>wxStaticBoxSizer</p></li><li class="listitem"><p>wxGridSizer</p></li><li class="listitem"><p>wxFlexGridSizer</p></li><li class="listitem"><p>Spacer</p></li></ul></div></td><td valign="top"><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>wxButton</p></li><li class="listitem"><p>wxBitmapButton</p></li><li class="listitem"><p>wxCalendarCtrl</p></li><li class="listitem"><p>wxCheckBox</p></li><li class="listitem"><p>wxChoice</p></li><li class="listitem"><p>wxComboBox</p></li><li class="listitem"><p>wxDatePickerCtrl</p></li><li class="listitem"><p>wxGauge</p></li><li class="listitem"><p>wxGenericCalendarCtrl</p></li><li class="listitem"><p>wxGrid</p></li><li class="listitem"><p>wxHyperlinkCtrl</p></li><li class="listitem"><p>wxListBox</p></li><li class="listitem"><p>wxListCtrl</p></li><li class="listitem"><p>wxPropertyGridManager</p></li><li class="listitem"><p>wxRadioBox</p></li><li class="listitem"><p>wxRadioButton</p></li><li class="listitem"><p>wxSlider</p></li><li class="listitem"><p>wxSpinButton</p></li><li class="listitem"><p>wxSpinCtrl</p></li><li class="listitem"><p>wxStaticBitmap</p></li><li class="listitem"><p>wxStaticLine</p></li><li class="listitem"><p>wxStaticText</p></li><li class="listitem"><p>wxTextCtrl</p></li><li class="listitem"><p>wxToggleButton</p></li><li class="listitem"><p>wxTreeCtrl</p></li></ul></div></td><td valign="top"><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>wxMenu</p></li><li class="listitem"><p>wxMenuBar</p></li><li class="listitem"><p>Menu Bar Separators</p></li><li class="listitem"><p>Sub Menus</p></li><li class="listitem"><p>wxStatusBar</p></li><li class="listitem"><p>wxToolBar</p></li><li class="listitem"><p>Tool Bar Separators</p></li><li class="listitem"><p>Tools</p></li></ul></div></td></tr></tbody></table></div><p>Missing widgets can be integrated using the <span class="quote">“<span class="quote">Custom
-      Widget</span>”</span>.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ui_shortcuts.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="codegen_bitmap_path.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Shortcuts </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Specifying the Path of Bitmaps</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/technical_notes.html wxglade-1.0.1/docs_old/html/technical_notes.html
--- wxglade-0.9.6/docs_old/html/technical_notes.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/technical_notes.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 7. wxGlade technical notes</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="widget_list.html" title="Widget List"><link rel="next" href="contributing.html" title="Contributing to wxGlade"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 7. wxGlade technical notes</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="widget_list.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="contributing.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="technical_notes"></a>Chapter 7. wxGlade technical notes</h1></div></div></div><p>This is an informal overview of wxGlade internals, made through a
-    sample session of use. Each action of the hypothetical user will be
-    described from the point of view of the application, to (hopefully)
-    understand what's happening behind the scenes.</p><p>These notes are <span class="emphasis"><em>absolutely</em></span> incomplete and in
-    some cases they might be outdated or not completely correct: the best
-    reference is always the source code.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idm139900190941904"></a>Installing and Designing own Widget Plugins</h2></div></div></div><p>wxGlade supports a simple plugin system for widgets to load all
-      widgets at the application startup dynamically. The plugin system loads
-      all built-in widgets like <span class="quote">“<span class="quote">Static Text</span>”</span> widget or the
-      <span class="quote">“<span class="quote">Gauge</span>”</span> widget. It also loads widgets installed by
-      users.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190939840"></a>Widgets Packages</h3></div></div></div><p>The wxGlade plugin system supports two different types of widget
-        packages:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p><span class="quote">“<span class="quote">directory package</span>”</span> - a single directory with
-              all necessary files inside</p></li><li class="listitem"><p><span class="quote">“<span class="quote">ZIP package</span>”</span> - a zipped version of a
-              "directory" package</p></li></ol></div><div class="example"><a name="idm139900190935520"></a><p class="title"><b>Example 7.1. Directory package</b></p><div class="example-contents"><pre class="screen">static_text          &lt;- Directory named after the widget name
-|-- __init__.py      &lt;- Mostly an empty file or a file with just a comment
-|-- codegen.py       &lt;- Python and C++ code generators
-|-- wconfig.py       &lt;- Widget configuration
-|-- lisp_codegen.py  &lt;- Lisp code generator
-|-- perl_codegen.py  &lt;- Perl code generator
-`-- static_text.py   &lt;- wxGlade GUI code
-</pre></div></div><br class="example-break"><div class="example"><a name="idm139900190933552"></a><p class="title"><b>Example 7.2. ZIP package</b></p><div class="example-contents"><pre class="screen"># unzip -l static_text.zip 
-Archive:  static_text.zip
-  Length      Date    Time    Name
----------  ---------- -----   ----
-        0  2013-12-09 10:02   static_text/
-      329  2013-12-09 10:02   static_text/__init__.py
-     3352  2013-12-09 10:02   static_text/codegen.py
-      320  2013-12-09 10:02   static_text/wconfig.py
-     1640  2013-12-09 10:02   static_text/lisp_codegen.py
-     1841  2013-12-09 10:02   static_text/perl_codegen.py
-     5917  2013-12-09 10:02   static_text/static_text.py
----------                     -------
-    13079                     6 files</pre></div></div><br class="example-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190931312"></a>Create a ZIP Package</h3></div></div></div><p>Creating a ZIP package is quite simple. Just create a ZIP
-        package from widgets directory with all Python and additional files.
-        Don't include Python bytecode files because they are not platform
-        independent.</p><pre class="programlisting"># tree static_text/
-static_text/
-|-- __init__.py
-|-- codegen.py
-|-- wconfig.py
-|-- lisp_codegen.py
-|-- perl_codegen.py
-`-- static_text.py
-
-# zip -r static_text.zip static_text 
-  adding: static_text/ (stored 0%)
-  adding: static_text/__init__.py (deflated 36%)
-  adding: static_text/codegen.py (deflated 67%)
-  adding: static_text/wconfig.py (deflated 64%)
-  adding: static_text/lisp_codegen.py (deflated 54%)
-  adding: static_text/perl_codegen.py (deflated 56%)
-  adding: static_text/static_text.py (deflated 69%)
-</pre><p>Check the integrity of the created ZIP archive:</p><pre class="programlisting"># zip -T static_text.zip 
-test of static_text.zip OK</pre></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190927760"></a>Installing Widget Plugins Locally</h3></div></div></div><p>The installation of local plugins is a two-step process:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Place the widget package in the <span class="guilabel">Local widget
-            path</span> (see <a class="xref" href="configure_wxglade.html#preferences" title="Preferences Dialog">the section called “Preferences Dialog”</a>).
-            Create this directory if it doesn't exist.</p></li><li class="listitem"><p>Add widget name to the text file named
-            <code class="filename">widgets.txt</code>. This file is also located in the
-            directory specified in <span class="guilabel">Local widget path</span>.
-            Just create a simple text file, if the file doesn't exists.</p></li></ol></div><p>The new widget will be available after wxGlade has been
-        restarted.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190921024"></a>Designing own Widget Plugins</h3></div></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>This section is under construction! Please use this
-          information carefully.</p></div><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Create a new directory named like the widget and change in
-            this directory</p></li><li class="listitem"><p>Place an empty file <code class="filename">__init__.py</code> in that
-            directory</p></li><li class="listitem"><p>Create a file <code class="filename">wconfig.py</code> in the widget
-            directory and describe the styles used by this widget</p><pre class="programlisting">"""\
-wxStaticLine widget configuration
-
-@copyright: &lt;Add year and your name&gt;
-@license: &lt;Choice a license&gt;
-"""
-
-config = {
-    'wxklass': 'myCtrl',
-    'style_defs': {
-        'wxMCFance': {
-            'desc': _('Use the new and fancy design.'),
-        },
-        'wxMCOldFashion': {
-            'desc': _('Use the old fashion design.'),
-        },
-    },
-    'default_style': 'wxMCFance',
-    'style_list': ['wxMCFance', 'wxMCOldFashion']
-}</pre></li><li class="listitem"><p>Create a Python file codegen.py with initial content
-            like</p><pre class="programlisting">"""
-Code generator functions for myCtrl objects
-
-@copyright: &lt;Add year and your name&gt;
-@license: &lt;Choice a license&gt;
-"""
-
-import common
-
-
-class PythonMyCtrlGenerator(wcodegen.PythonWidgetCodeWriter):
-
-    tmpl = '%(name)s = %(klass)s(%(parent)s, %(id)s, %(label)s%(style)s)\n'
-
-# end of class PythonMyCtrlGenerator
-
-
-def initialize():
-    common.class_names['EditmyCtrl'] = 'myCtrl'
-
-    pygen = common.code_writers.get("python")
-    if pygen:
-        pygen.add_widget_handler('myCtrl', PythonMyCtrlGenerator())</pre></li><li class="listitem"><p>Create a Python file named like the widget directory e.g.
-            myctrl.py</p></li><li class="listitem"><p>Create remaining code generators</p></li><li class="listitem"><p>Example of the created structure</p><pre class="programlisting">myctrl
-|-- __init__.py
-|-- codegen.py
-|-- myctrl.py
-`-- wconfig.py</pre></li></ol></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900190906736"></a>Widget Initialisation</h4></div></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>This section is incomplete.</p></div><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Load generic and language independent widget configuration
-              from <code class="filename">wconfig.py</code>
-              (<code class="function">common.load_config()</code>)</p></li><li class="listitem"><p>Load and initialise language code writers
-              (<code class="function">common.load_code_writers()</code>)</p></li><li class="listitem"><p>Load and initialise widgets
-              (<code class="function">common.load_widgets()</code>)</p></li><li class="listitem"><p>Load and initialise sizers
-              (<code class="function">common.load_sizers()</code> )</p></li></ol></div></div></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="widget_list.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="contributing.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Widget List </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Contributing to wxGlade</td></tr></table></div></body></html>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/tooltip_styles.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/tooltip_styles.png differ
diff -Nru wxglade-0.9.6/docs_old/html/trademarks.html wxglade-1.0.1/docs_old/html/trademarks.html
--- wxglade-0.9.6/docs_old/html/trademarks.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/trademarks.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Trademarks</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="copyright.html" title="Appendix B. Copyrights, Licenses and Trademarks"><link rel="prev" href="license_mit.html" title="wxGlade License Agreement"><link rel="next" href="icon.html" title="Appendix C. The wxGlade Icon"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Trademarks</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="license_mit.html">Prev</a> </td><th width="60%" align="center">Appendix B. Copyrights, Licenses and Trademarks</th><td width="20%" align="right"> <a accesskey="n" href="icon.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="trademarks"></a>Trademarks</h2></div></div></div><p>wxWidgets is copyright (C) 1998-2005 Julian Smart, Robert Roebling
-      et al. See <a class="ulink" href="http://www.wxwidgets.org" target="_top">http://www.wxwidgets.org</a> for
-      details.</p><p>Microsoft and Windows are registered trademarks of Microsoft
-      Corporation.</p><p>UNIX is a registered trademark of The Open Group.</p><p>All other trademarks are property of their respective
-      owners.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="license_mit.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="copyright.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="icon.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">wxGlade License Agreement </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix C. The wxGlade Icon</td></tr></table></div></body></html>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/tree_window.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/tree_window.png differ
diff -Nru wxglade-0.9.6/docs_old/html/troubleshooting.html wxglade-1.0.1/docs_old/html/troubleshooting.html
--- wxglade-0.9.6/docs_old/html/troubleshooting.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/troubleshooting.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Troubleshooting and Error Handling</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="running_wxglade.html" title="Chapter 3. Running wxGlade"><link rel="prev" href="deprecated_features.html" title="Deprecated Features"><link rel="next" href="working_with_wxglade.html" title="Chapter 4. Working with wxGlade"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Troubleshooting and Error Handling</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="deprecated_features.html">Prev</a> </td><th width="60%" align="center">Chapter 3. Running wxGlade</th><td width="20%" align="right"> <a accesskey="n" href="working_with_wxglade.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="troubleshooting"></a>Troubleshooting and Error Handling</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191657376"></a>Troubleshooting</h3></div></div></div><p>This section should help you to solve some non-application
-        issues.</p><div class="glosslist"><dl><dt><span class="glossterm">wxGlade has started e.g. by clicking on the desktop
-              icon, but no application window opens</span></dt><dd class="glossdef"><p>Check the log file for errors (see <a class="xref" href="configure_wxglade.html#config_files" title="Configuration Files">the section called “Configuration Files”</a>) and check that all
-                dependencies (especially wxWidgets and wxPython) are
-                installed. A list of dependencies is in <a class="xref" href="installation.html#requirements" title="Requirements and Supported Platforms">the section called “Requirements and Supported Platforms”</a>.</p><p>If you think this is an application issue, please file a
-                bug report like described in <a class="xref" href="troubleshooting.html#report_bugs" title="How to Report a Bug">the section called “How to Report a Bug”</a>.</p></dd></dl></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191651728"></a>Error Messages</h3></div></div></div><p>The following list of error messages should help you to find the
-        reason and take corrective actions. Please note, that the list is
-        still incomplete.</p><div class="glosslist"><dl><dt><span class="glossterm">Output path "&lt;path&gt;" must be an existing
-            directory when generating multiple files.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> You want to
-              create multiple files form your design. wxGlade expects an
-              output directory in such case, but the given output path isn't a
-              existing directory.</p><p><span class="bold"><strong>Corrective Action:</strong></span> Create
-              the missing directory or select an existing output
-              directory.</p></dd><dt><span class="glossterm">Output path "&lt;path&gt;" exists but the directory is
-            not writable.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Corrective Action:</strong></span> Choose
-              a writable output directory.</p></dd><dt><span class="glossterm">Output path "&lt;path&gt;" can not be a directory when
-            generating a single file.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> You want to
-              generate a single source code files for your design. wxGalde
-              expects an output filename, but the given output path is a
-              directory.</p><p><span class="bold"><strong>Corrective Action:</strong></span> Choose
-              a file instead of a directory.</p></dd><dt><span class="glossterm">Output path "&lt;path&gt;" should be a directory when
-            generating multiple files.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> You want to
-              generate multiple source code files for your design. wxGlade
-              expects an output directory in such case, but the given output
-              path isn't a directory.</p><p><span class="bold"><strong>Corrective Action:</strong></span> Choose
-              an existing output directory.</p></dd><dt><span class="glossterm">Generated source code couldn't converted to encoding
-            &lt;encoding&gt;. The source contains invalid characters
-            "&lt;characters&gt;" from &lt;start position&gt; to &lt;end
-            position&gt;.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> The current
-              design uses characters that can't converted to the encoding
-              selected for the source code file.</p><p><span class="bold"><strong>Corrective Action:</strong></span> Choose
-              a encoding that supports the listed characters.</p></dd><dt><span class="glossterm">Generating Lisp code for wxWidgets version
-            &lt;version&gt; is not supported.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> There is no Lisp
-              support for the selected version of wxWidgets</p><p><span class="bold"><strong>Corrective Action:</strong></span> Create
-              the code for an older wxWidget version.</p></dd><dt><span class="glossterm">XRC code cannot be split into multiple
-            files.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> You want to
-              create multiple XRC files for your design. This option isn't
-              supported by wxGlade.</p><p><span class="bold"><strong>Corrective Action:</strong></span> Select
-              the <span class="quote">“<span class="quote"><span class="guilabel">Single file</span></span>”</span> option to
-              store the whole design in one XRC file.</p></dd><dt><span class="glossterm">Code generation from a template is not
-            possible.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> You've selected
-              a template as input file to generate source code from.</p><p><span class="bold"><strong>Corrective Action:</strong></span> Use a
-              design file instead of a template.</p></dd><dt><span class="glossterm">Code writer for "&lt;language&gt;" is not
-            available.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> The code
-              generators for the given language hasn't been loaded.</p><p><span class="bold"><strong>Corrective Action:</strong></span> That's
-              probably a bug in wxGlade. Please check the log file and file a
-              bug report. See <a class="xref" href="troubleshooting.html#report_bugs" title="How to Report a Bug">the section called “How to Report a Bug”</a> for more
-              details.</p></dd><dt><span class="glossterm">Conversion of the source file &lt;filename&gt; to
-            Unicode failed.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> The file
-              encoding set within the design doesn't match the encoding used
-              within the source file. Thereby the source file can't be
-              loaded.</p><p><span class="bold"><strong>Corrective Action:</strong></span> Check
-              the encoding selected in your design and the encoding of your
-              source file. Change the design encoding to match source files
-              encoding.</p></dd><dt><span class="glossterm">Please install missing Python module
-            "wxPython".</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> The Python
-              wrapper for wxWidgets couldn't be loaded.</p><p><span class="bold"><strong>Corrective Action:</strong></span> Check
-              if</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>you have wxPython installed</p></li><li class="listitem"><p>the wxPython version matches to the Python
-                  installation</p></li><li class="listitem"><p>Python and wxPython used the same memory address width
-                  of 32-bit or 64-bit</p></li></ul></div></dd><dt><span class="glossterm">Please install missing Python module
-            "wxversion".</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> The Python
-              module <span class="quote">“<span class="quote">wxversion</span>”</span> couldn't be loaded.</p><p><span class="bold"><strong>Corrective Action:</strong></span>
-              <span class="quote">“<span class="quote">wxversion</span>”</span> is a Python module written in pure
-              Python. Thereby you can't have trouble with 32bit and 64bit like
-              with <span class="quote">“<span class="quote">wxPython</span>”</span>. Just install the Python module
-              <span class="quote">“<span class="quote">wxversion</span>”</span>. Mostly the module is part of the
-              wxPython installation.</p></dd><dt><span class="glossterm">Too many wxg files given.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> You want to
-              start the code generation from command line, but you have chosen
-              to many design files.</p><p><span class="bold"><strong>Corrective Action:</strong></span>
-              Re-execute the command with the just design one file name as
-              last argument.</p></dd><dt><span class="glossterm">No wxg file given.</span></dt><dd class="glossdef"><p><span class="bold"><strong>Details:</strong></span> You want to
-              start the code generation from command line, but you haven't
-              specify the design file to process.</p><p><span class="bold"><strong>Corrective Action:</strong></span>
-              Re-execute the command with the design file name as last
-              argument.</p></dd></dl></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="report_bugs"></a>How to Report a Bug</h3></div></div></div><p>Writing a helpful bug report is easy if you follow some hints.
-        The items below should help you to integrate useful information. They
-        are not absolute rules - it's more like a guideline. Additionally you
-        may read <a class="ulink" href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html" target="_top">How to
-        Report Bugs Effectively</a>.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>What did you? May you want to include a screen shot.</p></li><li class="listitem"><p>What do you want to happen?</p></li><li class="listitem"><p>What actually happened?</p></li><li class="listitem"><p>Provide a short example to reproduce the issue.</p></li><li class="listitem"><p>Include the internal error log file
-            <span class="quote">“<span class="quote">wxglade.log</span>”</span> always. The pane <span class="quote">“<span class="quote"><span class="guilabel">How
-            to Report a Bug</span></span>”</span> contains the full path of the
-            error log file. The file location is additionally described in
-            <a class="xref" href="configure_wxglade.html#config_files" title="Configuration Files">the section called “Configuration Files”</a>.</p></li></ul></div><p>Please create a new bug report in the <a class="ulink" href="???" target="_top">wxGlade
-        bug tracker</a> on Sourceforge. You have to log-in on Sourceforge
-        to file a bug report.</p><p>Alternatively you can send the bug report to the wxGlade mailing
-        list. Keep in mind that you need a subscription for sending emails to
-        this mailing list.</p><div class="figure"><a name="idm139900191589760"></a><p class="title"><b>Figure 3.2. An error dialog example</b></p><div class="figure-contents"><div class="mediaobject"><img src="error_dialog.png" width="354" alt="An error dialog example"></div></div></div><br class="figure-break"></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="deprecated_features.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="running_wxglade.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="working_with_wxglade.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Deprecated Features </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 4. Working with wxGlade</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/ui_design_window.html wxglade-1.0.1/docs_old/html/ui_design_window.html
--- wxglade-0.9.6/docs_old/html/ui_design_window.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/ui_design_window.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Design Window</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="ui.html" title="Chapter 5. wxGlade User Interface"><link rel="prev" href="ui_tree_window.html" title="Tree Window"><link rel="next" href="ui_properties_window.html" title="Properties Window"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Design Window</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ui_tree_window.html">Prev</a> </td><th width="60%" align="center">Chapter 5. wxGlade User Interface</th><td width="20%" align="right"> <a accesskey="n" href="ui_properties_window.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ui_design_window"></a>Design Window</h2></div></div></div><p>The design window shows the frame or panel you are creating in
-      WYSIWYG mode and allows you to select a widget from the main palette and
-      to put it on an empty slot of a sizer. You can show the design window by
-      double-clicking on the icon of a frame or dialog in the tree window.
-      </p><div class="figure"><a name="idm139900191414848"></a><p class="title"><b>Figure 5.5. The Design Window</b></p><div class="figure-contents"><div><img src="design_window_empty_slot.png" width="283" alt="The Design Window"></div></div></div><p><br class="figure-break"></p><p>By clicking with the right mouse button on a widget you can access
-      the context menu.</p><p>Notice that the sizers, which are invisible elements, have a
-      little gray <span class="quote">“<span class="quote">handle</span>”</span>. They are marked with green boxes in
-      the screenshot above. Click to the handles to select the sizer or let
-      the pop-up menu appear.</p><p>The pop-up menu is the same as the one you get in the Tree Window,
-      as shown in <a class="xref" href="ui_tree_window.html#label_menu.fig" title="Figure 5.3. The menu for a widget">Figure 5.3, “The menu for a widget”</a> or in <a class="xref" href="ui_tree_window.html#sizer_menu.fig" title="Figure 5.4. The menu for a sizer">Figure 5.4, “The menu for a sizer”</a>.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ui_tree_window.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ui.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ui_properties_window.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Tree Window </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Properties Window</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/ui.html wxglade-1.0.1/docs_old/html/ui.html
--- wxglade-0.9.6/docs_old/html/ui.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/ui.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 5. wxGlade User Interface</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="next_steps.html" title="Next Steps"><link rel="next" href="ui_tree_window.html" title="Tree Window"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 5. wxGlade User Interface</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="next_steps.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ui_tree_window.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="ui"></a>Chapter 5. wxGlade User Interface</h1></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ui_palette_window"></a>Main Palette</h2></div></div></div><p>The main window is a palette that hosts the menu and the widget
-      choice buttons.</p><div class="figure"><a name="idm139900191435696"></a><p class="title"><b>Figure 5.1. The Main Palette</b></p><div class="figure-contents"><div><img src="main_window.png" width="283" alt="The Main Palette"></div></div></div><p><br class="figure-break"></p><p>If you pass the mouse pointer over a button a tooltip shows the
-      button's description.</p><p>The <span class="quote">“<span class="quote"><span class="guibutton">Add a Frame</span></span>”</span> button and
-      the <span class="quote">“<span class="quote"><span class="guibutton">Add a Dialog/Panel</span></span>”</span> button
-      bring up a dialog to add a frame, a dialog or a panel to your
-      project.</p><p>The <span class="quote">“<span class="quote"><span class="guibutton">Add a MenuBar</span></span>”</span> button
-      asks you for the name of the class then adds a menu bar to your
-      project.</p><p>The <span class="quote">“<span class="quote"><span class="guibutton">Add a ToolBar</span></span>”</span> button
-      asks you for the name of the class then adds a toolbar to your
-      project.</p><p>The other buttons in the main window add widgets to a form. When
-      you click on one, the mouse pointer changes to an arrow. Then you can
-      click on a sizer's empty cell to add the widget to it.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="next_steps.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ui_tree_window.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Next Steps </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Tree Window</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/ui_menu.html wxglade-1.0.1/docs_old/html/ui_menu.html
--- wxglade-0.9.6/docs_old/html/ui_menu.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/ui_menu.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>The wxGlade Menu</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="ui.html" title="Chapter 5. wxGlade User Interface"><link rel="prev" href="ui_properties_window.html" title="Properties Window"><link rel="next" href="ui_shortcuts.html" title="Shortcuts"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The wxGlade Menu</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ui_properties_window.html">Prev</a> </td><th width="60%" align="center">Chapter 5. wxGlade User Interface</th><td width="20%" align="right"> <a accesskey="n" href="ui_shortcuts.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ui_menu"></a>The wxGlade Menu</h2></div></div></div><p>wxGlade has only a few very small number of menus.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="ui_file_menu"></a>The FILE Menu</h3></div></div></div><p>In the <span class="guimenu">FILE</span> menu are the classic <span class="guimenu">File</span> → <span class="guimenuitem">New</span>, <span class="guimenu">File</span> → <span class="guimenuitem">Open...</span> and <span class="guimenu">File</span> → <span class="guimenuitem">Save</span> items. When opening or saving a new file, the file
-        dialog defaults to the directory that you put in the
-        <span class="quote">“<span class="quote"><span class="guilabel">Initial path</span></span>”</span> text box in the
-        Preferences dialog, usually the user home directory.</p><p>The <span class="guimenu">File</span> → <span class="guimenuitem">Generate code</span> item produces the code from the current design.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="ui_view_menu"></a>The VIEW Menu</h3></div></div></div><p>In the <span class="guimenu">VIEW</span> menu, you can show or hide the
-        tree window and the <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span>
-        window.</p><p>In this menu you access the Preferences Dialog as well.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="ui_help_menu"></a>The HELP Menu</h3></div></div></div><p>The <span class="guimenu">HELP</span> menu provides access to the wxGlade
-        user manual (this documentation), a short tutorual and the
-        <span class="quote">“<span class="quote"><span class="guilabel">About...</span></span>”</span> dialog.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ui_properties_window.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ui.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ui_shortcuts.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Properties Window </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Shortcuts</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/ui_properties_window.html wxglade-1.0.1/docs_old/html/ui_properties_window.html
--- wxglade-0.9.6/docs_old/html/ui_properties_window.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/ui_properties_window.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Properties Window</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="ui.html" title="Chapter 5. wxGlade User Interface"><link rel="prev" href="ui_design_window.html" title="Design Window"><link rel="next" href="ui_menu.html" title="The wxGlade Menu"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Properties Window</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ui_design_window.html">Prev</a> </td><th width="60%" align="center">Chapter 5. wxGlade User Interface</th><td width="20%" align="right"> <a accesskey="n" href="ui_menu.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ui_properties_window"></a>Properties Window</h2></div></div></div><p>The <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window lets you
-      see and edit the properties that apply to the selected element. This
-      window consists up to six different tabs. All six tabs are not always
-      present. The visibility of the single tabs depends on the widget type.
-      Most widgets have a <span class="quote">“<span class="quote"><span class="guilabel">Common</span></span>”</span> tab and a
-      <span class="quote">“<span class="quote"><span class="guilabel">Code</span></span>”</span> tab. The combination of
-      presented tabs depends on the widget type.</p><p>For example:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><code class="classname">wxFrame</code> widgets have
-          <span class="quote">“<span class="quote"><span class="guilabel">Common</span></span>”</span>,
-          <span class="quote">“<span class="quote"><span class="guilabel">Widget</span></span>”</span> and
-          <span class="quote">“<span class="quote"><span class="guilabel">Code</span></span>”</span> tabs</p></li><li class="listitem"><p>Spacers have the tabs
-          <span class="quote">“<span class="quote"><span class="guilabel">Layout</span></span>”</span> and
-          <span class="quote">“<span class="quote"><span class="guilabel">Code</span></span>”</span></p></li><li class="listitem"><p><code class="classname">wxGridSizer</code> widgets have
-          <span class="quote">“<span class="quote"><span class="guilabel">Common</span></span>”</span> and
-          <span class="quote">“<span class="quote"><span class="guilabel">Grid</span></span>”</span></p></li><li class="listitem"><p><code class="classname">wxBoxSizer</code> widgets only have the
-          <span class="quote">“<span class="quote"><span class="guilabel">Common</span></span>”</span> tab</p></li></ul></div><p>Editing properties is quite simple; Properties are represented by
-      buttons, text boxes, checks and other controls. Usually they are
-      referenced by the same name or symbol that you find writing C++
-      code.</p><p>Usually you get the changes in the design window in real time. In
-      some cases you have to push the
-      <span class="quote">“<span class="quote"><span class="guibutton">Apply</span></span>”</span> button. For example, the
-      <code class="classname">wxNotebook</code> widget shows in its
-      <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window a list of child
-      <code class="classname">wxPanel</code>s. You have to press the
-      <span class="quote">“<span class="quote"><span class="guibutton">Apply</span></span>”</span> button to show changes you
-      make when you add or remove panels.</p><p>You can show or hide the
-      <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window by the menu item
-      <span class="guimenu">View</span> → <span class="guimenuitem">Show Properties</span>.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="ui_application_properties"></a>Application Properties</h3></div></div></div><p>The page <span class="quote">“<span class="quote"><span class="guilabel">Application</span></span>”</span>
-        contains the general settings of the active wxGlade project.</p><div class="figure"><a name="properties_window_application.fig"></a><p class="title"><b>Figure 5.6. Project Properties - Application settings</b></p><div class="figure-contents"><div class="mediaobject"><img src="properties_window_application.png" width="283" alt="Project Properties - Application settings"></div></div></div><p><br class="figure-break"></p><div class="glosslist"><dl><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Name</span></span>”</span></span></dt><dd class="glossdef"><p>Name of the instance created from
-                <span class="quote">“<span class="quote"><span class="guilabel">Class</span></span>”</span></p><p><a class="xref" href="next_steps.html#automatically.created.wxapp.instance.section" title="Automatically Created wxApp Instances">the section called “Automatically Created <code class="classname">wxApp</code>
-          Instances”</a>
-                provides more information</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Class</span></span>”</span></span></dt><dd class="glossdef"><p>Name of the automatically generated class derived from
-                <code class="classname">wxApp</code></p><p><a class="xref" href="next_steps.html#automatically.created.wxapp.instance.section" title="Automatically Created wxApp Instances">the section called “Automatically Created <code class="classname">wxApp</code>
-          Instances”</a>
-                provides more information</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Encoding</span></span>”</span></span></dt><dd class="glossdef"><p>Encoding of the generated source files.</p><p>The encoding to use with new projects will be determined
-                automatically based on the machine settings.
-                <span class="quote">“<span class="quote">UTF-8</span>”</span> will be used if the automatic detection
-                fails.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Enable gettext
-              support</span></span>”</span></span></dt><dd class="glossdef"><p>Enable internationalisation and localisation for the
-                generated source files</p><p><a class="xref" href="next_steps.html#automatically.created.wxapp.instance.section" title="Automatically Created wxApp Instances">the section called “Automatically Created <code class="classname">wxApp</code>
-          Instances”</a>
-                provides more information</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Top
-              window</span></span>”</span></span></dt><dd class="glossdef"><p>This widget is used as top window in the
-                <code class="classname">wxApp</code> start code</p><p><a class="xref" href="next_steps.html#automatically.created.wxapp.instance.section" title="Automatically Created wxApp Instances">the section called “Automatically Created <code class="classname">wxApp</code>
-          Instances”</a>
-                provides more information</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Code
-              Generation</span></span>”</span></span></dt><dd class="glossdef"><p>Write all source code in one file or split the source
-                into one file per class / widget</p><p><a class="xref" href="next_steps.html#using.source.code.section" title="Using the Source Code">the section called “Using the Source Code”</a> provides
-                more information</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Language</span></span>”</span></span></dt><dd class="glossdef"><p>Programming language to generate the source files
-                in</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">wxWidgets
-              compatibility</span></span>”</span></span></dt><dd class="glossdef"><p>Generate source files for the selected wxWidgets
-                version</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Overwrite existing
-              sources</span></span>”</span></span></dt><dd class="glossdef"><p>Overwrite existing source files or modify the code
-                sequences generated by wxGlade in place</p><p><a class="xref" href="next_steps.html#using.source.code.section" title="Using the Source Code">the section called “Using the Source Code”</a> provides
-                more information</p><div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Warning</h3><p>This feature is deprecated and will be removed from
-                    a future version of wxGlade. Thereby it's advised not to
-                    use this feature for new projects. Details about all
-                    deprecated features are shown in <a class="xref" href="deprecated_features.html" title="Deprecated Features">the section called “Deprecated Features”</a>.</p></div></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Output
-              path</span></span>”</span></span></dt><dd class="glossdef"><p>Output file or directory</p><p><a class="xref" href="next_steps.html#output.path.filenames.section" title="Output Path and Filenames">the section called “Output Path and Filenames”</a> provides
-                more information</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Generate
-              code</span></span>”</span></span></dt><dd class="glossdef"><p>Start generating source files</p></dd></dl></div><p>The page <span class="quote">“<span class="quote"><span class="guilabel">Settings</span></span>”</span>
-        contains the language specific settings of the active wxGlade
-        project.</p><div class="figure"><a name="idm139900191349904"></a><p class="title"><b>Figure 5.7. Project Properties - Language settings</b></p><div class="figure-contents"><div class="mediaobject"><img src="properties_window_settings.png" width="283" alt="Project Properties - Language settings"></div></div></div><p><br class="figure-break"></p><div class="glosslist"><dl><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Indentation
-              mode</span></span>”</span></span></dt><dd class="glossdef"><p>Use spaces or tabs for indentation within the generated
-                source files.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Indentation
-              amount</span></span>”</span></span></dt><dd class="glossdef"><p>Number of spaces or tabs used for one indentation
-                level.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Source
-              ext</span></span>”</span></span></dt><dd class="glossdef"><p>Extension of the source file.</p><p>The extension doesn't has a leading dot.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Header
-              ext</span></span>”</span></span></dt><dd class="glossdef"><p>Extension of the header file.</p><p>The extension doesn't has a leading dot.</p></dd></dl></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191337920"></a>Common Properties</h3></div></div></div><p>The first tab contains the common properties that apply to all
-        widgets. As shown in <a class="xref" href="ui_properties_window.html#properties_window_tab_1.fig" title="Figure 5.8. Common Properties">Figure 5.8, “Common Properties”</a> the
-        common properties are related to name, class, size, colors, fonts and
-        tooltip.</p><div class="figure"><a name="properties_window_tab_1.fig"></a><p class="title"><b>Figure 5.8. Common Properties</b></p><div class="figure-contents"><div><img src="properties_window_tab_1.png" width="283" alt="Common Properties"></div></div></div><br class="figure-break"><p>The property name is a mangled version of the wxWidgets property
-        name. The property input field is disabled by default. wxGlade won't
-        use disabled properties for code generation. wxWidgets defaults are
-        used instead.</p><p>Enable the property in the wxGlade GUI to set non-default values
-        (see <a class="xref" href="ui_properties_window.html#properties_window_tab_1_change.fig" title="Figure 5.9. Changing Common Properties">Figure 5.9, “Changing Common Properties”</a>).</p><div class="figure"><a name="properties_window_tab_1_change.fig"></a><p class="title"><b>Figure 5.9. Changing Common Properties</b></p><div class="figure-contents"><div><img src="properties_window_tab_1_change.png" width="283" alt="Changing Common Properties"></div></div></div><br class="figure-break"><div class="glosslist"><dl><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Name</span></span>”</span></span></dt><dd class="glossdef"><p>Name of the instance created from
-              <span class="quote">“<span class="quote"><span class="guilabel">Class</span></span>”</span></p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Class</span></span>”</span></span></dt><dd class="glossdef"><p>Name of the subclass of the widget. How this name affects
-              code generation depends on the output language.</p><div class="figure"><a name="idm139900191325776"></a><p class="title"><b>Figure 5.10. Common Properties - A subclassed widget (default
-                behaviour)</b></p><div class="figure-contents"><div class="mediaobject"><img src="example_subclassed.png" width="283" alt="Common Properties - A subclassed widget (default behaviour)"></div></div></div><br class="figure-break"><div class="example"><a name="idm139900191323168"></a><p class="title"><b>Example 5.1. Generated Python code of a subclassed widget</b></p><div class="example-contents"><pre class="programlisting">class MyDialog(wxDialog):
-
-    def __init__(self, *args, **kwds):
-        kwds["style"] = wxDEFAULT_DIALOG_STYLE
-        wxDialog.__init__(self, *args, **kwds)
-</pre></div></div><br class="example-break"></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Base
-            class(es)</span></span>”</span></span></dt><dd class="glossdef"><p>A comma-separated list of custom base classes. The first
-              class will be invoked with the same parameters as this class,
-              while for the others the default constructor will be used. This
-              property will be shown only for non-managed widgets for instance
-              <code class="classname">wxFrame</code>, <code class="classname">wxDialog</code>,
-              <code class="classname">wxNotebook</code>,
-              <code class="classname">wxPanel</code> and
-              <code class="classname">wxSplitterWindow</code>. You should probably not
-              use this if <span class="quote">“<span class="quote"><span class="guilabel">Overwrite existing
-              sources</span></span>”</span> is not set.</p><div class="figure"><a name="example_baseclasses.fig"></a><p class="title"><b>Figure 5.11. Common Properties - Base class(es) entry</b></p><div class="figure-contents"><div><img src="example_baseclasses.png" width="283" alt="Common Properties - Base class(es) entry"></div></div></div><br class="figure-break"><div class="example"><a name="idm139900191313984"></a><p class="title"><b>Example 5.2. Generated Python code of a widget with two base
-                classes</b></p><div class="example-contents"><pre class="programlisting">class MyFrame(myFrameMixin, wxFrame):
-
-    def __init__(self, *args, **kwds):
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
-        myFrameMixin.__init__(self, *args, **kwds)
-        wxFrame.__init__(self)
-</pre></div></div><br class="example-break"></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Id</span></span>”</span></span></dt><dd class="glossdef"><p>This property could be</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>a constant numeric value</p></li><li class="listitem"><p>a predefined identifier e.g.
-                  <code class="constant">wxID_ANY</code></p></li><li class="listitem"><p>a predefined variable like a class member e.g.
-                  <span class="command"><strong>self.myButtonID</strong></span></p></li><li class="listitem"><p>a variable assignment e.g.
-                  <span class="quote">“<span class="quote"><span class="command"><strong>self.myButtonID=?</strong></span></span>”</span> The
-                  pattern of a variable assignment is always
-                  <span class="quote">“<span class="quote"><span class="command"><strong>variable=value</strong></span></span>”</span>. The value
-                  could be again a numeric value, a predefined identifier,
-                  another predefined variable or
-                  <span class="quote">“<span class="quote"><span class="command"><strong>?</strong></span></span>”</span> a shortcut for
-                  <span class="quote">“<span class="quote"><span class="command"><strong>wxNewId()</strong></span></span>”</span></p></li></ul></div><div class="figure"><a name="idm139900191302336"></a><p class="title"><b>Figure 5.12. Common Properties - Variable assignment</b></p><div class="figure-contents"><div class="mediaobject"><img src="example_variableassigment.png" width="283" alt="Common Properties - Variable assignment"></div></div></div><br class="figure-break"><div class="example"><a name="idm139900191299824"></a><p class="title"><b>Example 5.3. Generated Python code for a variable assignment</b></p><div class="example-contents"><pre class="programlisting">class MyFrame(wx.Frame):
-
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
-        wx.Frame.__init__(self, *args, **kwds)
-        self.myButtonID = wx.NewId()
-        self.button_1 = wx.Button(self, self.myButtonID, "button_1")
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-</pre></div></div><br class="example-break"></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Size</span></span>”</span></span></dt><dd class="glossdef"><p>Set the widget size in pixels.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Background</span></span>”</span></span></dt><dd class="glossdef"><p>Set the background colour of the widget.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Foreground</span></span>”</span></span></dt><dd class="glossdef"><p>Set the foreground colour of the widget.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Font</span></span>”</span></span></dt><dd class="glossdef"><p>Set the font for widgets text elements.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Tooltip</span></span>”</span></span></dt><dd class="glossdef"><p>Set a tooltip for this widget.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Disabled</span></span>”</span></span></dt><dd class="glossdef"><p>Disable the widget.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Focused</span></span>”</span></span></dt><dd class="glossdef"><p>Set the widget to receive keyboard input.</p></dd><dt><span class="glossterm"><span class="quote">“<span class="quote"><span class="guilabel">Hidden</span></span>”</span></span></dt><dd class="glossdef"><p>Hide the widget.</p></dd></dl></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="layout_properties"></a>Layout Properties</h3></div></div></div><p>The second tab is related to layout properties that control
-        position and resizing within the sizer. </p><div class="figure"><a name="properties_window_tab_2.fig"></a><p class="title"><b>Figure 5.13. Layout Properties</b></p><div class="figure-contents"><div><img src="properties_window_tab_2.png" width="283" alt="Layout Properties"></div></div></div><p><br class="figure-break">These properties apply to any widget. You can check or
-        uncheck any option related to the placement in the sizer. Many widgets
-        may have a default value of 3 in the
-        <span class="quote">“<span class="quote"><span class="guilabel">Border</span></span>”</span> property in the Preferences
-        Dialog (see <a class="xref" href="configure_wxglade.html#preferences" title="Preferences Dialog">the section called “Preferences Dialog”</a>). If you let a
-        widget have a default border, the <code class="constant">wxAll</code> option is
-        also checked.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191275232"></a>Widget Properties</h3></div></div></div><p>The third tab, named <span class="quote">“<span class="quote"><span class="guilabel">Widget</span></span>”</span>
-        is different for each widget, and lets you edit properties for the
-        specific element you have selected. </p><div class="figure"><a name="properties_window_tab_3.fig"></a><p class="title"><b>Figure 5.14. Widget Properties</b></p><div class="figure-contents"><div><img src="properties_window_tab_3.png" width="283" alt="Widget Properties"></div></div></div><p><br class="figure-break">The set of options may also be quite complex in the case of
-        widgets that have a great deal of methods and properties (such as
-        grids and tree views). In this case, wxGlade greatly simplifies the
-        process of designing forms.</p><p><span class="quote">“<span class="quote"><span class="guilabel">Store as attribute</span></span>”</span> stores
-        the widget as an attribute of the top-level class.</p><p>Select <span class="quote">“<span class="quote"><span class="guilabel">Don't generate code for this
-        class</span></span>”</span> to prevent generating code for subwidgets of
-        <code class="classname">wxNotebook</code>, <code class="classname">wxPanel</code> and
-        <code class="classname">wxSplitterWindow</code>.</p><div class="figure"><a name="idm139900191267696"></a><p class="title"><b>Figure 5.15. Widget Properties - Don't generate code for this
-          class</b></p><div class="figure-contents"><div class="mediaobject"><img src="properties_window_tab_3_dont_generate_code.png" width="283" alt="Widget Properties - Don't generate code for this class"></div></div></div><br class="figure-break"><p>You can use this feature to:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Split complex designs into smaller pieces. The correlation
-            in such a setup based on the widget name.</p></li><li class="listitem"><p>Prevent generation of stubs, if using custom base
-            classes.</p></li></ol></div><p>Some widgets have an <span class="quote">“<span class="quote"><span class="guibutton">Apply</span></span>”</span>
-        button onhe <span class="quote">“<span class="quote"><span class="guilabel">Widget</span></span>”</span> tabs. Click on
-        the <span class="quote">“<span class="quote"><span class="guibutton">Apply</span></span>”</span> button to consolidate
-        your changes. Otherwise they will lost.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191259264"></a>Styles</h3></div></div></div><p>The most of the styles as shown in the <a class="xref" href="ui_properties_window.html#layout_properties" title="Layout Properties">the section called “Layout Properties”</a> and <a class="xref" href="ui_properties_window.html" title="Properties Window">the section called “Properties Window”</a> have a tooltip with additional
-        information about the style.</p><p>The tooltips show a short description as well as additional
-        information.</p><div class="figure"><a name="idm139900191256560"></a><p class="title"><b>Figure 5.16. Widget Properties - Styles Tooltip</b></p><div class="figure-contents"><div><img src="tooltip_styles.png" width="213" alt="Widget Properties - Styles Tooltip"></div></div></div><p><br class="figure-break"></p><p>The style details will be used also to compute the styles in the
-        generated source code.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191254192"></a>Events Properties</h3></div></div></div><p>The fourth tab, named <span class="quote">“<span class="quote"><span class="guilabel">Events</span></span>”</span>
-        lists the widgets events. wxGlade generates an event handler stub and
-        binds the event for each added handler name.</p><div class="figure"><a name="idm139900191252272"></a><p class="title"><b>Figure 5.17. Events Properties</b></p><div class="figure-contents"><div class="mediaobject"><img src="properties_window_tab_4.png" width="283" alt="Events Properties"></div></div></div><br class="figure-break"><div class="figure"><a name="idm139900191249760"></a><p class="title"><b>Figure 5.18. Events Properties - Event handler name added</b></p><div class="figure-contents"><div class="mediaobject"><img src="example_eventhandler.png" width="283" alt="Events Properties - Event handler name added"></div></div></div><br class="figure-break"><div class="example"><a name="idm139900191247248"></a><p class="title"><b>Example 5.4. Generated Python code of an <span class="command">EVT_TEXT</span> event
-          handler stub at line 12</b></p><div class="example-contents"><pre class="programlisting">class MyFrame(wx.Frame):
-
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
-        wx.Frame.__init__(self, *args, **kwds)
-        self.text_ctrl_1 = wx.TextCtrl(self, -1, "")
-        self.__set_properties()
-        self.__do_layout()
-        self.Bind(wx.EVT_TEXT, self.myEVTTEXT, self.text_ctrl_1)
-        # end wxGlade
-
-    def myEVTTEXT(self, event):  # wxGlade: MyFrame.&lt;event_handler&gt;
-        print "Event handler `myEVTTEXT' not implemented!"
-        event.Skip()
-</pre></div></div><br class="example-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="ui_code_properties"></a>Code Properties</h3></div></div></div><p>The fifth and last tab is named
-        <span class="quote">“<span class="quote"><span class="guilabel">Code</span></span>”</span> and has two parts.</p><div class="figure"><a name="idm139900191241680"></a><p class="title"><b>Figure 5.19. Code Properties - Extra code and extra properties</b></p><div class="figure-contents"><div class="mediaobject"><img src="properties_window_tab_5.png" width="283" alt="Code Properties - Extra code and extra properties"></div></div></div><br class="figure-break"><p>wxGlade never declares or assigns variable or function names or
-        import for non-default base classes and custom widgets.</p><p>If you use non-default base classes, <code class="code">var:</code> or
-        <code class="code">code:</code> statements, you have to manually assign the
-        variables, declare used functions as well as to include resp. to
-        import of additional code need by your widget in
-        <span class="quote">“<span class="quote"><span class="guilabel">Extra code for this widget</span></span>”</span>. This
-        <span class="quote">“<span class="quote"><span class="guilabel">Extra code</span></span>”</span> will be added to the
-        context of the source file and not to the context of the class.</p><p>The lower part simplifies setting of additional widget
-        properties. Add the property name to the
-        <span class="quote">“<span class="quote"><span class="guilabel">Property</span></span>”</span> field and not the name of
-        the setter function. For instance add
-        <span class="quote">“<span class="quote"><span class="command"><strong>MaxLength</strong></span></span>”</span> and not
-        <span class="quote">“<span class="quote"><span class="command"><strong>SetMaxLength</strong></span></span>”</span>. The
-        <span class="quote">“<span class="quote"><span class="guilabel">Value</span></span>”</span> field is just a text field.
-        You can enter e.g. a simple number only as well as a complex statement
-        e.g. <span class="command"><strong>0, 0, "1"</strong></span> or a function call. But be
-        carefully! Your entered sequence will be inserted in the source
-        without any changes - one to one.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p><span class="quote">“<span class="quote"><span class="guilabel">Extra code</span></span>”</span> and
-          <span class="quote">“<span class="quote"><span class="guilabel">Extra properties</span></span>”</span> won't be
-          processed for the widget preview.</p></div><div class="figure"><a name="idm139900191228992"></a><p class="title"><b>Figure 5.20. Code Properties - Set extra property</b></p><div class="figure-contents"><div class="mediaobject"><img src="example_setproperty.png" width="283" alt="Code Properties - Set extra property"></div></div></div><br class="figure-break"><div class="example"><a name="idm139900191226480"></a><p class="title"><b>Example 5.5. Generated Python code for setting property
-          <span class="command">MaxLength</span> to <span class="command">10</span> at line
-          14</b></p><div class="example-contents"><pre class="programlisting">class MyFrame(wx.Frame):
-
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
-        wx.Frame.__init__(self, *args, **kwds)
-        self.text_ctrl_1 = wx.TextCtrl(self, -1, "")
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame_1")
-        self.text_ctrl_1.SetMaxLength(10)
-        # end wxGlade
-</pre></div></div><br class="example-break"></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ui_design_window.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ui.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ui_menu.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Design Window </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> The wxGlade Menu</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/ui_shortcuts.html wxglade-1.0.1/docs_old/html/ui_shortcuts.html
--- wxglade-0.9.6/docs_old/html/ui_shortcuts.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/ui_shortcuts.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Shortcuts</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="ui.html" title="Chapter 5. wxGlade User Interface"><link rel="prev" href="ui_menu.html" title="The wxGlade Menu"><link rel="next" href="supported_widgets.html" title="Chapter 6. Supported widgets"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Shortcuts</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ui_menu.html">Prev</a> </td><th width="60%" align="center">Chapter 5. wxGlade User Interface</th><td width="20%" align="right"> <a accesskey="n" href="supported_widgets.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ui_shortcuts"></a>Shortcuts</h2></div></div></div><div class="glosslist"><dl><dt><span class="glossterm"><span class="keysym">Ctrl-G</span></span></dt><dd class="glossdef"><p>Generate code from the current GUI design</p></dd><dt><span class="glossterm"><span class="keysym">Ctrl-I</span></span></dt><dd class="glossdef"><p>Import GUI design out of a XRC file</p></dd><dt><span class="glossterm"><span class="keysym">Ctrl-N</span></span></dt><dd class="glossdef"><p>Start a new GUI design</p></dd><dt><span class="glossterm"><span class="keysym">Ctrl-O</span></span></dt><dd class="glossdef"><p>Read a GUI design from a <code class="filename">.wxg</code>
-            file</p></dd><dt><span class="glossterm"><span class="keysym">Ctrl-S</span></span></dt><dd class="glossdef"><p>Save the current GUI design to a <code class="filename">.wxg</code>
-            file</p></dd><dt><span class="glossterm"><span class="keysym">Shift-Ctrl-S</span></span></dt><dd class="glossdef"><p>Save the current GUI design to another
-            <code class="filename">.wxg</code> file</p></dd><dt><span class="glossterm"><span class="keysym">Ctrl-P</span></span></dt><dd class="glossdef"><p>Open a preview window for the current top-level
-            widget</p></dd><dt><span class="glossterm"><span class="keysym">Ctrl-Q</span></span></dt><dd class="glossdef"><p>Exit wxGlade</p></dd><dt><span class="glossterm"><span class="keysym">Ctrl-C</span></span></dt><dd class="glossdef"><p>Copy the selected item, element, text, ...</p></dd><dt><span class="glossterm"><span class="keysym">Ctrl-V</span></span></dt><dd class="glossdef"><p>Insert clipboard content</p></dd><dt><span class="glossterm"><span class="keysym">Ctrl-X</span></span></dt><dd class="glossdef"><p>Cut the selected item, element, text, ...</p></dd><dt><span class="glossterm"><span class="keysym">F1</span></span></dt><dd class="glossdef"><p>Show the wxGlade user manual (this documentation)</p></dd><dt><span class="glossterm"><span class="keysym">F2</span></span></dt><dd class="glossdef"><p>Show the <span class="guilabel">Tree</span> window</p></dd><dt><span class="glossterm"><span class="keysym">F3</span></span></dt><dd class="glossdef"><p>Show the <span class="guilabel">Properties</span> window</p></dd><dt><span class="glossterm"><span class="keysym">F4</span></span></dt><dd class="glossdef"><p>Show all application windows</p></dd><dt><span class="glossterm"><span class="keysym">F5</span></span></dt><dd class="glossdef"><p>Refresh the screen</p></dd></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ui_menu.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ui.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="supported_widgets.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">The wxGlade Menu </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 6. Supported widgets</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/ui_tree_window.html wxglade-1.0.1/docs_old/html/ui_tree_window.html
--- wxglade-0.9.6/docs_old/html/ui_tree_window.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/ui_tree_window.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Tree Window</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="ui.html" title="Chapter 5. wxGlade User Interface"><link rel="prev" href="ui.html" title="Chapter 5. wxGlade User Interface"><link rel="next" href="ui_design_window.html" title="Design Window"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Tree Window</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ui.html">Prev</a> </td><th width="60%" align="center">Chapter 5. wxGlade User Interface</th><td width="20%" align="right"> <a accesskey="n" href="ui_design_window.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ui_tree_window"></a>Tree Window</h2></div></div></div><p>The tree window shows the logical hierarchy of widgets and their
-      child-widgets. For example you can see a panel as a tree's node and the
-      widgets on it as child nodes. </p><div class="figure"><a name="idm139900191426896"></a><p class="title"><b>Figure 5.2. The Tree Window</b></p><div class="figure-contents"><div><img src="tree_window.png" width="283" alt="The Tree Window"></div></div></div><p><br class="figure-break"></p><p>You can show or hide the tree window by the menu item View/Show
-      Tree.</p><p>Usually a frame or a panel contains a sizer, so you often see a
-      sort of panel-sizer-widgets structure. The tree gets more complex when
-      you nest sizers within sizers.</p><p>You open the Design Window with double-clicking to the top-level
-      widget first. In the next step you can navigate the visual presentation
-      of your widget tree by mouse, expand and collapse sizers, and copy, cut
-      or remove widgets.</p><p>A click on an icon in the tree window displays the properties of
-      the corresponding element in the
-      <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window. A double click in
-      a frame, dialog or panel icon makes the designer window show it as it
-      appears. Clicking with the right button of the mouse gives you a pop-up
-      menu. </p><div class="figure"><a name="label_menu.fig"></a><p class="title"><b>Figure 5.3. The menu for a widget</b></p><div class="figure-contents"><div><img src="label_menu.png" width="213" alt="The menu for a widget"></div></div></div><p><br class="figure-break"> </p><div class="figure"><a name="sizer_menu.fig"></a><p class="title"><b>Figure 5.4. The menu for a sizer</b></p><div class="figure-contents"><div><img src="sizer_menu.png" width="213" alt="The menu for a sizer"></div></div></div><p><br class="figure-break"> The pop-up menu for a widget allows you to copy, cut or
-      remove the element. The pop-up menu for a sizer allows you to copy, cut
-      or remove the element, or add or insert an empty slot.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>Often when you add an empty slot, you have to make the designer
-        window larger, to show the new slot.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ui.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ui.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ui_design_window.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 5. wxGlade User Interface </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Design Window</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/widget_list.html wxglade-1.0.1/docs_old/html/widget_list.html
--- wxglade-0.9.6/docs_old/html/widget_list.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/widget_list.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Widget List</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="supported_widgets.html" title="Chapter 6. Supported widgets"><link rel="prev" href="star_bars.html" title="Menubar, Statusbar and Toolbar"><link rel="next" href="technical_notes.html" title="Chapter 7. wxGlade technical notes"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Widget List</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="star_bars.html">Prev</a> </td><th width="60%" align="center">Chapter 6. Supported widgets</th><td width="20%" align="right"> <a accesskey="n" href="technical_notes.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="widget_list"></a>Widget List</h2></div></div></div><p>Follow the widget list as it appears in the wxGlade main
-      window.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191061664"></a>Frame</h3></div></div></div><p>This prompts for a <code class="classname">wxFrame</code> or a
-        <code class="classname">wxMDIChildFrame</code>. A vertical
-        <code class="classname">wxBoxSizer</code> is appended. In the properties
-        window you can choose the styles and you can add an icon.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191059248"></a>Dialog or Panel</h3></div></div></div><p>This prompts for a <code class="classname">wxDialog</code> or a
-        <code class="classname">wxPanel</code> in top-level. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can choose
-        the styles and, for the dialog, you can add an icon.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191056480"></a>Panel</h3></div></div></div><p>This allows you to add a panel to a sizer. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can choose
-        the styles.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191054496"></a>Splitter Window</h3></div></div></div><p>This produces a <code class="classname">wxSplitterWindow</code> and two
-        associated panels as well. You can choose vertical or horizontal
-        splitting. In the <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span>
-        window you can choose the styles and the sash position.</p><p>Be careful not to put too large a widget in a splitter panel,
-        because while it might appear normal in the design window, when you
-        run your program one of two panels will take all the available space
-        and the other will shrink to the minimum size possible.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191051328"></a>Notebook</h3></div></div></div><p>This produces a <code class="classname">wxNotebook</code> and one panel
-        for each tab. In the <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span>
-        window you can add and remove tabs, which appear in a list.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191048960"></a>Buttons</h3></div></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191048320"></a>Button</h4></div></div></div><p>This produces a <code class="classname">wxButton</code>. You can enter
-          a caption and the <span class="quote">“<span class="quote">default</span>”</span> flag. If you want to add an
-          image you need a bitmap button (see <a class="xref" href="widget_list.html#widgets.bitmap_button.section" title="Bitmap Button">the section called “Bitmap Button”</a>).</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="widgets.bitmap_button.section"></a>Bitmap Button</h4></div></div></div><p>This produces a <code class="classname">wxBitmapButton</code>. You can
-          set the <span class="quote">“<span class="quote">default</span>”</span> flag on or off. You also can choose
-          the bitmap for the button and, optionally, the bitmap for the
-          disabled status. Refer to <a class="xref" href="codegen_bitmap_path.html" title="Specifying the Path of Bitmaps">the section called “Specifying the Path of Bitmaps”</a> for
-          bitmap path specifications.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191042992"></a>Radio Button</h4></div></div></div><p>This produces a <code class="classname">wxRadioButton</code>. In the
-          <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-          the text, and the status, clicked or not, and the style.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191040592"></a>Spin Button</h4></div></div></div><p>This produces a <code class="classname">wxSpinButton</code>. In the
-          <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-          the range and the value.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900191038224"></a>Toggle Button</h4></div></div></div><p>This produces a <code class="classname">wxToggleButton</code>. You can
-          enter a caption and the status (clicked or not) of the
-          button.</p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191036448"></a>Calendar Control</h3></div></div></div><p>This produces a <code class="classname">wxCalendarCtrl</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191034160"></a>Check List Box</h3></div></div></div><p>This produces a <code class="classname">wxCheckListBox</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the choices, the selection and the style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191031792"></a>Check Box</h3></div></div></div><p>This produces a <code class="classname">wxCheckBox</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the text, and the status, checked or not, of the button.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191029408"></a>Choice</h3></div></div></div><p>This produces a <code class="classname">wxChoice</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the position of the selected item starting from 0. You can edit the
-        list of choices.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191026976"></a>Combo Box</h3></div></div></div><p>This produces a <code class="classname">wxComboBox</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the position of the selected item starting from 0. You can edit the
-        list of choices.</p><p>Click on the <span class="quote">“<span class="quote"><span class="guibutton">Apply</span></span>”</span> button
-        to consolidate your changes, they are lost without clicking.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191023312"></a>Date Picker Control</h3></div></div></div><p>This produces a <code class="classname">wxDatePickerCtrl</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191021024"></a>Gauge</h3></div></div></div><p>This produces a <code class="classname">wxGauge</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the range and set the style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191018656"></a>Generic Calendar Control</h3></div></div></div><p>This produces a <code class="classname">wxGenericCalendarCtrl</code>. In
-        the <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can set
-        the style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191016368"></a>Grid</h3></div></div></div><p>This produces a <code class="classname">wxGrid</code>. In the properties
-        window you can set the style, the row number, the label size, the line
-        and background color and the selection mode. You can edit the list of
-        columns. Also you can choose to let wxGlade to create the grid or
-        leave it to the user code.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191014528"></a>Hyperlink Control</h3></div></div></div><p>This produces a <code class="classname">wxHyperlinkCtrl</code>. In the
-        property window you can enter the label, the URL and also set the
-        style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191012880"></a>List Box</h3></div></div></div><p>This produces a <code class="classname">wxListBox</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the position of the selected item starting from 0. You can edit the
-        list of choices.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191010448"></a>List Control</h3></div></div></div><p>This produces a <code class="classname">wxListCtrl</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can set the
-        style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191008160"></a>Property Grid Manager</h3></div></div></div><p>This produces a <code class="classname">wxPropertyGridManager</code>. In
-        the <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can set
-        the style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191005872"></a>Radio Box</h3></div></div></div><p>This produces a <code class="classname">wxRadioBox</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the dimension. The style determines whether the dimension is the
-        number of rows or columns.</p><p>You also can set which button is selected with the
-        <span class="quote">“<span class="quote">Selection</span>”</span> spin starting from 0. You can edit the list
-        of choices.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191002512"></a>Slider</h3></div></div></div><p>This produces a <code class="classname">wxSlider</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the value, the range and also set the style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191000128"></a>Spin Control</h3></div></div></div><p>This produces a <code class="classname">wxSpinCtrl</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the value, the range and also set the style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190997744"></a>Static Line</h3></div></div></div><p>This produces a vertical or horizontal
-        <code class="classname">wxStaticLine</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can tell
-        wxGlade whether to store the object as an attribute of the frame
-        class.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190995328"></a>Static Bitmap</h3></div></div></div><p>This produces a <code class="classname">wxStaticBitmap</code>. You will
-        be prompted for the bitmap path. Refer to <a class="xref" href="codegen_bitmap_path.html" title="Specifying the Path of Bitmaps">the section called “Specifying the Path of Bitmaps”</a> for bitmap path specifications. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can set the
-        style and you can tell wxGlade whether to store the object as an
-        attribute of the frame class.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190992320"></a>Static Text</h3></div></div></div><p>This produces a <code class="classname">wxStaticText</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the text, set the style and tell wxGlade whether to store the control
-        as an attribute.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190989888"></a>Text Control</h3></div></div></div><p>This produces a <code class="classname">wxTextCtrl</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can enter
-        the text and also set the style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190987520"></a>Tree Control</h3></div></div></div><p>This produces a <code class="classname">wxTreeCtrl</code>. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can set the
-        style.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190985232"></a>Custom Widget</h3></div></div></div><p>When you put a Custom Widget in the design window you will be
-        prompted for a class name.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>Custom Widgets will not be shown in the design
-            preview.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900190983120"></a>Constructor for Custom Widgets</h4></div></div></div><p>In the <span class="quote">“<span class="quote"><span class="guilabel">Widget</span></span>”</span> tab of the
-          <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window you can set a
-          number of custom attributes that will appear in the constructor
-          call.</p><div class="figure"><a name="idm139900190980464"></a><p class="title"><b>Figure 6.4. Widget Properties for a Custom Widget</b></p><div class="figure-contents"><div class="mediaobject"><img src="properties_custom_widget.png" width="567" alt="Widget Properties for a Custom Widget"></div></div></div><br class="figure-break"><p>There are four attributes <strong class="userinput"><code>$id</code></strong>,
-          <strong class="userinput"><code>$parent</code></strong>, <strong class="userinput"><code>$width</code></strong> and
-          <strong class="userinput"><code>$height</code></strong> have a special meaning:</p><div class="glosslist"><dl><dt><span class="glossterm">$id</span></dt><dd class="glossdef"><p>This attribute will be replaced by the own widget ID
-                e.g. <code class="constant">wxID_ANY</code>.</p></dd><dt><span class="glossterm">$parent</span></dt><dd class="glossdef"><p>This attribute will be replaced by a reference to the
-                parent widget.</p></dd><dt><span class="glossterm">$width</span></dt><dd class="glossdef"><p>This attribute will be replaced by the widget
-                width.</p></dd><dt><span class="glossterm">$height</span></dt><dd class="glossdef"><p>This attribute will be replaced by the widget
-                height.</p></dd></dl></div><p>These attributes have different effects in C++, Lisp, Perl,
-          Python or XRC code generation.</p><p>For XRC you can use it to add custom attributes to the
-          resource object. To do so, arguments must have the following format:
-          <span class="quote">“<span class="quote"><em class="parameter"><code>ATTRIBUTE_NAME:
-          ATTRIBUTE_VALUE</code></em></span>”</span>. For instance:
-          <span class="quote">“<span class="quote"><em class="parameter"><code>default_value:10</code></em></span>”</span> is translated
-          to:
-          <span class="quote">“<span class="quote"><code class="code">&lt;default_value&gt;10&lt;/default_value&gt;</code></span>”</span>.
-          Invalid entries are silently ignored.</p><p>You can use the property <span class="quote">“<span class="quote"><span class="guilabel">Custom
-          constructor</span></span>”</span> to specify a custom constructor like
-          a factory method.</p><div class="example"><a name="idm139900190963440"></a><p class="title"><b>Example 6.6. Generated C++ code for the custom widget shown
-            above</b></p><div class="example-contents"><pre class="programlisting">MyFrame::MyFrame(wxWindow* parent, int id, const wxString&amp; title, const wxPoint&amp; pos, const wxSize&amp; size, long style):
-    wxFrame(parent, id, title, pos, size, style)
-{
-    // begin wxGlade: MyFrame::MyFrame
-    window_1 = new wxChoicebook(this, wxID_ANY);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-</pre></div></div><br class="example-break"><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>Refer to <a class="xref" href="ui_properties_window.html#ui_code_properties" title="Code Properties">the section called “Code Properties”</a> for a
-            description of declaration and assignment of additional functions
-            and variables.</p></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a name="idm139900190959280"></a>Example: AGW SpeedMeter</h4></div></div></div><div class="example"><a name="idm139900190958512"></a><p class="title"><b>Example 6.7. Widget Custom Widget - AGW SpeedMeter</b></p><div class="example-contents"><div class="figure"><a name="idm139900190957744"></a><p class="title"><b>Figure 6.5. Widget Tree</b></p><div class="figure-contents"><div class="mediaobject"><img src="custom_widget_SM_tree.png" width="319" alt="Widget Tree"></div></div></div><p><br class="figure-break"></p><div class="figure"><a name="idm139900190955360"></a><p class="title"><b>Figure 6.6. SpeedMeter Properties</b></p><div class="figure-contents"><div class="mediaobject"><img src="custom_widget_SM_design1.png" width="638" alt="SpeedMeter Properties"></div><div class="mediaobject"><img src="custom_widget_SM_design2.png" width="319" alt="SpeedMeter Properties"></div></div></div><p><br class="figure-break"></p><div class="figure"><a name="idm139900190951472"></a><p class="title"><b>Figure 6.7. Preview</b></p><div class="figure-contents"><div class="mediaobject"><img src="custom_widget_SM_preview.png" width="319" alt="Preview"></div></div></div><p><br class="figure-break">Generated Python code:</p><pre class="programlisting">#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-#
-# generated by wxGlade 0.7.1 on Sat Dec 19 11:11:39 2015
-#
-
-import wx
-
-# begin wxGlade: dependencies
-import gettext
-# end wxGlade
-
-# begin wxGlade: extracode
-import wx.lib.agw.speedmeter as SM
-# end wxGlade
-
-
-class MyFrame(wx.Frame):
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame.__init__
-        wx.Frame.__init__(self, *args, **kwds)
-        self.speedmeter_1 = SM.SpeedMeter(self, wx.ID_ANY)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle(_("frame_1"))
-        self.SetSize((300, 300))
-        self.speedmeter_1.SetSpeedValue(33)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_1.Add(self.speedmeter_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.SetSizer(sizer_1)
-        self.Layout()
-        # end wxGlade
-
-# end of class MyFrame
-class MyApp(wx.App):
-    def OnInit(self):
-        frame_1 = MyFrame(None, wx.ID_ANY, "")
-        self.SetTopWindow(frame_1)
-        frame_1.Show()
-        return True
-
-# end of class MyApp
-
-if __name__ == "__main__":
-    gettext.install("app") # replace with the appropriate catalog name
-
-    app = MyApp(0)</pre></div></div><p><br class="example-break"></p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900190945968"></a>Spacer</h3></div></div></div><p>When you put a spacer into a sizer slot in the design window you
-        will be prompted for the size; wxGlade will generate the code to set
-        an empty space in that slot of the sizer.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="star_bars.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="supported_widgets.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="technical_notes.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Menubar, Statusbar and Toolbar </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 7. wxGlade technical notes</td></tr></table></div></body></html>
diff -Nru wxglade-0.9.6/docs_old/html/working_with_wxglade.html wxglade-1.0.1/docs_old/html/working_with_wxglade.html
--- wxglade-0.9.6/docs_old/html/working_with_wxglade.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/html/working_with_wxglade.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 4. Working with wxGlade</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="wxGlade manual"><link rel="up" href="index.html" title="wxGlade manual"><link rel="prev" href="troubleshooting.html" title="Troubleshooting and Error Handling"><link rel="next" href="next_steps.html" title="Next Steps"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 4. Working with wxGlade</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="troubleshooting.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="next_steps.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="working_with_wxglade"></a>Chapter 4. Working with wxGlade</h1></div></div></div><p>The program wxGlade is a tool for designing Graphical User
-    Interfaces (GUI). It is intended to be used with the wxWidgets framework
-    in all its flavors: C++, Lisp, Perl, Python and XRC.</p><p>You use a visual editor for creating forms, menus and toolbars with
-    the mouse.</p><p>Your design is saved in a <code class="filename">.wxg</code> file, which is
-    the wxGlade file format. Then you generate source code or XRC by using
-    visual tools or invoking wxGlade on the command line. You can also use
-    wxGlade in your makefile by generating source code only when the
-    <code class="filename">.wxg</code> file changes.</p><p>A <code class="filename">.wxg</code> file can contain multiple forms, panels,
-    menus and toolbars and generate either a single file containing all
-    classes or multiple files containing one class each.</p><p>wxGlade does not manage events, file inclusion, function names,
-    stubs or anything else but graphic interface code.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idm139900191581312"></a>First Steps</h2></div></div></div><p>These sections provided you a short introduction into wxGlade.
-      Advanced topics like escaping special characters or naming convention
-      will be discussed in <a class="xref" href="next_steps.html" title="Next Steps">the section called “Next Steps”</a>.</p><p>The used abbreviations are described in <a class="xref" href="abbreviations.html" title="Appendix A. Glossary of Terms, Abbreviations, and Acronyms">Appendix A, <i>Glossary of Terms, Abbreviations, and Acronyms</i></a>.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idm139900191578736"></a>Quick Example</h3></div></div></div><p>We will design a simple form.</p><p>Start wxGlade by running the <span class="command"><strong>wxglade</strong></span> program
-        on Unix or the <span class="command"><strong>wxglade.pyw</strong></span> program on Microsoft
-        Windows.</p><p>You will see a Main Palette with several buttons, and a Tree
-        Window with an icon marked <span class="guiicon">Application</span>. A
-        Properties Window shows the properties of the Application. If you move
-        the mouse over a button in the Main Palette, a tooltip will display
-        its function.</p><p>To add a frame in the design window, from the Main Palette
-        choose the first button: <span class="quote">“<span class="quote"><span class="guibutton">Add a
-        frame</span></span>”</span> and choose <code class="classname">wxFrame</code> as
-        the base class.</p><p>Look at the tree window and see that two icons are generated
-        under the application icon, a frame icon and a sizer icon.</p><p>If you double click on the frame icon, the designer window
-        appears. Notice that the sizer is displayed as a set of gray hatched
-        boxes: they are the <span class="quote">“<span class="quote">slots</span>”</span> of the sizer where you will
-        place the widgets.</p><p>You place a widget on a sizer by selecting it on the Main
-        Palette, then click on an empty slot on the frame on the designer
-        window. Try adding a static text, a text control and a button.</p><p>If you want to add something else, add empty slots on the sizer
-        by right-clicking on the sizer on the Tree Window and selecting
-        <span class="quote">“<span class="quote"><span class="guilabel">Add slot</span></span>”</span>.</p><p>Play around, adding four or five widgets on the frame.</p><p>Now look at the properties form; there are three tabs. In the
-        <span class="quote">“<span class="quote"><span class="guilabel">Common</span></span>”</span> tab you can specify the
-        name, size and color of the widget.</p><p>In the <span class="quote">“<span class="quote"><span class="guilabel">Layout</span></span>”</span> tab you can
-        adjust borders and alignments and the
-        <span class="quote">“<span class="quote"><span class="guilabel">Widget</span></span>”</span> tab enables you to change
-        the properties of the widget.</p><p>You can select the properties of a widget by clicking on the
-        designer window or the corresponding icon on the tree window.</p><p>Try adjusting widgets with the properties form until you know
-        you have played enough.</p><p>Now let's generate the code.</p><p>Select the Application icon on the tree window and go to the
-        <span class="quote">“<span class="quote"><span class="guilabel">Properties</span></span>”</span> window.</p><p>Check <span class="quote">“<span class="quote"><span class="guilabel">Name</span></span>”</span> and
-        <span class="quote">“<span class="quote"><span class="guilabel">Class</span></span>”</span>, choose a
-        <span class="quote">“<span class="quote"><span class="guilabel">Top window</span></span>”</span>, check
-        <span class="quote">“<span class="quote"><span class="guilabel">Single file</span></span>”</span> and choose the
-        language and set the <span class="quote">“<span class="quote"><span class="guilabel">Output path</span></span>”</span>
-        by pushing the button for selecting a path and a filename.</p><p>Finally press the <span class="quote">“<span class="quote"><span class="guibutton">Generate
-        code</span></span>”</span> button, and the code is generated.</p><p>Compile and enjoy.</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="troubleshooting.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="next_steps.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Troubleshooting and Error Handling </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Next Steps</td></tr></table></div></body></html>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/wxglade.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/wxglade.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/wxglade_start_on_linux.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/wxglade_start_on_linux.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/html/wxglade_start_on_windows.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/html/wxglade_start_on_windows.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/img/box_sizer_button.gif and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/img/box_sizer_button.gif differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/img/button_button.gif and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/img/button_button.gif differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/img/custom_widget.gif and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/img/custom_widget.gif differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/img/frame_button.gif and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/img/frame_button.gif differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/img/notebook_button.gif and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/img/notebook_button.gif differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/img/sizer_slot.gif and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/img/sizer_slot.gif differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/img/spacer_button.gif and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/img/spacer_button.gif differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/img/text_ctrl_button.gif and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/img/text_ctrl_button.gif differ
diff -Nru wxglade-0.9.6/docs_old/man/manpage.xml wxglade-1.0.1/docs_old/man/manpage.xml
--- wxglade-0.9.6/docs_old/man/manpage.xml	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/man/manpage.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,238 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'.  A manual page
-<package>.<section> will be generated.  You may view the
-manual page with: nroff -man <package>.<section> | less'.  A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
-        $(XP) $(DB2MAN) $<
-    
-The xsltproc binary is found in the xsltproc package.  The
-XSL files are in docbook-xsl.  Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
-  <!ENTITY dhusername  "Georges Khaznadar">
-  <!ENTITY dhpackage   "wxglade">
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-<refentry>
-
-
-  <refentryinfo>
-    <authorgroup>
-      <author>
-        <firstname>Georges</firstname>
-        <surname>Khaznadar</surname>
-        <affiliation>
-          <address>
-            <email>georgesk@ofset.org</email>
-          </address>
-        </affiliation>
-        <contrib>
-          This manual page was originally written by &dhusername; for
-          the &debian; system (but may be used by others).  Permission is
-          granted to copy, distribute and/or modify this document under
-          the terms of the &gnu; General Public License, Version 2 any 
-          later version published by the Free Software Foundation.
-          On &debian; systems, the complete text of the &gnu; General Public
-          License can be found in /usr/share/common-licenses/GPL.
-        </contrib>
-      </author>
-      <author>
-        <firstname>Carsten</firstname>
-        <surname>Grohmann</surname>
-        <affiliation>
-          <address>
-            <email>mail@carstengrohmann.de</email>
-          </address>
-        </affiliation>
-        <contrib>
-          Current maintainer of this manpage.
-        </contrib>
-      </author>
-    </authorgroup>
-    <copyright>
-      <year>2003</year>
-      <holder>Georges Khaznadar</holder>
-      <year>2012-2016</year>
-      <holder>Carsten Grohmann</holder>
-    </copyright>
-    <date>January 07, 2012</date>
-  </refentryinfo>
-
-
-  <refmeta>
-    <refentrytitle>wxGlade</refentrytitle>
-    <manvolnum>1</manvolnum>
-    <refmiscinfo class="source">wxGlade</refmiscinfo>
-    <refmiscinfo class="manual">User Commands</refmiscinfo>
-    <refmiscinfo class="date">January 07, 2012</refmiscinfo>
-  </refmeta>
-
-
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-    <refpurpose>python program to build user interfaces based on the wxWidgets toolset.</refpurpose>
-  </refnamediv>
-
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      <group choice="opt">
-        <arg choice="plain">--help</arg>
-        <arg choice="plain">-h</arg>
-      </group>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      <arg choice="opt">--version</arg>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      <arg choice="opt">
-        <replaceable>FILENAME.wxg</replaceable>
-      </arg>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      <group choice="req">
-        <arg choice="plain">-g <replaceable>LANG</replaceable></arg>
-        <arg choice="plain">--generate-code <replaceable>LANG</replaceable></arg>
-      </group>
-      <group choice="opt">
-        <arg choice="plain">-o <replaceable>DESTINATION</replaceable></arg>
-        <arg choice="plain">--output <replaceable>DESTINATION</replaceable></arg>
-      </group>
-      <arg choice="plain">
-        <replaceable>FILENAME.wxg</replaceable>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  
-
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      <command>&dhpackage;</command> wxGlade is a GUI designer written in
-      Python with the popular GUI toolkit wxPython, that helps you create
-      wxWidgets/wxPython user interfaces. At the moment it can generate
-      Python, Lisp, C++ and XRC (wxWidgets' XML resources) code.
-    </para>
-  </refsect1>
-
-
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>These programs follow the usual <acronym>GNU</acronym> command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <application>Info</application> files.</para>
-    <variablelist>
-      <varlistentry>
-        <term><option>-g</option> or
-          <option>--generate-code</option> <replaceable>LANG</replaceable>
-        </term>
-        <listitem>
-          <para>If you only want to generate the code without starting the 
-            GUI, use the -g or --generate-code option with the language as 
-            argument
-          </para>
-          <para>
-            Possible values for LANG are "python", "lisp", "XRC", "perl"
-            or "C++".
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><option>-o</option> or
-          <option>--output</option> <replaceable>DESTINATION</replaceable>
-        </term>
-        <listitem>
-          <para>
-            You can specify the destination of the generated code with -o
-            or --output option.
-          </para>
-          <para>
-            The DESTINATION argument can be a file or a directory. It is a file
-            when the FILENAME.wxg generates single-file source code. It is a
-            directory when the FILENAME.wxg generates multiple-file source
-            code.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-h</option> or
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>
-            Show the help message and exit            
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>
-            Show programs version number and exit
-          </para>
-        </listitem>
-      </varlistentry>  
-    </variablelist>
-  </refsect1>
-
-
-  <refsect1>
-    <title>EXAMPLES</title>
-    <para>
-      Generate Python code out of <filename>myapp.wxg</filename>:
-    </para>
-    <para>
-      <command>&dhpackage;</command> -o /tmp -g python myapp.wxg
-    </para>
-    <para>
-      Open file <filename>myapp.wxg</filename> in wxGlade GUI:
-    </para>
-    <para>
-      <command>&dhpackage;</command> myapp.wxg
-    </para>
-  </refsect1>
-  
-  
-  <refsect1>
-    <title>BUGS</title>
-    <para>
-      Report wxGlade bugs to &lt;wxglade-general@lists.sourceforge.net&gt; or 
-      &lt;https://sourceforge.net/projects/wxglade/&gt;
-    </para>
-  </refsect1>  
-  
-  
-  <refsect1>
-    <title>SEE ALSO</title>
-    <para>
-      wxGlade home page &lt;http://wxgalde.sourceforge.net&gt;
-    </para>
-
-  </refsect1>
-  
-</refentry>
diff -Nru wxglade-0.9.6/docs_old/man/wxglade.1 wxglade-1.0.1/docs_old/man/wxglade.1
--- wxglade-0.9.6/docs_old/man/wxglade.1	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/man/wxglade.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-'\" t
-.\"     Title: wxGlade
-.\"    Author: Georges Khaznadar <georgesk@ofset.org>
-.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: January 07, 2012
-.\"    Manual: User Commands
-.\"    Source: wxGlade
-.\"  Language: English
-.\"
-.TH "WXGLADE" "1" "January 07, 2012" "wxGlade" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-wxglade \- python program to build user interfaces based on the wxWidgets toolset\&.
-.SH "SYNOPSIS"
-.HP \w'\fBwxglade\fR\ 'u
-\fBwxglade\fR [\-\-help | \-h]
-.HP \w'\fBwxglade\fR\ 'u
-\fBwxglade\fR [\-\-version]
-.HP \w'\fBwxglade\fR\ 'u
-\fBwxglade\fR [\fIFILENAME\&.wxg\fR]
-.HP \w'\fBwxglade\fR\ 'u
-\fBwxglade\fR {\-g\ \fILANG\fR | \-\-generate\-code\ \fILANG\fR} [\-o\ \fIDESTINATION\fR | \-\-output\ \fIDESTINATION\fR] \fIFILENAME\&.wxg\fR
-.SH "DESCRIPTION"
-.PP
-\fBwxglade\fR
-wxGlade is a GUI designer written in Python with the popular GUI toolkit wxPython, that helps you create wxWidgets/wxPython user interfaces\&. At the moment it can generate Python, Lisp, C++ and XRC (wxWidgets\*(Aq XML resources) code\&.
-.SH "OPTIONS"
-.PP
-These programs follow the usual
-GNU
-command line syntax, with long options starting with two dashes (`\-\*(Aq)\&. A summary of options is included below\&. For a complete description, see the
-Info
-files\&.
-.PP
-\fB\-g\fR or \fB\-\-generate\-code\fR \fILANG\fR
-.RS 4
-If you only want to generate the code without starting the GUI, use the \-g or \-\-generate\-code option with the language as argument
-.sp
-Possible values for LANG are "python", "lisp", "XRC", "perl" or "C++"\&.
-.RE
-.PP
-\fB\-o\fR or \fB\-\-output\fR \fIDESTINATION\fR
-.RS 4
-You can specify the destination of the generated code with \-o or \-\-output option\&.
-.sp
-The DESTINATION argument can be a file or a directory\&. It is a file when the FILENAME\&.wxg generates single\-file source code\&. It is a directory when the FILENAME\&.wxg generates multiple\-file source code\&.
-.RE
-.PP
-\fB\-h\fR or \fB\-\-help\fR
-.RS 4
-Show the help message and exit
-.RE
-.PP
-\fB\-\-version\fR
-.RS 4
-Show programs version number and exit
-.RE
-.SH "EXAMPLES"
-.PP
-Generate Python code out of
-myapp\&.wxg:
-.PP
-\fBwxglade\fR
-\-o /tmp \-g python myapp\&.wxg
-.PP
-Open file
-myapp\&.wxg
-in wxGlade GUI:
-.PP
-\fBwxglade\fR
-myapp\&.wxg
-.SH "BUGS"
-.PP
-Report wxGlade bugs to <wxglade\-general@lists\&.sourceforge\&.net> or <https://sourceforge\&.net/projects/wxglade/>
-.SH "SEE ALSO"
-.PP
-wxGlade home page <http://wxgalde\&.sourceforge\&.net>
-.SH "AUTHORS"
-.PP
-\fBGeorges Khaznadar\fR <\&georgesk@ofset\&.org\&>
-.RS 4
-This manual page was originally written by Georges Khaznadar for the Debian(TM) system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation\&. On Debian(TM) systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&.
-.RE
-.PP
-\fBCarsten Grohmann\fR <\&mail@carstengrohmann\&.de\&>
-.RS 4
-Current maintainer of this manpage\&.
-.RE
-.SH "COPYRIGHT"
-.br
-Copyright \(co 2003, 2012-2016 Georges Khaznadar, Carsten Grohmann
-.br
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/pdf/manual.pdf and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/pdf/manual.pdf differ
diff -Nru wxglade-0.9.6/docs_old/ReleaseSteps.txt wxglade-1.0.1/docs_old/ReleaseSteps.txt
--- wxglade-0.9.6/docs_old/ReleaseSteps.txt	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/ReleaseSteps.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-Steps to publish a new version
-==============================
-
-NAMING:
-  HG_OLD_VERSION - Mercurial version string of the OLD version e.g. 0_7_0
-  HG_NEW_VERSION - Mercurial version string of the NEW version e.g. 0_7_1
-  NEW_VERSION    - Version string of the wxGlade version to release
-                   e.g. 0.7.1
-
-
-STEPS:
- 1. Close last stable branch
-    # hg update <HG_OLD_VERSION>
-    # hg commit --close-branch -m "Closed WXG-BRANCH-VERSION_<HG_OLD_VERSION> branch"
-    # hg update default
-
- 2. Update documentation 
-  * NEWS.txt
-  * README.txt
-  * README.SF.md
-  * wxGlade.desktop
-  * wxGlade manual especially the error section
-  * Add new changes to changelog file "CHANGES.txt"
-    # hg log --template=changelog > CHANGES.txt
-        
- 3. Change the version number in wxglade-installer.iss to "<NEW_VERSION>"
-
- 4. Commit all open changes
-
- 5. Create a new Mercurial tag
-    # hg tag rel_<HG_NEW_VERSION>
-        
- 6. Create a branch for maintaining stable release
-    # hg branch WXG-BRANCH-VERSION_<HG_NEW_VERSION>
-    # hg commit --message "Created WXG-BRANCH-VERSION_<HG_NEW_VERSION> branch"
-        
- 7. Create a version.py file in stable branch
-
-    Please ensure that the version string as the same as in
-    wxglade-installer.iss
-
-    # cat version.py
-        #
-        # This is an automatically generated file. Manual changes will be
-        # overwritten without warning.
-        #
-
-        __version__ = "<NEW_VERSION>"
-    # hg add version.py
-    # hg commit -m "Add version file" version.py
-        
- 8. Push changes into public repository
-
- 9. Create all packages
-    - build windows installer (see docs/BuildingInstaller.txt)
-    - create zip and tar.gz source packages
-      # make release
-          
-10. Update web page at wxglade.sf.net
-    - upload packages to SF
-    - update README.SF.md and upload to SF
-    - update news section in htdocs/bits/news.html
-    - update HTML and PDF manual in htdocs/manual
-        
-11. Send notification email to wxGlade mailing list
-
-12. Switch back to default branch
-    # hg update default
-
-13. Change version number in wxglade-installer.iss back to "HG"
-
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/custom_widget_SM_design1.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/custom_widget_SM_design1.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/custom_widget_SM_design2.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/custom_widget_SM_design2.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/custom_widget_SM_preview.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/custom_widget_SM_preview.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/custom_widget_SM_tree.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/custom_widget_SM_tree.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/design_window_empty_slot.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/design_window_empty_slot.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/design_window.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/design_window.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/error_dialog.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/error_dialog.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/example_baseclasses.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/example_baseclasses.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/example_eventhandler.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/example_eventhandler.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/example_setproperty.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/example_setproperty.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/example_subclassed.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/example_subclassed.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/example_variableassigment.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/example_variableassigment.png differ
diff -Nru wxglade-0.9.6/docs_old/src/html.xsl wxglade-1.0.1/docs_old/src/html.xsl
--- wxglade-0.9.6/docs_old/src/html.xsl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/src/html.xsl	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-    <!-- Most of this parameters are specific to dblatex -->
-
-    <xsl:param name="generate.toc" select="'book toc,title,figure,table,example'"/>
-
-    <!-- Print the document collaborators (authors, etc.) in a table -->
-    <xsl:param name="doc.collab.show" select="0"/>
-
-    <!-- List of titles to display after TOC -->
-    <xsl:param name="doc.lot.show"></xsl:param>
-
-    <!-- Depth of the section numbering -->
-    <xsl:param name="doc.section.depth">2</xsl:param>
-
-    <!-- Print the revhistory table -->
-    <xsl:param name="latex.output.revhistory" select="0"/>
-
-    <!-- How preface section and subsections appear in TOC -->
-    <xsl:param name="preface.tocdepth" select="1"/>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-    <xsl:param name="toc.section.depth">2</xsl:param>
-
-    <!-- Use number and title in cross references -->
-    <xsl:param name="xref.with.number.and.title" select="1"/>
-
-    <!-- Use number and title in cross references -->
-    <xsl:param name="use.id.as.filename" select="1"/>
-
-    <!-- Create chunk even for first toplevel section -->
-    <xsl:param name="chunk.first.sections" select="0"></xsl:param>
-</xsl:stylesheet>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/label_menu.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/label_menu.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/main_window.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/main_window.png differ
diff -Nru wxglade-0.9.6/docs_old/src/manual.xml wxglade-1.0.1/docs_old/src/manual.xml
--- wxglade-0.9.6/docs_old/src/manual.xml	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/src/manual.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,4540 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"/usr/share/xml/docbook/xml-dtd-4.5/docbookx.dtd">
-<book>
-  <title>wxGlade manual</title>
-
-  <bookinfo>
-    <date>2016-08-30</date>
-
-    <authorgroup>
-      <author>
-        <firstname>Marcello</firstname>
-
-        <surname>Semboli</surname>
-      </author>
-
-      <author>
-        <firstname>Alberto</firstname>
-
-        <surname>Griggio</surname>
-      </author>
-
-      <author>
-        <firstname>Carsten</firstname>
-
-        <surname>Grohmann</surname>
-      </author>
-    </authorgroup>
-  </bookinfo>
-
-  <preface id="preface">
-    <title>Preface</title>
-
-    <para>This manual describes the program wxGlade, initially written by
-    Alberto Griggio. wxGlade is a Python, Perl, Lisp, C++ and XRC Graphical
-    User Interface (<quote>GUI</quote>) editor for Unix and Microsoft Windows.
-    Each of the chapters in this manual is designed as a tutorial for using
-    wxGlade and a reference for widgets supported until now.</para>
-
-    <section id="preface_contact">
-      <title>Contact</title>
-
-      <para>Check the project homepage <ulink
-      url="http://wxglade.sourceforge.net">http://wxglade.sourceforge.net</ulink>
-      for the mailing list to discuss the project. Use the lists for
-      questions, proposals, bug reports and collaboration. Information,
-      support and bug reports can be addressed to the wxGlade mailing list
-      too.</para>
-
-      <para>Any kind of feedback is always welcome.</para>
-    </section>
-
-    <section id="preface_license">
-      <title>License</title>
-
-      <para>wxGlade is copyright 2002-2007 by Alberto Griggio and 2011-2016 by
-      Carsten Grohmann.</para>
-
-      <para>Use and distribution of wxGlade is governed by the MIT license,
-      located in <xref linkend="license_mit"/>.</para>
-    </section>
-  </preface>
-
-  <chapter id="start">
-    <title>Getting Started</title>
-
-    <section id="what_is_wxglade">
-      <title>What is wxGlade?</title>
-
-      <para>wxGlade is an open source graphical user interface builder written
-      in Python using popular widget toolkit wxWidgets.</para>
-
-      <figure>
-        <title>wxGlade windows</title>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata contentwidth="15cm" fileref="wxglade.png"/>
-          </imageobject>
-        </mediaobject>
-      </figure>
-
-      <para>wxGlade allows to create graphical user interfaces using
-      wxWidgets. The designer can arrange different widgets using a drag and
-      drop WYSIWYG editor. This simplifies the creation of a graphical user
-      interface in comparison with manual coded graphical user
-      interfaces.</para>
-
-      <para>wxGlade is able to generate source code for Python, Perl, Lisp,
-      C++ and XRC based on the designed GUI.</para>
-
-      <para>As you can guess by the name, its model is Glade, the famous
-      GTK+/GNOME GUI builder, with which wxGlade shares the philosophy and the
-      look &amp; feel (but not a line of code).</para>
-
-      <section>
-        <title>What can you do with wxGlade?</title>
-
-        <para>With wxGlade you can:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>Design the whole GUI of your application inclusive simple or
-            complex dialogs as well as menu bars, different kinds of buttons
-            and text widgets, bitmaps, ...</para>
-          </listitem>
-
-          <listitem>
-            <para>Use the graphical editor for editing, cutting and pasting
-            widgets</para>
-          </listitem>
-
-          <listitem>
-            <para>Convert your design in source code of your favorite
-            language</para>
-          </listitem>
-
-          <listitem>
-            <para>Run wxGlade on a wide variety of operation systems since it
-            is written in Python</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section>
-        <title>What is wxGlade NOT?</title>
-
-        <para>wxGlade is not a full featured IDE and will never be one.
-        wxGlade is just a graphical user interface builder. The generated code
-        does nothing apart from displaying the created widgets.</para>
-
-        <para>If you are looking for a complete IDE, maybe <ulink
-        url="http://eric-ide.python-projects.org">Eric Python IDE</ulink>,
-        <ulink url="???">PyCharm</ulink>, <ulink
-        url="http://www.codeblocks.org">Code::Blocks</ulink> or one of the
-        many other IDEs the right tool.</para>
-
-        <para> wxGlade isn't a tool to learn programming with wxWidgets. You
-        can't use wxGlade if you do not have any basic understanding of
-        programming. You need to know the basics of wxWidgets, as well as the
-        basics of C++, Python, Perl or Lisp.</para>
-      </section>
-    </section>
-  </chapter>
-
-  <chapter id="installation">
-    <title>Installation</title>
-
-    <section id="requirements">
-      <title>Requirements and Supported Platforms</title>
-
-      <para>wxGlade has been run on Microsoft Windows, Linux, OS X because
-      it's written in Python using wxPython. wxGlade can be run on any
-      platform that supports Python and wxPython.</para>
-
-      <para>The requirements to run wxGlade are:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Python 2.7, Python 3.1 or later</para>
-        </listitem>
-
-        <listitem>
-          <para>wxPython 2.8 or 3.0</para>
-
-          <para>Sometimes the wxPython module <quote>wxversion</quote> is
-          packaged separately e.g. in Debian. Please install the
-          <quote>wxversion</quote> package manually in such case</para>
-        </listitem>
-
-        <listitem>
-          <para>wxWidgets 2.8 or 3.0, the wxWidgets are often bundled with
-          wxPython</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>wxWidgets is available at <ulink
-      url="http://www.wxwidgets.org">http://www.wxwidgets.org</ulink> and
-      wxPython at <ulink
-      url="http://www.wxpython.org">http://www.wxpython.org</ulink>.</para>
-    </section>
-
-    <section id="installing">
-      <title>Installing wxGlade</title>
-
-      <para>wxGlade is available in four different package types:</para>
-
-      <orderedlist>
-        <listitem>
-          <para>the sources packages (<filename>.zip</filename> and
-          <filename>.tar.gz</filename>)</para>
-        </listitem>
-
-        <listitem>
-          <para>the full installer on Microsoft Windows
-          (<filename>wxGlade-&lt;VERSION&gt;-setup.exe</filename>)</para>
-        </listitem>
-
-        <listitem>
-          <para>the installer of the Standalone Edition on Microsoft Windows
-          (<filename>wxGlade-SAE-&lt;VERSION&gt;-setup.exe</filename>)</para>
-        </listitem>
-
-        <listitem>
-          <para>current development version</para>
-        </listitem>
-      </orderedlist>
-
-      <section>
-        <title>Requirements for Building Own Packages</title>
-
-        <para>You need listed additional packages for building wxGlade
-        packages from the Mercurial repository:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>setuptools</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section>
-        <title>Download</title>
-
-        <section>
-          <title>Official Release Packages</title>
-
-          <para>All stable version are available for downloading at <ulink
-          url="https://sourceforge.net/projects/wxglade/">https://sourceforge.net/projects/wxglade/</ulink>.</para>
-        </section>
-
-        <section>
-          <title>Development Versions</title>
-
-          <para>wxGlade manages source code in a <ulink
-          url="http://mercurial.selenic.com">Mercurial</ulink> repository
-          hosted on <ulink url="https://bitbucket.org">Bitbucket.org</ulink>.
-          You can fetch the whole repository from <ulink
-          url="https://bitbucket.org/wxglade/wxglade">https://bitbucket.org/wxglade/wxglade</ulink>
-          using anonymous Mercurial (<command>hg</command>) access.</para>
-
-          <para>Alternatively you can download different source tarballs from
-          <ulink
-          url="https://bitbucket.org/wxglade/wxglade/downloads">https://bitbucket.org/wxglade/wxglade/downloads</ulink>.</para>
-        </section>
-      </section>
-
-      <section>
-        <title>Installing on Microsoft Windows</title>
-
-        <para>The full installer requires a local installation Python and
-        wxPython. The wxWidgets are usually bundled with wxPython on Microsoft
-        Windows. Thereby you don't need to install wxWidgets
-        separately.</para>
-
-        <para>The Standalone Edition doesn't need additional packages. It's
-        includes already the required parts of Python, wxPython and
-        wxWidgets.</para>
-
-        <para>The installation process is quite simple. Just download the
-        installer binary, execute it and follow the instructions.</para>
-      </section>
-
-      <section>
-        <title>Installing on Unix/Unix-like Operating Systems</title>
-
-        <para>Current Linux distributions provide wxGlade packages already.
-        Use the distribution specific install mechanism to install the wxGlade
-        package and all dependencies.</para>
-
-        <para>Install wxGlade from the source package like described in <xref
-        linkend="installation_from_source"/> if your distribution
-        doesn't provide any package or the package is out-of-date.</para>
-
-        <para>On Unix systems wxGlade will be started using the shell script
-        <command>wxglade</command>. The script search the system for Python 2
-        and finally executes the Python interpreter to start wxGlade.</para>
-
-        <para>You can set the environment variable <envar>PYTHON_BIN</envar>,
-        if the shell script <command>wxglade</command> doesn't find Python or
-        if you want to use a non-default interpreter.</para>
-      </section>
-
-      <section id="installation_from_source">
-        <title>Installing from Source</title>
-
-        <para>The installation from scratch requires Python, wxPython and
-        wxWidgets. Install these three components first. You can use already
-        packaged versions of those components for your operating system.
-        Otherwise read the installation documentation of the missing
-        components and follow the instructions.</para>
-
-        <para>Download a source package or a development package in a first
-        step.</para>
-
-        <para>You can install wxGlade from source in three different
-        ways.</para>
-
-        <section id="installation_single_user">
-          <title>Single User Installation (Extract and Run)</title>
-
-          <sidebar>
-            <para>In short:</para>
-
-            <para>Just download the archive of current version as a .zip file
-            or a .tar.gz file, extract the archive into a empty directory and
-            execute <command>wxglade</command> on Unix or
-            <command>wxglade.pyw</command> on Windows to start wxGlade.</para>
-          </sidebar>
-
-          <para>The <quote>Single User Installation</quote> is a simplified
-          installation without using native package like
-          <filename>.msi</filename> or <filename>.exe</filename> files on
-          Microsoft Windows or <filename>.rpm</filename>,
-          <filename>.pkg</filename> and <filename>.deb</filename> on Linux.
-          It's to provide a simple way for running wxGlade without the need of
-          installation privileges.</para>
-
-          <para>The dependencies listed in <xref
-          linkend="requirements"/> have been
-          satisfied.</para>
-
-          <para>The source packages and the development packages have the same
-          structure. They have a top-level directory and all wxGlade files are
-          under those top-level directory. Extract the package into the user's
-          home directory. Take care that the directory structure of the
-          archive will be preserved. Rename the top-level directory to
-          wxGlade. That's shorter and simpler to use.</para>
-
-          <para>Change into the new created directory. Execute the
-          <command>wxglade</command> file on Unix operating systems or
-          <command>wxglade.pyw</command> on Microsoft Windows to start
-          wxGlade. Feel free to create a shortcut on your desktop.</para>
-
-          <para>That's all. Installations below users home directory don't
-          require administrative permissions.</para>
-        </section>
-
-        <section>
-          <title>Multi User Installation - Variant A on Windows and
-          Unix</title>
-
-          <para>The first variant of a multi user installation is very similar
-          to <xref linkend="installation_single_user"/> except the
-          installation directory. And probably you need administrative
-          permissions. You could extract the wxGlade source package e.g. into
-          <command>C:\Program Files\wxGlade</command> on Microsoft Windows or
-          into <command>/opt/wxGlade</command> on Unix. Execute the
-          <command>wxglade</command> file on Unix operating systems or
-          <command>wxglade.pyw</command> on Microsoft Windows to start
-          wxGlade.</para>
-
-          <figure>
-            <title>Starting wxGlade on Windows at C:\Program
-            Files\wxGlade</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata contentwidth="15cm"
-                           fileref="wxglade_start_on_windows.png"/>
-              </imageobject>
-            </mediaobject>
-          </figure>
-        </section>
-
-        <section>
-          <title>Multi User Installation - Variant B on Unix</title>
-
-          <para>The second installation method is only supported Unix
-          operating systems.</para>
-
-          <para>Extract the downloaded package into a temporary directory.
-          Open a terminal window, change into the temporary directory and
-          install wxGlade using execute the Python setup script
-          <command>setup.py</command> as follow:</para>
-
-          <para><command>python2 setup.py install --root &lt;DESTINATION
-          DIRECTORY&gt;</command></para>
-
-          <note>
-            <para>Parameters shown in angle brackets (e.g.,
-            <quote><parameter>&lt;parameter&gt;</parameter></quote>) are
-            required.</para>
-
-            <para>Parameters shown in square brackets (e.g.,
-            <quote><parameter>[parameter]</parameter></quote>) are optional.
-            If not given, wxGlade will use suitable defaults.</para>
-          </note>
-
-          <example>
-            <title>Installing wxGlade at /opt/wxglade</title>
-
-            <screen># python2 setup.py install --root /opt/wxGlade
-running install
-running build
-running build_py
-running build_scripts
-running install_lib
-creating /opt/wxGlade
-creating /opt/wxGlade/usr
-creating /opt/wxGlade/usr/lib
-creating /opt/wxGlade/usr/lib/python2.7
-[...]
-writing manifest file 'wxGlade.egg-info/SOURCES.txt'
-Copying wxGlade.egg-info to /opt/wxGlade/usr/lib/python2.7/site-packages/wxGlade-0.7.1rc1-py2.7.egg-info
-running install_scripts
-creating /opt/wxGlade/usr/bin
-copying build/scripts-2.7/wxglade -&gt; /opt/wxGlade/usr/bin
-changing mode of /opt/wxGlade/usr/bin/wxglade to 755
-</screen>
-          </example>
-
-          <para>Once the installation has finished the wxGlade main script
-          <command>wxglade </command>is located at <command>&lt;install
-          directory&gt;/usr/bin</command>.</para>
-
-          <para>Execute the script <command>&lt;install
-          directory&gt;/usr/bin/wxglade</command> to start wxGlade</para>
-
-          <figure>
-            <title>Starting wxGlade on Linux at
-            /opt/wxglade/bin/wxglade</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata contentwidth="15cm"
-                           fileref="wxglade_start_on_linux.png"/>
-              </imageobject>
-            </mediaobject>
-          </figure>
-        </section>
-      </section>
-    </section>
-  </chapter>
-
-  <chapter id="running_wxglade">
-    <title>Running wxGlade</title>
-
-    <para>Once the installation of wxGlade is finished successfully, you can
-    start wxGlade either by clicking on the desktop icon, selecting the
-    program from the <quote>Start Menu</quote> or on a command line as
-    described in <xref linkend="invocation_cmdline"
-    xreflabel="command line"/>.</para>
-
-    <section id="known_platforms">
-      <title>Known Platforms</title>
-
-      <para>wxGlade works on most Unix platforms and Microsoft Windows.</para>
-    </section>
-
-    <section id="languages">
-      <title>Languages</title>
-
-      <para>wxGlade uses English only, currently.</para>
-    </section>
-
-    <section id="invocation_cmdline">
-      <title>Command Line Invocation</title>
-
-      <para>You can run wxGlade without parameters to start the GUI with an
-      empty project as follows:</para>
-
-      <para><command>wxglade</command></para>
-
-      <para>Run wxGlade GUI on an existing project specifying the
-      <filename>.wxg</filename> file as follow:</para>
-
-      <para><command>wxglade &lt;WXG File&gt;</command></para>
-
-      <para>If you only want to generate the code without starting the GUI,
-      use the <option>-g</option> or <option>--generate-code</option> option
-      with the language as argument as follows:</para>
-
-      <para><command>wxglade -g &lt;LANGUAGE&gt; &lt;WXG
-      File&gt;</command></para>
-
-      <para><command>wxglade --generate-code=&lt;LANGUAGE&gt; &lt;WXG
-      File&gt;</command></para>
-
-      <para>Possible values for LANGUAGE are "XRC", "python", "perl", "lisp"
-      or "C++".</para>
-
-      <para>You can also specify the destination of the generated code with
-      <option>-o</option> or <option>--output</option> option:</para>
-
-      <para><command>wxglade -g &lt;LANGUAGE&gt; -o &lt;DESTINATION&gt;
-      &lt;WXG File&gt;</command></para>
-
-      <para>The DESTINATION argument can be a file or a directory.</para>
-
-      <para>Complete command line description:</para>
-
-      <screen># wxglade --help
-Usage: wxglade &lt;WXG File&gt;             start the wxGlade GUI
- or:   wxglade &lt;Options&gt; &lt;WXG File&gt;   generate code from command line
- or:   wxglade --version              show programs version number and exit
- or:   wxglade -h|--help              show this help message and exit
-
-Options:
-  --version             show program's version number and exit
-  -h, --help            show this help message and exit
-  -g LANG, --generate-code=LANG
-                        (required) output language, valid languages are: C++,
-                        XRC, lisp, perl, python
-  -o PATH, --output=PATH
-                        (optional) output file in single-file mode or output
-                        directory in multi-file mode
-
-Example: Generate Python code out of myapp.wxg
-
-   wxglade -o output.py -g python myapp.wxg
-
-Report bugs to:    &lt;wxglade-general@lists.sourceforge.net&gt; or at
-                   &lt;https://sourceforge.net/projects/wxglade/&gt;
-wxGlade home page: &lt;http://wxglade.sourceforge.net/&gt;
-</screen>
-
-      <note>
-        <para>Use <command>wxglade.pyw</command> instead of
-        <command>wxglade</command> on Microsoft Windows.</para>
-
-        <para>Parameters shown in angle brackets (e.g.,
-        <quote><parameter>&lt;parameter&gt;</parameter></quote>) are
-        required.</para>
-
-        <para>Parameters shown in angle brackets (e.g.,
-        <quote><parameter>&lt;parameter&gt;</parameter></quote>) are
-        required.</para>
-      </note>
-    </section>
-
-    <section id="configure_wxglade">
-      <title>Configuring wxGlade</title>
-
-      <section id="preferences">
-        <title>Preferences Dialog</title>
-
-        <para>You can access the Preferences Dialog with the menu <menuchoice>
-            <guimenu>View</guimenu>
-
-            <guimenuitem>Preferences</guimenuitem>
-          </menuchoice>. You can choose some decoration options, like whether
-        to show icons in menus or not. For example, you can modify the number
-        of buttons in the Main Palette. If you type a value of 15 or 30, you
-        get a long toolbar-like Main Palette. You can also choose the default
-        path where you save wxGlade files or generate source code.</para>
-
-        <para>Another useful option is to enable a default border of 3 around
-        some widgets. In many cases this can be useful to have set.</para>
-
-        <para>You need to restart wxGlade for changes to take effect.</para>
-
-        <figure>
-          <title>wxGlade preferences dialog</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="15cm" fileref="preferences.png"/>
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </section>
-
-      <section>
-        <title>Environment Variables</title>
-
-        <para>wxGlade supports only one environment variable
-        <quote>WXGLADE_CONFIG_PATH</quote>.</para>
-
-        <para>If you want to store the whole configuration data inclusive user
-        generated templates and log files in a non-default directory, then
-        store the full path of the alternative directory in the environment
-        variable <quote>WXGLADE_CONFIG_PATH</quote> and start wxGlade with the
-        new environment.</para>
-      </section>
-
-      <section id="config_files">
-        <title>Configuration Files</title>
-
-        <para>wxGlade stores several internal information like configuration
-        settings and log files in an own directory. The location of this
-        directory varies between different operating systems. On Unix wxGlade
-        uses <filename>~/.wxglade</filename>. On Microsoft Windows the
-        information will be stored in
-        <filename>C:/Users/&lt;username&gt;/AppData/Roaming</filename>.</para>
-
-        <note>
-          <para>Some components of the path will be translated to the users'
-          language on Microsoft Windows automatically and transparently in the
-          Windows Explorer and other graphical applications. Other
-          applications show the original names. The translation behaviour
-          depends on the API used by the application developer.</para>
-        </note>
-
-        <para>The configuration file is a simple text file and contains user
-        settings. It's named <filename>.wxgladerc</filename> on Unix or
-        <filename>wxglade.ini</filename> on Microsoft Windows. Be careful with
-        manual changes.</para>
-
-        <para>The configuration directory contains also a list of recently
-        used files in <filename>file_history.txt</filename>.</para>
-
-        <para>wxGlade writes always a small error log file
-        <filename>wxglade.log</filename>. It's also stored inside this
-        directory. The file size is limited to 100 KB and wxGlade will keep at
-        most two log files <filename>wxglade.log</filename> and
-        <filename>wxglade.log.1</filename>. The roll over from
-        <filename>wxglade.log</filename> to <filename>wxglade.log.1</filename>
-        will occur if the file size limit is reached. An already existing file
-        <filename>wxglade.log.1</filename> will be deleted automatically. The
-        log file is an UTF-8 encoded text file.</para>
-      </section>
-    </section>
-
-    <section id="deprecated_features">
-      <title>Deprecated Features</title>
-
-      <para>This section lists deprecated features of wxGlade. These features
-      will be removed from a future version of wxGlade.</para>
-
-      <section>
-        <title><quote><guilabel>Overwrite existing
-        sources</guilabel></quote></title>
-
-        <para>wxGlade can change the own code inside existing source files to
-        reflect changed designs. This feature have some limitations e.g. in
-        case of name and dependencies changes. Thereby it's recommended to
-        overwrite existing sources always and extend derived classes with your
-        functionality.</para>
-
-        <para>The pro and cons are discussed detailed in <xref
-        linkend="shared_control"/>.</para>
-
-        <para>This feature isn't removed currently to stay backward
-        compatible.</para>
-
-        <warning>
-          <para>Don't use this feature for new projects.</para>
-        </warning>
-      </section>
-    </section>
-
-    <section id="troubleshooting">
-      <title>Troubleshooting and Error Handling</title>
-
-      <section>
-        <title>Troubleshooting</title>
-
-        <para>This section should help you to solve some non-application
-        issues.</para>
-
-        <para><glosslist>
-            <glossentry>
-              <glossterm>wxGlade has started e.g. by clicking on the desktop
-              icon, but no application window opens</glossterm>
-
-              <glossdef>
-                <para>Check the log file for errors (see <xref
-                linkend="config_files"/>) and check that all
-                dependencies (especially wxWidgets and wxPython) are
-                installed. A list of dependencies is in <xref
-                linkend="requirements"/>.</para>
-
-                <para>If you think this is an application issue, please file a
-                bug report like described in <xref
-                linkend="report_bugs"/>.</para>
-              </glossdef>
-            </glossentry>
-          </glosslist></para>
-      </section>
-
-      <section>
-        <title>Error Messages</title>
-
-        <para>The following list of error messages should help you to find the
-        reason and take corrective actions. Please note, that the list is
-        still incomplete.</para>
-
-        <glosslist>
-          <glossentry>
-            <glossterm>Output path "&lt;path&gt;" must be an existing
-            directory when generating multiple files.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> You want to
-              create multiple files form your design. wxGlade expects an
-              output directory in such case, but the given output path isn't a
-              existing directory.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis> Create
-              the missing directory or select an existing output
-              directory.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Output path "&lt;path&gt;" exists but the directory is
-            not writable.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Corrective Action:</emphasis> Choose
-              a writable output directory.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Output path "&lt;path&gt;" can not be a directory when
-            generating a single file.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> You want to
-              generate a single source code files for your design. wxGalde
-              expects an output filename, but the given output path is a
-              directory.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis> Choose
-              a file instead of a directory.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Output path "&lt;path&gt;" should be a directory when
-            generating multiple files.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> You want to
-              generate multiple source code files for your design. wxGlade
-              expects an output directory in such case, but the given output
-              path isn't a directory.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis> Choose
-              an existing output directory.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Generated source code couldn't converted to encoding
-            &lt;encoding&gt;. The source contains invalid characters
-            "&lt;characters&gt;" from &lt;start position&gt; to &lt;end
-            position&gt;.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> The current
-              design uses characters that can't converted to the encoding
-              selected for the source code file.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis> Choose
-              a encoding that supports the listed characters.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Generating Lisp code for wxWidgets version
-            &lt;version&gt; is not supported.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> There is no Lisp
-              support for the selected version of wxWidgets</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis> Create
-              the code for an older wxWidget version.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>XRC code cannot be split into multiple
-            files.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> You want to
-              create multiple XRC files for your design. This option isn't
-              supported by wxGlade.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis> Select
-              the <quote><guilabel>Single file</guilabel></quote> option to
-              store the whole design in one XRC file.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Code generation from a template is not
-            possible.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> You've selected
-              a template as input file to generate source code from.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis> Use a
-              design file instead of a template.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Code writer for "&lt;language&gt;" is not
-            available.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> The code
-              generators for the given language hasn't been loaded.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis> That's
-              probably a bug in wxGlade. Please check the log file and file a
-              bug report. See <xref linkend="report_bugs"/> for more
-              details.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Conversion of the source file &lt;filename&gt; to
-            Unicode failed.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> The file
-              encoding set within the design doesn't match the encoding used
-              within the source file. Thereby the source file can't be
-              loaded.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis> Check
-              the encoding selected in your design and the encoding of your
-              source file. Change the design encoding to match source files
-              encoding.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Please install missing Python module
-            "wxPython".</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> The Python
-              wrapper for wxWidgets couldn't be loaded.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis> Check
-              if</para>
-
-              <itemizedlist>
-                <listitem>
-                  <para>you have wxPython installed</para>
-                </listitem>
-
-                <listitem>
-                  <para>the wxPython version matches to the Python
-                  installation</para>
-                </listitem>
-
-                <listitem>
-                  <para>Python and wxPython used the same memory address width
-                  of 32-bit or 64-bit</para>
-                </listitem>
-              </itemizedlist>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Please install missing Python module
-            "wxversion".</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> The Python
-              module <quote>wxversion</quote> couldn't be loaded.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis>
-              <quote>wxversion</quote> is a Python module written in pure
-              Python. Thereby you can't have trouble with 32bit and 64bit like
-              with <quote>wxPython</quote>. Just install the Python module
-              <quote>wxversion</quote>. Mostly the module is part of the
-              wxPython installation.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Too many wxg files given.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> You want to
-              start the code generation from command line, but you have chosen
-              to many design files.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis>
-              Re-execute the command with the just design one file name as
-              last argument.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>No wxg file given.</glossterm>
-
-            <glossdef>
-              <para><emphasis role="bold">Details:</emphasis> You want to
-              start the code generation from command line, but you haven't
-              specify the design file to process.</para>
-
-              <para><emphasis role="bold">Corrective Action:</emphasis>
-              Re-execute the command with the design file name as last
-              argument.</para>
-            </glossdef>
-          </glossentry>
-        </glosslist>
-      </section>
-
-      <section id="report_bugs">
-        <title>How to Report a Bug</title>
-
-        <para>Writing a helpful bug report is easy if you follow some hints.
-        The items below should help you to integrate useful information. They
-        are not absolute rules - it's more like a guideline. Additionally you
-        may read <ulink
-        url="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">How to
-        Report Bugs Effectively</ulink>.</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>What did you? May you want to include a screen shot.</para>
-          </listitem>
-
-          <listitem>
-            <para>What do you want to happen?</para>
-          </listitem>
-
-          <listitem>
-            <para>What actually happened?</para>
-          </listitem>
-
-          <listitem>
-            <para>Provide a short example to reproduce the issue.</para>
-          </listitem>
-
-          <listitem>
-            <para>Include the internal error log file
-            <quote>wxglade.log</quote> always. The pane <quote><guilabel>How
-            to Report a Bug</guilabel></quote> contains the full path of the
-            error log file. The file location is additionally described in
-            <xref linkend="config_files"/>.</para>
-          </listitem>
-        </itemizedlist>
-
-        <para>Please create a new bug report in the <ulink url="???">wxGlade
-        bug tracker</ulink> on Sourceforge. You have to log-in on Sourceforge
-        to file a bug report.</para>
-
-        <para>Alternatively you can send the bug report to the wxGlade mailing
-        list. Keep in mind that you need a subscription for sending emails to
-        this mailing list.</para>
-
-        <figure>
-          <title>An error dialog example</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="10cm" fileref="error_dialog.png"/>
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </section>
-    </section>
-  </chapter>
-
-  <chapter id="working_with_wxglade">
-    <title>Working with wxGlade</title>
-
-    <para>The program wxGlade is a tool for designing Graphical User
-    Interfaces (GUI). It is intended to be used with the wxWidgets framework
-    in all its flavors: C++, Lisp, Perl, Python and XRC.</para>
-
-    <para>You use a visual editor for creating forms, menus and toolbars with
-    the mouse.</para>
-
-    <para>Your design is saved in a <filename>.wxg</filename> file, which is
-    the wxGlade file format. Then you generate source code or XRC by using
-    visual tools or invoking wxGlade on the command line. You can also use
-    wxGlade in your makefile by generating source code only when the
-    <filename>.wxg</filename> file changes.</para>
-
-    <para>A <filename>.wxg</filename> file can contain multiple forms, panels,
-    menus and toolbars and generate either a single file containing all
-    classes or multiple files containing one class each.</para>
-
-    <para>wxGlade does not manage events, file inclusion, function names,
-    stubs or anything else but graphic interface code.</para>
-
-    <section>
-      <title>First Steps</title>
-
-      <para>These sections provided you a short introduction into wxGlade.
-      Advanced topics like escaping special characters or naming convention
-      will be discussed in <xref
-      linkend="next_steps"/>.</para>
-
-      <para>The used abbreviations are described in <xref
-      linkend="abbreviations"/>.</para>
-
-      <section>
-        <title>Quick Example</title>
-
-        <para>We will design a simple form.</para>
-
-        <para>Start wxGlade by running the <command>wxglade</command> program
-        on Unix or the <command>wxglade.pyw</command> program on Microsoft
-        Windows.</para>
-
-        <para>You will see a Main Palette with several buttons, and a Tree
-        Window with an icon marked <guiicon>Application</guiicon>. A
-        Properties Window shows the properties of the Application. If you move
-        the mouse over a button in the Main Palette, a tooltip will display
-        its function.</para>
-
-        <para>To add a frame in the design window, from the Main Palette
-        choose the first button: <quote><guibutton>Add a
-        frame</guibutton></quote> and choose <classname>wxFrame</classname> as
-        the base class.</para>
-
-        <para>Look at the tree window and see that two icons are generated
-        under the application icon, a frame icon and a sizer icon.</para>
-
-        <para>If you double click on the frame icon, the designer window
-        appears. Notice that the sizer is displayed as a set of gray hatched
-        boxes: they are the <quote>slots</quote> of the sizer where you will
-        place the widgets.</para>
-
-        <para>You place a widget on a sizer by selecting it on the Main
-        Palette, then click on an empty slot on the frame on the designer
-        window. Try adding a static text, a text control and a button.</para>
-
-        <para>If you want to add something else, add empty slots on the sizer
-        by right-clicking on the sizer on the Tree Window and selecting
-        <quote><guilabel>Add slot</guilabel></quote>.</para>
-
-        <para>Play around, adding four or five widgets on the frame.</para>
-
-        <para>Now look at the properties form; there are three tabs. In the
-        <quote><guilabel>Common</guilabel></quote> tab you can specify the
-        name, size and color of the widget.</para>
-
-        <para>In the <quote><guilabel>Layout</guilabel></quote> tab you can
-        adjust borders and alignments and the
-        <quote><guilabel>Widget</guilabel></quote> tab enables you to change
-        the properties of the widget.</para>
-
-        <para>You can select the properties of a widget by clicking on the
-        designer window or the corresponding icon on the tree window.</para>
-
-        <para>Try adjusting widgets with the properties form until you know
-        you have played enough.</para>
-
-        <para>Now let's generate the code.</para>
-
-        <para>Select the Application icon on the tree window and go to the
-        <quote><guilabel>Properties</guilabel></quote> window.</para>
-
-        <para>Check <quote><guilabel>Name</guilabel></quote> and
-        <quote><guilabel>Class</guilabel></quote>, choose a
-        <quote><guilabel>Top window</guilabel></quote>, check
-        <quote><guilabel>Single file</guilabel></quote> and choose the
-        language and set the <quote><guilabel>Output path</guilabel></quote>
-        by pushing the button for selecting a path and a filename.</para>
-
-        <para>Finally press the <quote><guibutton>Generate
-        code</guibutton></quote> button, and the code is generated.</para>
-
-        <para>Compile and enjoy.</para>
-      </section>
-    </section>
-
-    <section id="next_steps">
-      <title>Next Steps</title>
-
-      <para>This section covers advanced topics like the handling of
-      automatically generated source files or escaping of special characters
-      like newline characters or tab characters.</para>
-
-      <section>
-        <title>Escape Sequences</title>
-
-        <para>Escape sequences are used to define certain special characters
-        within string literals. wxGlade supports escape sequences generally.
-        The only exception is the null byte
-        (<quote><emphasis>0</emphasis></quote>) and the escape sequence
-        (<quote><emphasis>\0</emphasis></quote>) belonging to it. wxGlade
-        can't handle null bytes.</para>
-
-        <para>Escape sequences like <quote><emphasis>\n</emphasis></quote> or
-        <quote><emphasis>\t</emphasis></quote> will not touched by wxGlade.
-        Thereby the generated source code contains exactly the same sequence
-        as entered. The language interpreter or compiler will interpret and
-        probably convert the sequence into control characters. For example
-        <quote><emphasis>\n</emphasis></quote> will be converted into a line
-        break.</para>
-
-        <para>Escape sequences with at least two leading backslashes e.g.
-        <quote><emphasis>\\n</emphasis></quote> will be escaped to show exact
-        the same sequence and don't convert it into control characters.
-        Question marks especially double quotes will be escaped also.</para>
-      </section>
-
-      <section id="best_practice">
-        <title>Best Practice</title>
-
-        <para>These recommendations should help to improve the usability and
-        maintainability of code generated by wxGlade. They combine the
-        experience of many wxGlade users.</para>
-
-        <section>
-          <title>Overwrite Existing Sources</title>
-
-          <para>wxGlade is able to change the own code inside existing source
-          files to reflect changed designs.</para>
-
-          <para>This feature has some limitations. They are detailed discusses
-          in <xref linkend="shared_control"/>.</para>
-
-          <para>It's common coding practice to separate and encapsulate
-          individual responsibilities. Using a derived class to extend the
-          code e.g. with GUI logic would follow this practice.</para>
-
-          <para><warning>
-              <para>This feature is deprecated and will be removed from a
-              future version of wxGlade. Thereby it's advised not to use this
-              feature for new projects. Details about all deprecated features
-              are shown in <xref
-              linkend="deprecated_features"/>.</para>
-            </warning></para>
-        </section>
-
-        <section>
-          <title>Use the C++ naming convention</title>
-
-          <para>Use the C++ names for all wx identifiers like classes, colours
-          or events of the wx framework. Please don't enter identifiers
-          already formatted in a language specific form. wxGlade is able to
-          transform the entered original identifiers in language-specific
-          terms. You can use your own style for your object certainly.</para>
-
-          <example>
-            <title>Correct entered wx constant</title>
-
-            <para>Enter <quote><command>wxID_CANCEL</command></quote> even for
-            wxPython instead of
-            <quote><command>wx.ID_CANCEL</command></quote></para>
-          </example>
-        </section>
-
-        <section>
-          <title>Use UTF-8 encoding</title>
-
-          <para>It's generally recommended to use Unicode encoding for all
-          non-ASCII character sets.</para>
-        </section>
-
-        <section>
-          <title>Use Gettext Support</title>
-
-          <para>Enable internationalisation support. There are no
-          disadvantages if internationalization is active but not used.</para>
-
-          <para>It's hard to add i18n and Unicode afterwards from project
-          point of view.</para>
-        </section>
-
-        <section>
-          <title>Naming Conventions</title>
-
-          <para>The wxWidgets are written in C++ and follow the C++ naming
-          convention. This naming convention may differ from the language
-          specific and / or project specific naming convention.</para>
-
-          <para>For consistency's sake, it's recommended to use the wxWidgets
-          style.</para>
-        </section>
-
-        <section>
-          <title>Prevent Language Specific Statements</title>
-
-          <para>Usage of language specific codes e.g. for
-          <quote><guilabel>Extra code for this widget</guilabel></quote> or in
-          generic input fields complicated changing the output language later
-          e.g. to re-use GUI elements in another project too.</para>
-        </section>
-      </section>
-
-      <section>
-        <title>Language Specific Peculiarities</title>
-
-        <section>
-          <title>Python</title>
-
-          <para>It's not recommended to use nested classed and functions in
-          combination with disabled feature <quote><guilabel>Overwrite
-          existing sources</guilabel></quote>. Use derived classes to
-          implement your functionality. See <xref
-          linkend="best_practice"/> also.</para>
-        </section>
-
-        <section>
-          <title>Lisp</title>
-
-          <para>The Lisp code generated by wxGlade may or may not working with
-          a current Lisp dialect. Help to improve the Lisp support is really
-          welcome.</para>
-
-          <para>Unsupported features in Lisp:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>Unicode support</para>
-            </listitem>
-
-            <listitem>
-              <para>Support for wxWidgets 3.0</para>
-            </listitem>
-          </itemizedlist>
-        </section>
-
-        <section>
-          <title>XRC</title>
-
-          <para>The XRC code writer doesn't supports all bitmap path tags
-          described in <xref linkend="codegen_bitmap_path"/>.</para>
-
-          <para>Just the <quote><code>art:</code></quote> statement is
-          supported. The remaining bitmap tags will irgnored.</para>
-        </section>
-      </section>
-
-      <section id="using.source.code.section">
-        <title>Using the Source Code</title>
-
-        <para>There are a lot of options to control the source code generation
-        process. They are bundled in the
-        <quote><guilabel>Application</guilabel></quote> page of the
-        <quote><guilabel>Properties</guilabel></quote> window (see <xref
-        linkend="properties_window_application.fig"/>). Let's talk about three
-        of those options -<quote><guilabel>Single file</guilabel></quote>,
-        <quote><guilabel>Separate file for each class</guilabel></quote> and
-        <quote><guilabel>Overwrite existing sources</guilabel></quote>.</para>
-
-        <para>The first two options triggers wxGlade to generate one file with
-        all classes inside or multiple files - one per class/widget. The
-        <quote><guilabel>Single file</guilabel></quote>option includes source
-        and header file for C++ certainly.</para>
-
-        <para>The third option <quote><guilabel>Overwrite existing
-        sources</guilabel></quote> is just about control - <quote>Full control
-        by wxGlade</quote> and <quote>Shared control</quote>. It separated the
-        two ways to work with wxGlade.</para>
-
-        <section id="full_control">
-          <title>Full Control by
-          wxGlade</title>
-
-          <para>If <quote><guilabel>Overwrite existing
-          sources</guilabel></quote> is set, wxGlade will re-generated all
-          source files and drop potential manual changes. You've to include
-          the generated source files and use derived classes for implementing
-          changes.</para>
-
-          <para>The files written by wxGlade are consistent always. Also if
-          e.g. classes or attributes are renamed. Rewriting the whole files is
-          less error-prone in comparison with <xref
-          linkend="shared_control"/>. That is the advantages of this
-          method.</para>
-
-          <para>This method is the recommended one.</para>
-        </section>
-
-        <section id="shared_control">
-          <title>Shared Control</title>
-
-          <para>Manual changes in the source files won't be overwritten if
-          <quote><guilabel>Overwrite existing sources</guilabel></quote> isn't
-          set. You can safely edit the source code of the generated class.
-          This is because wxGlade marks the untouchable code with the special
-          comments <quote><command>begin wxGlade</command></quote> and
-          <quote><command>end wxGlade</command></quote>. So you can edit all
-          you need outside these two tags. When you make changes in your
-          forms, a new code generation will not modify the user code. wxGlade
-          is applying most of the changes but not all.</para>
-
-          <para>The source code modifications by wxGlade may incomplete
-          after:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>renaming classes and attributes</para>
-            </listitem>
-
-            <listitem>
-              <para>changes in dependencies are not updated in all use
-              cases</para>
-            </listitem>
-
-            <listitem>
-              <para>changing the base classes or replace a single base class
-              by multipe base classes or vis-a-vis</para>
-            </listitem>
-
-            <listitem>
-              <para>nested classed and functions</para>
-            </listitem>
-
-            <listitem>
-              <para>if the percent sign (<quote>%</quote>) have been added
-              manually</para>
-            </listitem>
-
-            <listitem>
-              <para>removing event handlers</para>
-            </listitem>
-          </itemizedlist>
-
-          <para>Additionally there are some internal flaws like the
-          inconsistent design of the begin and end markers, just compare the
-          event handler code generated for Perl and Python. Improving the
-          handling internally would break the backward compatibility.</para>
-
-          <warning>
-            <para>This feature is deprecated and will be removed from a future
-            version of wxGlade. Thereby it's advised not to use this feature
-            for new projects. Details about all deprecated features are shown
-            in <xref linkend="deprecated_features"/>.</para>
-          </warning>
-        </section>
-
-        <section id="output.path.filenames.section">
-          <title>Output Path and Filenames</title>
-
-          <para><quote><guilabel>Output path</guilabel></quote> specifies the
-          name of the output file for <quote><guilabel>Single
-          file</guilabel></quote> projects or the output directory for
-          multi-file projects (<quote><guilabel>Separate file for each
-          class</guilabel></quote>).</para>
-        </section>
-
-        <section id="automatically.created.wxapp.instance.section">
-          <title>Automatically Created <classname>wxApp</classname>
-          Instances</title>
-
-          <para>wxGlade can create additional code to start an instance of
-          projects <quote><guilabel>Top window</guilabel></quote>.</para>
-
-          <para>There are two types of application start code:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>simplified application start code</para>
-            </listitem>
-
-            <listitem>
-              <para>detailed application start code</para>
-            </listitem>
-          </itemizedlist>
-
-          <para>The application start code generation is controlled by three
-          properties:</para>
-
-          <orderedlist>
-            <listitem>
-              <para><guilabel>Name</guilabel></para>
-            </listitem>
-
-            <listitem>
-              <para><guilabel>Class</guilabel></para>
-            </listitem>
-
-            <listitem>
-              <para><guilabel>Top window</guilabel></para>
-            </listitem>
-          </orderedlist>
-
-          <para>Those properties are explained in <xref
-          linkend="ui_application_properties"/>. Different combinations
-          of those attributes generated different application start code. The
-          table below shows the type of application start code resulting from
-          different combinations of the three properties. The
-          <quote><guilabel>Enable gettext support</guilabel></quote> property
-          just triggers i18n-enabled source code.</para>
-
-          <table>
-            <title>Interaction between properties to generate different types
-            of start code</title>
-
-            <tgroup cols="4">
-              <colspec colnum="4" colwidth="2*"/>
-
-              <thead>
-                <row>
-                  <entry align="left"><guilabel>Name</guilabel></entry>
-
-                  <entry align="left"><guilabel>Class</guilabel></entry>
-
-                  <entry align="left"><guilabel>Top window</guilabel></entry>
-
-                  <entry align="left"><guilabel>Type of application start code
-                  to generate</guilabel></entry>
-                </row>
-              </thead>
-
-              <tbody>
-                <row>
-                  <entry>not selected</entry>
-
-                  <entry>not selected</entry>
-
-                  <entry>not selected</entry>
-
-                  <entry>not generated</entry>
-                </row>
-
-                <row>
-                  <entry>selected</entry>
-
-                  <entry>not selected</entry>
-
-                  <entry>not selected</entry>
-
-                  <entry>not generated</entry>
-                </row>
-
-                <row>
-                  <entry>not selected</entry>
-
-                  <entry>selected</entry>
-
-                  <entry>not selected</entry>
-
-                  <entry>not generated</entry>
-                </row>
-
-                <row>
-                  <entry>selected</entry>
-
-                  <entry>selected</entry>
-
-                  <entry>not selected</entry>
-
-                  <entry>not generated</entry>
-                </row>
-
-                <row>
-                  <entry>selected</entry>
-
-                  <entry>not selected</entry>
-
-                  <entry>selected</entry>
-
-                  <entry>simplified start code</entry>
-                </row>
-
-                <row>
-                  <entry>not selected</entry>
-
-                  <entry>selected</entry>
-
-                  <entry>selected</entry>
-
-                  <entry>not generated</entry>
-                </row>
-
-                <row>
-                  <entry>selected</entry>
-
-                  <entry>selected</entry>
-
-                  <entry>selected</entry>
-
-                  <entry>detailed start code</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-
-          <para>The application start code of a multi-file project will be
-          recreated every time the code generation is running.</para>
-
-          <para>In opposition the application start code of single-file
-          projects will not updated if the name of the <quote><guilabel>Top
-          window</guilabel></quote> has changed and <quote><guilabel>Overwrite
-          existing sources</guilabel></quote> is not set.</para>
-
-          <para><example>
-              <title>Detailed application start code in Perl</title>
-
-              <para><programlisting language="perl" linenumbering="numbered">package MyApp;
-
-use base qw(Wx::App);
-use strict;
-
-sub OnInit {
-    my( $self ) = shift;
-
-    Wx::InitAllImageHandlers();
-
-    my $frame_1 = MyFrame-&gt;new();
-
-    $self-&gt;SetTopWindow($frame_1);
-    $frame_1-&gt;Show(1);
-
-    return 1;
-}
-# end of class MyApp
-
-package main;
-unless(caller){
-    my $local = Wx::Locale-&gt;new("English", "en", "en"); # replace with ??
-    $local-&gt;AddCatalog("app"); # replace with the appropriate catalog name
-
-    my $app = MyApp-&gt;new();
-    $app-&gt;MainLoop();
-}</programlisting></para>
-            </example></para>
-
-          <example>
-            <title>Simplified application start code in Perl</title>
-
-            <para><programlisting format="linespecific" language="perl"
-            linenumbering="numbered">package main;
-
-unless(caller){
-    my $local = Wx::Locale-&gt;new("English", "en", "en"); # replace with ??
-    $local-&gt;AddCatalog("PlOgg1_app"); # replace with the appropriate catalog name
-
-    local *Wx::App::OnInit = sub{1};
-    my $PlOgg1_app = Wx::App-&gt;new();
-    Wx::InitAllImageHandlers();
-
-    my $Mp3_To_Ogg = PlOgg1_MyDialog-&gt;new();
-
-    $PlOgg1_app-&gt;SetTopWindow($Mp3_To_Ogg);
-    $Mp3_To_Ogg-&gt;Show(1);
-    $PlOgg1_app-&gt;MainLoop();
-}</programlisting></para>
-          </example>
-        </section>
-
-        <section>
-          <title>Compiling C++ Code</title>
-
-          <para>You can compile your wxGlade project after the generation of
-          the C++ source and header files. The following examples demonstrate
-          compiling on Linux command line using <command>g++</command>.</para>
-
-          <example>
-            <title>Compiling a single file C++ project on Linux</title>
-
-            <screen># g++ FontColour.cpp $(wx-config --libs) $(wx-config --cxxflags) -o FontColour
-
-# ll FontColour*
--rwxr-xr-x 1 carsten carsten 72493 Jun 15 09:22 FontColour
--rwxr-xr-x 1 carsten carsten  1785 Mai 11 19:24 FontColour.cpp
--rwxr-xr-x 1 carsten carsten  1089 Jun 11 07:09 FontColour.h</screen>
-          </example>
-
-          <example>
-            <title>Compiling a multi file C++ project on Linux</title>
-
-            <screen># g++  CPPOgg2_main.cpp $(wx-config --libs) $(wx-config --cxxflags) \
-  -o CPPOgg2_main CPPOgg2_MyDialog.cpp CPPOgg2_MyFrame.cpp
-
-# ll CPPOgg2*
--rwxr-xr-x 1 carsten carsten 108354 Jun 15 09:33 CPPOgg2_main
--rwxr-xr-x 1 carsten carsten    844 Mai 11 19:25 CPPOgg2_main.cpp
--rw-r--r-- 1 carsten carsten   5287 Mai 18 19:06 CPPOgg2_MyDialog.cpp
--rw-r--r-- 1 carsten carsten   1829 Jun 11 07:11 CPPOgg2_MyDialog.h
--rw-r--r-- 1 carsten carsten   1785 Mai 11 19:25 CPPOgg2_MyFrame.cpp
--rw-r--r-- 1 carsten carsten   1290 Jun 11 07:10 CPPOgg2_MyFrame.h</screen>
-          </example>
-        </section>
-      </section>
-
-      <section>
-        <title>Handling XRC Files</title>
-
-        <para>wxGlade is able to save projects as XRC files and to convert XRC
-        files into wxGlade projects.</para>
-
-        <para>One way for converting XRC files is the usage of the Python
-        script <command>xrc2wxg.py</command> at command line. The script is
-        part of wxGlade.</para>
-
-        <example>
-          <title>Converting a XRC file into a wxGlade project</title>
-
-          <screen># ./xrc2wxg.py FontColour.xrc
-
-# ls -l FontColour.*
--rw-r--r-- 1 carsten carsten 5554 Dez  4 20:36 FontColour.wxg
--rw-r--r-- 1 carsten carsten 4992 Dez  4 20:13 FontColour.xrc</screen>
-        </example>
-
-        <para>The <quote><guimenu>File</guimenu></quote> menu provides a menu
-        item <quote><guimenuitem>Import from XRC...</guimenuitem></quote> to
-        import and open a XRC file directly.</para>
-
-        <para>The following example shows how to load and show the frame
-        <quote>Main</quote> from XRC file
-        <filename>test.xrc</filename>.</para>
-
-        <example>
-          <title>wxPython code to load and show a XRC resource</title>
-
-          <programlisting language="python" linenumbering="numbered">#!/usr/bin/env python2
-
-import wx
-from wx import xrc
-
-GUI_FILENAME = "test.xrc"
-GUI_MAINFRAME_NAME = "Main"
-
-class MyApp(wx.App):
-    def OnInit(self):
-        self.res = xrc.XmlResource(GUI_FILENAME)
-        self.frame = self.res.LoadFrame(None, GUI_MAINFRAME_NAME)
-        self.frame.Show()
-        return True
-
-if __name__ == "__main__":
-    app = MyApp()
-    app.MainLoop()</programlisting>
-        </example>
-      </section>
-    </section>
-  </chapter>
-
-  <chapter id="ui">
-    <title>wxGlade User Interface</title>
-
-    <section id="ui_palette_window">
-      <title>Main Palette</title>
-
-      <para>The main window is a palette that hosts the menu and the widget
-      choice buttons.</para>
-
-      <para><figure>
-          <title>The Main Palette</title>
-
-          <graphic contentwidth="8cm" fileref="main_window.png"/>
-        </figure></para>
-
-      <para>If you pass the mouse pointer over a button a tooltip shows the
-      button's description.</para>
-
-      <para>The <quote><guibutton>Add a Frame</guibutton></quote> button and
-      the <quote><guibutton>Add a Dialog/Panel</guibutton></quote> button
-      bring up a dialog to add a frame, a dialog or a panel to your
-      project.</para>
-
-      <para>The <quote><guibutton>Add a MenuBar</guibutton></quote> button
-      asks you for the name of the class then adds a menu bar to your
-      project.</para>
-
-      <para>The <quote><guibutton>Add a ToolBar</guibutton></quote> button
-      asks you for the name of the class then adds a toolbar to your
-      project.</para>
-
-      <para>The other buttons in the main window add widgets to a form. When
-      you click on one, the mouse pointer changes to an arrow. Then you can
-      click on a sizer's empty cell to add the widget to it.</para>
-    </section>
-
-    <section id="ui_tree_window">
-      <title>Tree Window</title>
-
-      <para>The tree window shows the logical hierarchy of widgets and their
-      child-widgets. For example you can see a panel as a tree's node and the
-      widgets on it as child nodes. <figure>
-          <title>The Tree Window</title>
-
-          <graphic contentwidth="8cm" fileref="tree_window.png"/>
-        </figure></para>
-
-      <para>You can show or hide the tree window by the menu item View/Show
-      Tree.</para>
-
-      <para>Usually a frame or a panel contains a sizer, so you often see a
-      sort of panel-sizer-widgets structure. The tree gets more complex when
-      you nest sizers within sizers.</para>
-
-      <para>You open the Design Window with double-clicking to the top-level
-      widget first. In the next step you can navigate the visual presentation
-      of your widget tree by mouse, expand and collapse sizers, and copy, cut
-      or remove widgets.</para>
-
-      <para>A click on an icon in the tree window displays the properties of
-      the corresponding element in the
-      <quote><guilabel>Properties</guilabel></quote> window. A double click in
-      a frame, dialog or panel icon makes the designer window show it as it
-      appears. Clicking with the right button of the mouse gives you a pop-up
-      menu. <figure id="label_menu.fig">
-          <title id="label_menu.title">The menu for a widget</title>
-
-          <graphic contentwidth="6cm" fileref="label_menu.png"/>
-        </figure> <figure id="sizer_menu.fig">
-          <title id="sizer_menu.title">The menu for a sizer</title>
-
-          <graphic contentwidth="6cm" fileref="sizer_menu.png"/>
-        </figure> The pop-up menu for a widget allows you to copy, cut or
-      remove the element. The pop-up menu for a sizer allows you to copy, cut
-      or remove the element, or add or insert an empty slot.</para>
-
-      <note>
-        <para>Often when you add an empty slot, you have to make the designer
-        window larger, to show the new slot.</para>
-      </note>
-    </section>
-
-    <section id="ui_design_window">
-      <title>Design Window</title>
-
-      <para>The design window shows the frame or panel you are creating in
-      WYSIWYG mode and allows you to select a widget from the main palette and
-      to put it on an empty slot of a sizer. You can show the design window by
-      double-clicking on the icon of a frame or dialog in the tree window.
-      <figure>
-          <title>The Design Window</title>
-
-          <graphic contentwidth="8cm" fileref="design_window_empty_slot.png"/>
-        </figure></para>
-
-      <para>By clicking with the right mouse button on a widget you can access
-      the context menu.</para>
-
-      <para>Notice that the sizers, which are invisible elements, have a
-      little gray <quote>handle</quote>. They are marked with green boxes in
-      the screenshot above. Click to the handles to select the sizer or let
-      the pop-up menu appear.</para>
-
-      <para>The pop-up menu is the same as the one you get in the Tree Window,
-      as shown in <xref linkend="label_menu.fig"/> or in <xref
-      linkend="sizer_menu.fig"/>.</para>
-    </section>
-
-    <section id="ui_properties_window">
-      <title>Properties Window</title>
-
-      <para>The <quote><guilabel>Properties</guilabel></quote> window lets you
-      see and edit the properties that apply to the selected element. This
-      window consists up to six different tabs. All six tabs are not always
-      present. The visibility of the single tabs depends on the widget type.
-      Most widgets have a <quote><guilabel>Common</guilabel></quote> tab and a
-      <quote><guilabel>Code</guilabel></quote> tab. The combination of
-      presented tabs depends on the widget type.</para>
-
-      <para>For example:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para><classname>wxFrame</classname> widgets have
-          <quote><guilabel>Common</guilabel></quote>,
-          <quote><guilabel>Widget</guilabel></quote> and
-          <quote><guilabel>Code</guilabel></quote> tabs</para>
-        </listitem>
-
-        <listitem>
-          <para>Spacers have the tabs
-          <quote><guilabel>Layout</guilabel></quote> and
-          <quote><guilabel>Code</guilabel></quote></para>
-        </listitem>
-
-        <listitem>
-          <para><classname>wxGridSizer</classname> widgets have
-          <quote><guilabel>Common</guilabel></quote> and
-          <quote><guilabel>Grid</guilabel></quote></para>
-        </listitem>
-
-        <listitem>
-          <para><classname>wxBoxSizer</classname> widgets only have the
-          <quote><guilabel>Common</guilabel></quote> tab</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>Editing properties is quite simple; Properties are represented by
-      buttons, text boxes, checks and other controls. Usually they are
-      referenced by the same name or symbol that you find writing C++
-      code.</para>
-
-      <para>Usually you get the changes in the design window in real time. In
-      some cases you have to push the
-      <quote><guibutton>Apply</guibutton></quote> button. For example, the
-      <classname>wxNotebook</classname> widget shows in its
-      <quote><guilabel>Properties</guilabel></quote> window a list of child
-      <classname>wxPanel</classname>s. You have to press the
-      <quote><guibutton>Apply</guibutton></quote> button to show changes you
-      make when you add or remove panels.</para>
-
-      <para>You can show or hide the
-      <quote><guilabel>Properties</guilabel></quote> window by the menu item
-      <menuchoice>
-          <guimenu>View</guimenu>
-
-          <guimenuitem>Show Properties</guimenuitem>
-        </menuchoice>.</para>
-
-      <section id="ui_application_properties">
-        <title>Application Properties</title>
-
-        <para>The page <quote><guilabel>Application</guilabel></quote>
-        contains the general settings of the active wxGlade project.</para>
-
-        <para><figure id="properties_window_application.fig">
-            <title>Project Properties - Application settings</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata contentwidth="8cm"
-                           fileref="properties_window_application.png"/>
-              </imageobject>
-            </mediaobject>
-          </figure><glosslist>
-            <glossentry>
-              <glossterm><quote><guilabel>Name</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Name of the instance created from
-                <quote><guilabel>Class</guilabel></quote></para>
-
-                <para><xref
-                linkend="automatically.created.wxapp.instance.section"/>
-                provides more information</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Class</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Name of the automatically generated class derived from
-                <classname>wxApp</classname></para>
-
-                <para><xref
-                linkend="automatically.created.wxapp.instance.section"/>
-                provides more information</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Encoding</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Encoding of the generated source files.</para>
-
-                <para>The encoding to use with new projects will be determined
-                automatically based on the machine settings.
-                <quote>UTF-8</quote> will be used if the automatic detection
-                fails.</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Enable gettext
-              support</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Enable internationalisation and localisation for the
-                generated source files</para>
-
-                <para><xref
-                linkend="automatically.created.wxapp.instance.section"/>
-                provides more information</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Top
-              window</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>This widget is used as top window in the
-                <classname>wxApp</classname> start code</para>
-
-                <para><xref
-                linkend="automatically.created.wxapp.instance.section"/>
-                provides more information</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Code
-              Generation</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Write all source code in one file or split the source
-                into one file per class / widget</para>
-
-                <para><xref linkend="using.source.code.section"/> provides
-                more information</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Language</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Programming language to generate the source files
-                in</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>wxWidgets
-              compatibility</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Generate source files for the selected wxWidgets
-                version</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Overwrite existing
-              sources</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Overwrite existing source files or modify the code
-                sequences generated by wxGlade in place</para>
-
-                <para><xref linkend="using.source.code.section"/> provides
-                more information</para>
-
-                <para><warning>
-                    <para>This feature is deprecated and will be removed from
-                    a future version of wxGlade. Thereby it's advised not to
-                    use this feature for new projects. Details about all
-                    deprecated features are shown in <xref
-                    linkend="deprecated_features"/>.</para>
-                  </warning></para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Output
-              path</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Output file or directory</para>
-
-                <para><xref linkend="output.path.filenames.section"/> provides
-                more information</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Generate
-              code</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Start generating source files</para>
-              </glossdef>
-            </glossentry>
-          </glosslist>The page <quote><guilabel>Settings</guilabel></quote>
-        contains the language specific settings of the active wxGlade
-        project.</para>
-
-        <para><figure>
-            <title>Project Properties - Language settings</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata contentwidth="8cm"
-                           fileref="properties_window_settings.png"/>
-              </imageobject>
-            </mediaobject>
-          </figure><glosslist>
-            <glossentry>
-              <glossterm><quote><guilabel>Indentation
-              mode</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Use spaces or tabs for indentation within the generated
-                source files.</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Indentation
-              amount</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Number of spaces or tabs used for one indentation
-                level.</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Source
-              ext</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Extension of the source file.</para>
-
-                <para>The extension doesn't has a leading dot.</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm><quote><guilabel>Header
-              ext</guilabel></quote></glossterm>
-
-              <glossdef>
-                <para>Extension of the header file.</para>
-
-                <para>The extension doesn't has a leading dot.</para>
-              </glossdef>
-            </glossentry>
-          </glosslist></para>
-      </section>
-
-      <section>
-        <title>Common Properties</title>
-
-        <para>The first tab contains the common properties that apply to all
-        widgets. As shown in <xref linkend="properties_window_tab_1.fig"/> the
-        common properties are related to name, class, size, colors, fonts and
-        tooltip.</para>
-
-        <figure id="properties_window_tab_1.fig">
-          <title>Common Properties</title>
-
-          <graphic contentwidth="8cm" fileref="properties_window_tab_1.png"/>
-        </figure>
-
-        <para>The property name is a mangled version of the wxWidgets property
-        name. The property input field is disabled by default. wxGlade won't
-        use disabled properties for code generation. wxWidgets defaults are
-        used instead.</para>
-
-        <para>Enable the property in the wxGlade GUI to set non-default values
-        (see <xref linkend="properties_window_tab_1_change.fig"/>).</para>
-
-        <figure id="properties_window_tab_1_change.fig">
-          <title>Changing Common Properties</title>
-
-          <graphic contentwidth="8cm"
-                   fileref="properties_window_tab_1_change.png"/>
-        </figure>
-
-        <glosslist>
-          <glossentry>
-            <glossterm><quote><guilabel>Name</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>Name of the instance created from
-              <quote><guilabel>Class</guilabel></quote></para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Class</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>Name of the subclass of the widget. How this name affects
-              code generation depends on the output language.</para>
-
-              <figure>
-                <title>Common Properties - A subclassed widget (default
-                behaviour)</title>
-
-                <mediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="8cm"
-                               fileref="example_subclassed.png"/>
-                  </imageobject>
-                </mediaobject>
-              </figure>
-
-              <example>
-                <title>Generated Python code of a subclassed widget</title>
-
-                <para><programlisting language="python"
-                linenumbering="numbered">class MyDialog(wxDialog):
-
-    def __init__(self, *args, **kwds):
-        kwds["style"] = wxDEFAULT_DIALOG_STYLE
-        wxDialog.__init__(self, *args, **kwds)
-</programlisting></para>
-              </example>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Base
-            class(es)</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>A comma-separated list of custom base classes. The first
-              class will be invoked with the same parameters as this class,
-              while for the others the default constructor will be used. This
-              property will be shown only for non-managed widgets for instance
-              <classname>wxFrame</classname>, <classname>wxDialog</classname>,
-              <classname>wxNotebook</classname>,
-              <classname>wxPanel</classname> and
-              <classname>wxSplitterWindow</classname>. You should probably not
-              use this if <quote><guilabel>Overwrite existing
-              sources</guilabel></quote> is not set.</para>
-
-              <figure id="example_baseclasses.fig">
-                <title>Common Properties - Base class(es) entry</title>
-
-                <graphic contentwidth="8cm" fileref="example_baseclasses.png"/>
-              </figure>
-
-              <example>
-                <title>Generated Python code of a widget with two base
-                classes</title>
-
-                <programlisting language="python" linenumbering="numbered">class MyFrame(myFrameMixin, wxFrame):
-
-    def __init__(self, *args, **kwds):
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
-        myFrameMixin.__init__(self, *args, **kwds)
-        wxFrame.__init__(self)
-</programlisting>
-              </example>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Id</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>This property could be</para>
-
-              <itemizedlist>
-                <listitem>
-                  <para>a constant numeric value</para>
-                </listitem>
-
-                <listitem>
-                  <para>a predefined identifier e.g.
-                  <constant>wxID_ANY</constant></para>
-                </listitem>
-
-                <listitem>
-                  <para>a predefined variable like a class member e.g.
-                  <command>self.myButtonID</command></para>
-                </listitem>
-
-                <listitem>
-                  <para>a variable assignment e.g.
-                  <quote><command>self.myButtonID=?</command></quote> The
-                  pattern of a variable assignment is always
-                  <quote><command>variable=value</command></quote>. The value
-                  could be again a numeric value, a predefined identifier,
-                  another predefined variable or
-                  <quote><command>?</command></quote> a shortcut for
-                  <quote><command>wxNewId()</command></quote></para>
-                </listitem>
-              </itemizedlist>
-
-              <figure>
-                <title>Common Properties - Variable assignment</title>
-
-                <mediaobject>
-                  <imageobject>
-                    <imagedata contentwidth="8cm"
-                               fileref="example_variableassigment.png"/>
-                  </imageobject>
-                </mediaobject>
-              </figure>
-
-              <example>
-                <title>Generated Python code for a variable assignment</title>
-
-                <para><programlisting language="python"
-                linenumbering="numbered">class MyFrame(wx.Frame):
-
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
-        wx.Frame.__init__(self, *args, **kwds)
-        self.myButtonID = wx.NewId()
-        self.button_1 = wx.Button(self, self.myButtonID, "button_1")
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-</programlisting></para>
-              </example>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Size</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>Set the widget size in pixels.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Background</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>Set the background colour of the widget.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Foreground</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>Set the foreground colour of the widget.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Font</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>Set the font for widgets text elements.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Tooltip</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>Set a tooltip for this widget.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Disabled</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>Disable the widget.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Focused</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>Set the widget to receive keyboard input.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><quote><guilabel>Hidden</guilabel></quote></glossterm>
-
-            <glossdef>
-              <para>Hide the widget.</para>
-            </glossdef>
-          </glossentry>
-        </glosslist>
-      </section>
-
-      <section id="layout_properties">
-        <title>Layout Properties</title>
-
-        <para>The second tab is related to layout properties that control
-        position and resizing within the sizer. <figure
-            id="properties_window_tab_2.fig">
-            <title>Layout Properties</title>
-
-            <graphic contentwidth="8cm" fileref="properties_window_tab_2.png"/>
-          </figure>These properties apply to any widget. You can check or
-        uncheck any option related to the placement in the sizer. Many widgets
-        may have a default value of 3 in the
-        <quote><guilabel>Border</guilabel></quote> property in the Preferences
-        Dialog (see <xref linkend="preferences"/>). If you let a
-        widget have a default border, the <constant>wxAll</constant> option is
-        also checked.</para>
-      </section>
-
-      <section>
-        <title>Widget Properties</title>
-
-        <para>The third tab, named <quote><guilabel>Widget</guilabel></quote>
-        is different for each widget, and lets you edit properties for the
-        specific element you have selected. <figure
-            id="properties_window_tab_3.fig">
-            <title>Widget Properties</title>
-
-            <graphic contentwidth="8cm" fileref="properties_window_tab_3.png"/>
-          </figure>The set of options may also be quite complex in the case of
-        widgets that have a great deal of methods and properties (such as
-        grids and tree views). In this case, wxGlade greatly simplifies the
-        process of designing forms.</para>
-
-        <para><quote><guilabel>Store as attribute</guilabel></quote> stores
-        the widget as an attribute of the top-level class.</para>
-
-        <para>Select <quote><guilabel>Don't generate code for this
-        class</guilabel></quote> to prevent generating code for subwidgets of
-        <classname>wxNotebook</classname>, <classname>wxPanel</classname> and
-        <classname>wxSplitterWindow</classname>.</para>
-
-        <figure>
-          <title>Widget Properties - Don't generate code for this
-          class</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="8cm"
-                         fileref="properties_window_tab_3_dont_generate_code.png"/>
-            </imageobject>
-          </mediaobject>
-        </figure>
-
-        <para>You can use this feature to:</para>
-
-        <orderedlist>
-          <listitem>
-            <para>Split complex designs into smaller pieces. The correlation
-            in such a setup based on the widget name.</para>
-          </listitem>
-
-          <listitem>
-            <para>Prevent generation of stubs, if using custom base
-            classes.</para>
-          </listitem>
-        </orderedlist>
-
-        <para>Some widgets have an <quote><guibutton>Apply</guibutton></quote>
-        button onhe <quote><guilabel>Widget</guilabel></quote> tabs. Click on
-        the <quote><guibutton>Apply</guibutton></quote> button to consolidate
-        your changes. Otherwise they will lost.</para>
-      </section>
-
-      <section>
-        <title>Styles</title>
-
-        <para>The most of the styles as shown in the <xref
-        linkend="layout_properties"/> and <xref
-        linkend="ui_properties_window"/> have a tooltip with additional
-        information about the style.</para>
-
-        <para>The tooltips show a short description as well as additional
-        information.</para>
-
-        <para><figure>
-            <title>Widget Properties - Styles Tooltip</title>
-
-            <graphic contentwidth="6cm" fileref="tooltip_styles.png"/>
-          </figure></para>
-
-        <para>The style details will be used also to compute the styles in the
-        generated source code.</para>
-      </section>
-
-      <section>
-        <title>Events Properties</title>
-
-        <para>The fourth tab, named <quote><guilabel>Events</guilabel></quote>
-        lists the widgets events. wxGlade generates an event handler stub and
-        binds the event for each added handler name.</para>
-
-        <figure>
-          <title>Events Properties</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="8cm"
-                         fileref="properties_window_tab_4.png"/>
-            </imageobject>
-          </mediaobject>
-        </figure>
-
-        <figure>
-          <title>Events Properties - Event handler name added</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="8cm" fileref="example_eventhandler.png"/>
-            </imageobject>
-          </mediaobject>
-        </figure>
-
-        <example>
-          <title>Generated Python code of an <command>EVT_TEXT</command> event
-          handler stub at line 12</title>
-
-          <programlisting language="python" linenumbering="numbered">class MyFrame(wx.Frame):
-
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
-        wx.Frame.__init__(self, *args, **kwds)
-        self.text_ctrl_1 = wx.TextCtrl(self, -1, "")
-        self.__set_properties()
-        self.__do_layout()
-        self.Bind(wx.EVT_TEXT, self.myEVTTEXT, self.text_ctrl_1)
-        # end wxGlade
-
-    def myEVTTEXT(self, event):  # wxGlade: MyFrame.&lt;event_handler&gt;
-        print "Event handler `myEVTTEXT' not implemented!"
-        event.Skip()
-</programlisting>
-        </example>
-      </section>
-
-      <section id="ui_code_properties">
-        <title>Code Properties</title>
-
-        <para>The fifth and last tab is named
-        <quote><guilabel>Code</guilabel></quote> and has two parts.</para>
-
-        <figure>
-          <title>Code Properties - Extra code and extra properties</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="8cm"
-                         fileref="properties_window_tab_5.png"/>
-            </imageobject>
-          </mediaobject>
-        </figure>
-
-        <para>wxGlade never declares or assigns variable or function names or
-        import for non-default base classes and custom widgets.</para>
-
-        <para>If you use non-default base classes, <code>var:</code> or
-        <code>code:</code> statements, you have to manually assign the
-        variables, declare used functions as well as to include resp. to
-        import of additional code need by your widget in
-        <quote><guilabel>Extra code for this widget</guilabel></quote>. This
-        <quote><guilabel>Extra code</guilabel></quote> will be added to the
-        context of the source file and not to the context of the class.</para>
-
-        <para>The lower part simplifies setting of additional widget
-        properties. Add the property name to the
-        <quote><guilabel>Property</guilabel></quote> field and not the name of
-        the setter function. For instance add
-        <quote><command>MaxLength</command></quote> and not
-        <quote><command>SetMaxLength</command></quote>. The
-        <quote><guilabel>Value</guilabel></quote> field is just a text field.
-        You can enter e.g. a simple number only as well as a complex statement
-        e.g. <command>0, 0, "1"</command> or a function call. But be
-        carefully! Your entered sequence will be inserted in the source
-        without any changes - one to one.</para>
-
-        <note>
-          <para><quote><guilabel>Extra code</guilabel></quote> and
-          <quote><guilabel>Extra properties</guilabel></quote> won't be
-          processed for the widget preview.</para>
-        </note>
-
-        <figure>
-          <title>Code Properties - Set extra property</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="8cm" fileref="example_setproperty.png"/>
-            </imageobject>
-          </mediaobject>
-        </figure>
-
-        <example>
-          <title>Generated Python code for setting property
-          <command>MaxLength</command> to <command>10</command> at line
-          14</title>
-
-          <programlisting language="python" linenumbering="numbered">class MyFrame(wx.Frame):
-
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
-        wx.Frame.__init__(self, *args, **kwds)
-        self.text_ctrl_1 = wx.TextCtrl(self, -1, "")
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame_1")
-        self.text_ctrl_1.SetMaxLength(10)
-        # end wxGlade
-</programlisting>
-        </example>
-      </section>
-    </section>
-
-    <section id="ui_menu">
-      <title>The wxGlade Menu</title>
-
-      <para>wxGlade has only a few very small number of menus.</para>
-
-      <section id="ui_file_menu">
-        <title>The FILE Menu</title>
-
-        <para>In the <guimenu>FILE</guimenu> menu are the classic <menuchoice>
-            <guimenu>File</guimenu>
-
-            <guimenuitem>New</guimenuitem>
-          </menuchoice>, <menuchoice>
-            <guimenu>File</guimenu>
-
-            <guimenuitem>Open...</guimenuitem>
-          </menuchoice> and <menuchoice>
-            <guimenu>File</guimenu>
-
-            <guimenuitem>Save</guimenuitem>
-          </menuchoice> items. When opening or saving a new file, the file
-        dialog defaults to the directory that you put in the
-        <quote><guilabel>Initial path</guilabel></quote> text box in the
-        Preferences dialog, usually the user home directory.</para>
-
-        <para>The <menuchoice>
-            <guimenu>File</guimenu>
-
-            <guimenuitem>Generate code</guimenuitem>
-          </menuchoice> item produces the code from the current design.</para>
-      </section>
-
-      <section id="ui_view_menu">
-        <title>The VIEW Menu</title>
-
-        <para>In the <guimenu>VIEW</guimenu> menu, you can show or hide the
-        tree window and the <quote><guilabel>Properties</guilabel></quote>
-        window.</para>
-
-        <para>In this menu you access the Preferences Dialog as well.</para>
-      </section>
-
-      <section id="ui_help_menu">
-        <title>The HELP Menu</title>
-
-        <para>The <guimenu>HELP</guimenu> menu provides access to the wxGlade
-        user manual (this documentation), a short tutorual and the
-        <quote><guilabel>About...</guilabel></quote> dialog.</para>
-      </section>
-    </section>
-
-    <section id="ui_shortcuts">
-      <title>Shortcuts</title>
-
-      <glosslist>
-        <glossentry>
-          <glossterm><keysym>Ctrl-G</keysym></glossterm>
-
-          <glossdef>
-            <para>Generate code from the current GUI design</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>Ctrl-I</keysym></glossterm>
-
-          <glossdef>
-            <para>Import GUI design out of a XRC file</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>Ctrl-N</keysym></glossterm>
-
-          <glossdef>
-            <para>Start a new GUI design</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>Ctrl-O</keysym></glossterm>
-
-          <glossdef>
-            <para>Read a GUI design from a <filename>.wxg</filename>
-            file</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>Ctrl-S</keysym></glossterm>
-
-          <glossdef>
-            <para>Save the current GUI design to a <filename>.wxg</filename>
-            file</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>Shift-Ctrl-S</keysym></glossterm>
-
-          <glossdef>
-            <para>Save the current GUI design to another
-            <filename>.wxg</filename> file</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>Ctrl-P</keysym></glossterm>
-
-          <glossdef>
-            <para>Open a preview window for the current top-level
-            widget</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>Ctrl-Q</keysym></glossterm>
-
-          <glossdef>
-            <para>Exit wxGlade</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>Ctrl-C</keysym></glossterm>
-
-          <glossdef>
-            <para>Copy the selected item, element, text, ...</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>Ctrl-V</keysym></glossterm>
-
-          <glossdef>
-            <para>Insert clipboard content</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>Ctrl-X</keysym></glossterm>
-
-          <glossdef>
-            <para>Cut the selected item, element, text, ...</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>F1</keysym></glossterm>
-
-          <glossdef>
-            <para>Show the wxGlade user manual (this documentation)</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>F2</keysym></glossterm>
-
-          <glossdef>
-            <para>Show the <guilabel>Tree</guilabel> window</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>F3</keysym></glossterm>
-
-          <glossdef>
-            <para>Show the <guilabel>Properties</guilabel> window</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>F4</keysym></glossterm>
-
-          <glossdef>
-            <para>Show all application windows</para>
-          </glossdef>
-        </glossentry>
-
-        <glossentry>
-          <glossterm><keysym>F5</keysym></glossterm>
-
-          <glossdef>
-            <para>Refresh the screen</para>
-          </glossdef>
-        </glossentry>
-      </glosslist>
-    </section>
-  </chapter>
-
-  <chapter id="supported_widgets">
-    <title>Supported widgets</title>
-
-    <section>
-      <title>Introduction</title>
-
-      <para>wxGlade supports a number of widgets and helps you to edit the
-      visual look and properties of each one.</para>
-
-      <informaltable>
-        <tgroup cols="4">
-          <thead>
-            <row>
-              <entry align="center">Containers</entry>
-
-              <entry align="center">Layout Widgets</entry>
-
-              <entry align="center">Common Widgets</entry>
-
-              <entry align="center">Menu bar / Status Bar / Tool bar</entry>
-            </row>
-          </thead>
-
-          <tbody>
-            <row valign="top">
-              <entry><itemizedlist>
-                  <listitem>
-                    <para>wxDialog</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxFrame</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxNotebook</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxPanel</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxScrolledWindow</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxSplitterWindow</para>
-                  </listitem>
-                </itemizedlist></entry>
-
-              <entry><itemizedlist>
-                  <listitem>
-                    <para>wxBoxSizer</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxStaticBoxSizer</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxGridSizer</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxFlexGridSizer</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Spacer</para>
-                  </listitem>
-                </itemizedlist></entry>
-
-              <entry><itemizedlist>
-                  <listitem>
-                    <para>wxButton</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxBitmapButton</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxCalendarCtrl</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxCheckBox</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxChoice</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxComboBox</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxDatePickerCtrl</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxGauge</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxGenericCalendarCtrl</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxGrid</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxHyperlinkCtrl</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxListBox</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxListCtrl</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxPropertyGridManager</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxRadioBox</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxRadioButton</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxSlider</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxSpinButton</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxSpinCtrl</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxStaticBitmap</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxStaticLine</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxStaticText</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxTextCtrl</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxToggleButton</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxTreeCtrl</para>
-                  </listitem>
-                </itemizedlist></entry>
-
-              <entry><itemizedlist>
-                  <listitem>
-                    <para>wxMenu</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxMenuBar</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Menu Bar Separators</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Sub Menus</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxStatusBar</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>wxToolBar</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Tool Bar Separators</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Tools</para>
-                  </listitem>
-                </itemizedlist></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-
-      <para>Missing widgets can be integrated using the <quote>Custom
-      Widget</quote>.</para>
-    </section>
-
-    <section id="codegen_bitmap_path">
-      <title>Specifying the Path of Bitmaps</title>
-
-      <para>You need to specify a bitmap in some widgets. This can be done in
-      several ways:</para>
-
-      <section>
-        <title>Bitmap Path</title>
-
-        <para>Specify the path to the bitmap file.</para>
-
-        <para>Usually you can type an absolute path in a text box or browse
-        for a bitmap with a file dialog.</para>
-
-        <example>
-          <title><classname>wxBitmap</classname> object with the typed string
-          as bitmap path</title>
-
-          <para>Input:</para>
-
-          <para><userinput>/usr/share/icons/application.png</userinput></para>
-
-          <para>produces in C++:</para>
-
-          <programlisting language="C++">wxBitmap("/usr/share/icons/application.png", wxBITMAP_TYPE_ANY)</programlisting>
-        </example>
-      </section>
-
-      <section>
-        <title>statement <quote><code>var:</code></quote></title>
-
-        <para>Syntax: <emphasis>var:&lt;variable name&gt;</emphasis></para>
-
-        <para>You can enter a variable name using the
-        <emphasis>var:</emphasis> tag in the text box. In Perl code generation
-        a <quote>$</quote> sign is added if you omit it.</para>
-
-        <example>
-          <title><classname>wxBitmap</classname> object with the variable name
-          as bitmap path</title>
-
-          <para>Input:</para>
-
-          <para><userinput>var:my_bitmap_path</userinput></para>
-
-          <para>produces in C++:</para>
-
-          <programlisting language="C++">wxBitmap(my_bitmap_path, wxBITMAP_TYPE_ANY)</programlisting>
-        </example>
-      </section>
-
-      <section>
-        <title>statement <quote><code>empty:</code></quote></title>
-
-        <para>Syntax:
-        <emphasis>empty:&lt;width&gt;,&lt;height&gt;</emphasis></para>
-
-        <para>Creates an empty bitmap of the specified size. It's recommended
-        to use a minimal size of 1, 1.</para>
-
-        <example>
-          <title>Create an empty <classname>wxBitmap</classname> with width of
-          32 and height of 32</title>
-
-          <para>Input:</para>
-
-          <para><userinput>empty:32,32</userinput></para>
-
-          <para>produces in Python:</para>
-
-          <programlisting language="python">wx.EmptyBitmap(32, 32)</programlisting>
-
-          <para>produces in C++:</para>
-
-          <programlisting language="C++">wxBitmap(32, 32)</programlisting>
-        </example>
-      </section>
-
-      <section>
-        <title>statement <quote><code>art:</code></quote></title>
-
-        <para>Syntax: <emphasis>art:&lt;ArtID&gt;,&lt;ArtClient&gt;</emphasis>
-        or
-        <emphasis>art:&lt;ArtID&gt;,&lt;ArtClient&gt;,&lt;width&gt;,&lt;height&gt;</emphasis></para>
-
-        <para>Create a bitmap using wxArtProvider.</para>
-
-        <example>
-          <title>Create a bitmap using wxArtProvider</title>
-
-          <para>Input:</para>
-
-          <para><userinput>art:wxART_GO_UP,wxART_OTHER,32,32</userinput></para>
-
-          <para>produces in Perl:</para>
-
-          <programlisting language="perl">Wx::ArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, Wx::Size-&gt;new(32, 32))</programlisting>
-        </example>
-      </section>
-
-      <section>
-        <title>statement <quote><code>code:</code></quote></title>
-
-        <para>Syntax: <emphasis>code:&lt;code chunk to return a
-        wxBitmap&gt;</emphasis></para>
-
-        <para>You can enter a code chunk returning a
-        <classname>wxBitmap</classname>, by using the
-        <emphasis>code:</emphasis> tag. This inserts verbatim the code you
-        enter in brackets and nothing more.</para>
-
-        <example>
-          <title><classname>wxSomeWidget</classname> needs a
-          <classname>wxBitmap</classname> as an argument</title>
-
-          <para>Input:</para>
-
-          <para><userinput>code:if (x == 0) get_bitmap1() else
-          get_bitmap2();</userinput></para>
-
-          <para>produces in C++:</para>
-
-          <programlisting language="C++">wxSomeWidget((if (x == 0) get_bitmap1() else get_bitmap2();), option1, option2)</programlisting>
-        </example>
-
-        <para>If you use the <code>code:</code> tags like shown above the
-        preview window shows a fixed size empty bitmap instead.</para>
-
-        <note>
-          <para>Refer to <xref linkend="ui_code_properties"/> for a
-          description of declaration and assignment of additional functions
-          and variables.</para>
-        </note>
-      </section>
-    </section>
-
-    <section id="star_bars">
-      <title>Menubar, Statusbar and Toolbar</title>
-
-      <section>
-        <title>Introduction</title>
-
-        <para>wxGlade helps you to design the menu, the tool bar and the
-        status bar for your application.</para>
-
-        <para>There are two ways to integrate the three elements into a
-        wxGlade project:</para>
-
-        <orderedlist>
-          <listitem>
-            <para>Create standalone widgets by clicking the corresponding
-            button in the main window.</para>
-          </listitem>
-
-          <listitem>
-            <para>Associated with a <classname>wxFrame</classname>by selecting
-            the related checkboxes in the <classname>wxFrame</classname>
-            properties window.</para>
-          </listitem>
-        </orderedlist>
-
-        <para>Associated bars will be integrated automatically to the right
-        place. On the other side standalone widgets have to integrate the
-        elements later manually in design after the source code has been
-        generated.</para>
-      </section>
-
-      <section>
-        <title>Menu</title>
-
-        <para>In the menu <quote><guilabel>Properties</guilabel></quote>
-        window click on the <quote><guibutton>Edit
-        menus...</guibutton></quote> button. A dialog will let you edit your
-        menu. Use the <quote><guibutton>Add</guibutton></quote> button to add
-        items to the menu; enter the label, an optional name and help string.
-        You can use numbers or variable names as the item id. If you use a
-        variable name, you have to provide extra code in the generated source
-        code.</para>
-
-        <para>Choose the type of the item: Normal, Checkable or Radio.</para>
-
-        <para>You can move menu items with
-        <quote><guibutton>Up</guibutton></quote> and
-        <quote><guibutton>Down</guibutton></quote> buttons, and you can modify
-        the hierarchy of the menu with
-        <quote><guibutton>&lt;</guibutton></quote> and
-        <quote><guibutton>&gt;</guibutton></quote> buttons.</para>
-
-        <figure>
-          <title>Menu editor</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="15cm"
-                         fileref="properties_menu_editor.png"/>
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </section>
-
-      <section>
-        <title>Statusbar</title>
-
-        <para>In the <quote><guilabel>Properties</guilabel></quote> window you
-        can edit the list of fields and their size.</para>
-
-        <figure>
-          <title>Statusbar properties</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="8cm"
-                         fileref="properties_window_statusbar.png"/>
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </section>
-
-      <section>
-        <title>Toolbar</title>
-
-        <para>You can edit the toolbar style and bitmap size in the properties
-        window.</para>
-
-        <para>Click on the <quote>Edit tools...</quote> button to edit the
-        toolbar buttons. Use the <quote>Add</quote> button to add buttons to
-        the toolbar; enter the label, an optional name and help string. You
-        can use numbers or variable names as the button id. If you use a
-        variable name, you have to provide extra code in the generated source
-        code.</para>
-
-        <para>Choose the type of the button: Normal, Checkable or
-        Radio.</para>
-
-        <para>You can move toolbar buttons with
-        <quote><guibutton>Up</guibutton></quote> and
-        <quote><guibutton>Down</guibutton></quote> buttons.</para>
-
-        <para>You have to enter two bitmaps, one for normal status and the
-        other for the pushed status.</para>
-
-        <para>Refer to <xref linkend="codegen_bitmap_path"/> for bitmap path
-        specifications.</para>
-
-        <figure>
-          <title>Toolbar editor</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="10cm"
-                         fileref="properties_toolbar_editor.png"/>
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </section>
-    </section>
-
-    <section id="widget_list">
-      <title>Widget List</title>
-
-      <para>Follow the widget list as it appears in the wxGlade main
-      window.</para>
-
-      <section>
-        <title>Frame</title>
-
-        <para>This prompts for a <classname>wxFrame</classname> or a
-        <classname>wxMDIChildFrame</classname>. A vertical
-        <classname>wxBoxSizer</classname> is appended. In the properties
-        window you can choose the styles and you can add an icon.</para>
-      </section>
-
-      <section>
-        <title>Dialog or Panel</title>
-
-        <para>This prompts for a <classname>wxDialog</classname> or a
-        <classname>wxPanel</classname> in top-level. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can choose
-        the styles and, for the dialog, you can add an icon.</para>
-      </section>
-
-      <section>
-        <title>Panel</title>
-
-        <para>This allows you to add a panel to a sizer. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can choose
-        the styles.</para>
-      </section>
-
-      <section>
-        <title>Splitter Window</title>
-
-        <para>This produces a <classname>wxSplitterWindow</classname> and two
-        associated panels as well. You can choose vertical or horizontal
-        splitting. In the <quote><guilabel>Properties</guilabel></quote>
-        window you can choose the styles and the sash position.</para>
-
-        <para>Be careful not to put too large a widget in a splitter panel,
-        because while it might appear normal in the design window, when you
-        run your program one of two panels will take all the available space
-        and the other will shrink to the minimum size possible.</para>
-      </section>
-
-      <section>
-        <title>Notebook</title>
-
-        <para>This produces a <classname>wxNotebook</classname> and one panel
-        for each tab. In the <quote><guilabel>Properties</guilabel></quote>
-        window you can add and remove tabs, which appear in a list.</para>
-      </section>
-
-      <section>
-        <title>Buttons</title>
-
-        <section>
-          <title>Button</title>
-
-          <para>This produces a <classname>wxButton</classname>. You can enter
-          a caption and the <quote>default</quote> flag. If you want to add an
-          image you need a bitmap button (see <xref
-          linkend="widgets.bitmap_button.section"/>).</para>
-        </section>
-
-        <section id="widgets.bitmap_button.section">
-          <title>Bitmap Button</title>
-
-          <para>This produces a <classname>wxBitmapButton</classname>. You can
-          set the <quote>default</quote> flag on or off. You also can choose
-          the bitmap for the button and, optionally, the bitmap for the
-          disabled status. Refer to <xref linkend="codegen_bitmap_path"/> for
-          bitmap path specifications.</para>
-        </section>
-
-        <section>
-          <title>Radio Button</title>
-
-          <para>This produces a <classname>wxRadioButton</classname>. In the
-          <quote><guilabel>Properties</guilabel></quote> window you can enter
-          the text, and the status, clicked or not, and the style.</para>
-        </section>
-
-        <section>
-          <title>Spin Button</title>
-
-          <para>This produces a <classname>wxSpinButton</classname>. In the
-          <quote><guilabel>Properties</guilabel></quote> window you can enter
-          the range and the value.</para>
-        </section>
-
-        <section>
-          <title>Toggle Button</title>
-
-          <para>This produces a <classname>wxToggleButton</classname>. You can
-          enter a caption and the status (clicked or not) of the
-          button.</para>
-        </section>
-      </section>
-
-      <section>
-        <title>Calendar Control</title>
-
-        <para>This produces a <classname>wxCalendarCtrl</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the style.</para>
-      </section>
-
-      <section>
-        <title>Check List Box</title>
-
-        <para>This produces a <classname>wxCheckListBox</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the choices, the selection and the style.</para>
-      </section>
-
-      <section>
-        <title>Check Box</title>
-
-        <para>This produces a <classname>wxCheckBox</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the text, and the status, checked or not, of the button.</para>
-      </section>
-
-      <section>
-        <title>Choice</title>
-
-        <para>This produces a <classname>wxChoice</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the position of the selected item starting from 0. You can edit the
-        list of choices.</para>
-      </section>
-
-      <section>
-        <title>Combo Box</title>
-
-        <para>This produces a <classname>wxComboBox</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the position of the selected item starting from 0. You can edit the
-        list of choices.</para>
-
-        <para>Click on the <quote><guibutton>Apply</guibutton></quote> button
-        to consolidate your changes, they are lost without clicking.</para>
-      </section>
-
-      <section>
-        <title>Date Picker Control</title>
-
-        <para>This produces a <classname>wxDatePickerCtrl</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the style.</para>
-      </section>
-
-      <section>
-        <title>Gauge</title>
-
-        <para>This produces a <classname>wxGauge</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the range and set the style.</para>
-      </section>
-
-      <section>
-        <title>Generic Calendar Control</title>
-
-        <para>This produces a <classname>wxGenericCalendarCtrl</classname>. In
-        the <quote><guilabel>Properties</guilabel></quote> window you can set
-        the style.</para>
-      </section>
-
-      <section>
-        <title>Grid</title>
-
-        <para>This produces a <classname>wxGrid</classname>. In the properties
-        window you can set the style, the row number, the label size, the line
-        and background color and the selection mode. You can edit the list of
-        columns. Also you can choose to let wxGlade to create the grid or
-        leave it to the user code.</para>
-      </section>
-
-      <section>
-        <title>Hyperlink Control</title>
-
-        <para>This produces a <classname>wxHyperlinkCtrl</classname>. In the
-        property window you can enter the label, the URL and also set the
-        style.</para>
-      </section>
-
-      <section>
-        <title>List Box</title>
-
-        <para>This produces a <classname>wxListBox</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the position of the selected item starting from 0. You can edit the
-        list of choices.</para>
-      </section>
-
-      <section>
-        <title>List Control</title>
-
-        <para>This produces a <classname>wxListCtrl</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can set the
-        style.</para>
-      </section>
-
-      <section>
-        <title>Property Grid Manager</title>
-
-        <para>This produces a <classname>wxPropertyGridManager</classname>. In
-        the <quote><guilabel>Properties</guilabel></quote> window you can set
-        the style.</para>
-      </section>
-
-      <section>
-        <title>Radio Box</title>
-
-        <para>This produces a <classname>wxRadioBox</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the dimension. The style determines whether the dimension is the
-        number of rows or columns.</para>
-
-        <para>You also can set which button is selected with the
-        <quote>Selection</quote> spin starting from 0. You can edit the list
-        of choices.</para>
-      </section>
-
-      <section>
-        <title>Slider</title>
-
-        <para>This produces a <classname>wxSlider</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the value, the range and also set the style.</para>
-      </section>
-
-      <section>
-        <title>Spin Control</title>
-
-        <para>This produces a <classname>wxSpinCtrl</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the value, the range and also set the style.</para>
-      </section>
-
-      <section>
-        <title>Static Line</title>
-
-        <para>This produces a vertical or horizontal
-        <classname>wxStaticLine</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can tell
-        wxGlade whether to store the object as an attribute of the frame
-        class.</para>
-      </section>
-
-      <section>
-        <title>Static Bitmap</title>
-
-        <para>This produces a <classname>wxStaticBitmap</classname>. You will
-        be prompted for the bitmap path. Refer to <xref
-        linkend="codegen_bitmap_path"/> for bitmap path specifications. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can set the
-        style and you can tell wxGlade whether to store the object as an
-        attribute of the frame class.</para>
-      </section>
-
-      <section>
-        <title>Static Text</title>
-
-        <para>This produces a <classname>wxStaticText</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the text, set the style and tell wxGlade whether to store the control
-        as an attribute.</para>
-      </section>
-
-      <section>
-        <title>Text Control</title>
-
-        <para>This produces a <classname>wxTextCtrl</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can enter
-        the text and also set the style.</para>
-      </section>
-
-      <section>
-        <title>Tree Control</title>
-
-        <para>This produces a <classname>wxTreeCtrl</classname>. In the
-        <quote><guilabel>Properties</guilabel></quote> window you can set the
-        style.</para>
-      </section>
-
-      <section>
-        <title>Custom Widget</title>
-
-        <para>When you put a Custom Widget in the design window you will be
-        prompted for a class name.</para>
-
-        <para><note>
-            <para>Custom Widgets will not be shown in the design
-            preview.</para>
-          </note></para>
-
-        <section>
-          <title>Constructor for Custom Widgets</title>
-
-          <para>In the <quote><guilabel>Widget</guilabel></quote> tab of the
-          <quote><guilabel>Properties</guilabel></quote> window you can set a
-          number of custom attributes that will appear in the constructor
-          call.</para>
-
-          <figure>
-            <title>Widget Properties for a Custom Widget</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata contentwidth="16cm"
-                           fileref="properties_custom_widget.png"/>
-              </imageobject>
-            </mediaobject>
-          </figure>
-
-          <para>There are four attributes <userinput>$id</userinput>,
-          <userinput>$parent</userinput>, <userinput>$width</userinput> and
-          <userinput>$height</userinput> have a special meaning:</para>
-
-          <glosslist>
-            <glossentry>
-              <glossterm>$id</glossterm>
-
-              <glossdef>
-                <para>This attribute will be replaced by the own widget ID
-                e.g. <constant>wxID_ANY</constant>.</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm>$parent</glossterm>
-
-              <glossdef>
-                <para>This attribute will be replaced by a reference to the
-                parent widget.</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm>$width</glossterm>
-
-              <glossdef>
-                <para>This attribute will be replaced by the widget
-                width.</para>
-              </glossdef>
-            </glossentry>
-
-            <glossentry>
-              <glossterm>$height</glossterm>
-
-              <glossdef>
-                <para>This attribute will be replaced by the widget
-                height.</para>
-              </glossdef>
-            </glossentry>
-          </glosslist>
-
-          <para>These attributes have different effects in C++, Lisp, Perl,
-          Python or XRC code generation.</para>
-
-          <para>For XRC you can use it to add custom attributes to the
-          resource object. To do so, arguments must have the following format:
-          <quote><parameter>ATTRIBUTE_NAME:
-          ATTRIBUTE_VALUE</parameter></quote>. For instance:
-          <quote><parameter>default_value:10</parameter></quote> is translated
-          to:
-          <quote><code>&lt;default_value&gt;10&lt;/default_value&gt;</code></quote>.
-          Invalid entries are silently ignored.</para>
-
-          <para>You can use the property <quote><guilabel>Custom
-          constructor</guilabel></quote> to specify a custom constructor like
-          a factory method.</para>
-
-          <example>
-            <title>Generated C++ code for the custom widget shown
-            above</title>
-
-            <programlisting language="C++" linenumbering="numbered">MyFrame::MyFrame(wxWindow* parent, int id, const wxString&amp; title, const wxPoint&amp; pos, const wxSize&amp; size, long style):
-    wxFrame(parent, id, title, pos, size, style)
-{
-    // begin wxGlade: MyFrame::MyFrame
-    window_1 = new wxChoicebook(this, wxID_ANY);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-</programlisting>
-          </example>
-
-          <note>
-            <para>Refer to <xref linkend="ui_code_properties"/> for a
-            description of declaration and assignment of additional functions
-            and variables.</para>
-          </note>
-        </section>
-
-        <section>
-          <title>Example: AGW SpeedMeter</title>
-
-          <para><example>
-              <title>Widget Custom Widget - AGW SpeedMeter</title>
-
-              <para><figure>
-                  <title>Widget Tree</title>
-
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata contentwidth="9cm"
-                                 fileref="custom_widget_SM_tree.png"/>
-                    </imageobject>
-                  </mediaobject>
-                </figure><figure>
-                  <title>SpeedMeter Properties</title>
-
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata contentwidth="18cm"
-                                 fileref="custom_widget_SM_design1.png"/>
-                    </imageobject>
-                  </mediaobject>
-
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata contentwidth="9cm"
-                                 fileref="custom_widget_SM_design2.png"/>
-                    </imageobject>
-                  </mediaobject>
-                </figure><figure>
-                  <title>Preview</title>
-
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata contentwidth="9cm"
-                                 fileref="custom_widget_SM_preview.png"/>
-                    </imageobject>
-                  </mediaobject>
-                </figure>Generated Python code:</para>
-
-              <programlisting language="python" linenumbering="numbered">#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-#
-# generated by wxGlade 0.7.1 on Sat Dec 19 11:11:39 2015
-#
-
-import wx
-
-# begin wxGlade: dependencies
-import gettext
-# end wxGlade
-
-# begin wxGlade: extracode
-import wx.lib.agw.speedmeter as SM
-# end wxGlade
-
-
-class MyFrame(wx.Frame):
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame.__init__
-        wx.Frame.__init__(self, *args, **kwds)
-        self.speedmeter_1 = SM.SpeedMeter(self, wx.ID_ANY)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle(_("frame_1"))
-        self.SetSize((300, 300))
-        self.speedmeter_1.SetSpeedValue(33)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_1.Add(self.speedmeter_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.SetSizer(sizer_1)
-        self.Layout()
-        # end wxGlade
-
-# end of class MyFrame
-class MyApp(wx.App):
-    def OnInit(self):
-        frame_1 = MyFrame(None, wx.ID_ANY, "")
-        self.SetTopWindow(frame_1)
-        frame_1.Show()
-        return True
-
-# end of class MyApp
-
-if __name__ == "__main__":
-    gettext.install("app") # replace with the appropriate catalog name
-
-    app = MyApp(0)</programlisting>
-            </example></para>
-        </section>
-      </section>
-
-      <section>
-        <title>Spacer</title>
-
-        <para>When you put a spacer into a sizer slot in the design window you
-        will be prompted for the size; wxGlade will generate the code to set
-        an empty space in that slot of the sizer.</para>
-      </section>
-    </section>
-  </chapter>
-
-  <chapter id="technical_notes">
-    <title>wxGlade technical notes</title>
-
-    <para>This is an informal overview of wxGlade internals, made through a
-    sample session of use. Each action of the hypothetical user will be
-    described from the point of view of the application, to (hopefully)
-    understand what's happening behind the scenes.</para>
-
-    <para>These notes are <emphasis>absolutely</emphasis> incomplete and in
-    some cases they might be outdated or not completely correct: the best
-    reference is always the source code.</para>
-
-    <section>
-      <title>Installing and Designing own Widget Plugins</title>
-
-      <para>wxGlade supports a simple plugin system for widgets to load all
-      widgets at the application startup dynamically. The plugin system loads
-      all built-in widgets like <quote>Static Text</quote> widget or the
-      <quote>Gauge</quote> widget. It also loads widgets installed by
-      users.</para>
-
-      <section>
-        <title>Widgets Packages</title>
-
-        <para>The wxGlade plugin system supports two different types of widget
-        packages:</para>
-
-        <para><orderedlist>
-            <listitem>
-              <para><quote>directory package</quote> - a single directory with
-              all necessary files inside</para>
-            </listitem>
-
-            <listitem>
-              <para><quote>ZIP package</quote> - a zipped version of a
-              "directory" package</para>
-            </listitem>
-          </orderedlist></para>
-
-        <example>
-          <title>Directory package</title>
-
-          <para><screen>static_text          &lt;- Directory named after the widget name
-|-- __init__.py      &lt;- Mostly an empty file or a file with just a comment
-|-- codegen.py       &lt;- Python and C++ code generators
-|-- wconfig.py       &lt;- Widget configuration
-|-- lisp_codegen.py  &lt;- Lisp code generator
-|-- perl_codegen.py  &lt;- Perl code generator
-`-- static_text.py   &lt;- wxGlade GUI code
-</screen></para>
-        </example>
-
-        <example>
-          <title>ZIP package</title>
-
-          <para><screen># unzip -l static_text.zip 
-Archive:  static_text.zip
-  Length      Date    Time    Name
----------  ---------- -----   ----
-        0  2013-12-09 10:02   static_text/
-      329  2013-12-09 10:02   static_text/__init__.py
-     3352  2013-12-09 10:02   static_text/codegen.py
-      320  2013-12-09 10:02   static_text/wconfig.py
-     1640  2013-12-09 10:02   static_text/lisp_codegen.py
-     1841  2013-12-09 10:02   static_text/perl_codegen.py
-     5917  2013-12-09 10:02   static_text/static_text.py
----------                     -------
-    13079                     6 files</screen></para>
-        </example>
-      </section>
-
-      <section>
-        <title>Create a ZIP Package</title>
-
-        <para>Creating a ZIP package is quite simple. Just create a ZIP
-        package from widgets directory with all Python and additional files.
-        Don't include Python bytecode files because they are not platform
-        independent.<programlisting># tree static_text/
-static_text/
-|-- __init__.py
-|-- codegen.py
-|-- wconfig.py
-|-- lisp_codegen.py
-|-- perl_codegen.py
-`-- static_text.py
-
-# zip -r static_text.zip static_text 
-  adding: static_text/ (stored 0%)
-  adding: static_text/__init__.py (deflated 36%)
-  adding: static_text/codegen.py (deflated 67%)
-  adding: static_text/wconfig.py (deflated 64%)
-  adding: static_text/lisp_codegen.py (deflated 54%)
-  adding: static_text/perl_codegen.py (deflated 56%)
-  adding: static_text/static_text.py (deflated 69%)
-</programlisting></para>
-
-        <para>Check the integrity of the created ZIP archive:</para>
-
-        <para><programlisting># zip -T static_text.zip 
-test of static_text.zip OK</programlisting></para>
-      </section>
-
-      <section>
-        <title>Installing Widget Plugins Locally</title>
-
-        <para>The installation of local plugins is a two-step process:</para>
-
-        <orderedlist>
-          <listitem>
-            <para>Place the widget package in the <guilabel>Local widget
-            path</guilabel> (see <xref linkend="preferences"/>).
-            Create this directory if it doesn't exist.</para>
-          </listitem>
-
-          <listitem>
-            <para>Add widget name to the text file named
-            <filename>widgets.txt</filename>. This file is also located in the
-            directory specified in <guilabel>Local widget path</guilabel>.
-            Just create a simple text file, if the file doesn't exists.</para>
-          </listitem>
-        </orderedlist>
-
-        <para>The new widget will be available after wxGlade has been
-        restarted.</para>
-      </section>
-
-      <section>
-        <title>Designing own Widget Plugins</title>
-
-        <note>
-          <para>This section is under construction! Please use this
-          information carefully.</para>
-        </note>
-
-        <orderedlist>
-          <listitem>
-            <para>Create a new directory named like the widget and change in
-            this directory</para>
-          </listitem>
-
-          <listitem>
-            <para>Place an empty file <filename>__init__.py</filename> in that
-            directory</para>
-          </listitem>
-
-          <listitem>
-            <para>Create a file <filename>wconfig.py</filename> in the widget
-            directory and describe the styles used by this widget</para>
-
-            <programlisting language="python" linenumbering="numbered">"""\
-wxStaticLine widget configuration
-
-@copyright: &lt;Add year and your name&gt;
-@license: &lt;Choice a license&gt;
-"""
-
-config = {
-    'wxklass': 'myCtrl',
-    'style_defs': {
-        'wxMCFance': {
-            'desc': _('Use the new and fancy design.'),
-        },
-        'wxMCOldFashion': {
-            'desc': _('Use the old fashion design.'),
-        },
-    },
-    'default_style': 'wxMCFance',
-    'style_list': ['wxMCFance', 'wxMCOldFashion']
-}</programlisting>
-          </listitem>
-
-          <listitem>
-            <para>Create a Python file codegen.py with initial content
-            like</para>
-
-            <programlisting language="python" linenumbering="numbered">"""
-Code generator functions for myCtrl objects
-
-@copyright: &lt;Add year and your name&gt;
-@license: &lt;Choice a license&gt;
-"""
-
-import common
-
-
-class PythonMyCtrlGenerator(wcodegen.PythonWidgetCodeWriter):
-
-    tmpl = '%(name)s = %(klass)s(%(parent)s, %(id)s, %(label)s%(style)s)\n'
-
-# end of class PythonMyCtrlGenerator
-
-
-def initialize():
-    common.class_names['EditmyCtrl'] = 'myCtrl'
-
-    pygen = common.code_writers.get("python")
-    if pygen:
-        pygen.add_widget_handler('myCtrl', PythonMyCtrlGenerator())</programlisting>
-          </listitem>
-
-          <listitem>
-            <para>Create a Python file named like the widget directory e.g.
-            myctrl.py</para>
-          </listitem>
-
-          <listitem>
-            <para>Create remaining code generators</para>
-          </listitem>
-
-          <listitem>
-            <para>Example of the created structure</para>
-
-            <programlisting>myctrl
-|-- __init__.py
-|-- codegen.py
-|-- myctrl.py
-`-- wconfig.py</programlisting>
-          </listitem>
-        </orderedlist>
-
-        <section>
-          <title>Widget Initialisation</title>
-
-          <note>
-            <para>This section is incomplete.</para>
-          </note>
-
-          <orderedlist>
-            <listitem>
-              <para>Load generic and language independent widget configuration
-              from <filename>wconfig.py</filename>
-              (<function>common.load_config()</function>)</para>
-            </listitem>
-
-            <listitem>
-              <para>Load and initialise language code writers
-              (<function>common.load_code_writers()</function>)</para>
-            </listitem>
-
-            <listitem>
-              <para>Load and initialise widgets
-              (<function>common.load_widgets()</function>)</para>
-            </listitem>
-
-            <listitem>
-              <para>Load and initialise sizers
-              (<function>common.load_sizers()</function> )</para>
-            </listitem>
-          </orderedlist>
-        </section>
-      </section>
-    </section>
-
-    <section id="contributing">
-      <title>Contributing to wxGlade</title>
-
-      <para>You are, of course, free to make any changes/additions you want to
-      wxGlade, in whatever way you like.</para>
-
-      <para>If you decide to contribute them back, however, here are some
-      simple (stylistic) rules to follow: note that these are only general
-      indications, if you think they don't fit somewhere, feel free to ignore
-      them.</para>
-
-      <section>
-        <title>Coding conventions</title>
-
-        <para><itemizedlist>
-            <listitem>
-              <para>Class names are usually CamelCase - variables, functions
-              and method names are lower_case_with_unserscores</para>
-            </listitem>
-
-            <listitem>
-              <para>Constants are UPPER_CASE</para>
-            </listitem>
-
-            <listitem>
-              <para>Source lines are at most 79 characters long</para>
-            </listitem>
-
-            <listitem>
-              <para>Class bodies are usually ended by a <quote><code><code>#
-              end of class ClassName</code></code></quote> comment</para>
-            </listitem>
-
-            <listitem>
-              <para>Source files use Unix EOL conventions (LF) if possible. In
-              any case, please don't mix Unix and Windows EOLs</para>
-            </listitem>
-
-            <listitem>
-              <para>Put your copyright info whenever appropriate</para>
-            </listitem>
-          </itemizedlist></para>
-      </section>
-
-      <section>
-        <title>Testing</title>
-
-        <para>Please write tests for significant changes and run the test
-        suite before committing changes.</para>
-      </section>
-
-      <section>
-        <title>Commit Messages</title>
-
-        <para><itemizedlist>
-            <listitem>
-              <para>Use the present tense (<quote>Add feature</quote> not
-              <quote>Added feature</quote>)</para>
-            </listitem>
-
-            <listitem>
-              <para>Use the imperative mood (<quote>Move cursor to...</quote>
-              not <quote>Moves cursor to...</quote>)</para>
-            </listitem>
-
-            <listitem>
-              <para>Limit the first line to 72 characters or less</para>
-            </listitem>
-
-            <listitem>
-              <para>Reference issues and pull requests liberally</para>
-            </listitem>
-          </itemizedlist></para>
-      </section>
-    </section>
-
-    <section id="incomplete_and_outdated">
-      <title>Incomplete and outdated parts</title>
-
-      <caution>
-        <para>The remaining content in this section has not been updated since
-        July 2002. It's likely be very outdated in some parts.</para>
-      </caution>
-
-      <section>
-        <title>Startup</title>
-
-        <para>The program starts from the function
-        <quote><function>main</function></quote> in the module
-        <quote><function>main</function></quote>: this creates an instance of
-        wxGlade (a subclass of <classname>wxApp</classname>), which in turn
-        creates a <classname>wxGladeFrame</classname>: this is the main window
-        of the app, i.e. the one with the palette of buttons. The
-        initialization of <classname>wxGladeFrame</classname> consists of
-        three steps:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>Creation of the three frames of the app, the palette itself,
-            the tree and the property window</para>
-          </listitem>
-
-          <listitem>
-            <para>Loading of the code generator modules. The
-            <quote><filename>codegen/</filename></quote> subdirectory is
-            scanned to find the available code generators: when a python
-            module is found, the app tries to load it and to access its
-            'writer' attribute: if this is successfully accomplished, such
-            'writer' object is considered a valid code generator, and is
-            inserted into the 'common.code_writers' dictionary (the key used
-            is the 'language' attribute of the writer itself)</para>
-          </listitem>
-
-          <listitem>
-            <para>Loading of the widget and sizer modules. To load the
-            widgets, the file
-            <quote><filename>widgets/widgets.txt</filename></quote> is read,
-            and the app tries to import every widget module listed on such
-            file. For every module successfully imported, the
-            <quote><methodname>initialize</methodname></quote> function is
-            then called: this function sets up the builder and code generator
-            functions for a particular widget (explained later), and returns a
-            <classname>wxBitmapButton</classname> instance to be added to the
-            main palette. The loading of the sizers is more or less the same,
-            except that all the sizers are in the same module,
-            <quote><function>edit_sizers</function></quote>, and the
-            initialization function (called
-            <quote><function>init_gui</function></quote>) returns a list of
-            <classname>wxBitmapButton</classname> objects</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section>
-        <title>Adding a top-level Widget</title>
-
-        <para>When the user clicks on a button of a top-level widget (a Frame
-        or a Dialog), the method
-        <quote><methodname>add_toplevel_object</methodname></quote> of
-        <classname>wxGladeFrame</classname> is called: this is responsible for
-        the addition of the widget to the application. This happens in this
-        way:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>the name of the class of the widget to add is obtained: this
-            is done with the use of the
-            <quote><code>common.refs</code></quote> dictionary, which maps the
-            ids of the buttons of the palette to the class names of the
-            widgets.</para>
-          </listitem>
-
-          <listitem>
-            <para>with the name just obtained, the appropriate factory
-            function for the widget to add is got from the
-            <quote><code>common.widgets</code></quote> dictionary. This
-            function must accept three parameters: a reference to the parent
-            widget (<code>None</code> in this case), a reference to the sizer
-            to which the widget will be added (again <code>None</code> for
-            top-level windows) and the zero-based position inside the sizer
-            (once again, this is unused for top-level windows)</para>
-          </listitem>
-
-          <listitem>
-            <para>the call of the factory function actually builds the widgets
-            and inserts it in the <quote><code>common.app_tree</code></quote>
-            tree with a call to its method
-            <quote><methodname>insert</methodname></quote>. The
-            <quote><filename>__init__</filename></quote> method of the widget
-            also builds all the Properties of the object and stores them in
-            the 'self.properties' dictionary</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section>
-        <title>Adding a top-level Sizer</title>
-
-        <para>This is similar to the addition of a top-level widget, but the
-        action is performed in two steps:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>when the user clicks on the button in the palette, the
-            method <quote><methodname>add_object</methodname></quote> of
-            <classname>wxGladeFrame</classname> is called: this sets the
-            global variables <quote><code>common.adding_widget</code></quote>
-            and <quote><code>common.adding_sizer</code></quote> to
-            <code>True</code>, and stores the class name of the sizer to add
-            in the global <quote><code>common.widget_to_add</code></quote>
-            (the name is obtained from the
-            <quote><code>common.refs</code></quote> dictionary as described
-            above)</para>
-          </listitem>
-
-          <listitem>
-            <para>when the user left-clicks the mouse inside the previously
-            added top-level widget, its <quote><code>drop_sizer</code></quote>
-            method is called, which is responsible of the addition of the
-            sizer: it calls the factory function for the sizer (passing self
-            as the first argument), which will build the object and add it to
-            the tree</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section>
-        <title>Adding a Normal Widget/Sizer</title>
-
-        <para>This step is more or less the same as step 3:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para><quote><code>wxGladeFrame.add_object</code></quote> is
-            called in response to a button click</para>
-          </listitem>
-
-          <listitem>
-            <para>when the user ``drops'' the widget inside a slot in a sizer,
-            the method <quote><function>on_drop_widget</function></quote> of
-            <code>edit_sizers.SizerSlot</code> is called, which in turn calls
-            the appropriate factory function with arguments
-            <quote><code>self.parent</code></quote>,
-            <quote><code>self.sizer</code></quote> and
-            <quote><code>self.pos</code></quote> (i.e. the parent, sizer and
-            position inside the sizer of the slot that will be replaced).
-            Factory functions of non-top-level objects call, apart from
-            <quote><code>common.app_tree.insert</code></quote> to insert the
-            object in the tree, the method
-            <quote><methodname>add_item</methodname></quote> of
-            <quote><classname>edit_sizers.SizerBase</classname></quote>, to
-            add the object to the sizer and to remove the slot. For managed
-            widgets/sizers, the
-            <quote><methodname>__init__</methodname></quote> method also
-            builds the Properties which control the layout of the object
-            inside a sizer, and stores them in the
-            <quote><code>self.sizer_properties</code></quote>
-            dictionary.</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section>
-        <title>Changing the Value of a Property</title>
-
-        <para>When the user selects a widget the property window changes to
-        display the properties of the selected object: this is done by the
-        functions <quote><methodname>show_properties</methodname></quote> of
-        <classname>edit_windows.EditBase</classname> and
-        <classname>edit_sizers.SizerBase</classname>, which are called inside
-        two event handlers for focus and tree selection events.</para>
-
-        <para>When the value of a Property is changed, its setter function is
-        called to update the aspect/layout of the widget the Property belongs
-        to: such function is obtained from a call to the widget's
-        <quote><methodname>__getitem__</methodname></quote> method, which must
-        return a 2-tuple (getter, setter) for the Property</para>
-      </section>
-
-      <section>
-        <title>Saving the Design</title>
-
-        <para>This operation is performed by the
-        <quote><code>common.app_tree</code></quote> Tree: for every Node of
-        the tree, an <quote>object</quote> XML element is generated, with the
-        following attributes: name, class, base (class). Each object contains
-        an element for each Property (generated by the
-        <quote><methodname>write</methodname></quote> method of Property) and
-        then an <quote>object</quote> element for all its sub-widgets and/or
-        sizers. Properties in the <quote><code>sizer_properties</code></quote>
-        dictionary are treated in a different way, as well as the children of
-        a sizer, which are sub-elements of
-        <quote><code>sizeritem</code></quote> objects: see the source code for
-        details.</para>
-      </section>
-
-      <section>
-        <title>Loading an App from a XML file</title>
-
-        <para>This is done by
-        <quote><classname>xml_parse.XmlWidgetBuilder</classname></quote>, a
-        subclass of
-        <classname>xml.sax.handler.ContentHandler</classname>.</para>
-
-        <para>Basically, the steps involved are the following:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>when the start of an <quote>object</quote> element is
-            reached, a <classname>XMLWidgetObject</classname> instance is
-            created and pushed onto a stack of the objects created: such
-            object in turn calls the appropriate ``XML builder'' function (got
-            from the <quote><code>common.widgets_from_xml</code></quote>
-            dictionary) that creates the widget: this function is similar to
-            the factory function used to build the widget during an
-            interactive session, see the code for details and
-            differences</para>
-          </listitem>
-
-          <listitem>
-            <para>when the end of an <quote>object</quote> element is reached,
-            the object at the top of the stack is removed, and its widget (see
-            the source of <classname>XmlWidgetObject</classname>) is laid
-            out</para>
-          </listitem>
-
-          <listitem>
-            <para>when the end of a Property element is reached, the
-            appropriate setter function of the owner of the Property is
-            called. This is the default behaviour, suitable for simple
-            properties. For more complex properties, whose XML representation
-            consists of more sub-elements, each widget can define a particular
-            handler: see for example <classname>FontHandler</classname> in
-            <classname>edit_windows.WindowBase</classname></para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section>
-        <title>Generating the Source Code</title>
-
-        <para>This section is the result of a cut &amp; paste of the comment
-        at the beginning of
-        <quote><filename>codegen/py_codegen.py</filename></quote>. It is
-        *VERY* incomplete. The <classname>ContentHandler</classname> subclass
-        which drives the code generation is
-        <classname>xml_parse.CodeWriter</classname>.</para>
-
-        <para>How the code is generated: every time the end of an object is
-        reached during the parsing of the XML tree, either the function
-        <quote><methodname>add_object</methodname></quote> or the function
-        <quote><methodname>add_class</methodname></quote> is called: the
-        latter when the object is a top-level one, the former when it is not.
-        In the last case, <quote><methodname>add_object</methodname></quote>
-        calls the appropriate ``writer'' function for the specific object,
-        found in the <quote><code>obj_builders</code></quote> dictionary. Such
-        function accepts one argument, the <classname>CodeObject</classname>
-        representing the object for which the code has to be written, and
-        returns 3 lists of strings, representing the lines to add to the
-        <quote><methodname>__init__</methodname></quote>,
-        <quote><methodname>__set_properties</methodname></quote> and
-        <quote><methodname>__do_layout</methodname></quote> methods of the
-        parent object.</para>
-
-        <note>
-          <para>The lines in the
-          <quote><methodname>__init__</methodname></quote> list will be added
-          in reverse order.</para>
-        </note>
-      </section>
-    </section>
-  </chapter>
-
-  <appendix id="abbreviations">
-    <title>Glossary of Terms, Abbreviations, and Acronyms</title>
-
-    <para>The following abbreviations are used in this manual: <variablelist>
-        <varlistentry>
-          <term>API</term>
-
-          <listitem>
-            <para>Application Programming Interface</para>
-
-            <para>It's a standardized implementation-independent programming
-            interface.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>Escape sequence</term>
-
-          <listitem>
-            <para>Escape sequences are used to define certain special
-            characters within string literals. Escape sequences starts mostly
-            with a backslash (<quote>\</quote>).</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>gettext</term>
-
-          <listitem>
-            <para>Widespread internationalisation (i18n) and localisation
-            system.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><emphasis>GUI</emphasis></term>
-
-          <listitem>
-            <para>Graphical User Interface</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>i18n</term>
-
-          <listitem>
-            <para>Numeronym for internationalisation support.</para>
-
-            <para>Internationalisation means adapting software to different
-            languages, regional differences, ...</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>Managed Widget</term>
-
-          <listitem>
-            <para>Normal widget with a parent object</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>Non-Managed Widget</term>
-
-          <listitem>
-            <para>Synonym for lop-level widget</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><emphasis>OS</emphasis></term>
-
-          <listitem>
-            <para>Operating system</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>OS X</term>
-
-          <listitem>
-            <para>is a graphical UNIX operating system developed by Apple Inc.
-            OS X is certified by The Open Group.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>Python</term>
-
-          <listitem>
-            <para>Python is a general-purpose, high-level programming
-            language.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>SAE</term>
-
-          <listitem>
-            <para>Standalone Edition</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>Top-level widget</term>
-
-          <listitem>
-            <para>Top-level widgets like <classname>wxFrame</classname> or
-            <classname>wxDialog</classname> don't have a parent object.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>Unix</term>
-
-          <listitem>
-            <para>is a multitasking, multi-user operation system. Today the
-            trademark <quote>UNIX</quote> is owned by The Open Group.
-            Operating systems complaint with <quote>Single UNIX
-            Specification</quote> and certified by The Open Group are called
-            <quote>UNIX</quote>.</para>
-
-            <para>Unix-like operating systems behaves similar to
-            <quote>UNIX</quote> operating systems. They are not certified by
-            The Open Group.</para>
-
-            <para>This document use the term <quote>Unix</quote> for certified
-            <quote>UNIX</quote> operating systems as well as
-            <quote>Unix-like</quote> operating systems. Linux is an Unix-like
-            operating system.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>UTF-8</term>
-
-          <listitem>
-            <para>Universal Character Set Transformation Format - 8-bit</para>
-
-            <para>Character encoding with the capability to encode all
-            possible characters</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>wxg</term>
-
-          <listitem>
-            <para>File extension used by wxGlade to store the design / project
-            in a XML file.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><emphasis>wx</emphasis></term>
-
-          <listitem>
-            <para>abbreviation for <acronym>wxWidgets</acronym></para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>wxPython</term>
-
-          <listitem>
-            <para>is a wrapper for wxWidgets of the Python programming
-            language.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>wxWidgets</term>
-
-          <listitem>
-            <para>wxWidgets a widget toolkit and tools library for creating
-            graphical user interfaces (GUIs) for cross-platform
-            applications.</para>
-
-            <para>wxWidgets is open source and written in C++.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><emphasis>WYSIWYG</emphasis></term>
-
-          <listitem>
-            <para>What You See Is What You Get.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><emphasis>X11</emphasis></term>
-
-          <listitem>
-            <para>The X Window System version 11.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>XRC</term>
-
-          <listitem>
-            <para>XML-based system for describing wxWidgets resources like
-            dialogs, menus or toolbars.</para>
-
-            <para>Those resources are loaded into the application at
-            run-time.</para>
-          </listitem>
-        </varlistentry>
-      </variablelist></para>
-  </appendix>
-
-  <appendix id="copyright">
-    <title>Copyrights, Licenses and Trademarks</title>
-
-    <section>
-      <title>Copyrights</title>
-
-      <para>wxGlade is copyright 2002-2007 by Alberto Griggio and 2011-2016 by
-      Carsten Grohmann. Use and distribution of wxGlade is governed by the MIT
-      license, located in <xref linkend="license_mit"/>.</para>
-    </section>
-
-    <section id="license_mit">
-      <title>wxGlade License Agreement</title>
-
-      <para>Copyright (c) 2002-2007 Alberto Griggio.</para>
-
-      <para>Copyright (c) 2011-2016 Carsten Grohmann.</para>
-
-      <para>Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation files
-      (the "Software"), to deal in the Software without restriction, including
-      without limitation the rights to use, copy, modify, merge, publish,
-      distribute, sublicense and/or sell copies of the Software, and to permit
-      persons to whom the Software is furnished to do so, subject to the
-      following conditions:</para>
-
-      <para>The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.</para>
-
-      <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-      IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-      TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-      SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</para>
-    </section>
-
-    <section id="trademarks">
-      <title>Trademarks</title>
-
-      <para>wxWidgets is copyright (C) 1998-2005 Julian Smart, Robert Roebling
-      et al. See <ulink
-      url="http://www.wxwidgets.org">http://www.wxwidgets.org</ulink> for
-      details.</para>
-
-      <para>Linux is a registered trademark of Linus Torvalds.</para>
-
-      <para>Microsoft and Windows are registered trademarks of Microsoft
-      Corporation.</para>
-
-      <para>UNIX is a registered trademark of The Open Group.</para>
-
-      <para>All other trademarks are property of their respective
-      owners.</para>
-    </section>
-  </appendix>
-
-  <appendix id="icon">
-    <title>The wxGlade Icon</title>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="mondrian_200x200.png"/>
-      </imageobject>
-    </mediaobject>
-
-    <para>The wxGlade logo is a homage to Piet Mondrian a Dutch
-    painter.</para>
-
-    <para>The icon looks like a typical Mondrian painting. It has the
-    characteristic solid horizontal and vertical black lines as well as areas
-    filled with the three primary colours yellow, red and blue.</para>
-  </appendix>
-</book>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/mondrian_200x200.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/mondrian_200x200.png differ
diff -Nru wxglade-0.9.6/docs_old/src/pdf.xsl wxglade-1.0.1/docs_old/src/pdf.xsl
--- wxglade-0.9.6/docs_old/src/pdf.xsl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/src/pdf.xsl	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-    <!-- Most of this parameters are specific to dblatex -->
-
-    <!-- Print the document collaborators (authors, etc.) in a table -->
-    <xsl:param name="doc.collab.show" select="0"/>
-
-    <!-- List of titles to display after TOC -->
-    <xsl:param name="doc.lot.show">figure,table,example</xsl:param>
-
-    <!-- Depth of the section numbering -->
-    <xsl:param name="doc.section.depth">2</xsl:param>
-
-    <!-- Print the revhistory table -->
-    <xsl:param name="latex.output.revhistory" select="0"/>
-
-    <!-- How preface section and subsections appear in TOC -->
-    <xsl:param name="preface.tocdepth" select="1"/>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-    <xsl:param name="toc.section.depth">2</xsl:param>
-
-    <!-- Use number and title in cross references -->
-    <xsl:param name="xref.with.number.and.title" select="1"/>
-</xsl:stylesheet>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/preferences.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/preferences.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/preview_window.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/preview_window.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_custom_widget.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_custom_widget.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_menu_editor.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_menu_editor.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_toolbar_editor.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_toolbar_editor.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_window_application.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_window_application.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_window_settings.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_window_settings.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_window_statusbar.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_window_statusbar.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_window_tab_1_change.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_window_tab_1_change.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_window_tab_1.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_window_tab_1.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_window_tab_2.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_window_tab_2.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_window_tab_3_dont_generate_code.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_window_tab_3_dont_generate_code.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_window_tab_3.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_window_tab_3.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_window_tab_4.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_window_tab_4.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/properties_window_tab_5.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/properties_window_tab_5.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/select_frame.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/select_frame.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/sizer_menu.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/sizer_menu.png differ
diff -Nru wxglade-0.9.6/docs_old/src/test.wxg wxglade-1.0.1/docs_old/src/test.wxg
--- wxglade-0.9.6/docs_old/src/test.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/src/test.wxg	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!-- generated by wxGlade 0.3pre2 on Sat Sep  6 15:01:39 2003 -->
-
-<application path="" name="" class="" option="0" language="python" top_window="" encoding="UTF-8" use_gettext="0" overwrite="0">
-    <object class="MyDialog" name="dialog_1" base="EditDialog">
-        <style>wxDEFAULT_DIALOG_STYLE</style>
-        <title>dialog_1</title>
-        <object class="wxStaticBoxSizer" name="sizer_1" base="EditStaticBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <label>Personal Data</label>
-            <object class="sizeritem">
-                <flag>wxALL|wxALIGN_CENTER_HORIZONTAL</flag>
-                <border>3</border>
-                <option>0</option>
-                <object class="wxStaticText" name="label_1" base="EditStaticText">
-                    <attribute>1</attribute>
-                    <label>Type here your name:</label>
-                </object>
-            </object>
-            <object class="sizeritem">
-                <flag>wxEXPAND</flag>
-                <border>0</border>
-                <option>0</option>
-                <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
-                    <orient>wxHORIZONTAL</orient>
-                    <object class="sizeritem">
-                        <flag>wxALL</flag>
-                        <border>3</border>
-                        <option>0</option>
-                        <object class="wxStaticText" name="label_2" base="EditStaticText">
-                            <attribute>1</attribute>
-                            <label>Your Name:</label>
-                        </object>
-                    </object>
-                    <object class="sizeritem">
-                        <flag>wxALL</flag>
-                        <border>3</border>
-                        <option>1</option>
-                        <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
-                        </object>
-                    </object>
-                </object>
-            </object>
-            <object class="sizeritem">
-                <flag>wxALL|wxALIGN_CENTER_HORIZONTAL</flag>
-                <border>3</border>
-                <option>0</option>
-                <object class="wxButton" name="button_1" base="EditButton">
-                    <label>Done</label>
-                </object>
-            </object>
-        </object>
-    </object>
-</application>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/tooltip_styles.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/tooltip_styles.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/tree_window.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/tree_window.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/wxglade.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/wxglade.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/wxglade_start_on_linux.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/wxglade_start_on_linux.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/docs_old/src/wxglade_start_on_windows.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/docs_old/src/wxglade_start_on_windows.png differ
diff -Nru wxglade-0.9.6/docs_old/tutorial.html wxglade-1.0.1/docs_old/tutorial.html
--- wxglade-0.9.6/docs_old/tutorial.html	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/docs_old/tutorial.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,531 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-         
-  <meta http-equiv="CONTENT-TYPE"
- content="text/html; charset=iso-8859-1" />
-  <title>wxGlade tutorial</title>
-                     
-  <style type="text/css">
-body { font-family: Arial, Helvetica, sans-serif }
-  </style>
-</head>
-<body bgcolor="#ffffff" style="padding: 10px">
-
-<h1>wxGlade Tutorial</h1>
-    
-<!-- CONTENT_START -->
-  
-<p>The aim of this minimal tutorial is to give an overview of wxGlade and its
-functionalities: despite its very short length, it is (hopefully) complete
-enough to make you understand how the application works, through a step-by-step
-description of the creation of a frame containing a notebook with some
-controls, a menubar and a statusbar.<br/>
- </p>
-    
-<p>Before we start, let me apologize for my English: it's not my native
-language (I'm Italian), so it is very far from perfection.<br/>
- </p>
-    
-<h3>1. Creation of the frame</h3>
-    
-<p>To create a new frame, click on the appropriate button of the "palette"
-(<img src="img/frame_button.gif" align="middle" width="31" height="31"
-border="0" alt="" />): a dialog asking for the name of the class of the new
-window is displayed: choose the name you prefer, but remember that it must be a
-valid name for a Python (or C++) class.<br/>
- </p>
-    
-<p>Now the frame is displayed, and the properties window changes to show the
-attributes of the widget just created. The first thing we'll do is change the
-title of the frame, which is by default equal to the object's name, and insert
-"Frame with notebook": the change takes effect when the <tt>Title</tt> property
-loses focus.<br/>
- </p>
-    
-<h3>2. Creation of the menubar</h3>
-    
-<p>Let's activate the <tt>Widget</tt> tab of the properties notebook of our
-frame, and check the property <tt>Has MenuBar</tt> to create a menu bar for the
-frame.</p>
-    
-<p>The properties window changes again, and now it shows the properties of the
-menubar: let's click on the <tt>Edit menus</tt> button to add some menus with
-the Menu Editor.<br/>
- </p>
-    
-<p>Click on the button <tt>Add</tt> to add a menu, and then edit the
-<tt>Label</tt> field to change its value to "File".<br/> Let's then add some
-menu items to our File menu: click on the <tt>Add</tt> button again, change
-<tt>Label</tt> to "New", and finally click the <tt>&gt;</tt> button: after the
-latter action we can see that the label of our item ("New") is indented
-compared to the previous one ("File"): this says that "New" is an item of
-"File".<br/> Repeat the previous operations "ad libitum" to add other menus and
-items (and sub-menus), then click <tt>OK</tt>: the window gets closed, and our
-menubar contains the menus we added.<br/>
- </p>
-    
-<h3>3. Creation of the statusbar</h3>
-    
-<p>Under the <tt>Has MenuBar</tt> property of our frame there's the <tt>Has
-StatusBar</tt> one: check it to add the statusbar.<br/>
- </p>
-    
-<p>The <tt>Fields</tt> property of the object just added keeps the fields to
-display on the statubar: double-click on a field to edit it; to add, remove,
-insert other fields use the appropriate buttons.<br/> Edit the default field, an
-set its value to "Created with wxGlade!", then add some other fields with the
-<tt>Add</tt> button: the <tt>Size</tt> column shows the dimension of each
-field: you can change them as you like, but remember that one of the fields
-must have a size of &nbsp;-1 (which tells that it will fill the remaining
-space).<br/> After performing these operations, click on the <tt>Apply</tt>
-button to reflect the changes on the widget.<br/>
- </p>
-    
-<h3>4. Creation of the notebook</h3>
-    
-<p>Now it's time to add a notebook to our frame. You should have noticed that
-the frame you've just added contain a BoxSizer (<img
-src="img/box_sizer_button.gif" align="middle" width="31" height="31" border="0"
-alt="" />). This is because with wxGlade every container widget must have a
-Sizer before you can add sub-widgets to it, and since it is very common for
-frames to have just one child window, wxGlade adds an 1-slot BoxSizer
-automatically for you. This doesn't happen for other containers, for which
-you'll have to set their sizer manually, as will be explained below, after the
-addition of the notebook to the frame.<br/></p>
-
-<p>Let's add such notebook, then: to do so, click on the Notebook button (<img
- src="img/notebook_button.gif" align="middle" border="0" width="30" height="30"
- alt="" />) on the palette: now when you move the mouse inside the sizer's area
- (<img src="img/sizer_slot.gif" align="middle" border="0" width="30"
- height="30" alt="" />), the pointer changes its shape and becomes a cross:
- this tells us that we can drop the notebook on the sizer's only slot.<br/> A
- left-click starts the operation, and a dialog asking for the placement of the
- notebook's tabs appears: choose what you like best.</p>
-
-
-<p>Now let's select the <tt>Common</tt> tab of the properties of the object
-just added: we can see that the <tt>Class</tt> property's value is
-<tt>wxNotebook</tt>, i.e.  the name of the class our object is an instance
-of. If we change such value, we can make our notebook an instance of a custom
-class derived from wxNotebook: this has no effect during the creation of the
-app, but it changes the generated code, so that a definition for our custom
-class will be written. Let's change then the value of <tt>Class</tt> to
-<tt>MyNotebook</tt>, to make wxGlade generate the code for the custom
-class.</p>
-
-<p><b>NOTE:</b> The above is true only for "container" widgets, i.e. those that
-can have children. For controls, instead, the meaning is slightly different;
-let me illustrate it with an example.<br/>
-
-<blockquote>Suppose you have a button inside a panel, its <tt>Class</tt> is
-<tt>wxButton</tt>. If you change such value to <tt>MyCustomButton</tt>, wxGlade
-assumes that you have a subclass of <tt>wxButton</tt> called
-<tt>MyCustomButton</tt> defined somewhere, and that such class has a costructor
-compatible with that of the "regular" <tt>wxButton</tt>, and so when it
-generates the code for the object, it writes:
-<pre>button_1 = MyCustomButton(parent, id, "Label")</pre> instead of
-<pre>button_1 = wxButton(parent, id, "Label")</pre> </blockquote>
-
-<p><b>NOTE 2:</b> For XRC output, if the value of <tt>Class</tt> is different
-from the default one, the object will have a <tt>subclass</tt> attribute. For
-the example above, the code generated would be: </p>
-<blockquote> 
-&lt;object class="wxButton" name="button_1" subclass="MyCustomButton"/&gt; 
-</blockquote>
-<p>This means that you should be a little careful with XRC output, in that you
-have to remember to reset the <tt>Class</tt> value to the default one when
-adding a "top-level" widget (frame, dialog,...), because by default wxGlade
-assumes they are custom classes.
-</p>
-    
-<h3>5. Adding and removing notebook pages</h3>
-    
-<p>This operation is almost identical to the handling of statusbar fields: the
-<tt>Tabs</tt> property of our notebook controls the number of pages (tabs) and
-their labels (don't forget to "Apply" the changes!).<br/>
- </p>
-    
-<h3>6. Addition of some controls</h3>
-    
-<p>We have now reached the last part of this short tutorial: the addition
-of some controls to the first page of our notebook. In particular, we'll add
-a text area and two buttons: these operations will allow us to show the layout
-options of the objects inside sizers, and the cut &amp;
-paste support of wxGlade. <br/>
- </p>
-    
-<p>As said before, the first thing to do in order to add widgets to a container
-is to set its sizer.  Let's start with the addition of a sizer to the first
-page of the notebook, which is where we are going to put our controls, then: to
-do so, click on the BoxSizer button (<img src="img/box_sizer_button.gif"
-align="middle" width="31" height="31" border="0" alt="" />) on the palette, and
-then move the mouse inside the page. Again, the pointer is now a cross, and so
-we can drop the sizer on our page: if everything is OK, you should see a dialog
-asking for some features of the sizer to add. We have to change the default
-values, since we want a 2-slots vertical box, so set to Vertical the
-orientation and to 2 the number of slots. None of the two actions is mandatory,
-since both the orientation (or better, the type) of the sizer and the number of
-slots can be changed in any moment: the former by changing the value of the
-<tt>Class</tt> property, the latter from the popup menu you can activate with a
-right-click on the "handle" button of the sizer or on the corresponding node of
-the tree of widgets. (As a side note, this same procedure can be used to show
-the menu of almost every object handled by wxGlade).<br/></p>
-
-<p><font size="4"><b>6.1 Text area</b></font></p>
-    
-<p>Let's click on the TextCtrl button (<img src="img/text_ctrl_button.gif"
- align="middle" width="30" height="30" alt="" />) and insert the text area in
- the first slot of our sizer. </p>
-    
-<p>The default dimension isn't right, as we want to display a long and
-multiline text: to edit the layout, let's select the <tt>Layout</tt> tab of the
-TextCtrl's properties, and set to 1 the value of <tt>Option</tt> and to
-<tt>wxEXPAND</tt> that of <tt>Alignment</tt>.  To make the text area multiline,
-let's check the
-<tt>wxTE_MULTILINE</tt> checkbox of the <tt>Style</tt> property (in the
-<tt>Widget</tt> tab): as with almost every <tt>Style</tt> property in wxGlade,
-such change has no visible effect, but it changes the generated code.</p>
-    
-<p><b><font size="+1">6.2 Buttons</font></b><br/></p>
-   
-<p>Now replace the second slot with a horizontal Sizer which will contain our
-two buttons: set the number of slots to 3, to leave room for a spacer to insert
-between the two buttons (so as they won't appear too close to each other).<br/>
- </p>
- 
-<p>Replace then the first slot with a new button, as usually with the
-approprate button (<img src="img/button_button.gif" align="middle" width="30"
-height="30" alt="" />).<br/> To add the second button, instead, we will use the
-clipboard: let's click on the <tt>Copy</tt> item of the popup menu of the first
-button (or select it and press <tt>Ctrl+C</tt>), then move the mouse inside the
-third slot, and finally click on the <tt>Paste</tt> item of the popup menu of
-the slot to paste the copied widget (again, you can alternatively left-click on
-the empty slot and then press <tt>Ctrl+V</tt>, or if you have a 3-buttons mouse
-just click on the empty slot with the middle button).<br/>
- </p>
-
-<p> Now add a spacer (<img src="img/spacer_button.gif" align="middle"
- width="30" height="30" alt="" />) of the appropriate dimension between the
- buttons, to keep them at a reasonable distance.<br/></p>
-     
-<p>Finally, the last operation we have to do is to edit the layout of the
-horizontal Sizer that contains the buttons: set to 0 the value of "Option",
-uncheck <tt>wxEXPAND</tt> from <tt>Aligment</tt> and check
-<tt>wxALIGN_CENTER_HORIZONTAL</tt>, and set a border (<tt>4</tt>) on the top
-(<tt>wxTOP</tt>) and bottom (<tt>wxBOTTOM</tt>), to keep the buttons separate
-from the text area and the notebook lower border. <br/>
- </p>
- 
-<p><b>NOTE on widgets' ids: </b>You certainly know that every wxWindows widget
-has an id, used among other things for event handling, so in wxGlade each
-widget has an <tt>Id</tt> property. This may have the following values:<br/>
- </p>
- 
-<ul>
-   
-   <li><u>a number</u>: this will be the integer which will be passed to the
-   constructor of the widget</li>
-
-   <li><u>a name</u>: in this case wxGlade assumes it is the name of an id
-   declared somewhere in the program, and uses it. For example, you can set the
-   value of <tt>Id</tt> to <tt>wxID_OK</tt> for the default OK button of a
-   dialog</li>
-   
-   <li><u>a pair name=value</u>: in this case before the constructor of the
-   widget the declaration of the variable is generated. For example you could
-   write <tt>TEST_BUTTON=wxNewId()</tt> to generate the id of a button called
-   "Test" (note for C++ code generation: since ids are stored in an anonymous
-   enum, only constant initializers are allowed, so the assigment above is not
-   legal - but you can use, for instance, <tt>TEST_BUTTON=100</tt>) </li>
-
-   <li><u>a pair name=?</u>: this special form means that the code will contain
-   the definition of a varable "name" with an auto-assigned unique id. For
-   python output, this is the same as "name=wxNewId()", while for C++ output,
-   it's the equivalent of "name=1000" (of course, 1000 is just an example
-   here). In this latter case, wxGlade will start generating ids exacly from
-   1000, so you can safely use ids below that for your own purposes.</li>
- 
-</ul>
- 
-<p> </p>
-    
-<h3>7. Last changes</h3>
-
- Finally, suppose you are not happy with the current layout, and you decide
-it's better to put the buttons above the text area and not below as they are:
-so what can we do? Simple: let's change the value of the <tt>Pos</tt> property
-of the sizer which contains the buttons, and set its value to <tt>0</tt>, to
-move the sizer before the text area: easy, isn't it?  <br/> <br/> Now our
-window is complete: all we have to do is set a reasonable initial size for
-it. To do this, resize the frame until you find a good size, and then activate
-the <tt>Size</tt> property.<br/>
-    
-<h3>8. Code generation</h3>
-
- Before we proceed with the code generation, let's save our work, selecting the
-  <tt>Save As...</tt> item of the <tt>File</tt> menu of the main wxGlade
-  window: this operation is not strictly necessary, but it's a good practice to
-  not risk to loose the work, in particular until wxGlade will reach a certain
-  maturity :-)<br/>
-   
-<p>Now we can go on with the code generation: select the <tt>Application</tt>
-item on the tree of widgets (it is the root) to make the <tt>Application</tt>
-tab appear on the properties window. This panel contains the options for the
-code generation:<br/>
- </p>
-    
-<ul>
-  <li><u>Name</u>: name to give to the wxApp object which represents the application:
-if this property and the next one (Class) are not active, there will be no
-code for the application startup, but only that of the various  widgets<br/>
- </li>
-   <li><u>Class</u>: name of the class derived from wxApp which represents
-the application: if this property is not active but the previous one (Name)
-is, the application object will be an instance of wxPySimpleApp (this applies
-to Python output only - for C++ output this property must be active if you
-want the startup code to be generated)</li>
-<li><u>Encoding</u>: encoding used to store the saved .wxg file (also for XRC);</li>
-  <li><u>Enable gettext support</u>: if checked, all the strings in the generated sources will be wrapped by a "_()", ready for gettext;</li>
-   <li><u>Top window</u>: main window of the application to generate<br/>
- </li>
-   <li><u>Code generation</u>: this controls the kind of output, and lets
-you choose between a single source file containing all the widgets, or a separate
-file for each custom class defined (for C++ output, the single-file mode
-actually generates two files, a ".h" and a ".cpp")<br/>
-  </li>
- <li><u>Language</u>: this lets you choose the language of the generated code:
-at the moment, Python, C++ and XRC, i.e. wxWindows resources xml format. Note
-that in this last case some of the properties of the application are ignored
-(Name, Class, Top window), and some are disallowed (you cannot set Code generation
-to multi-files)<br/>
-  </li>
-  <li><u>Overwrite existing sources</u>: if checked, the code will be completely re-generated instead of updated (see the first note below for details);</li>
-    <li><u>Output path</u>: in single-file mode, name of the output file;
-in   multi-file mode, path to the output directory: in this last case, every
-custom class will be placed in a file with the name of such class, except for
-the (eventual) wxApp class, which is placed in a file whose name is given by
-the Name property described above. For example, for our notebook, we'll have 
-<tt>MyFrame.py</tt>, <tt>MyNotebook.py</tt> and <tt>app.py</tt> (assuming
-you're generating Python code, of course).<br/>
-  </li>
-   <li><u>Generate code</u>: button which starts the code generation</li>
- 
-</ul>
-    
-<p>After the selection of the various options as described above, click on the
-<tt>Generate code</tt> button: if everything is OK, after a while a message box
-appears: this says that the operation is over... like this short tutorial
-;-)<br/>
- </p>
-  
-<h3>9. Notes</h3>
-
-<p>This section contains a list of things that you should know about wxGlade
-(known bugs and/or limitations, "hidden" features, tips and tricks, ...) which
-I wasn't able to fit in the tutorial <!-- (I am definitely a bad writer :) -->. The list
-is loosely sorted by importance.
-</p>
-
-<ul>
-  <li>When you generate Python or C++ code, if the output file already exists,
-  wxGlade by default doesn't overwrite all its contents, but only the lines
-  inside a 
-  <pre>
-  # begin wxGlade: ...
-  # end wxGlade
-  </pre>
-  block. This is a desirable feature in most occasions,
-  since it lets you add your code to the file without worrying of losing it
-  when re-generating the GUI code, but there are situations in which a little
-  attention is required. In particular, you should be aware of the following:
-  <ul>
-    <li>If the output file contains a class whose name is the same as that of
-    one of your custom classes, but its body has no wxGlade block, the code for
-    that class is not generated (a warning appears on the shell);</li>
-    <li>If you rename one of your custom classes, you should rename also its
-    code in the output file (and also all the occurrences of such name in the
-    wxGlade tags), because wxGlade has no way of determining the previous name
-    of such class, and will treat it like a brand new one (this means that it
-    will generate a new class declaration instead of updating the old one). Let
-    me explain this with an example:<br/>
-    Suppose you have a class called <tt>MyFrame</tt>, and the corresponding
-    generated file <tt>frame.py</tt>:<br/><pre>
-#!/usr/bin/env python
-# generated by wxGlade 0.2 on Sat Dec 14 15:15:06 2002
-
-from wxPython.wx import *
-
-class MyFrame(wxFrame):
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wxDEFAULT_FRAME_STYLE
-        wxFrame.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame_1")
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        pass
-        # end wxGlade
-
-# end of class MyFrame
-</pre>
-   Now suppose you rename <tt>MyFrame</tt> to <tt>RenamedFrame</tt>. If you
-   don't care to fix <tt>frame.py</tt> accordingly, if you re-generate it you
-   will get something like:<br/><pre>
-#!/usr/bin/env python
-# generated by wxGlade 0.2 on Sat Dec 14 15:15:06 2002
-
-from wxPython.wx import *
-
-class RenamedFrame(wxFrame):
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: RenamedFrame.__init__
-        kwds["style"] = wxDEFAULT_FRAME_STYLE
-        wxFrame.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: RenamedFrame.__set_properties
-        self.SetTitle("frame_1")
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: RenamedFrame.__do_layout
-        pass
-        # end wxGlade
-
-# end of class RenamedFrame
-
-
-class MyFrame(wxFrame):
-    def __init__(self, *args, **kwds):
-        # content of this block not found: did you rename this class?
-        pass
-
-    def __set_properties(self):
-        # content of this block not found: did you rename this class?
-        pass
-
-    def __do_layout(self):
-        # content of this block not found: did you rename this class?
-        pass
-
-# end of class MyFrame
-</pre>
-which is clearly not what you intended.<br/>&nbsp;</li>
-    
-<li>If you remove a custom class from the wxg file, wxGlade won't automatically
-remove it from the source when it is re-generated (this does not apply if there
-is no old version of such source), but it will try to update the parts inside
-wxGlade blocks nonetheless: this means that:
-<ul>
-  <li>If you want to remove the class, you have to do it manually,</li>
-  <li>If you want to keep the class as is, you have to remove the wxGlade tags.</li>
-</ul>
-  </ul>
-
-  <p>As of version 0.3, it is possible to turn off this "update contents"
-  feature, by checking the "Overwrite existing sources" property of the
-  Application: if the property value is <tt>True</tt>, wxGlade will always
-  re-generate the code from scratch (performing the appropriate backups,
-  according to the preferences you can set from
-  <tt>View->Preferences->Other</tt>).</p></li>
-
-  <li>When you add new custom classes to an app, if there is a previous version
-  of the generated code, the definitions of the new classes will be inserted
-  *before* the old ones: this usually is not a problem, but for C++ output
-  there could be occasions in which the generated code won't compile "out of
-  the box", but you'll have to perform some manual adjustments (e.g. add some
-  forward declarations before the new classes).
-  <br/>&nbsp;</li>
-
-  <li>When you add slots to sizers, it may be possible that you don't see
-  such new slots: this happens because the size of the window that contains the
-  sizer is too small, and so new slots are hidden. The solution is to resize
-  the window, so that its layout is recalculated and the new slots are shown.
-  <br/>&nbsp;</li>
-
-  <li>XRC code generation has some differences wrt Python or C++; apart from
-    those already mentioned in section 8, the most important ones are:
-  <ul>
-<!--
-    <li>At the moment there is no support for custom classes, which means that
-    the Class property of widgets is ignored. There's a chance that future
-    versions of wxGlade will support it, though, since XRC itself has something
-    similar (but it seems that at the moment it can be used only by C++
-    progs).</li>
--->
-    <li>Some widgets are not supported at all (e.g. status
-    bar and grid): for them no code will be generated, but instead the XRC output
-    file will contain a comment like this:
-    <pre>&lt;!-- code generator for wxStatusBar objects not available --&gt;
-    </pre></li>
-    <li>Output files are always overwritten, so if you manually edit the XRC
-    file, all the changes you made will be lost when you re-generate it.</li>
-  </ul><br/>&nbsp;
-
-  <li>Starting from version 0.2, there's a special component called
-  <tt>CustomWidget</tt> (<img src="img/custom_widget.gif" align="middle"
-  border="0" alt="" />). This is different from the others because it can be
-  used to include in a wxg file any widget, even if it is not directly
-  supported by wxGlade. The key feature for this is the Arguments property,
-  which has two different meanings: for Python or C++ output, it lets you
-  define the constructor parameters for the object. In this case it has two
-  special parameters, <tt>$parent</tt> and <tt>$id</tt>, which as you can guess
-  by their names are placeholders for the actual parent and id of the
-  object. For XRC output, instead, it lets you specify additional properties of
-  the object. In this case each entry should be in the form
-  <blockquote><tt>name: value</tt></blockquote> (invalid entries will be
-  silently ignored): for each of these lines, the output will contain a
-  <blockquote><tt>&lt;name&gt;value&lt;/name&gt;</tt></blockquote> property of
-  the XRC object.<br/>&nbsp;</li>
-
-  <li>Starting from version 0.2, there's a script called <tt>xrc2wxg.py</tt>
-  shipped with wxGlade. You can use this script to convert an XRC file to
-  a wxGlade resource, so that you can edit it with wxGlade itself. Its usage is
-  straightforward: 
-  <pre>python xrc2wxg.py xrc_file.xrc wxg_file.wxg</pre>
-  (if <tt>wxg_file.wxg</tt> is omitted, it defaults to <tt>xrc_file.wxg</tt>),
-  but there are some limitations you should be aware of:
-  <ul>
-    <li>First of all, it can handle correctly only "wxGlade-friendly" XRC
-    files. This basically means that all windows but the toplevel ones must be
-    inside a sizer (but there are other cases).</li>
-    <li>All the widgets unknown to wxGlade will be replaced by the special
-    <tt>CustomWidget</tt> component.</li>
-    <li>Finally, <tt>xrc2wxg</tt> is very experimental, and so it probably
-    contains many bugs. If you find one of them, please report it (this is
-    valid for wxGlade in general, BTW).<br/>&nbsp;</li>
-  </ul></li>
-
-  <li>You can invoke code generation also from the command line, without
-  starting the GUI. For the details, type
-  <pre>python wxglade.py -h</pre> at your shell's prompt.</li>
-</ul>    
-  
-<p>I hope the contents are clear (and my English not too ridicule),
-anyway for questions, comments, critics you can contact the 
-<a href="https://lists.sourceforge.net/lists/listinfo/wxglade-general">
-wxGlade mailing list</a>.<br/></p>
-     
-<p>Alberto Griggio<br/></p>
-
-<!-- CONTENT_END -->
-
-  <br/>
-   <br/>
-<br/>
-</body>
-</html>
diff -Nru wxglade-0.9.6/edit_base.py wxglade-1.0.1/edit_base.py
--- wxglade-0.9.6/edit_base.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/edit_base.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,932 @@
+
+import wx
+import new_properties as np
+import common, misc, compat, clipboard, config
+
+MANAGED_PROPERTIES  = ["span", "proportion", "border", "flag"]
+
+if config.debugging:
+    class _UniqueList(list):
+        def append(self, obj):
+            if obj in self and obj is not None:
+                raise AssertionError("Element already in list")
+            list.append(self, obj)
+        def insert(self, index, obj):
+            if obj in self and obj is not None:
+                raise AssertionError("Element already in list")
+            list.insert(self, index, obj)
+        def __setitem__(self, index, obj):
+            if obj in self and obj is not None:
+                if obj is self[index]: return
+                raise AssertionError("Element already in list")
+            list.__setitem__(self, index, obj)
+else:
+    _UniqueList = list
+
+
+class EditBase(np.PropertyOwner):
+    IS_TOPLEVEL = IS_SLOT = IS_SIZER = IS_WINDOW = IS_ROOT = IS_TOPLEVEL_WINDOW = IS_CONTAINER = False
+    IS_CLASS = None  # dynamically set during code generation if a class is generated for this item
+    # usually this one is fixed, but EditPanel/EditToplevelPanel will overwrite it depending on the "scrollable" property
+    WX_CLASS = None # needs to be defined in every derived class; e.g. "wxFrame", "wxBoxSizer", "TopLevelPanel"
+    WX_CLASSES = None  # used if WX_CLASS can be changed dynamically
+    WXG_BASE = None # usually None, but if defined, it will be written to the wxg file instead of the editor class name
+    IS_NAMED = True  # default, only False for Spacer
+    #CHILDREN = 1  # 0 or a fixed number or None for e.g. a sizer with a variable number of children; -1 for 0 or 1
+    ATT_CHILDREN = None
+    TREE_ICON = None  # defaults to editor class name
+
+    def __init__(self, name, parent, index):
+        assert self.WX_CLASS
+        np.PropertyOwner.__init__(self)
+
+        self.widget = None          # this is the reference to the actual wxWindow widget, created when required
+        self.item = None            # the TreeCtrl item
+
+        # initialise instance properties
+        self.name = np.NameProperty(name)
+
+        # initialise structure
+        self.parent = parent
+        if self.CHILDREN is None:
+            # variable number of children
+            self.children = _UniqueList([])
+        elif self.CHILDREN:
+            # fixed number of children
+            self.children = _UniqueList([None]*self.CHILDREN)
+        else:
+            # no children
+            self.children = None
+        if isinstance(index, str):
+            setattr(self.parent, index, self)
+            self.attribute_name = index
+        else:
+            self.parent.add_item(self, index)
+
+        # the toplevel parent keeps track of the names ( see next two methods ...contained_name() )
+        if self.IS_TOPLEVEL:
+            # either derived from edit_windows.TopLevelBase or a toplevel Menu/ToolBar where IS_TOPLEVEL is set True
+            self.names = set([self.name])
+            self._NUMBERS = {}  # for finding new names
+        elif self.IS_NAMED:
+            self.toplevel_parent.track_contained_name( new_name=name )
+
+    # manage names of contained elements ###############################################################################
+    # actually, this might be too strict if contained elements are their own classes
+    def get_next_contained_name(self, fmt, exclude=None):
+        # get a name that is not yet used for one of the children inside
+        # will only be used for IS_TOPLEVEL==True; currently only by TopLevelBase; in future maybe for toolbars as well
+        number = self._NUMBERS.get(fmt, 1)
+        while True:
+            name = fmt % number
+            if not name in self.names and (not exclude or not name in exclude):
+                self._NUMBERS[fmt] = number
+                return name
+            number += 1
+
+    def track_contained_name(self, old_name=None, new_name=None):
+        # only for named elements (IS_NAMED==True)
+        #  to remove: new_name=None
+        #  to add:    old_name=None
+        # EditDialog also uses this to track names for "affirmative" and "escape" properties
+        #print("track_contained_name", old_name,new_name, self.names)
+        if old_name is not None:
+            try:
+                self.names.remove( old_name )
+            except KeyError:
+                pass
+        if new_name is not None: self.names.add( new_name )
+
+    # tree navigation (parent and children) ############################################################################
+    @property
+    def toplevel_parent(self):
+        # go up to parent until that's parent IS_ROOT
+        item = self
+        parent = item.parent
+        while not parent.IS_ROOT:
+            item = parent
+            parent = item.parent
+        return item
+
+    @property
+    def parent_window(self):
+        # go up to parent until it is no sizer
+        item = self.parent
+        while True:
+            if item.IS_WINDOW: return item
+            item = item.parent
+            if item is None: return None
+
+    @property
+    def toplevel_parent_window(self):
+        # go up to parent until IS_TOPLEVEL is True
+        item = self.parent
+        while True:
+            if item.IS_TOPLEVEL: return item
+            item = item.parent
+
+    #@property
+    #def class_object(self):
+        ## used for code generation: the object for which a class code is generated
+        #item = self
+        #parent = item.parent
+        #while parent is not None:
+            #if not item.IS_SIZER and item.IS_CLASS: return item
+            #item = parent
+            #parent = item.parent
+        #return None
+
+    @property
+    def parent_class_object(self):
+        # same as before, but start with parent
+        # used only for XRC code generation, so IS_CLASS is set
+        item = self.parent
+        parent = item.parent
+        while parent is not None:
+            if not item.IS_SIZER and item.IS_CLASS: return item
+            item = parent
+            parent = item.parent
+        return None
+
+    @property
+    def sizer(self):
+        # return the containing sizer or None
+        if self.parent.IS_SIZER: return self.parent
+        return None
+
+    @property
+    def top_sizer(self):
+        # return the top containing sizer or None
+        if not self.parent.IS_SIZER:
+            if self.IS_SIZER: return self
+            return None
+        item = self.parent
+        while item.parent.IS_SIZER:
+            item = item.parent
+        return item
+
+
+    def get_all_children(self):
+        # this always returns a copy, as it might be used by recursive_remove
+        ret = []
+        if self.ATT_CHILDREN:
+            for att in self.ATT_CHILDREN or []:
+                child = getattr(self, att)
+                if child is not None: ret.append(child)
+        ret.extend(self.children or [])
+        return ret
+
+    def _get_child(self, index):
+        if index is None and self.children:
+            return self.children[0]
+        if isinstance(index, str) and index in self.ATT_CHILDREN:
+            return getattr(self, index)
+        if self.children and index<=len(self.children):
+            return self.children[index]
+        return self
+
+    def _get_child_pos(self, child):
+        # calculate pos including named attributes; this is the position in the tree view
+        pos = 0
+        if self.ATT_CHILDREN:
+            for att in self.ATT_CHILDREN or []:
+                c = getattr(self, att)
+                if c is not None:
+                    if child is c: return pos
+                    pos += 1
+        return pos + self.children.index(child)
+    
+    def find_children(self, name=None, wx_class=None):
+        ret = []
+        for child in self.get_all_children():
+            if not child: continue
+            ret += child.find_children(name, wx_class)
+            if name is not None and child.name!=name: continue
+            if wx_class is not None and child.WX_CLASS!=wx_class: continue
+            ret.append(child)
+        return ret
+
+    ####################################################################################################################
+    @property
+    def index(self):
+        # index or attribute name
+        attribute_name = getattr(self, "attribute_name", None)
+        if attribute_name is not None: return attribute_name
+        return self.parent.children.index(self)
+
+    def add_item(self, child, index=None):
+        if index is None:
+            # happens during loading or pasting
+            if self.CHILDREN is None:
+                # variable number of children
+                self.children.append(child)
+                return
+            # fixed number of children; fill first free position (a None or a Slot)
+            assert self.CHILDREN
+            if None in self.children:
+                index = self.children.index(None)
+            elif self.CHILDREN in (-1,1):
+                index = 0
+
+        if len(self.children)<=index:
+            self.children += [None]*(index - len(self.children) + 1)
+        if self.children[index] is not None:
+            self.children[index].recursive_remove(0, keep_slot=True)
+        self.children[index] = child
+
+    def insert_item(self, child, index):
+        # for now only for child=None as placeholder; used by notebook
+        self.children.insert(index, child)
+
+    def remove_item(self, child, level, keep_slot=False):
+        "Removes child from self and adjust pos of following items"
+        if not child: return
+        if child in self.children:
+            index = self.children.index(child)
+            if keep_slot:
+                self.children[index] = None
+            else:
+                del self.children[index]
+            return
+        if hasattr(child, "attribute_name"):
+            setattr(self, child.attribute_name, None)
+            return
+        raise ValueError("Internal error")
+
+    def has_ancestor(self, editor):
+        "Returns True if editor is parent or parents parent ..."
+        parent = self.parent
+        if parent is None: return False
+        while True:
+            if editor is parent: return True
+            if parent.parent is None: return False
+            parent = parent.parent
+    
+    def get_path(self):
+        """returns a list of widget names, from the toplevel to the selected one
+        Example: ['frame_1', 'sizer_1', 'panel_1', 'sizer_2', 'button_1']
+                 if button_1 is the currently selected widget"""
+        ret = []
+        w = self
+        while w:
+            if w.IS_SLOT:
+                ret.append("SLOT %d"%w.index)
+            else:
+                ret.append(w.name)
+            w = w.parent
+        ret.reverse()
+        return "/".join(ret)
+
+    # property handling ################################################################################################
+    @staticmethod
+    def MOVE_PROPERTY(PROPERTIES, move_property, after_property):
+        "move a property to another position, right behind after_property"
+        PROPERTIES.remove( move_property )
+        PROPERTIES.insert( PROPERTIES.index(after_property)+1, move_property )
+
+    def _properties_changed(self, modified, actions):
+        if modified and "name" in modified and self.properties["name"].previous_value is not None:
+            if config.debugging or config.testing:
+                assert self.IS_NAMED
+            old_name = self.properties["name"].previous_value or None
+            self.toplevel_parent.track_contained_name(old_name, self.name)
+
+        if modified and ("name" in modified or "label" in modified or "title" in modified):
+            actions.add("label")
+
+    def properties_changed(self, modified):
+        actions = np.PropertyOwner.properties_changed(self, modified)
+
+        if common.app_tree is not None and ("label" in actions or "image" in actions):
+            common.app_tree.refresh(self, refresh_label=("label" in actions), refresh_image=("image" in actions))
+
+        return actions
+
+    # widget creation and destruction ##################################################################################
+    def create(self):
+        # entry point to create widget including all children
+        self.recursive_create_widgets(level=0)
+        self.layout()
+
+    def recursive_create_widgets(self, level):
+        self.create_widget()
+        self.finish_widget_creation(level)
+        for child in self.get_all_children():
+            child.recursive_create_widgets(level+1)
+        self.child_widgets_created(level)  # if level==0, only one of the child widgets was created
+        self.parent.child_widget_created(self, level)
+
+    def layout(self):
+        # called once after all widgets incl. children were created or e.g. layout property modified
+        # before 2020-08-10 the ClipboardXmlWidgetBuilder.endElement() had code with
+        #  SafeYield, layout, Refresh, GetTopLevelParent().SendSizeEvent()
+        self.widget.Layout()
+        if self.IS_TOPLEVEL: return
+        if self.IS_WINDOW: self.widget.SendSizeEvent()
+        parent_window = self.parent_window
+        parent_window.widget.SendSizeEvent()
+        if hasattr(self.widget, "SendSizeEvent") and wx.Platform == '__WXGTK__':
+            # following is required for gtk when e.g. pasting a button or label with non-standard font
+            # on Windows or Mac Os it's not required
+            wx.SafeYield()
+            compat.wxWindow_SendSizeEventToParent(self.widget)
+        # following is required when e.g. adding a slot or widget to a sizer on a panel in a sizer
+        compat.wxWindow_SendSizeEventToParent(self.parent_window.widget)
+
+    # actual widget creation
+    def create_widget(self):
+        "Initializes self.widget and shows it"
+        raise NotImplementedError
+
+    def finish_widget_creation(self, level):
+        "Binds the popup menu handler and connects some event handlers to self.widgets; set tooltip string"
+        if not self.widget: return
+        self.widget.Bind(wx.EVT_RIGHT_DOWN, self.popup_menu)
+        if self.WX_CLASS in ("wxStatusBar",): return
+        compat.SetToolTip(self.widget, self._get_tooltip_string())
+
+    # callbacks when children were created
+    def child_widget_created(self, child, level):
+        # called after child's children were also created; implemented for notebook, splitter, sizers
+        pass
+    
+    def child_widgets_created(self, level):
+        # implemented for notebook, splitter, sizers?
+        pass
+
+    # actual widget destruction, called from recursive_remove
+    def destroy_widget(self, level, later=True):
+        # just destroy the widget; all bookkeeping / data structure update is done in recursive_remove
+        # level is 0 for toplevel or when the user just deletes this one
+        if not self.widget: return
+        if later:
+            compat.DestroyLater(self.widget)
+        else:
+            self.widget.Destroy()
+        self.widget = None
+
+    def destroying_child_widget(self, child, index):
+        # called before a child widget is destroyed; e.g. used by splitter to unsplit
+        # child has been removed from self.children already,
+        #  except when a widget is re-created or a slot is just set to overlapped
+        # index can be an index or an attribute name
+        pass
+
+    def destroyed_child_widget(self):
+        pass
+
+    ####################################################################################################################
+    def recursive_remove(self, level, keep_slot=False):
+        "recursively remove children and then self from parent; delete widget; remove from tree and do bookkeeping"
+        # this is not a GUI entry point, see remove() for this!
+        index = self.index
+
+        # recursively remove children
+        if self.children:
+            for child in self.get_all_children():
+                if child is None: continue  # this might happen during loading when a widget type is not supported
+                child.recursive_remove(level+1)
+
+        self.parent.remove_item(self, level, keep_slot)
+
+        if level==0 and self.widget:
+            self.parent.destroying_child_widget(self, index)
+            self.destroy_widget(level)
+            self.parent.destroyed_child_widget()
+
+        # remove from Tree (rebuild_tree to be called separately)
+        if misc.focused_widget is self: misc.focused_widget = None
+        if common.app_tree is not None:
+            common.app_tree.remove(self)  # remove mutual reference from widget to/from Tree item
+
+        # bookkeeping
+        if not self.IS_TOPLEVEL and self.IS_NAMED and self.name:
+            self.toplevel_parent.track_contained_name( self.name )
+
+    def remove(self, focus=True):
+        # entry point from GUI or script
+        common.root.saved = False   # update the status of the app
+        self.recursive_remove(level=0)
+        misc.rebuild_tree(self.parent, recursive=False, focus=focus)
+
+    # XML generation ###################################################################################################
+    def get_editor_name(self):
+        # the panel classes will return something else here, depending on self.scrollable
+        return self.WXG_BASE or self.__class__.__name__
+    def write(self, output, tabs):
+        "Writes the xml code for the widget to the given output file"
+        # write object tag, including class, name, base
+        classname = self.get_editor_name()
+        # to disable custom class code generation (for panels...)
+        outer_tabs = u'    ' * tabs
+        instance_class = ''
+        if "class" in self.properties:
+            klass = self.get_prop_value("class", default=self.WX_CLASS)
+            if self.check_prop_truth("instance_class"):
+                instance_class = " " + common.format_xml_attrs(instance_class=self.instance_class)
+        else:
+            klass = self.get_prop_value("instance_class", default=self.WX_CLASS)
+        output.append(u'%s<object %s %s %s%s>\n' % ( outer_tabs,
+                                                     common.format_xml_attrs(**{'class': klass}),
+                                                     common.format_xml_attrs(name=self.name),
+                                                     common.format_xml_attrs(base=classname),
+                                                     instance_class) )
+
+        if config.debugging and getattr(self, "_restore_properties", None):
+            raise ValueError("properties not restored")
+        self.restore_properties()
+        # write properties, but without name and class
+        # XXX be 100% compatible to 0.7.2, where option is written into the object; remove later
+        properties = self.get_properties(without=set(MANAGED_PROPERTIES))
+        for prop in properties:
+            prop.write(output, tabs+1)
+
+        if self.IS_SIZER:
+            for child in self.children or []:
+                if not child.IS_SLOT:
+                    inner_xml = []
+
+                    for name in MANAGED_PROPERTIES:
+                        name = child.properties[name]
+                        if name is not None:
+                            name.write(inner_xml, tabs+2)
+
+                    child.write(inner_xml, tabs+2)
+                    stmt = common.format_xml_tag( u'object', inner_xml, tabs+1,
+                                                  is_xml=True, **{'class': 'sizeritem'} )
+                    output.extend(stmt)
+                else:
+                    child.write(output, tabs+1)
+        elif self.children is not None or self.ATT_CHILDREN is not None:
+            for child in self.get_all_children():
+                assert not config.debugging or child is not None
+                child.write(output, tabs+1)
+        output.append(u'%s</object>\n' % outer_tabs)
+
+    # XML loading and slot handling ####################################################################################
+    def _add_slots(self, max_index=None):
+        "replace None with Slot"
+        for index, child in enumerate(self.children):
+            if child is None:
+                if max_index is not None and index>max_index: continue
+                Slot(self, index)
+
+    def on_load(self, child=None):
+        "called from XML parser, right after the widget is loaded; children have been loaded already"
+        # when a child has been pasted in, it's also called, with argument child
+        if self.CHILDREN != 0:
+            self._add_slots()
+
+    def free_slot(self, index, force_layout=True):
+        "Replaces the element at index with an empty slot"
+        # called from ManagedBase context menu when removing an item
+        slot = self._free_slot(index, force_layout)
+        misc.rebuild_tree(slot)
+
+    def _free_slot(self, index, force_layout=True):
+        #with self.toplevel_parent.frozen():  # this does not work on mac os: when deleting a panel notebook page, it will remain black
+        slot = Slot(self, index)
+        if self.widget: slot.create()  # create the actual SizerSlot as wx.Window with hatched background
+        return slot
+
+    # for tree and help display ########################################################################################
+    def _get_tree_label(self):
+        # get a label for node
+        s = self.name
+        if self.WX_CLASS=="CustomWidget":
+            s += ' (%s)' % self.instance_class
+        elif self.check_prop("class"):
+            s += ' (%s)' % self.klass
+            if getattr(self, "has_title", None):
+                # include title
+                s += ': "%s"'%self.title
+        elif self.check_prop("stockitem"):
+            s = "%s: %s"%(s, self.stockitem)
+        elif self.check_prop("label"):
+            # include label of control
+            label = self.label
+            label = label.replace("\n","\\n").replace("\t","\\t")
+            if '"' in label:
+                if len(label)>36:
+                    s += ": '%s..."%(label[:30])
+                else:
+                    s += ": '%s'"%label
+            else:
+                if len(label)>24:
+                    s += ': "%s...'%(label[:30])
+                else:
+                    s += ': "%s"'%label
+        elif getattr(self, "has_title", None):
+            # include title
+            s += ': "%s"'%self.title
+        elif self.parent.WX_CLASS=="wxNotebook":
+            # notebook pages: include page title: "[title] name"
+            notebook = self.parent
+            if self in notebook.children:
+                title = notebook.tabs[notebook.children.index(self)][0]
+                s = '[%s] %s'%(title, s)
+        return s
+
+    def _get_tree_image(self):
+        "Get an image name for tree display"
+        return self.TREE_ICON or self.__class__.__name__
+
+    def _label_editable(self):
+        # returns True if the label can be edited in the Tree ctrl
+        if not "name" in self.properties: return False
+        if not "label" in self.properties: return True
+        label = self.label
+        # no editing in case of special characters
+        if "\n" in label or "\t" in label or "'" in label or '"' in label: return False
+        if len(label)>24: return False
+        return True
+
+    def _get_tooltip_string(self):
+        # get tooltip string: first (optional) part from parent, second from ourself
+        # used as tooltip for the widget in the Design window and also for the status bar of the Palette
+        tooltip = []
+        if self.parent.children and self in self.parent.children:
+            tooltip.append( self.parent._get_parent_tooltip(self.index) )
+        tooltip.append( self._get_tooltip() )
+        return "\n".join(s for s in tooltip if s)
+
+    def _get_parent_tooltip(self, index):
+        # called for a child; e.g. Splitter pane may return "Left spliter pane:" for pos=0
+        return None
+
+    def _get_tooltip(self):
+        return None
+
+
+class Slot(EditBase):
+    "A window to represent an empty slot, e.g. single slot of a Frame or a page of a Notebook"
+    PROPERTIES = ["Slot", "info"]
+    IS_TOPLEVEL = IS_SIZER = IS_WINDOW = False
+    IS_SLOT = True
+    IS_NAMED = False
+    CHILDREN = 0
+
+    def __init__(self, parent, index, label=None):
+        # XXX unify with EditBase.__init__ ?
+        assert isinstance(index, int)
+        assert not parent.IS_SLOT
+        np.PropertyOwner.__init__(self)
+        self.klass = self.classname = "slot"
+        self.label = label
+
+        # initialise instance properties
+        self.widget = None          # Reference to the widget resembling the slot (a wx.Window)
+        self.name = "SLOT"
+        self.overlapped = False  # for spanning in GridBagSizer
+        self.item = None
+
+        # initialise structure
+        self.parent = parent
+        self.children = None
+        self.parent.add_item(self, index)
+
+        # display some help
+        self.info = np.DisplayProperty(self._get_tooltip())
+
+        # the following are just set to use the same Add call as with widgets
+        self.proportion = 1
+        self.span = (1,1)
+        self.flag = wx.EXPAND
+        self.border = 0
+
+    def update_view(self, selected):
+        # we can ignore selected here, as the repainting only takes place later
+        if self.widget:
+            self.widget.Refresh()
+
+    def create_widget(self):
+        if self.overlapped and self.parent._IS_GRIDBAG: return
+        style = wx.FULL_REPAINT_ON_RESIZE
+        if self.parent.CHILDREN in (-1, 1):  # e.g. Panel in a Frame
+            size = self.parent.widget.GetClientSize()
+        else:
+            size = (20, 20)
+        self.widget = wx.Window(self.parent_window.widget, -1, size=size, style=style)
+        self.widget.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
+        #self.widget.SetAutoLayout(True)
+        self.widget.Bind(wx.EVT_PAINT, self.on_paint)
+        self.widget.Bind(wx.EVT_ERASE_BACKGROUND, self.on_erase_background)
+        self.widget.Bind(wx.EVT_RIGHT_DOWN, self.popup_menu)
+        self.widget.Bind(wx.EVT_LEFT_DOWN, self.on_drop_widget)
+        self.widget.Bind(wx.EVT_MIDDLE_DOWN, misc.exec_after(self.on_select_and_paste))
+        self.widget.Bind(wx.EVT_ENTER_WINDOW, self.on_enter)
+        self.widget.Bind(wx.EVT_LEAVE_WINDOW, self.on_leave)
+        #self.widget.Bind(wx.EVT_CHAR_HOOK, misc.on_key_down_event)  # catch cursor keys   XXX still required?
+
+    def recursive_create_widgets(self, level):
+        if self.overlapped: return
+        self.create_widget()
+        self.finish_widget_creation(level)
+        self.parent.child_widget_created(self, level)
+
+    def is_visible(self):
+        return False
+
+    def on_enter(self, event):
+        # hack. definitely. but...
+        misc.currently_under_mouse = self.widget
+        # set cursor
+        if common.adding_widget:
+            if self.check_drop_compatibility()[0]:
+                self.widget.SetCursor(wx.CROSS_CURSOR)
+            else:
+                self.widget.SetCursor(wx.StockCursor(wx.CURSOR_NO_ENTRY))
+        else:
+            self.widget.SetCursor(wx.STANDARD_CURSOR)
+        event.Skip()
+
+    def on_leave(self, event):
+        # currently_under_mouse is used to restore the normal cursor, if the
+        # user cancelled the addition of a widget and the cursor is over this slot
+        misc.currently_under_mouse = None
+        event.Skip()
+
+    def on_paint(self, event):
+        "Handle paint request and draw hatched lines onto the window"
+        #if not self.sizer: return  # in deletion
+        dc = wx.PaintDC(self.widget)
+        self._draw_background(dc)
+
+    def on_erase_background(self, event):
+        dc = event.GetDC()
+        if not dc:
+            dc = wx.ClientDC(self)
+            rect = self.widget.GetUpdateRegion().GetBox()
+            dc.SetClippingRect(rect)
+        self._draw_background(dc, clear=False)
+
+    def _draw_background(self, dc, clear=True):
+        "draw the hatches on device context dc (red if selected)"
+        size = self.widget.GetSize()
+        small = size[0]<10 or size[1]<10
+        focused = misc.focused_widget is self
+        if clear:
+            if small and focused:
+                dc.SetBackground(wx.Brush(wx.BLUE))
+            else:
+                dc.SetBackground(wx.Brush(wx.LIGHT_GREY))
+            dc.Clear()
+        if small and focused:
+            color = wx.WHITE
+        elif small or not focused:
+            color = wx.BLACK
+        else:
+            color = wx.BLUE
+
+        if focused:
+            hatch = compat.BRUSHSTYLE_CROSSDIAG_HATCH
+        elif not self.parent.IS_SIZER:
+            hatch = compat.BRUSHSTYLE_FDIAGONAL_HATCH
+        else:
+            if not "cols" in self.parent.PROPERTIES:  # horizontal/vertical sizer or grid sizer?
+                pos = self.index
+            else:
+                pos = sum( self.sizer._get_row_col(self.index) )
+            hatch = compat.BRUSHSTYLE_FDIAGONAL_HATCH  if pos%2 else  compat.BRUSHSTYLE_BDIAGONAL_HATCH
+        brush = wx.Brush(color, hatch)
+        # draw hatched lines in foreground
+        dc.SetBrush(brush)
+        size = self.widget.GetClientSize()
+        dc.DrawRectangle(0, 0, size.width, size.height)
+
+    # context menu #####################################################################################################
+    def popup_menu(self, event, pos=None):
+        event_widget = event.GetEventObject()
+        menu = self._create_popup_menu(widget=event_widget)
+        if pos is None:
+            # convert relative event position to relative widget position
+            event_pos  = event.GetPosition()
+            screen_pos = event_widget.ClientToScreen(event_pos)
+            pos        = event_widget.ScreenToClient(screen_pos)
+        event_widget.PopupMenu(menu, pos)
+        menu.Destroy()
+
+    def _create_popup_menu(self, widget):
+        # menu title
+        if self.parent.IS_SIZER and "cols" in self.parent.properties:
+            rows, cols = self.parent._get_actual_rows_cols()
+            # calculate row and col of our slot
+            row,col = self.parent._get_row_col(self.index)
+            menu = wx.Menu(_("Slot %d/%d"%(row+1,col+1)))
+        elif self.parent.CHILDREN not in (-1,1):
+            menu = wx.Menu(_("Slot %d"%self.index))
+        else:
+            menu = wx.Menu(_("Slot"))
+
+        # edit: paste
+        i = misc.append_menu_item(menu, -1, _('Paste\tCtrl+V'), wx.ART_PASTE)
+        misc.bind_menu_item_after(widget, i, clipboard.paste, self)
+        if not clipboard.check("widget","sizer"): i.Enable(False)
+        menu.AppendSeparator()
+
+        # slot actions
+        if self.parent.IS_SIZER or self.parent.CHILDREN==-1:
+            if not "cols" in self.parent.properties:
+                i = misc.append_menu_item(menu, -1, _('Remove Slot\tDel'), wx.ART_DELETE)
+                misc.bind_menu_item_after(widget, i, self.remove)
+                if self.parent.IS_SIZER and len(self.parent.children)<=1: i.Enable(False)
+            else:
+                # if inside a grid sizer: allow removal of empty rows/cols
+                # check whether all slots in same row/col are empty
+                row_is_empty = col_is_empty = True
+                for index,child in enumerate(self.parent.children):
+                    child_row, child_col = self.parent._get_row_col(index)
+                    if child_row==row and not child.IS_SLOT:
+                        row_is_empty = False
+                    if child_col==col and not child.IS_SLOT:
+                        col_is_empty = False
+
+                # allow removal of empty row
+                i = misc.append_menu_item(menu, -1, _('Remove Row %d'%(row+1)) )
+                misc.bind_menu_item_after(widget, i, self.parent.remove_row, self.index)
+                if not row_is_empty or rows<=1: i.Enable(False)
+
+                # allow removal of empty col
+                i = misc.append_menu_item(menu, -1, _('Remove Column %d'%(col+1)) )
+                misc.bind_menu_item_after(widget, i, self.parent.remove_col, self.index)
+                if not col_is_empty or cols<=1: i.Enable(False)
+                menu.AppendSeparator()
+
+        if hasattr(self.parent, "_add_parent_popup_menu_items"):
+            self.parent._add_parent_popup_menu_items(menu, self, widget)
+
+        p = self.toplevel_parent_window # misc.get_toplevel_widget(self.sizer)
+        #if p is not None and p.preview_is_visible():
+        if p.preview_is_visible():
+            item = _('Close preview (%s)\tF5') % p.name
+        else:
+            item = _('Preview (%s)\tF5') % p.name
+
+        i = misc.append_menu_item( menu, -1, item )
+        #misc.bind_menu_item_after(widget, i, self.preview_parent)
+        misc.bind_menu_item_after(widget, i, p.preview)
+
+        return menu
+
+    ####################################################################################################################
+    def remove(self):
+        # entry point from GUI
+        i = self.index
+        EditBase.remove(self, focus=False)
+        if i >= len(self.parent.children): i = len(self.parent.children)-1
+        # set focused widget
+        if i>=0:
+            misc.set_focused_widget( self.parent.children[i] )
+        else:
+            misc.set_focused_widget( self.parent )
+
+    def on_drop_widget(self, event, reset=None):
+        """replaces self with a widget. This method is called to add every non-toplevel
+        widget or sizer, and in turn calls the appropriate builder function
+        (found in the 'common.widgets' dict)."""
+        if not common.adding_widget:  # widget focused/selected
+            misc.set_focused_widget(self)
+            if self.widget:
+                self.widget.Refresh()
+                self.widget.SetFocus()
+            return
+        if not self.check_drop_compatibility()[0]:
+            return
+        if self.widget:
+            self.widget.SetCursor(wx.NullCursor)
+        common.adding_window = event and event.GetEventObject().GetTopLevelParent() or None
+        # call the appropriate builder
+        new_widget = common.widgets[common.widget_to_add](self.parent, self.index)
+        if new_widget is None: return
+        misc.rebuild_tree(new_widget)
+        if reset is False: return
+        if event is None or not misc.event_modifier_copy(event):
+            common.adding_widget = common.adding_sizer = False
+            common.widget_to_add = None
+        if event is not None and new_widget.widget:
+            # set focus; required mainly on macOS to receive keys
+            widget = None
+            if new_widget.IS_WINDOW:
+                widget = new_widget.widget
+            elif new_widget.IS_SIZER:
+                widget = new_widget.toplevel_parent_window.widget
+            if hasattr(widget, "SetFocus"):
+                widget.SetFocus()  
+
+    def check_drop_compatibility(self):
+        if common.adding_sizer and self.parent.IS_CONTAINER:
+            return (False, "No sizer can be added here")
+        if self.parent.WX_CLASS in ("wxPanel", "wxScrolledWindow", ):
+            # no containers like splitter or notebook in a panel
+            if common.widget_to_add in ("EditSplitterWindow", "EditNotebook"):
+                return (False, "No container can be added here")
+        return (True,None)
+
+    # clipboard handling ###############################################################################################
+    def check_compatibility(self, widget, typename=None):
+        "check whether widget can be pasted here"
+        if self.parent.CHILDREN == -1:
+            # single or no child: no sizer but a panel or frame
+            return self.parent.check_compatibility(widget, typename)
+        if typename is not None:
+            if typename=="sizer" and self.parent.CHILDREN != 1:
+                return (False, "No sizer can be pasted here")
+            if typename=="window":
+                return (False, "No toplevel object can be pasted here.")
+            return (True,None)
+
+        if widget.IS_TOPLEVEL:
+            return (False, "No toplevel object can be pasted here.")
+        if self.parent.IS_CONTAINER and widget.IS_SIZER:
+            # e.g. a sizer dropped on a splitter window slot; instead, a panel would be required
+            return (False, "No sizer can be pasted here")
+        return (True,None)
+
+    def clipboard_paste(self, clipboard_data):
+        "Insert a widget from the clipboard to the current destination"
+        if self.parent.CHILDREN==-1:
+            # e.g. Panel has special treatment
+            return self.parent.clipboard_paste(clipboard_data)
+        return clipboard._paste(self.parent, self.index, clipboard_data)
+
+    def on_select_and_paste(self, *args):
+        "Middle-click event handler: selects the slot and, if the clipboard is not empty, pastes its content here"
+        misc.focused_widget = self
+        self.widget.SetFocus()
+        clipboard.paste(self)
+    ####################################################################################################################
+
+    def destroy_widget(self, level):
+        if self.widget is None: return
+        if misc.currently_under_mouse is self.widget:
+            misc.currently_under_mouse = None
+
+        self.widget.Hide()
+
+        if wx.VERSION_STRING!="2.8.12.0":
+            # unbind events to prevent new created (and queued) events
+            self.widget.Bind(wx.EVT_PAINT, None)
+            self.widget.Bind(wx.EVT_RIGHT_DOWN, None)
+            self.widget.Bind(wx.EVT_LEFT_DOWN, None)
+            self.widget.Bind(wx.EVT_MIDDLE_DOWN, None)
+            self.widget.Bind(wx.EVT_ENTER_WINDOW, None)
+            self.widget.Bind(wx.EVT_LEAVE_WINDOW, None)
+            self.widget.Bind(wx.EVT_KEY_DOWN, None)
+        compat.DestroyLater(self.widget)
+        self.widget = None
+
+        if misc.focused_widget is self:
+            misc.set_focused_widget(None)
+
+    def write(self, output, tabs):
+        return
+
+    # for tree and help display ########################################################################################
+    def _get_tree_label(self):
+        if self.label: return str(self.label)
+        if self.parent.CHILDREN in (1,-1): return "SLOT"
+        index = self.index
+        if hasattr(self.parent, "_get_slot_label"):
+            return self.parent._get_slot_label(index)
+        if self.parent.IS_SIZER and "cols" in self.parent.properties:
+            # grid sizer: display row/col
+            rows, cols = self.parent._get_actual_rows_cols()
+            row = index // cols + 1  # 1 based at the moment
+            col = index %  cols + 1
+            return "SLOT  %d/%d"%(row, col)
+        return "SLOT %d"%(index)
+
+    def _get_tree_image(self):
+        "Get an image name for tree display"
+        if self.parent.WX_CLASS=="wxSplitterWindow":
+            return 'EditSplitterSlot-%s'%self.parent._get_label(self.index)  # 'Left', 'Right', 'Top', 'Bottom'
+
+        if not self.parent.IS_SIZER: return "EditSlot"
+        name = "EditSizerSlot"
+        if "rows" in self.parent.properties:
+            rows, cols = self.parent._get_actual_rows_cols()
+            row, col = self.parent._get_row_col(self.index, cols)
+            posh = posv = 1  # default
+            if row==0:        posv = 0
+            elif row+1==rows: posv = 2
+            if col==0:        posh = 0
+            elif col+1==cols: posh = 2
+            name = "EditGridSizerSlot-%s%s"%(posh, posv)
+            if self.overlapped: name += "-Disabled"
+        elif "orient" in self.parent.properties:
+            sizer_orient = self.parent.orient
+            if sizer_orient is not None:
+                if sizer_orient==wx.VERTICAL:
+                    name = "EditVerticalSizerSlot"
+                elif sizer_orient==wx.HORIZONTAL:
+                    name = "EditHorizontalSizerSlot"
+        return name
+
+    def _get_tooltip(self):
+        if self.parent.WX_CLASS in ("wxPanel", "wxScrolledWindow"):
+            return "Add a sizer or a control here."
+        if self.parent.WX_CLASS in ("wxFrame",):
+            return "Add a control or container or sizer here, e.g. a panel, a panel plus sizer, a notebook or a sizer."
+        if self.parent.WX_CLASS in ("wxDialog",):
+            return "Add a sizer or a control here."
+        return "Add a control or container here, e.g. a panel, a panel plus sizer or a notebook."
diff -Nru wxglade-0.9.6/edit_sizers/cpp_sizers_codegen.py wxglade-1.0.1/edit_sizers/cpp_sizers_codegen.py
--- wxglade-0.9.6/edit_sizers/cpp_sizers_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/edit_sizers/cpp_sizers_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,12 +2,12 @@
 C++ generator functions for the various wxSizerS
 
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2017 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import common
-from .edit_sizers import BaseSizerBuilder
+from .edit_sizers import BaseSizerBuilder, SlotGenerator
 
 
 class BaseCPPSizerBuilder(BaseSizerBuilder):
@@ -17,52 +17,38 @@
 
     tmpl_SetSizer = '%(parent_ref)sSetSizer(%(sizer_name)s);\n'
     tmpl_Fit = '%(sizer_name)s->Fit(%(parent_widget)s);\n'
+    tmpl_Realize = '%(sizer_name)s->Realize();\n'
     tmpl_SetSizeHints = '%(sizer_name)s->SetSizeHints(%(parent_widget)s);\n'
 
-    #def _get_wparent(self, obj):
-        #if not obj.parent.is_toplevel:
-            #parent = '%s' % obj.parent.name
-        #else:
-            #parent = 'this'
-        #return parent
-
     def _get_wparent(self, obj):
-        while obj.is_sizer:
-            obj = obj.node.parent.widget
-        if not obj.is_toplevel:
-            parent = '%s' % obj.name
+        window = obj.parent_window
+        if not window.IS_CLASS:
+            parent = '%s' % window.name
         else:
             parent = 'this'
         return parent
 
     def _get_parent_ref(self, obj):
-        #while obj.is_sizer:
-        if obj.is_sizer:
-            obj = obj.node.parent.widget
-        #if not obj.parent.is_toplevel:
-        if not obj.is_toplevel:
+        if obj.IS_SIZER:
+            obj = obj.parent
+        if not obj.IS_CLASS:
             parent_ref = '%s->' % obj.parent.name
         else:
             parent_ref = ''
         return parent_ref
 
     def _get_parent_ref(self, obj):
-        #if not obj.parent.is_toplevel:
-        if not obj.node.parent.is_toplevel:
-            #parent_ref = '%s->' % obj.parent.name
-            parent_ref = '%s->' % obj.node.parent.widget.name
+        if not obj.parent.IS_CLASS:
+            parent_ref = '%s->' % obj.parent.name
         else:
             parent_ref = ''
         return parent_ref
 
     def _get_code(self, obj):
         self.tmpl_dict['parent_ref'] = self._get_parent_ref(obj)
-        result = BaseSizerBuilder._get_code(self, obj)
-
         # get_code() for C++ has different return values
-        result = list(result)
-        result.insert(2, [])
-        return result
+        init, final = BaseSizerBuilder._get_code(self, obj)
+        return init, [], final
 
     def _prepare_tmpl_content(self, obj):
         super(BaseCPPSizerBuilder, self)._prepare_tmpl_content(obj)
@@ -106,13 +92,10 @@
     tmpl = '%(assignment)s = new %(klass)s(%(vgap)s, %(hgap)s);\n'
 
 
-import wcodegen
-
-class CppSizerSlotGenerator(wcodegen.CppWidgetCodeWriter):
-    # spacers and empty sizer slots are generally handled by a hack:
-    # The the implementations of add_sizeritem() contains more details.
-    # The code generation code is already implemented in base class.
-    pass
+class CppSizerSlotGenerator(SlotGenerator):
+    def get_code(self, obj):
+        init, final = SlotGenerator.get_code(self, obj)
+        return init, [], final
 
 
 def initialize():
@@ -125,7 +108,7 @@
 
     cppgen = common.code_writers.get("C++")
     if cppgen:
-        awh = cppgen.add_widget_handler
+        awh = cppgen.register_widget_code_generator
         awh('wxBoxSizer', CppBoxSizerBuilder())
         awh('wxWrapSizer', CppWrapSizerBuilder())
         awh('wxStaticBoxSizer', CppStaticBoxSizerBuilder())
@@ -133,4 +116,5 @@
         awh('wxFlexGridSizer', CppFlexGridSizerBuilder())
         awh('wxGridBagSizer', CppGridBagSizerBuilder())
 
-    common.register('C++', "sizerslot", CppSizerSlotGenerator("sizerslot"))
+    #common.register('C++', "sizerslot", CppSizerSlotGenerator("sizerslot"))
+    common.register('C++', "sizerslot", CppSizerSlotGenerator("C++"))
diff -Nru wxglade-0.9.6/edit_sizers/edit_sizers.py wxglade-1.0.1/edit_sizers/edit_sizers.py
--- wxglade-0.9.6/edit_sizers/edit_sizers.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/edit_sizers/edit_sizers.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,26 +3,26 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
-import logging
 import wx
 from wx.lib.buttons import GenButton
 
 import new_properties as np
-from tree import WidgetTree, Node, SlotNode
 import clipboard
 import common, compat, config, misc
+import edit_base
 
 HAVE_WRAP_SIZER = hasattr(wx, "WrapSizer")  # only for 3.0
 
 def _frozen(method):
     "freeze toplevel parent during update"
     def _frozen(sizer, *args):
-        if sizer.window.widget:
+        if config.use_freeze_thaw and sizer.window.widget:
             toplevel = sizer.window.widget.GetTopLevelParent()
+            if config.debugging: print("Freezing", toplevel)
             toplevel.Freeze()
         else:
             toplevel = None
@@ -31,27 +31,90 @@
         finally:
             if toplevel:
                 toplevel.Refresh()
+                if config.debugging: print("Thawing", toplevel)
                 toplevel.Thaw()
     return _frozen
 
 
+class SizerSlot(edit_base.Slot):
+    "A window to represent a slot in a sizer"
+    WX_CLASS ="sizerslot"
+    def __init__(self, parent, index, label=None):
+        edit_base.Slot.__init__(self, parent, index, label)
+
+    def set_overlap(self, overlapped=True, add_to_sizer=True):
+        # interface from GridBagSizer; so self.parent is a sizer
+        if overlapped==self.overlapped: return
+        self.overlapped = overlapped
+        sizer = self.parent
+        if overlapped:
+            if self.widget:
+                self.parent.destroying_child_widget(self, self.index)
+                self.destroy_widget(0)
+        else:
+            if sizer.widget and not self.widget:
+                self.create_widget()
+                if add_to_sizer:
+                    sizer.widget.Add(self.widget, self.index, self.span, wx.EXPAND, self.border)
+        self.properties["info"].set( self._get_tooltip() )
+        common.app_tree.refresh(self)  # XXX indicate overlapped slots
+
+    def check_drop_compatibility(self):
+        if self.overlapped:
+            return (False,"Slot/cell overlapped by another cell")
+        return (True,None)
+
+    # clipboard handling ###############################################################################################
+    def check_compatibility(self, widget, typename=None):
+        "check whether widget can be pasted here"
+        if self.overlapped:
+            return (False,"Slot/cell overlapped by another cell")
+        if typename is not None:
+            if typename=="window":
+                return (False, "No toplevel object can be pasted here.")
+            return (True,None)
+
+        if widget.IS_TOPLEVEL:
+            return (False, "No toplevel object can be pasted here.")
+        return (True,None)
+
+    def write(self, output, tabs):
+        output.extend( common.format_xml_tag( u'object', '', tabs, **{'class': 'sizerslot'}) )
+
+    def _get_tooltip(self):
+        if self.overlapped:
+            return "This slot is overlapped by another cell.\n(see Properties->Layout->Span of the other cell)"
+        return "Add a widget or another sizer here."
+
+
+class SizerHandleButton(GenButton):
+    'Provides a "handle" to activate a Sizer and to access its popup menu'
+    def __init__(self, parent, id, sizer):
+        GenButton.__init__(self, parent.widget, id, '', size=(5, 5))
+        self.sizer = sizer
+        self.SetUseFocusIndicator(False)
+        self.Bind(wx.EVT_RIGHT_DOWN, self.sizer.popup_menu )
+        #self.Bind(wx.EVT_KEY_DOWN, misc.on_key_down_event)
+        color = compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_BTNFACE)
+        self.SetBackgroundColour(color)
+
 class BaseSizerBuilder(object):
     "Language independent base class for all sizer builders / code generators"
 
     tmpl = []                 # Statements to generate the sizer from, the stmt has to end with a newline character
 
-    klass = ''                # klass: Sizer class name
     language = None           # Language to generate the code for
 
     tmpl_SetSizer = ''        # Template to call SetSizer()
     tmpl_Fit = ''             # Template to call Fit()
+    tmpl_Realize = ''         # Template to call Realize() for StdDialogButtonSizer
     tmpl_SetSizeHints = ''    # Template to set the size hints
     tmpl_AddGrowableRow = ''  # Template for wxFlexGridSizer to set growable rows
     tmpl_AddGrowableCol = ''  # Template for wxFlexGridSizer to set growable columns
 
     def __init__(self):
         "Initialise sizer builder"
-        self.tmpl_dict = {}                          # properties to replace in L{tmpl}
+        self.tmpl_dict = {}                               # properties to replace in tmpl
         self.codegen = common.code_writers[self.language] #language specific code generator (codegen.BaseLangCodeWriter)
 
     def _get_wparent(self, topl, obj):
@@ -61,16 +124,15 @@
     def _prepare_tmpl_content(self, obj):
         """Prepare template variables"""
         self.tmpl_dict.clear()
-        self.tmpl_dict['klass'] = self.codegen.cn(self.klass)
+        self.tmpl_dict['klass'] = self.codegen.cn(obj.WX_CLASS)
         self.tmpl_dict['wxIDANY'] = self.codegen.cn('wxID_ANY')
-        #self.tmpl_dict['parent_widget'] = self._get_wparent(obj)
         self.tmpl_dict['parent_widget'] = self._get_wparent(obj)
         self.tmpl_dict['sizer_name'] = self.codegen._format_classattr(obj)
 
     def _get_code(self, obj):
-        "Generates the language specific code for sizer specified in L{klass}"
+        "Generates the language specific code for sizer specified in klass"
         if not self.tmpl:
-            return [], [], []  # init, props, layout
+            return [], []  # init, final
 
         init = []
         layout = []
@@ -79,47 +141,47 @@
         init.append(self.tmpl % self.tmpl_dict)
 
         # generate layout lines
-        #if obj.is_toplevel:
-        #if obj.window.is_toplevel:
-        if not obj.node.parent.widget.is_sizer:
+        if not obj.parent.IS_SIZER:
             layout.append(self.tmpl_SetSizer % self.tmpl_dict)
-            #if not 'size' in obj.parent.properties and obj.parent.is_toplevel:
-            #if not 'size' in obj.window.properties:
-            #if not obj.window.properties["size"].is_active():
-            if not obj.node.parent.widget.check_prop("size") and obj.node.parent.widget.is_toplevel:
+            if not obj.parent.check_prop("size") and obj.parent.IS_TOPLEVEL:
                 layout.append(self.tmpl_Fit % self.tmpl_dict)
             if "sizehints" in obj.window.properties and obj.window.sizehints:
                 layout.append(self.tmpl_SetSizeHints % self.tmpl_dict)
 
-        return init, [], layout  # init, props, layout
+        return init, layout  # init, post
 
     def get_code(self, obj):
-        "Generates the language specific code for sizer specified in L{klass}"
+        "Generates the language specific code for sizer specified in klass"
         self._prepare_tmpl_content(obj)
-        if self.klass == 'wxBoxSizer':       return self.get_code_wxBoxSizer(obj)
-        if self.klass == 'wxWrapSizer':      return self.get_code_wxBoxSizer(obj)  # the same here
-        if self.klass == 'wxStaticBoxSizer': return self.get_code_wxStaticBoxSizer(obj)
-        if self.klass == 'wxGridSizer':      return self.get_code_wxGridSizer(obj)
-        if self.klass == 'wxFlexGridSizer':  return self.get_code_wxFlexGridSizer(obj)
-        if self.klass == 'wxGridBagSizer':   return self.get_code_wxFlexGridSizer(obj)
+        if obj.WX_CLASS == 'wxBoxSizer':             return self.get_code_wxBoxSizer(obj)
+        if obj.WX_CLASS == 'wxWrapSizer':            return self.get_code_wxBoxSizer(obj)  # the same here
+        if obj.WX_CLASS == 'wxStaticBoxSizer':       return self.get_code_wxStaticBoxSizer(obj)
+        if obj.WX_CLASS == 'wxStdDialogButtonSizer': return self.get_code_wxStdDialogButtonSizer(obj)
+        if obj.WX_CLASS == 'wxGridSizer':            return self.get_code_wxGridSizer(obj)
+        if obj.WX_CLASS == 'wxFlexGridSizer':        return self.get_code_wxFlexGridSizer(obj)
+        if obj.WX_CLASS == 'wxGridBagSizer':         return self.get_code_wxFlexGridSizer(obj)
         return self._get_code(obj)
 
     def get_code_wxStaticBoxSizer(self, obj):
         "Set sizer specific properties and generate the code"
-        #self.tmpl_dict['orient'] = self.codegen.cn( obj.properties.get('orient', 'wxHORIZONTAL') )
         self.tmpl_dict['orient'] = self.codegen.cn( obj.properties["orient"].get_string_value() )
         self.tmpl_dict['label'] = self.codegen.quote_str( obj.label )
         return self._get_code(obj)
 
     def get_code_wxBoxSizer(self, obj):
         "Set sizer specific properties and generate the code"
-        #self.tmpl_dict['orient'] = self.codegen.cn( obj.properties.get('orient', 'wxHORIZONTAL') )
         self.tmpl_dict['orient'] = self.codegen.cn( obj.properties["orient"].get_string_value() )
         return self._get_code(obj)
 
+    def get_code_wxStdDialogButtonSizer(self, obj):
+        "Set sizer specific properties and generate the code"
+        init, layout = self._get_code(obj)
+        layout.append(self.tmpl_Realize % self.tmpl_dict)
+        return init, layout
+
     def get_code_wxGridSizer(self, obj):
         "Set sizer specific properties and generate the code"
-        if self.klass != 'wxGridBagSizer':
+        if obj.WX_CLASS != 'wxGridBagSizer':
             self.tmpl_dict['rows'] = obj.rows
             self.tmpl_dict['cols'] = obj.cols
         self.tmpl_dict['vgap'] = obj.vgap
@@ -128,546 +190,78 @@
 
     def get_code_wxFlexGridSizer(self, obj):
         "Set sizer specific properties and generate the code"
-        result = self.get_code_wxGridSizer(obj)
+        ret = list( self.get_code_wxGridSizer(obj) )
 
-        if obj.klass=="wxGridBagSizer":
+        if obj.WX_CLASS=="wxGridBagSizer":
             max_row, max_col = obj._get_max_row_col()
         else:
             max_row = max_col = None
 
-        layout = []
+        growable = []
         if 'growable_rows' in obj.properties:
             for row in obj.growable_rows:
                 if max_row is None or row<=max_row:
                     self.tmpl_dict['row'] = row
-                    layout.append(self.tmpl_AddGrowableRow % self.tmpl_dict)
+                    growable.append(self.tmpl_AddGrowableRow % self.tmpl_dict)
         if 'growable_cols' in obj.properties:
             for col in obj.growable_cols:
                 if max_col is None or col<=max_col:
                     self.tmpl_dict['col'] = col
-                    layout.append(self.tmpl_AddGrowableCol % self.tmpl_dict)
-
-        # convert tuple to list and append the layout lines
-        result = list(result)
-        result[-1] += layout
-        return result
-
-
-
-class SizerSlot(np.PropertyOwner):
-    "A window to represent a slot in a sizer"
-    PROPERTIES = ["Slot", "pos"]
-    is_sizer = False
-    _is_toplevel = False
-    def __init__(self, parent, sizer, pos=0, label=None):
-        np.PropertyOwner.__init__(self)
-        # initialise instance logger
-        self._logger = logging.getLogger(self.__class__.__name__)
-        self.klass = self.classname = self.base = "sizerslot"
-        self.label = label
-
-        self.sizer = sizer  # Sizer object (SizerBase instance)
-
-        # initialise instance properties
-        self.parent = parent
-        self.pos = np.LayoutPosProperty(pos)  # position within the sizer, 1-based
-        # the following are just set to use the same Add call as with widgets
-        self.proportion = 1
-        self.span = (1,1)
-        self.flag = wx.EXPAND
-        self.border = 0
-
-        self.widget = None       # Reference to the widget resembling the slot (a wx.Window)
-        self.name = "SLOT"
-        self.overlapped = False  # for spanning in GridBagSizer
-
-    def set_overlap(self, overlapped=True, add_to_sizer=True):
-        # interface from GridBagSizer
-        if overlapped==self.overlapped: return
-        self.overlapped = overlapped
-        if overlapped:
-            if self.widget:
-                if add_to_sizer:
-                    self.sizer.widget.Detach(self.widget)
-                compat.DestroyLater(self.widget)
-                self.widget = None
-        else:
-            if self.sizer.widget and not self.widget:
-                self.create_widget()
-                if add_to_sizer:
-                    self.sizer.widget.Add(self.widget, self.pos, self.span, wx.EXPAND, self.border)
-        # XXX update icon in Tree
-
-    def on_load(self):  # called from XML parser, right after the widget is loaded
-        pass
-    def post_load(self): # called from show_widget
-        pass
-
-    def update_view(self, selected):
-        # we can ignore selected here, as the repainting only takes place later
-        if self.widget:
-            self.widget.Refresh()
-
-    def create_widget(self):
-        if self.overlapped and self.sizer._IS_GRIDBAG: return
-        style = wx.FULL_REPAINT_ON_RESIZE
-        self.widget = wx.Window(self.parent.widget, -1, size=(20, 20), style=style)
-        self.widget.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
-        self.widget.SetAutoLayout(True)
-        self.widget.Bind(wx.EVT_PAINT, self.on_paint)
-        self.widget.Bind(wx.EVT_ERASE_BACKGROUND, self.on_erase_background)
-        self.widget.Bind(wx.EVT_RIGHT_DOWN, self.popup_menu)
-        self.widget.Bind(wx.EVT_LEFT_DOWN, self.on_drop_widget)
-        self.widget.Bind(wx.EVT_MIDDLE_DOWN, misc.exec_after(self.on_select_and_paste))
-        self.widget.Bind(wx.EVT_ENTER_WINDOW, self.on_enter)
-        self.widget.Bind(wx.EVT_LEAVE_WINDOW, self.on_leave)
-        #self.widget.Bind(wx.EVT_CHAR_HOOK, misc.on_key_down_event)  # catch cursor keys   XXX still required?
-
-    def is_visible(self):
-        return False
-
-    def create(self):
-        if self.widget: return
-        self.create_widget()
-
-    def on_enter(self, event):
-        # hack. definitely. but...
-        misc.currently_under_mouse = self.widget
-        if common.adding_widget and (not common.adding_sizer or not self.sizer.is_virtual()):
-            self.widget.SetCursor(wx.CROSS_CURSOR)
-        else:
-            self.widget.SetCursor(wx.STANDARD_CURSOR)
-        event.Skip()
-
-    def on_leave(self, event):
-        # currently_under_mouse is used to restore the normal cursor, if the
-        # user cancelled the addition of a widget and the cursor is over this slot
-        misc.currently_under_mouse = None
-        event.Skip()
-
-    def on_paint(self, event):
-        "Handle paint request and draw hatched lines onto the window"
-        if not self.sizer: return  # in deletion
-        dc = wx.PaintDC(self.widget)
-        self._draw_background(dc)
-
-    def on_erase_background(self, event):
-        dc = event.GetDC()
-        if not dc:
-            dc = wx.ClientDC(self)
-            rect = self.widget.GetUpdateRegion().GetBox()
-            dc.SetClippingRect(rect)
-        self._draw_background(dc, clear=False)
-
-    def _draw_background(self, dc, clear=True):
-        "draw the hatches on device context dc (red if selected)"
-        # fill background first; propably needed only on MSW and not for on_erase_background
-        size = self.widget.GetSize()
-        small = size[0]<10 or size[1]<10
-        focused = misc.focused_widget is self
-        if clear:
-            if small and focused:
-                dc.SetBackground(wx.Brush(wx.BLUE))
-            else:
-                dc.SetBackground(wx.Brush(wx.LIGHT_GREY))
-            dc.Clear()
-        if small and focused:
-            color = wx.WHITE
-        elif small or not focused:
-            color = wx.BLACK
-        else:
-            color = wx.BLUE
+                    growable.append(self.tmpl_AddGrowableCol % self.tmpl_dict)
+        ret[-1] = growable + ret[-1]
+        return ret
 
-        if focused:
-            hatch = compat.BRUSHSTYLE_CROSSDIAG_HATCH
-        else:
-            if not "cols" in self.sizer.PROPERTIES:  # horizontal/vertical sizer or grid sizer?
-                pos = self.pos
-            else:
-                pos = sum( self.sizer._get_row_col(self.pos) )
-            hatch = compat.BRUSHSTYLE_FDIAGONAL_HATCH  if pos%2 else  compat.BRUSHSTYLE_BDIAGONAL_HATCH
-        brush = wx.Brush(color, hatch)
-        # draw hatched lines in foreground
-        dc.SetBrush(brush)
-        size = self.widget.GetClientSize()
-        dc.DrawRectangle(0, 0, size.width, size.height)
+    def get_code_per_child(self, obj, child):
+        """Returns code that will be inserted after the child code; e.g. for adding element to a sizer.
+        It's placed before the final code returned from get_code()."""
 
-    # context menu #####################################################################################################
-    def popup_menu(self, event, pos=None):
-        event_widget = event.GetEventObject()
-        menu = self._create_popup_menu(widget=event_widget)
-        if pos is None:
-            # convert relative event position to relative widget position
-            event_pos  = event.GetPosition()
-            screen_pos = event_widget.ClientToScreen(event_pos)
-            pos        = event_widget.ScreenToClient(screen_pos)
-        event_widget.PopupMenu(menu, pos)
-        menu.Destroy()
+        if child.WX_CLASS in ("spacer","sizerslot"):  # spacer and slot are adding itself to the sizer
+            return []
 
-    def _create_popup_menu(self, widget):
-        # menu title
-        if isinstance(self.sizer, GridSizerBase):
-            rows, cols = self.sizer._get_actual_rows_cols()
-            # calculate row and pos of our slot
-            row,col = self.sizer._get_row_col(self.pos)
-            menu = wx.Menu(_("Slot %d/%d"%(row+1,col+1)))
-        else:
-            menu = wx.Menu(_("Slot %d"%self.pos))
+        # the name attribute of a spacer is already formatted "<width>, <height>".
+        # This string can simply inserted in Add() call.
+        obj_name = self.codegen._format_classattr(child)
 
-        # edit: paste
-        i = misc.append_menu_item(menu, -1, _('Paste\tCtrl+V'), wx.ART_PASTE)
-        misc.bind_menu_item_after(widget, i, clipboard.paste, self)
-        if not clipboard.check("widget","sizer"): i.Enable(False)
-        menu.AppendSeparator()
+        # check if sizer has to store as a class attribute
+        sizer_name = self.codegen._format_classattr(obj)
 
-        # slot actions
-        if not self.sizer.is_virtual():
-            # we can add/remove items only from non-virtual sizers
-            if not isinstance(self.sizer, EditGridBagSizer):
-                i = misc.append_menu_item(menu, -1, _('Remove Slot\tDel'), wx.ART_DELETE)
-                misc.bind_menu_item_after(widget, i, self.remove)
-                if len(self.sizer.children)<=2: i.Enable(False)
-
-            # if inside a grid sizer: allow removal of empty rows/cols
-            if isinstance(self.sizer, GridSizerBase):
-                # check whether all slots in same row/col are empty
-                row_is_empty = col_is_empty = True
-                for pos,child in enumerate(self.sizer.children):
-                    if pos==0: continue
-                    child_row, child_col = self.sizer._get_row_col(pos)
-                    if child_row==row and not isinstance(child, SizerSlot):
-                        row_is_empty = False
-                    if child_col==col and not isinstance(child, SizerSlot):
-                        col_is_empty = False
-
-                # allow removal of empty row
-                i = misc.append_menu_item(menu, -1, _('Remove Row %d'%(row+1)) )
-                misc.bind_menu_item_after(widget, i, self.sizer.remove_row, self.pos)
-                if not row_is_empty or rows<=1: i.Enable(False)
-
-                # allow removal of empty col
-                i = misc.append_menu_item(menu, -1, _('Remove Column %d'%(col+1)) )
-                misc.bind_menu_item_after(widget, i, self.sizer.remove_col, self.pos)
-                if not col_is_empty or cols<=1: i.Enable(False)
-                menu.AppendSeparator()
+        flag = child.properties["flag"].get_string_value()  # as string, joined with "|"
+        flag = self.codegen.cn_f(flag) or '0'
 
-            self.sizer._add_popup_menu_items(menu, self, widget)
+        if obj.WX_CLASS=="wxStdDialogButtonSizer" and child.WX_CLASS=='wxButton':
+            # XXX optionally use SetAffirmativeButton, SetCancelButton, SetNegativeButton
+            id_value = child.check_prop("id") and child.properties["id"].value.strip() or ""  # e.g. 'wxID_CANCEL'
+            if ( (child.check_prop_truth("stockitem") and child.stockitem in obj.BUTTON_STOCKITEMS) or 
+                 (id_value and id_value.startswith("wxID_") and id_value[5:] in obj.BUTTON_STOCKITEMS) ):
+                tmpl = self.codegen.tmpl_sizeritem_button
+                return [tmpl % ( sizer_name, obj_name )]
 
-        p = misc.get_toplevel_widget(self.sizer)
-        if p is not None and p.preview_is_visible():
-            item = _('Close preview (%s)\tF5') % p.name
+        if obj.WX_CLASS!="wxGridBagSizer":
+            stmt = self.codegen.tmpl_sizeritem % ( sizer_name, obj_name, child.proportion, flag, child.border )
         else:
-            item = _('Preview (%s)\tF5') % p.name
-
-        i = misc.append_menu_item( menu, -1, item )
-        misc.bind_menu_item_after(widget, i, self.preview_parent)
-
-        return menu
-
-    def preview_parent(self):
-        # context menu callback
-        p = misc.get_toplevel_widget(self.sizer)
-        if p is not None:
-            p.preview()
-
-    ####################################################################################################################
-    def _remove(self):
-        # does not set focus
-        if self.sizer.is_virtual() or len(self.sizer.children)<=2: return
-        sizer = self.sizer
-        node = self.sizer.children[self.pos].node
-        with self.sizer.window.frozen():
-            self.sizer.remove_item(self)
-            self.delete()
-            common.app_tree.remove(node)
-
-    def remove(self):
-        # set focused widget
-        sizer = self.sizer
-        pos = self.pos
-        self._remove()
-        if pos >= len(sizer.children):
-            pos = len(sizer.children)-1
-        misc.set_focused_widget( sizer.children[pos] )
-
-    def on_drop_widget(self, event):
-        """replaces self with a widget in self.sizer. This method is called
-        to add every non-toplevel widget or sizer, and in turn calls the
-        appropriate builder function (found in the ``common.widgets'' dict)"""
-        if not common.adding_widget:  # widget focused/selecte
-            misc.set_focused_widget(self)
-            if self.widget:
-                self.widget.Refresh()
-                self.widget.SetFocus()
-            return
-        if common.adding_sizer and self.sizer.is_virtual():
-            return
-        if self.widget:
-            self.widget.SetCursor(wx.NullCursor)
-        common.adding_window = event and event.GetEventObject().GetTopLevelParent() or None
-        # call the appropriate builder
-        common.widgets[common.widget_to_add](self.parent, self.sizer, self.pos)
-        if event is None or not misc.event_modifier_copy(event):
-            common.adding_widget = common.adding_sizer = False
-            common.widget_to_add = None
-        common.app_tree.app.saved = False
-
-    def check_drop_compatibility(self):
-        """replaces self with a widget in self.sizer. This method is called
-        to add every non-toplevel widget or sizer, and in turn calls the
-        appropriate builder function (found in the ``common.widgets'' dict)"""
-        if common.adding_sizer and self.sizer.is_virtual():
-            return (False, "No sizer can be added here")
-        return (True,None)
-
-    # clipboard handling ###############################################################################################
-    def check_compatibility(self, widget, typename=None):
-        "check whether widget can be pasted here"
-        if typename is not None:
-            if typename=="sizer" and self.sizer.is_virtual():
-                return (False, "No sizer can be pasted here")
-            if typename=="window":
-                return (False, "No toplevel object can be pasted here.")
-            return (True,None)
-
-        if getattr(widget, "_is_toplevel", False):
-            return (False, "No toplevel object can be pasted here.")
-        if self.sizer.is_virtual() and isinstance(widget, Sizer):
-            # e.g. a sizer dropped on a splitter window slot; instead, a panel would be required
-            return (False, "No sizer can be pasted here")
-        return (True,None)
-
-    def clipboard_paste(self, clipboard_data):
-        "Insert a widget from the clipboard to the current destination"
-        return clipboard._paste(self.parent, self.sizer, self.pos, clipboard_data)
-
-    def on_select_and_paste(self, *args):
-        "Middle-click event handler: selects the slot and, if the clipboard is not empty, pastes its content here"
-        misc.focused_widget = self
-        self.widget.SetFocus()
-        clipboard.paste(self)
-    ####################################################################################################################
-
-    def delete(self):
-        # mainly deletes the widget
-        self.destroy_widget()
-        common.app_tree.app.saved = False
-
-    def destroy_widget(self):
-        if self.widget is None: return
-        if misc.currently_under_mouse is self.widget:
-            misc.currently_under_mouse = None
-        if self.widget:
-            self.widget.Hide()
-            if wx.VERSION_STRING!="2.8.12.0":
-                # unbind events to prevent new created (and queued) events
-                self.widget.Bind(wx.EVT_PAINT, None)
-                self.widget.Bind(wx.EVT_RIGHT_DOWN, None)
-                self.widget.Bind(wx.EVT_LEFT_DOWN, None)
-                self.widget.Bind(wx.EVT_MIDDLE_DOWN, None)
-                self.widget.Bind(wx.EVT_ENTER_WINDOW, None)
-                self.widget.Bind(wx.EVT_LEAVE_WINDOW, None)
-                self.widget.Bind(wx.EVT_KEY_DOWN, None)
-            if self.sizer and not self.sizer.is_virtual and self.sizer.widget:
-                self.sizer.widget.Detach(self.widget)  # this will happen during recursive removal only
-                self.sizer = None
-            compat.DestroyLater(self.widget)
-            self.widget = None
-
-        if misc.focused_widget is self:
-            misc.set_focused_widget(None)
-
-    def __getstate__(self):
-        state = self.__dict__.copy()
-        del state['_logger']
-        return state
-
-    def __setstate__(self, state):
-        self.__dict__.update(state)
-
-        # re-initialise logger instance deleted from __getstate__
-        self._logger = logging.getLogger(self.__class__.__name__)
+            index = obj._get_row_col(child.index)
+            stmt = self.codegen.tmpl_gridbagsizeritem % ( sizer_name, obj_name, index, child.span, flag, child.border )
 
+        return [stmt]
 
 
-class SizerHandleButton(GenButton):
-    'Provides a "handle" to activate a Sizer and to access its popup menu'
-    def __init__(self, parent, id, sizer):
-        GenButton.__init__(self, parent.widget, id, '', size=(5, 5))
-        self.sizer = sizer
-        self.SetUseFocusIndicator(False)
-        self.Bind(wx.EVT_RIGHT_DOWN, self.sizer.popup_menu )
-        #self.Bind(wx.EVT_KEY_DOWN, misc.on_key_down_event)
-        color = compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_BTNFACE)
-        self.SetBackgroundColour(color)
-
-
-def change_sizer(old, new):
-    """Replaces sizer instance 'old' with a new one; 'new' is the name of the new one.
-    (which_page: index of the property windows notebook page; used only by set_growable_(rows|cols)"""
-    constructors = {
-        'wxBoxSizer (wxVERTICAL)':         lambda: EditBoxSizer(old.name, old.window, wx.VERTICAL, 0, old.toplevel),
-        'wxBoxSizer (wxHORIZONTAL)':       lambda: EditBoxSizer(old.name, old.window, wx.HORIZONTAL, 0, old.toplevel),
-        'wxWrapSizer (wxVERTICAL)':        lambda: EditWrapSizer(old.name, old.window, wx.VERTICAL, 0, old.toplevel),
-        'wxWrapSizer (wxHORIZONTAL)':      lambda: EditWrapSizer(old.name, old.window, wx.HORIZONTAL, 0, old.toplevel),
-        'wxStaticBoxSizer (wxVERTICAL)':   lambda: EditStaticBoxSizer(old.name, old.window, wx.VERTICAL,
-                                                                      getattr(old, 'label', old.name), 0, old.toplevel),
-        'wxStaticBoxSizer (wxHORIZONTAL)': lambda: EditStaticBoxSizer(old.name, old.window, wx.HORIZONTAL,
-                                                                      getattr(old, 'label', old.name), 0, old.toplevel),
-        'wxGridSizer':     lambda: EditGridSizer(old.name, old.window, rows=0, cols=0, toplevel=old.toplevel),
-        'wxFlexGridSizer': lambda: EditFlexGridSizer(old.name, old.window, rows=0, cols=0, toplevel=old.toplevel),
-        'wxGridBagSizer': lambda: EditGridBagSizer(old.name, old.window, rows=0, cols=0, toplevel=old.toplevel) }
-
-    with old.window.frozen():
-        # construct without children, take then the children from the old sizer
-        szr = constructors[new]()
-        if old._IS_GRIDBAG and old.widget:
-            for c in old.children[1:]:
-                if c:
-                    if c.widget:
-                        old.widget.Detach(c.widget)
-                    elif isinstance(c, SizerSlot) and c.overlapped:
-                        # re-create hidden widget
-                        c.set_overlap(False, add_to_sizer=False)
-    
-        szr.children.extend(old.children[1:])
-        szr.node = old.node
-    
-        # copy/set properties
-        if isinstance(szr, GridSizerBase):
-            # take rows, cols, hgap, vgap from old sizer, if applicable
-            rows = getattr(old, "rows", 1)
-            cols = getattr(old, "cols", len(szr.children)-1)
-            if isinstance(szr, EditGridBagSizer):
-                # for GridSizer and FlexGridSizer cols may be 0, i.e. auto calculated
-                if rows==0: rows = (len(self.children)-2)//cols +1
-                if cols==0: cols = (len(self.children)-2)//rows +1
-    
-            szr.properties["rows"].set( rows )
-            szr.properties["cols"].set( cols )
-            szr.properties["hgap"].set( getattr(old, "hgap", 0) )
-            szr.properties["vgap"].set( getattr(old, "vgap", 0) )
-            szr.properties_changed( ["rows","cols","hgap","vgap"] )
-        if isinstance(szr, EditFlexGridSizer) and isinstance(old, EditFlexGridSizer):
-            # take growable rows and cols from old sizer
-            grow_r_p = old.properties["growable_rows"]
-            grow_c_p = old.properties["growable_cols"]
-            if grow_r_p.is_active():
-                szr.properties['growable_rows'].value = grow_r_p.value
-                szr.properties['growable_rows'].deactivated = False
-            if grow_c_p.is_active():
-                szr.properties['growable_cols'].value = grow_c_p.value
-                szr.properties['growable_cols'].deactivated = False
-        # XXX keep rows, cols, growable_rows, growable_cols in attributes of new sizer if it's not a (Flex)GridSizer
-        #     and re-use them if user switches back
-
-        if isinstance(szr, EditGridBagSizer):
-            szr._check_slots(remove_only=True)  # mark overlapped slots; the slot.sizer attributes still point to old
-
-        if old.widget is not None:
-            for c in old.widget.GetChildren():
-                if c and c.IsSizer():
-                    compat.SizerItem_SetSizer(c, None)
-            old.widget.Clear()  # without deleting window items; but sets the sizer of the windows to NULL
-
-        for widget in szr.children[1:]:
-            widget.sizer = szr
-            widget.properties["flag"]._check_value()
-
-        if old.widget is not None:
-            szr.create(dont_set=True)  # here the slots are added; the .sizer attribute needs to point to szr
-
-        for widget in szr.children[1:]:
-            if not isinstance(widget, SizerSlot):
-                if szr.widget is not None:
-                    if not isinstance(szr, EditGridBagSizer):
-                        szr.widget.Insert(widget.pos, widget.widget, widget.proportion, widget.flag, widget.border)
-                    else:
-                        szr.widget.Add(widget.widget, widget.pos, widget.span, widget.flag, widget.border)
-    
-        if not szr.toplevel:
-            szr.sizer = old.sizer
-            szr.properties["proportion"].set(old.proportion)
-            szr.properties["flag"].set(old.flag)
-            szr.properties["border"].set(old.border)
-            szr.properties["pos"].set(old.pos)
-            szr.sizer.children[szr.pos] = szr
-            if szr.sizer.widget:
-                pos = szr.sizer.get_child_index(szr.pos)
-                elem = szr.sizer.widget.GetChildren()[pos]  # a sizer item
-                compat.SizerItem_SetSizer(elem, szr.widget)
-    
-        common.app_tree.change_node(szr.node, szr)
-    
-        old.toplevel = False
-        del old.children[1:]
-        old.delete()
-    
-        if szr.toplevel:
-            szr.window.set_sizer(szr)
-        szr.layout(True)
-        if szr.widget: szr.window.widget.Refresh()
-        misc.set_focused_widget(szr)
-
-
-
-class Sizer(object):
-    "Base class for every Sizer handled by wxGlade"
-    _IS_GRIDBAG = False
-    is_sizer = True
-    def __init__(self, window):
-        self.window = window
-        # initialise instance logger
-        self._logger = logging.getLogger(self.__class__.__name__)
-
-    def set_item(self, pos, option=None, flag=None, border=None, size=None, force_layout=True):
-        "Updates the layout of the item at the given pos"
-        raise NotImplementedError
-
-    def add_item(self, item, pos=None, option=0, flag=0, border=0, size=None, force_layout=True):
-        "Adds an item to self"
-        raise NotImplementedError
-
-    def remove_item(self, elem, force_layout=True):
-        "Removes elem from self"
-        pass
-
-    def free_slot(self, pos, force_layout=True):
-        "Replaces the element at pos with an empty slot"
-        raise NotImplementedError
-
-    def _fix_notebook(self, pos, notebook_sizer, force_layout=True):
-        "Internal method used to replace a notebook widget with its notebook sizer."
-        pass
-
-    def is_virtual(self):
-        "Return true if sizer is virtual (e.g. SplitterWindowSizer or NotebookSizer)"
-        return False
-
-    def is_fixed(self):
-        "Return True if sizer has a fixed number of slots (e.g. SplitterWindowSizer)"
-
-    def get_itempos(self, attrs):
-        """For virtual sizers only, returns the position of the item in the parent:
-        this is used when loading a wxg file, to build the tree of widgets correctly"""
-        raise NotImplementedError
-
-    def on_load(self):  # called from XML parser, right after the widget is loaded
-        pass
-
-    def post_load(self):  # called from Tree when widget tree is first shown
-        pass
+class SlotGenerator(object):
+    # generic code generator; as a slot does not have flags etc. we don't need BaseWidgetBuilder etc.
+    def __init__(self, language):
+        self.language = language
+        self.codegen = common.code_writers[self.language] #language specific code generator (codegen.BaseLangCodeWriter)
 
-    def __getstate__(self):
-        state = self.__dict__.copy()
-        del state['_logger']
-        return state
-
-    def __setstate__(self, state):
-        self.__dict__.update(state)
-        # re-initialise logger instance deleted from __getstate__
-        self._logger = logging.getLogger(self.__class__.__name__)
+    def get_code(self, obj):
+        # add spacer for empty sizer slot
+        parent = obj.parent
+        if not parent.IS_SIZER or parent._IS_GRIDBAG: return [], []
+        sizer_name = self.codegen._format_classattr(parent)
+        size = self.codegen.tmpl_spacersize%(0, 0)
+        stmt = self.codegen.tmpl_sizeritem % ( sizer_name, size, 0, '0', 0 )
+        return [stmt], []
 
+    def get_event_handlers(self, obj):
+        return []
 
 
 class OrientProperty(np.Property):
@@ -676,6 +270,7 @@
     STRING_to_ORIENTATION = {'wxHORIZONTAL': wx.HORIZONTAL, 'wxVERTICAL': wx.VERTICAL}
 
     def __init__(self, value, default_value=None, name=None):
+        assert value!=0
         np.Property.__init__(self, value, default_value, name)
     def _set_converter(self, value):
         if not value: return None
@@ -698,7 +293,8 @@
         CHOICES += [
                 ('wxWrapSizer (wxVERTICAL)', 'without box and label; wraps around'),
                 ('wxWrapSizer (wxHORIZONTAL)', 'without box and label; wraps around') ]
-    CHOICES += [('wxGridSizer', None),
+    CHOICES += [('wxStdDialogButtonSizer', 'for dialog buttons (will be rearranged acc. to platform style guide)'),
+                ('wxGridSizer', None),
                 ('wxFlexGridSizer', "with columns/rows of different widths"),
                 ('wxGridBagSizer', "with cell spanning (i.e. item may populate multiple grid cells)")]
 
@@ -711,13 +307,17 @@
         pass
 
 
-class SizerBase(Sizer, np.PropertyOwner):
+class SizerBase(edit_base.EditBase):
     "Base class for every non-virtual Sizer handled by wxGlade"
-    PROPERTIES = ["Common", "name", "attribute", "class", "orient", "class_orient", # class and orient are hidden
-                  "Layout"]  # not a property, just start the next page in the editor
+    IS_SIZER = True
+    IS_TOPLEVEL = IS_WINDOW = IS_SLOT = False
+    _IS_GRIDBAG = False
+    CHILDREN = None  # any number
+
+    PROPERTIES = ["Common", "name", "attribute", "class_orient", "Layout"]
     EXTRA_PROPERTIES = []
 
-    MANAGED_PROPERTIES  = ["pos", "span", "proportion", "border", "flag"]
+    MANAGED_PROPERTIES  = edit_base.MANAGED_PROPERTIES
     TOPLEVEL_PROPERTIES = ["fit"]
 
     _PROPERTY_LABELS = {"fit":"Fit parent",
@@ -728,22 +328,16 @@
                       "attribute":'Store instance as attribute of window class; e.g. self.sizer_1 = wx.BoxSizer(...)\n'
                                   'Without this, you can not access the sizer from your program'}
 
-    def __init__(self, name, klass, orient, window, toplevel=True):
-        np.PropertyOwner.__init__(self)
-        Sizer.__init__(self, window)
+    def __init__(self, name, parent, index, orient):
+        edit_base.EditBase.__init__(self, name, parent, index)
 
         # if True, self is not inside another sizer, but it is the responsible of the layout of self.window
+        toplevel = not parent.IS_SIZER
         self.toplevel = toplevel
 
-        self.id = wx.NewId()
-
         # initialise instance properties
-        self.name         = np.NameProperty(name)
-        self.classname    = klass
-        self.klass        = np.Property(klass, name="class")             # class and orient are hidden
-        self.orient       = OrientProperty(orient)                       # they will be set from the class_orient property
-        self.class_orient = ClassOrientProperty(self.get_class_orient()) # this will set the class and orient properties
-        self.base         = np.TextProperty(klass, "base")
+        self.orient       = OrientProperty(orient)                       # will be set from the class_orient property
+        self.class_orient = ClassOrientProperty(self.get_class_orient()) # will set the orient properties
         self.attribute    = np.CheckBoxProperty(False, default_value=False)
         self.fit          = np.ActionButtonProperty(self.fit_parent)
 
@@ -751,42 +345,32 @@
             self.PROPERTIES = self.PROPERTIES + self.MANAGED_PROPERTIES + self.EXTRA_PROPERTIES
             # if within another sizer: the arguments to sizer.Add(self, proportion, flag, border)
             # same as for edit_windows.ManagedBase
-            self.pos        = np.LayoutPosProperty(0)        # the position within the sizer, 0-based
             self.span       = np.LayoutSpanProperty((1,1) )  # row,colspan for items in GridBagSizers
             self.proportion = np.LayoutProportionProperty(1)
             self.border     = np.SpinProperty(0, immediate=True)
             self.flag       = np.ManagedFlags(wx.EXPAND)
-            self.sizer = None  # the (parent) sizer instance
             self._has_layout = True
         else:
             self._has_layout = False
             self.PROPERTIES = self.PROPERTIES + self.TOPLEVEL_PROPERTIES + self.EXTRA_PROPERTIES
 
-        self.children = []    # widgets added to the sizer
-        self.widget = None    # actual wxSizer instance
         self._btn = None      # "handle" to activate a Sizer and to access its popup menu (SizerHandleButton)
 
+    window = edit_base.EditBase.parent_window
+
     def frozen(self):
         return self.window.frozen()
 
-    def create_widgets(self):
-        common.app_tree.create_widgets(self.node)
-
     def create_widget(self):
-        "Creates the wxSizer self.widget"
-        raise NotImplementedError
-
-    def create(self, dont_set=False):
-        if self.widget: return  # nothing to do if the sizer has already been created
-        self._btn = SizerHandleButton(self.window, self.id, self ) # XXX handle the popupmenu creation in SizerHandleButton
+        self._btn = SizerHandleButton(self.window, wx.ID_ANY, self ) # XXX handle the popupmenu creation in SizerHandleButton
         # ScreenToClient used by WidgetTree for the popup menu
-        self._btn.Bind(wx.EVT_BUTTON, self.on_selection, id=self.id)
-        self._btn.Bind(wx.EVT_MOUSE_EVENTS, self.on_mouse_events, id=self.id)
-        self.create_widget()
-        self.widget.Refresh = self.refresh
+        self._btn.Bind(wx.EVT_BUTTON, self.on_selection, id=self._btn.GetId())
+        self._btn.Bind(wx.EVT_MOUSE_EVENTS, self.on_mouse_events, id=self._btn.GetId())
+
+    def finish_widget_creation(self, level):
         self.widget.GetBestSize = self.widget.GetMinSize
         self.widget.ScreenToClient = self._btn.ScreenToClient
-        if self.toplevel and not dont_set:
+        if self.toplevel:
             self.window.set_sizer(self)
         if not config.preferences.show_sizer_handle:
             self.widget.Show(self._btn, False)
@@ -809,23 +393,22 @@
         # as string
         return self.WX_CLASS
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         # "class" and "orient" will only display; "class_orient"
-        if modified and "flag" in modified and self.sizer:
+        if modified and "flag" in modified and self.parent.IS_SIZER:
             self.properties["flag"]._check_value()
 
-        if modified and "name" in modified:
-            previous_name = self.properties["name"].previous_value
-            common.app_tree.refresh_name(self.node, previous_name)
         if not modified or "class" in modified:
             self.properties["class_orient"].set(self.get_class_orient())
         if not modified or "orient" in modified:
             self.properties["class_orient"].set(self.get_class_orient())
+
         if "class_orient" in modified:
             # user has selected -> change
             value = self.class_orient
             if misc.focused_widget is self: misc.set_focused_widget(None)
             wx.CallAfter(change_sizer, self, value)
+
         if (not modified or "flag" in modified or "option" in modified or "border" in modified or "span" in modified):
             if not self.toplevel and self.sizer is not None:
                 if "border" in modified and self.border and not "flag" in modified:
@@ -835,17 +418,29 @@
                         p.add("wxALL")
                 if self.widget:
                     self.sizer.item_properties_modified(self, modified)
-        np.PropertyOwner.properties_changed(self, modified)
+                    actions.add("layout")
+
+        edit_base.EditBase._properties_changed(self, modified, actions)
+
+    def properties_changed(self, modified):
+        actions = edit_base.EditBase.properties_changed(self, modified)
+
+        if config.debugging:
+            assert not {"recreate", "recreate2", "refresh", "sizeevent"}.intersection(actions)
+        if self.widget:
+            if "layout" in actions:
+                self.parent_window.layout()
+        return actions
 
     def check_drop_compatibility(self):
-        return (False, "Items can only be added to empty slots")
+        return (False, "Items can only be added to empty slots; add/insert a slot first, if required.")
 
     def check_compatibility(self, widget, typename=None):
         if typename is not None:
             if typename in ("widget","sizer"):
                 return ("AddSlot",None)
             return (False,"Only widgets and sizers can be pasted here")
-        if getattr(widget, "_is_toplevel", False):
+        if widget.IS_TOPLEVEL:
             return (False,"No toplevel objects can be pasted here")
         return ("AddSlot",None) # a slot is to be added before inserting/pasting
 
@@ -871,11 +466,11 @@
 
         widgetclass = self.__class__.__name__.lstrip("Edit")
         i = misc.append_menu_item(menu, -1, _('Remove %s\tDel')%widgetclass, wx.ART_DELETE)
-        misc.bind_menu_item_after(widget, i, self._remove)
+        misc.bind_menu_item_after(widget, i, self.remove)
 
         if not self.toplevel and self.sizer and self.sizer._can_add_insert_slots():
             i = misc.append_menu_item( menu, -1, _('Insert slot before\tCtrl+I') )
-            misc.bind_menu_item_after(widget, i, self.sizer.insert_slot, self.pos)
+            misc.bind_menu_item_after(widget, i, self.sizer.insert_slot, self.index)
             menu.AppendSeparator()
 
         # other menu items: add/insert slot, copy, cut
@@ -907,17 +502,16 @@
 
         return menu
 
-    def _add_popup_menu_items(self, menu, item, widget):
+    def _add_parent_popup_menu_items(self, menu, item, widget):
         # called from managed widget items' _create_popup_menu method
-        if self.is_virtual(): return
 
         # rows/cols if inside a grid sizer
         if "rows" in self.PROPERTIES:
-            row, col = self._get_row_col(item.pos)
+            row, col = self._get_row_col(item.index)
             i = misc.append_menu_item(menu, -1, _('Insert Row before') )
-            misc.bind_menu_item_after(widget, i, self.insert_row, item.pos)
+            misc.bind_menu_item_after(widget, i, self.insert_row, item.index)
             i = misc.append_menu_item(menu, -1, _('Insert Column before') )
-            misc.bind_menu_item_after(widget, i, self.insert_col, item.pos)
+            misc.bind_menu_item_after(widget, i, self.insert_col, item.index)
             if row==self.rows-1:
                 # last row
                 i = misc.append_menu_item(menu, -1, _('Add Row') )
@@ -926,16 +520,26 @@
                 # last col
                 i = misc.append_menu_item(menu, -1, _('Add Column') )
                 misc.bind_menu_item_after(widget, i, self.insert_col, -1)
+
+        if "growable_rows" in self.PROPERTIES:
+            i = misc.append_menu_item(menu, -1, _('Make Row growable'), kind=wx.ITEM_CHECK )
+            i.Check(row in self.growable_rows)
+            misc.bind_menu_item_after(widget, i, self.make_growable, "row", row)
+            i = misc.append_menu_item(menu, -1, _('Make Column growable'), kind=wx.ITEM_CHECK )
+            i.Check(col in self.growable_cols)
+            misc.bind_menu_item_after(widget, i, self.make_growable, "col", col)
+
+        if "rows" in self.PROPERTIES:
             menu.AppendSeparator()
 
         if self._can_add_insert_slots():
             # slots
             i = misc.append_menu_item(menu, -1, _('Insert Slot before\tCtrl+I') )
-            misc.bind_menu_item_after(widget, i, self.insert_slot, item.pos)
+            misc.bind_menu_item_after(widget, i, self.insert_slot, item.index)
             i = misc.append_menu_item(menu, -1, _('Insert Slots before...\tCtrl+Shift+I') )
-            misc.bind_menu_item_after(widget, i, self.insert_slot, item.pos, True)
+            misc.bind_menu_item_after(widget, i, self.insert_slot, item.index, True)
     
-            if item.pos==len(self.children)-1: # last slot -> allow to add
+            if item.index==len(self.children)-1: # last slot -> allow to add
                 i = misc.append_menu_item(menu, -1, _('Add Slot\tCtrl+A') )
                 misc.bind_menu_item_after(widget, i, self.add_slot)
                 i = misc.append_menu_item(menu, -1, _('Add Slots...\tCtrl+Shift+A') )
@@ -945,33 +549,13 @@
         ####################################################################################################################
     def _remove(self):
         "removes the sizer from his parent, if it has one"
-        if self.toplevel:
-            window = self.window
-            common.app_tree.remove(self.node)
-            window.set_sizer(None)
-            return
-        # XXX as of now: remove old and then create a new slot; maybe there's a better way to change the node directly
-        #sizer = self.sizer
-        #common.app_tree.remove(self.node)
-        #sizer.remove_item(self)
-        #sizer.insert_slot(self.pos)
-
-        ## XXX as of now, this won't work
-        return self.sizer.free_slot(self.pos)
+        return self.parent._free_slot( self.parent.children.index(self) )
 
     def remove(self):
-        if self.toplevel:
-            parent = self.window
-        slot = self._remove()
-        if self.toplevel:
-            misc.set_focused_widget(parent)
-        else:
-            misc.set_focused_widget(slot)
-
-    def Destroy(self):
-        GenButton.Destroy(self)
-        if misc.focused_widget is self:
-            misc.focused_widget = None
+        # entry point from GUI
+        common.root.saved = False  # update the status of the app
+        focus = self._remove()  # slot or window
+        misc.rebuild_tree(focus)
 
     def preview_parent(self):
         # context menu callback
@@ -981,102 +565,72 @@
     def fit_parent(self, *args):
         "Tell the sizer to resize the window to match the sizer's minimal size"
         if self.widget and self.window.widget:
-            if self.window._is_toplevel:
+            if self.window.IS_TOPLEVEL:
                 self.widget.Fit(self.window.widget.GetTopLevelParent())
             else:
                 self.widget.Fit(self.window.widget)
             # self.widget.SetSizeHints(self.window.widget)
             self.window.widget.Layout()
 
-    def add_item(self, item, pos=None, size=None, force_layout=True):
+    def add_item(self, item, index=None):
         "Adds an item to self."
         # called from ManagedBase.__init__ when adding an item to the end from XML parser
         # or interactively when adding an item to an empty sizer slot
-        if pos is None:
-            pos = len(self.children)
-        sizer_item = None
-        if pos==len(self.children):
+        # XXX unify with edit_base.EditBase.add_item
+        if index is None: index = len(self.children)
+
+        if index==len(self.children):
             self.children.append(None)
         else:
-            old_child = self.children[pos]
-            if isinstance(old_child, SizerSlot) and old_child.widget:
-                self.widget.Detach(old_child.widget)
-                old_child.delete()
+            old_child = self.children[index]
+            if old_child:
+                self.children[index].recursive_remove(0, keep_slot=True)
         if "rows" in self.PROPERTIES and not self._IS_GRIDBAG:
             self._adjust_rows_cols()  # for GridSizer
-        self.children[pos] = item
-        item._size = size
+        self.children[index] = item
 
-        item.sizer = self
-        item.properties["flag"]._check_value()
-        item.properties["pos"].set(pos)
-
-        ################################################################################################################
-        # actually add item.widget to self.widget, i.e. the wxWidget to the wxSizer
-        if not self.widget or not item.widget:
-            return  # nothing more to do; design window not yet created
-
-        # calculate width, height
-        size_arg = size
-        if not size or -1 in size:
-            best_size = item.widget.GetBestSize()
-        if size:
-            w, h = size
-            if w == -1: w = best_size[0]
-            if h == -1: h = best_size[1]
+    def child_widget_created(self, child, level):
+        "called from finish_widget_creation() to add widget to sizer widget"
+        index = child.index
+        if self._IS_GRIDBAG:
+            # GridBagSizer: add at (row, col) position
+            self.widget.Add( child.widget, index, child.span, child.flag, child.border, destroy=True )
         else:
-            w, h = best_size
-
-        if pos>len(self.widget.GetChildren()):
-            ## I have to set wxADJUST_MINSIZE to handle a bug that I'm not able to detect (yet): if the width or height
-            ## of a widget is -1, the layout is messed up!
-            if self._IS_GRIDBAG:
-                self.widget.Add( item.widget, pos, item.span, item.flag, item.border )
+            # no GridBagSizer: add or insert at index position
+            if index+self.widget._BTN_OFFSET>=len(self.widget.GetChildren()):
+                self.widget.Add( child.widget, child.proportion, child.flag, child.border )
             else:
-                self.widget.Add( item.widget, item.proportion, item.flag, item.border )
+                self.widget.Insert(index+self.widget._BTN_OFFSET, child.widget, child.proportion, child.flag, child.border)
 
-            self.widget.SetItemMinSize(item.widget, w, h)
-            return
-
-        if self._IS_GRIDBAG:
-            # XXX check item.widget.span and remove empty slots
-            self.widget.Add( item.widget, pos, item.span, item.flag, item.border, destroy=True )
-            self.widget.Layout()
-            return
+        if child.check_prop("size"):
+            # size has been set in set_size, so we can just use GetSize here
+            self.set_item_best_size(child, size=child.widget.GetSize())
+        if self.widget:
+            self.window.widget.Layout()
 
-        # no GridBagSizer
-        self.widget.Insert(pos, item.widget, item.proportion, item.flag, item.border)
+    def _layout(self):
+        # for delayed callback; see next method
+        if self.widget: self.widget.Layout()
+
+    def on_child_pasted(self):
+        # otherwise EXPAND may not be obeyed
+        wx.CallLater(1, self._layout)
+
+    def destroying_child_widget(self, child, index):
+        # previously in _free_slot
+        # required here; otherwise removal of a StaticBox of a StaticBoxSizer will cause a crash
+        # child has been removed from self.children already,
+        #  except when a widget is re-created or a slot is just set to overlapped
+        self.widget.Detach(child.widget)
 
-        try:  # if the item was a window, set its size to a reasonable value
-            self.widget.SetItemMinSize(item.widget, w, h)  # w,h is GBestSize
-        except Exception:
-            # production version: exceptions to be ignored
-            if config.debugging: raise
-        if self.widget:
-            self.window.widget.Refresh()
-        if force_layout:
-            self.layout()  # update the layout of self
+    def destroyed_child_widget(self):
+        self.widget.Layout()
 
-    def get_child_index(self, pos):
+    def get_child_index(self, index):
         # return the index of the widget; in GridBagSizers, overlapped slots are skipped
-        return pos
+        return index
 
-    def _fix_notebook(self, pos, notebook_sizer, force_layout=True):   # XXX check this with new implementation
-        """Replaces the widget at 'pos' with 'notebook_sizer':
-        this is intended to be used by wxNotebook widgets, to add the notebook sizer to this sizer.
-        This is a hack, but it's the best I could find without having to rewrite too much code :-("""
-        # no error checking at all, this is a "protected" method, so it should
-        # be safe to assume the caller knows how to use it
-        pos = self.get_child_index(pos)
-        item = self.widget.GetChildren()[pos]
-        if item.IsWindow():
-            w = item.GetWindow()
-            w.SetContainingSizer(None)
-        compat.SizerItem_SetSizer(item, notebook_sizer)
-        if force_layout:
-            self.layout()
-
-    def set_item_best_size(self, widget, size=(-1,-1), force_layout=True):
+    def set_item_best_size(self, widget, size=(-1,-1)):
         if not self.widget or not widget.widget: return
 
         elem = self.widget.GetItem(widget.widget)
@@ -1090,14 +644,10 @@
             if h == -1: h = best_size[1]
             self.widget.SetItemMinSize(item, w, h)
 
-        if force_layout:
-            self.layout(True)
-
     @_frozen
-    def item_properties_modified(self, widget, modified=None, force_layout=True):
+    def item_properties_modified(self, widget, modified=None):
         "update layout properties"
-        if not self.widget or not widget.widget:
-            return
+        if not self.widget or not widget.widget: return
 
         item = self.widget.GetItem(widget.widget)  # a SizerItem or GBSizerItem instance
         if not item: return
@@ -1139,107 +689,25 @@
                     w,h = best_size
             self.widget.SetItemMinSize(widget.widget, w, h)
 
-        if force_layout:
-            self.layout(True)
-
-    def item_properties_modified2(self, widget, force_layout=True):
-        # workaround: called from EditNotebook.post_load()
-        if not self.widget or not widget.widget:
-            return
-
-        item = self.widget.GetItem(widget.widget)  # a SizerItem or GBSizerItem instance
-        if not item: return
-
-        # set either specified size or GetBestSize
-        if not item.IsWindow(): return
-
-        best_size = widget.widget.GetBestSize()
-        size_p = widget.properties["size"]
-        if size_p.is_active():
-            size = size_p.get_size(widget.widget) # XXX check dialog units -> call with window
-            w, h = size
-            if w == -1: w = best_size[0]
-            if h == -1: h = best_size[1]
-        else:
-            w,h = best_size
-        self.widget.SetItemMinSize(widget.widget, w, h)
-
-        self.layout(True)
-
-    def remove_item(self, elem, force_layout=True):
+    def remove_item(self, child, level, keep_slot=False):
         "Removes elem from self"
-        # called e.g. from context menu of SizerSlot
-        if elem:
-            for c in self.children[elem.pos + 1:]:
-                c.properties["pos"].value -= 1
-            del self.children[elem.pos]
+        # called from context menu of SizerSlot; detaches element and does re-layout
+        edit_base.EditBase.remove_item(self, child, level, keep_slot)
+        if level>0: return
         if "rows" in self.PROPERTIES and not self._IS_GRIDBAG:
             self._adjust_rows_cols()  # for GridSizer
-        if self.widget and elem.widget:
-            if not self._IS_GRIDBAG:
-                self.widget.Detach(elem.pos)
-            else:
-                self.widget.Detach(elem.widget)  # don't use pos, as for gridbag it might be invalid
-            elem.sizer = None
-            if force_layout:
-                self.layout(True)
-                self.window.widget.Refresh()
-                # if not self.toplevel: self.sizer.Layout()
-
-    def layout(self, recursive=True):
-        # update slot labels in tree view
-        for c in self.children:
-            if isinstance(c, SizerSlot):
-                common.app_tree.refresh_name( c.node )
-
-        if not self.widget:
-            return
-
-        # layout
-        if self.toplevel and not self.window._is_toplevel and hasattr(self.window.sizer, 'widget'):
-            if not self.window.properties['size'].is_active():
-                szr = self.window.sizer.widget
-                w, h = self.window.widget.GetBestSize()
-                szr.SetItemMinSize(self.window.widget, w, h)
-            if self.window.sizer is not self:
-                self.window.sizer.layout(False)
-            else:
-                szr.Layout()
-            return
-        elif self.toplevel and self.window._is_toplevel:
-            # self.window.widget.Layout()
-            self.widget.Layout()
-            evt = wx.SizeEvent( self.window.widget.GetSize(), self.window.widget.GetId() )
-            wx.PostEvent(self.window.widget, evt)
-            # don't change the size of the window
-            if not misc.check_wx_version(2, 6, 0):
-                self.widget.FitInside(self.window.widget)
-            return
-        self.widget.SetMinSize(self.widget.CalcMin())
-        self.widget.Layout()
-        for c in self.children:
-            try:
-                c.widget.Refresh()
-            except:
-                pass
-        if recursive:
-            if getattr(self, 'sizer', None) is not None:
-                self.sizer.layout(recursive)
-
-    def delete(self):
-        "Destructor"
-        self.destroy_widget()
-        if self.toplevel:
-            self.window.set_sizer(None)
 
-    def destroy_widget(self):
-        # actually, the sizer widget is not destroyed
-        if self._btn:
-            # delete SizerHandleButton first, as the sizer widget may be destroyed already when called from change_sizer
-            self._btn.Destroy()
-            self._btn = None
+    def destroy_widget(self, level):
         if not self.widget: return
-        self.widget.Clear()  # without deleting window items; but sets the sizer of the windows to NULL
+        if compat.IS_PHOENIX:
+            self.widget.Clear(delete_windows=True)  # not available with wxPython 3.0
+        else:
+            self.widget.DeleteWindows()
+            self.widget.Clear()
+        if not self.parent.IS_SIZER: self.window.widget.SetSizer(None)
+        # the call of self.widget.Destroy() would crash on mac os
+        #edit_base.EditBase.destroy_widget(self, level)
+        self.widget = None
 
     if wx.Platform == '__WXMSW__':
         def finish_set(self):  # previously called after self.set_option(...)
@@ -1253,21 +721,13 @@
         def finish_set(self):
             pass
 
-    def refresh(self, *args):
-        # this will be self.widget.Refresh
-        for c in self.children:
-            if c.widget:
-                try:
-                    c.widget.Refresh()
-                except AttributeError:
-                    pass
-
     def update_view(self, selected):
         if self._btn is None: return
         if selected:
             color = wx.RED
         else:
             color = compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_BTNFACE)
+        if not self._btn or self._btn.IsBeingDeleted(): return
         self._btn.SetBackgroundColour(color)
         self._btn.Refresh(True)
 
@@ -1276,57 +736,21 @@
         "adds an empty slot to the sizer, i.e. a fake window that will accept the dropping of widgets"
         # called from "add slot" context menu handler of sizer
         # called from XML parser for adding empty 'sizerslot': sizer._add_slot(loading=True)
-        slot = SizerSlot(self.window, self, len(self.children))
-        self.children.append( slot )
+        slot = SizerSlot(self, len(self.children))
         if "rows" in self.PROPERTIES: self._adjust_rows_cols(loading)  # for GridSizer
+        if self.widget: slot.create()
+        return slot
 
-        # insert node into tree
-        slot.node = node = SlotNode(slot)
-        common.app_tree.add(node, self.node)
-
-        if self.widget:
-            slot.create()  # create the actual SizerSlot widget
-            if not self._IS_GRIDBAG:
-                self.widget.Add(slot.widget, 1, wx.EXPAND)
-            else:
-                self._check_slots(remove_only=True)  # the added slot could be hidden
-                self.widget.Add( slot.widget, slot.pos, slot.span, slot.flag, slot.border )
-            self.widget.SetItemMinSize(slot.widget, 20, 20)
-
-    def _insert_slot(self, pos=None, select=True, no_add=False):
+    def _insert_slot(self, index=None):
         "Inserts an empty slot into the sizer at pos (1 based); optionally force layout update"
         # called from context menu handler; multiple times if applicable; layout will be called there
         # also called from SizerBase._remove after a sizer has removed itself and inserts an empty slot instead
-        # pos is 1 based here
-        slot = SizerSlot(self.window, self, pos)
-        if pos<len(self.children) and self.children[pos] is None:
-            # a placeholder to be overwritten
-            self.children[pos] = slot
-        else:
-            self.children.insert( pos, slot )
-        for p,c in enumerate(self.children):
-            if p==0 or c is None: continue
-            pos_p = c.properties["pos"]
-            if pos_p.value!=p: pos_p.value=p
-
+        if index>=len(self.children) or not self.children[index] is None:
+            self.children.insert( index, None)  # placeholder to be overwritten
+        slot = SizerSlot(self, index)
         if "rows" in self.PROPERTIES: self._adjust_rows_cols()  # for GridSizer
-
-        # insert node into tree
-        slot.node = node = SlotNode(slot)
-        common.app_tree.insert(node, self.node, pos-1, select=select)
-        for c in self.children:
-            if isinstance(c, SizerSlot):
-                common.app_tree.refresh_name( c.node )
-
-        if self.widget:
-            slot.create()  # create the actual SizerSlot
-            if not no_add:
-                if not self._IS_GRIDBAG:
-                    self.widget.Insert(pos, slot.widget, slot.proportion, slot.flag)
-                else:
-                    self._check_slots(remove_only=True)  # the added slot could be hidden
-                    self.widget.Add(slot.widget, slot.pos, slot.span, slot.flag, slot.border)
-            self.widget.SetItemMinSize(slot.widget, 20, 20)
+        if self.widget: slot.create()
+        return slot
 
     # insert/add slot callbacks for context menus ######################################################################
     def _ask_count(self, insert=True):
@@ -1340,54 +764,43 @@
         dlg.Destroy()
         return ret
 
-    def insert_slot(self, pos, multiple=False):
+    def insert_slot(self, index, multiple=False):
         # insert before current
         if not self._can_add_insert_slots(report=True):
             return
         count = self._ask_count() if multiple else 1
+        if not count: return
         with self.window.frozen():
             for n in range(count):
-                self._insert_slot(pos)
-            if self.widget: self.layout(True)
-        common.app_tree.app.saved = False
+                slot = self._insert_slot(index)
+            if self.widget: self.layout()
+        misc.rebuild_tree(slot, recursive=False)
 
     def add_slot(self, multiple=False):
         # add to the end
         if not self._can_add_insert_slots(report=True):
             return
         count = self._ask_count(insert=False) if multiple else 1
+        if not count: return
         with self.window.frozen():
             for n in range(count):
-                self._add_slot()
+                slot = self._add_slot()
             if self.widget: self.layout()
-        common.app_tree.app.saved = False
+        misc.rebuild_tree(slot, recursive=False)  # rebuild also slots
 
     @_frozen
-    def free_slot(self, pos, force_layout=True):
-        "Replaces the element at pos with an empty slot"
+    def _free_slot(self, index):
+        "Replaces the element at index with an empty slot"
         # called from ManagedBase context menu when removing an item
-        old_node = self.children[pos].node
-        slot = SizerSlot(self.window, self, pos)
-        self.children[pos] = slot
-
-        # replace the node with a SlotNode
-        slot.node = node = SlotNode(slot)
-        if self.widget:
-            # required here; otherwise removal of a StaticBox of a StaticBoxSizer will cause a crash
-            self.widget.Detach(old_node.widget.widget)
-        common.app_tree.change_node( old_node, slot, node )  # calls the delete methods of the widgets
+        slot = SizerSlot(self, index)
 
         if self.widget:
             slot.create()  # create the actual SizerSlot as wx.Window with hatched background
-            # pos is 1 based, Insert/Detach are 0 based, but item at 0 is the handle button
-            if not self._IS_GRIDBAG:
-                self.widget.Insert(pos, slot.widget, 1, wx.EXPAND)
-            else:
-                self.widget.Add( slot.widget, pos, slot.span, slot.flag, slot.border )
+            if self._IS_GRIDBAG:
                 self._check_slots(add_only=True)
-            if force_layout:
-                self.layout()
+            self.layout()
         return slot
+
     ####################################################################################################################
     def is_visible(self):
         return self.window.is_visible()
@@ -1408,9 +821,45 @@
                 postfix = 'd'
             size_p.set('%s, %s%s' % (w, h, postfix))
 
+    def child_widgets_created(self, level):
+        # called after (all) child widgets have been created or a single one has been added
+        if "rows" in self.PROPERTIES: self._adjust_rows_cols()  # for GridSizer
+        if not self.toplevel:
+            return
+        size_p = self.window.properties['size']
+        if not size_p.is_active():
+            self.fit_parent()
+            w, h = self.widget.GetSize()
+            postfix = ''
+            if config.preferences.use_dialog_units:
+                w, h = compat.ConvertPixelsToDialog( self.window.widget, self.widget.GetSize() )
+                postfix = 'd'
+            size_p.set('%s, %s%s' % (w, h, postfix))
+
+    def _get_tree_image(self):
+        "Get an image name for tree display"
+        name = self.__class__.__name__
+
+        if name in ("EditStaticBoxSizer", "EditBoxSizer"):
+            # with or without label, horizontal/vertical
+            if self.orient & wx.VERTICAL:
+                name = "EditVerticalSizer"
+            elif self.orient & wx.HORIZONTAL:
+                name = "EditHorizontalSizer"
+            else:
+                name = "EditSpacer"
+        elif name=="EditWrapSizer":
+            if self.orient & wx.VERTICAL:
+                name = "EditVerticalWrapSizer"
+            else:
+                name = "EditHorizontalWrapSizer"
+
+        return name
+
 
 
 class wxGladeBoxSizer(wx.BoxSizer):
+    _BTN_OFFSET = 1
     def SetItemMinSize(self, item, w, h):
         if w==-1 or h==-1:
             try:
@@ -1422,79 +871,73 @@
         wx.BoxSizer.SetItemMinSize(self, item, w, h)
 
 
-class Dummy(object):
-    "dummy item for SizerItem that contains the sizer handle button sizer._btn"
-    widget = None
-    proportion = border = 0
-    span = (1,1)
-    flags = wx.EXPAND
-
-
 class BoxSizerBase(SizerBase):
     "orientation handling for BoxSizer and StaticBoxSizer"
 
-    def __init__(self, name, window, orient=wx.VERTICAL, elements=0, toplevel=True):
+    def __init__(self, name, parent, index, orient=wx.VERTICAL, elements=0):
         # elements: number of slots
-        SizerBase.__init__(self, name, self.WX_CLASS, orient, window, toplevel)
+        SizerBase.__init__(self, name, parent, index, orient)
 
-        self.children = [Dummy()]  # add to self.children the SizerItem for self._btn
-
-        for i in range(1, elements + 1):
-            self._add_slot()
-        self.layout()
+        self.children = []
+        for i in range(elements): self._add_slot()
 
     def get_class_orient(self):
         return '%s (%s)'%( self.WX_CLASS, self.properties["orient"].get_string_value() )
 
     def _check_flags(self, flags, added=None):
         excludes = set()
-        remove = set()
+        replace = {}
         msg = None
+        if "wxALIGN_RIGHT" in flags and ("wxALIGN_CENTER" in flags or "wxALIGN_CENTER_HORIZONTAL" in flags):
+            msg = "Multiple conflicting horizontal alignment flags"
+            if "wxALIGN_CENTER" in flags:            replace["wxALIGN_CENTER"] = None
+            if "wxALIGN_CENTER_HORIZONTAL" in flags: replace["wxALIGN_CENTER_HORIZONTAL"] = None
+
+        if "wxALIGN_BOTTOM" in flags and ("wxALIGN_CENTER" in flags or "wxALIGN_CENTER_VERTICAL" in flags):
+            msg = "Multiple conflicting vertical alignment flags"
+            if "wxALIGN_CENTER" in flags:          replace["wxALIGN_CENTER"] = None
+            if "wxALIGN_CENTER_VERTICAL" in flags: replace["wxALIGN_CENTER_VERTICAL"] = None
+            
         if self.orient==wx.VERTICAL:
             excludes = {"wxALIGN_BOTTOM", "wxALIGN_CENTER_VERTICAL", "wxALIGN_CENTER"}
-            if "wxALIGN_BOTTOM" in flags:
-                remove.add("wxALIGN_BOTTOM")
-                msg = "Vertical alignment flags are ignored in vertical sizers"
-
-            # We need to accept wxALIGN_CENTER_VERTICAL when it is combined with wxALIGN_CENTER_HORIZONTAL because
-            # this is known as wxALIGN_CENTER and we accept it historically in wxSizer API.
-            if not "wxALIGN_CENTER_HORIZONTAL" in flags and "wxALIGN_CENTER_VERTICAL" in flags:
+            if "wxALIGN_BOTTOM" in flags or "wxALIGN_CENTER_VERTICAL" in flags or "wxALIGN_CENTER" in flags:
                 msg = "Vertical alignment flags are ignored in vertical sizers"
-                remove.add("wxALIGN_CENTER_VERTICAL")
+                if "wxALIGN_BOTTOM" in flags:          replace["wxALIGN_BOTTOM"] = None
+                if "wxALIGN_CENTER_VERTICAL" in flags: replace["wxALIGN_CENTER_VERTICAL"] = None
+                if "wxALIGN_CENTER" in flags:          replace["wxALIGN_CENTER"] = "wxALIGN_CENTER_HORIZONTAL"
 
             # Note that using alignment with wxEXPAND can make sense if wxSHAPED is also used,
             # as the item doesn't necessarily fully expand in the other direction in this case.
             if "wxEXPAND" in flags and not "wxSHAPED" in flags:
                 if "wxALIGN_RIGHT" in flags or "wxALIGN_CENTER_HORIZONTAL" in flags or "wxALIGN_CENTER" in flags:
                     msg = "Horizontal alignment flags are ignored with wxEXPAND"
-                    remove.update({"wxALIGN_RIGHT", "wxALIGN_CENTER_HORIZONTAL", "wxALIGN_CENTER"})
-                excludes.update({"wxALIGN_RIGHT", "wxALIGN_CENTER_HORIZONTAL"})
+                    if "wxALIGN_RIGHT" in flags:             replace["wxALIGN_RIGHT"] = None
+                    if "wxALIGN_CENTER_HORIZONTAL" in flags: replace["wxALIGN_CENTER_HORIZONTAL"] = None
+                    if "wxALIGN_CENTER" in flags:            replace["wxALIGN_CENTER"] = "wxALIGN_CENTER_VERTICAL"
+                excludes.update({"wxALIGN_RIGHT", "wxALIGN_CENTER_HORIZONTAL", "wxALIGN_CENTER"})
 
         else:  # horizontal
             excludes = {"wxALIGN_RIGHT", "wxALIGN_CENTER_HORIZONTAL", "wxALIGN_CENTER"}
-            if "wxALIGN_RIGHT" in flags:
-                msg = "Horizontal alignment flags are ignored in horizontal sizers"
-                remove.add("wxALIGN_RIGHT")
-    
-            if not "wxALIGN_CENTER_VERTICAL" in flags and "wxALIGN_CENTER_HORIZONTAL" in flags:
-                # the combination would be wxALIGN_CENTER and accepted
+            if "wxALIGN_RIGHT" in flags or "wxALIGN_CENTER_HORIZONTAL" in flags or "wxALIGN_CENTER" in flags:
                 msg = "Horizontal alignment flags are ignored in horizontal sizers"
-                remove.add("wxALIGN_CENTER_HORIZONTAL")
+                if "wxALIGN_RIGHT" in flags:             replace["wxALIGN_RIGHT"] = None
+                if "wxALIGN_CENTER_HORIZONTAL" in flags: replace["wxALIGN_CENTER_HORIZONTAL"] = None
+                if "wxALIGN_CENTER" in flags:            replace["wxALIGN_CENTER"] = "wxALIGN_CENTER_VERTICAL"
     
             if "wxEXPAND" in flags and not "wxSHAPED" in flags:
                 if "wxALIGN_BOTTOM" in flags or "wxALIGN_CENTER_VERTICAL" in flags or "wxALIGN_CENTER" in flags:
                     msg = "Vertical alignment flags are ignored with wxEXPAND"
-                    remove.update({"wxALIGN_BOTTOM", "wxALIGN_CENTER_VERTICAL"})
-                excludes.update( {"wxALIGN_BOTTOM", "wxALIGN_CENTER_VERTICAL"} )
-
-        return excludes, remove, msg
-
-    def properties_changed(self, modified):
-        if not modified or "orient" in modified and self.node and config.use_gui:
-            # update the image
-            common.app_tree.SetItemImage(self.node.item, self.node.get_image() )
-
-        SizerBase.properties_changed(self, modified)
+                    if "wxALIGN_BOTTOM" in flags:          replace["wxALIGN_BOTTOM"] = None
+                    if "wxALIGN_CENTER_VERTICAL" in flags: replace["wxALIGN_CENTER_VERTICAL"] = None
+                    if "wxALIGN_CENTER" in flags:          replace["wxALIGN_CENTER"] = "wxALIGN_CENTER_HORIZONTAL"
+                excludes.update( {"wxALIGN_BOTTOM", "wxALIGN_CENTER_VERTICAL", "wxALIGN_CENTER"} )
+
+        return excludes, replace, msg
+
+    def _properties_changed(self, modified, actions):
+        if modified and "orient" in modified:
+            actions.add("image")
+        SizerBase._properties_changed(self, modified, actions)
 
 
 class EditBoxSizer(BoxSizerBase):
@@ -1502,35 +945,14 @@
     WX_CLASS = "wxBoxSizer"
 
     def create_widget(self):
+        BoxSizerBase.create_widget(self)
         self.widget = wxGladeBoxSizer(self.orient)
         self.widget.Add(self._btn, 0, wx.EXPAND)
-        to_lay_out = []
-        for c in self.children[1:]:  # we've already added self._btn
-            c.create()
-            if isinstance(c, SizerSlot):
-                self.widget.Add(c.widget, 1, wx.EXPAND)
-                self.widget.SetItemMinSize(c.widget, 20, 20)
-            else:
-                sp = c.properties.get('size')
-                if sp and sp.is_active():
-                    if (c.proportion != 0 or (c.flag & wx.EXPAND)) and not (c.flag & wx.FIXED_MINSIZE):
-                        c.widget.Layout()
-                        size = sp.get_size(c.widget)
-                        c.widget.SetMinSize(size)
-                    else:
-                        size = sp.get_size(c.widget)
-                        # now re-set the item to update the size correctly...
-                        to_lay_out.append((c.pos, size) )
-        for pos, size in to_lay_out:
-            self.set_item_best_size(self.children[pos], size)
-        self.layout(True)
-        if not self.toplevel and getattr(self, 'sizer'):
-            # hasattr(self, 'sizer') is False only in case of a 'change_sizer' call
-            self.sizer.add_item( self, self.pos, self.widget.GetMinSize() )
 
 
 if HAVE_WRAP_SIZER:
     class wxGladeWrapSizer(wx.WrapSizer):
+        _BTN_OFFSET = 1
         def SetItemMinSize(self, item, w, h):
             if w==-1 or h==-1:
                 try:
@@ -1546,37 +968,27 @@
         "Class to handle wxWrapSizer objects"
         WX_CLASS = "wxWrapSizer"
     
-        def create_widget(self):
+        def create_widget(self, dont_add=False):
+            BoxSizerBase.create_widget(self)
             self.widget = wxGladeWrapSizer(self.orient)
             self.widget.Add(self._btn, 0, wx.EXPAND)
-            to_lay_out = []
-            for c in self.children[1:]:  # we've already added self._btn
-                c.create()
-                if isinstance(c, SizerSlot):
-                    self.widget.Add(c.widget, 1, wx.EXPAND)
-                    self.widget.SetItemMinSize(c.widget, 20, 20)
-                else:
-                    sp = c.properties.get('size')
-                    if sp and sp.is_active():
-                        if (c.proportion != 0 or (c.flag & wx.EXPAND)) and not (c.flag & wx.FIXED_MINSIZE):
-                            c.widget.Layout()
-                            size = sp.get_size(c.widget)
-                            c.widget.SetMinSize(size)
-                        else:
-                            size = sp.get_size(c.widget)
-                            # now re-set the item to update the size correctly...
-                            to_lay_out.append((c.pos, size) )
-            for pos, size in to_lay_out:
-                self.set_item_best_size(self.children[pos], size)
-            self.layout(True)
-            if not self.toplevel and getattr(self, 'sizer'):
-                # hasattr(self, 'sizer') is False only in case of a 'change_sizer' call
-                self.sizer.add_item( self, self.pos, self.widget.GetMinSize() )
-    
 
 
+class EditStdDialogButtonSizer(EditBoxSizer):
+    "Class to handle wxStdDialogButtonSizer objects"
+    WX_CLASS = "wxStdDialogButtonSizer"
+    # the stockitems that are handled specially by StdDialogButtonSizer
+    BUTTON_STOCKITEMS = ["OK", "YES", "SAVE", "APPLY", "CLOSE","NO", "CANCEL", "HELP", "CONTEXT_HELP"]
+    def __init__(self, name, parent, index, elements=0):
+        # elements: number of slots
+        BoxSizerBase.__init__(self, name, parent, index, wx.HORIZONTAL, elements)
+
+    def get_class_orient(self):
+        return self.WX_CLASS
+
 
 class wxGladeStaticBoxSizer(wx.StaticBoxSizer):
+    _BTN_OFFSET = 1
     def SetItemMinSize(self, item, w, h):
         if w==-1 or h==-1:
             try:
@@ -1588,62 +1000,37 @@
         wx.StaticBoxSizer.SetItemMinSize(self, item, w, h)
 
 
-
 class EditStaticBoxSizer(BoxSizerBase):
     "Class to handle wxStaticBoxSizer objects"
     WX_CLASS = "wxStaticBoxSizer"
-    PROPERTIES = ["Common", "name", "class", "orient", "class_orient", # class and orient are hidden
+    PROPERTIES = ["Common", "name", "orient", "class_orient", # class and orient are hidden
                   "label", "attribute",
                   "Layout"]  # not a property, just start the next page in the editor
     EXTRA_PROPERTIES = []
 
-    def __init__(self, name, window, orient=wx.VERTICAL, label='', elements=3, toplevel=True):
-        BoxSizerBase.__init__(self, name, window, orient, elements, toplevel)
+    def __init__(self, name, parent, index, orient=wx.VERTICAL, label='', elements=3):
+        BoxSizerBase.__init__(self, name, parent, index, orient, elements)
         self.label = np.TextProperty(label)
 
     def create_widget(self):
+        BoxSizerBase.create_widget(self)
         self.widget = wxGladeStaticBoxSizer( wx.StaticBox(self.window.widget, -1, self.label), self.orient )
         self.widget.Add(self._btn, 0, wx.EXPAND)
-        for c in self.children[1:]:  # we've already added self._btn
-            c.create()
-            if isinstance(c, SizerSlot):
-                self.widget.Add(c.widget, 1, wx.EXPAND)
-                self.widget.SetItemMinSize(c.widget, 20, 20)
-            else:
-                size_p = c.properties.get('size')
-                if size_p and size_p.is_active() and ( c.proportion == 0 or not (c.flag & wx.EXPAND) ):
-                    w,h = size_p.get_size(c.widget)
-                else:
-                    w, h = c.widget.GetBestSize()
-                self.widget.SetItemMinSize(c.widget, w, h)
-        self.layout()
-        if not self.toplevel and getattr(self, 'sizer'):
-            # getattr(self, 'sizer') is False only in case of a 'change_sizer' call
-            self.sizer.add_item(self, self.pos, self.widget.GetMinSize())
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "label" in modified and self.widget:
             self.widget.GetStaticBox().SetLabel(self.label or "")
-            #self.layout()
-        if modified and "name" in modified:
-            previous_name = self.properties["name"].previous_value
-            common.app_tree.refresh_name(self.node, previous_name)
-        elif not modified or "label" in modified or "name" in modified and self.node:
-            common.app_tree.refresh_name(self.node)
-
-        BoxSizerBase.properties_changed(self, modified)
-
-    def destroy_widget(self):
-        if self.widget:
-            self.widget.GetStaticBox().Destroy()
-        SizerBase.destroy_widget(self)
+        BoxSizerBase._properties_changed(self, modified, actions)
 
+    def destroy_widget(self, level):
+        if self.widget: self.widget.GetStaticBox().Destroy()
+        SizerBase.destroy_widget(self, level)
 
 
 class CustomGridSizer(wx.BoxSizer):
     """Custom wxSizer class used to implement a GridSizer with an additional handle button.
     e.g. in EditGridSizer instance: self.widget = CustomGridSizer(self,rows,cols,vgap,hgap"""
-
+    _BTN_OFFSET = 0
     def __init__(self, parent, rows, cols, vgap, hgap):
         wx.BoxSizer.__init__(self, wx.VERTICAL)
         self.parent = parent  # EditGridSizer or derived class
@@ -1666,23 +1053,23 @@
     def Add(self, *args, **kwds):
         self._grid.Add(*args, **kwds)
 
-    def Insert(self, pos, *args, **kwds):
-        self._grid.Insert(pos - 1, *args, **kwds)
+    def Insert(self, index, *args, **kwds):
+        self._grid.Insert(index, *args, **kwds)
 
     def Remove(self, *args, **kwds):
         try:
-            pos = int(args[0]) - 1
-            self._grid.Remove(pos)
+            index = int(args[0])
+            self._grid.Remove(index)
         except TypeError:
             self._grid.Remove(*args, **kwds)
 
-    def RemovePos(self, pos):
-        self._grid.Remove(pos - 1)
+    def RemovePos(self, index):
+        self._grid.Remove(index)
 
     def Detach(self, pos_or_obj):
         try:
-            pos = int(pos_or_obj) - 1
-            self._grid.Detach(pos)
+            index = int(pos_or_obj)
+            self._grid.Detach(index)
         except TypeError:
             self._grid.Detach(pos_or_obj)
 
@@ -1696,7 +1083,7 @@
         self._grid.SetItemMinSize(item, w, h)
 
     def GetChildren(self):
-        return [None] + list(self._grid.GetChildren())
+        return self._grid.GetChildren()
 
     def GetItem(self, widget):
         if hasattr(self._grid, "FindItem"):
@@ -1755,7 +1142,6 @@
                 old_sizer_item.AssignWindow(widget)
         else:
             self._grid.Add( widget, pos, span, flag, border )
-        print("ADDED", widget, pos, span, self._grid.GetChildren())
 
     def Detach(self, obj):
         self._grid.Detach(obj)
@@ -1763,15 +1149,19 @@
 
 class GridSizerBase(SizerBase):
     "Base class for Grid sizers"
-    _PROPERTY_HELP = {"rows":"Numbers of sizer rows; can be set to 0 for 'as many as required'",
-                      "cols":"Numbers of sizer columns; can be set to 0 for 'as many as required'",
+    _PROPERTY_HELP = {"rows":"Number of sizer rows; can be set to 0 for 'as many as required'.\n"
+                             "This will re-arrange the children and empty slots, but not add/remove slots.\n"
+                             "To insert/add rows, better use the context menu items",
+                      "cols":"Number of sizer columns; can be set to 0 for 'as many as required'.\n"
+                             "This will re-arrange the children and empty slots, but not add/remove slots.\n"
+                             "To insert/add columns, better use the context menu items",
                       "vgap":'Vertical extra space between all children',
                       "hgap":'Horizontal extra space between all children'}
 
     EXTRA_PROPERTIES = ["Grid", "rows", "cols", "vgap", "hgap"]
 
-    def __init__(self, name, klass, window, rows=3, cols=3, vgap=0, hgap=0, toplevel=True):
-        SizerBase.__init__(self, name, klass, None, window, toplevel)
+    def __init__(self, name, parent, index, rows=3, cols=3, vgap=0, hgap=0):
+        SizerBase.__init__(self, name, parent, index, None)
         if self.WX_CLASS == "wxGridBagSizer":
             val_range=(1,1000)
         else:
@@ -1782,35 +1172,6 @@
         self.vgap = np.SpinProperty(vgap, immediate=True)
         self.hgap = np.SpinProperty(hgap, immediate=True)
 
-        self.children = [Dummy()]  # add to self.children the SizerItem for self._btn
-        for i in range(1, self.rows * self.cols + 1):
-            slot = SizerSlot(self.window, self, i) # XXX no node?
-            self.children.append(slot)
-
-    def create_widget(self):
-        "This must be overriden and called at the end of the overriden version"
-        to_lay_out = []
-        for c in self.children[1:]:  # we've already added self._btn
-            c.create()
-            if isinstance(c, SizerSlot):
-                self.widget.Add(c.widget, 1, wx.EXPAND)
-                self.widget.SetItemMinSize(c.widget, 20, 20)
-            else:
-                sp = c.properties.get('size')
-                if sp and sp.is_active():
-                    if (c.proportion != 0 or (c.flag & wx.EXPAND)) and not (c.flag & wx.FIXED_MINSIZE):
-                        c.widget.Layout()
-                        size = sp.get_size(c.widget)
-                        c.widget.SetMinSize(size)
-                    else:
-                        size = sp.get_size(c.widget)
-                        # now re-set the item to update the size correctly...
-                        to_lay_out.append( (c.pos, size) )
-
-        for pos, size in to_lay_out:
-            self.set_item_best_size(self.children[pos], size=size, force_layout=False)
-        self.layout(True)
-
     def fit_parent(self, *args):
         "Tell the sizer to resize the window to match the sizer's minimal size"
         if self.widget and self.window.widget:
@@ -1818,7 +1179,7 @@
             self.widget.SetSizeHints(self.window.widget)
 
     def _can_add_insert_slots(self, report=False):
-        if self.rows and self.cols:
+        if self.rows and self.cols and len(self.children)==self.rows*self.cols:
             # if both are defined, a re-sizing would need to be done
             if report:
                 misc.error_message("Can't add or insert slots as sizer's Rows and Cols are fixed (see Properties -> Grid).")
@@ -1830,28 +1191,36 @@
         rows = self.rows
         cols = self.cols
         # for GridSizer and FlexGridSizer cols may be 0, i.e. auto calculated
-        if cols==0:    cols = (len(self.children)-2)//rows + 1
-        elif rows==0:  rows = (len(self.children)-2)//cols + 1
+        if cols==0:    cols = (len(self.children)-1)//rows + 1
+        elif rows==0:  rows = (len(self.children)-1)//cols + 1
         return rows, cols
-    def _get_row_col(self, pos, cols=None):
+
+    def _get_row_col(self, index, cols=None):
         if cols is None:
             rows, cols = self._get_actual_rows_cols()
-        return (pos-1) // cols,  (pos-1) %  cols
+        return index // cols,  index %  cols
 
     def _get_pos(self, row, col):
         rows, cols = self._get_actual_rows_cols()
-        return 1 + row*cols + col
+        return row*cols + col
 
     def _adjust_rows_cols(self, loading=False):
         # called when items are added or removed: adjust number of rows
         cols_p = self.properties["cols"]
         rows_p = self.properties["rows"]
         if rows_p.value==0 or cols_p.value==0: return
-        rows_new = (len(self.children)-2) // cols_p.get() + 1
+        rows_new = (len(self.children)-1) // cols_p.get() + 1
         if rows_new==rows_p.value or (loading and rows_new<rows_p.value): return
         rows_p.set(rows_new)
 
     # context menu actions #############################################################################################
+    def _rebuild_tree(self):
+        # refresh labels of existing slots; add tree items for new
+        for c in self.children:
+            if c.IS_SLOT and c.item:
+                common.app_tree.refresh(c)
+        misc.rebuild_tree(self)
+
     @_frozen
     def insert_row(self, pos=-1):
         "inserts slots for a new row"
@@ -1861,7 +1230,7 @@
         if pos==-1:
             add_row = rows
             # ensure that the last row is full
-            for n in range( len(self.children) -rows*cols - 1 ):
+            for n in range( rows*cols - len(self.children) ):
                 self._insert_slot( len(self.children) )
         else:
             add_row, dummy = self._get_row_col(pos)
@@ -1871,7 +1240,7 @@
             if self.widget: self.widget.SetRows(rows+1)
 
         for n in range(cols):
-            self._insert_slot( n+1 + add_row*cols )
+            self._insert_slot( n + add_row*cols )
 
         if "growable_rows" in self.PROPERTIES:
             self.properties["growable_rows"].shift_items(add_row)
@@ -1879,8 +1248,8 @@
         if self.widget:
             if "growable_rows" in self.PROPERTIES:
                 self._set_growable()
-            self.layout(True)
-        common.app_tree.app.saved = False
+            self.layout()
+        self._rebuild_tree()
 
     @_frozen
     def insert_col(self, pos=-1):
@@ -1894,13 +1263,13 @@
             dummy, add_col = self._get_row_col(pos)
 
         # calculate the column index of the last child (0 based)
-        last_pos = len(self.children)-1
+        last_pos = len(self.children)
         last_pos_col = (last_pos % cols) - 1
         if last_pos_col == -1: last_pos_col = cols-1
         # fill up the last row up to the insertion position if required
         if last_pos_col < min(add_col,cols-1):
             for i in range(min(add_col,cols-1)-last_pos_col):
-                self._insert_slot( last_pos+1+i )
+                self._insert_slot( last_pos+i )
 
         # insert the new colum
         if self.cols:
@@ -1908,8 +1277,9 @@
             if self.widget: self.widget.SetCols(cols+1)
         # insert placeholders to avoid problems with GridBagSizers and overlap tests
         for r in range(rows-1,-1,-1):
-            self.children.insert( add_col+1 + r*cols, None )
-        # actually create the slot
+            #self.children.insert( add_col+1 + r*cols, None )
+            self.children.insert( add_col + r*cols, None )
+        # actually create the slots
         for r in range(0,rows):
             self._insert_slot( self._get_pos(r,add_col) )
 
@@ -1920,20 +1290,18 @@
             if self.widget.GetCols()!=cols+1: self.widget.SetCols(cols+1)
             if "growable_rows" in self.PROPERTIES:
                 self._set_growable()
-            self.layout(True)
-        common.app_tree.app.saved = False
+            self.layout()
+        self._rebuild_tree()
 
     @_frozen
     def remove_row(self, pos):
         rows = self.rows
-        cols = self.cols
         # calculate row and pos of the slot
         row,col = self._get_row_col(pos)
         # find the slots that are in the same row
         slots = []
-        for pos,child in enumerate(self.children):
-            if pos==0: continue
-            child_row, child_col = self._get_row_col(pos)
+        for index,child in enumerate(self.children):
+            child_row, child_col = self._get_row_col(index)
             if child_row==row: slots.append(child)
         if rows: self.properties["rows"].set( rows-1 )
         # actually remove the slots
@@ -1945,7 +1313,9 @@
         if self.widget:
             if "growable_rows" in self.PROPERTIES:
                 self._set_growable()
-            self.layout(True)
+            if self.rows: self.widget.SetRows(self.rows)
+            self.layout()
+        self._rebuild_tree()
 
     @_frozen
     def remove_col(self, pos):
@@ -1954,9 +1324,8 @@
         row,col = self._get_row_col(pos)
         # find the slots that are in the same row
         slots = []
-        for pos,child in enumerate(self.children):
-            if pos==0: continue
-            child_row, child_col = self._get_row_col(pos)
+        for index,child in enumerate(self.children):
+            child_row, child_col = self._get_row_col(index)
             if child_col==col: slots.append(child)
         if cols: self.properties["cols"].set( cols-1 )
         # actually remove the slots
@@ -1970,40 +1339,45 @@
                 self.widget.SetCols(cols-1)
             if "growable_cols" in self.PROPERTIES:
                 self._set_growable()
-            self.layout(True)
+            if self.cols: self.widget.SetCols(self.cols)
+            self.layout()
+        self._rebuild_tree()
 
     ####################################################################################################################
     def _check_flags(self, flags, added=None):
-        remove = set()
+        replace = {}
         msg = None
         if "wxEXPAND" in flags:
             # Check that expansion will happen in at least one of the directions.
             if ( ("wxALIGN_BOTTOM" in flags or "wxALIGN_CENTER_VERTICAL" in flags or "wxALIGN_CENTER" in flags) and
                  ("wxALIGN_RIGHT" in flags or "wxALIGN_CENTER_HORIZONTAL" in flags or "wxALIGN_CENTER" in flags) ):
                 if added is None or added=="wxEXPAND":
-                    remove = {"wxALIGN_BOTTOM", "wxALIGN_CENTER_VERTICAL", "wxALIGN_CENTER",
-                              "wxALIGN_RIGHT", "wxALIGN_CENTER_HORIZONTAL"}
+                    if "wxALIGN_BOTTOM" in flags:            replace["wxALIGN_BOTTOM"] = None
+                    if "wxALIGN_CENTER_VERTICAL" in flags:   replace["wxALIGN_CENTER_VERTICAL"] = None
+                    if "wxALIGN_CENTER" in flags:            replace["wxALIGN_CENTER"] = None
+                    if "wxALIGN_RIGHT" in flags:             replace["wxALIGN_RIGHT"] = None
+                    if "wxALIGN_CENTER_HORIZONTAL" in flags: replace["wxALIGN_CENTER_HORIZONTAL"] = None
                 else:
-                    remove = {"wxEXPAND"}
+                    replace["wxEXPAND"] = None
                 msg = "wxEXPAND flag would be overridden by alignment flags"
-        return set(), remove, msg 
+        return set(), replace, msg 
 
     @_frozen
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         rows, cols = self._get_actual_rows_cols()
-        if rows*cols < len(self.children) - 1:
+        if rows*cols < len(self.children):
             # number of rows/cols too low; this is not called if rows or col==0
             if not modified or "cols" in modified:
                 # adjust number of rows if required
-                if rows*cols < len(self.children) - 1:
+                if rows*cols < len(self.children):
                     # more rows required
-                    rows = (len(self.children)-1) // (cols or 1)
-                    if (len(self.children)-1) % (cols or 1): rows += 1
+                    rows = len(self.children) // (cols or 1)
+                    if len(self.children) % (cols or 1): rows += 1
                 self.properties["rows"].set(rows)
                 if modified and not "rows" in modified: modified.append("rows")
             elif "rows" in modified:
-                cols = (len(self.children)-1) // (rows or 1)
-                if (len(self.children)-1) % (rows or 1): cols += 1
+                cols = len(self.children) // (rows or 1)
+                if len(self.children) % (rows or 1): cols += 1
                 self.properties["cols"].set(cols)
                 if modified and not "cols" in modified: modified.append("cols")
 
@@ -2017,51 +1391,42 @@
             elif self.WX_CLASS != "wxGridBagSizer":
                 self.properties["rows"].set_range(0,1000)
 
-        layout = False
-
         if not "class_orient" in modified:  # otherwise, change_sizer will be called and we can skip the following
             if not modified or "rows" in modified and self.widget:
                 if self.widget.GetRows()!=self.rows:
                     self.widget.SetRows(self.rows)
-                    layout = True
+                    actions.add("layout")
             if not modified or "cols" in modified and self.widget:
                 if self.widget.GetCols()!=self.cols:
                     self.widget.SetCols(self.cols)
-                    layout = True
+                    actions.add("layout")
             if not modified or "hgap" in modified and self.widget:
                 if self.widget.GetHGap()!=self.hgap:
                     self.widget.SetHGap(self.hgap)
-                    layout = True
+                    actions.add("layout")
             if not modified or "vgap" in modified and self.widget:
                 if self.widget.GetVGap()!=self.vgap:
                     self.widget.SetVGap(self.vgap)
-                    layout = True
+                    actions.add("layout")
 
         if "growable_rows" in self.properties and self.widget:
             if not modified or "growable_rows" in modified or "growable_cols" in modified:
                 self._set_growable()
-                layout = True
-
-        if layout:
-            self.layout(True)
-            if self.widget: self.window.widget.Refresh()
+                actions.add("layout")
 
-        SizerBase.properties_changed(self, modified)
+        SizerBase._properties_changed(self, modified, actions)
 
 
 class EditGridSizer(GridSizerBase):
     "Class to handle wxGridSizer objects"
     WX_CLASS = "wxGridSizer"
 
-    def __init__(self, name, window, rows=3, cols=3, vgap=0, hgap=0, toplevel=True):
-        GridSizerBase.__init__(self, name, 'wxGridSizer', window, rows, cols, vgap, hgap, toplevel)
+    def __init__(self, name, parent, index, rows=3, cols=3, vgap=0, hgap=0):
+        GridSizerBase.__init__(self, name, parent, index, rows, cols, vgap, hgap)
 
     def create_widget(self):
-        self.widget = CustomGridSizer(self, self.rows, self.cols, self.vgap, self.hgap)
-        if not self.toplevel and getattr(self, 'sizer', None):
-            # getattr(self, 'sizer') is False only in case of a 'change_sizer' call
-            self.sizer.add_item(self, self.pos) # , self.widget.GetMinSize())
         GridSizerBase.create_widget(self)
+        self.widget = CustomGridSizer(self, self.rows, self.cols, self.vgap, self.hgap)
 
 
 class _GrowableDialog(wx.Dialog):
@@ -2085,7 +1450,6 @@
     def get_value(self):
         ret = []
         for c,choice in enumerate(self._choices):
-            #in range(self.choices.GetCount()):
             if self.choices.IsChecked(c):
                 ret.append(str(int(choice)-1))
         return ",".join(ret)
@@ -2101,7 +1465,6 @@
         self.message.SetLabel(message)
 
 
-
 class _GrowablePropertyD(np.DialogPropertyD):
     def _create_dialog(self):
         if self.dialog is None:
@@ -2187,20 +1550,17 @@
     _PROPERTY_HELP = {"growable_rows":'Select growable rows',
                       "growable_cols":'Select growable columns'}
 
-    def __init__(self, name, window, rows=3, cols=3, vgap=0, hgap=0, toplevel=True):
-        GridSizerBase.__init__(self, name, self.WX_CLASS, window, rows, cols, vgap, hgap, toplevel)
+    def __init__(self, name, parent, index, rows=3, cols=3, vgap=0, hgap=0):
+        GridSizerBase.__init__(self, name, parent, index, rows, cols, vgap, hgap)
         self.growable_rows = _GrowablePropertyD([], default_value=[])
         self.growable_cols = _GrowablePropertyD([], default_value=[])
         self.properties["growable_rows"].title = 'Select growable rows'
         self.properties["growable_cols"].title = 'Select growable cols'
 
     def create_widget(self):
-        self.widget = CustomFlexGridSizer(self, self.rows, self.cols, self.vgap, self.hgap)
         GridSizerBase.create_widget(self)
+        self.widget = CustomFlexGridSizer(self, self.rows, self.cols, self.vgap, self.hgap)
         self._set_growable()
-        if not self.toplevel and getattr(self, 'sizer', None) is not None:
-            # hasattr(self, 'sizer') is False only in case of a 'change_sizer' call
-            self.sizer.add_item(self, self.pos)
 
     def _set_growable(self):
         rows = self.growable_rows
@@ -2219,6 +1579,39 @@
             elif not growable and c in cols:
                 self.widget.AddGrowableCol(c)
 
+    @_frozen
+    def make_growable(self, direction, row_or_col):
+        "set growable_rows or growable_cols"
+        p_name = "growable_%ss"%direction
+        p = self.properties[p_name]
+        if row_or_col in p.value:
+            p.value.remove(row_or_col)
+        else:
+            p.value.append(row_or_col)
+            p.value.sort()
+        p.set_active(bool(p.value))
+        self.properties_changed([p_name])
+        p.update_display()
+
+    def ask_growable(self, row, col):
+        "ask user whether to make a row or col growable when the user has selected EXPAND without a growable row or col"
+        import dialogs
+        dlg = dialogs.MakeRowColGrowableDlg(common.main)
+        usr = dlg.ShowModal()
+        if usr != wx.ID_OK: return
+        changed = []
+        # we can be sure that row and col are not in the property values
+        if dlg.cb_row_growable.GetValue():
+            p = self.properties["growable_rows"]
+            p.set(sorted(p.value+[row]), activate=True)
+            changed.append("growable_rows")
+        if dlg.cb_col_growable.GetValue():
+            p = self.properties["growable_cols"]
+            p.set(sorted(p.value+[col]), activate=True)
+            changed.append("growable_cols")
+
+        dont_show_again = dlg.cb_dont_show_again.GetValue()
+        if changed: self.properties_changed(changed)
 
 
 class EditGridBagSizer(EditFlexGridSizer):
@@ -2228,41 +1621,16 @@
     _PROPERTY_HELP = {"rows":"Numbers of sizer rows; this is just used internally for wxGlade design, not by wx",
                       "cols":"Numbers of sizer columns; this is just used internally for wxGlade design, not by wx"}
 
-    def create_widget(self):  # this one does not call GridSizerBase.create_widget, as the strategy here is different
+    def create_widget(self):
+        GridSizerBase.create_widget(self)
         self.widget = CustomGridBagSizer(self, self.rows, self.cols, self.vgap, self.hgap)
-        #GridSizerBase.create_widget(self)
-        ################################################################################################################
-        
-        to_lay_out = []
-        for child in self.children[1:]:  # we've already added self._btn
-            pos = self._get_row_col(child.pos)
-            child.create()
-            if isinstance(child, SizerSlot) and child.widget:
-                self.widget.Add(child.widget, pos, (1,1), wx.EXPAND, 0)
-                self.widget.SetItemMinSize(child.widget, 20, 20)
-            else:
-                sp = child.properties.get('size')
-                if sp and sp.is_active():
-                    if (child.proportion != 0 or (child.flag & wx.EXPAND)) and not (child.flag & wx.FIXED_MINSIZE):
-                        child.widget.Layout()
-                        w, h = child.widget.GetBestSize()
-                        child.widget.SetMinSize((w, h))
-                    else:
-                        size = sp.get_size(child.widget)
-                        to_lay_out.append((child.pos, size))  # re-set the item to update the size correctly...
 
-        for pos, size in to_lay_out:
-            self.set_item_best_size(self.children[pos], size)
-        self.layout(True)
-        ################################################################################################################
+    def child_widgets_created(self, level):
         self._set_growable()
-        if not self.toplevel and getattr(self, 'sizer', None) is not None:
-            # hasattr(self, 'sizer') is False only in case of a 'change_sizer' call
-            self.sizer.add_item(self, self.pos)
 
-    def check_span_range(self, pos, rowspan=1, colspan=1):
+    def check_span_range(self, index, rowspan=1, colspan=1, inserting=False):
         "called from LayoutSpanProperty to set the maximum row/col span range"
-        row, col = self._get_row_col(pos)
+        row, col = self._get_row_col(index)
         # check max colspan
         max_col = col
         for c in range(col+1, self.cols):
@@ -2275,7 +1643,9 @@
                     break
                 child = self.children[p]
                 if not isinstance(child, SizerSlot): break
+                if inserting and child.overlapped: break
             if p>=len(self.children) or not isinstance(child, SizerSlot): break
+            if inserting and child.overlapped: break
             # only empty cells found
             max_col = c
         # check max rowspan
@@ -2290,21 +1660,22 @@
                     break
                 child = self.children[p]
                 if not isinstance(child, SizerSlot): break
+                if inserting and child.overlapped: break
             if p>=len(self.children) or not isinstance(child, SizerSlot): break
+            if inserting and child.overlapped: break
             # only empty cells found
             max_row = r
         return max_row-row+1, max_col-col+1
 
     def _get_occupied_slots(self):
         "get pos for all slots that are SizerSlots only, but are occupied by other items spanning over rows/cols"
-        pos = 0
+        index = 0
         occupied = []
         rows, cols = self._get_actual_rows_cols()
         for row in range(rows):
             for col in range(cols):
-                pos += 1
-                if pos==len(self.children): break
-                child = self.children[pos]
+                if index==len(self.children): break
+                child = self.children[index]
                 if not isinstance(child, SizerSlot) and not child is None:
                     # an element, check whether it spans over any slots
                     span = child.span
@@ -2314,15 +1685,15 @@
                                 if r==row and c ==col: continue  # the original cell
                                 if c>=self.cols: continue
                                 occupied.append( self._get_pos(r,c) )
-            if pos==len(self.children): break
+                index += 1
+            if index==len(self.children): break
         return occupied
 
     def _get_max_row_col(self):
         "get last row and col indices that are populated or spanned; for use by rows/cols properties"
         max_row = max_col = 0
-        for pos, child in enumerate(self.children):
-            if pos==0: continue
-            row, col = self._get_row_col(pos)
+        for index, child in enumerate(self.children):
+            row, col = self._get_row_col(index)
             if not isinstance(child, SizerSlot) and not child is None:
                 span = child.span
                 max_row = max( max_row, row + span[0] - 1 )
@@ -2332,10 +1703,9 @@
     def _check_slots(self, remove_only=False, add_only=False, add_to_sizer=True):
         "add/remove the widgets for empty slots"
         occupied = set( self._get_occupied_slots() )
-        for p,child in enumerate(self.children[1:]):
-            pos = p+1
+        for index,child in enumerate(self.children):
             if isinstance(child, SizerSlot):
-                if pos in occupied:
+                if index in occupied:
                     if not add_only: child.set_overlap(True, add_to_sizer=add_to_sizer)
                 else:
                     if not remove_only: child.set_overlap(False, add_to_sizer=add_to_sizer)
@@ -2345,12 +1715,12 @@
             misc.error_message("Can't insert or add slots as sizer's Rows and Cols are fixed (see Properties -> Grid).")
         return False
 
-    def get_child_index(self, pos):
+    def get_child_index(self, index):
         # return the index of the widget; overlapped slots are skipped
         ret = 0
         for p, child in enumerate(self.children):
             if child is None or (isinstance(child, SizerSlot) and child.overlapped): continue
-            if p==pos: return ret
+            if p==index: return ret
             ret += 1
 
     # context menu actions #############################################################################################
@@ -2364,9 +1734,8 @@
         remove_cols = [c for c in range(previous_cols) if not c in rows]
         new_children = [[None]*len(cols) for row in range(len(rows))]
         # detach all elements from old sizer
-        for pos, child in enumerate(self.children):
-            if pos==0: continue
-            r,c = self._get_row_col(pos, previous_cols)
+        for index, child in enumerate(self.children):
+            r,c = self._get_row_col(index, previous_cols)
             if r not in rows or c not in cols:
                 remove_slots.append(child)
                 if child.widget:
@@ -2390,7 +1759,7 @@
 
         # remove the slots, if required
         set_focus = misc.focused_widget in remove_slots
-        for slot in reversed(remove_slots): slot._remove()
+        for slot in reversed(remove_slots): slot.recursive_remove(level=0)
         if set_focus:
             misc.set_focused_widget(self)
 
@@ -2400,60 +1769,67 @@
         self.properties["growable_cols"].keep_items(cols)
 
         # insert placeholders to avoid problems with GridBagSizers and overlap tests
-        self.children[1:] = sum(new_children,[])
+        self.children[:] = sum(new_children,[])
         # actually create the new slots
-        for pos, child in enumerate(self.children):
-            if pos==0 or child is not None: continue
-            self._insert_slot( pos, select=False, no_add=True )
+        for index, child in enumerate(self.children):
+            if child is not None:
+                common.app_tree.refresh(child)
+                continue
+            self._insert_slot( index )
 
         # check overlapped slots
         self._check_slots(add_to_sizer=False)
 
-        if not self.widget: return
-        # re-create the widget and add the items
-        for c in self.widget._grid.GetChildren():
-            if c and c.IsSizer():
-                compat.SizerItem_SetSizer(c, None)
-
-        self.widget._grid.Clear()
-        #self.widget._grid.Destroy()  # spurious crashes, even with CallAfter
-        self.widget._create(None,None, self.vgap, self.hgap)
-        wx.BoxSizer.Add(self.widget, self.widget._grid, 1, wx.EXPAND)
-
-        for child in self.children[1:]:
-            if not child.widget: continue # for overlapped sizer slots, widget may be None
-            self.widget.Add(child.widget, child.pos, child.span, child.flag, child.border)
+        if self.widget:
+            # re-create the widget and add the items
+            for c in self.widget._grid.GetChildren():
+                if c and c.IsSizer():
+                    compat.SizerItem_SetSizer(c, None)
+    
+            self.widget._grid.Clear()
+            #self.widget._grid.Destroy()  # spurious crashes, even with CallAfter
+            self.widget._create(None,None, self.vgap, self.hgap)
+            wx.BoxSizer.Add(self.widget, self.widget._grid, 1, wx.EXPAND)
+    
+            for child in self.children:
+                if not child.widget: continue # for overlapped sizer slots, widget may be None
+                self.widget.Add(child.widget, child.index, child.span, child.flag, child.border)
 
-        self._set_growable()
-        self.layout(True)
+            self._set_growable()
 
-    def remove_row(self, pos):
-        row,col = self._get_row_col(pos)
+        misc.rebuild_tree(self)
+
+    def remove_row(self, index):
+        row,col = self._get_row_col(index)
         rows = [r for r in range(self.rows) if r!=row]
         self._recreate(rows, None, self.rows, self.cols)
+        if self.widget: self.parent_window.layout()
 
-    def remove_col(self, pos):
-        row,col = self._get_row_col(pos)
+    def remove_col(self, index):
+        row,col = self._get_row_col(index)
         cols = [c for c in range(self.cols) if c!=col]
         self._recreate(None, cols, self.rows, self.cols)
+        if self.widget: self.parent_window.layout()
 
-    def insert_row(self, pos=-1):
-        row,col = self._get_row_col(pos)
+    def insert_row(self, index=-1):
+        row,col = self._get_row_col(index)
         rows = [r for r in range(self.rows)]
-        if pos==-1:
+        if index==-1:
             rows.append(None)
         else:
             rows.insert(row, None)
         self._recreate(rows, None, self.rows, self.cols)
+        if self.widget: self.parent_window.layout()
 
-    def insert_col(self, pos=-1):
-        row,col = self._get_row_col(pos)
+    def insert_col(self, index=-1):
+        row,col = self._get_row_col(index)
         cols = [c for c in range(self.cols)]
-        if pos==-1:
+        if index==-1:
             cols.append(None)
         else:
             cols.insert(col, None)
         self._recreate(None, cols, self.rows, self.cols)
+        if self.widget: self.parent_window.layout()
 
     def _set_row_col_range(self):
         "set ranges of rows/cols properties"
@@ -2469,14 +1845,12 @@
         if name=="cols" and new_value<max_col+1: return False
         return EditFlexGridSizer.check_property_modification(self, name, value, new_value)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if modified and ("rows" in modified or "cols" in modified):
             rows_p = self.properties["rows"]
             cols_p = self.properties["cols"]
             if rows_p.previous_value is not None or cols_p.previous_value is not None:
                 # actually a user input
-                delete_rows = []
-                delete_cols = []
                 rows = cols = None # default arguments
                 if "rows" in modified:
                     previous_rows = rows_p.previous_value
@@ -2497,86 +1871,205 @@
                         # remove cols
                         cols = list(range(cols_p.value))
                 self._recreate(rows, cols, previous_rows, previous_cols)
+                actions.add("layout")
                 return
 
-        EditFlexGridSizer.properties_changed(self, modified)
-    def on_load(self):
-        # called from XML parser right after loading the widget
+        EditFlexGridSizer._properties_changed(self, modified, actions)
+
+    def on_load(self, child=None):
+        # called from XML parser right after loading the widget or when pasting an item into a slot
+        # ensure that rows/cols is not 0; this is actually an error in the file
+        rows = self.rows
+        cols = self.cols
+        if rows==0: self.properties["rows"].set( (len(self.children)-1)//cols +1 )
+        if cols==0: self.properties["cols"].set( (len(self.children)-1)//rows +1 )
+
+        if child is not None:
+            # an item is being pasted into a slot; we might need to limit the spanning
+            span_p = child.properties["span"]
+            if span_p.value != (1,1):
+                # check whether spanning is OK or needs to be reduced
+                span = span_p.value
+                max_span = self.check_span_range(child.index, *span, inserting=True)
+                new_span = (min(span[0], max_span[0]), min(span[1], max_span[1]))
+                if new_span != span: span_p.set(new_span)
+
         self._check_slots(remove_only=True)
-        EditFlexGridSizer.on_load(self)
+        EditFlexGridSizer.on_load(self, child)
 
 
-def _builder(parent, sizer, pos, orientation=wx.VERTICAL, slots=1, is_static=False, label="",
-             is_wrap=False, number=[1]):
-    num = slots
-    name = 'sizer_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'sizer_%d' % number[0]
-    if sizer is not None:
-        topl = False
-    else:
-        topl = True
+def change_sizer(old, new):
+    "Replaces sizer instance 'old' with a new one; 'new' is the name of the new one."
+    index = old.index
+    parent = old.parent
+    constructors = {
+        'wxBoxSizer (wxVERTICAL)':         lambda: EditBoxSizer(old.name, parent, index, wx.VERTICAL, 0),
+        'wxBoxSizer (wxHORIZONTAL)':       lambda: EditBoxSizer(old.name, parent, index, wx.HORIZONTAL, 0),
+        'wxWrapSizer (wxVERTICAL)':        lambda: EditWrapSizer(old.name, parent, index, wx.VERTICAL, 0),
+        'wxWrapSizer (wxHORIZONTAL)':      lambda: EditWrapSizer(old.name, parent, index, wx.HORIZONTAL, 0),
+        'wxStaticBoxSizer (wxVERTICAL)':   lambda: EditStaticBoxSizer(old.name, parent, index, wx.VERTICAL,
+                                                                      getattr(old, 'label', old.name), 0),
+        'wxStaticBoxSizer (wxHORIZONTAL)': lambda: EditStaticBoxSizer(old.name, parent, index, wx.HORIZONTAL,
+                                                                      getattr(old, 'label', old.name), 0),
+        'wxStdDialogButtonSizer':          lambda: EditStdDialogButtonSizer(old.name, parent, index, 0),
+        'wxGridSizer':     lambda: EditGridSizer(old.name, parent, index, rows=0, cols=0),
+        'wxFlexGridSizer': lambda: EditFlexGridSizer(old.name, parent, index, rows=0, cols=0),
+        'wxGridBagSizer': lambda: EditGridBagSizer(old.name, parent, index, rows=0, cols=0) }
+
+    with old.window.frozen():
+        # construct without children, take then the children from the old sizer
+        parent.children[index] = None  # avoid recursive_remove being called
+        szr = constructors[new]()
+        if old._IS_GRIDBAG and old.widget:
+            for index, child in enumerate(old.children):
+                if child:
+                    if child.widget:
+                        old.destroying_child_widget(child, index)
+                    elif child.IS_SLOT and child.overlapped:
+                        # re-create hidden widget
+                        child.set_overlap(False, add_to_sizer=False)
+
+        szr.children.extend(old.children)
+
+        # copy/set properties
+        if isinstance(szr, GridSizerBase):
+            # take rows, cols, hgap, vgap from old sizer, if applicable
+            rows = getattr(old, "rows", 1)
+            cols = getattr(old, "cols", len(szr.children))
+            if isinstance(szr, EditGridBagSizer):
+                # for GridSizer and FlexGridSizer cols may be 0, i.e. auto calculated
+                if rows==0: rows = (len(szr.children)-1)//cols +1
+                if cols==0: cols = (len(szr.children)-1)//rows +1
+
+            szr.properties["rows"].set( rows )
+            szr.properties["cols"].set( cols )
+            szr.properties["hgap"].set( getattr(old, "hgap", 0) )
+            szr.properties["vgap"].set( getattr(old, "vgap", 0) )
+            szr.properties_changed( ["rows","cols","hgap","vgap"] )
+        if isinstance(szr, EditFlexGridSizer) and isinstance(old, EditFlexGridSizer):
+            # take growable rows and cols from old sizer
+            grow_r_p = old.properties["growable_rows"]
+            grow_c_p = old.properties["growable_cols"]
+            if grow_r_p.is_active():
+                szr.properties['growable_rows'].value = grow_r_p.value
+                szr.properties['growable_rows'].deactivated = False
+            if grow_c_p.is_active():
+                szr.properties['growable_cols'].value = grow_c_p.value
+                szr.properties['growable_cols'].deactivated = False
+        # XXX keep rows, cols, growable_rows, growable_cols in attributes of new sizer if it's not a (Flex)GridSizer
+        #     and re-use them if user switches back
+
+        if szr._IS_GRIDBAG:
+            szr._check_slots(remove_only=True)  # for the children, .parent is still the old sizer here
+
+        for widget in szr.children:
+            widget.parent = szr
+            if "flag" in widget.properties: widget.properties["flag"]._check_value()
+
+        if old.widget is not None:
+            # detach child widgets from old sizer
+            for c in old.widget.GetChildren():
+                if c and c.IsSizer():
+                    compat.SizerItem_SetSizer(c, None)
+
+            # destroy old and create new sizer
+            compat.DestroyLater(old._btn)
+            old.widget.Clear()  # without deleting window items; but sets the sizer of the windows to NULL
+
+            szr.create_widget()
+
+            # move child widgets to new sizer
+            for child in szr.children:
+                if child.IS_SLOT and child.overlapped: continue
+                szr.child_widget_created(child, 0)
+
+            # move new sizer to parent if this is a sizer; sizer item is kept
+            if parent.IS_SIZER:
+                szr.copy_properties(old, szr.MANAGED_PROPERTIES, notify=False)  # span","proportion","border","flag"
+                si = szr.sizer.widget.GetItem(old.widget)
+                compat.SizerItem_SetSizer(si, szr.widget)
+
+        common.app_tree.change_item_editor(old, szr, keep_children=True)
+
+        old.toplevel = False  # could probably be omitted
+        del old.children[:]
+        old.destroy_widget(0)
+
+        for child in szr.children:
+            if child: child.parent = szr
+        if not szr.parent.IS_SIZER:
+            szr.window.set_sizer(szr)
+
+        if szr.widget:
+            szr.top_sizer.layout()
+            if szr.parent.IS_TOPLEVEL:
+                szr.fit_parent()
+
+        misc.set_focused_widget(szr)
+
+
+def _builder(parent, index, orientation=wx.VERTICAL, slots=1, is_static=False, label="", is_wrap=False):
+    name = parent.toplevel_parent.get_next_contained_name('sizer_%d')
 
     # add slots later
-    if is_static:
-        sz = EditStaticBoxSizer(name, parent, orientation, label, 0, topl)
+    if orientation=="StdDialogButtonSizer":
+        editor = EditStdDialogButtonSizer(name, parent, index, 0)
+    elif is_static:
+        editor = EditStaticBoxSizer(name, parent, index, orientation, label, 0)
     elif is_wrap:
-        sz = EditWrapSizer(name, parent, orientation, 0, topl)
+        editor = EditWrapSizer(name, parent, index, orientation, 0)
     else:
-        sz = EditBoxSizer(name, parent, orientation, 0, topl)
+        editor = EditBoxSizer(name, parent, index, orientation, 0)
 
-    if sizer is not None:
-        sizer.add_item(sz, pos)
-        node = Node(sz)
-        sz.node = node
-        common.app_tree.insert(node, sizer.node, pos-1)
-        common.adding_sizer = False
-    else:
-        parent.set_sizer(sz)
-        node = Node(sz)
-        sz.node = node
-        if pos is None:
-            common.app_tree.add(node, parent.node)
+    if parent.IS_SIZER:
+        if orientation=="StdDialogButtonSizer":
+            editor.properties['proportion'].set(0)
+            editor.properties['flag'].set('wxALIGN_RIGHT')
         else:
-            common.app_tree.insert(node, parent.node, pos-1)
-            sz.pos = pos
+            editor.properties['flag'].set('wxEXPAND')
 
     # add the slots
-    for i in range(num):
-        sz._add_slot()
-    sz.layout()
-
-    if parent.widget: sz.create()
-    if sizer is not None:
-        sz.properties['flag'].set('wxEXPAND')
-        sz.properties['pos'].set(pos)
+    for i in range(slots):
+        editor._add_slot()
+    #editor.layout()
 
-    # set focus on the sizer again
-    common.app_tree.select_item(sz.node)
+    if parent.widget: editor.create()
+    return editor
 
 
 class _SizerDialog(wx.Dialog):
-    def __init__(self, parent):
+    def __init__(self, parent, to_dialog, default_orient=None):
         pos = wx.GetMousePosition()
         wx.Dialog.__init__( self, misc.get_toplevel_parent(parent), -1, _('Select sizer type'), pos )
-        self.orientation = wx.RadioBox( self, -1, _('Orientation'), choices=[_('Horizontal'), _('Vertical')] )
-        self.orientation.SetSelection(0)
+        szr = wx.BoxSizer(wx.VERTICAL)
+
+        # static box sizer with radio buttons for orientation / type
+        self.orientation = 1 if default_orient==wx.VERTICAL else 0
+        self.radios = []
+        vsizer = wx.StaticBoxSizer(wx.StaticBox(self, -1, _("Orientation")), wx.VERTICAL)
+        for i, choice in enumerate( ('Horizontal', 'Vertical') ):
+            radio = wx.RadioButton(self, -1, _(choice), style=wx.RB_GROUP if i==0 else 0)
+            if i==self.orientation: radio.SetValue(True)
+            vsizer.Add(radio, 0, wx.ALL, 4)
+            radio.Bind(wx.EVT_RADIOBUTTON, self.on_choice_orientation)
+            self.radios.append(radio)
+        szr.Add(vsizer, 0, wx.ALL | wx.EXPAND, 4)
+
         tmp = wx.BoxSizer(wx.HORIZONTAL)
         tmp.Add( wx.StaticText(self, -1, _('Slots: ')), 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 3 )
         self.num = wx.SpinCtrl(self, -1)
-        self.num.SetRange(1, 100)
         self.num.SetValue(1)
+        self.num.SetRange(0, 100)
         tmp.Add(self.num, 1, wx.ALL, 3)
-        szr = wx.BoxSizer(wx.VERTICAL)
-        szr.Add(self.orientation, 0, wx.ALL | wx.EXPAND, 4)
         szr.Add(tmp, 0, wx.EXPAND)
+
         self.checkbox_static = wx.CheckBox(self, -1, _('Has a Static Box:'))
-        compat.SetToolTip(self.checkbox_static, "Use wxStaticBoxSizer")
+        compat.SetToolTip(self.checkbox_static, "Use wxStaticBoxSizer with box and label")
         self.label = wx.TextCtrl(self, -1, "")
         self.label.Enable(False)
-        self.checkbox_static.Bind(wx.EVT_CHECKBOX, self.on_check_statbox)
+        self.checkbox_static.Bind(wx.EVT_CHECKBOX, self._set_active)
         szr.Add(self.checkbox_static, 0, wx.ALL | wx.EXPAND, 4)
+
         tmp = wx.BoxSizer(wx.HORIZONTAL)
         tmp.Add(wx.StaticText(self, -1, _("Label: ")), 0, wx.ALIGN_CENTER)
         tmp.Add(self.label, 1)
@@ -2585,56 +2078,76 @@
         if HAVE_WRAP_SIZER:
             self.checkbox_wrap = wx.CheckBox(self, -1, _('Wraps around'))
             compat.SetToolTip(self.checkbox_wrap, "Use wxWrapSizer")
-            self.checkbox_wrap.Bind(wx.EVT_CHECKBOX, self.on_check_wrapbox)
+            self.checkbox_wrap.Bind(wx.EVT_CHECKBOX, self._set_active)
             szr.Add(self.checkbox_wrap, 0, wx.ALL | wx.EXPAND, 4)
 
+        if to_dialog:
+            # option for 'StdDialogButtonSizer'
+            self.checkbox_dlgbutton = wx.CheckBox(self, -1, "StdDialogButtonSizer")
+            compat.SetToolTip(self.checkbox_dlgbutton, "Horizontal sizer for action buttons in dialogs")
+            self.checkbox_dlgbutton.Bind(wx.EVT_CHECKBOX, self.on_checkbox_dlgbutton)
+            szr.Add(self.checkbox_dlgbutton, 0, wx.ALL | wx.EXPAND, 4)
+        else:
+            self.checkbox_dlgbutton = None
+
         # horizontal sizer for action buttons
-        hsizer = wx.BoxSizer(wx.HORIZONTAL)
+        hsizer = wx.StdDialogButtonSizer()
         hsizer.Add( wx.Button(self, wx.ID_CANCEL, _('Cancel')), 1, wx.ALL, 5)
         btn = wx.Button(self, wx.ID_OK, _('OK'))
         btn.SetDefault()
         hsizer.Add(btn, 1, wx.ALL, 5)
         szr.Add(hsizer, 0, wx.EXPAND )
+
         self.SetAutoLayout(1)
         self.SetSizer(szr)
         szr.Fit(self)
         self.Layout()
-        #self.CenterOnScreen()
 
-    def reset(self):
-        self.orientation.SetSelection(0)
-        self.num.SetValue(1)
-        self.checkbox_static.SetValue(0)
-        self.label.SetValue("")
-        self.label.Enable(False)
-        if HAVE_WRAP_SIZER:
-            self.checkbox_wrap.SetValue(0)
+    def on_choice_orientation(self, event):
+        self.orientation = self.radios.index(event.GetEventObject())
+        self._set_active()
+
+    def on_checkbox_dlgbutton(self, event):
+        if event.IsChecked() and self.num.Value<2: self.num.SetValue(2)
+        self._set_active()
 
-    def on_check_statbox(self, event):
-        checked = event.IsChecked()
-        self.label.Enable(checked)
+    def _set_active(self, event=None):
+        # dynamically activate and deactivate controls
         if HAVE_WRAP_SIZER:
-            self.checkbox_wrap.Enable(not checked)
-            if checked: self.checkbox_wrap.SetValue(False)
-
-    def on_check_wrapbox(self, event):
-        checked = event.IsChecked()
-        self.checkbox_static.Enable(not checked)
-        if checked:
-            self.checkbox_static.SetValue(False)
-            self.label.Disable()
+            can_be_wrap = not self.checkbox_static.IsChecked()
+            if self.checkbox_dlgbutton and self.checkbox_dlgbutton.IsChecked(): can_be_wrap = False
+            self.checkbox_wrap.Enable( can_be_wrap )
+
+        can_be_static = self.orientation<2
+        if HAVE_WRAP_SIZER and self.checkbox_wrap.IsChecked(): can_be_static = False
+        if self.checkbox_dlgbutton and self.checkbox_dlgbutton.IsChecked(): can_be_static = False
+        self.checkbox_static.Enable( can_be_static )
+
+        self.label.Enable( self.checkbox_static.IsChecked() )
+
+        if self.checkbox_dlgbutton:
+            can_be_dialogbutton_sizer = self.orientation==0 and not self.checkbox_static.IsChecked()
+            if HAVE_WRAP_SIZER and self.checkbox_wrap.IsChecked(): can_be_dialogbutton_sizer = False
+            self.checkbox_dlgbutton.Enable( can_be_dialogbutton_sizer )
+            
+            self.radios[1].Enable( not self.checkbox_dlgbutton.IsChecked() )
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for box sizers"
-
-    dialog = _SizerDialog(common.adding_window or parent)
+    default_orient = None
+    if parent.IS_SIZER and parent.check_prop("orient") and parent.orient in (wx.HORIZONTAL, wx.VERTICAL):
+        default_orient = wx.HORIZONTAL if parent.orient==wx.VERTICAL else wx.VERTICAL
+    dialog = _SizerDialog(common.adding_window or parent, parent.toplevel_parent.WX_CLASS=="wxDialog", default_orient)
     with misc.disable_stay_on_top(common.adding_window or parent):
         res = dialog.ShowModal()
-    if dialog.orientation.GetStringSelection() == _('Horizontal'):
+    if dialog.checkbox_dlgbutton and dialog.checkbox_dlgbutton.IsChecked():
+        orientation = "StdDialogButtonSizer"
+    elif dialog.orientation==0:
         orientation = wx.HORIZONTAL
     else:
         orientation = wx.VERTICAL
+
     num = dialog.num.GetValue()
     wrap = HAVE_WRAP_SIZER and dialog.checkbox_wrap.GetValue() or False
     label = dialog.label.GetValue()
@@ -2643,41 +2156,21 @@
     dialog.Destroy()
     if res != wx.ID_OK: return
     with parent.frozen():
-        _builder( parent, sizer, pos, orientation, num, static, label, wrap )
+        editor = _builder( parent, index, orientation, num, static, label, wrap )
 
+    return editor
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
-    "factory function to build EditBoxSizer objects from a XML file"
-    from xml_parse import XmlParsingError
 
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError( _("'name' attribute missing") )
+def xml_builder(parser, base, name, parent, index):
+    "factory function to build EditBoxSizer objects from a XML file"
     orientation = wx.VERTICAL  # default value
-    topl = True  if sizer is None  else False
-    if attrs['base'] == 'EditStaticBoxSizer':
-        sz = EditStaticBoxSizer(name, parent, orientation, '', 0, topl)
-    elif attrs['base'] == 'EditWrapSizer':
-        sz = EditWrapSizer(name, parent, orientation, 0, topl)
-    else:
-        sz = EditBoxSizer(name, parent, orientation, 0, topl)
-    if sizer is not None:
-        if sizeritem is None:
-            raise XmlParsingError( _("'sizeritem' object not found") )
-        sizer.add_item( sz, pos=pos )
-        node = Node(sz)
-        sz.node = node
-        if pos is None:
-            common.app_tree.add(node, sizer.node)
-        else:
-            common.app_tree.insert(node, sizer.node, pos-1)
-    else:
-        parent.set_sizer(sz)
-        node = Node(sz)
-        sz.node = node
-        common.app_tree.add(node, parent.node)
-    return sz
+    if base == 'EditStaticBoxSizer':
+        return EditStaticBoxSizer(name, parent, index, orientation, '', 0)
+    if base == 'EditWrapSizer':
+        return EditWrapSizer(name, parent, index, orientation, 0)
+    if base == 'EditStdDialogButtonSizer':
+        return EditStdDialogButtonSizer(name, parent, index, 0)
+    return EditBoxSizer(name, parent, index, orientation, 0)
 
 
 class _GridBuilderDialog(wx.Dialog):
@@ -2727,8 +2220,7 @@
         self.Layout()
 
 
-
-def grid_builder(parent, sizer, pos, number=[1]):
+def grid_builder(parent, index):
     "factory function for grid sizers"
     #dialog = _GridBuilderDialog(parent)
     dialog = _GridBuilderDialog(common.adding_window or parent)
@@ -2742,125 +2234,83 @@
     dialog.Destroy()
     if res != wx.ID_OK: return
 
-    name = 'grid_sizer_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'grid_sizer_%d' % number[0]
-    is_toplevel = True
+    name = parent.toplevel_parent.get_next_contained_name('grid_sizer_%d')
     if type_=="Grid":
         constructor = EditGridSizer
     elif type_=="FlexGrid":
         constructor = EditFlexGridSizer
     elif type_=="GridBag":
         constructor = EditGridBagSizer
-    if sizer is not None:
-        is_toplevel = False
 
     with parent.frozen():
-        #sz = constructor(name, parent, rows, cols, vgap, hgap, is_toplevel)
-        sz = constructor(name, parent, 0, cols, vgap, hgap, is_toplevel) # add slots later
-        if sizer is not None:
-            sizer.add_item(sz, pos)
-            node = Node(sz)
-            sz.node = node
-            common.app_tree.insert(node, sizer.node, pos-1)
-            common.adding_sizer = False
-        else:
-            parent.set_sizer(sz)
-            node = Node(sz)
-            sz.node = node
-            if pos is None:
-                common.app_tree.add(node, parent.node)
-            else:
-                common.app_tree.insert(node, parent.node, pos-1)
-                sz.pos = pos
-    
+        editor = constructor(name, parent, index, rows, cols, vgap, hgap)
+        if parent.IS_SIZER:
+            editor.properties['flag'].set('wxEXPAND')
+
         # add the slots
         for i in range(rows*cols):
-            sz._add_slot()
-        if rows!=0:
-            sz.properties["rows"].set(rows)
-        sz.layout()
+            editor._add_slot()
 
-        if parent.widget: sz.create()
-    
-        if sizer is not None:
-            sz.properties['flag'].set('wxEXPAND')
-            sz.properties['pos'].set(pos)
-        
-        # set focus on the sizer again
-        common.app_tree.select_item(sz.node)
+        if parent.widget: editor.create()
 
+    return editor
 
 
-def grid_xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def grid_xml_builder(parser, base, name, parent, index):
     "factory function to build EditGridSizer objects from a XML file"
-    from xml_parse import XmlParsingError
-
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if attrs['base'] == 'EditGridSizer':
-        constructor = EditGridSizer
-    elif attrs['base'] == 'EditFlexGridSizer':
-        constructor = EditFlexGridSizer
-    elif attrs['base'] == 'EditGridBagSizer':
-        constructor = EditGridBagSizer
-    if sizer is not None:
-        sz = constructor(name, parent, rows=0, cols=0, toplevel=False)
-        if sizeritem is None:
-            raise XmlParsingError(_("'sizeritem' object not found"))
-        sizer.add_item(sz, pos=pos)
-        node = Node(sz)
-        sz.node = node
-        if pos is None:
-            common.app_tree.add(node, sizer.node)
-        else:
-            common.app_tree.insert(node, sizer.node, pos-1)
-    else:
-        sz = constructor(name, parent, rows=0, cols=0, toplevel=True)
-        parent.set_sizer(sz)
-        node = Node(sz)
-        sz.node = node
-        common.app_tree.add(node, parent.node)
-    return sz
+    if base == 'EditGridSizer':
+        return EditGridSizer(name, parent, index, rows=0, cols=0)
+    elif base == 'EditFlexGridSizer':
+        return EditFlexGridSizer(name, parent, index, rows=0, cols=0)
+    elif base == 'EditGridBagSizer':
+        return EditGridBagSizer(name, parent, index, rows=0, cols=0)
 
 
 def init_all():
     "Module initialization function: returns dict w. key 'Sizers' and an assigned list of buttons for the main palette"
 
-    cw = common.widgets
-    cw['EditBoxSizer'] = builder
-    cw['EditGridSizer'] = grid_builder
+    common.widgets['EditBoxSizer'] = builder
+    common.widgets['EditGridSizer'] = grid_builder
+
+    common.widget_classes['EditBoxSizer'] = EditBoxSizer
+    common.widget_classes['EditStdDialogButtonSizer'] = EditStdDialogButtonSizer
+    if HAVE_WRAP_SIZER:
+        common.widget_classes['EditWrapSizer'] = EditWrapSizer
+    common.widget_classes['EditStaticBoxSizer'] = EditStaticBoxSizer
+    common.widget_classes['EditGridSizer'] = EditGridSizer
+    common.widget_classes['EditFlexGridSizer'] = EditFlexGridSizer
+    common.widget_classes['EditGridBagSizer'] = EditGridBagSizer
 
-    cwx = common.widgets_from_xml
-    cwx['EditBoxSizer'] = xml_builder
+    common.widgets_from_xml['EditBoxSizer'] = xml_builder
+    common.widgets_from_xml['EditStdDialogButtonSizer'] = xml_builder
     if HAVE_WRAP_SIZER:
-        cwx['EditWrapSizer'] = xml_builder
-    cwx['EditStaticBoxSizer'] = xml_builder
-    cwx['EditGridSizer'] = grid_xml_builder
-    cwx['EditFlexGridSizer'] = grid_xml_builder
-    cwx['EditGridBagSizer'] = grid_xml_builder
+        common.widgets_from_xml['EditWrapSizer'] = xml_builder
+    common.widgets_from_xml['EditStaticBoxSizer'] = xml_builder
+    common.widgets_from_xml['EditGridSizer'] = grid_xml_builder
+    common.widgets_from_xml['EditFlexGridSizer'] = grid_xml_builder
+    common.widgets_from_xml['EditGridBagSizer'] = grid_xml_builder
 
     import os.path
+    from tree import WidgetTree
 
     if HAVE_WRAP_SIZER:
-        WidgetTree.images['EditWrapSizer'] = os.path.join( config.icons_path, 'wrap_sizer_h.xpm')
-        WidgetTree.images['EditHorizontalWrapSizer'] = os.path.join( config.icons_path, 'wrap_sizer_h.xpm')
-        WidgetTree.images['EditVerticalWrapSizer'] = os.path.join( config.icons_path, 'wrap_sizer.xpm')
-    WidgetTree.images['EditStaticBoxSizer'] = os.path.join( config.icons_path, 'sizer.xpm')
-    WidgetTree.images['EditFlexGridSizer']  = os.path.join( config.icons_path, 'grid_sizer.xpm' )
-    WidgetTree.images['EditGridBagSizer']  = os.path.join( config.icons_path, 'grid_sizer.xpm' )
-
-    WidgetTree.images['EditVerticalSizer']   = os.path.join( config.icons_path, 'sizer_v.xpm' )
-    WidgetTree.images['EditHorizontalSizer'] = os.path.join( config.icons_path, 'sizer_h.xpm' )
-
-    WidgetTree.images['EditVerticalSizerSlot']   = os.path.join( config.icons_path, 'sizer_slot_v.xpm' )
-    WidgetTree.images['EditHorizontalSizerSlot'] = os.path.join( config.icons_path, 'sizer_slot_h.xpm' )
-    WidgetTree.images['EditSizerSlot'] = os.path.join( config.icons_path, 'sizer_slot.xpm' )
+        WidgetTree.images['EditWrapSizer'] = os.path.join( config.icons_path, 'wrap_sizer_h.png')
+        WidgetTree.images['EditHorizontalWrapSizer'] = os.path.join( config.icons_path, 'wrap_sizer_h.png')
+        WidgetTree.images['EditVerticalWrapSizer'] = os.path.join( config.icons_path, 'wrap_sizer.png')
+    WidgetTree.images['EditStaticBoxSizer'] = os.path.join( config.icons_path, 'sizer.png')
+    WidgetTree.images['EditFlexGridSizer']  = os.path.join( config.icons_path, 'flexgrid_sizer.png' )
+    WidgetTree.images['EditGridBagSizer']  = os.path.join( config.icons_path, 'gridbag_sizer.png' )
+
+    WidgetTree.images['EditVerticalSizer']   = os.path.join( config.icons_path, 'sizer_v.png' )
+    WidgetTree.images['EditHorizontalSizer'] = os.path.join( config.icons_path, 'sizer_h.png' )
+    WidgetTree.images['EditStdDialogButtonSizer'] = os.path.join( config.icons_path, 'button_sizer.png' )
+
+    WidgetTree.images['EditVerticalSizerSlot']   = os.path.join( config.icons_path, 'sizer_slot_v.png' )
+    WidgetTree.images['EditHorizontalSizerSlot'] = os.path.join( config.icons_path, 'sizer_slot_h.png' )
+    WidgetTree.images['EditSizerSlot'] = os.path.join( config.icons_path, 'sizer_slot.png' )
+    WidgetTree.images['EditSlot'] = os.path.join( config.icons_path, 'slot.png' )
 
     ret = {'Sizers': [
-        common.make_object_button('EditBoxSizer', 'sizer.xpm'),
-        common.make_object_button('EditGridSizer', 'grid_sizer.xpm')] }
+        common.make_object_button('EditBoxSizer', 'sizer.png'),
+        common.make_object_button('EditGridSizer', 'grid_sizer.png')] }
     return ret
diff -Nru wxglade-0.9.6/edit_sizers/__init__.py wxglade-1.0.1/edit_sizers/__init__.py
--- wxglade-0.9.6/edit_sizers/__init__.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/edit_sizers/__init__.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,13 +3,11 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
-import config
 
-Sizer = None          # Shortcut for edit_sizers.Sizer
 SizerSlot = None      # Shortcut for edit_sizers.SizerSlot
 SizerBase = None      # Shortcut for edit_sizers.SizerBase
 GridSizerBase = None  # Shortcut for edit_sizers.GridSizerBase
@@ -17,12 +15,8 @@
 
 
 def init_gui():
-    #if not config.use_gui:
-    #    return {}
-
     from . import edit_sizers
-    global Sizer, SizerSlot, SizerBase, GridSizerBase, _builder
-    Sizer = edit_sizers.Sizer
+    global SizerSlot, SizerBase, GridSizerBase, _builder
     SizerSlot = edit_sizers.SizerSlot
     SizerBase = edit_sizers.SizerBase
     GridSizerBase = edit_sizers.GridSizerBase
diff -Nru wxglade-0.9.6/edit_sizers/lisp_sizers_codegen.py wxglade-1.0.1/edit_sizers/lisp_sizers_codegen.py
--- wxglade-0.9.6/edit_sizers/lisp_sizers_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/edit_sizers/lisp_sizers_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,12 +3,12 @@
 
 @copyright: 2002-2004 D.H. aka crazyinsomniac on sourceforge.net
 @copyright: 2013-2016 Carsten Grohmann
-@copyright: 2017 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import common
-from .edit_sizers import BaseSizerBuilder
+from .edit_sizers import BaseSizerBuilder, SlotGenerator
 
 
 class BaseLispSizerBuilder(BaseSizerBuilder):
@@ -18,70 +18,79 @@
 
     tmpl_SetSizer = '(wxWindow_SetSizer %(parent_widget)s (%(sizer_name)s obj))\n'
     tmpl_Fit = '(wxSizer_Fit (%(sizer_name)s obj) %(parent_widget)s)\n'
+    tmpl_Realize = '(wxSizer_Realize (%(sizer_name)s obj))\n'
     tmpl_SetSizeHints = '(wxSizer_SetSizeHints (slot-%(sizer_name)s obj) %(parent_widget)s)\n'
 
     tmpl_wparent = '(slot-frame obj)'
-    """Only in Lisp the widgets parent statement differs between
-    C{slot-frame obj} and C{slot-top-window obj}.
+    """Only in Lisp the widgets parent statement differs between 'slot-frame obj' and 'slot-top-window obj'.
 
-    @todo: Clarify why the widget parent differs between different sizers in Lisp.
+    todo: Clarify why the widget parent differs between different sizers in Lisp.
 
-    see: L{_get_wparent()}
-    """
+    see: _get_wparent()"""
 
     def _get_wparent(self, obj):
-        while obj.is_sizer:
-            obj = obj.node.parent.widget
-        if not obj.is_toplevel:
-            parent = '(slot-%s obj)' % self.codegen._format_name(obj.name)
+        window = obj.parent_window
+        if not window.IS_CLASS:
+            parent = '(slot-%s obj)' % self.codegen._format_name(window.name)
         else:
             parent = self.tmpl_wparent
         return parent
 
 
-class LispBoxSizerBuilder(BaseLispSizerBuilder):
-    klass = 'wxBoxSizer'
+    def get_code_per_child(self, obj, child):
+        """Returns code that will be inserted after the child code; e.g. for adding element to a sizer.
+        It's placed before the final code returned from get_code()."""
+
+        if child.WX_CLASS in ("spacer","sizerslot"):  # spacer and slot are adding itself to the sizer
+            return []
+        obj_name = self.codegen._format_classattr(child)
+        sizer_name = self.codegen._format_classattr(obj)
+
+        flag = child.properties["flag"].get_string_value()  # as string, joined with "|"
+        flag = self.codegen.cn_f(flag) or '0'
+
+
+        if obj.WX_CLASS=="wxStdDialogButtonSizer" and child.WX_CLASS=='wxButton':
+            # XXX optionally use SetAffirmativeButton, SetCancelButton, SetNegativeButton
+            if child.check_prop("stockitem"):
+                tmpl_sizeritem = '(wxSizer_AddButton (%s obj) (%s obj))\n'
+                return [tmpl_sizeritem % ( sizer_name, obj_name )]
 
-    tmpl = '(setf (%(sizer_name)s obj) (wxBoxSizer_Create %(orient)s))\n'
+        if child.IS_SIZER:
+            tmpl_sizeritem = '(wxSizer_AddSizer (%s obj) (%s obj) %s %s %s nil)\n'
+        else:
+            tmpl_sizeritem = '(wxSizer_AddWindow (%s obj) (%s obj) %s %s %s nil)\n'
+        stmt = tmpl_sizeritem % ( sizer_name, obj_name, child.proportion, flag, child.border )
+
+        return [stmt]
 
+
+class LispBoxSizerBuilder(BaseLispSizerBuilder):
+    tmpl = '(setf (%(sizer_name)s obj) (wxBoxSizer_Create %(orient)s))\n'
     tmpl_wparent = '(slot-top-window obj)'
 
+
 class LispWrapSizerBuilder(LispBoxSizerBuilder):
-    klass = 'wxWrapSizer'
     tmpl = '(setf (%(sizer_name)s obj) (wxWrapSizer_Create %(orient)s))\n'
 
 
 class LispStaticBoxSizerBuilder(BaseLispSizerBuilder):
-    klass = 'wxStaticBoxSizer'
     tmpl = '(setf (%(sizer_name)s obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create %(parent_widget)s %(label)s) %(orient)s))\n'
 
 
 class LispGridSizerBuilder(BaseLispSizerBuilder):
-    klass = 'wxGridSizer'
     tmpl = '(setf (%(sizer_name)s obj) (wxGridSizer_Create %(rows)s %(cols)s %(vgap)s %(hgap)s))\n'
 
 
 class LispFlexGridSizerBuilder(LispGridSizerBuilder):
-    klass = 'wxFlexGridSizer'
-
     tmpl_AddGrowableRow = '(wxFlexGridSizer_AddGrowableRow (%(sizer_name)s obj) %(row)s)\n'
     tmpl_AddGrowableCol = '(wxFlexGridSizer_AddGrowableCol (%(sizer_name)s obj) %(col)s)\n'
 
 
 class LispGridBagSizerBuilder(LispGridSizerBuilder):
-    klass = 'wxGridBagSizer'
     tmpl = '(setf (%(sizer_name)s obj) (wxGridSizer_Create %(vgap)s %(hgap)s))\n'
 
 
-import wcodegen
-
-class LispSizerSlotGenerator(wcodegen.LispWidgetCodeWriter):
-    # spacers and empty sizer slots are generally handled by a hack:
-    # The the implementations of add_sizeritem() contains more details.
-    # The code generation code is already implemented in base class.
-    pass
-
-
 def initialize():
     cn = common.class_names
     cn['EditBoxSizer'] = 'wxBoxSizer'
@@ -93,12 +102,12 @@
 
     lispgen = common.code_writers.get("lisp")
     if lispgen:
-        awh = lispgen.add_widget_handler
+        awh = lispgen.register_widget_code_generator
         awh('wxBoxSizer', LispBoxSizerBuilder())
         awh('wxWrapSizer', LispWrapSizerBuilder())
         awh('wxStaticBoxSizer', LispStaticBoxSizerBuilder())
         awh('wxGridSizer', LispGridSizerBuilder())
         awh('wxFlexGridSizer', LispFlexGridSizerBuilder())
         awh('wxGridBagSizer', LispGridBagSizerBuilder())
-        
-    common.register('lisp', "sizerslot", LispSizerSlotGenerator("sizerslot"))
+
+    common.register('lisp', "sizerslot", SlotGenerator("lisp"))
diff -Nru wxglade-0.9.6/edit_sizers/perl_sizers_codegen.py wxglade-1.0.1/edit_sizers/perl_sizers_codegen.py
--- wxglade-0.9.6/edit_sizers/perl_sizers_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/edit_sizers/perl_sizers_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,12 +3,12 @@
 
 @copyright: 2002-2004 D.H. aka crazyinsomniac on sourceforge.net
 @copyright: 2013-2016 Carsten Grohmann
-@copyright: 2017 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import common
-from .edit_sizers import BaseSizerBuilder
+from .edit_sizers import BaseSizerBuilder, SlotGenerator
 
 
 class BasePerlSizerBuilder(BaseSizerBuilder):
@@ -17,58 +17,43 @@
 
     tmpl_SetSizer = '%(parent_widget)s->SetSizer(%(sizer_name)s);\n'
     tmpl_Fit = '%(sizer_name)s->Fit(%(parent_widget)s);\n'
+    tmpl_Realize = '%(sizer_name)s->Realize();\n'
     tmpl_SetSizeHints = '%(sizer_name)s->SetSizeHints(%(parent_widget)s);\n'
 
     def _get_wparent(self, obj):
-        while obj.is_sizer:
-            obj = obj.node.parent.widget
-        if not obj.is_toplevel:
-            parent = '$self->{%s}' % obj.name
+        window = obj.parent_window
+        if not window.IS_CLASS:
+            parent = '$self->{%s}' % window.name
         else:
             parent = '$self'
         return parent
 
 
 class PerlBoxSizerBuilder(BasePerlSizerBuilder):
-    klass = 'wxBoxSizer'
     tmpl = '%(sizer_name)s = %(klass)s->new(%(orient)s);\n'
 
 
 class PerlWrapSizerBuilder(PerlBoxSizerBuilder):
-    klass = 'wxWrapSizer'
+    pass
 
 
 class PerlStaticBoxSizerBuilder(BasePerlSizerBuilder):
-    klass = 'wxStaticBoxSizer'
     tmpl = '%(sizer_name)s = %(klass)s->new(Wx::StaticBox->new(%(parent_widget)s, wxID_ANY, %(label)s), %(orient)s);\n'
 
 
 class PerlGridSizerBuilder(BasePerlSizerBuilder):
-    klass = 'wxGridSizer'
     tmpl = '%(sizer_name)s = %(klass)s->new(%(rows)s, %(cols)s, %(vgap)s, %(hgap)s);\n'
 
 
 class PerlFlexGridSizerBuilder(PerlGridSizerBuilder):
-    klass = 'wxFlexGridSizer'
-
     tmpl_AddGrowableRow = '%(sizer_name)s->AddGrowableRow(%(row)s);\n'
     tmpl_AddGrowableCol = '%(sizer_name)s->AddGrowableCol(%(col)s);\n'
 
 
 class PerlGridBagSizerBuilder(PerlFlexGridSizerBuilder):
-    klass = 'wxGridBagSizer'
     tmpl = '%(sizer_name)s = %(klass)s->new(%(vgap)s, %(hgap)s);\n'
 
 
-import wcodegen
-
-class PerlSizerSlotGenerator(wcodegen.PerlWidgetCodeWriter):
-    # spacers and empty sizer slots are generally handled by a hack:
-    # The the implementations of add_sizeritem() contains more details.
-    # The code generation code is already implemented in base class.
-    pass
-
-
 def initialize():
     cn = common.class_names
     cn['EditBoxSizer'] = 'wxBoxSizer'
@@ -80,7 +65,7 @@
 
     plgen = common.code_writers.get("perl")
     if plgen:
-        awh = plgen.add_widget_handler
+        awh = plgen.register_widget_code_generator
         awh('wxBoxSizer', PerlBoxSizerBuilder())
         awh('wxWrapSizer', PerlWrapSizerBuilder())
         awh('wxStaticBoxSizer', PerlStaticBoxSizerBuilder())
@@ -88,4 +73,4 @@
         awh('wxFlexGridSizer', PerlFlexGridSizerBuilder())
         awh('wxGridBagSizer', PerlGridBagSizerBuilder())
 
-    common.register('perl', "sizerslot", PerlSizerSlotGenerator("sizerslot"))
+    common.register('perl', "sizerslot", SlotGenerator("perl"))
\ No newline at end of file
diff -Nru wxglade-0.9.6/edit_sizers/py_sizers_codegen.py wxglade-1.0.1/edit_sizers/py_sizers_codegen.py
--- wxglade-0.9.6/edit_sizers/py_sizers_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/edit_sizers/py_sizers_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,14 +1,15 @@
 """
-Python generator functions for the various wxSizerS
+Python generator functions for the various wxSizers
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2013-2016 Carsten Grohmann
+@copyright: 2019 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 
 import common
-from .edit_sizers import BaseSizerBuilder
+from .edit_sizers import BaseSizerBuilder, SlotGenerator
 
 
 class BasePythonSizerBuilder(BaseSizerBuilder):
@@ -18,64 +19,49 @@
 
     tmpl_SetSizer = '%(parent_widget)s.SetSizer(%(sizer_name)s)\n'
     tmpl_Fit = '%(sizer_name)s.Fit(%(parent_widget)s)\n'
+    tmpl_Realize = '%(sizer_name)s.Realize()\n'
     tmpl_SetSizeHints = '%(sizer_name)s.SetSizeHints(%(parent_widget)s)\n'
 
     def _get_wparent(self, obj):
-        while obj.is_sizer:
-            obj = obj.node.parent.widget
-        if not obj.is_toplevel:
-            parent = 'self.%s' % obj.name
-        else:
-            parent = 'self'
-        return parent
-
+        window = obj.parent_window
+        if window.IS_CLASS:
+            return 'self'
+        return 'self.%s' % window.name
 
 
 class PythonBoxSizerBuilder(BasePythonSizerBuilder):
-    klass = 'wxBoxSizer'
     tmpl = '%(sizer_name)s = %(klass)s(%(orient)s)\n'
 
 
+class PythonStdDialogButtonSizerBuilder(BasePythonSizerBuilder):
+    tmpl = '%(sizer_name)s = %(klass)s()\n'
+
+
 class PythonWrapSizerBuilder(PythonBoxSizerBuilder):
-    klass = 'wxWrapSizer'
+    pass
 
 
 class PythonStaticBoxSizerBuilder(BasePythonSizerBuilder):
-    klass = 'wxStaticBoxSizer'
     tmpl = '%(sizer_name)s = %(klass)s(wx.StaticBox(%(parent_widget)s, %(wxIDANY)s, %(label)s), %(orient)s)\n'
 
 
-
 class PythonGridSizerBuilder(BasePythonSizerBuilder):
-    klass = 'wxGridSizer'
     tmpl = '%(sizer_name)s = %(klass)s(%(rows)s, %(cols)s, %(vgap)s, %(hgap)s)\n'
 
 
-
 class PythonFlexGridSizerBuilder(PythonGridSizerBuilder):
-    klass = 'wxFlexGridSizer'
-
     tmpl_AddGrowableRow = '%(sizer_name)s.AddGrowableRow(%(row)s)\n'
     tmpl_AddGrowableCol = '%(sizer_name)s.AddGrowableCol(%(col)s)\n'
 
 
 class PythonGridBagSizerBuilder(PythonFlexGridSizerBuilder):
-    klass = 'wxGridBagSizer'
     tmpl = '%(sizer_name)s = %(klass)s(%(vgap)s, %(hgap)s)\n'
 
 
-import wcodegen
-
-class PythonSizerSlotGenerator(wcodegen.PythonWidgetCodeWriter):
-    # spacers and empty sizer slots are generally handled by a hack:
-    # The the implementations of add_sizeritem() contains more details.
-    # The code generation code is already implemented in base class.
-    pass
-
-
 def initialize():
     cn = common.class_names
     cn['EditBoxSizer'] = 'wxBoxSizer'
+    cn['EditStdDialogButtonSizer'] = 'wxStdDialogButtonSizer'
     cn['EditWrapSizer'] = 'wxWrapSizer'
     cn['EditStaticBoxSizer'] = 'wxStaticBoxSizer'
     cn['EditGridSizer'] = 'wxGridSizer'
@@ -84,14 +70,13 @@
 
     pygen = common.code_writers.get("python")
     if pygen:
-        awh = pygen.add_widget_handler
+        awh = pygen.register_widget_code_generator
         awh('wxBoxSizer', PythonBoxSizerBuilder())
+        awh('wxStdDialogButtonSizer', PythonStdDialogButtonSizerBuilder())
         awh('wxWrapSizer', PythonWrapSizerBuilder())
         awh('wxStaticBoxSizer', PythonStaticBoxSizerBuilder())
         awh('wxGridSizer', PythonGridSizerBuilder())
         awh('wxFlexGridSizer', PythonFlexGridSizerBuilder())
         awh('wxGridBagSizer', PythonGridBagSizerBuilder())
 
-    # handle SizerSlot
-    #common.class_names['EditSpacer'] = klass
-    common.register('python', "sizerslot", PythonSizerSlotGenerator("sizerslot"))
+    common.register('python', "sizerslot", SlotGenerator("python"))
diff -Nru wxglade-0.9.6/edit_sizers/xrc_sizers_codegen.py wxglade-1.0.1/edit_sizers/xrc_sizers_codegen.py
--- wxglade-0.9.6/edit_sizers/xrc_sizers_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/edit_sizers/xrc_sizers_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -44,6 +44,27 @@
     return FlexGridSizerXrcObject(obj)
 
 
+def xrc_code_generator(obj):
+    xrcgen = common.code_writers['XRC']
+
+    class SizerSlotXrcObject(xrcgen.XrcObject):
+        "XrcObject to handle widgets"
+
+        def __init__(self, obj):
+            xrcgen.XrcObject.__init__(self)
+            self.obj = obj
+
+        def write(self, output, ntabs):
+            if self.obj: return
+            tabs = self.tabs(ntabs)
+            tabs1 = self.tabs(ntabs + 1)
+            output.append( tabs + '<object class="spacer">\n' )
+            output.append( tabs1 + '<size>0, 0</size>\n' )
+            output.append( tabs + '</object>\n')
+
+    return SizerSlotXrcObject(obj)
+
+
 def initialize():
     cn = common.class_names
     cn['EditBoxSizer'] = 'wxBoxSizer'
@@ -54,8 +75,10 @@
 
     xrcgen = common.code_writers.get("XRC")
     if xrcgen:
-        xrcgen.add_widget_handler( 'wxBoxSizer', xrc_wxSizer_builder )
-        xrcgen.add_widget_handler( 'wxWrapSizer', xrc_wxSizer_builder )
-        xrcgen.add_widget_handler( 'wxStaticBoxSizer', xrc_wxSizer_builder )
-        xrcgen.add_widget_handler( 'wxGridSizer', xrc_wxSizer_builder )
-        xrcgen.add_widget_handler( 'wxFlexGridSizer', xrc_wxFlexGridSizer_builder )
+        xrcgen.register_widget_code_generator( 'wxBoxSizer', xrc_wxSizer_builder )
+        xrcgen.register_widget_code_generator( 'wxWrapSizer', xrc_wxSizer_builder )
+        xrcgen.register_widget_code_generator( 'wxStaticBoxSizer', xrc_wxSizer_builder )
+        xrcgen.register_widget_code_generator( 'wxGridSizer', xrc_wxSizer_builder )
+        xrcgen.register_widget_code_generator( 'wxFlexGridSizer', xrc_wxFlexGridSizer_builder )
+        xrcgen.register_widget_code_generator( 'sizerslot', xrc_code_generator )
+
diff -Nru wxglade-0.9.6/edit_windows.py wxglade-1.0.1/edit_windows.py
--- wxglade-0.9.6/edit_windows.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/edit_windows.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,14 +3,15 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
-import logging, re
+import logging
 import wx
 
 import new_properties as np
+import edit_base
 import misc, common, compat, config, clipboard
 import decorators, contextlib
 from wcodegen.taghandler import BaseXmlBuilderTagHandler
@@ -70,30 +71,40 @@
             return True  # to remove this handler
 
 
-class EditBase(EventsMixin, np.PropertyOwner):
+class EditBase(EventsMixin, edit_base.EditBase):
     """Base class of every window available in the builder.
 
     This class holds the basic properties for this object.
-    The properties that control the layout (i.e. the behaviour when inside a sizer) are in L{ManagedBase}."""
+    The properties that control the layout (i.e. the behaviour when inside a sizer) are in ManagedBase."""
     can_preview = False
-    _PROPERTIES = ["Common", "name","class", "custom_base"] # "custom_base" will be set to None or a property
+    # "class" and "custom_base" will be added for TopLevelBase, notebook, panel and splitter window
+    _PROPERTIES = ["Common", "name", "instance_class"]
     PROPERTIES = _PROPERTIES
 
     # the following will be placed on the last tab
     _EXTRA_PROPERTIES = ["Events", "events", "Code", "extracode", "extracode_pre", "extracode_post", "extraproperties"]
     EXTRA_PROPERTIES = _EXTRA_PROPERTIES
 
-    _PROPERTY_HELP={ "class": _("If you change the default value, it will be interpreted as the name "
-                                "of the subclass of the widget.\n\nHow this name affects code generation "
-                                "depends on the kind (i.e. language) of output. See the docs for more details."),
+    _PROPERTY_HELP={ "class": ("The name of the class to be generated.\n\n"
+                               "E.g. for 'ClassName':\n\n"
+                               "class ClassName:\n"
+                               "    def __init__(self, ...):\n        ...\n\n"
+                               "Toplevel windows like frames or dialogs are aways classes.\n"
+                               "Notebooks, panels or splitters can be classes."),
                      "name":_("Name of the variable for assigning the reference to the created widget instance.\n\n"
                               "(Valid: alphanumeric characters and underscore, also minus, but not at the beginning)\n"
                               "If the config setting is to have unique names, a non-unique name will be indicated"
-                              " by a yellow background"),
+                              " by a yellow background.\n\n"
+                              "You may edit this in the Tree view as well."),
+                     "label": _("You may edit this in the Tree view as well."),
                      "custom_base": _("A comma-separated list of custom base classes. The first will be invoked\n"
                                       "with the same parameters as this class, while for the others the default\n"
                                       "constructor will be used. You should probably not use this if \n"
                                       "overwrite existing sources is not set."),
+                     "instance_class":("Instead of e.g. wx.TextCtrl you may specify a compatible class here,\n"
+                                "e.g. 'mycontrols.MyTextCtrl'.\n\n"
+                                "You need to ensure that the class is available.\n"
+                                "Add required import code to 'Extra (import) code for this widget' on the Code tab."),
                      "extracode":"This code will be inserted at the beginning of the file.\n"
                                  "Use this to add e.g. import statements.\n\n"
                                  "The code will be added to the section marked with '# begin wxGlade: extracode'",
@@ -105,81 +116,66 @@
                         "extracode":"Extra (import) code for this widget",
                         "extracode_pre":"Code to be inserted before",
                         "extracode_post":"Code to be inserted after"}
-    is_sizer = False
-
-    def __init__(self, name, klass, parent, id, custom_class=True):
-        np.PropertyOwner.__init__(self)
-        # initialise instance logger
-        self._logger = logging.getLogger(self.__class__.__name__)
-
-        # initialise instance
-        self.parent = parent
-        self.id = id          # id used for internal purpose events
+    def __init__(self, name, parent, index, klass=None, instance_class=None):
+        edit_base.EditBase.__init__(self, name, parent, index)
 
         # initialise instance properties
-        self.name  = name_p  = np.NameProperty(name)
-        self.classname = klass
-        self.klass = klass_p = np.ClassProperty(klass, name="class") # Name of the object's class: read/write or read only
-        if not custom_class: klass_p.readonly = True  # only used for StatusBar, ToolBar and also non-standalone MenuBar
-
-        # Name of object's wxWidget class; base and klass are mostly the same, except e.g. wxDialog:
-        self.base = klass  # not editable; e.g. wxFrame or wxComboBox; used to find the code generator
-        # If true, the user can change the value of the 'class' property:
-        self.custom_class = custom_class
-
-        if getattr(self, '_custom_base_classes', False):
-            self.custom_base = np.TextPropertyD("", multiline=False, default_value=None)
-        else:
-            self.custom_base = None
+        if "class" in self.PROPERTIES:
+            if self.IS_TOPLEVEL:
+                # always a class
+                self.klass = klass_p = np.ClassProperty(klass, name="class")
+            else:
+                # optionally a class
+                self.klass = klass_p = np.ClassPropertyD(klass, name="class")
+                if klass: klass_p.deactivated = False
+
+        if "instance_class" in self.PROPERTIES:
+            self.instance_class = instance_class_p = np.InstanceClassPropertyD(instance_class, default_value=self.WX_CLASS)
+            if instance_class is not None and instance_class!=self.WX_CLASS:
+                instance_class_p.deactivated = False
+
+        if "custom_base" in self.PROPERTIES:
+            # for TopLevelBase, notebook, panel and splitter window
+            self.custom_base = custom_base_p = np.BaseClassesPropertyD(default_value=self.WX_CLASS)
+            if klass_p.deactivated: custom_base_p.set_blocked()
 
         self.extracode       = np.CodeProperty()
         self.extracode_pre   = np.CodeProperty()
         self.extracode_post  = np.CodeProperty()
         self.extraproperties = np.ExtraPropertiesProperty()
 
-        self.widget = None  # this is the reference to the actual wxWindow widget, created when required
-        self._dont_destroy = False
-
         EventsMixin.__init__(self)
 
-    @staticmethod
-    def MOVE_PROPERTY(PROPERTIES, move_property, after_property):
-        "move a property to another position, right behind after_property"
-        PROPERTIES.remove( move_property )
-        PROPERTIES.insert( PROPERTIES.index(after_property)+1, move_property )
+    def get_instantiation_class(self, formatter=None, cls_formatter=None, preview=False):
+        # e.g. klass = obj.get_instantiation_class(self.cn, self.cn_class)
+        if preview:
+            if self.IS_TOPLEVEL:
+                if cls_formatter is not None: return cls_formatter(self.klass)
+                return self.klass
+            if formatter is not None:
+                return formatter(self.WX_CLASS)
+            return self.WX_CLASS
+
+        if self.check_prop("instance_class"):
+            return self.instance_class
+        if self.check_prop_truth("class"):
+            if cls_formatter is not None: return cls_formatter(self.klass)
+            return self.klass
+        if formatter is not None:
+            return formatter(self.WX_CLASS)
+        return self.WX_CLASS
 
-    def create_widgets(self):
-        common.app_tree.create_widgets(self.node)
+    def get_property_handler(self, prop_name):
+        """Returns a custom handler function for the property 'prop_name', used when loading this object from a XML file.
+        handler must provide three methods: 'start_elem', 'end_elem' and 'char_data'"""
+        return EventsMixin.get_property_handler(self, prop_name)
 
-    def create(self):
-        "create the wx widget"
-        if self.parent is not None and self.parent.widget is None: return
-        if self.widget: return
-        self.create_widget()
-        self.finish_widget_creation()
-
-    def create_widget(self):
-        "Initializes self.widget and shows it"
-        raise NotImplementedError
-
-    def finish_widget_creation(self, *args, **kwds):
-        "Creates the popup menu and connects some event handlers to self.widgets"
-        self.widget.Bind(wx.EVT_RIGHT_DOWN, self.popup_menu)
-
-    def delete(self):
-        """Destructor. deallocates the popup menu, the notebook and all the properties.
-        Why we need explicit deallocation? Well, basically because otherwise we get a lot of memory leaks... :)"""
-        # XXX tell property editor
-        self.destroy_widget()
-        if misc.focused_widget is self:
-            misc.focused_widget = None
-    
-    def destroy_widget(self):
-        if not self.widget or self._dont_destroy: return
-        if getattr(self, "sizer", None) and not self.sizer.is_virtual():
-            self.sizer.widget.Detach(self.widget)  # remove from sizer without destroying
-        compat.DestroyLater(self.widget)
-        self.widget = None
+    def _properties_changed(self, modified, actions):
+        edit_base.EditBase._properties_changed(self, modified, actions)
+        # enable "custom_base" property only if "class" is active
+        class_p = self.properties.get("class")
+        if class_p and (not modified or "class" in modified) and class_p.deactivated is not None:
+            self.properties["custom_base"].set_blocked( block=class_p.deactivated or not class_p.value )
 
     # context menu #####################################################################################################
     def popup_menu(self, event, pos=None):
@@ -200,14 +196,18 @@
         widgetclass = self.__class__.__name__.lstrip("Edit")
         i = misc.append_menu_item(menu, -1, _('Remove %s\tDel')%widgetclass, wx.ART_DELETE)
         misc.bind_menu_item_after(widget, i, self.remove)
+
+        if hasattr(self, "_add_popup_menu_items"):
+            self._add_popup_menu_items(menu, widget)
+
         i = misc.append_menu_item( menu, -1, _('Copy\tCtrl+C'), wx.ART_COPY )
         misc.bind_menu_item_after(widget, i, clipboard.copy, self)
         i = misc.append_menu_item( menu, -1, _('Cut\tCtrl+X'), wx.ART_CUT )
         misc.bind_menu_item_after(widget, i, clipboard.cut, self)
         menu.AppendSeparator()
 
-        if self.sizer and hasattr(self.sizer, "_add_popup_menu_items"):
-            self.sizer._add_popup_menu_items(menu, self, widget)
+        if hasattr(self.parent, "_add_parent_popup_menu_items"):
+            self.parent._add_parent_popup_menu_items(menu, self, widget)
 
         # preview (create or close?)
         p = misc.get_toplevel_widget(self)
@@ -222,43 +222,27 @@
         return menu
 
     def preview_parent(self, *args):
-        widget = misc.get_toplevel_widget(self)
+        widget = self.toplevel_parent # misc.get_toplevel_widget(self)
         if widget is not None:
             wx.CallAfter( widget.preview )  # direct call would result in crash
 
     ####################################################################################################################
 
-    def remove(self, *args):
-        self._dont_destroy = False  # always destroy when explicitly asked
-        common.app_tree.remove(self.node)
-
-    def duplicate(self, *args):
-        clipboard.copy(self)
-        clipboard.paste(common.app_tree.root.widget)
-
     def on_set_focus(self, event):
         """Event handler called when a window receives the focus: this in fact is
         connected to a EVT_LEFT_DOWN and not to an EVT_FOCUS, but the effect is the same"""
         misc.set_focused_widget(self)
         #if wxPlatform != '__WXMSW__': event.Skip()
 
-    def get_property_handler(self, prop_name):
-        """Returns a custom handler function for the property 'prop_name', used when loading this object from a XML file.
-        handler must provide three methods: 'start_elem', 'end_elem' and 'char_data'"""
-        return EventsMixin.get_property_handler(self, prop_name)
-
-    def properties_changed(self, modified):
-        if modified and "name" in modified:
-            previous_name = self.properties["name"].previous_value
-            common.app_tree.refresh_name(self.node, previous_name)
-        elif not modified or "class" in modified or "name" in modified:
-            common.app_tree.refresh_name(self.node)
-
     # clipboard ########################################################################################################
-    def check_compatibility(self, widget, typename=None, report=False):
+    def check_compatibility(self, widget, typename=None):
         # only with slots before/after
-        if typename is not None and typename=="window" or getattr(widget, "_is_toplevel",False):
+        if typename=="bitmap":
+            return (False, "No bitmaps can be pasted here")
+        if (typename is not None and typename=="window") or (widget and widget.IS_TOPLEVEL):
             return (False,"No toplevel objects can be pasted here")
+        if self.parent.IS_SIZER and not self.parent._can_add_insert_slots():
+            return (False, "Slot is populated already")
         return ("Slot",None)
 
     def check_drop_compatibility(self):
@@ -270,7 +254,7 @@
     def is_visible(self):
         if not self.widget: return False
         if not self.widget.IsShown() and not isinstance(self.widget, wx.ScrolledWindow): return False
-        if self.widget.IsTopLevel():
+        if self.IS_TOPLEVEL:
             return self.widget.GetTopLevelParent().IsShown()
         parent = self.parent
         if parent: return parent.is_visible()
@@ -281,19 +265,16 @@
         widget is currently selected; the default implementation does nothing."""
         pass
 
-    def on_load(self):
-        "called from XML parser, right after the widget is loaded"
-        pass
-
-    def post_load(self):
-        """Called after the loading of an app from a XML file, before showing the hierarchy of widget for the first time.
-        The default implementation does nothing."""
-        pass
+    def _get_default_or_client_size(self):
+        # used by SplitterWindow, Panel to create with parent's client size if parent is not a sizer
+        if self.parent.IS_SIZER: return wx.DefaultSize
+        return self.parent.widget.GetClientSize()
 
     @contextlib.contextmanager
     def frozen(self):
-        if self.widget:
+        if config.use_freeze_thaw and self.widget:
             toplevel = self.widget.GetTopLevelParent()
+            if config.debugging: print("Freezing", toplevel)
             toplevel.Freeze()
         else:
             toplevel = None
@@ -301,6 +282,11 @@
             yield
         finally:
             if toplevel:
+                if self.widget:
+                    self.widget.Refresh()
+                    #self.widget.SendSizeEvent()  # would work most of the time
+                    toplevel.SendSizeEvent()  # would work as well
+                if config.debugging: print("Thawing", toplevel)
                 toplevel.Thaw()
 
 
@@ -325,13 +311,28 @@
                 "If you want to specify either width or height, you can use -1\n"
                 "for the other direction to keep the default for that.\n"
                 "E.g. '200,-1' or '-1,200'.\n"
-                "(The default value is '-1,-1' .)"}
+                "(The default value is '-1,-1' .)",
+
+        "size_sizehints": "Specify the size of the widget.\n"
+                "This might be overridden if Sizehints property is enabled.\n\n"
+                "E.g. '200,100' for a width of 200 pixels and a height of 100.\n\n"
+                "If you want to specify either width or height, you can use -1\n"
+                "for the other direction to keep the default for that.\n"
+                "E.g. '200,-1' or '-1,200'.\n"
+                "(The default value is '-1,-1' .)",
+
+        "sizehints":"Call SetSizeHints method of the toplevel sizer.\n"
+                    "This resizes the window such that it fits the sizer's minimal size.\n"
+                    "Setting this usually overrides the size property."
+    }
 
     _PROPERTY_LABELS = {"attribute":'Store as attribute'}  # used in many derived widget editors
 
+    IS_WINDOW = True
+    CHILDREN = None  # sizer or something else
 
-    def __init__(self, name, klass, parent, id):
-        EditBase.__init__(self, name, klass, parent, id)
+    def __init__(self, name, parent, index, klass, instance_class=None):
+        EditBase.__init__(self, name, parent, index, klass, instance_class)
 
         self.window_id = np.TextPropertyD( "wxID_ANY", name="id", default_value=None )
         self.size      = np.SizePropertyD( "-1, -1", default_value="-1, -1" )
@@ -361,44 +362,26 @@
         self.focused    = np.CheckBoxProperty(False, default_value=False)
         self.hidden     = np.CheckBoxProperty(False, default_value=False)
 
-    def finish_widget_creation(self, *args, **kwds):
-        # store the actual values of foreground, background and font as default, if the property is deactivated later
-        background_p = self.properties["background"]
-        foreground_p = self.properties["foreground"]
- 
+        self.toplevel_parent.parent.check_codegen(self)
+
+    def finish_widget_creation(self, level):
+        self.widget.Bind(wx.EVT_SIZE, self.on_size)
+
+        # store the actual values of font as default, if the property is deactivated later
         fnt = self.widget.GetFont()
-        if not fnt.IsOk():
-            fnt = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT)
-        self._original['font'] = fnt
- 
-        size_p = self.properties['size']
-        if size_p.is_active():
-            self.set_size()
-        else:
-            # this is a dirty hack: in previous versions <=0.7.2 self.set_size is practically always called
-            # set_size then calls self.sizer.set_item(item, pos)
-            # without calling this here, e.g. an empty notebook page is not created!
-            # XXX this should be made more straightforward
-            if "pos" in self.properties:
-                #self.sizer.set_item(self.pos)
-                self.sizer.item_properties_modified(self)
-            size_p.set('%s, %s' % tuple(self.widget.GetSize()))
- 
-        if background_p.is_active(): self.widget.SetBackgroundColour(self.background)
-        if foreground_p.is_active(): self.widget.SetForegroundColour(self.foreground)
+        if not fnt.IsOk(): fnt = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT)
+        self._original['font'] = fnt.GetNativeFontInfoDesc()
 
-        font_p = self.properties.get('font')
-        if font_p and font_p.is_active():
-            self._set_font()
+        if self.check_prop_truth("font"): self._set_font()
+        if self.check_prop_truth("wrap"): self.widget.Wrap(self.wrap)
+        if self.check_prop("size"):       self.set_size()
+        if self.check_prop("background"): self.widget.SetBackgroundColour(self.background)
+        if self.check_prop("foreground"): self.widget.SetForegroundColour(self.foreground)
 
-        EditBase.finish_widget_creation(self)
+        EditBase.finish_widget_creation(self, level)
 
-        self.widget.Bind(wx.EVT_SIZE, self.on_size)
-        # after setting various Properties, we must Refresh widget in order to see changes
-        self.widget.Refresh()
-        #self.widget.Bind(wx.EVT_KEY_DOWN, misc.on_key_down_event)
         self.widget.Bind(wx.EVT_CHAR_HOOK, self.on_char_hook)
-    
+
     def on_char_hook(self, event):
         misc.handle_key_event(event, "design")
 
@@ -418,43 +401,59 @@
                 if child: self._reparent_widget(child)
 
     def recreate_widget(self):
-        "currently used by EditTopLevelPanel to re-create after switch between ScrolledWindow and Panel"
+        "re-create widget and re-parent children"
+        # currently used by panel on modification of 'scrolled' to switch between ScrolledWindow and Panel
         old_widget = self.widget
-        size = self.widget.GetSize()
         with self.frozen():
-            self.create_widget()
-            self.widget.SetSize(size)
+            self.parent.destroying_child_widget(self, self.index)
+            self.create_widget()  # this is not recursive
+            if self.IS_TOPLEVEL_WINDOW: self.widget.SetSize(size)   # do this for IS_TOPLEVEL only?
             old_widget.Hide()
             if self.sel_marker:
                 self.sel_marker.Destroy()
                 self.sel_marker = None
 
-            if self.sizer and not self.sizer.is_virtual():
-                self.sizer.widget.Detach(old_widget)
-                # finish_widget_creation below will add the new widget to the sizer; alternatively add it here
-
             sizer = old_widget.GetSizer()
             if sizer:
                 self.widget.SetSizer(sizer)
                 old_widget.SetSizer(None, False)
                 sizer.SetContainingWindow(self.widget)
                 self._reparent_widget(sizer)
-                #sizer.Layout()
             else:
                 for child in self.widget.GetChildren():
                     # actually, for now a panel may only have a sizer as child, so this code is not executed
                     self._reparent_widget(child)
-            if old_widget in misc.design_windows:
-                misc.design_windows.remove(old_widget)
-                misc.design_windows.append(self.widget)
             compat.DestroyLater(old_widget)
-            self.finish_widget_creation()  # this will add the new widget to the sizer (default argument re_add=True)
+            self.finish_widget_creation(0)
+            self.parent.child_widget_created(self, 0)
+
+    def recreate_widget2(self):
+        "destroy widget (incl. children) and recursively re-create, typically when a style can't be changed dynamically"
+        # restore position and size for toplevels; focus else
+        if self.IS_TOPLEVEL:
+            rect = self.widget.GetTopLevelParent().GetRect()
+        else:
+            focused = misc.focused_widget is self
+
+        with self.frozen():
+            self.parent.destroying_child_widget(self, self.index)
+            self.destroy_widget(0, later=True)
+            self.parent.destroyed_child_widget()
+
+            self.create()
+
+            # restore position and size for toplevels; focus else
+            if self.IS_TOPLEVEL:
+                self.widget.GetTopLevelParent().SetRect(rect)
+            elif focused:
+                misc.focused_widget = self
+                if self.sel_marker: self.sel_marker.Show(True)
 
     def on_size(self, event):
         "Update the value of the 'size' property"
         if not self.widget: return  # this can happen on destruction
-        if event.GetEventObject() is None: return
         event.Skip()
+        if event.GetEventObject() is None: return
         try:
             prop_size = self.properties['size']
 
@@ -487,12 +486,22 @@
             # The issue probably occur only within EditGrid.
             # This is workaround prevents the propagation if the size hasn't changed.
             # Related SF bug report: #170
-            if size_prop == size_widget: return
-
-            prop_size.set(size_widget)  # set to the actual value, either because wx forced it or just for displaying
+            if size_prop != size_widget:
+                # set to the actual value, either because wx forced it or just for displaying
+                prop_size.set(size_widget)
         except KeyError:
             logging.exception(_('Internal Error'))
 
+        # for a Panel this is required, while it's not required for a Frame:
+        if self.CHILDREN==-1 and self.children and self.children[0].IS_SLOT:
+            # make the slot filling the whole window
+            self.children[0].widget.SetSize(self.widget.GetClientSize())
+
+    def on_child_pasted(self):
+        if not self.widget: return
+        if self.parent.WX_CLASS=="wxSplitterWindow":
+            self.parent.widget.UpdateSize()
+
     def _build_from_font(self, font):
         families = np.FontProperty.font_families_from
         styles   = np.FontProperty.font_styles_from
@@ -503,8 +512,14 @@
     def _set_font(self):
         if not self.widget: return
         font_p = self.properties["font"]
-        if not font_p.is_active(): 
-            font = self._original["font"]
+        if not font_p.is_active():
+            try:
+                font = wx.Font()
+                font.SetNativeFontInfo( self._original["font"] )
+            except TypeError:
+                # wxPython 2.8
+                font = self.widget.GetFont()
+                font.SetNativeFontInfoFromString( self._original["font"] )
         else:
             font = font_p.value
             families = np.FontProperty.font_families_to
@@ -513,8 +528,8 @@
             font = wx.Font( font[0], families[font[1]], styles[font[2]], weights[font[3]], font[4], font[5])
 
         self.widget.SetFont(font)
-        if not self.properties["size"].is_active():
-            self.sizer.set_item_best_size(self)
+        #if hasattr(self.parent, "set_item_best_size") and not self.check_prop("size"):
+            #self.parent.set_item_best_size(self)
 
     def set_size(self):
         if not self.widget: return
@@ -522,75 +537,95 @@
         if not size_p.is_active(): return
         size = size_p.get_size(self.widget)
         self.widget.SetSize(size)
-        try:
-            self.sizer.set_item_best_size(self, size=size)
-        except AttributeError:
-            pass
-
-    def get_property_handler(self, name):
-        if name == 'font':
-            return FontHandler(self)
-        elif name == 'extraproperties':
-            return ExtraPropertiesPropertyHandler(self)
-        return EditBase.get_property_handler(self, name)
+        if self.parent.IS_SIZER:
+            self.parent.set_item_best_size(self, size=size)
+        #if hasattr(self.parent, "set_item_best_size"):  # at this point, self.widget may not have been added to a sizer yet
+            #self.parent.set_item_best_size(self, size=size)
 
-    def properties_changed(self, modified=None):
+    def _properties_changed(self, modified, actions):
         # XXX check whether actions are required
-        refresh = False
         if modified and "size" in modified and self.widget:
             self.set_size()
         if not modified or "background" in modified and self.widget:
             self.widget.SetBackgroundColour(self.properties["background"].get_color())
-            refresh = True
+            actions.add("refresh")
         if not modified or "foreground" in modified and self.widget:
             self.widget.SetForegroundColour(self.properties["foreground"].get_color())
-            refresh = True
+            actions.add("refresh")
         if "font" in modified and self.widget:
             self._set_font()
-        if refresh: self.widget.Refresh()
+            actions.add("layout")
+
+        EditBase._properties_changed(self, modified, actions)
+
+    def get_property_handler(self, name):
+        if name == 'font':
+            return FontHandler(self)
+        elif name == 'extraproperties':
+            return ExtraPropertiesPropertyHandler(self)
+        return EditBase.get_property_handler(self, name)
 
-        EditBase.properties_changed(self, modified)
+    def properties_changed(self, modified):
+        actions = EditBase.properties_changed(self, modified)
+        # widget properties modified; trigger updates
+        if self.widget:
+            if config.debugging: print("Actions", actions)
+            if "recreate2" in actions:
+                self.recreate_widget2()
+                self.layout()
+            elif "recreate" in actions:
+                self.recreate_widget()
+                self.layout()
+            elif "refresh" in actions:
+                self.widget.Refresh()
+            if "layout" in actions:
+                self.layout()
+            if "sizeevent" in actions:
+                wx.SafeYield()  # required for gtk when e.g. increasing the font size of a label or button
+                compat.wxWindow_SendSizeEventToParent(self.widget)
+        return actions
 
     def get_properties(self, without=set()):
-        if not self.properties["foreground"].is_active(): without.add("foreground")
-        if not self.properties["background"].is_active(): without.add("background")
+        if "foreground" in self.properties:
+            if not self.properties["foreground"].is_active(): without.add("foreground")
+            if not self.properties["background"].is_active(): without.add("background")
         return EditBase.get_properties(self, without)
 
 
-
 class ManagedBase(WindowBase):
     """Base class for every window managed by a sizer.
 
     Extends WindowBase with the addition of properties relative to the layout of the window:
     proportion/option, flag, and border."""
-    _is_toplevel = False  # this will be True for a top level widget like Frame
 
-    _PROPERTIES = ["Layout","pos", "span", "proportion", "border", "flag"]
-    SIZER_PROPERTIES = ["pos","proportion","border","flag"]
+    _PROPERTIES = ["Layout", "span", "proportion", "border", "flag"]
+    SIZER_PROPERTIES = ["proportion","border","flag"]
     PROPERTIES = WindowBase.PROPERTIES + _PROPERTIES
 
-    _PROPERTY_HELP = { "border": _("Border width, if enabled below"),  "pos": _("Sizer slot") }
+    _PROPERTY_HELP = { "border": _("Border width, if enabled below") } #,  "pos": _("Sizer slot") }
     _PROPERTY_LABELS = {"option": "Proportion" }
 
+    #CHILDREN = 0  # most widgets have no children
+
     ####################################################################################################################
 
-    def __init__(self, name, klass, parent, id, sizer, pos):
-        WindowBase.__init__(self, name, klass, parent, id)
+    def __init__(self, name, parent, index, instance_class=None, class_=None):
+        WindowBase.__init__(self, name, parent, index, class_, instance_class)
         # if True, the user is able to control the layout of the widget
         # inside the sizer (proportion, borders, alignment...)
-        self._has_layout = not sizer.is_virtual()
-
-        self.sizer = sizer
+        self._has_layout = parent.IS_SIZER
 
         # attributes to keep the values of the sizer properties
-        self.pos        = np.LayoutPosProperty(pos)            # position within the sizer, 1-based
+        if index is None:
+            if self in self.parent.children:
+                index = self.parent.children.index(self)
+            else:
+                index = len(self.parent.children) - 1
         self.span       = np.LayoutSpanProperty((1,1))         # cell spanning for GridBagSizer
         self.proportion = np.LayoutProportionProperty(0)       # item growth in sizer main direction
         self.border     = np.SpinProperty(0, immediate=True)   # border width
         self.flag       = np.ManagedFlags(0)                   # alignment, border; expansion in other dir.
 
-        sizer.add_item(self, pos)
-
     def check_defaults(self):
         # apply default border if set in preferences; called explicitely from the interactive builder functions
         if not config.preferences.default_border or self.border==config.preferences.default_border_size: return
@@ -599,16 +634,13 @@
         if not flag_p.value_set.intersection(flag_p.FLAG_DESCRIPTION["Border"]):
             flag_p.add("wxALL", notify=False)
 
-    def finish_widget_creation(self, sel_marker_parent=None, re_add=True):
-        if sel_marker_parent is None: sel_marker_parent = self.parent.widget
+    def finish_widget_creation(self, level, sel_marker_parent=None, re_add=True):
+        if sel_marker_parent is None: sel_marker_parent = self.parent_window.widget
         self.sel_marker = misc.SelectionMarker(self.widget, sel_marker_parent)
-        WindowBase.finish_widget_creation(self)
+        WindowBase.finish_widget_creation(self, level)
         self.widget.Bind(wx.EVT_LEFT_DOWN, self.on_set_focus)
         self.widget.Bind(wx.EVT_MOUSE_EVENTS, self.on_mouse_events)
         self.widget.Bind(wx.EVT_MOVE, self.on_move)
-        if re_add:
-            # re-add the item to update it; this is not to be done when a widget is replaced due to style change
-            self.sizer.add_item( self, self.pos )
 
     def update_view(self, selected):
         if self.sel_marker: self.sel_marker.Show(selected)
@@ -626,10 +658,10 @@
             size_p.set(old)
         if self.sel_marker: self.sel_marker.update()
 
-    def properties_changed(self, modified):
-        WindowBase.properties_changed(self, modified)
+    def _properties_changed(self, modified, actions):
+        WindowBase._properties_changed(self, modified, actions)
         p = self.properties["flag"]
-        if modified and "flag" in modified and self.parent.is_sizer:
+        if modified and "flag" in modified and self.parent.IS_SIZER:
             p._check_value()
 
         if "flag" in modified and "wxSHAPED" in p.value_set and self.proportion:
@@ -645,42 +677,60 @@
 
         if not modified or ("option" in modified or "flag" in modified or "border" in modified or
             "size" in modified or "span" in modified):
-            if self.sizer._IS_GRIDBAG and (not modified or "span" in modified) and self.span!=(1,1):
+            if self.parent.WX_CLASS=="wxGridBagSizer" and (not modified or "span" in modified) and self.span!=(1,1):
                 # check span range, if pasted item would span more rows/cols than available
                 span_p = self.properties["span"]
-                max_span = self.sizer.check_span_range(self.pos, *span_p.value)
+                max_span = self.sizer.check_span_range(self.index, *span_p.value)
                 max_span = ( min(span_p.value[0],max_span[0]), min(span_p.value[1],max_span[1]) )
                 if max_span!=span_p.value:
                     span_p.set(max_span, notify=False)
-            if not self.sizer.is_virtual():
+            if self.parent.IS_SIZER:
                 self.sizer.item_properties_modified(self, modified)
+                actions.add("layout")
 
-    def _set_widget_best_size(self):
-        # called when the widget has been modified and this might affect the automatic size
-        if not self.widget: return
-        size_p = self.properties["size"]
-        if size_p.is_active() and size_p.get() != "-1, -1": return # fixed size
-        # find best size, apply; display if size property is not active
-        self.widget.SetMinSize( (-1,-1) )  # otherwise the size would often not be reduced, e.g. for buttons
-        best_size = self.widget.GetBestSize()
-        self.sizer.set_item_best_size(self, best_size)
-        if not size_p.is_active():
-            size_p.set( best_size )
+        # if an item inside a flex grid sizer is set to EXPAND, inform the user if row and col are not growable
+        if modified and "flag" in modified and self.parent.IS_SIZER and "growable_rows" in self.parent.properties:
+            if p.previous_value is not None and "wxEXPAND" in p.value_set and not "wxEXPAND" in p.previous_value:
+                row, col = self.parent._get_row_col(self.index)
+                if not row in self.parent.growable_rows and not col in self.parent.growable_cols:
+                    wx.CallAfter(self.parent.ask_growable, row,col)
+
+        #if modified and self.widget:
+            #wx.SafeYield()  # required for gtk when e.g. increasing the font size of a label or button
+            #self.widget.SendSizeEventToParent()
+        if modified: actions.add("sizeevent")
+
+    #def _set_widget_best_size(self):
+        ## called when the widget has been modified and this might affect the automatic size
+        #if not self.widget: return
+        #size_p = self.properties["size"]
+        #if size_p.is_active() and size_p.get() != "-1, -1": return # fixed size
+        ## find best size, apply; display if size property is not active
+        #self.widget.SetMinSize( (-1,-1) )  # otherwise the size would often not be reduced, e.g. for buttons
+        
+        #print("skipping SET BESET SIZE")
+        ##if hasattr(self.parent, "set_item_best_size"):
+            ##best_size = self.widget.GetBestSize()
+            ##print("SET BESET SIZE", best_size)
+            ##self.parent.set_item_best_size(self, best_size)
+            ##if not size_p.is_active():
+                ##size_p.set( best_size )
 
-    def destroy_widget(self):
-        if self.sel_marker:
+    def destroy_widget(self, level, later=True):
+        if self.widget and self.sel_marker:
             self.sel_marker.Destroy()  # destroy the selection markers
             self.sel_marker = None
-        WindowBase.destroy_widget(self)
+        WindowBase.destroy_widget(self, level, later)
 
     def _remove(self):
         "don't set focus"
-        return self.sizer.free_slot(self.pos)
+        return self.parent._free_slot(self.index)
 
     def remove(self):
-        with self.frozen():
-            slot = self._remove()
-        misc.set_focused_widget(slot)
+        # entry point from GUI
+        #with self.frozen():  # this does not work on mac os: when deleting a panel notebook page, it will remain black
+        slot = self._remove()
+        misc.rebuild_tree(slot, recursive=False)
 
     def on_mouse_events(self, event):
         if event.Dragging():
@@ -691,7 +741,6 @@
         event.Skip()
 
 
-
 class PreviewMixin(object):
     def __init__(self):
         self.preview = np.ActionButtonProperty(self.on_preview)
@@ -711,9 +760,12 @@
             return
         new_label = None
         if self.preview_widget is None:
-            self.preview_widget = common.app_tree.app.preview(self, self._preview_position)
+            self.preview_widget = common.root.preview(self, self._preview_position)
             if self.preview_widget:
                 new_label = _('Close Preview')
+            if wx.Platform == '__WXGTK__':  # otherwise e.g. preview of Test_Editing2 fails sometimes
+                wx.SafeYield()
+                compat.wxWindow_SendSizeEventToParent(self.preview_widget)
         else:
             self._preview_position = self.preview_widget.GetPosition()  # remember position
             self.preview_widget.Close()
@@ -742,26 +794,72 @@
 
 class TopLevelBase(WindowBase, PreviewMixin):
     "Base class for every non-managed window (i.e. Frames, Dialogs and TopLevelPanel)"
-    _is_toplevel = True
-    _is_toplevel_window = True  # will be False for TopLevelPanel and MDIChildFrame
-    _custom_base_classes = True
     PROPERTIES = WindowBase.PROPERTIES + ["design","preview"]
+    np.insert_after(PROPERTIES, "name", "class", "custom_base")
+
+    IS_TOPLEVEL = True
+    IS_TOPLEVEL_WINDOW = True  # will be False for TopLevelPanel and MDIChildFrame
+    CHILDREN = 1  # a sizer or a widget
+
+    _PROPERTY_HELP={ "extracode_pre": "This code will be inserted at the beginning of the constructor.",
+                     "extracode_post":"This code will be inserted at the end of the constructor." }
 
-    def __init__(self, name, klass, parent, id, title=None):
-        WindowBase.__init__(self, name, klass, parent, id)
+    def __init__(self, name, parent, klass, title=None):
+        WindowBase.__init__(self, name, parent, None, klass)
         self._oldname = name
-        self.has_title = "title" in self.PROPERTIES
-        if self.has_title:
-            if title is None: title = self.name
-            self.title = np.TextProperty(title)
-        self.sizer = None  # sizer that controls the layout of the children of the window
+        if "title" in self.PROPERTIES:
+            self.title = np.TextProperty(title if title is not None else name)
         PreviewMixin.__init__(self)
         self.design = DesignButtonProperty(self.on_design_button)
 
-    def finish_widget_creation(self, *args, **kwds):
-        WindowBase.finish_widget_creation(self)
+    @property
+    def window_sizer(self):
+        # return the main sizer for this window
+        if len(self.children)!=1: return None
+        if self.children[0] is None: return None
+        if self.children[0].IS_SIZER: return self.children[0]
+        return None
+
+    def create(self):
+        # creates/shows the widget of the given toplevel node and all its children
+        wx.BeginBusyCursor()
+        try:
+            WindowBase.create(self)
+        finally:
+            wx.EndBusyCursor()
+        # from old code:
+        # below, probably check_prop should be False
+        ## set the best size for the widget (if no one is given)
+        #if not self.check_prop('size'):
+            #if self.sizer:  # self.sizer is the containing sizer, i.e. the parent
+                #self.sizer.fit_parent()
+            #elif self.WX_CLASS=="wxPanel" and self.children:
+                #wx.Yield()  # by now, there are probably many EVT_SIZE in the queue
+                #self.children[0].fit_parent()
+
+        self.widget.GetTopLevelParent().Show()
+        # SafeYield and SetFocus are required for e.g. Ubuntu w. Python 3.8 and wxPython 4.0.7
+        # see file SIMPLIFICATIONS\Tests_full.wxg where the first frame will not be layouted
+        wx.SafeYield()
+        self.widget.Raise()
+        self.widget.SetFocus()
+
+    def show_widget(self):
+        if not self.widget:
+            self.create()
+        else:
+            self.widget.GetTopLevelParent().Show()  # GetTopLevelParent is required for e.g. Panel
+            self.widget.GetTopLevelParent().Raise()
+
+    def finish_widget_creation(self, level):
+        WindowBase.finish_widget_creation(self, level)
+
+        if self.CHILDREN:  # not for MenuBar, ToolBar
+            self.drop_target = clipboard.DropTarget(self)
+            self.widget.SetDropTarget(self.drop_target)
+
         self.widget.SetMinSize = self.widget.SetSize
-        if self.has_title:
+        if self.check_prop("title"):
             self.widget.SetTitle( misc.design_title(self.title) )
         elif hasattr(self.widget, 'SetTitle'):
             self.widget.SetTitle(misc.design_title(self.name))
@@ -772,17 +870,21 @@
             # MSW isn't smart enough to avoid overlapping windows, so at least move it away from the 3 wxGlade frames
             self.widget.Center()
 
-    def create(self):
-        WindowBase.create(self)
-        if wx.Platform == '__WXMSW__':
-            # more than ugly, but effective hack to properly layout the window on Win32
-            if self.properties['size'].is_active():
-                w, h = self.widget.GetSize()
-                self.widget.SetSize((-1, h+1))
-                self.widget.SetSize((-1, h))
-            elif self.sizer:
-                self.sizer.fit_parent()
-        misc.design_windows.append(self.widget)
+    def destroy_widget(self, level, later=True):
+        if self.preview_widget is not None:
+            self.preview_widget.Unbind(wx.EVT_CHAR_HOOK)
+            compat.DestroyLater(self.preview_widget)
+            self.preview_widget = None
+        WindowBase.destroy_widget(self, level, later)
+
+    def hide_widget(self, event=None):
+        self.widget.Hide()  # just hide, don't close
+        common.app_tree.Collapse(self.item)
+        self.design.update_label()
+
+    def duplicate(self, *args):
+        clipboard.copy(self)
+        clipboard.paste(common.root)
 
     def _create_popup_menu(self, widget):
         # remove, hide
@@ -807,7 +909,8 @@
         # paste
         i = misc.append_menu_item(menu, -1, _('Paste Sizer\tCtrl+V'), wx.ART_PASTE)
         misc.bind_menu_item_after(widget, i, clipboard.paste, self)
-        if self.sizer is not None or not clipboard.check("sizer"): i.Enable(False)
+        # XXX change later on to allow other widgets to be pasted
+        if self.children or not clipboard.check("sizer"): i.Enable(False)
 
         # preview
         menu.AppendSeparator()
@@ -829,92 +932,98 @@
         self.design.update_label()
 
     ####################################################################################################################
-    def check_compatibility(self, widget, typename=None, report=True):
+    def check_compatibility(self, widget, typename=None):
         "check in advance whether widget can be pasted"
 
-        if self.sizer is not None:
-            if report:
-                return (False, 'Sizer already set for this window')
-            return (True,None)
+        if widget is not None:
+            if widget.WX_CLASS=="wxMenuBar":   typename = "menubar"
+            elif widget.WX_CLASS=="wxToolBar": typename = "toolbar"
+            elif widget.WX_CLASS=="wxStatusBar": typename = "statusbar"
+
+        if typename in ("menubar", "toolbar", "statusbar"):
+            if not typename in self.properties:
+                return (False, "Can't set a menu, tool or status bar")
+            if self.check_prop(typename) and getattr(self, typename):
+                return (False, 'Menu, tool or status bar already set for this window')
+            return (True, None)
+
+        if widget and widget.IS_TOPLEVEL:
+            # a toplevel dragged internally on another toplevel -> just re-order
+            return ("Reorder", None)
+
+        if self.children and not self.children[0].IS_SLOT:
+            return (False, 'Sizer or child widget already set for this window')
 
         if typename is not None:
-            if typename!="sizer":
-                return (False,'Only sizers can be pasted here')
+            #if typename!="sizer":
+                #return (False,'Only sizers can be pasted here')
             return (True,None)
-        import edit_sizers
-        if not isinstance(widget, edit_sizers.Sizer):
-            return (False, 'Only sizers can be pasted here')
+        #import edit_sizers
+        #if not isinstance(widget, edit_sizers.Sizer):
+        #if not widget.IS_SIZER:
+            #return (False, 'Only sizers can be pasted here')
         return (True,None)
 
     def clipboard_paste(self, clipboard_data):
         "Insert a widget from the clipboard to the current destination"
         if self.widget: size = self.widget.GetSize()
-        ret = clipboard._paste(self, None, 0, clipboard_data)
+        ret = clipboard._paste(self, 0, clipboard_data)
         if self.widget: self.widget.SetSize(size)
         return ret
 
     ####################################################################################################################
     def set_sizer(self, sizer):
-        self.sizer = sizer
-        if self.sizer and self.sizer.widget and self.widget:
+        assert sizer in self.children
+        if sizer.widget and self.widget:
             self.widget.SetAutoLayout(True)
-            self.widget.SetSizer(self.sizer.widget)
+            self.widget.SetSizer(sizer.widget)
             self.widget.Layout()
 
     def on_enter(self, event):
-        if not self.sizer and common.adding_sizer:
+        if not self.children and common.adding_sizer:
             self.widget.SetCursor(wx.CROSS_CURSOR)
         else:
             self.widget.SetCursor(wx.STANDARD_CURSOR)
 
-    def drop_sizer(self, event=None):
-        if self.sizer or not common.adding_sizer:
+    def drop_sizer(self, event=None, reset=None):
+        if self.children:# or not common.adding_sizer:
             self.on_set_focus(event)  # default behaviour: call show_properties
             return
         if self.widget: self.widget.SetCursor(wx.STANDARD_CURSOR)
-        common.widgets[common.widget_to_add](self, None, None)
+        new_widget = common.widgets[common.widget_to_add](self, None)
+        if new_widget is None: return
+        misc.rebuild_tree(new_widget)
+        if reset is False: return
         if event is None or not misc.event_modifier_copy(event):
             common.adding_widget = common.adding_sizer = False
             common.widget_to_add = None
-        common.app_tree.app.saved = False
 
     def check_drop_compatibility(self):
-        if self.sizer:
-            return (False, 'Sizer already set for this window')
-        if common.adding_sizer:
-            return (True, None)
-        return (False, 'Only sizers can be added here')
-
-    def hide_widget(self, event=None):
-        self.widget.Hide()  # just hide, don't close
-        common.app_tree.expand(self.node, False)
-        #misc.set_focused_widget(self.node.parent)
-        self.design.update_label()
+        if self.children:
+            return (False, 'Sizer or child widget already set for this window')
+        #if common.adding_sizer:
+        return (True, None)
+        #return (False, 'Only sizers can be added here')
 
     def on_size(self, event):
         WindowBase.on_size(self, event)
-        if self.sizer and self.widget:
-            self.sizer.refresh()
-
-    def properties_changed(self, modified):
-        if self.has_title and (not modified or "title" in modified):
-            if self.widget:
-                self.widget.SetTitle(misc.design_title(self.title))
-            common.app_tree.refresh(self.node)
+        if len(self.children)!=1 or self.children[0] is None or not self.children[0].widget: return
+        child = self.children[0]
+        #if child.IS_SLOT or child.WX_CLASS in ("wxSplitterWindow", "wxPanel", "wxNotebook"):
+        if child.WX_CLASS in ("wxSplitterWindow", "wxPanel", "wxNotebook"):
+            # resize element to fill full space; SendSizeEvent in frozen is not enough
+            size = self.widget.GetClientSize()
+            child.widget.SetSize( size )
+
+    def _properties_changed(self, modified, actions):
+        if "title" in self.properties and (not modified or "title" in modified):
+            if self.widget: self.widget.SetTitle( misc.design_title(self.title) )
 
         if not modified or "name" in modified and (self.name!=self._oldname):
-            common.app_tree.app.update_top_window_name(self._oldname, self.name)
+            self.parent.update_top_window_name(self._oldname, self.name)
+            self._oldname = self.name
 
-        WindowBase.properties_changed(self, modified)
-
-    def delete(self, *args):
-        if self.preview_widget is not None:
-            self.preview_widget.Unbind(wx.EVT_CHAR_HOOK)
-            compat.DestroyLater(self.preview_widget)
-            self.preview_widget = None
-        widget = self.widget
-        WindowBase.delete(self)
-        if widget is not None and widget in misc.design_windows: misc.design_windows.remove(widget)
+        WindowBase._properties_changed(self, modified, actions)
 
     def _find_widget_by_pos(self, w, x,y, level=1):
         "helper for find_widget_by_pos; w is the parent window/widget"
@@ -923,7 +1032,7 @@
             x0,y0,width,height = w.GetRect()
             return self._find_widget_by_pos(page, x-x0,y-y0, level+1)
         ret = []
-        # check the widget itself
+        # check the widget itself; except for the toplevel, this is redundant
         if w.IsTopLevel():  # for a Frame, Rect is the screen position
             x0,y0,width,height = w.GetClientRect()
         else:
@@ -943,18 +1052,30 @@
                 ret += self._find_widget_by_pos(c, x,y, level+1)
         return ret
 
-    def find_widget_by_pos(self, x,y):
-        "find the widget at a given position"
+    def find_editor_by_pos(self, x,y):
+        "find the Edit item at a given position"
         if self.widget is None: return None
-        x0,y0,width,height = self.widget.ClientRect
-        found = self._find_widget_by_pos(self.widget, x-x0,y-y0)
-        if not found: return None
-        node = None
-        while found and node is None:
-            node = common.app_tree.find_widget(found.pop(-1))
-        if node is None: return None
-        return node.widget
-
+        found = self._find_widget_by_pos(self.widget, x,y)
+        while found:
+            w = self._find_editor( found.pop(-1), self )
+            if w: return w
+        return None
+
+    def _find_editor(self, widget, node):
+        # wx widget to editor
+        if node.widget is None:
+            return
+        if widget is node.widget: return node
+        button = getattr(node, "_btn", None)
+        if button is not None and widget is button: return node
+        if hasattr(node.widget, "GetStaticBox"):
+            if widget is node.widget.GetStaticBox(): return node
+        if node.children:
+            for child in node.children:
+                found = self._find_editor(widget, child)
+                if found is not None:
+                    return found
+        return None
 
 
 class EditStylesMixin(np.PropertyOwner):
@@ -967,44 +1088,26 @@
 
     style_set: Set of selected styles (strings)
     style_names: List of style names
-    widget_writer: Widget code writer (wcodegen.BaseWidgetWriter)
-
-    """
-    codegen = None             # Code generator class; @see: L{codegen.BaseLangCodeWriter}
-    update_widget_style = True # Flag to update the widget style if a style is set using L{set_style()}
+    widget_writer: Widget code writer (wcodegen.BaseWidgetWriter)"""
+    codegen = None             # Code generator class; see: codegen.BaseLangCodeWriter
+    update_widget_style = True # Flag to update the widget style if a style is set using set_style()
     recreate_on_style_change = False
 
-    def __init__(self, klass='', styles=[]):
+    def __init__(self, styles=[]):
         """Initialise instance
 
         klass: Name of the wxWidget klass
-        styles: Supported styles, for more details see L{widget_properties.CheckListProperty}; list or OrderedDict"""
-        assert klass or hasattr(self, 'base')
+        styles: Supported styles, for more details see widget_properties.CheckListProperty; list or OrderedDict"""
 
         self.style_names = []
 
-        # This class needs the wxWidget class to get the proper widget
-        # writer. Mostly the wxWidget class is stored in self.base. If
-        # not you've to set manually using constructors 'klass' parameter.
-        # The 'klass' parameter will preferred used.
-        if klass:
-            klass = klass
-        elif getattr(self, 'base', None):
-            klass = self.base
-        else:
-            raise TypeError('Can not determinate wxWidgets class')
-
-        # set code generator only once per class
         if not self.codegen:
-            self.codegen = common.code_writers['python'].copy()
-            self.codegen.for_version = compat.version
-            EditStylesMixin.codegen = self.codegen
+            EditStylesMixin.codegen = common.code_writers['preview']
 
         try:
-            self.widget_writer = self.codegen.obj_builders[klass]
+            self.widget_writer = self.codegen.obj_builders[self.WX_CLASS]
         except KeyError:
             raise NotImplementedError
-
         if styles:
             if isinstance(styles, dict):
                 for box_label in styles.keys():
@@ -1013,51 +1116,8 @@
                 self.style_names = styles
         else:
             self.style_names = self.widget_writer.style_list
-        #self.style = np.WidgetStyleProperty(0) # this will use below methods
         self.style = np.WidgetStyleProperty()  # this will read it's default value
 
-    def _set_widget_style(self):
-        """Set a new widget style if the style has changed.
-        For some widgets style changes are not possible, so they need to be re-created.
-        The attribute recreate_on_style_change needs to be True in this case."""
-        if not self.widget or not self.update_widget_style: return
-        old_style = self.widget.GetWindowStyleFlag()
-        new_style = self.style
-        if old_style == new_style: return
-
-        recreate = self.recreate_on_style_change
-        if self.base == "wxButton" and (old_style & wx.BU_EXACTFIT != new_style & wx.BU_EXACTFIT):
-            recreate = True  # workaround
-
-        if not recreate:
-            # update style without re-creating the widget
-            self.widget.SetWindowStyleFlag(new_style)
-            self.widget.Refresh()
-            return
-
-        # some widgets can't be updated, e.g. Gauge can't be switched between horizontal and vertical after creation
-        # this is for ManagedBase derived classes only
-        with self.frozen():
-            focused = misc.focused_widget is self
-            if self.sel_marker:
-                self.sel_marker.Destroy()
-                self.sel_marker = None
-            old_widget = self.widget
-            old_widget.Hide()
-            inside_sizer = self.sizer and not self.sizer.is_virtual()
-            if inside_sizer: si = self.sizer.widget.GetItem(old_widget)
-            self.create_widget()
-            if inside_sizer: compat.SizerItem_SetWindow(si, self.widget)
-            compat.DestroyLater(old_widget)
-            if inside_sizer: self.sizer.item_properties_modified(self)  # will call toplevel Refresh as well
-
-            self.finish_widget_creation(re_add=False)
-            if inside_sizer: self.sizer.layout()
-            if focused:
-                misc.focused_widget = self
-                if self.sel_marker: self.sel_marker.Show(True)
-
-
     @decorators.memoize
     def wxname2attr(self, name):
         """Return the attribute specified by the name. Only wx attributes are supported.
@@ -1085,8 +1145,24 @@
             return getattr(wx.propgrid, cn)
         raise ValueError("namespace %s not implemented"%namespace)
 
-    def properties_changed(self, modified):
-        if "style" in modified:
-            self._set_widget_style()
+    def _properties_changed(self, modified, actions):
+        if not modified or not "style" in modified: return
+        if not self.widget or not self.update_widget_style: return
+        if "recreate" in actions or "recreate2" in actions: return
+        old_style = self.widget.GetWindowStyleFlag()
+        new_style = self.style
+        if old_style == new_style: return
+
+        if self.recreate_on_style_change:
+            actions.add("recreate2")
+        if self.WX_CLASS == "wxButton" and (old_style & wx.BU_EXACTFIT != new_style & wx.BU_EXACTFIT):
+            actions.add("recreate2")  # workaround
+
+        if not "recreate2" in actions:
+            # update style without re-creating the widget
+            self.widget.SetWindowStyleFlag(new_style)
+            actions.add("refresh")
 
 
+class Slot(edit_base.Slot):
+    pass
diff -Nru wxglade-0.9.6/errors.py wxglade-1.0.1/errors.py
--- wxglade-0.9.6/errors.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/errors.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-"""\
-wxGlade internal exceptions
-
-@note: Please update the documentation accordingly after changing this file.
-
-@copyright: 2012-2016 Carsten Grohmann
-@license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
-"""
-
-
-class WxgBaseException(Exception):
-    "Base class for all individual wxGlade exceptions"
-    msg = None
-
-    def __str__(self):
-        if not self.msg:
-            return ""
-        if len(self.args) == 1:
-            text = self.msg % self.args[0]
-        else:
-            text = "%s: %s" % (self.msg, self.args)
-        return text
-
-
-class WxgOutputDirectoryNotExist(WxgBaseException):
-    "Raised if output path is not an existing directory"
-    msg = _('Output path "%s" must be an existing directory.\nCheck Properties->Application->Output Path.')
-
-class WxgOutputDirectoryNotWritable(WxgBaseException):
-    "Raised if the output path exists but the directory is not writable"
-    msg = _('Output path "%s" exists but the directory is not writable.\nCheck Properties->Application->Output Path.')
-
-class WxgOutputPathIsDirectory(WxgBaseException):
-    "Raised if the output path is a directory when generating a single file"
-    msg = _('Output path "%s" can not be a directory when generating a single file.\nCheck Properties->Application->Output Path.')
-
-class WxgOutputPathIsNotDirectory(WxgBaseException):
-    "Raised if the output path is not a directory when generating multiple files"
-    msg = _('Output path "%s" should be a directory when generating multiple files.\nCheck Properties->Application->Output Path.')
-
-class WxgOutputUnicodeError(WxgBaseException):
-    "Raised if the generated code can't converted to the desired encoding"
-    msg = _('''Generated source code couldn't converted to encoding %s.\n'''
-            '''The source contains invalid characters "%s" from %s to %s.''')
-
-class WxgLispWx3NotSupported(WxgBaseException):
-    "Raised if Lisp code for wx 3.0 or newer should be generated"
-    msg = _('Generating Lisp code for wxWidgets version %s is not supported.')
-
-class WxgXRCMultipleFilesNotSupported(WxgBaseException):
-    "Raised multi file XRC designs."
-    msg = _('XRC code cannot be split into multiple files.')
-
-class WxgTemplateCodegenNotPossible(WxgBaseException):
-    "Code generation from a template is not possible"
-    msg = _('Code generation from a template is not possible.')
-
-class WxgMissingCodeWriter(WxgBaseException):
-    "Code writer for the given language is not available"
-    msg = _('Code writer for "%s" is not available.')
-
-class WxgReadSourceFileUnicodeError(WxgBaseException):
-    "Unicode decode error during reading an already existing source file"
-    msg = _('Conversion of the source file %s to Unicode failed.')
diff -Nru wxglade-0.9.6/events_mixin.py wxglade-1.0.1/events_mixin.py
--- wxglade-0.9.6/events_mixin.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/events_mixin.py	2020-12-31 14:04:48.000000000 +0000
@@ -27,9 +27,10 @@
                "then you need to create and register the handler yourself.\n"
                "You can do so in your own source that you derive from the\n"
                "wxGlade generated code or within wxGlade on the 'Code' tab.")
-    validation_res = [re.compile(r'^EVT_[a-zA-Z0-9_]+$'),
+    validation_res = [re.compile(r'^([a-zA-Z_][a-zA-Z0-9_\.]*\.)?EVT_[A-Z0-9_]+$'),  # XXX avoid ..
                       re.compile(r'^(([a-zA-Z_]+[a-zA-Z0-9_-]*)|()|(lambda .*))$')]
     EDITABLE_COLS = [0,1]
+    UPPERCASE_COLS = [None,None]
     SKIP_EMPTY = True
     IS_KEY_VALUE = True
     CAN_ADD_GROUPS = True
@@ -47,8 +48,14 @@
         self.grid.AutoSizeColumn(1, False)
 
     def set_value_dict(self, values_dict):
+        default_events = set()
         for row in self.value:
             row[1] = values_dict.get(row[0], "")
+            default_events.add(row[0])
+        # handle non-default events
+        for key, value in values_dict.items():
+            if key in default_events: continue
+            self.value.append([key,value])
         self.update_display()
 
     def write(self, output, tabs):
@@ -95,14 +102,15 @@
     def __init__(self):
         # get events known by this widget
         try:
-            events = list( config.widget_config[self.klass]['events'].keys() )
+            #events = list( config.widget_config[self.klass]['events'].keys() )
+            events = list( config.widget_config[self.WX_CLASS]['events'].keys() )
             if 'default' in events: events.remove('default')
             events.sort()
         except KeyError:
             events = []  # no default handler
 
         # create Property
-        self.events = EventsProperty(events) if events else None
+        self.events = EventsProperty(events) if events is not None else None
 
     def get_property_handler(self, name):
         if name == 'events':
diff -Nru wxglade-0.9.6/examples/AllWidgets/AllWidgets_28.py wxglade-1.0.1/examples/AllWidgets/AllWidgets_28.py
--- wxglade-0.9.6/examples/AllWidgets/AllWidgets_28.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/AllWidgets/AllWidgets_28.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,15 +1,15 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
-# generated by wxGlade 0.8.0a13 on Tue Dec 19 20:27:46 2017
+# generated by wxGlade 1.0.0b2 on Sat Dec 12 18:00:23 2020
 #
 
 import wx
-import wx.calendar
-import wx.grid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.calendar
+import wx.grid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -21,7 +21,12 @@
         # begin wxGlade: All_Widgets_Frame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        
+        self.SetSize((800, 417))
+        self.SetTitle(_("All Widgets"))
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
+        self.SetIcon(_icon)
+
         # Menu Bar
         self.All_Widgets_menubar = wx.MenuBar()
         wxglade_tmp_menu = wx.Menu()
@@ -32,12 +37,12 @@
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&File"))
         wxglade_tmp_menu = wx.Menu()
         self.All_Widgets_menubar.mn_Unix = wxglade_tmp_menu.Append(wx.ID_ANY, _("Unix"), _("Use Unix line endings"), wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.onSelectUnix, id=self.All_Widgets_menubar.mn_Unix.GetId())
+        self.Bind(wx.EVT_MENU, self.onSelectUnix, self.All_Widgets_menubar.mn_Unix)
         self.All_Widgets_menubar.mn_Windows = wxglade_tmp_menu.Append(wx.ID_ANY, _("Windows"), _("Use Windows line endings"), wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.onSelectWindows, id=self.All_Widgets_menubar.mn_Windows.GetId())
+        self.Bind(wx.EVT_MENU, self.onSelectWindows, self.All_Widgets_menubar.mn_Windows)
         wxglade_tmp_menu.AppendSeparator()
         self.All_Widgets_menubar.mn_RemoveTabs = wxglade_tmp_menu.Append(wx.ID_ANY, _("Remove Tabs"), _("Remove all leading tabs"), wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.onRemoveTabs, id=self.All_Widgets_menubar.mn_RemoveTabs.GetId())
+        self.Bind(wx.EVT_MENU, self.onRemoveTabs, self.All_Widgets_menubar.mn_RemoveTabs)
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Edit"))
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.ID_HELP, _("Manual"), _("Show the application manual"))
@@ -47,349 +52,504 @@
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.All_Widgets_menubar)
         # Menu Bar end
+
         self.All_Widgets_statusbar = self.CreateStatusBar(1, wx.ST_SIZEGRIP)
-        
+        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
+        for i in range(len(All_Widgets_statusbar_fields)):
+            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
+
         # Tool Bar
         self.All_Widgets_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.All_Widgets_toolbar)
         self.All_Widgets_toolbar.AddLabelTool(wx.ID_UP, _("UpDown"), wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, _("Up or Down"), _("Up or Down"))
         self.All_Widgets_toolbar.AddLabelTool(wx.ID_OPEN, _("Open"), wx.EmptyBitmap(32, 32), wx.NullBitmap, wx.ITEM_NORMAL, _("Open a new file"), _("Open a new file"))
+        self.SetToolBar(self.All_Widgets_toolbar)
+        self.All_Widgets_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxBitmapButton = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
+        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
+
+        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
+
+        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
+        self.bitmap_button_icon1.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_empty1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.EmptyBitmap(10, 10))
+        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
+        self.bitmap_button_empty1.SetDefault()
+        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_art = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
+        self.bitmap_button_art.SetDefault()
+        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
+
+        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_3 = wx.Button(self.notebook_1_wxButton, wx.ID_BOLD, "")
+        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_wxCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
+
+        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.calendar_ctrl_1 = wx.calendar.CalendarCtrl(self.notebook_1_wxCalendarCtrl, wx.ID_ANY, style=wx.calendar.CAL_MONDAY_FIRST | wx.calendar.CAL_SEQUENTIAL_MONTH_SELECTION | wx.calendar.CAL_SHOW_HOLIDAYS | wx.calendar.CAL_SHOW_SURROUNDING_WEEKS)
+        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxCheckBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
+
+        sizer_21 = wx.GridSizer(2, 3, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("one (unchecked)"))
+        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
+
         self.checkbox_2 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("two (checked)"))
+        self.checkbox_2.SetValue(1)
+        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
+
         self.checkbox_3 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("three"), style=wx.CHK_2STATE)
+        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
+
         self.checkbox_4 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("four (unchecked)"), style=wx.CHK_3STATE)
+        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
+        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
+
         self.checkbox_5 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("five (checked)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
+        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
+
         self.checkbox_6 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("six (undetermined)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
+        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
+
         self.notebook_1_wxCheckListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
+
+        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.check_list_box_1 = wx.CheckListBox(self.notebook_1_wxCheckListBox, wx.ID_ANY, choices=[_("one"), _("two"), _("three"), _("four")])
+        self.check_list_box_1.SetSelection(2)
+        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxChoice = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.choice_empty = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[])
+        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
+
         self.choice_filled = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")])
+        self.choice_filled.SetSelection(1)
+        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxComboBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
+
         self.combo_box_empty = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[], style=wx.CB_DROPDOWN)
+        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
+
         self.combo_box_filled = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[_("Item 1 (pre-selected)"), _("Item 2")], style=wx.CB_DROPDOWN)
+        self.combo_box_filled.SetSelection(0)
+        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxDatePickerCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
+
+        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.datepicker_ctrl_1 = wx.DatePickerCtrl(self.notebook_1_wxDatePickerCtrl, wx.ID_ANY, style=wx.DP_SHOWCENTURY)
+        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.notebook_1_wxGauge = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
+
+        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.gauge_1 = wx.Gauge(self.notebook_1_wxGauge, wx.ID_ANY, 20)
+        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxGrid = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
+
+        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.grid_1 = wx.grid.Grid(self.notebook_1_wxGrid, wx.ID_ANY, size=(1, 1))
+        self.grid_1.CreateGrid(10, 3)
+        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxHyperlinkCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
+
+        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.hyperlink_1 = wx.HyperlinkCtrl(self.notebook_1_wxHyperlinkCtrl, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"))
+        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
+
         self.notebook_1_wxListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
+
+        sizer_4 = wx.BoxSizer(wx.VERTICAL)
+
         self.list_box_empty = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[])
+        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
+
         self.list_box_filled = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")], style=wx.LB_MULTIPLE | wx.LB_SORT)
+        self.list_box_filled.SetSelection(1)
+        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxListCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.list_ctrl_1 = wx.ListCtrl(self.notebook_1_wxListCtrl, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_REPORT)
+        self.list_ctrl_1.InsertColumn(0, _("A"), format=wx.LIST_FORMAT_LEFT, width=-1)
+        self.list_ctrl_1.InsertColumn(1, _("B"), format=wx.LIST_FORMAT_LEFT, width=-1)
+        self.list_ctrl_1.InsertColumn(2, _("C"), format=wx.LIST_FORMAT_LEFT, width=-1)
+        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
+
+        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
+
         self.radio_box_empty1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty1"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
+        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled1"), choices=[_("choice 1"), _("choice 2 (pre-selected)"), _("choice 3")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.radio_box_filled1.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_empty2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty2"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled2"), choices=[_("choice 1"), _("choice 2 (pre-selected)")], majorDimension=0, style=wx.RA_SPECIFY_COLS)
+        self.radio_box_filled2.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
+
+        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
+
+        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
+        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
+
         self.radio_btn_1 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Alice"), style=wx.RB_GROUP)
+        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_2 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Bob"))
+        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_3 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Malroy"))
+        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSlider = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
+
+        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.slider_1 = wx.Slider(self.notebook_1_wxSlider, wx.ID_ANY, 5, 0, 10)
+        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSpinButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton"))
+
+        grid_sizer_5 = wx.GridSizer(0, 2, 0, 0)
+
+        label_9 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("vertical:"))
+        grid_sizer_5.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
         self.spin_button_vertical = wx.SpinButton(self.notebook_1_wxSpinButton, wx.ID_ANY )
+        grid_sizer_5.Add(self.spin_button_vertical, 0, 0, 0)
+
+        label_10 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("horizontal:\n(not supported on\nall platforms)"))
+        grid_sizer_5.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
         self.spin_button_horizontal = wx.SpinButton(self.notebook_1_wxSpinButton, wx.ID_ANY , style=wx.SP_HORIZONTAL)
+        grid_sizer_5.Add(self.spin_button_horizontal, 0, 0, 0)
+
         self.notebook_1_wxSpinCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.spin_ctrl_1 = wx.SpinCtrl(self.notebook_1_wxSpinCtrl, wx.ID_ANY, "4", min=0, max=100, style=wx.SP_ARROW_KEYS | wx.TE_RIGHT)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
+
+        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.spin_ctrl_1 = wx.SpinCtrl(self.notebook_1_wxSpinCtrl, wx.ID_ANY, "4", min=0, max=100)
+        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxSplitterWindow_horizontal = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
+
+        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_1 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_horizontal, wx.ID_ANY)
+        self.splitter_1.SetMinimumPaneSize(20)
+        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_1 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_top_pane = wx.StaticText(self.splitter_1_pane_1, wx.ID_ANY, _("top pane"))
+        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_2 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_buttom_pane = wx.StaticText(self.splitter_1_pane_2, wx.ID_ANY, _("bottom pane"))
+        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSplitterWindow_vertical = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
+
+        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_2 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_vertical, wx.ID_ANY)
+        self.splitter_2.SetMinimumPaneSize(20)
+        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_1 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_32 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_left_pane = wx.StaticText(self.splitter_2_pane_1, wx.ID_ANY, _("left pane"))
+        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_2 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_33 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_right_pane = wx.StaticText(self.splitter_2_pane_2, wx.ID_ANY, _("right pane"))
+        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticBitmap = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
+
+        sizer_11 = wx.GridSizer(3, 2, 0, 0)
+
+        label_6 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Empty Bitmap:\nempty:32,32"))
+        sizer_11.Add(label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
         self.bitmap_empty = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.EmptyBitmap(32, 32))
-        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_empty, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        label_7 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Bitmap File:"))
+        sizer_11.Add(label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
+        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_file, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        label_8 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Art Provider:\nart:wxART_PRINT,wxART_OTHER,32,32"))
+        sizer_11.Add(label_8, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
         self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
-        self.notebook_1_wxStaticLine = wx.Panel(self.notebook_1, wx.ID_ANY)
+        sizer_11.Add(self.bitmap_art, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.notebook_1_wxStaticLine = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
+
+        sizer_9 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
+
         self.static_line_2 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
+        sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_3 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
+        sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_4 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
+        sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_5 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
+        sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticText = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
+
+        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
+        grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
+        self.label_4.SetToolTipString(_("Background colour won't show, check documentation for more details"))
+        grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
+        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
+        self.label_5.SetToolTipString(_("Background colour won't show, check documentation for more details"))
+        grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_Spacer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
+
+        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
+
         self.label_3 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("Two labels with a"))
+        grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
+
+        grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
+
         self.label_2 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("spacer between"))
+        grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxTextCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
+
+        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.text_ctrl = wx.TextCtrl(self.notebook_1_wxTextCtrl, wx.ID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), style=wx.TE_CHARWRAP | wx.TE_MULTILINE | wx.TE_WORDWRAP)
+        sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxToggleButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
+
+        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_2 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 1"))
+        sizer_23.Add(self.button_2, 1, wx.ALL, 5)
+
         self.button_4 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 2"), style=wx.BU_BOTTOM | wx.BU_EXACTFIT)
+        sizer_23.Add(self.button_4, 1, wx.ALL, 5)
+
         self.notebook_1_wxTreeCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
+
+        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.tree_ctrl_1 = wx.TreeCtrl(self.notebook_1_wxTreeCtrl, wx.ID_ANY)
+        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
         self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
+        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
 
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
-        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
-        # end wxGlade
+        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
 
-    def __set_properties(self):
-        # begin wxGlade: All_Widgets_Frame.__set_properties
-        self.SetTitle(_("All Widgets"))
-        _icon = wx.NullIcon
-        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
-        self.SetIcon(_icon)
-        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
 
-        # statusbar fields
-        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
-        for i in range(len(All_Widgets_statusbar_fields)):
-            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
-        self.All_Widgets_toolbar.Realize()
-        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
-        self.bitmap_button_icon1.SetDefault()
-        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
-        self.bitmap_button_empty1.SetDefault()
-        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
-        self.bitmap_button_art.SetDefault()
-        self.checkbox_2.SetValue(1)
-        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
-        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
-        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
-        self.check_list_box_1.SetSelection(2)
-        self.choice_filled.SetSelection(1)
-        self.combo_box_filled.SetSelection(0)
-        self.grid_1.CreateGrid(10, 3)
-        self.list_box_filled.SetSelection(1)
-        self.list_ctrl_1.InsertColumn(0, _("A"), format=wx.LIST_FORMAT_LEFT, width=-1)
-        self.list_ctrl_1.InsertColumn(1, _("B"), format=wx.LIST_FORMAT_LEFT, width=-1)
-        self.list_ctrl_1.InsertColumn(2, _("C"), format=wx.LIST_FORMAT_LEFT, width=-1)
-        self.radio_box_filled1.SetSelection(1)
-        self.radio_box_filled2.SetSelection(1)
-        self.splitter_1.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
-        self.splitter_2.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
-        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetToolTipString(_("Background colour won't show, check documentation for more details"))
-        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
-        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
-        self.label_5.SetToolTipString(_("Background colour won't show, check documentation for more details"))
-        # end wxGlade
+        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
+
+        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
+
+        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
+
+        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
+
+        self.splitter_2_pane_2.SetSizer(sizer_33)
+
+        self.splitter_2_pane_1.SetSizer(sizer_32)
+
+        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
+
+        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
+
+        self.splitter_1_pane_2.SetSizer(sizer_31)
+
+        self.splitter_1_pane_1.SetSizer(sizer_30)
+
+        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
+
+        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
+
+        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
+
+        self.notebook_1_wxSpinButton.SetSizer(grid_sizer_5)
+
+        self.notebook_1_wxSlider.SetSizer(sizer_22)
+
+        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
+
+        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
+
+        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
+
+        self.notebook_1_wxListBox.SetSizer(sizer_4)
+
+        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
+
+        self.notebook_1_wxGrid.SetSizer(sizer_19)
+
+        self.notebook_1_wxGauge.SetSizer(sizer_15)
+
+        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
+
+        self.notebook_1_wxComboBox.SetSizer(sizer_6)
+
+        self.notebook_1_wxChoice.SetSizer(sizer_5)
+
+        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
+
+        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
+
+        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
+
+        self.notebook_1_wxButton.SetSizer(sizer_28)
 
-    def __do_layout(self):
-        # begin wxGlade: All_Widgets_Frame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
-        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
-        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_9 = wx.BoxSizer(wx.VERTICAL)
-        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_11 = wx.GridSizer(3, 2, 0, 0)
-        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_33 = wx.BoxSizer(wx.VERTICAL)
-        sizer_32 = wx.BoxSizer(wx.VERTICAL)
-        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_5 = wx.GridSizer(0, 2, 0, 0)
-        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
-        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
-        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.VERTICAL)
-        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.VERTICAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_21 = wx.GridSizer(2, 3, 0, 0)
-        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
-        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
         sizer_13.AddGrowableRow(0)
         sizer_13.AddGrowableRow(1)
         sizer_13.AddGrowableCol(0)
         sizer_13.AddGrowableCol(1)
-        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_wxButton.SetSizer(sizer_28)
-        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
-        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
-        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
-        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
-        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
-        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
-        self.notebook_1_wxChoice.SetSizer(sizer_5)
-        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
-        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
-        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
-        self.notebook_1_wxComboBox.SetSizer(sizer_6)
-        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER | wx.ALL, 5)
-        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
-        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
-        self.notebook_1_wxGauge.SetSizer(sizer_15)
-        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
-        self.notebook_1_wxGrid.SetSizer(sizer_19)
-        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
-        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
-        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListBox.SetSizer(sizer_4)
-        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
-        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
-        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
-        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
-        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSlider.SetSizer(sizer_22)
-        label_9 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("vertical:"))
-        grid_sizer_5.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
-        grid_sizer_5.Add(self.spin_button_vertical, 0, 0, 0)
-        label_10 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("horizontal:\n(not supported on\nall platforms)"))
-        grid_sizer_5.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
-        grid_sizer_5.Add(self.spin_button_horizontal, 0, 0, 0)
-        self.notebook_1_wxSpinButton.SetSizer(grid_sizer_5)
-        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
-        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_1.SetSizer(sizer_30)
-        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_2.SetSizer(sizer_31)
-        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
-        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
-        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_1.SetSizer(sizer_32)
-        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_2.SetSizer(sizer_33)
-        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
-        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
-        label_6 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Empty Bitmap:\nempty:32,32"))
-        sizer_11.Add(label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
-        sizer_11.Add(self.bitmap_empty, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        label_7 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Bitmap File:"))
-        sizer_11.Add(label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
-        sizer_11.Add(self.bitmap_file, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        label_8 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Art Provider:\nart:wxART_PRINT,wxART_OTHER,32,32"))
-        sizer_11.Add(label_8, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
-        sizer_11.Add(self.bitmap_art, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
-        sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
-        sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
-        grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
-        grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
-        sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
-        sizer_23.Add(self.button_2, 1, wx.ALL, 5)
-        sizer_23.Add(self.button_4, 1, wx.ALL, 5)
-        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
-        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
-        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
-        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
-        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
-        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
-        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
-        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
-        self.SetSize((800, 417))
+
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
+        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
         # end wxGlade
 
     def onSelectUnix(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
diff -Nru wxglade-0.9.6/examples/AllWidgets/AllWidgets_28.wxg wxglade-1.0.1/examples/AllWidgets/AllWidgets_28.wxg
--- wxglade-0.9.6/examples/AllWidgets/AllWidgets_28.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/AllWidgets/AllWidgets_28.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -174,7 +174,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon1" base="EditBitmapButton">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <default>1</default>
                                 </object>
                             </object>
@@ -831,7 +831,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticBitmap" name="bitmap_file" base="EditStaticBitmap">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <attribute>1</attribute>
                                 </object>
                             </object>
diff -Nru wxglade-0.9.6/examples/AllWidgets/AllWidgets_30_Classic.py wxglade-1.0.1/examples/AllWidgets/AllWidgets_30_Classic.py
--- wxglade-0.9.6/examples/AllWidgets/AllWidgets_30_Classic.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/AllWidgets/AllWidgets_30_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,16 +1,16 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
-# generated by wxGlade 0.8.0a13 on Tue Dec 19 20:32:25 2017
+# generated by wxGlade 1.0.0b2 on Sat Dec 12 18:00:46 2020
 #
 
 import wx
-import wx.calendar
-import wx.grid
-import wx.propgrid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.calendar
+import wx.grid
+import wx.propgrid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -22,7 +22,12 @@
         # begin wxGlade: All_Widgets_Frame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        
+        self.SetSize((800, 417))
+        self.SetTitle(_("All Widgets"))
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
+        self.SetIcon(_icon)
+
         # Menu Bar
         self.All_Widgets_menubar = wx.MenuBar()
         wxglade_tmp_menu = wx.Menu()
@@ -33,12 +38,12 @@
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&File"))
         wxglade_tmp_menu = wx.Menu()
         self.All_Widgets_menubar.mn_Unix = wxglade_tmp_menu.Append(wx.ID_ANY, _("Unix"), _("Use Unix line endings"), wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.onSelectUnix, id=self.All_Widgets_menubar.mn_Unix.GetId())
+        self.Bind(wx.EVT_MENU, self.onSelectUnix, self.All_Widgets_menubar.mn_Unix)
         self.All_Widgets_menubar.mn_Windows = wxglade_tmp_menu.Append(wx.ID_ANY, _("Windows"), _("Use Windows line endings"), wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.onSelectWindows, id=self.All_Widgets_menubar.mn_Windows.GetId())
+        self.Bind(wx.EVT_MENU, self.onSelectWindows, self.All_Widgets_menubar.mn_Windows)
         wxglade_tmp_menu.AppendSeparator()
         self.All_Widgets_menubar.mn_RemoveTabs = wxglade_tmp_menu.Append(wx.ID_ANY, _("Remove Tabs"), _("Remove all leading tabs"), wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.onRemoveTabs, id=self.All_Widgets_menubar.mn_RemoveTabs.GetId())
+        self.Bind(wx.EVT_MENU, self.onRemoveTabs, self.All_Widgets_menubar.mn_RemoveTabs)
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Edit"))
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.ID_HELP, _("Manual"), _("Show the application manual"))
@@ -48,364 +53,528 @@
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.All_Widgets_menubar)
         # Menu Bar end
+
         self.All_Widgets_statusbar = self.CreateStatusBar(1, wx.STB_ELLIPSIZE_MIDDLE | wx.STB_SHOW_TIPS | wx.STB_SIZEGRIP)
-        
+        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
+        for i in range(len(All_Widgets_statusbar_fields)):
+            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
+
         # Tool Bar
         self.All_Widgets_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.All_Widgets_toolbar)
         self.All_Widgets_toolbar.AddLabelTool(wx.ID_UP, _("UpDown"), wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, _("Up or Down"), _("Up or Down"))
         self.All_Widgets_toolbar.AddLabelTool(wx.ID_OPEN, _("Open"), wx.EmptyBitmap(32, 32), wx.NullBitmap, wx.ITEM_NORMAL, _("Open a new file"), _("Open a new file"))
+        self.SetToolBar(self.All_Widgets_toolbar)
+        self.All_Widgets_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxBitmapButton = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
+        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
+
+        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
+
+        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
+        self.bitmap_button_icon1.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_empty1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.EmptyBitmap(10, 10))
-        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
+        self.bitmap_button_empty1.SetDefault()
+        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_icon2.SetBitmapDisabled(wx.EmptyBitmap(32, 32))
+        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
+        self.bitmap_button_icon2.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_art = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
+        self.bitmap_button_art.SetDefault()
+        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
+
+        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_3 = wx.Button(self.notebook_1_wxButton, wx.ID_BOLD, "")
+        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_wxCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
+
+        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.calendar_ctrl_1 = wx.calendar.CalendarCtrl(self.notebook_1_wxCalendarCtrl, wx.ID_ANY, style=wx.calendar.CAL_MONDAY_FIRST | wx.calendar.CAL_SEQUENTIAL_MONTH_SELECTION | wx.calendar.CAL_SHOW_SURROUNDING_WEEKS | wx.calendar.CAL_SHOW_WEEK_NUMBERS)
+        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxGenericCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGenericCalendarCtrl, _("wxGenericCalendarCtrl"))
+
+        sizer_27 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.generic_calendar_ctrl_1 = wx.calendar.GenericCalendarCtrl(self.notebook_1_wxGenericCalendarCtrl, wx.ID_ANY, style=wx.calendar.CAL_MONDAY_FIRST | wx.calendar.CAL_SHOW_HOLIDAYS)
+        sizer_27.Add(self.generic_calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxCheckBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
+
+        sizer_21 = wx.GridSizer(2, 3, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("one (unchecked)"))
+        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
+
         self.checkbox_2 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("two (checked)"))
+        self.checkbox_2.SetValue(1)
+        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
+
         self.checkbox_3 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("three"), style=wx.CHK_2STATE)
+        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
+
         self.checkbox_4 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("four (unchecked)"), style=wx.CHK_3STATE)
+        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
+        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
+
         self.checkbox_5 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("five (checked)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
+        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
+
         self.checkbox_6 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("six (undetermined)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
+        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
+
         self.notebook_1_wxCheckListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
+
+        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.check_list_box_1 = wx.CheckListBox(self.notebook_1_wxCheckListBox, wx.ID_ANY, choices=[_("one"), _("two"), _("three"), _("four")])
+        self.check_list_box_1.SetSelection(2)
+        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxChoice = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.choice_empty = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[])
+        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
+
         self.choice_filled = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")])
+        self.choice_filled.SetSelection(1)
+        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxComboBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
+
         self.combo_box_empty = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[], style=0)
+        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
+
         self.combo_box_filled = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[_("Item 1 (pre-selected)"), _("Item 2")], style=wx.CB_DROPDOWN)
+        self.combo_box_filled.SetSelection(0)
+        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxDatePickerCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
+
+        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.datepicker_ctrl_1 = wx.DatePickerCtrl(self.notebook_1_wxDatePickerCtrl, wx.ID_ANY, style=wx.DP_SHOWCENTURY)
+        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.notebook_1_wxGauge = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
+
+        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.gauge_1 = wx.Gauge(self.notebook_1_wxGauge, wx.ID_ANY, 20)
+        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxGrid = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
+
+        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.grid_1 = wx.grid.Grid(self.notebook_1_wxGrid, wx.ID_ANY, size=(1, 1))
+        self.grid_1.CreateGrid(10, 3)
+        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxHyperlinkCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
+
+        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.hyperlink_1 = wx.HyperlinkCtrl(self.notebook_1_wxHyperlinkCtrl, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"))
+        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
+
         self.notebook_1_wxListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
+
+        sizer_4 = wx.BoxSizer(wx.VERTICAL)
+
         self.list_box_empty = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[])
+        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
+
         self.list_box_filled = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")], style=wx.LB_MULTIPLE | wx.LB_SORT)
+        self.list_box_filled.SetSelection(1)
+        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxListCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.list_ctrl_1 = wx.ListCtrl(self.notebook_1_wxListCtrl, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_REPORT)
+        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxPropertyGridManager = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxPropertyGridManager, _("wxPropertyGridManager"))
+
+        sizer_34 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.property_grid_2 = wx.propgrid.PropertyGridManager(self.notebook_1_wxPropertyGridManager, wx.ID_ANY, style=wx.propgrid.PG_ALPHABETIC_MODE)
+        sizer_34.Add(self.property_grid_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
+
+        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
+
         self.radio_box_empty1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty1"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
+        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled1"), choices=[_("choice 1"), _("choice 2 (pre-selected)"), _("choice 3")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.radio_box_filled1.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_empty2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty2"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled2"), choices=[_("choice 1"), _("choice 2 (pre-selected)")], majorDimension=0, style=wx.RA_SPECIFY_COLS)
+        self.radio_box_filled2.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
+
+        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
+
+        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
+        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
+
         self.radio_btn_1 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Alice"), style=wx.RB_GROUP)
+        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_2 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Bob"))
+        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_3 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Malroy"))
+        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSlider = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
+
+        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.slider_1 = wx.Slider(self.notebook_1_wxSlider, wx.ID_ANY, 5, 0, 10)
+        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSpinButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton"))
+
+        sizer_16 = wx.GridSizer(2, 2, 0, 0)
+
+        label_9 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("vertical:"))
+        sizer_16.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
         self.spin_button_vertical = wx.SpinButton(self.notebook_1_wxSpinButton, wx.ID_ANY )
+        sizer_16.Add(self.spin_button_vertical, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        label_10 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("horizontal:\n(not supported on\nall platforms)"))
+        sizer_16.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
         self.spin_button_horizontal = wx.SpinButton(self.notebook_1_wxSpinButton, wx.ID_ANY , style=wx.SP_HORIZONTAL)
+        sizer_16.Add(self.spin_button_horizontal, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.notebook_1_wxSpinCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.spin_ctrl_1 = wx.SpinCtrl(self.notebook_1_wxSpinCtrl, wx.ID_ANY, "4", min=0, max=100, style=wx.SP_ARROW_KEYS | wx.TE_RIGHT)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
+
+        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.spin_ctrl_1 = wx.SpinCtrl(self.notebook_1_wxSpinCtrl, wx.ID_ANY, "4", min=0, max=100, style=wx.ALIGN_RIGHT | wx.SP_ARROW_KEYS)
+        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxSplitterWindow_horizontal = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
+
+        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_1 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_horizontal, wx.ID_ANY)
+        self.splitter_1.SetMinimumPaneSize(20)
+        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_1 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_top_pane = wx.StaticText(self.splitter_1_pane_1, wx.ID_ANY, _("top pane"))
+        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_2 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_buttom_pane = wx.StaticText(self.splitter_1_pane_2, wx.ID_ANY, _("bottom pane"))
+        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSplitterWindow_vertical = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
+
+        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_2 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_vertical, wx.ID_ANY)
+        self.splitter_2.SetMinimumPaneSize(20)
+        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_1 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_32 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_left_pane = wx.StaticText(self.splitter_2_pane_1, wx.ID_ANY, _("left pane"))
+        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_2 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_33 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_right_pane = wx.StaticText(self.splitter_2_pane_2, wx.ID_ANY, _("right pane"))
+        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticBitmap = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.bitmap_empty = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.EmptyBitmap(32, 32))
-        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
-        self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
-        self.notebook_1_wxStaticLine = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.static_line_2 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
-        self.static_line_3 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
-        self.static_line_4 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
-        self.static_line_5 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
-        self.notebook_1_wxStaticText = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER)
-        self.notebook_1_Spacer = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.label_3 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("Two labels with a"))
-        self.label_2 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("spacer between"))
-        self.notebook_1_wxTextCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.text_ctrl = wx.TextCtrl(self.notebook_1_wxTextCtrl, wx.ID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), style=wx.TE_CHARWRAP | wx.TE_MULTILINE | wx.TE_WORDWRAP)
-        self.notebook_1_wxToggleButton = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.button_2 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 1"))
-        self.button_4 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 2"), style=wx.BU_BOTTOM | wx.BU_EXACTFIT)
-        self.notebook_1_wxTreeCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.tree_ctrl_1 = wx.TreeCtrl(self.notebook_1_wxTreeCtrl, wx.ID_ANY)
-        self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
-        self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
-        self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_NAVIGATION_KEY, self.OnBitmapButtonPanelNavigationKey)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
-        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: All_Widgets_Frame.__set_properties
-        self.SetTitle(_("All Widgets"))
-        _icon = wx.NullIcon
-        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
-        self.SetIcon(_icon)
-        self.All_Widgets_statusbar.SetStatusWidths([-1])
-
-        # statusbar fields
-        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
-        for i in range(len(All_Widgets_statusbar_fields)):
-            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
-        self.All_Widgets_toolbar.Realize()
-        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
-        self.bitmap_button_icon1.SetDefault()
-        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
-        self.bitmap_button_empty1.SetDefault()
-        self.bitmap_button_icon2.SetBitmapDisabled(wx.EmptyBitmap(32, 32))
-        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
-        self.bitmap_button_icon2.SetDefault()
-        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
-        self.bitmap_button_art.SetDefault()
-        self.checkbox_2.SetValue(1)
-        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
-        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
-        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
-        self.check_list_box_1.SetSelection(2)
-        self.choice_filled.SetSelection(1)
-        self.combo_box_filled.SetSelection(0)
-        self.grid_1.CreateGrid(10, 3)
-        self.list_box_filled.SetSelection(1)
-        self.radio_box_filled1.SetSelection(1)
-        self.radio_box_filled2.SetSelection(1)
-        self.splitter_1.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
-        self.splitter_2.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
-        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetToolTip(wx.ToolTip(_("Background colour won't show, check documentation for more details")))
-        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
-        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
-        self.label_5.SetToolTip(wx.ToolTip(_("Background colour won't show, check documentation for more details")))
-        # end wxGlade
+        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
 
-    def __do_layout(self):
-        # begin wxGlade: All_Widgets_Frame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
-        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
-        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_9 = wx.BoxSizer(wx.VERTICAL)
-        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_11 = wx.GridSizer(3, 2, 0, 0)
-        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_33 = wx.BoxSizer(wx.VERTICAL)
-        sizer_32 = wx.BoxSizer(wx.VERTICAL)
-        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_16 = wx.GridSizer(2, 2, 0, 0)
-        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
-        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
-        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
-        sizer_34 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.VERTICAL)
-        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.VERTICAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_21 = wx.GridSizer(2, 3, 0, 0)
-        sizer_27 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
-        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
-        sizer_13.AddGrowableRow(0)
-        sizer_13.AddGrowableRow(1)
-        sizer_13.AddGrowableCol(0)
-        sizer_13.AddGrowableCol(1)
-        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_wxButton.SetSizer(sizer_28)
-        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
-        sizer_27.Add(self.generic_calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxGenericCalendarCtrl.SetSizer(sizer_27)
-        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
-        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
-        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
-        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
-        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
-        self.notebook_1_wxChoice.SetSizer(sizer_5)
-        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
-        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
-        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
-        self.notebook_1_wxComboBox.SetSizer(sizer_6)
-        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER | wx.ALL, 5)
-        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
-        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
-        self.notebook_1_wxGauge.SetSizer(sizer_15)
-        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
-        self.notebook_1_wxGrid.SetSizer(sizer_19)
-        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
-        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
-        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListBox.SetSizer(sizer_4)
-        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
-        sizer_34.Add(self.property_grid_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxPropertyGridManager.SetSizer(sizer_34)
-        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
-        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
-        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
-        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSlider.SetSizer(sizer_22)
-        label_9 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("vertical:"))
-        sizer_16.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
-        sizer_16.Add(self.spin_button_vertical, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        label_10 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("horizontal:\n(not supported on\nall platforms)"))
-        sizer_16.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
-        sizer_16.Add(self.spin_button_horizontal, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
-        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
-        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_1.SetSizer(sizer_30)
-        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_2.SetSizer(sizer_31)
-        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
-        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
-        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_1.SetSizer(sizer_32)
-        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_2.SetSizer(sizer_33)
-        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
-        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
+
         label_6 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Empty Bitmap:\nempty:32,32"))
         sizer_11.Add(label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
+        self.bitmap_empty = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.EmptyBitmap(32, 32))
         sizer_11.Add(self.bitmap_empty, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         label_7 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Bitmap File:"))
         sizer_11.Add(label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
+        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
         sizer_11.Add(self.bitmap_file, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         label_8 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Art Provider:\nart:wxART_PRINT,wxART_OTHER,32,32"))
         sizer_11.Add(label_8, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
+        self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
         sizer_11.Add(self.bitmap_art, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
+
+        self.notebook_1_wxStaticLine = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
+
+        sizer_9 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
+
+        self.static_line_2 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
         sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.static_line_3 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
         sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
+
+        self.static_line_4 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
         sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.static_line_5 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
         sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
+
+        self.notebook_1_wxStaticText = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
+
+        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
         grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
+        self.label_4.SetToolTip(wx.ToolTip(_("Background colour won't show, check documentation for more details")))
         grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
+        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
+        self.label_5.SetToolTip(wx.ToolTip(_("Background colour won't show, check documentation for more details")))
         grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
+
+        self.notebook_1_Spacer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
+
+        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        self.label_3 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("Two labels with a"))
         grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
+
         grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_2 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("spacer between"))
         grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
+
+        self.notebook_1_wxTextCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
+
+        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.text_ctrl = wx.TextCtrl(self.notebook_1_wxTextCtrl, wx.ID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), style=wx.TE_CHARWRAP | wx.TE_MULTILINE | wx.TE_WORDWRAP)
         sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
+
+        self.notebook_1_wxToggleButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
+
+        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.button_2 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 1"))
         sizer_23.Add(self.button_2, 1, wx.ALL, 5)
+
+        self.button_4 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 2"), style=wx.BU_BOTTOM | wx.BU_EXACTFIT)
         sizer_23.Add(self.button_4, 1, wx.ALL, 5)
-        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
-        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
-        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGenericCalendarCtrl, _("wxGenericCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
-        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
-        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
-        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxPropertyGridManager, _("wxPropertyGridManager"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
-        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
-        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
+
+        self.notebook_1_wxTreeCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
         self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.tree_ctrl_1 = wx.TreeCtrl(self.notebook_1_wxTreeCtrl, wx.ID_ANY)
+        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
         sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
+        self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
         sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
+        self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
         sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+
+        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
+
+        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
+
+        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
+
+        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
+
+        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
+
+        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
+
+        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
+
+        self.splitter_2_pane_2.SetSizer(sizer_33)
+
+        self.splitter_2_pane_1.SetSizer(sizer_32)
+
+        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
+
+        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
+
+        self.splitter_1_pane_2.SetSizer(sizer_31)
+
+        self.splitter_1_pane_1.SetSizer(sizer_30)
+
+        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
+
+        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
+
+        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
+
+        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
+
+        self.notebook_1_wxSlider.SetSizer(sizer_22)
+
+        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
+
+        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
+
+        self.notebook_1_wxPropertyGridManager.SetSizer(sizer_34)
+
+        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
+
+        self.notebook_1_wxListBox.SetSizer(sizer_4)
+
+        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
+
+        self.notebook_1_wxGrid.SetSizer(sizer_19)
+
+        self.notebook_1_wxGauge.SetSizer(sizer_15)
+
+        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
+
+        self.notebook_1_wxComboBox.SetSizer(sizer_6)
+
+        self.notebook_1_wxChoice.SetSizer(sizer_5)
+
+        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
+
+        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
+
+        self.notebook_1_wxGenericCalendarCtrl.SetSizer(sizer_27)
+
+        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
+
+        self.notebook_1_wxButton.SetSizer(sizer_28)
+
+        sizer_13.AddGrowableRow(0)
+        sizer_13.AddGrowableRow(1)
+        sizer_13.AddGrowableCol(0)
+        sizer_13.AddGrowableCol(1)
+        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
-        self.SetSize((800, 417))
+
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
+        self.Bind(wx.EVT_NAVIGATION_KEY, self.OnBitmapButtonPanelNavigationKey)
+        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
         # end wxGlade
 
     def onSelectUnix(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
@@ -424,10 +593,6 @@
         print("Event handler 'onShowManual' not implemented!")
         event.Skip()
 
-    def OnBitmapButtonPanelNavigationKey(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
-        print("Event handler 'OnBitmapButtonPanelNavigationKey' not implemented!")
-        event.Skip()
-
     def OnNotebookPageChanged(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
         print("Event handler 'OnNotebookPageChanged' not implemented!")
         event.Skip()
@@ -436,6 +601,10 @@
         print("Event handler 'OnNotebookPageChanging' not implemented!")
         event.Skip()
 
+    def OnBitmapButtonPanelNavigationKey(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
+        print("Event handler 'OnBitmapButtonPanelNavigationKey' not implemented!")
+        event.Skip()
+
     def onStartConverting(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
         print("Event handler 'onStartConverting' not implemented!")
         event.Skip()
diff -Nru wxglade-0.9.6/examples/AllWidgets/AllWidgets_30_Phoenix.py wxglade-1.0.1/examples/AllWidgets/AllWidgets_30_Phoenix.py
--- wxglade-0.9.6/examples/AllWidgets/AllWidgets_30_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/AllWidgets/AllWidgets_30_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,16 +1,16 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 #
-# generated by wxGlade 0.8.0a13 on Tue Dec 19 20:25:22 2017
+# generated by wxGlade 1.0.0b2 on Sat Dec 12 17:59:47 2020
 #
 
 import wx
-import wx.adv
-import wx.grid
-import wx.propgrid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.adv
+import wx.grid
+import wx.propgrid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -22,7 +22,12 @@
         # begin wxGlade: All_Widgets_Frame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        
+        self.SetSize((800, 417))
+        self.SetTitle(_("All Widgets"))
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
+        self.SetIcon(_icon)
+
         # Menu Bar
         self.All_Widgets_menubar = wx.MenuBar()
         wxglade_tmp_menu = wx.Menu()
@@ -33,12 +38,12 @@
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&File"))
         wxglade_tmp_menu = wx.Menu()
         self.All_Widgets_menubar.mn_Unix = wxglade_tmp_menu.Append(wx.ID_ANY, _("Unix"), _("Use Unix line endings"), wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.onSelectUnix, id=self.All_Widgets_menubar.mn_Unix.GetId())
+        self.Bind(wx.EVT_MENU, self.onSelectUnix, self.All_Widgets_menubar.mn_Unix)
         self.All_Widgets_menubar.mn_Windows = wxglade_tmp_menu.Append(wx.ID_ANY, _("Windows"), _("Use Windows line endings"), wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.onSelectWindows, id=self.All_Widgets_menubar.mn_Windows.GetId())
+        self.Bind(wx.EVT_MENU, self.onSelectWindows, self.All_Widgets_menubar.mn_Windows)
         wxglade_tmp_menu.AppendSeparator()
         self.All_Widgets_menubar.mn_RemoveTabs = wxglade_tmp_menu.Append(wx.ID_ANY, _("Remove Tabs"), _("Remove all leading tabs"), wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.onRemoveTabs, id=self.All_Widgets_menubar.mn_RemoveTabs.GetId())
+        self.Bind(wx.EVT_MENU, self.onRemoveTabs, self.All_Widgets_menubar.mn_RemoveTabs)
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Edit"))
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.ID_HELP, _("Manual"), _("Show the application manual"))
@@ -48,364 +53,528 @@
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.All_Widgets_menubar)
         # Menu Bar end
+
         self.All_Widgets_statusbar = self.CreateStatusBar(1, wx.STB_ELLIPSIZE_MIDDLE | wx.STB_SHOW_TIPS | wx.STB_SIZEGRIP)
-        
+        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
+        for i in range(len(All_Widgets_statusbar_fields)):
+            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
+
         # Tool Bar
         self.All_Widgets_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.All_Widgets_toolbar)
         self.All_Widgets_toolbar.AddTool(wx.ID_UP, _("UpDown"), wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, _("Up or Down"), _("Up or Down"))
         self.All_Widgets_toolbar.AddTool(wx.ID_OPEN, _("Open"), wx.Bitmap(32, 32), wx.NullBitmap, wx.ITEM_NORMAL, _("Open a new file"), _("Open a new file"))
+        self.SetToolBar(self.All_Widgets_toolbar)
+        self.All_Widgets_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxBitmapButton = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
+        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
+
+        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
+
+        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
+        self.bitmap_button_icon1.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_empty1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap(10, 10))
-        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
+        self.bitmap_button_empty1.SetDefault()
+        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_icon2.SetBitmapDisabled(wx.Bitmap(32, 32))
+        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
+        self.bitmap_button_icon2.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_art = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
+        self.bitmap_button_art.SetDefault()
+        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
+
+        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_3 = wx.Button(self.notebook_1_wxButton, wx.ID_BOLD, "")
+        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_wxCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
+
+        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.calendar_ctrl_1 = wx.adv.CalendarCtrl(self.notebook_1_wxCalendarCtrl, wx.ID_ANY, style=wx.adv.CAL_MONDAY_FIRST | wx.adv.CAL_SEQUENTIAL_MONTH_SELECTION | wx.adv.CAL_SHOW_SURROUNDING_WEEKS | wx.adv.CAL_SHOW_WEEK_NUMBERS)
+        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxGenericCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGenericCalendarCtrl, _("wxGenericCalendarCtrl"))
+
+        sizer_27 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.generic_calendar_ctrl_1 = wx.adv.GenericCalendarCtrl(self.notebook_1_wxGenericCalendarCtrl, wx.ID_ANY, style=wx.adv.CAL_MONDAY_FIRST | wx.adv.CAL_SHOW_HOLIDAYS)
+        sizer_27.Add(self.generic_calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxCheckBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
+
+        sizer_21 = wx.GridSizer(2, 3, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("one (unchecked)"))
+        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
+
         self.checkbox_2 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("two (checked)"))
+        self.checkbox_2.SetValue(1)
+        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
+
         self.checkbox_3 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("three"), style=wx.CHK_2STATE)
+        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
+
         self.checkbox_4 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("four (unchecked)"), style=wx.CHK_3STATE)
+        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
+        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
+
         self.checkbox_5 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("five (checked)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
+        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
+
         self.checkbox_6 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("six (undetermined)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
+        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
+
         self.notebook_1_wxCheckListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
+
+        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.check_list_box_1 = wx.CheckListBox(self.notebook_1_wxCheckListBox, wx.ID_ANY, choices=[_("one"), _("two"), _("three"), _("four")])
+        self.check_list_box_1.SetSelection(2)
+        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxChoice = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.choice_empty = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[])
+        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
+
         self.choice_filled = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")])
+        self.choice_filled.SetSelection(1)
+        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxComboBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
+
         self.combo_box_empty = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[], style=0)
+        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
+
         self.combo_box_filled = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[_("Item 1 (pre-selected)"), _("Item 2")], style=wx.CB_DROPDOWN)
+        self.combo_box_filled.SetSelection(0)
+        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxDatePickerCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
+
+        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.datepicker_ctrl_1 = wx.adv.DatePickerCtrl(self.notebook_1_wxDatePickerCtrl, wx.ID_ANY, style=wx.adv.DP_SHOWCENTURY)
+        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.notebook_1_wxGauge = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
+
+        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.gauge_1 = wx.Gauge(self.notebook_1_wxGauge, wx.ID_ANY, 20)
+        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxGrid = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
+
+        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.grid_1 = wx.grid.Grid(self.notebook_1_wxGrid, wx.ID_ANY, size=(1, 1))
+        self.grid_1.CreateGrid(10, 3)
+        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxHyperlinkCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
+
+        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.hyperlink_1 = wx.adv.HyperlinkCtrl(self.notebook_1_wxHyperlinkCtrl, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"))
+        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
+
         self.notebook_1_wxListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
+
+        sizer_4 = wx.BoxSizer(wx.VERTICAL)
+
         self.list_box_empty = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[])
+        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
+
         self.list_box_filled = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")], style=wx.LB_MULTIPLE | wx.LB_SORT)
+        self.list_box_filled.SetSelection(1)
+        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxListCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.list_ctrl_1 = wx.ListCtrl(self.notebook_1_wxListCtrl, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_REPORT)
+        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxPropertyGridManager = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxPropertyGridManager, _("wxPropertyGridManager"))
+
+        sizer_34 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.property_grid_2 = wx.propgrid.PropertyGridManager(self.notebook_1_wxPropertyGridManager, wx.ID_ANY, style=wx.propgrid.PG_ALPHABETIC_MODE)
+        sizer_34.Add(self.property_grid_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
+
+        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
+
         self.radio_box_empty1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty1"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
+        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled1"), choices=[_("choice 1"), _("choice 2 (pre-selected)"), _("choice 3")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.radio_box_filled1.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_empty2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty2"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled2"), choices=[_("choice 1"), _("choice 2 (pre-selected)")], majorDimension=0, style=wx.RA_SPECIFY_COLS)
+        self.radio_box_filled2.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
+
+        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
+
+        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
+        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
+
         self.radio_btn_1 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Alice"), style=wx.RB_GROUP)
+        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_2 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Bob"))
+        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_3 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Malroy"))
+        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSlider = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
+
+        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.slider_1 = wx.Slider(self.notebook_1_wxSlider, wx.ID_ANY, 5, 0, 10)
+        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSpinButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton"))
+
+        sizer_16 = wx.GridSizer(2, 2, 0, 0)
+
+        label_9 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("vertical:"))
+        sizer_16.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
         self.spin_button_vertical = wx.SpinButton(self.notebook_1_wxSpinButton, wx.ID_ANY )
+        sizer_16.Add(self.spin_button_vertical, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        label_10 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("horizontal:\n(not supported on\nall platforms)"))
+        sizer_16.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
         self.spin_button_horizontal = wx.SpinButton(self.notebook_1_wxSpinButton, wx.ID_ANY , style=wx.SP_HORIZONTAL)
+        sizer_16.Add(self.spin_button_horizontal, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.notebook_1_wxSpinCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.spin_ctrl_1 = wx.SpinCtrl(self.notebook_1_wxSpinCtrl, wx.ID_ANY, "4", min=0, max=100, style=wx.SP_ARROW_KEYS | wx.TE_RIGHT)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
+
+        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.spin_ctrl_1 = wx.SpinCtrl(self.notebook_1_wxSpinCtrl, wx.ID_ANY, "4", min=0, max=100, style=wx.ALIGN_RIGHT | wx.SP_ARROW_KEYS)
+        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxSplitterWindow_horizontal = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
+
+        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_1 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_horizontal, wx.ID_ANY)
+        self.splitter_1.SetMinimumPaneSize(20)
+        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_1 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_top_pane = wx.StaticText(self.splitter_1_pane_1, wx.ID_ANY, _("top pane"))
+        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_2 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_buttom_pane = wx.StaticText(self.splitter_1_pane_2, wx.ID_ANY, _("bottom pane"))
+        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSplitterWindow_vertical = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
+
+        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_2 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_vertical, wx.ID_ANY)
+        self.splitter_2.SetMinimumPaneSize(20)
+        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_1 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_32 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_left_pane = wx.StaticText(self.splitter_2_pane_1, wx.ID_ANY, _("left pane"))
+        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_2 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_33 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_right_pane = wx.StaticText(self.splitter_2_pane_2, wx.ID_ANY, _("right pane"))
+        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticBitmap = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.bitmap_empty = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap(32, 32))
-        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
-        self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
-        self.notebook_1_wxStaticLine = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.static_line_2 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
-        self.static_line_3 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
-        self.static_line_4 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
-        self.static_line_5 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
-        self.notebook_1_wxStaticText = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER)
-        self.notebook_1_Spacer = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.label_3 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("Two labels with a"))
-        self.label_2 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("spacer between"))
-        self.notebook_1_wxTextCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.text_ctrl = wx.TextCtrl(self.notebook_1_wxTextCtrl, wx.ID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), style=wx.TE_CHARWRAP | wx.TE_MULTILINE | wx.TE_WORDWRAP)
-        self.notebook_1_wxToggleButton = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.button_2 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 1"))
-        self.button_4 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 2"), style=wx.BU_BOTTOM | wx.BU_EXACTFIT)
-        self.notebook_1_wxTreeCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.tree_ctrl_1 = wx.TreeCtrl(self.notebook_1_wxTreeCtrl, wx.ID_ANY)
-        self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
-        self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
-        self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_NAVIGATION_KEY, self.OnBitmapButtonPanelNavigationKey)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
-        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: All_Widgets_Frame.__set_properties
-        self.SetTitle(_("All Widgets"))
-        _icon = wx.NullIcon
-        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
-        self.SetIcon(_icon)
-        self.All_Widgets_statusbar.SetStatusWidths([-1])
-
-        # statusbar fields
-        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
-        for i in range(len(All_Widgets_statusbar_fields)):
-            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
-        self.All_Widgets_toolbar.Realize()
-        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
-        self.bitmap_button_icon1.SetDefault()
-        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
-        self.bitmap_button_empty1.SetDefault()
-        self.bitmap_button_icon2.SetBitmapDisabled(wx.Bitmap(32, 32))
-        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
-        self.bitmap_button_icon2.SetDefault()
-        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
-        self.bitmap_button_art.SetDefault()
-        self.checkbox_2.SetValue(1)
-        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
-        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
-        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
-        self.check_list_box_1.SetSelection(2)
-        self.choice_filled.SetSelection(1)
-        self.combo_box_filled.SetSelection(0)
-        self.grid_1.CreateGrid(10, 3)
-        self.list_box_filled.SetSelection(1)
-        self.radio_box_filled1.SetSelection(1)
-        self.radio_box_filled2.SetSelection(1)
-        self.splitter_1.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
-        self.splitter_2.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
-        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetToolTip(_("Background colour won't show, check documentation for more details"))
-        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
-        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
-        self.label_5.SetToolTip(_("Background colour won't show, check documentation for more details"))
-        # end wxGlade
+        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
 
-    def __do_layout(self):
-        # begin wxGlade: All_Widgets_Frame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
-        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
-        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_9 = wx.BoxSizer(wx.VERTICAL)
-        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_11 = wx.GridSizer(3, 2, 0, 0)
-        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_33 = wx.BoxSizer(wx.VERTICAL)
-        sizer_32 = wx.BoxSizer(wx.VERTICAL)
-        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_16 = wx.GridSizer(2, 2, 0, 0)
-        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
-        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
-        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
-        sizer_34 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.VERTICAL)
-        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.VERTICAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_21 = wx.GridSizer(2, 3, 0, 0)
-        sizer_27 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
-        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
-        sizer_13.AddGrowableRow(0)
-        sizer_13.AddGrowableRow(1)
-        sizer_13.AddGrowableCol(0)
-        sizer_13.AddGrowableCol(1)
-        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_wxButton.SetSizer(sizer_28)
-        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
-        sizer_27.Add(self.generic_calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxGenericCalendarCtrl.SetSizer(sizer_27)
-        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
-        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
-        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
-        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
-        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
-        self.notebook_1_wxChoice.SetSizer(sizer_5)
-        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
-        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
-        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
-        self.notebook_1_wxComboBox.SetSizer(sizer_6)
-        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER | wx.ALL, 5)
-        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
-        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
-        self.notebook_1_wxGauge.SetSizer(sizer_15)
-        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
-        self.notebook_1_wxGrid.SetSizer(sizer_19)
-        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
-        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
-        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListBox.SetSizer(sizer_4)
-        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
-        sizer_34.Add(self.property_grid_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxPropertyGridManager.SetSizer(sizer_34)
-        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
-        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
-        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
-        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSlider.SetSizer(sizer_22)
-        label_9 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("vertical:"))
-        sizer_16.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
-        sizer_16.Add(self.spin_button_vertical, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        label_10 = wx.StaticText(self.notebook_1_wxSpinButton, wx.ID_ANY, _("horizontal:\n(not supported on\nall platforms)"))
-        sizer_16.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
-        sizer_16.Add(self.spin_button_horizontal, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
-        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
-        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_1.SetSizer(sizer_30)
-        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_2.SetSizer(sizer_31)
-        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
-        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
-        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_1.SetSizer(sizer_32)
-        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_2.SetSizer(sizer_33)
-        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
-        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
+
         label_6 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Empty Bitmap:\nempty:32,32"))
         sizer_11.Add(label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
+        self.bitmap_empty = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap(32, 32))
         sizer_11.Add(self.bitmap_empty, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         label_7 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Bitmap File:"))
         sizer_11.Add(label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
+        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
         sizer_11.Add(self.bitmap_file, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         label_8 = wx.StaticText(self.notebook_1_wxStaticBitmap, wx.ID_ANY, _("Art Provider:\nart:wxART_PRINT,wxART_OTHER,32,32"))
         sizer_11.Add(label_8, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 0)
+
+        self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
         sizer_11.Add(self.bitmap_art, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
+
+        self.notebook_1_wxStaticLine = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
+
+        sizer_9 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
+
+        self.static_line_2 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
         sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.static_line_3 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
         sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
+
+        self.static_line_4 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
         sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.static_line_5 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
         sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
+
+        self.notebook_1_wxStaticText = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
+
+        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
         grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
+        self.label_4.SetToolTip(_("Background colour won't show, check documentation for more details"))
         grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
+        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
+        self.label_5.SetToolTip(_("Background colour won't show, check documentation for more details"))
         grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
+
+        self.notebook_1_Spacer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
+
+        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        self.label_3 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("Two labels with a"))
         grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
+
         grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_2 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("spacer between"))
         grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
+
+        self.notebook_1_wxTextCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
+
+        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.text_ctrl = wx.TextCtrl(self.notebook_1_wxTextCtrl, wx.ID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), style=wx.TE_CHARWRAP | wx.TE_MULTILINE | wx.TE_WORDWRAP)
         sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
+
+        self.notebook_1_wxToggleButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
+
+        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.button_2 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 1"))
         sizer_23.Add(self.button_2, 1, wx.ALL, 5)
+
+        self.button_4 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 2"), style=wx.BU_BOTTOM | wx.BU_EXACTFIT)
         sizer_23.Add(self.button_4, 1, wx.ALL, 5)
-        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
-        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
-        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGenericCalendarCtrl, _("wxGenericCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
-        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
-        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
-        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxPropertyGridManager, _("wxPropertyGridManager"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
-        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
-        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
+
+        self.notebook_1_wxTreeCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
         self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.tree_ctrl_1 = wx.TreeCtrl(self.notebook_1_wxTreeCtrl, wx.ID_ANY)
+        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
         sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
+        self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
         sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
+        self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
         sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+
+        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
+
+        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
+
+        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
+
+        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
+
+        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
+
+        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
+
+        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
+
+        self.splitter_2_pane_2.SetSizer(sizer_33)
+
+        self.splitter_2_pane_1.SetSizer(sizer_32)
+
+        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
+
+        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
+
+        self.splitter_1_pane_2.SetSizer(sizer_31)
+
+        self.splitter_1_pane_1.SetSizer(sizer_30)
+
+        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
+
+        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
+
+        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
+
+        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
+
+        self.notebook_1_wxSlider.SetSizer(sizer_22)
+
+        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
+
+        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
+
+        self.notebook_1_wxPropertyGridManager.SetSizer(sizer_34)
+
+        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
+
+        self.notebook_1_wxListBox.SetSizer(sizer_4)
+
+        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
+
+        self.notebook_1_wxGrid.SetSizer(sizer_19)
+
+        self.notebook_1_wxGauge.SetSizer(sizer_15)
+
+        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
+
+        self.notebook_1_wxComboBox.SetSizer(sizer_6)
+
+        self.notebook_1_wxChoice.SetSizer(sizer_5)
+
+        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
+
+        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
+
+        self.notebook_1_wxGenericCalendarCtrl.SetSizer(sizer_27)
+
+        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
+
+        self.notebook_1_wxButton.SetSizer(sizer_28)
+
+        sizer_13.AddGrowableRow(0)
+        sizer_13.AddGrowableRow(1)
+        sizer_13.AddGrowableCol(0)
+        sizer_13.AddGrowableCol(1)
+        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
-        self.SetSize((800, 417))
+
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
+        self.Bind(wx.EVT_NAVIGATION_KEY, self.OnBitmapButtonPanelNavigationKey)
+        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
         # end wxGlade
 
     def onSelectUnix(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
@@ -424,10 +593,6 @@
         print("Event handler 'onShowManual' not implemented!")
         event.Skip()
 
-    def OnBitmapButtonPanelNavigationKey(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
-        print("Event handler 'OnBitmapButtonPanelNavigationKey' not implemented!")
-        event.Skip()
-
     def OnNotebookPageChanged(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
         print("Event handler 'OnNotebookPageChanged' not implemented!")
         event.Skip()
@@ -436,6 +601,10 @@
         print("Event handler 'OnNotebookPageChanging' not implemented!")
         event.Skip()
 
+    def OnBitmapButtonPanelNavigationKey(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
+        print("Event handler 'OnBitmapButtonPanelNavigationKey' not implemented!")
+        event.Skip()
+
     def onStartConverting(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
         print("Event handler 'onStartConverting' not implemented!")
         event.Skip()
diff -Nru wxglade-0.9.6/examples/AllWidgets/AllWidgets_30.wxg wxglade-1.0.1/examples/AllWidgets/AllWidgets_30.wxg
--- wxglade-0.9.6/examples/AllWidgets/AllWidgets_30.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/AllWidgets/AllWidgets_30.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -176,7 +176,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon1" base="EditBitmapButton">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <default>1</default>
                                 </object>
                             </object>
@@ -195,7 +195,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon2" base="EditBitmapButton">
                                     <style>wxBU_BOTTOM|wxBORDER_NONE</style>
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <disabled_bitmap>empty:32,32</disabled_bitmap>
                                     <default>1</default>
                                 </object>
@@ -865,7 +865,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticBitmap" name="bitmap_file" base="EditStaticBitmap">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <attribute>1</attribute>
                                 </object>
                             </object>
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/examples/AllWidgets/icon.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/examples/AllWidgets/icon.png differ
diff -Nru wxglade-0.9.6/examples/AllWidgets/icon.xpm wxglade-1.0.1/examples/AllWidgets/icon.xpm
--- wxglade-0.9.6/examples/AllWidgets/icon.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/AllWidgets/icon.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* XPM */
-static char *mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-"  c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-"                                ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-"                                ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++      ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++                    ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-"                                "
-};
diff -Nru wxglade-0.9.6/examples/Calculator/Calculator-01.wxg wxglade-1.0.1/examples/Calculator/Calculator-01.wxg
--- wxglade-0.9.6/examples/Calculator/Calculator-01.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/Calculator/Calculator-01.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,48 +1,40 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.0a6 on Sun Nov  5 14:54:18 2017 -->
+<!-- generated by wxGlade 0.9.9pre on Tue Aug  4 20:45:30 2020 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="1" use_new_namespace="1">
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="CalculatorFrame" name="frame" base="EditFrame">
         <size>400, 300</size>
         <title>Calculator</title>
         <style>wxDEFAULT_FRAME_STYLE</style>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <option>1</option>
-                <border>0</border>
-                <flag>wxEXPAND</flag>
-                <object class="wxPanel" name="panel_1" base="EditPanel">
+        <object class="wxPanel" name="panel_1" base="EditPanel">
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
                     <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
-                        <orient>wxVERTICAL</orient>
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
-                            <option>1</option>
+                            <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxStaticText" name="label_1" base="EditStaticText">
-                                        <label>Value 1:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
-                                    </object>
-                                </object>
+                            <object class="wxStaticText" name="label_1" base="EditStaticText">
+                                <label>Value 1:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
                             </object>
                         </object>
-                        <object class="sizerslot" />
-                        <object class="sizerslot" />
-                        <object class="sizerslot" />
-                        <object class="sizerslot" />
-                        <object class="sizerslot" />
                     </object>
                 </object>
+                <object class="sizerslot" />
+                <object class="sizerslot" />
+                <object class="sizerslot" />
+                <object class="sizerslot" />
+                <object class="sizerslot" />
             </object>
         </object>
     </object>
diff -Nru wxglade-0.9.6/examples/Calculator/Calculator-02.wxg wxglade-1.0.1/examples/Calculator/Calculator-02.wxg
--- wxglade-0.9.6/examples/Calculator/Calculator-02.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/Calculator/Calculator-02.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,142 +1,136 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.0a6 on Sun Nov 05 19:37:54 2017 -->
+<!-- generated by wxGlade 0.9.9pre on Tue Aug  4 21:12:33 2020 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="1" use_new_namespace="1">
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="CalculatorFrame" name="frame" base="EditFrame">
         <size>400, 300</size>
         <title>Calculator</title>
         <style>wxDEFAULT_FRAME_STYLE</style>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <option>1</option>
-                <border>0</border>
-                <flag>wxEXPAND</flag>
-                <object class="wxPanel" name="panel_1" base="EditPanel">
+        <object class="wxPanel" name="panel_1" base="EditPanel">
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
                     <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
-                        <orient>wxVERTICAL</orient>
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
-                            <option>1</option>
+                            <option>0</option>
+                            <border>0</border>
+                            <object class="wxStaticText" name="label_1" base="EditStaticText">
+                                <label>Value 1:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <object class="wxStaticText" name="label_4" base="EditStaticText">
+                                <label>Operator:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <object class="wxRadioBox" name="radiobox_operator" base="EditRadioBox">
+                                <dimension>1</dimension>
+                                <selection>0</selection>
+                                <choices>
+                                    <choice>+</choice>
+                                    <choice>-</choice>
+                                    <choice>*</choice>
+                                    <choice>/</choice>
+                                </choices>
+                                <style>wxRA_SPECIFY_ROWS</style>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <object class="wxStaticText" name="label_2" base="EditStaticText">
+                                <label>Value 2:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
+                        <style>wxLI_HORIZONTAL</style>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <object class="wxStaticText" name="label_3" base="EditStaticText">
+                                <label>Result:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
+                                <background>wxSYS_COLOUR_BTNFACE</background>
+                                <style>wxTE_MULTILINE|wxTE_READONLY</style>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
+                        <object class="sizeritem">
+                            <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxStaticText" name="label_1" base="EditStaticText">
-                                        <label>Value 1:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
-                                    </object>
-                                </object>
-                            </object>
-                        </object>
-                        <object class="sizeritem">
-                            <option>1</option>
-                            <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxStaticText" name="label_4" base="EditStaticText">
-                                        <label>Operator:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxRadioBox" name="radiobox_operator" base="EditRadioBox">
-                                        <dimension>1</dimension>
-                                        <selection>0</selection>
-                                        <choices>
-                                            <choice>+</choice>
-                                            <choice>-</choice>
-                                            <choice>*</choice>
-                                            <choice>/</choice>
-                                        </choices>
-                                        <style>wxRA_SPECIFY_ROWS</style>
-                                    </object>
-                                </object>
-                            </object>
-                        </object>
-                        <object class="sizeritem">
-                            <option>1</option>
-                            <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxStaticText" name="label_2" base="EditStaticText">
-                                        <label>Value 2:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
-                                    </object>
-                                </object>
+                            <object class="wxButton" name="button_execute" base="EditButton">
+                                <label>Execute</label>
+                                <default>1</default>
                             </object>
                         </object>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
-                                <style>wxLI_HORIZONTAL</style>
-                            </object>
-                        </object>
-                        <object class="sizeritem">
-                            <option>1</option>
-                            <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxStaticText" name="label_3" base="EditStaticText">
-                                        <label>Result:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
-                                    </object>
-                                </object>
-                            </object>
-                        </object>
-                        <object class="sizeritem">
-                            <option>1</option>
-                            <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxButton" name="button_execute" base="EditButton">
-                                        <label>Execute</label>
-                                        <default>1</default>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxButton" name="button_reset" base="EditButton">
-                                        <label>Reset</label>
-                                    </object>
-                                </object>
+                            <object class="wxButton" name="button_reset" base="EditButton">
+                                <label>Reset</label>
                             </object>
                         </object>
                     </object>
diff -Nru wxglade-0.9.6/examples/Calculator/Calculator-03.wxg wxglade-1.0.1/examples/Calculator/Calculator-03.wxg
--- wxglade-0.9.6/examples/Calculator/Calculator-03.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/Calculator/Calculator-03.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,149 +1,142 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.0a6 on Sun Nov 05 19:37:44 2017 -->
+<!-- generated by wxGlade 1.0.0a1 on Sat Aug 29 21:02:19 2020 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="1" use_new_namespace="1">
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="CalculatorFrame" name="frame" base="EditFrame">
         <size>400, 300</size>
         <title>Calculator</title>
         <style>wxDEFAULT_FRAME_STYLE</style>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <option>1</option>
-                <border>0</border>
-                <flag>wxEXPAND</flag>
-                <object class="wxPanel" name="panel_1" base="EditPanel">
+        <object class="wxPanel" name="panel_1" base="EditPanel">
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
                     <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
-                        <orient>wxVERTICAL</orient>
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                    <object class="wxStaticText" name="label_1" base="EditStaticText">
-                                        <label>Value 1:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>1</option>
-                                    <border>0</border>
-                                    <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
-                                    </object>
-                                </object>
+                            <flag>wxALIGN_CENTER_VERTICAL</flag>
+                            <object class="wxStaticText" name="label_1" base="EditStaticText">
+                                <label>Value 1:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>0</border>
+                            <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
                             </object>
                         </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                    <object class="wxStaticText" name="label_4" base="EditStaticText">
-                                        <label>Operator:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxRadioBox" name="radio_box_1" base="EditRadioBox">
-                                        <dimension>1</dimension>
-                                        <selection>0</selection>
-                                        <choices>
-                                            <choice>+</choice>
-                                            <choice>-</choice>
-                                            <choice>*</choice>
-                                            <choice>/</choice>
-                                        </choices>
-                                        <style>wxRA_SPECIFY_ROWS</style>
-                                    </object>
-                                </object>
+                            <flag>wxALIGN_CENTER_VERTICAL</flag>
+                            <object class="wxStaticText" name="label_4" base="EditStaticText">
+                                <label>Operator:</label>
                             </object>
                         </object>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                    <object class="wxStaticText" name="label_2" base="EditStaticText">
-                                        <label>Value 2:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>1</option>
-                                    <border>0</border>
-                                    <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
-                                    </object>
-                                </object>
+                            <object class="wxRadioBox" name="radiobox_operator" base="EditRadioBox">
+                                <dimension>1</dimension>
+                                <selection>0</selection>
+                                <choices>
+                                    <choice>+</choice>
+                                    <choice>-</choice>
+                                    <choice>*</choice>
+                                    <choice>/</choice>
+                                </choices>
+                                <style>wxRA_SPECIFY_ROWS</style>
                             </object>
                         </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
-                            <border>5</border>
-                            <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
-                            <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
-                                <style>wxLI_HORIZONTAL</style>
+                            <border>0</border>
+                            <flag>wxALIGN_CENTER_VERTICAL</flag>
+                            <object class="wxStaticText" name="label_2" base="EditStaticText">
+                                <label>Value 2:</label>
                             </object>
                         </object>
                         <object class="sizeritem">
                             <option>1</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxStaticText" name="label_3" base="EditStaticText">
-                                        <label>Result:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>1</option>
-                                    <border>0</border>
-                                    <flag>wxEXPAND</flag>
-                                    <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
-                                        <background>#d4d0c8</background>
-                                    </object>
-                                </object>
+                            <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
                             </object>
                         </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
+                    <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
+                        <style>wxLI_HORIZONTAL</style>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxALIGN_CENTER</flag>
-                            <object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>5</border>
-                                    <flag>wxALL</flag>
-                                    <object class="wxButton" name="button_execute" base="EditButton">
-                                        <label>Execute</label>
-                                        <default>1</default>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>5</border>
-                                    <flag>wxALL</flag>
-                                    <object class="wxButton" name="button_reset" base="EditButton">
-                                        <label>Reset</label>
-                                    </object>
-                                </object>
+                            <object class="wxStaticText" name="label_3" base="EditStaticText">
+                                <label>Result:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>0</border>
+                            <flag>wxEXPAND</flag>
+                            <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
+                                <background>wxSYS_COLOUR_BTNFACE</background>
+                                <style>wxTE_MULTILINE|wxTE_READONLY</style>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <flag>wxALIGN_CENTER_HORIZONTAL</flag>
+                    <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>5</border>
+                            <flag>wxALL</flag>
+                            <object class="wxButton" name="button_execute" base="EditButton">
+                                <label>Execute</label>
+                                <default>1</default>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>5</border>
+                            <flag>wxALL</flag>
+                            <object class="wxButton" name="button_reset" base="EditButton">
+                                <label>Reset</label>
                             </object>
                         </object>
                     </object>
diff -Nru wxglade-0.9.6/examples/Calculator/Calculator-04-Notebook.wxg wxglade-1.0.1/examples/Calculator/Calculator-04-Notebook.wxg
--- wxglade-0.9.6/examples/Calculator/Calculator-04-Notebook.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/Calculator/Calculator-04-Notebook.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,177 +1,158 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.0a6 on Sun Nov 05 19:37:33 2017 -->
+<!-- generated by wxGlade 1.0.0a1 on Sat Aug 29 21:04:04 2020 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="1" use_new_namespace="1">
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="CalculatorFrame" name="frame" base="EditFrame">
         <size>400, 300</size>
         <title>Calculator</title>
         <style>wxDEFAULT_FRAME_STYLE</style>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <option>1</option>
-                <border>0</border>
-                <flag>wxEXPAND</flag>
-                <object class="wxNotebook" name="notebook_1" base="EditNotebook">
-                    <style>wxNB_TOP</style>
-                    <tabs>
-                        <tab window="notebook_1_pane_1">Calculate</tab>
-                        <tab window="notebook_1_Log">Log</tab>
-                    </tabs>
-                    <object class="wxPanel" name="notebook_1_pane_1" base="EditPanel">
-                        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxNotebook" name="notebook_1" base="EditNotebook">
+            <style>wxNB_TOP</style>
+            <tabs>
+                <tab window="panel_1">Calculator</tab>
+                <tab window="text_log">Log</tab>
+            </tabs>
+            <object class="wxPanel" name="panel_1" base="EditPanel">
+                <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                    <orient>wxVERTICAL</orient>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>4</border>
+                        <flag>wxALL|wxEXPAND</flag>
                         <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
-                            <orient>wxVERTICAL</orient>
+                            <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
                                 <option>0</option>
                                 <border>0</border>
-                                <flag>wxEXPAND</flag>
-                                <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                        <object class="wxStaticText" name="label_1" base="EditStaticText">
-                                            <label>Value 1:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
-                                        </object>
-                                    </object>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxStaticText" name="label_1" base="EditStaticText">
+                                    <label>Value 1:</label>
                                 </object>
                             </object>
                             <object class="sizeritem">
-                                <option>0</option>
+                                <option>1</option>
                                 <border>0</border>
-                                <flag>wxEXPAND</flag>
-                                <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                        <object class="wxStaticText" name="label_4" base="EditStaticText">
-                                            <label>Operator:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <object class="wxRadioBox" name="radio_box_1" base="EditRadioBox">
-                                            <dimension>1</dimension>
-                                            <selection>0</selection>
-                                            <choices>
-                                                <choice>+</choice>
-                                                <choice>-</choice>
-                                                <choice>*</choice>
-                                                <choice>/</choice>
-                                            </choices>
-                                            <style>wxRA_SPECIFY_ROWS</style>
-                                        </object>
-                                    </object>
+                                <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
                                 </object>
                             </object>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>4</border>
+                        <flag>wxALL|wxEXPAND</flag>
+                        <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
                                 <option>0</option>
                                 <border>0</border>
-                                <flag>wxEXPAND</flag>
-                                <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                        <object class="wxStaticText" name="label_2" base="EditStaticText">
-                                            <label>Value 2:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
-                                        </object>
-                                    </object>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxStaticText" name="label_4" base="EditStaticText">
+                                    <label>Operator:</label>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <option>0</option>
-                                <border>5</border>
-                                <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
-                                <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
-                                    <style>wxLI_HORIZONTAL</style>
+                                <border>0</border>
+                                <object class="wxRadioBox" name="radiobox_operator" base="EditRadioBox">
+                                    <dimension>1</dimension>
+                                    <selection>0</selection>
+                                    <choices>
+                                        <choice>+</choice>
+                                        <choice>-</choice>
+                                        <choice>*</choice>
+                                        <choice>/</choice>
+                                    </choices>
+                                    <style>wxRA_SPECIFY_ROWS</style>
                                 </object>
                             </object>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>4</border>
+                        <flag>wxALL|wxEXPAND</flag>
+                        <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
-                                <option>1</option>
+                                <option>0</option>
                                 <border>0</border>
-                                <flag>wxEXPAND</flag>
-                                <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <object class="wxStaticText" name="label_3" base="EditStaticText">
-                                            <label>Result:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <flag>wxEXPAND</flag>
-                                        <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
-                                            <background>#d4d0c8</background>
-                                        </object>
-                                    </object>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxStaticText" name="label_2" base="EditStaticText">
+                                    <label>Value 2:</label>
                                 </object>
                             </object>
                             <object class="sizeritem">
-                                <option>0</option>
+                                <option>1</option>
                                 <border>0</border>
-                                <flag>wxALIGN_CENTER</flag>
-                                <object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>5</border>
-                                        <flag>wxALL</flag>
-                                        <object class="wxButton" name="button_execute" base="EditButton">
-                                            <label>Execute</label>
-                                            <default>1</default>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>5</border>
-                                        <flag>wxALL</flag>
-                                        <object class="wxButton" name="button_reset" base="EditButton">
-                                            <label>Reset</label>
-                                        </object>
-                                    </object>
+                                <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
                                 </object>
                             </object>
                         </object>
                     </object>
-                    <object class="wxPanel" name="notebook_1_Log" base="EditPanel">
-                        <style>wxTAB_TRAVERSAL</style>
-                        <object class="wxBoxSizer" name="sizer_8" base="EditBoxSizer">
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>5</border>
+                        <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
+                        <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
+                            <style>wxLI_HORIZONTAL</style>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>1</option>
+                        <border>4</border>
+                        <flag>wxALL|wxEXPAND</flag>
+                        <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
                             <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxStaticText" name="label_3" base="EditStaticText">
+                                    <label>Result:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
                                 <option>1</option>
                                 <border>0</border>
                                 <flag>wxEXPAND</flag>
-                                <object class="wxTextCtrl" name="text_log" base="EditTextCtrl">
-                                    <background>#d4d0c8</background>
-                                    <value>1+1 = 2</value>
+                                <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
+                                    <background>wxSYS_COLOUR_BTNFACE</background>
+                                    <style>wxTE_MULTILINE|wxTE_READONLY</style>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <flag>wxALIGN_CENTER_HORIZONTAL</flag>
+                        <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>5</border>
+                                <flag>wxALL</flag>
+                                <object class="wxButton" name="button_execute" base="EditButton">
+                                    <label>Execute</label>
+                                    <default>1</default>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>5</border>
+                                <flag>wxALL</flag>
+                                <object class="wxButton" name="button_reset" base="EditButton">
+                                    <label>Reset</label>
                                 </object>
                             </object>
                         </object>
                     </object>
                 </object>
             </object>
+            <object class="wxTextCtrl" name="text_log" base="EditTextCtrl">
+                <background>wxSYS_COLOUR_BTNFACE</background>
+                <style>wxTE_MULTILINE|wxTE_READONLY</style>
+            </object>
         </object>
     </object>
 </application>
diff -Nru wxglade-0.9.6/examples/Calculator/Calculator-05-Spacers.wxg wxglade-1.0.1/examples/Calculator/Calculator-05-Spacers.wxg
--- wxglade-0.9.6/examples/Calculator/Calculator-05-Spacers.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/Calculator/Calculator-05-Spacers.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,194 +1,175 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.0a6 on Sun Nov 05 19:37:23 2017 -->
+<!-- generated by wxGlade 1.0.0a1 on Sat Aug 29 20:59:05 2020 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="1" use_new_namespace="1">
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="CalculatorFrame" name="frame" base="EditFrame">
         <size>400, 300</size>
         <title>Calculator</title>
         <style>wxDEFAULT_FRAME_STYLE</style>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <option>1</option>
-                <border>0</border>
-                <flag>wxEXPAND</flag>
-                <object class="wxNotebook" name="notebook_1" base="EditNotebook">
-                    <style>wxNB_TOP</style>
-                    <tabs>
-                        <tab window="notebook_1_pane_1">Calculate</tab>
-                        <tab window="notebook_1_Log">Log</tab>
-                    </tabs>
-                    <object class="wxPanel" name="notebook_1_pane_1" base="EditPanel">
-                        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxNotebook" name="notebook_1" base="EditNotebook">
+            <style>wxNB_TOP</style>
+            <tabs>
+                <tab window="notebook_1_pane_1">Calculate</tab>
+                <tab window="text_log">Log</tab>
+            </tabs>
+            <object class="wxPanel" name="notebook_1_pane_1" base="EditPanel">
+                <style>wxTAB_TRAVERSAL</style>
+                <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                    <orient>wxVERTICAL</orient>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>4</border>
+                        <flag>wxALL|wxEXPAND</flag>
                         <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
-                            <orient>wxVERTICAL</orient>
+                            <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
                                 <option>0</option>
                                 <border>0</border>
-                                <flag>wxEXPAND</flag>
-                                <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                        <object class="wxStaticText" name="label_1" base="EditStaticText">
-                                            <label>Value 1:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
-                                        </object>
-                                    </object>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxStaticText" name="label_1" base="EditStaticText">
+                                    <label>Value 1:</label>
                                 </object>
                             </object>
                             <object class="sizeritem">
-                                <option>0</option>
+                                <option>1</option>
                                 <border>0</border>
-                                <flag>wxEXPAND</flag>
-                                <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                        <object class="wxStaticText" name="label_4" base="EditStaticText">
-                                            <label>Operator:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <object class="spacer" name="spacer" base="EditSpacer">
-                                            <width>20</width>
-                                            <height>0</height>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER</flag>
-                                        <object class="wxRadioBox" name="radio_box_1" base="EditRadioBox">
-                                            <dimension>1</dimension>
-                                            <selection>0</selection>
-                                            <choices>
-                                                <choice>+</choice>
-                                                <choice>-</choice>
-                                                <choice>*</choice>
-                                                <choice>/</choice>
-                                            </choices>
-                                            <style>wxRA_SPECIFY_ROWS</style>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <object class="spacer" name="spacer" base="EditSpacer">
-                                            <width>20</width>
-                                            <height>0</height>
-                                        </object>
-                                    </object>
+                                <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
                                 </object>
                             </object>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>4</border>
+                        <flag>wxALL|wxEXPAND</flag>
+                        <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
                                 <option>0</option>
                                 <border>0</border>
-                                <flag>wxEXPAND</flag>
-                                <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                        <object class="wxStaticText" name="label_2" base="EditStaticText">
-                                            <label>Value 2:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
-                                        </object>
-                                    </object>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxStaticText" name="label_4" base="EditStaticText">
+                                    <label>Operator:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="spacer" name="spacer" base="EditSpacer">
+                                    <width>20</width>
+                                    <height>0</height>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <option>0</option>
-                                <border>5</border>
-                                <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
-                                <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
-                                    <style>wxLI_HORIZONTAL</style>
+                                <border>0</border>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxRadioBox" name="radiobox_operator" base="EditRadioBox">
+                                    <dimension>1</dimension>
+                                    <selection>0</selection>
+                                    <choices>
+                                        <choice>+</choice>
+                                        <choice>-</choice>
+                                        <choice>*</choice>
+                                        <choice>/</choice>
+                                    </choices>
+                                    <style>wxRA_SPECIFY_ROWS</style>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <option>1</option>
                                 <border>0</border>
-                                <flag>wxEXPAND</flag>
-                                <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <object class="wxStaticText" name="label_3" base="EditStaticText">
-                                            <label>Result:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <flag>wxEXPAND</flag>
-                                        <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
-                                            <background>#d4d0c8</background>
-                                        </object>
-                                    </object>
+                                <object class="spacer" name="spacer" base="EditSpacer">
+                                    <width>20</width>
+                                    <height>0</height>
                                 </object>
                             </object>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>4</border>
+                        <flag>wxALL|wxEXPAND</flag>
+                        <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
                                 <option>0</option>
                                 <border>0</border>
-                                <flag>wxALIGN_CENTER</flag>
-                                <object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>5</border>
-                                        <flag>wxALL</flag>
-                                        <object class="wxButton" name="button_execute" base="EditButton">
-                                            <label>Execute</label>
-                                            <default>1</default>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>5</border>
-                                        <flag>wxALL</flag>
-                                        <object class="wxButton" name="button_reset" base="EditButton">
-                                            <label>Reset</label>
-                                        </object>
-                                    </object>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxStaticText" name="label_2" base="EditStaticText">
+                                    <label>Value 2:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
                                 </object>
                             </object>
                         </object>
                     </object>
-                    <object class="wxPanel" name="notebook_1_Log" base="EditPanel">
-                        <style>wxTAB_TRAVERSAL</style>
-                        <object class="wxBoxSizer" name="sizer_8" base="EditBoxSizer">
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>5</border>
+                        <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
+                        <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
+                            <style>wxLI_HORIZONTAL</style>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>1</option>
+                        <border>4</border>
+                        <flag>wxALL|wxEXPAND</flag>
+                        <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
                             <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxStaticText" name="label_3" base="EditStaticText">
+                                    <label>Result:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
                                 <option>1</option>
                                 <border>0</border>
                                 <flag>wxEXPAND</flag>
-                                <object class="wxTextCtrl" name="text_log" base="EditTextCtrl">
+                                <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
                                     <background>#d4d0c8</background>
-                                    <value>1+1 = 2</value>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <flag>wxALIGN_CENTER_HORIZONTAL</flag>
+                        <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>5</border>
+                                <flag>wxALL</flag>
+                                <object class="wxButton" name="button_execute" base="EditButton">
+                                    <label>Execute</label>
+                                    <default>1</default>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>5</border>
+                                <flag>wxALL</flag>
+                                <object class="wxButton" name="button_reset" base="EditButton">
+                                    <label>Reset</label>
                                 </object>
                             </object>
                         </object>
                     </object>
                 </object>
             </object>
+            <object class="wxTextCtrl" name="text_log" base="EditTextCtrl">
+                <background>#d4d0c8</background>
+                <value>1+1 = 2</value>
+            </object>
         </object>
     </object>
 </application>
diff -Nru wxglade-0.9.6/examples/Calculator/Calculator-06-GridSizer.wxg wxglade-1.0.1/examples/Calculator/Calculator-06-GridSizer.wxg
--- wxglade-0.9.6/examples/Calculator/Calculator-06-GridSizer.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/Calculator/Calculator-06-GridSizer.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,153 +1,134 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.0a6 on Sun Nov 05 19:37:12 2017 -->
+<!-- generated by wxGlade 1.0.0a1 on Sat Aug 29 20:59:00 2020 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="1" use_new_namespace="1">
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="CalculatorFrame" name="frame" base="EditFrame">
         <size>400, 300</size>
         <title>Calculator</title>
         <style>wxDEFAULT_FRAME_STYLE</style>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <option>1</option>
-                <border>0</border>
-                <flag>wxEXPAND</flag>
-                <object class="wxNotebook" name="notebook_1" base="EditNotebook">
-                    <style>wxNB_TOP</style>
-                    <tabs>
-                        <tab window="notebook_1_pane_1">Calculate</tab>
-                        <tab window="notebook_1_Log">Log</tab>
-                    </tabs>
-                    <object class="wxPanel" name="notebook_1_pane_1" base="EditPanel">
-                        <style>wxTAB_TRAVERSAL</style>
-                        <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
-                            <orient>wxVERTICAL</orient>
+        <object class="wxNotebook" name="notebook_1" base="EditNotebook">
+            <style>wxNB_TOP</style>
+            <tabs>
+                <tab window="notebook_1_pane_1">Calculate</tab>
+                <tab window="text_log">Log</tab>
+            </tabs>
+            <object class="wxPanel" name="notebook_1_pane_1" base="EditPanel">
+                <style>wxTAB_TRAVERSAL</style>
+                <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                    <orient>wxVERTICAL</orient>
+                    <object class="sizeritem">
+                        <option>1</option>
+                        <border>0</border>
+                        <flag>wxEXPAND</flag>
+                        <object class="wxFlexGridSizer" name="grid_sizer_1" base="EditFlexGridSizer">
+                            <rows>4</rows>
+                            <cols>2</cols>
+                            <vgap>2</vgap>
+                            <hgap>2</hgap>
+                            <growable_rows>3</growable_rows>
+                            <growable_cols>1</growable_cols>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxStaticText" name="label_1" base="EditStaticText">
+                                    <label>Value 1:</label>
+                                </object>
+                            </object>
                             <object class="sizeritem">
                                 <option>1</option>
                                 <border>0</border>
                                 <flag>wxEXPAND</flag>
-                                <object class="wxFlexGridSizer" name="grid_sizer_1" base="EditFlexGridSizer">
-                                    <rows>0</rows>
-                                    <cols>2</cols>
-                                    <vgap>0</vgap>
-                                    <hgap>0</hgap>
-                                    <growable_rows>3</growable_rows>
-                                    <growable_cols>1</growable_cols>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                        <object class="wxStaticText" name="label_1" base="EditStaticText">
-                                            <label>Value 1:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <flag>wxEXPAND</flag>
-                                        <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                        <object class="wxStaticText" name="label_4" base="EditStaticText">
-                                            <label>Operator:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER</flag>
-                                        <object class="wxRadioBox" name="radio_box_1" base="EditRadioBox">
-                                            <dimension>1</dimension>
-                                            <selection>0</selection>
-                                            <choices>
-                                                <choice>+</choice>
-                                                <choice>-</choice>
-                                                <choice>*</choice>
-                                                <choice>/</choice>
-                                            </choices>
-                                            <style>wxRA_SPECIFY_ROWS</style>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                        <object class="wxStaticText" name="label_2" base="EditStaticText">
-                                            <label>Value 2:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <flag>wxEXPAND</flag>
-                                        <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>0</border>
-                                        <object class="wxStaticText" name="label_3" base="EditStaticText">
-                                            <label>Result:</label>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>0</border>
-                                        <flag>wxEXPAND</flag>
-                                        <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
-                                            <background>#d4d0c8</background>
-                                        </object>
-                                    </object>
+                                <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <option>0</option>
                                 <border>0</border>
-                                <flag>wxALIGN_CENTER</flag>
-                                <object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer">
-                                    <orient>wxHORIZONTAL</orient>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>5</border>
-                                        <flag>wxALL</flag>
-                                        <object class="wxButton" name="button_execute" base="EditButton">
-                                            <label>Execute</label>
-                                            <default>1</default>
-                                        </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                        <option>0</option>
-                                        <border>5</border>
-                                        <flag>wxALL</flag>
-                                        <object class="wxButton" name="button_reset" base="EditButton">
-                                            <label>Reset</label>
-                                        </object>
-                                    </object>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxStaticText" name="label_4" base="EditStaticText">
+                                    <label>Operator:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxRadioBox" name="radiobox_operator" base="EditRadioBox">
+                                    <dimension>1</dimension>
+                                    <selection>0</selection>
+                                    <choices>
+                                        <choice>+</choice>
+                                        <choice>-</choice>
+                                        <choice>*</choice>
+                                        <choice>/</choice>
+                                    </choices>
+                                    <style>wxRA_SPECIFY_ROWS</style>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                <object class="wxStaticText" name="label_2" base="EditStaticText">
+                                    <label>Value 2:</label>
                                 </object>
                             </object>
-                        </object>
-                    </object>
-                    <object class="wxPanel" name="notebook_1_Log" base="EditPanel">
-                        <style>wxTAB_TRAVERSAL</style>
-                        <object class="wxBoxSizer" name="sizer_8" base="EditBoxSizer">
-                            <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
                                 <option>1</option>
                                 <border>0</border>
                                 <flag>wxEXPAND</flag>
-                                <object class="wxTextCtrl" name="text_log" base="EditTextCtrl">
+                                <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxStaticText" name="label_3" base="EditStaticText">
+                                    <label>Result:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
                                     <background>#d4d0c8</background>
-                                    <value>1+1 = 2</value>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <flag>wxALIGN_CENTER_HORIZONTAL</flag>
+                        <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>5</border>
+                                <flag>wxALL</flag>
+                                <object class="wxButton" name="button_execute" base="EditButton">
+                                    <label>Execute</label>
+                                    <default>1</default>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>5</border>
+                                <flag>wxALL</flag>
+                                <object class="wxButton" name="button_reset" base="EditButton">
+                                    <label>Reset</label>
                                 </object>
                             </object>
                         </object>
                     </object>
                 </object>
             </object>
+            <object class="wxTextCtrl" name="text_log" base="EditTextCtrl">
+                <background>#d4d0c8</background>
+                <value>1+1 = 2</value>
+            </object>
         </object>
     </object>
 </application>
diff -Nru wxglade-0.9.6/examples/Calculator/Calculator-07-Import.wxg wxglade-1.0.1/examples/Calculator/Calculator-07-Import.wxg
--- wxglade-0.9.6/examples/Calculator/Calculator-07-Import.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/Calculator/Calculator-07-Import.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.0a6 on Sun Nov  5 20:44:41 2017 -->
+<!-- generated by wxGlade 1.0.0a1 on Sat Aug 29 20:58:47 2020 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="1" path="Calculator_GUI.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="Calculator_GUI.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="CalculatorFrame" name="frame" base="EditFrame">
         <size>400, 300</size>
         <title>Calculator</title>
@@ -24,151 +24,143 @@
                 </menu>
             </menus>
         </object>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <option>1</option>
-                <border>0</border>
-                <flag>wxEXPAND</flag>
-                <object class="wxPanel" name="panel_1" base="EditPanel">
+        <object class="wxPanel" name="panel_1" base="EditPanel">
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
                     <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
-                        <orient>wxVERTICAL</orient>
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                    <object class="wxStaticText" name="label_1" base="EditStaticText">
-                                        <label>Value 1:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>1</option>
-                                    <border>0</border>
-                                    <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
-                                    </object>
-                                </object>
+                            <flag>wxALIGN_CENTER_VERTICAL</flag>
+                            <object class="wxStaticText" name="label_1" base="EditStaticText">
+                                <label>Value 1:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>0</border>
+                            <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
                             </object>
                         </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                    <object class="wxStaticText" name="label_4" base="EditStaticText">
-                                        <label>Operator:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxRadioBox" name="radiobox_operator" base="EditRadioBox">
-                                        <dimension>1</dimension>
-                                        <selection>0</selection>
-                                        <choices>
-                                            <choice>+</choice>
-                                            <choice>-</choice>
-                                            <choice>*</choice>
-                                            <choice>/</choice>
-                                        </choices>
-                                        <style>wxRA_SPECIFY_ROWS</style>
-                                    </object>
-                                </object>
+                            <flag>wxALIGN_CENTER_VERTICAL</flag>
+                            <object class="wxStaticText" name="label_4" base="EditStaticText">
+                                <label>Operator:</label>
                             </object>
                         </object>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                    <object class="wxStaticText" name="label_2" base="EditStaticText">
-                                        <label>Value 2:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>1</option>
-                                    <border>0</border>
-                                    <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
-                                    </object>
-                                </object>
+                            <object class="wxRadioBox" name="radiobox_operator" base="EditRadioBox">
+                                <dimension>1</dimension>
+                                <selection>0</selection>
+                                <choices>
+                                    <choice>+</choice>
+                                    <choice>-</choice>
+                                    <choice>*</choice>
+                                    <choice>/</choice>
+                                </choices>
+                                <style>wxRA_SPECIFY_ROWS</style>
                             </object>
                         </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
-                            <border>5</border>
-                            <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
-                            <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
-                                <style>wxLI_HORIZONTAL</style>
+                            <border>0</border>
+                            <flag>wxALIGN_CENTER_VERTICAL</flag>
+                            <object class="wxStaticText" name="label_2" base="EditStaticText">
+                                <label>Value 2:</label>
                             </object>
                         </object>
                         <object class="sizeritem">
                             <option>1</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxStaticText" name="label_3" base="EditStaticText">
-                                        <label>Result:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>1</option>
-                                    <border>0</border>
-                                    <flag>wxEXPAND</flag>
-                                    <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
-                                        <background>#d4d0c8</background>
-                                        <style>wxTE_MULTILINE|wxTE_READONLY</style>
-                                    </object>
-                                </object>
+                            <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
                             </object>
                         </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>5</border>
+                    <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
+                    <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
+                        <style>wxLI_HORIZONTAL</style>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxALIGN_CENTER</flag>
-                            <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>5</border>
-                                    <flag>wxALL</flag>
-                                    <object class="wxButton" name="button_execute" base="EditButton">
-                                        <events>
-                                            <handler event="EVT_BUTTON">on_execute_button_clicked</handler>
-                                        </events>
-                                        <label>Execute</label>
-                                        <default>1</default>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>5</border>
-                                    <flag>wxALL</flag>
-                                    <object class="wxButton" name="button_reset" base="EditButton">
-                                        <events>
-                                            <handler event="EVT_BUTTON">on_reset_button_clicked</handler>
-                                        </events>
-                                        <label>Reset</label>
-                                    </object>
-                                </object>
+                            <object class="wxStaticText" name="label_3" base="EditStaticText">
+                                <label>Result:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>0</border>
+                            <flag>wxEXPAND</flag>
+                            <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
+                                <background>#d4d0c8</background>
+                                <style>wxTE_MULTILINE|wxTE_READONLY</style>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <flag>wxALIGN_CENTER_HORIZONTAL</flag>
+                    <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>5</border>
+                            <flag>wxALL</flag>
+                            <object class="wxButton" name="button_execute" base="EditButton">
+                                <events>
+                                    <handler event="EVT_BUTTON">on_execute_button_clicked</handler>
+                                </events>
+                                <label>Execute</label>
+                                <default>1</default>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>5</border>
+                            <flag>wxALL</flag>
+                            <object class="wxButton" name="button_reset" base="EditButton">
+                                <events>
+                                    <handler event="EVT_BUTTON">on_reset_button_clicked</handler>
+                                </events>
+                                <label>Reset</label>
                             </object>
                         </object>
                     </object>
diff -Nru wxglade-0.9.6/examples/Calculator/Calculator-07-Keep.wxg wxglade-1.0.1/examples/Calculator/Calculator-07-Keep.wxg
--- wxglade-0.9.6/examples/Calculator/Calculator-07-Keep.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/Calculator/Calculator-07-Keep.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,156 +1,148 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.0a6 on Sun Nov 05 22:26:32 2017 -->
+<!-- generated by wxGlade 1.0.0a1 on Sat Aug 29 20:58:36 2020 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="0" path="Calculator.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="0" path="Calculator.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="CalculatorFrame" name="frame" base="EditFrame">
         <size>400, 300</size>
         <title>Calculator</title>
         <style>wxDEFAULT_FRAME_STYLE</style>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <option>1</option>
-                <border>0</border>
-                <flag>wxEXPAND</flag>
-                <object class="wxPanel" name="panel_1" base="EditPanel">
+        <object class="wxPanel" name="panel_1" base="EditPanel">
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
                     <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
-                        <orient>wxVERTICAL</orient>
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                    <object class="wxStaticText" name="label_1" base="EditStaticText">
-                                        <label>Value 1:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>1</option>
-                                    <border>0</border>
-                                    <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
-                                    </object>
-                                </object>
+                            <flag>wxALIGN_CENTER_VERTICAL</flag>
+                            <object class="wxStaticText" name="label_1" base="EditStaticText">
+                                <label>Value 1:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>0</border>
+                            <object class="wxTextCtrl" name="text_value1" base="EditTextCtrl">
                             </object>
                         </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                    <object class="wxStaticText" name="label_4" base="EditStaticText">
-                                        <label>Operator:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxRadioBox" name="radiobox_operator" base="EditRadioBox">
-                                        <dimension>1</dimension>
-                                        <selection>0</selection>
-                                        <choices>
-                                            <choice>+</choice>
-                                            <choice>-</choice>
-                                            <choice>*</choice>
-                                            <choice>/</choice>
-                                        </choices>
-                                        <style>wxRA_SPECIFY_ROWS</style>
-                                    </object>
-                                </object>
+                            <flag>wxALIGN_CENTER_VERTICAL</flag>
+                            <object class="wxStaticText" name="label_4" base="EditStaticText">
+                                <label>Operator:</label>
                             </object>
                         </object>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
-                                    <object class="wxStaticText" name="label_2" base="EditStaticText">
-                                        <label>Value 2:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>1</option>
-                                    <border>0</border>
-                                    <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
-                                    </object>
-                                </object>
+                            <object class="wxRadioBox" name="radiobox_operator" base="EditRadioBox">
+                                <dimension>1</dimension>
+                                <selection>0</selection>
+                                <choices>
+                                    <choice>+</choice>
+                                    <choice>-</choice>
+                                    <choice>*</choice>
+                                    <choice>/</choice>
+                                </choices>
+                                <style>wxRA_SPECIFY_ROWS</style>
                             </object>
                         </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
-                            <border>5</border>
-                            <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
-                            <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
-                                <style>wxLI_HORIZONTAL</style>
+                            <border>0</border>
+                            <flag>wxALIGN_CENTER_VERTICAL</flag>
+                            <object class="wxStaticText" name="label_2" base="EditStaticText">
+                                <label>Value 2:</label>
                             </object>
                         </object>
                         <object class="sizeritem">
                             <option>1</option>
                             <border>0</border>
-                            <flag>wxEXPAND</flag>
-                            <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>0</border>
-                                    <object class="wxStaticText" name="label_3" base="EditStaticText">
-                                        <label>Result:</label>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>1</option>
-                                    <border>0</border>
-                                    <flag>wxEXPAND</flag>
-                                    <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
-                                        <background>#d4d0c8</background>
-                                        <style>wxTE_MULTILINE|wxTE_READONLY</style>
-                                    </object>
-                                </object>
+                            <object class="wxTextCtrl" name="text_value2" base="EditTextCtrl">
                             </object>
                         </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>5</border>
+                    <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
+                    <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
+                        <style>wxLI_HORIZONTAL</style>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                             <option>0</option>
                             <border>0</border>
-                            <flag>wxALIGN_CENTER</flag>
-                            <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
-                                <orient>wxHORIZONTAL</orient>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>5</border>
-                                    <flag>wxALL</flag>
-                                    <object class="wxButton" name="btn_execute" base="EditButton">
-                                        <events>
-                                            <handler event="EVT_BUTTON">on_execute_button_clicked</handler>
-                                        </events>
-                                        <label>Execute</label>
-                                        <default>1</default>
-                                    </object>
-                                </object>
-                                <object class="sizeritem">
-                                    <option>0</option>
-                                    <border>5</border>
-                                    <flag>wxALL</flag>
-                                    <object class="wxButton" name="btn_reset" base="EditButton">
-                                        <events>
-                                            <handler event="EVT_BUTTON">on_reset_button_clicked</handler>
-                                        </events>
-                                        <label>Reset</label>
-                                    </object>
-                                </object>
+                            <object class="wxStaticText" name="label_3" base="EditStaticText">
+                                <label>Result:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>0</border>
+                            <flag>wxEXPAND</flag>
+                            <object class="wxTextCtrl" name="text_result" base="EditTextCtrl">
+                                <background>#d4d0c8</background>
+                                <style>wxTE_MULTILINE|wxTE_READONLY</style>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <flag>wxALIGN_CENTER_HORIZONTAL</flag>
+                    <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer">
+                        <orient>wxHORIZONTAL</orient>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>5</border>
+                            <flag>wxALL</flag>
+                            <object class="wxButton" name="button_execute" base="EditButton">
+                                <events>
+                                    <handler event="EVT_BUTTON">on_execute_button_clicked</handler>
+                                </events>
+                                <label>Execute</label>
+                                <default>1</default>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>5</border>
+                            <flag>wxALL</flag>
+                            <object class="wxButton" name="button_reset" base="EditButton">
+                                <events>
+                                    <handler event="EVT_BUTTON">on_reset_button_clicked</handler>
+                                </events>
+                                <label>Reset</label>
                             </object>
                         </object>
                     </object>
diff -Nru wxglade-0.9.6/examples/Calculator/Calculator_GUI.py wxglade-1.0.1/examples/Calculator/Calculator_GUI.py
--- wxglade-0.9.6/examples/Calculator/Calculator_GUI.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/Calculator/Calculator_GUI.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 #
-# generated by wxGlade 0.8.0a6 on Sun Nov  5 20:44:07 2017
+# generated by wxGlade 1.0.0a1 on Sat Aug 29 20:58:47 2020
 #
 
 import wx
@@ -16,77 +16,83 @@
 class CalculatorFrame(wx.Frame):
     def __init__(self, *args, **kwds):
         # begin wxGlade: CalculatorFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        
+        self.SetSize((400, 300))
+        self.SetTitle("Calculator")
+
         # Menu Bar
         self.frame_menubar = wx.MenuBar()
         wxglade_tmp_menu = wx.Menu()
         self.frame_menubar.i_reset = wxglade_tmp_menu.Append(wx.ID_ANY, "Reset", "Reset results")
-        self.Bind(wx.EVT_MENU, self.on_menu_File_Reset, id=self.frame_menubar.i_reset.GetId())
+        self.Bind(wx.EVT_MENU, self.on_menu_File_Reset, self.frame_menubar.i_reset)
         item = wxglade_tmp_menu.Append(wx.ID_ANY, "Exit", "Exit application")
-        self.Bind(wx.EVT_MENU, self.on_menu_File_Exit, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_menu_File_Exit, item)
         self.frame_menubar.Append(wxglade_tmp_menu, "File")
         self.SetMenuBar(self.frame_menubar)
         # Menu Bar end
+
         self.panel_1 = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_2, 0, wx.ALL | wx.EXPAND, 4)
+
+        label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "Value 1:")
+        sizer_2.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
         self.text_value1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
-        self.radiobox_operator = wx.RadioBox(self.panel_1, wx.ID_ANY, "", choices=["+", "-", "*", "/"], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
-        self.text_value2 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
-        self.text_result = wx.TextCtrl(self.panel_1, wx.ID_ANY, "", style=wx.TE_MULTILINE | wx.TE_READONLY)
-        self.button_execute = wx.Button(self.panel_1, wx.ID_ANY, "Execute")
-        self.button_reset = wx.Button(self.panel_1, wx.ID_ANY, "Reset")
+        sizer_2.Add(self.text_value1, 1, 0, 0)
 
-        self.__set_properties()
-        self.__do_layout()
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 4)
 
-        self.Bind(wx.EVT_BUTTON, self.on_execute_button_clicked, self.button_execute)
-        self.Bind(wx.EVT_BUTTON, self.on_reset_button_clicked, self.button_reset)
-        # end wxGlade
+        label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, "Operator:")
+        sizer_3.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL, 0)
 
-    def __set_properties(self):
-        # begin wxGlade: CalculatorFrame.__set_properties
-        self.SetTitle("Calculator")
+        self.radiobox_operator = wx.RadioBox(self.panel_1, wx.ID_ANY, "", choices=["+", "-", "*", "/"], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
         self.radiobox_operator.SetSelection(0)
-        self.text_result.SetBackgroundColour(wx.Colour(212, 208, 200))
-        self.button_execute.SetDefault()
-        # end wxGlade
+        sizer_3.Add(self.radiobox_operator, 0, 0, 0)
 
-    def __do_layout(self):
-        # begin wxGlade: CalculatorFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.VERTICAL)
-        sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "Value 1:")
-        sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_3.Add(self.text_value1, 1, 0, 0)
-        sizer_2.Add(sizer_3, 0, wx.EXPAND, 0)
-        label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, "Operator:")
-        sizer_7.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_7.Add(self.radiobox_operator, 0, 0, 0)
-        sizer_2.Add(sizer_7, 0, wx.EXPAND, 0)
+        sizer_1.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 4)
+
         label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, "Value 2:")
         sizer_4.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.text_value2 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
         sizer_4.Add(self.text_value2, 1, 0, 0)
-        sizer_2.Add(sizer_4, 0, wx.EXPAND, 0)
+
         static_line_1 = wx.StaticLine(self.panel_1, wx.ID_ANY)
-        sizer_2.Add(static_line_1, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
+        sizer_1.Add(static_line_1, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_5, 1, wx.ALL | wx.EXPAND, 4)
+
         label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, "Result:")
         sizer_5.Add(label_3, 0, 0, 0)
+
+        self.text_result = wx.TextCtrl(self.panel_1, wx.ID_ANY, "", style=wx.TE_MULTILINE | wx.TE_READONLY)
+        self.text_result.SetBackgroundColour(wx.Colour(212, 208, 200))
         sizer_5.Add(self.text_result, 1, wx.EXPAND, 0)
-        sizer_2.Add(sizer_5, 1, wx.EXPAND, 0)
+
+        sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_6, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+
+        self.button_execute = wx.Button(self.panel_1, wx.ID_ANY, "Execute")
+        self.button_execute.SetDefault()
         sizer_6.Add(self.button_execute, 0, wx.ALL, 5)
+
+        self.button_reset = wx.Button(self.panel_1, wx.ID_ANY, "Reset")
         sizer_6.Add(self.button_reset, 0, wx.ALL, 5)
-        sizer_2.Add(sizer_6, 0, wx.ALIGN_CENTER, 0)
-        self.panel_1.SetSizer(sizer_2)
-        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
-        self.SetSizer(sizer_1)
+
+        self.panel_1.SetSizer(sizer_1)
+
         self.Layout()
-        self.SetSize((400, 300))
+
+        self.Bind(wx.EVT_BUTTON, self.on_execute_button_clicked, self.button_execute)
+        self.Bind(wx.EVT_BUTTON, self.on_reset_button_clicked, self.button_reset)
         # end wxGlade
 
     def on_menu_File_Reset(self, event):  # wxGlade: CalculatorFrame.<event_handler>
diff -Nru wxglade-0.9.6/examples/Calculator/Calculator.py wxglade-1.0.1/examples/Calculator/Calculator.py
--- wxglade-0.9.6/examples/Calculator/Calculator.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/Calculator/Calculator.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,66 +17,72 @@
 class CalculatorFrame(wx.Frame):
     def __init__(self, *args, **kwds):
         # begin wxGlade: CalculatorFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("Calculator")
+
         self.panel_1 = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_2, 0, wx.ALL | wx.EXPAND, 4)
+
+        label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "Value 1:")
+        sizer_2.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
         self.text_value1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
-        self.radiobox_operator = wx.RadioBox(self.panel_1, wx.ID_ANY, "", choices=["+", "-", "*", "/"], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
-        self.text_value2 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
-        self.text_result = wx.TextCtrl(self.panel_1, wx.ID_ANY, "", style=wx.TE_MULTILINE | wx.TE_READONLY)
-        self.btn_execute = wx.Button(self.panel_1, wx.ID_ANY, "Execute")
-        self.btn_reset = wx.Button(self.panel_1, wx.ID_ANY, "Reset")
+        sizer_2.Add(self.text_value1, 1, 0, 0)
 
-        self.__set_properties()
-        self.__do_layout()
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 4)
 
-        self.Bind(wx.EVT_BUTTON, self.on_execute_button_clicked, self.btn_execute)
-        self.Bind(wx.EVT_BUTTON, self.on_reset_button_clicked, self.btn_reset)
-        # end wxGlade
+        label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, "Operator:")
+        sizer_3.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL, 0)
 
-    def __set_properties(self):
-        # begin wxGlade: CalculatorFrame.__set_properties
-        self.SetTitle("Calculator")
+        self.radiobox_operator = wx.RadioBox(self.panel_1, wx.ID_ANY, "", choices=["+", "-", "*", "/"], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
         self.radiobox_operator.SetSelection(0)
-        self.text_result.SetBackgroundColour(wx.Colour(212, 208, 200))
-        self.btn_execute.SetDefault()
-        # end wxGlade
+        sizer_3.Add(self.radiobox_operator, 0, 0, 0)
 
-    def __do_layout(self):
-        # begin wxGlade: CalculatorFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.VERTICAL)
-        sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "Value 1:")
-        sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_3.Add(self.text_value1, 1, 0, 0)
-        sizer_2.Add(sizer_3, 0, wx.EXPAND, 0)
-        label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, "Operator:")
-        sizer_7.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_7.Add(self.radiobox_operator, 0, 0, 0)
-        sizer_2.Add(sizer_7, 0, wx.EXPAND, 0)
+        sizer_1.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 4)
+
         label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, "Value 2:")
         sizer_4.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.text_value2 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
         sizer_4.Add(self.text_value2, 1, 0, 0)
-        sizer_2.Add(sizer_4, 0, wx.EXPAND, 0)
+
         static_line_1 = wx.StaticLine(self.panel_1, wx.ID_ANY)
-        sizer_2.Add(static_line_1, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
+        sizer_1.Add(static_line_1, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_5, 1, wx.ALL | wx.EXPAND, 4)
+
         label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, "Result:")
         sizer_5.Add(label_3, 0, 0, 0)
+
+        self.text_result = wx.TextCtrl(self.panel_1, wx.ID_ANY, "", style=wx.TE_MULTILINE | wx.TE_READONLY)
+        self.text_result.SetBackgroundColour(wx.Colour(212, 208, 200))
         sizer_5.Add(self.text_result, 1, wx.EXPAND, 0)
-        sizer_2.Add(sizer_5, 1, wx.EXPAND, 0)
-        sizer_6.Add(self.btn_execute, 0, wx.ALL, 5)
-        sizer_6.Add(self.btn_reset, 0, wx.ALL, 5)
-        sizer_2.Add(sizer_6, 0, wx.ALIGN_CENTER, 0)
-        self.panel_1.SetSizer(sizer_2)
-        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
-        self.SetSizer(sizer_1)
+
+        sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_6, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+
+        self.button_execute = wx.Button(self.panel_1, wx.ID_ANY, "Execute")
+        self.button_execute.SetDefault()
+        sizer_6.Add(self.button_execute, 0, wx.ALL, 5)
+
+        self.button_reset = wx.Button(self.panel_1, wx.ID_ANY, "Reset")
+        sizer_6.Add(self.button_reset, 0, wx.ALL, 5)
+
+        self.panel_1.SetSizer(sizer_1)
+
         self.Layout()
-        self.SetSize((400, 300))
+
+        self.Bind(wx.EVT_BUTTON, self.on_execute_button_clicked, self.button_execute)
+        self.Bind(wx.EVT_BUTTON, self.on_reset_button_clicked, self.button_reset)
         # end wxGlade
 
     def on_execute_button_clicked(self, event):  # wxGlade: CalculatorFrame.<event_handler>
diff -Nru wxglade-0.9.6/examples/dialog/dialog.py wxglade-1.0.1/examples/dialog/dialog.py
--- wxglade-0.9.6/examples/dialog/dialog.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/examples/dialog/dialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,116 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 0.9.9pre on Fri Jan  3 20:14:00 2020
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_menubar = wx.MenuBar()
+        wxglade_tmp_menu = wx.Menu()
+        item = wxglade_tmp_menu.Append(wx.ID_ANY, "Show Dialog", "")
+        self.Bind(wx.EVT_MENU, self.show_modal, item)
+        self.frame_menubar.Append(wxglade_tmp_menu, "Menu")
+        self.SetMenuBar(self.frame_menubar)
+        # Menu Bar end
+
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.button_1 = wx.Button(self.panel_1, wx.ID_ANY, "Show Dialog (modal)")
+        sizer_1.Add(self.button_1, 0, wx.ALL, 4)
+
+        static_text_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "Text from dialog:")
+        sizer_1.Add(static_text_1, 0, wx.ALL, 4)
+
+        self.text_ctrl_1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "", style=wx.TE_READONLY)
+        sizer_1.Add(self.text_ctrl_1, 0, wx.ALL | wx.EXPAND, 4)
+
+        self.panel_1.SetSizer(sizer_1)
+
+        self.Layout()
+
+        self.Bind(wx.EVT_BUTTON, self.show_modal, self.button_1)
+        # end wxGlade
+
+    def show_modal(self, event):  # wxGlade: MyFrame.<event_handler>
+        # event might be a button or menu event; it's not used anyway
+        # instantiate dialog and set text control to initial value
+        with MyDialog(self) as dlg:
+            dlg.text_ctrl_1.SetValue(self.text_ctrl_1.GetValue())
+            # show as modal dialog
+            if dlg.ShowModal() == wx.ID_OK:
+                # user has hit OK -> read text control value
+                self.text_ctrl_1.SetValue(dlg.text_ctrl_1.GetValue())
+
+# end of class MyFrame
+
+class MyDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        static_text_1 = wx.StaticText(self, wx.ID_ANY, "Enter text:")
+        sizer_1.Add(static_text_1, 0, wx.ALL, 8)
+
+        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, "")
+        sizer_1.Add(self.text_ctrl_1, 0, wx.ALL | wx.EXPAND, 8)
+
+        sizer_1.Add((20, 20), 1, wx.EXPAND, 0)
+
+        sizer_2 = wx.StdDialogButtonSizer()
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT | wx.ALL, 4)
+
+        self.button_OK = wx.Button(self, wx.ID_OK, "")
+        self.button_OK.SetDefault()
+        sizer_2.AddButton(self.button_OK)
+
+        self.button_CANCEL = wx.Button(self, wx.ID_CANCEL, "")
+        sizer_2.AddButton(self.button_CANCEL)
+
+        sizer_2.Realize()
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.SetAffirmativeId(self.button_OK.GetId())
+        self.SetEscapeId(self.button_CANCEL.GetId())
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialog
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/examples/dialog/dialog.wxg wxglade-1.0.1/examples/dialog/dialog.wxg
--- wxglade-0.9.6/examples/dialog/dialog.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/examples/dialog/dialog.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.9.9pre on Sun Aug  9 19:13:54 2020 -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="0" path="./dialog.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>400, 300</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <menubar>1</menubar>
+        <object class="wxMenuBar" name="frame_menubar" base="EditMenuBar">
+            <menus>
+                <menu label="Menu" name="">
+                    <item>
+                        <label>Show Dialog</label>
+                        <handler>show_modal</handler>
+                    </item>
+                </menu>
+            </menus>
+        </object>
+        <object class="wxPanel" name="panel_1" base="EditPanel">
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL</flag>
+                    <object class="wxButton" name="button_1" base="EditButton">
+                        <events>
+                            <handler event="EVT_BUTTON">show_modal</handler>
+                        </events>
+                        <label>Show Dialog (modal)</label>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL</flag>
+                    <object class="wxStaticText" name="static_text_1" base="EditStaticText">
+                        <label>Text from dialog:</label>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>4</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
+                        <style>wxTE_READONLY</style>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="MyDialog" name="dialog" base="EditDialog">
+        <title>dialog</title>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <affirmative>button_OK</affirmative>
+        <escape>button_CANCEL</escape>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>8</border>
+                <flag>wxALL</flag>
+                <object class="wxStaticText" name="static_text_1" base="EditStaticText">
+                    <label>Enter text:</label>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>8</border>
+                <flag>wxALL|wxEXPAND</flag>
+                <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="spacer" name="spacer" base="EditSpacer">
+                    <width>20</width>
+                    <height>20</height>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>4</border>
+                <flag>wxALL|wxALIGN_RIGHT</flag>
+                <object class="wxStdDialogButtonSizer" name="sizer_2" base="EditStdDialogButtonSizer">
+                    <orient>wxHORIZONTAL</orient>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxButton" name="button_OK" base="EditButton">
+                            <label>OK</label>
+                            <default>1</default>
+                            <stockitem>OK</stockitem>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxButton" name="button_CANCEL" base="EditButton">
+                            <label>Cancel</label>
+                            <stockitem>CANCEL</stockitem>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/examples/dialog/Readme.txt wxglade-1.0.1/examples/dialog/Readme.txt
--- wxglade-0.9.6/examples/dialog/Readme.txt	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/examples/dialog/Readme.txt	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,3 @@
+This example shows how to use a dialog.
+On button press or menu selection it will be instantiated, filled with data, shown modally
+and if the user presses OK, the entered value will be read back.
diff -Nru wxglade-0.9.6/examples/html/html_example.py wxglade-1.0.1/examples/html/html_example.py
--- wxglade-0.9.6/examples/html/html_example.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/html/html_example.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,52 +17,55 @@
 class MyFrame(wx.Frame):
     def __init__(self, *args, **kwds):
         # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.panel_1 = wx.Panel(self, wx.ID_ANY)
-        self.button_back = wx.Button(self.panel_1, wx.ID_ANY, "<--")
-        self.button_forward = wx.Button(self.panel_1, wx.ID_ANY, "-->")
-        self.text_url = wx.TextCtrl(self.panel_1, wx.ID_ANY, "../../docs/html/index.html")
-        self.button_go = wx.Button(self.panel_1, wx.ID_ANY, "Open")
-        self.html = wx.html.HtmlWindow(self.panel_1, wx.ID_ANY)
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_BUTTON, lambda event: self.html.HistoryCanBack() and self.html.HistoryBack(), self.button_back)
-        self.Bind(wx.EVT_BUTTON, lambda event: self.html.HistoryCanForward() and self.html.HistoryForward(), self.button_forward)
-        self.Bind(wx.EVT_BUTTON, lambda event:self.html.LoadPage( self.text_url.GetValue() ), self.button_go)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
+        self.SetSize((800, 600))
         self.SetTitle("html example")
-        self.button_back.SetMinSize((30, -1))
-        self.button_forward.SetMinSize((30, -1))
-        self.button_go.SetDefault()
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
+        
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
+        
         sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_3, 0, wx.EXPAND, 0)
+        
+        self.button_back = wx.Button(self.panel_1, wx.ID_ANY, "<--")
+        self.button_back.SetMinSize((30, -1))
         sizer_3.Add(self.button_back, 0, 0, 0)
+        
+        self.button_forward = wx.Button(self.panel_1, wx.ID_ANY, "-->")
+        self.button_forward.SetMinSize((30, -1))
         sizer_3.Add(self.button_forward, 0, 0, 0)
+        
         label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "Location:")
         sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_url = wx.TextCtrl(self.panel_1, wx.ID_ANY, "../../docs/html/index.html")
         sizer_3.Add(self.text_url, 1, 0, 0)
+        
+        self.button_go = wx.Button(self.panel_1, wx.ID_ANY, "Open")
+        self.button_go.SetDefault()
         sizer_3.Add(self.button_go, 0, 0, 0)
-        sizer_2.Add(sizer_3, 0, wx.EXPAND, 0)
+        
         label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, "Note: HtmlWindow can only handle http, so most of the time you'll see a Moved Permanently")
         label_2.SetForegroundColour(wx.Colour(255, 0, 0))
         sizer_2.Add(label_2, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+        
+        self.html = wx.html.HtmlWindow(self.panel_1, wx.ID_ANY)
         sizer_2.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+        
         self.panel_1.SetSizer(sizer_2)
-        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
         self.SetSizer(sizer_1)
+        
         self.Layout()
-        self.SetSize((800, 600))
+
+        self.Bind(wx.EVT_BUTTON, lambda event: self.html.HistoryCanBack() and self.html.HistoryBack(), self.button_back)
+        self.Bind(wx.EVT_BUTTON, lambda event: self.html.HistoryCanForward() and self.html.HistoryForward(), self.button_forward)
+        self.Bind(wx.EVT_BUTTON, lambda event:self.html.LoadPage( self.text_url.GetValue() ), self.button_go)
         # end wxGlade
 
 # end of class MyFrame
diff -Nru wxglade-0.9.6/examples/html2/html2_example.py wxglade-1.0.1/examples/html2/html2_example.py
--- wxglade-0.9.6/examples/html2/html2_example.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/html2/html2_example.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,49 +19,81 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.panel_1 = wx.Panel(self, wx.ID_ANY)
-        self.button_back = wx.Button(self.panel_1, wx.ID_ANY, "<--")
-        self.button_forward = wx.Button(self.panel_1, wx.ID_ANY, "-->")
-        self.text_url = wx.TextCtrl(self.panel_1, wx.ID_ANY, "http://www.python.org/")
-        self.button_go = wx.Button(self.panel_1, wx.ID_ANY, "Open")
-        self.html2 = wx.html2.WebView.New(self.panel_1)
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_BUTTON, lambda event: self.html2.CanGoBack() and self.html2.GoBack(), self.button_back)
-        self.Bind(wx.EVT_BUTTON, lambda event: self.html2.CanGoForward() and self.html2.GoForward(), self.button_forward)
-        self.Bind(wx.EVT_BUTTON, lambda event:self.html2.LoadURL( self.text_url.GetValue() ), self.button_go)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
+        self.SetSize((800, 600))
         self.SetTitle("html2 example")
-        self.button_back.SetMinSize((30, -1))
-        self.button_forward.SetMinSize((30, -1))
-        self.button_go.SetDefault()
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
+
         sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_3, 0, wx.EXPAND, 0)
+
+        self.button_back = wx.Button(self.panel_1, wx.ID_ANY, "<--")
+        self.button_back.SetMinSize((30, -1))
         sizer_3.Add(self.button_back, 0, 0, 0)
+
+        self.button_forward = wx.Button(self.panel_1, wx.ID_ANY, "-->")
+        self.button_forward.SetMinSize((30, -1))
         sizer_3.Add(self.button_forward, 0, 0, 0)
+
         label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "Location:")
         sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+
+        self.text_url = wx.TextCtrl(self.panel_1, wx.ID_ANY, "http://www.python.org/")
         sizer_3.Add(self.text_url, 1, 0, 0)
+
+        self.button_go = wx.Button(self.panel_1, wx.ID_ANY, "Open")
+        self.button_go.SetDefault()
         sizer_3.Add(self.button_go, 0, 0, 0)
-        sizer_2.Add(sizer_3, 0, wx.EXPAND, 0)
+
+        self.html2 = wx.html2.WebView.New(self.panel_1)
         sizer_2.Add(self.html2, 1, wx.ALL | wx.EXPAND, 3)
+
         self.panel_1.SetSizer(sizer_2)
-        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
-        self.SetSize((800, 600))
+
+        self.Bind(wx.EVT_BUTTON, lambda event: self.html2.CanGoBack() and self.html2.GoBack(), self.button_back)
+        self.Bind(wx.EVT_BUTTON, lambda event: self.html2.CanGoForward() and self.html2.GoForward(), self.button_forward)
+        self.Bind(wx.EVT_BUTTON, lambda event:self.html2.LoadURL( self.text_url.GetValue() ), self.button_go)
+        self.Bind(wx.html2.EVT_WEBVIEW_ERROR, self.on_webview_error, self.html2)
+        self.Bind(wx.html2.EVT_WEBVIEW_LOADED, self.on_webview_loaded, self.html2)
+        self.Bind(wx.html2.EVT_WEBVIEW_NAVIGATED, self.on_webview_navigated, self.html2)
+        self.Bind(wx.html2.EVT_WEBVIEW_NAVIGATING, self.on_webview_navigating, self.html2)
+        self.Bind(wx.html2.EVT_WEBVIEW_NEWWINDOW, self.on_webview_newwindow, self.html2)
+        self.Bind(wx.html2.EVT_WEBVIEW_TITLE_CHANGED, self.on_webview_title_changed, self.html2)
         # end wxGlade
 
+    def on_webview_error(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("EVT_WEBVIEW_ERROR", event.GetString())
+        event.Skip()
+
+    def on_webview_loaded(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("EVT_WEBVIEW_LOADED", event.GetURL())
+        event.Skip()
+
+    def on_webview_navigated(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("EVT_WEBVIEW_NAVIGATED", event.GetNavigationAction(), event.GetTarget(), event.GetURL())
+        event.Skip()
+
+    def on_webview_navigating(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("EVT_WEBVIEW_NAVIGATING", event.GetNavigationAction(), event.GetTarget(), event.GetURL())
+        # call event.Veto() to veto
+        event.Skip()
+
+    def on_webview_newwindow(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("EVT_WEBVIEW_NEWWINDOW", event.GetURL())
+        event.Skip()
+
+    def on_webview_title_changed(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("EVT_WEBVIEW_TITLE_CHANGED", event.GetString())
+        event.Skip()
 # end of class MyFrame
 
 class MyApp(wx.App):
diff -Nru wxglade-0.9.6/examples/html2/html2_example.wxg wxglade-1.0.1/examples/html2/html2_example.wxg
--- wxglade-0.9.6/examples/html2/html2_example.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/html2/html2_example.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.0a9 on Mon Dec  4 22:28:35 2017 -->
+<!-- generated by wxGlade 1.0.0b2 on Thu Dec 10 21:47:38 2020 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="0" path="html2_example.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="0" path="html2_example.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="MyFrame" name="frame" base="EditFrame">
         <size>800, 600</size>
         <title>html2 example</title>
@@ -77,6 +77,14 @@
                             <flag>wxALL|wxEXPAND</flag>
                             <object class="wx.html2.WebView" name="html2" base="CustomWidget">
                                 <extracode>import wx.html2</extracode>
+                                <events>
+                                    <handler event="wx.html2.EVT_WEBVIEW_NAVIGATING">on_webview_navigating</handler>
+                                    <handler event="wx.html2.EVT_WEBVIEW_NAVIGATED">on_webview_navigated</handler>
+                                    <handler event="wx.html2.EVT_WEBVIEW_LOADED">on_webview_loaded</handler>
+                                    <handler event="wx.html2.EVT_WEBVIEW_ERROR">on_webview_error</handler>
+                                    <handler event="wx.html2.EVT_WEBVIEW_NEWWINDOW">on_webview_newwindow</handler>
+                                    <handler event="wx.html2.EVT_WEBVIEW_TITLE_CHANGED">on_webview_title_changed</handler>
+                                </events>
                                 <arguments>
                                     <argument>$parent</argument>
                                 </arguments>
diff -Nru wxglade-0.9.6/examples/lib_plot/lib_plot_example.py wxglade-1.0.1/examples/lib_plot/lib_plot_example.py
--- wxglade-0.9.6/examples/lib_plot/lib_plot_example.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/lib_plot/lib_plot_example.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,70 +17,79 @@
 class MyFrame(wx.Frame):
     def __init__(self, *args, **kwds):
         # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 349))
+        self.SetTitle("wx.lib.plot example")
+        
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        
         self.panel_1 = wx.Panel(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
+        sizer_2 = wx.BoxSizer(wx.VERTICAL)
+        
         #################################################################
         # the custom widget:
         self.plot_canvas = wx.lib.plot.PlotCanvas(self.panel_1, wx.ID_ANY)
-        # code to be inserted after:
         self.plot_datasets = [] # list of wx.lib.plot.PolyLine instances
         #################################################################
-        self.text_function = wx.TextCtrl(self.panel_1, wx.ID_ANY, "sin(x)")
-        self.choice_colour = wx.Choice(self.panel_1, wx.ID_ANY, choices=["black", "red", "green", "blue", "yellow"])
-        self.text_xmin = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0")
-        self.text_max = wx.TextCtrl(self.panel_1, wx.ID_ANY, "10")
-        self.text_xstep = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0.1")
-        self.button_plot = wx.Button(self.panel_1, wx.ID_ANY, "Plot")
-        self.button_clear = wx.Button(self.panel_1, wx.ID_ANY, "Clear")
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_BUTTON, self.on_button_plot, self.button_plot)
-        self.Bind(wx.EVT_BUTTON, lambda event:(self.plot_canvas.Clear(), self.plot_datasets.clear()), self.button_clear)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("wx.lib.plot example")
-        self.choice_colour.SetSelection(0)
-        self.text_xmin.SetMinSize((40, -1))
-        self.text_max.SetMinSize((40, -1))
-        self.text_xstep.SetMinSize((40, -1))
-        self.button_plot.SetDefault()
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.VERTICAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_2.Add(self.plot_canvas, 1, wx.ALL | wx.EXPAND, 3)
+        
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 5)
+        
         label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, "f(x) = ")
         sizer_4.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+        
+        self.text_function = wx.TextCtrl(self.panel_1, wx.ID_ANY, "sin(x)")
         sizer_4.Add(self.text_function, 1, 0, 0)
+        
+        self.choice_colour = wx.Choice(self.panel_1, wx.ID_ANY, choices=["black", "red", "green", "blue", "yellow"])
+        self.choice_colour.SetSelection(0)
         sizer_4.Add(self.choice_colour, 0, wx.EXPAND, 0)
-        sizer_2.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 5)
+        
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 5)
+        
         label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "xmin")
         sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_xmin = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0")
+        self.text_xmin.SetMinSize((40, -1))
         sizer_3.Add(self.text_xmin, 0, 0, 0)
+        
         label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, "xmax")
         sizer_3.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_max = wx.TextCtrl(self.panel_1, wx.ID_ANY, "10")
+        self.text_max.SetMinSize((40, -1))
         sizer_3.Add(self.text_max, 0, 0, 0)
+        
         label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, "step")
         sizer_3.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_xstep = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0.1")
+        self.text_xstep.SetMinSize((40, -1))
         sizer_3.Add(self.text_xstep, 0, 0, 0)
+        
         sizer_3.Add((20, 20), 1, 0, 0)
+        
+        self.button_plot = wx.Button(self.panel_1, wx.ID_ANY, "Plot")
+        self.button_plot.SetDefault()
         sizer_3.Add(self.button_plot, 0, 0, 0)
+        
+        self.button_clear = wx.Button(self.panel_1, wx.ID_ANY, "Clear")
         sizer_3.Add(self.button_clear, 0, wx.LEFT, 8)
-        sizer_2.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 5)
+        
         self.panel_1.SetSizer(sizer_2)
-        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
         self.SetSizer(sizer_1)
+        
         self.Layout()
-        self.SetSize((400, 349))
+
+        self.Bind(wx.EVT_BUTTON, self.on_button_plot, self.button_plot)
+        self.Bind(wx.EVT_BUTTON, lambda event:(self.plot_canvas.Clear(), self.plot_datasets.clear()), self.button_clear)
         # end wxGlade
 
     def on_button_plot(self, event):  # wxGlade: MyFrame.<event_handler>
diff -Nru wxglade-0.9.6/examples/matplotlib/matplotlib_example.py wxglade-1.0.1/examples/matplotlib/matplotlib_example.py
--- wxglade-0.9.6/examples/matplotlib/matplotlib_example.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/matplotlib/matplotlib_example.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,65 +19,74 @@
 class MyFrame(wx.Frame):
     def __init__(self, *args, **kwds):
         # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("matplotlib canvas example")
+        
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        
         self.panel_1 = wx.Panel(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
+        sizer_2 = wx.BoxSizer(wx.VERTICAL)
+        
         figure = self.matplotlib_figure = Figure()
         # 1x1 grid, first subplot
         self.matplotlib_axes = figure.add_subplot(111)
         self.matplotlib_canvas = FigureCanvas(self.panel_1, wx.ID_ANY, figure)
-        self.text_function = wx.TextCtrl(self.panel_1, wx.ID_ANY, "sin(x)")
-        self.text_xmin = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0")
-        self.text_max = wx.TextCtrl(self.panel_1, wx.ID_ANY, "10")
-        self.text_xstep = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0.1")
-        self.button_plot = wx.Button(self.panel_1, wx.ID_ANY, "Plot")
-        self.button_clear = wx.Button(self.panel_1, wx.ID_ANY, "Clear")
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_BUTTON, self.on_button_plot, self.button_plot)
-        self.Bind(wx.EVT_BUTTON, lambda event:(self.matplotlib_axes.clear(),self.matplotlib_canvas.draw()), self.button_clear)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("matplotlib canvas example")
-        self.text_xmin.SetMinSize((40, -1))
-        self.text_max.SetMinSize((40, -1))
-        self.text_xstep.SetMinSize((40, -1))
-        self.button_plot.SetDefault()
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.VERTICAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_2.Add(self.matplotlib_canvas, 1, wx.ALL | wx.EXPAND, 3)
+        
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 5)
+        
         label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, "f(x) = ")
         sizer_4.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+        
+        self.text_function = wx.TextCtrl(self.panel_1, wx.ID_ANY, "sin(x)")
         sizer_4.Add(self.text_function, 1, 0, 0)
-        sizer_2.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 5)
+        
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 5)
+        
         label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "xmin")
         sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_xmin = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0")
+        self.text_xmin.SetMinSize((40, -1))
         sizer_3.Add(self.text_xmin, 0, 0, 0)
+        
         label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, "xmax")
         sizer_3.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_max = wx.TextCtrl(self.panel_1, wx.ID_ANY, "10")
+        self.text_max.SetMinSize((40, -1))
         sizer_3.Add(self.text_max, 0, 0, 0)
+        
         label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, "step")
         sizer_3.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_xstep = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0.1")
+        self.text_xstep.SetMinSize((40, -1))
         sizer_3.Add(self.text_xstep, 0, 0, 0)
+        
         sizer_3.Add((20, 20), 1, 0, 0)
+        
+        self.button_plot = wx.Button(self.panel_1, wx.ID_ANY, "Plot")
+        self.button_plot.SetDefault()
         sizer_3.Add(self.button_plot, 0, 0, 0)
+        
+        self.button_clear = wx.Button(self.panel_1, wx.ID_ANY, "Clear")
         sizer_3.Add(self.button_clear, 0, wx.LEFT, 8)
-        sizer_2.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 5)
+        
         self.panel_1.SetSizer(sizer_2)
-        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
         self.SetSizer(sizer_1)
+        
         self.Layout()
-        self.SetSize((400, 300))
+
+        self.Bind(wx.EVT_BUTTON, self.on_button_plot, self.button_plot)
+        self.Bind(wx.EVT_BUTTON, lambda event:(self.matplotlib_axes.clear(),self.matplotlib_canvas.draw()), self.button_clear)
         # end wxGlade
 
     def on_button_plot(self, event):  # wxGlade: MyFrame.<event_handler>
diff -Nru wxglade-0.9.6/examples/matplotlib2/matplotlib_GUI.py wxglade-1.0.1/examples/matplotlib2/matplotlib_GUI.py
--- wxglade-0.9.6/examples/matplotlib2/matplotlib_GUI.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/matplotlib2/matplotlib_GUI.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,60 +18,69 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.panel_1 = wx.Panel(self, wx.ID_ANY)
-        self.matplotlib_canvas = matplotlib_canvas.MatplotlibCanvas(self.panel_1, wx.ID_ANY)
-        self.text_function = wx.TextCtrl(self.panel_1, wx.ID_ANY, "sin(x)")
-        self.text_xmin = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0")
-        self.text_max = wx.TextCtrl(self.panel_1, wx.ID_ANY, "10")
-        self.text_xstep = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0.1")
-        self.button_plot = wx.Button(self.panel_1, wx.ID_ANY, "Plot")
-        self.button_clear = wx.Button(self.panel_1, wx.ID_ANY, "Clear")
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_BUTTON, self.on_button_plot, self.button_plot)
-        self.Bind(wx.EVT_BUTTON, self.on_button_clear, self.button_clear)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
+        self.SetSize((614, 505))
         self.SetTitle("matplotlib canvas example")
-        self.text_xmin.SetMinSize((40, -1))
-        self.text_max.SetMinSize((40, -1))
-        self.text_xstep.SetMinSize((40, -1))
-        self.button_plot.SetDefault()
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
+        
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+        
+        self.matplotlib_canvas = matplotlib_canvas.MatplotlibCanvas(self.panel_1, wx.ID_ANY)
         sizer_2.Add(self.matplotlib_canvas, 1, wx.ALL | wx.EXPAND, 3)
+        
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 5)
+        
         label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, "f(x) = ")
         sizer_4.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+        
+        self.text_function = wx.TextCtrl(self.panel_1, wx.ID_ANY, "sin(x)")
         sizer_4.Add(self.text_function, 1, 0, 0)
-        sizer_2.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 5)
+        
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 5)
+        
         label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "xmin")
         sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_xmin = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0")
+        self.text_xmin.SetMinSize((40, -1))
         sizer_3.Add(self.text_xmin, 0, 0, 0)
+        
         label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, "xmax")
         sizer_3.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_max = wx.TextCtrl(self.panel_1, wx.ID_ANY, "10")
+        self.text_max.SetMinSize((40, -1))
         sizer_3.Add(self.text_max, 0, 0, 0)
+        
         label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, "step")
         sizer_3.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_xstep = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0.1")
+        self.text_xstep.SetMinSize((40, -1))
         sizer_3.Add(self.text_xstep, 0, 0, 0)
+        
         sizer_3.Add((20, 20), 1, 0, 0)
+        
+        self.button_plot = wx.Button(self.panel_1, wx.ID_ANY, "Plot")
+        self.button_plot.SetDefault()
         sizer_3.Add(self.button_plot, 0, 0, 0)
+        
+        self.button_clear = wx.Button(self.panel_1, wx.ID_ANY, "Clear")
         sizer_3.Add(self.button_clear, 0, wx.LEFT, 8)
-        sizer_2.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 5)
+        
         self.panel_1.SetSizer(sizer_2)
-        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
         self.SetSizer(sizer_1)
+        
         self.Layout()
-        self.SetSize((614, 505))
+
+        self.Bind(wx.EVT_BUTTON, self.on_button_plot, self.button_plot)
+        self.Bind(wx.EVT_BUTTON, self.on_button_clear, self.button_clear)
         # end wxGlade
 
     def on_button_plot(self, event):  # wxGlade: MyFrame.<event_handler>
diff -Nru wxglade-0.9.6/examples/matplotlib3/matplotlib_GUI.py wxglade-1.0.1/examples/matplotlib3/matplotlib_GUI.py
--- wxglade-0.9.6/examples/matplotlib3/matplotlib_GUI.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/matplotlib3/matplotlib_GUI.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 #
-# generated by wxGlade 0.8.0b4 on Wed Mar 21 13:47:55 2018
+# generated by wxGlade 0.9.9pre on Wed Apr 29 22:07:23 2020
 #
 
 import wx
@@ -19,6 +19,7 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
+        self.SetTitle("Matplotlib canvas example")
         
         # Menu Bar
         self.frame_menubar = wx.MenuBar()
@@ -30,414 +31,549 @@
         self.frame_menubar.Append(wxglade_tmp_menu, "&File")
         self.SetMenuBar(self.frame_menubar)
         # Menu Bar end
+        
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        
         self.canvas = matplotlib_canvas.MatplotlibCanvas(self, wx.ID_ANY)
+        self.canvas.SetMinSize((100, 100))
         #self.controller = matplotlib_canvas.NavigationController2(self.canvas)
+        sizer_1.Add(self.canvas, 2, wx.ALL | wx.EXPAND, 0)
+        
         self.notebook_3 = wx.Notebook(self, wx.ID_ANY)
+        sizer_1.Add(self.notebook_3, 1, wx.EXPAND, 0)
+        
         self.notebook_3_pane_1 = wx.Panel(self.notebook_3, wx.ID_ANY)
+        self.notebook_3.AddPage(self.notebook_3_pane_1, "GUI")
+        
+        sizer_19 = wx.BoxSizer(wx.VERTICAL)
+        
+        sizer_13 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Cursor and Mouse"), wx.HORIZONTAL)
+        sizer_19.Add(sizer_13, 0, wx.EXPAND, 0)
+        
+        label_21 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "x/y:")
+        sizer_13.Add(label_21, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+        
         self.text_cursor_xy_pixel = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "px", style=wx.TE_READONLY)
-        self.text_cursor_xy_value = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "", style=wx.TE_READONLY)
-        self.choice_mouse_action = wx.Choice(self.notebook_3_pane_1, wx.ID_ANY, choices=["None/Pick", "Pan/Zoom", "Zoom"])
-        self.button_zoom_hist_home = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "|")
-        self.button_zoom_hist_back = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "<")
-        self.button_zoom_hist_forward = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, ">")
-        self.button_autoscale = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "A")
-        self.text_picked = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "", style=wx.TE_READONLY)
-        self.checkbox_pick_delete = wx.CheckBox(self.notebook_3_pane_1, wx.ID_ANY, "Delete on click")
-        self.choice_canvas_size = wx.Choice(self.notebook_3_pane_1, wx.ID_ANY, choices=["Variable", "400x300", "800x600", "1024x768", "1600x1200"])
-        self.choice_subplots = wx.Choice(self.notebook_3_pane_1, wx.ID_ANY, choices=["1x1", "1x2", "2x1", "2x2", "2x3"])
-        self.button_clear_plots = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "Clear plots")
-        self.button_clear_figures = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "Clear figures")
-        self.button_clear_all = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "Clear all")
-        self.button_multicursor = wx.ToggleButton(self.notebook_3_pane_1, wx.ID_ANY, "Multicursor")
-        self.text_function = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "sin(x)", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_xmin = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "0", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_xmax = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_xstep = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "0.1", style=wx.TE_PROCESS_ENTER)
-        self.choice_subplot = wx.Choice(self.notebook_3_pane_1, wx.ID_ANY, choices=["top left", "top right", "bottom left", "bottom right"])
-        self.button_plot = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "Plot")
-        self.notebook_2 = wx.Notebook(self.notebook_3_pane_1, wx.ID_ANY)
-        self.notebook_2_line = wx.Panel(self.notebook_2, wx.ID_ANY)
-        self.text_plot_line_x0 = wx.TextCtrl(self.notebook_2_line, wx.ID_ANY, "3", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_line_y0 = wx.TextCtrl(self.notebook_2_line, wx.ID_ANY, "0", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_line_x1 = wx.TextCtrl(self.notebook_2_line, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_line_y1 = wx.TextCtrl(self.notebook_2_line, wx.ID_ANY, "2", style=wx.TE_PROCESS_ENTER)
-        self.button_plot_line = wx.Button(self.notebook_2_line, wx.ID_ANY, "Plot Line")
-        self.notebook_2_AddRectangle = wx.Panel(self.notebook_2, wx.ID_ANY)
-        self.text_plot_rect_x = wx.TextCtrl(self.notebook_2_AddRectangle, wx.ID_ANY, "2", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_rect_y = wx.TextCtrl(self.notebook_2_AddRectangle, wx.ID_ANY, "0.5", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_rect_width = wx.TextCtrl(self.notebook_2_AddRectangle, wx.ID_ANY, "3", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_rect_height = wx.TextCtrl(self.notebook_2_AddRectangle, wx.ID_ANY, "3", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_rect_angle = wx.TextCtrl(self.notebook_2_AddRectangle, wx.ID_ANY, "15", style=wx.TE_PROCESS_ENTER)
-        self.button_plot_rect = wx.Button(self.notebook_2_AddRectangle, wx.ID_ANY, "Plot Rectangle")
-        self.notebook_2_circle = wx.Panel(self.notebook_2, wx.ID_ANY)
-        self.text_plot_circle_x = wx.TextCtrl(self.notebook_2_circle, wx.ID_ANY, "5 ", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_circle_y = wx.TextCtrl(self.notebook_2_circle, wx.ID_ANY, "0", style=wx.TE_PROCESS_ENTER)
-        self.text_plot_circle_radius = wx.TextCtrl(self.notebook_2_circle, wx.ID_ANY, "1", style=wx.TE_PROCESS_ENTER)
-        self.button_plot_circle = wx.Button(self.notebook_2_circle, wx.ID_ANY, "Plot Circle")
-        self.notebook_1 = wx.Notebook(self.notebook_3_pane_1, wx.ID_ANY)
-        self.notebook_1_line = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.text_line_x0 = wx.TextCtrl(self.notebook_1_line, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
-        self.text_line_y0 = wx.TextCtrl(self.notebook_1_line, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
-        self.text_line_x1 = wx.TextCtrl(self.notebook_1_line, wx.ID_ANY, "100", style=wx.TE_PROCESS_ENTER)
-        self.text_line_y1 = wx.TextCtrl(self.notebook_1_line, wx.ID_ANY, "100", style=wx.TE_PROCESS_ENTER)
-        self.button_draw_line = wx.Button(self.notebook_1_line, wx.ID_ANY, "Draw Line")
-        self.notebook_1_AddRectangle = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.text_rect_x = wx.TextCtrl(self.notebook_1_AddRectangle, wx.ID_ANY, "100", style=wx.TE_PROCESS_ENTER)
-        self.text_rect_y = wx.TextCtrl(self.notebook_1_AddRectangle, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
-        self.text_rect_width = wx.TextCtrl(self.notebook_1_AddRectangle, wx.ID_ANY, "100", style=wx.TE_PROCESS_ENTER)
-        self.text_rect_height = wx.TextCtrl(self.notebook_1_AddRectangle, wx.ID_ANY, "100", style=wx.TE_PROCESS_ENTER)
-        self.text_rect_angle = wx.TextCtrl(self.notebook_1_AddRectangle, wx.ID_ANY, "0", style=wx.TE_PROCESS_ENTER)
-        self.button_draw_rect = wx.Button(self.notebook_1_AddRectangle, wx.ID_ANY, "Draw Rectangle")
-        self.notebook_1_circle = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.text_circle_x = wx.TextCtrl(self.notebook_1_circle, wx.ID_ANY, "300", style=wx.TE_PROCESS_ENTER)
-        self.text_circle_y = wx.TextCtrl(self.notebook_1_circle, wx.ID_ANY, "200", style=wx.TE_PROCESS_ENTER)
-        self.text_circle_radius = wx.TextCtrl(self.notebook_1_circle, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
-        self.button_draw_circle = wx.Button(self.notebook_1_circle, wx.ID_ANY, "Draw Circle")
-        self.combo_box_colour = wx.ComboBox(self.notebook_3_pane_1, wx.ID_ANY, choices=["black", "red", "green", "blue", "yellow"], style=wx.CB_DROPDOWN | wx.CB_READONLY)
-        self.combo_box_line_width = wx.ComboBox(self.notebook_3_pane_1, wx.ID_ANY, choices=["0.1", "0.2", "0.5", "1", "2"], style=wx.CB_DROPDOWN | wx.CB_READONLY)
-        self.choice_line_style = wx.Choice(self.notebook_3_pane_1, wx.ID_ANY, choices=[" -  solid", " -- dashed", " -. dash dot", " :  dotted"])
-        self.notebook_3_Shell = wx.Panel(self.notebook_3, wx.ID_ANY)
-        self.shell = wx.py.shell.Shell(self.notebook_3_Shell, wx.ID_ANY, introText = "\nThis is the shell.\nHave a look at the variables 'app', 'frame', 'canvas' and 'shell'.\n")
-        # insert some variables into the shell's locals
-        self.shell.interp.locals["frame"]  = self
-        self.shell.interp.locals["shell2"] = self.shell
-        self.shell.interp.locals["canvas"] = self.canvas
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_CHOICE, self.on_choice_mouse_action, self.choice_mouse_action)
-        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_zoom_history("home"), self.button_zoom_hist_home)
-        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_zoom_history("back"), self.button_zoom_hist_back)
-        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_zoom_history("forward"), self.button_zoom_hist_forward)
-        self.Bind(wx.EVT_BUTTON, self.on_button_autoscale, self.button_autoscale)
-        self.Bind(wx.EVT_CHOICE, self.on_choice_canvas_size, self.choice_canvas_size)
-        self.Bind(wx.EVT_CHOICE, self.on_choice_subplots, self.choice_subplots)
-        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_clear("plots"), self.button_clear_plots)
-        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_clear("figures"), self.button_clear_figures)
-        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_clear("all"), self.button_clear_all)
-        self.Bind(wx.EVT_TOGGLEBUTTON, self.on_button_multicursor, self.button_multicursor)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot, self.text_function)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot, self.text_plot_xmin)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot, self.text_plot_xmax)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot, self.text_plot_xstep)
-        self.Bind(wx.EVT_CHOICE, self.on_choice_subplot, self.choice_subplot)
-        self.Bind(wx.EVT_BUTTON, self.on_button_plot, self.button_plot)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_line, self.text_plot_line_x0)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_line, self.text_plot_line_y0)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_line, self.text_plot_line_x1)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_line, self.text_plot_line_y1)
-        self.Bind(wx.EVT_BUTTON, self.on_button_plot_line, self.button_plot_line)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_rect, self.text_plot_rect_x)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_rect, self.text_plot_rect_y)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_rect, self.text_plot_rect_width)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_rect, self.text_plot_rect_height)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_rect, self.text_plot_rect_angle)
-        self.Bind(wx.EVT_BUTTON, self.on_button_plot_rect, self.button_plot_rect)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_circle, self.text_plot_circle_x)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_circle, self.text_plot_circle_y)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_circle, self.text_plot_circle_radius)
-        self.Bind(wx.EVT_BUTTON, self.on_button_plot_circle, self.button_plot_circle)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_line, self.text_line_x0)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_line, self.text_line_y0)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_line, self.text_line_x1)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_line, self.text_line_y1)
-        self.Bind(wx.EVT_BUTTON, self.on_button_draw_line, self.button_draw_line)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_rect, self.text_rect_x)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_rect, self.text_rect_y)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_rect, self.text_rect_width)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_rect, self.text_rect_height)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_rect, self.text_rect_angle)
-        self.Bind(wx.EVT_BUTTON, self.on_button_draw_rect, self.button_draw_rect)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_circle, self.text_circle_x)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_circle, self.text_circle_y)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_circle, self.text_circle_radius)
-        self.Bind(wx.EVT_BUTTON, self.on_button_draw_circle, self.button_draw_circle)
-        self.Bind(wx.EVT_COMBOBOX, self.on_combo_colour, self.combo_box_colour)
-        self.Bind(wx.EVT_TEXT, self.on_combo_colour, self.combo_box_colour)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_combo_colour, self.combo_box_colour)
-        self.Bind(wx.EVT_COMBOBOX, self.on_combo_line_width, self.combo_box_line_width)
-        self.Bind(wx.EVT_TEXT, self.on_combo_line_width, self.combo_box_line_width)
-        self.Bind(wx.EVT_TEXT_ENTER, self.on_combo_line_width, self.combo_box_line_width)
-        self.Bind(wx.EVT_CHOICE, self.on_choice_line_style, self.choice_line_style)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("Matplotlib canvas example")
-        self.canvas.SetMinSize((100, 100))
         self.text_cursor_xy_pixel.SetMinSize((40, -1))
         self.text_cursor_xy_pixel.SetToolTip("Last cursor position in pixels on canvas")
+        sizer_13.Add(self.text_cursor_xy_pixel, 2, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_cursor_xy_value = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "", style=wx.TE_READONLY)
         self.text_cursor_xy_value.SetMinSize((40, -1))
         self.text_cursor_xy_value.SetToolTip("Last cursor position in axis values")
+        sizer_13.Add(self.text_cursor_xy_value, 2, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        sizer_13.Add((20, 20), 1, wx.EXPAND, 0)
+        
+        label_23 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Mouse action:")
+        sizer_13.Add(label_23, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 30)
+        
+        self.choice_mouse_action = wx.Choice(self.notebook_3_pane_1, wx.ID_ANY, choices=["None/Pick", "Pan/Zoom", "Zoom"])
         self.choice_mouse_action.SetToolTip("Pick: click on element to e.g. delete them\nPan/Zoom: pan with left, zoom with right button\nZoom: zoom to rectangle")
         self.choice_mouse_action.SetSelection(0)
+        sizer_13.Add(self.choice_mouse_action, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        label_24 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Zoom:")
+        label_24.SetToolTip("Zoom history (not yet implemented)")
+        sizer_13.Add(label_24, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 30)
+        
+        self.button_zoom_hist_home = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "|")
         self.button_zoom_hist_home.SetMinSize((18, -1))
         self.button_zoom_hist_home.SetToolTip("Zoom history: home")
+        sizer_13.Add(self.button_zoom_hist_home, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.button_zoom_hist_back = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "<")
         self.button_zoom_hist_back.SetMinSize((18, -1))
         self.button_zoom_hist_back.SetToolTip("Zoom history: go back")
         self.button_zoom_hist_back.Enable(False)
+        sizer_13.Add(self.button_zoom_hist_back, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.button_zoom_hist_forward = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, ">")
         self.button_zoom_hist_forward.SetMinSize((18, -1))
         self.button_zoom_hist_forward.SetToolTip("Zoom history: go forward")
         self.button_zoom_hist_forward.Enable(False)
+        sizer_13.Add(self.button_zoom_hist_forward, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.button_autoscale = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "A")
         self.button_autoscale.SetMinSize((18, -1))
         self.button_autoscale.SetToolTip("auto scale axes")
-        self.text_picked.SetMinSize((60, -1))
-        self.choice_canvas_size.SetToolTip("change canvas size")
-        self.choice_canvas_size.SetSelection(0)
-        self.choice_subplots.SetToolTip("Subplot layout rows x columns; will only be applied on next Clear\n")
-        self.choice_subplots.SetSelection(0)
-        self.button_clear_figures.Enable(False)
-        self.button_multicursor.SetToolTip("Show synchronized cursor on all plots, if multiple sublplots are enabled/plotted.")
-        self.text_plot_xmin.SetMinSize((40, -1))
-        self.text_plot_xmax.SetMinSize((40, -1))
-        self.text_plot_xstep.SetMinSize((40, -1))
-        self.choice_subplot.SetToolTip("not yet implemented")
-        self.choice_subplot.SetSelection(0)
-        self.button_plot.SetDefault()
-        self.text_plot_line_x0.SetMinSize((40, -1))
-        self.text_plot_line_y0.SetMinSize((40, -1))
-        self.text_plot_line_x1.SetMinSize((40, -1))
-        self.text_plot_line_y1.SetMinSize((40, -1))
-        self.button_plot_line.SetDefault()
-        self.text_plot_rect_x.SetMinSize((40, -1))
-        self.text_plot_rect_y.SetMinSize((40, -1))
-        self.text_plot_rect_width.SetMinSize((40, -1))
-        self.text_plot_rect_height.SetMinSize((40, -1))
-        self.text_plot_rect_angle.SetMinSize((40, -1))
-        self.button_plot_rect.SetDefault()
-        self.text_plot_circle_x.SetMinSize((40, -1))
-        self.text_plot_circle_y.SetMinSize((40, -1))
-        self.text_plot_circle_radius.SetMinSize((40, -1))
-        self.button_plot_circle.SetDefault()
-        self.text_line_x0.SetMinSize((40, -1))
-        self.text_line_y0.SetMinSize((40, -1))
-        self.text_line_x1.SetMinSize((40, -1))
-        self.text_line_y1.SetMinSize((40, -1))
-        self.button_draw_line.SetDefault()
-        self.text_rect_x.SetMinSize((40, -1))
-        self.text_rect_y.SetMinSize((40, -1))
-        self.text_rect_width.SetMinSize((40, -1))
-        self.text_rect_height.SetMinSize((40, -1))
-        self.text_rect_angle.SetMinSize((40, -1))
-        self.button_draw_rect.SetDefault()
-        self.text_circle_x.SetMinSize((40, -1))
-        self.text_circle_y.SetMinSize((40, -1))
-        self.text_circle_radius.SetMinSize((40, -1))
-        self.button_draw_circle.SetDefault()
-        self.combo_box_colour.SetToolTip("not yet implemented")
-        self.combo_box_colour.SetSelection(0)
-        self.combo_box_line_width.SetMinSize((50, -1))
-        self.combo_box_line_width.SetToolTip("not yet implemented")
-        self.combo_box_line_width.SetSelection(3)
-        self.choice_line_style.SetSelection(0)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_7 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_Shell, wx.ID_ANY, "Shell"), wx.VERTICAL)
-        sizer_19 = wx.BoxSizer(wx.VERTICAL)
-        sizer_18 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Colours etc"), wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_9 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Add Figures (on canvas, by pixels)"), wx.HORIZONTAL)
-        sizer_11 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_14 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Add Figures (on plot area, by axis coordinates)"), wx.HORIZONTAL)
-        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Add Function Plots"), wx.VERTICAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_12 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Canvas Control"), wx.HORIZONTAL)
-        sizer_13 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Cursor and Mouse"), wx.HORIZONTAL)
-        sizer_1.Add(self.canvas, 2, wx.ALL | wx.EXPAND, 0)
-        label_21 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "x/y:")
-        sizer_13.Add(label_21, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        sizer_13.Add(self.text_cursor_xy_pixel, 2, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_13.Add(self.text_cursor_xy_value, 2, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_13.Add((20, 20), 1, wx.EXPAND, 0)
-        label_23 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Mouse action:")
-        sizer_13.Add(label_23, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 30)
-        sizer_13.Add(self.choice_mouse_action, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        label_24 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Zoom:")
-        label_24.SetToolTip("Zoom history (not yet implemented)")
-        sizer_13.Add(label_24, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 30)
-        sizer_13.Add(self.button_zoom_hist_home, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_13.Add(self.button_zoom_hist_back, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_13.Add(self.button_zoom_hist_forward, 0, wx.ALIGN_CENTER_VERTICAL, 0)
         sizer_13.Add(self.button_autoscale, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 4)
+        
         label_22 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Picked:")
         sizer_13.Add(label_22, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 30)
+        
+        self.text_picked = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "", style=wx.TE_READONLY)
+        self.text_picked.SetMinSize((60, -1))
         sizer_13.Add(self.text_picked, 4, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.checkbox_pick_delete = wx.CheckBox(self.notebook_3_pane_1, wx.ID_ANY, "Delete on click")
         sizer_13.Add(self.checkbox_pick_delete, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 6)
-        sizer_19.Add(sizer_13, 0, wx.EXPAND, 0)
+        
+        sizer_12 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Canvas Control"), wx.HORIZONTAL)
+        sizer_19.Add(sizer_12, 0, wx.ALL | wx.EXPAND, 3)
+        
         label_25 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Size:")
         label_25.SetToolTip("Zoom history (not yet implemented)")
         sizer_12.Add(label_25, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+        
+        self.choice_canvas_size = wx.Choice(self.notebook_3_pane_1, wx.ID_ANY, choices=["Variable", "400x300", "800x600", "1024x768", "1600x1200"])
+        self.choice_canvas_size.SetToolTip("change canvas size")
+        self.choice_canvas_size.SetSelection(0)
         sizer_12.Add(self.choice_canvas_size, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_15 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Subplots:")
         label_15.SetToolTip("Subplot layout; will only be applied on next Clear")
         sizer_12.Add(label_15, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 30)
+        
+        self.choice_subplots = wx.Choice(self.notebook_3_pane_1, wx.ID_ANY, choices=["1x1", "1x2", "2x1", "2x2", "2x3"])
+        self.choice_subplots.SetToolTip("Subplot layout rows x columns; will only be applied on next Clear\n")
+        self.choice_subplots.SetSelection(0)
         sizer_12.Add(self.choice_subplots, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.button_clear_plots = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "Clear plots")
         sizer_12.Add(self.button_clear_plots, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 30)
+        
+        self.button_clear_figures = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "Clear figures")
+        self.button_clear_figures.Enable(False)
         sizer_12.Add(self.button_clear_figures, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 8)
+        
+        self.button_clear_all = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "Clear all")
         sizer_12.Add(self.button_clear_all, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 8)
+        
         sizer_12.Add((20, 20), 1, wx.EXPAND, 0)
+        
+        self.button_multicursor = wx.ToggleButton(self.notebook_3_pane_1, wx.ID_ANY, "Multicursor")
+        self.button_multicursor.SetToolTip("Show synchronized cursor on all plots, if multiple sublplots are enabled/plotted.")
         sizer_12.Add(self.button_multicursor, 0, 0, 0)
-        sizer_19.Add(sizer_12, 0, wx.ALL | wx.EXPAND, 3)
+        
+        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Add Function Plots"), wx.VERTICAL)
+        sizer_19.Add(sizer_8, 0, wx.ALL | wx.EXPAND, 3)
+        
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 5)
+        
         label_4 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "f(x) = ")
         sizer_4.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+        
+        self.text_function = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "sin(x)", style=wx.TE_PROCESS_ENTER)
         sizer_4.Add(self.text_function, 1, 0, 0)
-        sizer_8.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 5)
+        
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 5)
+        
         label_1 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "xmin")
         sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_plot_xmin = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "0", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_xmin.SetMinSize((40, -1))
         sizer_3.Add(self.text_plot_xmin, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_2 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "xmax")
         sizer_3.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 0)
+        
+        self.text_plot_xmax = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_xmax.SetMinSize((40, -1))
         sizer_3.Add(self.text_plot_xmax, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_3 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "step")
         sizer_3.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_plot_xstep = wx.TextCtrl(self.notebook_3_pane_1, wx.ID_ANY, "0.1", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_xstep.SetMinSize((40, -1))
         sizer_3.Add(self.text_plot_xstep, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         sizer_3.Add((20, 20), 1, 0, 0)
+        
         label_19 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Subplot position:")
         sizer_3.Add(label_19, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+        
+        self.choice_subplot = wx.Choice(self.notebook_3_pane_1, wx.ID_ANY, choices=["top left", "top right", "bottom left", "bottom right"])
+        self.choice_subplot.SetToolTip("not yet implemented")
+        self.choice_subplot.SetSelection(0)
         sizer_3.Add(self.choice_subplot, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.button_plot = wx.Button(self.notebook_3_pane_1, wx.ID_ANY, "Plot")
+        self.button_plot.SetDefault()
         sizer_3.Add(self.button_plot, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_8.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_19.Add(sizer_8, 0, wx.ALL | wx.EXPAND, 3)
+        
+        sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_19.Add(sizer_6, 0, wx.EXPAND, 0)
+        
+        sizer_14 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Add Figures (on plot area, by axis coordinates)"), wx.HORIZONTAL)
+        sizer_6.Add(sizer_14, 1, wx.ALL, 3)
+        
+        self.notebook_2 = wx.Notebook(self.notebook_3_pane_1, wx.ID_ANY)
+        sizer_14.Add(self.notebook_2, 1, 0, 0)
+        
+        self.notebook_2_line = wx.Panel(self.notebook_2, wx.ID_ANY)
+        self.notebook_2.AddPage(self.notebook_2_line, "Add Line")
+        
+        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
+        
         label_29 = wx.StaticText(self.notebook_2_line, wx.ID_ANY, "x0")
         sizer_15.Add(label_29, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_plot_line_x0 = wx.TextCtrl(self.notebook_2_line, wx.ID_ANY, "3", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_line_x0.SetMinSize((40, -1))
         sizer_15.Add(self.text_plot_line_x0, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_31 = wx.StaticText(self.notebook_2_line, wx.ID_ANY, "y0")
         sizer_15.Add(label_31, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_plot_line_y0 = wx.TextCtrl(self.notebook_2_line, wx.ID_ANY, "0", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_line_y0.SetMinSize((40, -1))
         sizer_15.Add(self.text_plot_line_y0, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_32 = wx.StaticText(self.notebook_2_line, wx.ID_ANY, "x1")
         sizer_15.Add(label_32, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_plot_line_x1 = wx.TextCtrl(self.notebook_2_line, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_line_x1.SetMinSize((40, -1))
         sizer_15.Add(self.text_plot_line_x1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_33 = wx.StaticText(self.notebook_2_line, wx.ID_ANY, "y1")
         sizer_15.Add(label_33, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_plot_line_y1 = wx.TextCtrl(self.notebook_2_line, wx.ID_ANY, "2", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_line_y1.SetMinSize((40, -1))
         sizer_15.Add(self.text_plot_line_y1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         sizer_15.Add((20, 20), 1, 0, 0)
+        
+        self.button_plot_line = wx.Button(self.notebook_2_line, wx.ID_ANY, "Plot Line")
+        self.button_plot_line.SetDefault()
         sizer_15.Add(self.button_plot_line, 0, 0, 0)
-        self.notebook_2_line.SetSizer(sizer_15)
+        
+        self.notebook_2_AddRectangle = wx.Panel(self.notebook_2, wx.ID_ANY)
+        self.notebook_2.AddPage(self.notebook_2_AddRectangle, "Add Rectangle")
+        
+        sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
+        
         label_35 = wx.StaticText(self.notebook_2_AddRectangle, wx.ID_ANY, "corner x")
         sizer_16.Add(label_35, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_plot_rect_x = wx.TextCtrl(self.notebook_2_AddRectangle, wx.ID_ANY, "2", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_rect_x.SetMinSize((40, -1))
         sizer_16.Add(self.text_plot_rect_x, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_36 = wx.StaticText(self.notebook_2_AddRectangle, wx.ID_ANY, "y")
         sizer_16.Add(label_36, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_plot_rect_y = wx.TextCtrl(self.notebook_2_AddRectangle, wx.ID_ANY, "0.5", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_rect_y.SetMinSize((40, -1))
         sizer_16.Add(self.text_plot_rect_y, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_37 = wx.StaticText(self.notebook_2_AddRectangle, wx.ID_ANY, "width")
         sizer_16.Add(label_37, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_plot_rect_width = wx.TextCtrl(self.notebook_2_AddRectangle, wx.ID_ANY, "3", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_rect_width.SetMinSize((40, -1))
         sizer_16.Add(self.text_plot_rect_width, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_38 = wx.StaticText(self.notebook_2_AddRectangle, wx.ID_ANY, "height")
         sizer_16.Add(label_38, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_plot_rect_height = wx.TextCtrl(self.notebook_2_AddRectangle, wx.ID_ANY, "3", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_rect_height.SetMinSize((40, -1))
         sizer_16.Add(self.text_plot_rect_height, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_40 = wx.StaticText(self.notebook_2_AddRectangle, wx.ID_ANY, "angle")
         sizer_16.Add(label_40, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_plot_rect_angle = wx.TextCtrl(self.notebook_2_AddRectangle, wx.ID_ANY, "15", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_rect_angle.SetMinSize((40, -1))
         sizer_16.Add(self.text_plot_rect_angle, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        label_41 = wx.StaticText(self.notebook_2_AddRectangle, wx.ID_ANY, u"\u00b0")
+        
+        label_41 = wx.StaticText(self.notebook_2_AddRectangle, wx.ID_ANY, u"°")
         sizer_16.Add(label_41, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         sizer_16.Add((20, 20), 1, 0, 0)
+        
+        self.button_plot_rect = wx.Button(self.notebook_2_AddRectangle, wx.ID_ANY, "Plot Rectangle")
+        self.button_plot_rect.SetDefault()
         sizer_16.Add(self.button_plot_rect, 0, 0, 0)
-        self.notebook_2_AddRectangle.SetSizer(sizer_16)
+        
+        self.notebook_2_circle = wx.Panel(self.notebook_2, wx.ID_ANY)
+        self.notebook_2.AddPage(self.notebook_2_circle, "Add Circle")
+        
+        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
+        
         label_42 = wx.StaticText(self.notebook_2_circle, wx.ID_ANY, "center x")
         sizer_17.Add(label_42, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_plot_circle_x = wx.TextCtrl(self.notebook_2_circle, wx.ID_ANY, "5 ", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_circle_x.SetMinSize((40, -1))
         sizer_17.Add(self.text_plot_circle_x, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_43 = wx.StaticText(self.notebook_2_circle, wx.ID_ANY, "y")
         sizer_17.Add(label_43, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_plot_circle_y = wx.TextCtrl(self.notebook_2_circle, wx.ID_ANY, "0", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_circle_y.SetMinSize((40, -1))
         sizer_17.Add(self.text_plot_circle_y, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_44 = wx.StaticText(self.notebook_2_circle, wx.ID_ANY, "radius")
         sizer_17.Add(label_44, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_plot_circle_radius = wx.TextCtrl(self.notebook_2_circle, wx.ID_ANY, "1", style=wx.TE_PROCESS_ENTER)
+        self.text_plot_circle_radius.SetMinSize((40, -1))
         sizer_17.Add(self.text_plot_circle_radius, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         sizer_17.Add((20, 20), 1, 0, 0)
+        
+        self.button_plot_circle = wx.Button(self.notebook_2_circle, wx.ID_ANY, "Plot Circle")
+        self.button_plot_circle.SetDefault()
         sizer_17.Add(self.button_plot_circle, 0, 0, 0)
-        self.notebook_2_circle.SetSizer(sizer_17)
-        self.notebook_2.AddPage(self.notebook_2_line, "Add Line")
-        self.notebook_2.AddPage(self.notebook_2_AddRectangle, "Add Rectangle")
-        self.notebook_2.AddPage(self.notebook_2_circle, "Add Circle")
-        sizer_14.Add(self.notebook_2, 1, 0, 0)
-        sizer_6.Add(sizer_14, 1, wx.ALL, 3)
+        
+        sizer_9 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Add Figures (on canvas, by pixels)"), wx.HORIZONTAL)
+        sizer_6.Add(sizer_9, 1, wx.ALL, 3)
+        
+        self.notebook_1 = wx.Notebook(self.notebook_3_pane_1, wx.ID_ANY)
+        sizer_9.Add(self.notebook_1, 1, 0, 0)
+        
+        self.notebook_1_line = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_line, "Add Line")
+        
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+        
         label_5 = wx.StaticText(self.notebook_1_line, wx.ID_ANY, "x0")
         sizer_5.Add(label_5, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_line_x0 = wx.TextCtrl(self.notebook_1_line, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
+        self.text_line_x0.SetMinSize((40, -1))
         sizer_5.Add(self.text_line_x0, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_6 = wx.StaticText(self.notebook_1_line, wx.ID_ANY, "y0")
         sizer_5.Add(label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_line_y0 = wx.TextCtrl(self.notebook_1_line, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
+        self.text_line_y0.SetMinSize((40, -1))
         sizer_5.Add(self.text_line_y0, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_7 = wx.StaticText(self.notebook_1_line, wx.ID_ANY, "x1")
         sizer_5.Add(label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_line_x1 = wx.TextCtrl(self.notebook_1_line, wx.ID_ANY, "100", style=wx.TE_PROCESS_ENTER)
+        self.text_line_x1.SetMinSize((40, -1))
         sizer_5.Add(self.text_line_x1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_8 = wx.StaticText(self.notebook_1_line, wx.ID_ANY, "y1")
         sizer_5.Add(label_8, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_line_y1 = wx.TextCtrl(self.notebook_1_line, wx.ID_ANY, "100", style=wx.TE_PROCESS_ENTER)
+        self.text_line_y1.SetMinSize((40, -1))
         sizer_5.Add(self.text_line_y1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_9 = wx.StaticText(self.notebook_1_line, wx.ID_ANY, "pixels")
         sizer_5.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         sizer_5.Add((20, 20), 1, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.button_draw_line = wx.Button(self.notebook_1_line, wx.ID_ANY, "Draw Line")
+        self.button_draw_line.SetDefault()
         sizer_5.Add(self.button_draw_line, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        self.notebook_1_line.SetSizer(sizer_5)
+        
+        self.notebook_1_AddRectangle = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_AddRectangle, "Add Rectangle")
+        
+        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
+        
         label_10 = wx.StaticText(self.notebook_1_AddRectangle, wx.ID_ANY, "corner x")
         sizer_10.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_rect_x = wx.TextCtrl(self.notebook_1_AddRectangle, wx.ID_ANY, "100", style=wx.TE_PROCESS_ENTER)
+        self.text_rect_x.SetMinSize((40, -1))
         sizer_10.Add(self.text_rect_x, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_11 = wx.StaticText(self.notebook_1_AddRectangle, wx.ID_ANY, "y")
         sizer_10.Add(label_11, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_rect_y = wx.TextCtrl(self.notebook_1_AddRectangle, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
+        self.text_rect_y.SetMinSize((40, -1))
         sizer_10.Add(self.text_rect_y, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_12 = wx.StaticText(self.notebook_1_AddRectangle, wx.ID_ANY, "width")
         sizer_10.Add(label_12, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_rect_width = wx.TextCtrl(self.notebook_1_AddRectangle, wx.ID_ANY, "100", style=wx.TE_PROCESS_ENTER)
+        self.text_rect_width.SetMinSize((40, -1))
         sizer_10.Add(self.text_rect_width, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_13 = wx.StaticText(self.notebook_1_AddRectangle, wx.ID_ANY, "height")
         sizer_10.Add(label_13, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_rect_height = wx.TextCtrl(self.notebook_1_AddRectangle, wx.ID_ANY, "100", style=wx.TE_PROCESS_ENTER)
+        self.text_rect_height.SetMinSize((40, -1))
         sizer_10.Add(self.text_rect_height, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_14 = wx.StaticText(self.notebook_1_AddRectangle, wx.ID_ANY, "pixels")
         sizer_10.Add(label_14, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_16 = wx.StaticText(self.notebook_1_AddRectangle, wx.ID_ANY, "angle")
         sizer_10.Add(label_16, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_rect_angle = wx.TextCtrl(self.notebook_1_AddRectangle, wx.ID_ANY, "0", style=wx.TE_PROCESS_ENTER)
+        self.text_rect_angle.SetMinSize((40, -1))
         sizer_10.Add(self.text_rect_angle, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        label_17 = wx.StaticText(self.notebook_1_AddRectangle, wx.ID_ANY, u"\u00b0")
+        
+        label_17 = wx.StaticText(self.notebook_1_AddRectangle, wx.ID_ANY, u"°")
         sizer_10.Add(label_17, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         sizer_10.Add((20, 20), 1, 0, 0)
+        
+        self.button_draw_rect = wx.Button(self.notebook_1_AddRectangle, wx.ID_ANY, "Draw Rectangle")
+        self.button_draw_rect.SetDefault()
         sizer_10.Add(self.button_draw_rect, 0, 0, 0)
-        self.notebook_1_AddRectangle.SetSizer(sizer_10)
+        
+        self.notebook_1_circle = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_circle, "Add Circle")
+        
+        sizer_11 = wx.BoxSizer(wx.HORIZONTAL)
+        
         label_26 = wx.StaticText(self.notebook_1_circle, wx.ID_ANY, "center x")
         sizer_11.Add(label_26, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.text_circle_x = wx.TextCtrl(self.notebook_1_circle, wx.ID_ANY, "300", style=wx.TE_PROCESS_ENTER)
+        self.text_circle_x.SetMinSize((40, -1))
         sizer_11.Add(self.text_circle_x, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_27 = wx.StaticText(self.notebook_1_circle, wx.ID_ANY, "y")
         sizer_11.Add(label_27, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_circle_y = wx.TextCtrl(self.notebook_1_circle, wx.ID_ANY, "200", style=wx.TE_PROCESS_ENTER)
+        self.text_circle_y.SetMinSize((40, -1))
         sizer_11.Add(self.text_circle_y, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_28 = wx.StaticText(self.notebook_1_circle, wx.ID_ANY, "radius")
         sizer_11.Add(label_28, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
+        
+        self.text_circle_radius = wx.TextCtrl(self.notebook_1_circle, wx.ID_ANY, "10", style=wx.TE_PROCESS_ENTER)
+        self.text_circle_radius.SetMinSize((40, -1))
         sizer_11.Add(self.text_circle_radius, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_30 = wx.StaticText(self.notebook_1_circle, wx.ID_ANY, "pixels")
         sizer_11.Add(label_30, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         sizer_11.Add((20, 20), 1, 0, 0)
+        
+        self.button_draw_circle = wx.Button(self.notebook_1_circle, wx.ID_ANY, "Draw Circle")
+        self.button_draw_circle.SetDefault()
         sizer_11.Add(self.button_draw_circle, 0, 0, 0)
-        self.notebook_1_circle.SetSizer(sizer_11)
-        self.notebook_1.AddPage(self.notebook_1_line, "Add Line")
-        self.notebook_1.AddPage(self.notebook_1_AddRectangle, "Add Rectangle")
-        self.notebook_1.AddPage(self.notebook_1_circle, "Add Circle")
-        sizer_9.Add(self.notebook_1, 1, 0, 0)
-        sizer_6.Add(sizer_9, 1, wx.ALL, 3)
-        sizer_19.Add(sizer_6, 0, wx.EXPAND, 0)
+        
+        sizer_18 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_pane_1, wx.ID_ANY, "Colours etc"), wx.HORIZONTAL)
+        sizer_19.Add(sizer_18, 0, wx.EXPAND, 0)
+        
         label_20 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Line colour:")
         sizer_18.Add(label_20, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+        
+        self.combo_box_colour = wx.ComboBox(self.notebook_3_pane_1, wx.ID_ANY, choices=["black", "red", "green", "blue", "yellow"], style=wx.CB_DROPDOWN | wx.CB_READONLY)
+        self.combo_box_colour.SetToolTip("not yet implemented")
+        self.combo_box_colour.SetSelection(0)
         sizer_18.Add(self.combo_box_colour, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_18 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Line width:")
         sizer_18.Add(label_18, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 15)
+        
+        self.combo_box_line_width = wx.ComboBox(self.notebook_3_pane_1, wx.ID_ANY, choices=["0.1", "0.2", "0.5", "1", "2"], style=wx.CB_DROPDOWN | wx.CB_READONLY)
+        self.combo_box_line_width.SetMinSize((50, -1))
+        self.combo_box_line_width.SetToolTip("not yet implemented")
+        self.combo_box_line_width.SetSelection(3)
         sizer_18.Add(self.combo_box_line_width, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
         label_46 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "Line style:")
         sizer_18.Add(label_46, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 15)
+        
+        self.choice_line_style = wx.Choice(self.notebook_3_pane_1, wx.ID_ANY, choices=[" -  solid", " -- dashed", " -. dash dot", " :  dotted"])
+        self.choice_line_style.SetSelection(0)
         sizer_18.Add(self.choice_line_style, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_19.Add(sizer_18, 0, wx.EXPAND, 0)
-        self.notebook_3_pane_1.SetSizer(sizer_19)
+        
+        self.notebook_3_Shell = wx.Panel(self.notebook_3, wx.ID_ANY)
+        self.notebook_3.AddPage(self.notebook_3_Shell, "Shell")
+        
+        sizer_7 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_3_Shell, wx.ID_ANY, "Shell"), wx.VERTICAL)
+        
+        self.shell = wx.py.shell.Shell(self.notebook_3_Shell, wx.ID_ANY, introText = "\nThis is the shell.\nHave a look at the variables 'app', 'frame', 'canvas' and 'shell'.\n")
+        # insert some variables into the shell's locals
+        self.shell.interp.locals["frame"]  = self
+        self.shell.interp.locals["shell2"] = self.shell
+        self.shell.interp.locals["canvas"] = self.canvas
         sizer_7.Add(self.shell, 2, wx.EXPAND, 0)
+        
         self.notebook_3_Shell.SetSizer(sizer_7)
-        self.notebook_3.AddPage(self.notebook_3_pane_1, "GUI")
-        self.notebook_3.AddPage(self.notebook_3_Shell, "Shell")
-        sizer_1.Add(self.notebook_3, 1, wx.EXPAND, 0)
+        
+        self.notebook_1_circle.SetSizer(sizer_11)
+        
+        self.notebook_1_AddRectangle.SetSizer(sizer_10)
+        
+        self.notebook_1_line.SetSizer(sizer_5)
+        
+        self.notebook_2_circle.SetSizer(sizer_17)
+        
+        self.notebook_2_AddRectangle.SetSizer(sizer_16)
+        
+        self.notebook_2_line.SetSizer(sizer_15)
+        
+        self.notebook_3_pane_1.SetSizer(sizer_19)
+        
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+        
         self.Layout()
+
+        self.Bind(wx.EVT_CHOICE, self.on_choice_mouse_action, self.choice_mouse_action)
+        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_zoom_history("home"), self.button_zoom_hist_home)
+        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_zoom_history("back"), self.button_zoom_hist_back)
+        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_zoom_history("forward"), self.button_zoom_hist_forward)
+        self.Bind(wx.EVT_BUTTON, self.on_button_autoscale, self.button_autoscale)
+        self.Bind(wx.EVT_CHOICE, self.on_choice_canvas_size, self.choice_canvas_size)
+        self.Bind(wx.EVT_CHOICE, self.on_choice_subplots, self.choice_subplots)
+        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_clear("plots"), self.button_clear_plots)
+        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_clear("figures"), self.button_clear_figures)
+        self.Bind(wx.EVT_BUTTON, lambda e: self.on_button_clear("all"), self.button_clear_all)
+        self.Bind(wx.EVT_TOGGLEBUTTON, self.on_button_multicursor, self.button_multicursor)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot, self.text_function)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot, self.text_plot_xmin)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot, self.text_plot_xmax)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot, self.text_plot_xstep)
+        self.Bind(wx.EVT_CHOICE, self.on_choice_subplot, self.choice_subplot)
+        self.Bind(wx.EVT_BUTTON, self.on_button_plot, self.button_plot)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_line, self.text_plot_line_x0)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_line, self.text_plot_line_y0)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_line, self.text_plot_line_x1)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_line, self.text_plot_line_y1)
+        self.Bind(wx.EVT_BUTTON, self.on_button_plot_line, self.button_plot_line)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_rect, self.text_plot_rect_x)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_rect, self.text_plot_rect_y)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_rect, self.text_plot_rect_width)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_rect, self.text_plot_rect_height)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_rect, self.text_plot_rect_angle)
+        self.Bind(wx.EVT_BUTTON, self.on_button_plot_rect, self.button_plot_rect)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_circle, self.text_plot_circle_x)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_circle, self.text_plot_circle_y)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_plot_circle, self.text_plot_circle_radius)
+        self.Bind(wx.EVT_BUTTON, self.on_button_plot_circle, self.button_plot_circle)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_line, self.text_line_x0)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_line, self.text_line_y0)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_line, self.text_line_x1)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_line, self.text_line_y1)
+        self.Bind(wx.EVT_BUTTON, self.on_button_draw_line, self.button_draw_line)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_rect, self.text_rect_x)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_rect, self.text_rect_y)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_rect, self.text_rect_width)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_rect, self.text_rect_height)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_rect, self.text_rect_angle)
+        self.Bind(wx.EVT_BUTTON, self.on_button_draw_rect, self.button_draw_rect)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_circle, self.text_circle_x)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_circle, self.text_circle_y)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_button_draw_circle, self.text_circle_radius)
+        self.Bind(wx.EVT_BUTTON, self.on_button_draw_circle, self.button_draw_circle)
+        self.Bind(wx.EVT_COMBOBOX, self.on_combo_colour, self.combo_box_colour)
+        self.Bind(wx.EVT_TEXT, self.on_combo_colour, self.combo_box_colour)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_combo_colour, self.combo_box_colour)
+        self.Bind(wx.EVT_COMBOBOX, self.on_combo_line_width, self.combo_box_line_width)
+        self.Bind(wx.EVT_TEXT, self.on_combo_line_width, self.combo_box_line_width)
+        self.Bind(wx.EVT_TEXT_ENTER, self.on_combo_line_width, self.combo_box_line_width)
+        self.Bind(wx.EVT_CHOICE, self.on_choice_line_style, self.choice_line_style)
         # end wxGlade
 
     def on_file_save(self, event):  # wxGlade: MyFrame.<event_handler>
diff -Nru wxglade-0.9.6/examples/py_shell/py_shell_example.py wxglade-1.0.1/examples/py_shell/py_shell_example.py
--- wxglade-0.9.6/examples/py_shell/py_shell_example.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/py_shell/py_shell_example.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,34 +17,31 @@
 class MyFrame(wx.Frame):
     def __init__(self, *args, **kwds):
         # begin wxGlade: MyFrame.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.panel_1 = wx.Panel(self, wx.ID_ANY)
-        self.text_ctrl = wx.TextCtrl(self.panel_1, wx.ID_ANY, "This is text_ctrl.\n\nUse the shell to append text here.\nE.g. enter this:\napp.frame.text_ctrl.AppendText(\"text\")\n\n", style=wx.TE_MULTILINE | wx.TE_READONLY)
-        self.shell = wx.py.shell.Shell(self.panel_1, wx.ID_ANY, introText = "\nThis is the shell.\nHave a look at the variables 'app' and 'app.frame'.\n\n")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
+        self.SetSize((800, 379))
         self.SetTitle("frame")
-        self.text_ctrl.SetMinSize((200, 10))
-        self.text_ctrl.SetBackgroundColour(wx.Colour(192, 192, 192))
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
+        
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
+        
+        self.text_ctrl = wx.TextCtrl(self.panel_1, wx.ID_ANY, "This is text_ctrl.\n\nUse the shell to append text here.\nE.g. enter this:\napp.frame.text_ctrl.AppendText(\"line of text\\n\")\n", style=wx.TE_MULTILINE | wx.TE_READONLY)
+        self.text_ctrl.SetMinSize((200, 10))
+        self.text_ctrl.SetBackgroundColour(wx.Colour(192, 192, 192))
         sizer_2.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 1)
+        
+        self.shell = wx.py.shell.Shell(self.panel_1, wx.ID_ANY, introText = "\nThis is the shell.\nHave a look at the variables 'app' and 'app.frame'.\n\n")
         sizer_2.Add(self.shell, 2, wx.EXPAND, 0)
+        
         self.panel_1.SetSizer(sizer_2)
-        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
         self.SetSizer(sizer_1)
+        
         self.Layout()
-        self.SetSize((800, 379))
         # end wxGlade
 
 # end of class MyFrame
diff -Nru wxglade-0.9.6/examples/README.txt wxglade-1.0.1/examples/README.txt
--- wxglade-0.9.6/examples/README.txt	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/README.txt	2020-12-31 14:04:48.000000000 +0000
@@ -2,6 +2,8 @@
 
 AllWidgets:  examples showing most of the supported controls for wxPython 2.8 and >=3.0
 
+dialog:      use a dialog created with wxGlade
+
 html:        use wx.html.HtmlWindow to display simple HTML pages
 html2:       use wx.html2.WebView to display HTML with Javascript and CSS
              (not available on wxPython 2.8)
diff -Nru wxglade-0.9.6/examples/simplebook/simplebook.py wxglade-1.0.1/examples/simplebook/simplebook.py
--- wxglade-0.9.6/examples/simplebook/simplebook.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/simplebook/simplebook.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
-# generated by wxGlade 0.9.5 on Wed Apr 29 21:00:24 2020
+# generated by wxGlade 0.9.9pre on Wed Apr 29 22:08:08 2020
 #
 
 import wx
@@ -18,40 +18,40 @@
         # begin wxGlade: MySimplebook.__init__
         kwds["style"] = kwds.get("style", 0) | wx.NB_TOP
         wx.Simplebook.__init__(self, *args, **kwds)
+        
         self.notebook_1_pane_1 = wx.Panel(self, wx.ID_ANY)
-        self.button_1 = wx.Button(self.notebook_1_pane_1, wx.ID_ANY, "Show page 2")
-        self.notebook_1_notebook_1_pane_2 = wx.Panel(self, wx.ID_ANY)
-        self.button_2 = wx.Button(self.notebook_1_notebook_1_pane_2, wx.ID_ANY, "Show page 1")
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_BUTTON, lambda event: self.ChangeSelection(1), self.button_1)
-        self.Bind(wx.EVT_BUTTON, lambda event: self.ChangeSelection(0), self.button_2)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MySimplebook.__set_properties
         self.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
-        self.AddPage(self.notebook_1_notebook_1_pane_2, "notebook_1_pane_2")
-        self.button_1.SetFont(wx.Font(16, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
-        self.button_2.SetFont(wx.Font(16, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MySimplebook.__do_layout
-        sizer_3 = wx.BoxSizer(wx.VERTICAL)
+        
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
+        
         label_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, "Page 1 of Simplebook")
         label_1.SetFont(wx.Font(20, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         sizer_2.Add(label_1, 0, wx.ALIGN_CENTER | wx.ALL, 20)
+        
+        self.button_1 = wx.Button(self.notebook_1_pane_1, wx.ID_ANY, "Show page 2")
+        self.button_1.SetFont(wx.Font(16, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         sizer_2.Add(self.button_1, 1, wx.ALL | wx.EXPAND, 20)
-        self.notebook_1_pane_1.SetSizer(sizer_2)
+        
+        self.notebook_1_notebook_1_pane_2 = wx.Panel(self, wx.ID_ANY)
+        self.AddPage(self.notebook_1_notebook_1_pane_2, "notebook_1_pane_2")
+        
+        sizer_3 = wx.BoxSizer(wx.VERTICAL)
+        
         label_2 = wx.StaticText(self.notebook_1_notebook_1_pane_2, wx.ID_ANY, "Page 2 of Simplebook")
         label_2.SetFont(wx.Font(20, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         sizer_3.Add(label_2, 0, wx.ALIGN_CENTER | wx.ALL, 20)
+        
+        self.button_2 = wx.Button(self.notebook_1_notebook_1_pane_2, wx.ID_ANY, "Show page 1")
+        self.button_2.SetFont(wx.Font(16, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         sizer_3.Add(self.button_2, 1, wx.ALL | wx.EXPAND, 20)
+        
         self.notebook_1_notebook_1_pane_2.SetSizer(sizer_3)
+        
+        self.notebook_1_pane_1.SetSizer(sizer_2)
+        
+
+        self.Bind(wx.EVT_BUTTON, lambda event: self.ChangeSelection(1), self.button_1)
+        self.Bind(wx.EVT_BUTTON, lambda event: self.ChangeSelection(0), self.button_2)
         # end wxGlade
 
 # end of class MySimplebook
@@ -62,22 +62,15 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((400, 300))
-        self.simplebook_1 = MySimplebook(self, wx.ID_ANY)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle("frame")
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
+        
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        
+        self.simplebook_1 = MySimplebook(self, wx.ID_ANY)
         sizer_1.Add(self.simplebook_1, 1, wx.EXPAND, 0)
+        
         self.SetSizer(sizer_1)
+        
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/examples/SpeedMeter/speed_meter_example.py wxglade-1.0.1/examples/SpeedMeter/speed_meter_example.py
--- wxglade-0.9.6/examples/SpeedMeter/speed_meter_example.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/SpeedMeter/speed_meter_example.py	2020-12-31 14:04:48.000000000 +0000
@@ -22,7 +22,15 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 349))
+        self.SetTitle("wx.lib.agw.speedmeter example")
+        
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        
         self.panel_1 = wx.Panel(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
+        sizer_2 = wx.BoxSizer(wx.VERTICAL)
         
         #################################################################
         # the custom widget SpeedMeter:
@@ -48,18 +56,6 @@
         # Try To Comment This Line And See It For Yourself!
         self.speed_meter.DrawExternalArc(False)
         #################################################################
-        
-        self.slider_1 = wx.Slider(self.panel_1, wx.ID_ANY, 44, 0, 200)
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_COMMAND_SCROLL, lambda event: self.speed_meter.SetSpeedValue(event.GetEventObject().GetValue()), self.slider_1)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("wx.lib.agw.speedmeter example")
         self.speed_meter.SetAngleRange(-pi/6, 7*pi/6)
         self.speed_meter.SetHandColour(wx.Colour(255, 50, 0))
         self.speed_meter.SetIntervalColours([wx.BLACK]*10)
@@ -69,23 +65,24 @@
         self.speed_meter.SetSpeedValue(44)
         self.speed_meter.SetTicksColour(wx.WHITE)
         self.speed_meter.SetTicksFont(wx.Font(10, wx.FONTFAMILY_SWISS, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.VERTICAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_2.Add(self.speed_meter, 1, wx.ALL | wx.EXPAND, 3)
+        
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_3, 0, wx.EXPAND, 0)
+        
         label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "Drag this:")
         sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.slider_1 = wx.Slider(self.panel_1, wx.ID_ANY, 44, 0, 200)
         sizer_3.Add(self.slider_1, 1, wx.EXPAND, 0)
-        sizer_2.Add(sizer_3, 0, wx.EXPAND, 0)
+        
         self.panel_1.SetSizer(sizer_2)
-        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        
         self.SetSizer(sizer_1)
+        
         self.Layout()
-        self.SetSize((400, 349))
+
+        self.Bind(wx.EVT_COMMAND_SCROLL, lambda event: self.speed_meter.SetSpeedValue(event.GetEventObject().GetValue()), self.slider_1)
         # end wxGlade
 
 # end of class MyFrame
diff -Nru wxglade-0.9.6/examples/SpeedMeter/speed_meter_example.wxg wxglade-1.0.1/examples/SpeedMeter/speed_meter_example.wxg
--- wxglade-0.9.6/examples/SpeedMeter/speed_meter_example.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/examples/SpeedMeter/speed_meter_example.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.0b1 on Sat Dec 23 22:10:03 2017 -->
+<!-- generated by wxGlade 0.9.9pre on Sat Jan 18 19:15:48 2020 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="0" path="speed_meter_example.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="0" path="speed_meter_example.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="MyFrame" name="frame" base="EditFrame">
         <size>400, 349</size>
         <title>wx.lib.agw.speedmeter example</title>
@@ -21,8 +21,8 @@
                             <flag>wxALL|wxEXPAND</flag>
                             <object class="SM.SpeedMeter" name="speed_meter" base="CustomWidget">
                                 <extracode>import wx.lib.agw.speedmeter as SM\n\n# import these on module level to use them in the Extra Properties\nfrom math import pi, sqrt\n</extracode>
-                                <extracode_pre>\n#################################################################\n# the custom widget SpeedMeter:\n# we use the following styles:\n# SM_DRAW_HAND: We Want To Draw The Hand (Arrow) Indicator\n# SM_DRAW_SECTORS: Full Sectors Will Be Drawn, To Indicate Different Intervals\n# SM_DRAW_MIDDLE_TEXT: We Draw Some Text In The Center Of SpeedMeter\n# SM_DRAW_SECONDARY_TICKS: We Draw Secondary (Intermediate) Ticks Between the Main Ticks (Intervals)\n</extracode_pre>
-                                <extracode_post># see also extra properties\n\nintervals = list(range(0, 201, 20))\nself.speed_meter.SetIntervals(intervals)\n\nself.speed_meter.SetIntervalColours([wx.BLACK]*10)\n\n# Assign The Ticks: Here They Are Simply The String Equivalent Of The Intervals\nticks = [str(interval) for interval in intervals]\nself.speed_meter.SetTicks(ticks)\n\n# Do Not Draw The External (Container) Arc.\n# Drawing The External Arc May Sometimes Create Uglier Controls.\n# Try To Comment This Line And See It For Yourself!\nself.speed_meter.DrawExternalArc(False)\n#################################################################\n\n</extracode_post>
+                                <extracode_pre>#################################################################\n# the custom widget SpeedMeter:\n# we use the following styles:\n# SM_DRAW_HAND: We Want To Draw The Hand (Arrow) Indicator\n# SM_DRAW_SECTORS: Full Sectors Will Be Drawn, To Indicate Different Intervals\n# SM_DRAW_MIDDLE_TEXT: We Draw Some Text In The Center Of SpeedMeter\n# SM_DRAW_SECONDARY_TICKS: We Draw Secondary (Intermediate) Ticks Between the Main Ticks (Intervals)\n</extracode_pre>
+                                <extracode_post># see also extra properties\n\nintervals = list(range(0, 201, 20))\nself.speed_meter.SetIntervals(intervals)\n\nself.speed_meter.SetIntervalColours([wx.BLACK]*10)\n\n# Assign The Ticks: Here They Are Simply The String Equivalent Of The Intervals\nticks = [str(interval) for interval in intervals]\nself.speed_meter.SetTicks(ticks)\n\n# Do Not Draw The External (Container) Arc.\n# Drawing The External Arc May Sometimes Create Uglier Controls.\n# Try To Comment This Line And See It For Yourself!\nself.speed_meter.DrawExternalArc(False)\n#################################################################</extracode_post>
                                 <extraproperties>
                                     <property name="AngleRange">-pi/6, 7*pi/6</property>
                                     <property name="IntervalColours">[wx.BLACK]*10</property>
diff -Nru wxglade-0.9.6/font_dialog.py wxglade-1.0.1/font_dialog.py
--- wxglade-0.9.6/font_dialog.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/font_dialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -13,6 +13,7 @@
 
 
 class wxGladeFontDialog(wx.Dialog):
+    # keep this in sync with new_properties.FontProperty
     font_families_to = { 'default': wx.FONTFAMILY_DEFAULT, 'decorative': wx.FONTFAMILY_DECORATIVE,
                          'roman': wx.FONTFAMILY_ROMAN, 'swiss': wx.FONTFAMILY_SWISS,
                          'script':wx.FONTFAMILY_SCRIPT, 'modern': wx.FONTFAMILY_MODERN }
@@ -28,7 +29,6 @@
     font_families_from[wx.FONTFAMILY_TELETYPE] = 'teletype'
 
     def __init__(self, *args, **kwds):
-        self._logger = logging.getLogger(self.__class__.__name__)
         kwds["style"] = wx.DEFAULT_DIALOG_STYLE
         wx.Dialog.__init__(self, *args, **kwds)
         self.label_2_copy = wx.StaticText(self, -1, _("Family:"))
@@ -52,7 +52,17 @@
         self.ok_btn.Bind(wx.EVT_BUTTON, self.on_ok)
 
     def choose_specific_font(self, event):
-        dialog = wx.FontDialog(self, wx.FontData())
+        data = wx.FontData()
+        try:
+            family = self.font_families_to[self.value[1]]
+            style = self.font_styles_to[self.value[2]]
+            weight = self.font_weights_to[self.value[3]]
+            font = wx.Font( self.value[0], family, style, weight, self.value[4], self.value[5] )
+            data.SetInitialFont(font)
+        except AttributeError:
+            pass
+
+        dialog = wx.FontDialog(self, data)
         res = dialog.ShowModal()
         font = dialog.GetFontData().GetChosenFont()
         dialog.Destroy()
@@ -81,6 +91,7 @@
         return self.value
 
     def set_value(self, props):
+        self.value = props[:]
         self.family.SetStringSelection(props[1].capitalize())
         self.style.SetStringSelection(props[2].capitalize())
         self.weight.SetStringSelection(props[3].capitalize())
@@ -94,7 +105,7 @@
             self.point_size.SetValue(int(props[0]))
             self.point_size.SetSelection(-1,-1)
         except ValueError:
-            self._logger.exception(_('Internal Error'))
+            logging.exception(_('Internal Error'))
 
     def __set_properties(self):
         self.SetTitle(_("Select font attributes"))
diff -Nru wxglade-0.9.6/.gitignore wxglade-1.0.1/.gitignore
--- wxglade-0.9.6/.gitignore	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/.gitignore	2020-12-31 14:04:48.000000000 +0000
@@ -9,6 +9,7 @@
 bdist
 build
 dist
+/wxGlade.egg-info
 
 # build related files
 logdict*.log
@@ -26,8 +27,11 @@
 # automatically generated version file
 version.py
 wxgladeDS.py
-tests/generated/*.*
+/tests/generated/*
 sphinx/images/*.*
-tests/generated/PythonSubclass/PythonSubclass.py
 docs/doctrees/*.*
 docs/html/_sources/*.*
+/tests/test_bugs_new_38-64.py
+/tests/test_gui_new_38-64.py
+*.xpm
+*.xcf
diff -Nru wxglade-0.9.6/gui_mixins.py wxglade-1.0.1/gui_mixins.py
--- wxglade-0.9.6/gui_mixins.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/gui_mixins.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,7 +2,7 @@
 Different Mixins
 
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2017-2018 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -208,9 +208,23 @@
                       "focus_bitmap":   "Bitmap to be shown when the widget has the keyboard focus."}
     _NAMES = ( ("disabled_bitmap", "Disabled"), ("pressed_bitmap", "Pressed"),
                ("current_bitmap", "Current"),   ("focus_bitmap", "Focus") )
+
     def __init__(self):
-        self.bitmap_reference = None # size of reference bitmap
+        self._reference_bitmap_size = None # size of reference bitmap
+
+    # interface for drag'n'drop of bitmap files ========================================================================
+    def check_compatibility(self, widget, typename=None):
+        # only with slots before/after
+        if typename=="bitmap":
+            return (True, None)
+        return super(BitmapMixin, self).check_compatibility(widget, typename)
+
+    def set_attribute(self, fmt, bitmap):
+        if fmt!="file.bitmap": return
+        prop = "bitmap" if "bitmap" in self.PROPERTIES else "icon"
+        self.properties[prop].on_drop_file(bitmap)  # set relative path
 
+    # helpers ==========================================================================================================
     def _check_bitmaps(self, modified=None):
         # check that "bitmap" is defined if any other is defined
         # check that all have the same size as "bitmap"
@@ -219,28 +233,28 @@
             p = self.properties[p_name]
             if p.is_active():
                 active.append( (p,name) )
-        if not active: return
-        normal_p = self.properties["bitmap"]
-        warn = False
-        if not normal_p.is_active() or normal_p._error:
+
+        set_size = self.widget and self.widget.Size!=self.widget.GetBestSize() or False
+
+        if active:
+            normal_p = self.properties["bitmap"]
+            warn = False
+            if not normal_p.is_active() or normal_p._error:
+                for p, name in active:
+                    p.set_check_result(warning="'Bitmap' property must be set first")
+                    if modified and p.name in modified: warn = True  # show a dialog
+                if warn:
+                    logging.warning("'Bitmap' property must be set first")
+                return
+            # normal is set and has no error -> check sizes
+            if not self.widget: return
+            ref_size = normal_p._size
             for p, name in active:
-                p.set_check_result(warning="'Bitmap' property must be set first")
-                if modified and p.name in modified: warn = True  # show a dialog
-            if warn:
-                self._logger.warning("'Bitmap' property must be set first")
-            return
-        # normal is set and has no error -> check sizes
-        if not self.widget: return
-        ref_size = normal_p._size
-        set_size = False
-        for p, name in active:
-            method = getattr(self.widget, "GetBitmap%s"%name, None)
-            if method is None: continue
-            current = method()
-            if not current.IsOk() or current.Size != ref_size or (modified and p.name in modified):
-                self._set_preview_bitmap(p, name, ref_size)
-        if set_size or not modified or "bitmap" in modified:
-            self._set_widget_best_size()
+                method = getattr(self.widget, "GetBitmap%s"%name, None)
+                if method is None: continue
+                current = method()
+                if not current.IsOk() or current.Size != ref_size or (modified and p.name in modified):
+                    self._set_preview_bitmap(p, name, ref_size)
 
     def _set_preview_bitmap(self, prop, name, ref_size=None):
         if not config.use_gui:
@@ -267,12 +281,11 @@
 
     def _set_preview_bitmaps(self):#, include_bitmap=True):
         # set bitmaps after the widget has been created
-        self.widget._bitmap_size = None
         if self.bitmap:
             self._set_preview_bitmap(self.properties["bitmap"], "")
         self._check_bitmaps()
 
-    def _properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if "bitmap" in modified:
             # set normal bitmap here; the others will be set in _check_bitmaps
             self._set_preview_bitmap(self.properties["bitmap"], "")
@@ -327,7 +340,7 @@
                 raise ValueError
 
         except (ValueError, TypeError):
-            self._logger.warn( 'Malformed statement to create a bitmap via wxArtProvider(): %s', bitmap )
+            logging.warn( 'Malformed statement to create a bitmap via wxArtProvider(): %s', bitmap )
 
         # show wx art resources only
         if not art_id.startswith('wx'):     art_id     = 'wxART_HELP'
@@ -349,5 +362,5 @@
             size = bitmap[6:]
             width, height = [int(item.strip()) for item in size.split(',', 1)]
         except ValueError:
-            self._logger.warn( 'Malformed statement to create an empty bitmap: %s', bitmap )
+            logging.warn( 'Malformed statement to create an empty bitmap: %s', bitmap )
         return compat.wx_EmptyBitmap( max(1,width), max(1,height) )
diff -Nru wxglade-0.9.6/history.py wxglade-1.0.1/history.py
--- wxglade-0.9.6/history.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/history.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 """\
 history for undo/redo/repeat
 
-copyright: 2017-2018 Dietmar Schwertberger
+copyright: 2017-2020 Dietmar Schwertberger
 license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -18,8 +18,7 @@
 
 class HistoryItem(object):
     def __init__(self, prop):
-        path = common.app_tree.get_widget_path(prop.owner)
-        self.path = path
+        self.path = prop.owner.get_path()
         self.name = prop.name
     def get_key(self):
         return self.name
@@ -59,7 +58,7 @@
 
     def set_widget(self, widget):
         # for enabling/disabling tools and menus
-        path = common.app_tree.get_widget_path(widget)
+        path = widget and widget.get_path() or []
         if path==self._redo_widget or self._redo_widget is None:
             self.can_repeat = self.can_redo = False
         else:
@@ -79,7 +78,7 @@
         if focused_widget is None: return
         if not self.actions or not isinstance(self.actions[0], HistoryPropertyItem): return
         if not self._redo_widget: return
-        path = common.app_tree.get_widget_path(focused_widget)
+        path = focused_widget.get_path()
         if path==self._redo_widget: return
 
         # find all actions that could be repeated; they need to be HistoryPropertyItems from the _redo_widget
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/application.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/application.png differ
diff -Nru wxglade-0.9.6/icons/application.xpm wxglade-1.0.1/icons/application.xpm
--- wxglade-0.9.6/icons/application.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/application.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* XPM */
-static char * application_xpm[] = {
-"21 21 6 1",
-" 	c None",
-".	c #848284",
-"+	c #000084",
-"@	c #C6C3C6",
-"#	c #000000",
-"$	c #FFFFFF",
-"                     ",
-"                     ",
-"     .............   ",
-"     .+++++++++++@#  ",
-"     .+++++++++++@#  ",
-"     .$$$$$$$$$$$@#  ",
-"  .............$$@#  ",
-"  .+++++++++++@#$@#  ",
-"  .+++++++++++@#$@#  ",
-"  .$$$$$$$$$$$@#$@#  ",
-"  .$$$$$$$$$$$@#$@#  ",
-"  .$$$$$$$$$$$@#$@#  ",
-"  .$$$$$$$$$$$@#@@#  ",
-"  .$$$$$$$$$$$@####  ",
-"  .$$$$$$$$$$$@#     ",
-"  .$$$$$$$$$$$@#     ",
-"  .@@@@@@@@@@@@#     ",
-"   #############     ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/bitmap_button.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/bitmap_button.png differ
diff -Nru wxglade-0.9.6/icons/bitmap_button.xpm wxglade-1.0.1/icons/bitmap_button.xpm
--- wxglade-0.9.6/icons/bitmap_button.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/bitmap_button.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/* XPM */
-static char * bitmap_button_xpm[] = {
-"21 21 46 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"@	c #D6D6D6",
-"#	c #7B7B7B",
-"$	c #40FFFF",
-"%	c #7FFFFF",
-"&	c #60FFFF",
-"*	c #38F7F7",
-"=	c #C2E2E2",
-"-	c #C6E6E6",
-";	c #00FFFF",
-">	c #2ECECE",
-",	c #20FFFF",
-"'	c #30FFFF",
-")	c #2AF9F9",
-"!	c #A6E6E6",
-"~	c #BECD3E",
-"{	c #8FFFFF",
-"]	c #1FAEAE",
-"^	c #36C5C5",
-"/	c #2ECDCD",
-"(	c #BECE3E",
-"_	c #4D4D4D",
-":	c #8ECECE",
-"<	c #4ECDCD",
-"[	c #009F9F",
-"}	c #172727",
-"|	c #1F1F1F",
-"1	c #10FFFF",
-"2	c #008080",
-"3	c #A0A0A0",
-"4	c #AEAEDE",
-"5	c #00BD80",
-"6	c #005F40",
-"7	c #8686E5",
-"8	c #00DE00",
-"9	c #006F00",
-"0	c #3636F5",
-"a	c #00FF00",
-"b	c #008000",
-"c	c #787878",
-"d	c #7878A8",
-"e	c #0000BF",
-"f	c #00BF00",
-"g	c #007F00",
-"                     ",
-"                     ",
-"                     ",
-" ..................+ ",
-" .@@@@@@@@@@@@@@@@#+ ",
-" .@$%&*=-$&;;>>;@@#+ ",
-" .@,$';)!;';>~~>@@#+ ",
-" .@;{{;;]#^'/((/@@#+ ",
-" .@$;;;>_##:;/<$@@#+ ",
-" .@,;;[}|||}[;1,@@#+ ",
-" .@;;;234@432;;;@@#+ ",
-" .@555637@736555@@#+ ",
-" .@8889340439888@@#+ ",
-" .@aaabcdedcbaaa@@#+ ",
-" .@aaafgggggfaaa@@#+ ",
-" .@@@@@@@@@@@@@@@@#+ ",
-" .#################+ ",
-" +++++++++++++++++++ ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/button.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/button.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/button_sizer.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/button_sizer.png differ
diff -Nru wxglade-0.9.6/icons/button.xpm wxglade-1.0.1/icons/button.xpm
--- wxglade-0.9.6/icons/button.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/button.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/* XPM */
-static char * button_xpm[] = {
-"21 21 5 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"@	c #D6D6D6",
-"#	c #7B7B7B",
-"                     ",
-"                     ",
-"                     ",
-" ..................+ ",
-" .@@@@@@@@@@@@@@@@#+ ",
-" .@@@@@@@@@@@@@@@@#+ ",
-" .@@@@@@@@@@@@@@@@#+ ",
-" .@@@@++@@+@@+@@@@#+ ",
-" .@@@+@@+@+@+@@@@@#+ ",
-" .@@@+@@+@++@@@@@@#+ ",
-" .@@@+@@+@+@+@@@@@#+ ",
-" .@@@+@@+@+@@+@@@@#+ ",
-" .@@@@++@@+@@+@@@@#+ ",
-" .@@@@@@@@@@@@@@@@#+ ",
-" .@@@@@@@@@@@@@@@@#+ ",
-" .@@@@@@@@@@@@@@@@#+ ",
-" .#################+ ",
-" +++++++++++++++++++ ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/calendar_ctrl.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/calendar_ctrl.png differ
diff -Nru wxglade-0.9.6/icons/calendar_ctrl.xpm wxglade-1.0.1/icons/calendar_ctrl.xpm
--- wxglade-0.9.6/icons/calendar_ctrl.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/calendar_ctrl.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/* XPM */
-static char * calendar_ctrl_xpm[] = {
-"21 21 8 1",
-" 	c None",
-".	c #000000",
-"+	c #BFBFBF",
-"@	c #FEFEFE",
-"#	c #8E8ED1",
-"$	c #FFFFFF",
-"%	c #FF8080",
-"&	c #FFF1F1",
-"                     ",
-"                     ",
-".....................",
-".+++++++++++++++++++.",
-".+@@++@@+++++@@@@@@+.",
-".+++++++++++++++++++.",
-".....................",
-".###################.",
-".$$$$$$$$$$$$$$$$$$$.",
-".$$$$$##$$##$$##$%%$.",
-".$$$$$##$$##$$##$%%$.",
-".$$$$$$$$$$$$$$$$$&$.",
-".$##$$##$$##$$##$%%$.",
-".$##$$##$$##$$##$%%$.",
-".$$$$$$$$$$$$$$$$$$$.",
-".$##$$##$$##$$##$$$$.",
-".$##$$##$$##$$##$$$$.",
-".$$$$$$$$$$$$$$$$$$$.",
-".....................",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/checkbox.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/checkbox.png differ
diff -Nru wxglade-0.9.6/icons/checkbox.xpm wxglade-1.0.1/icons/checkbox.xpm
--- wxglade-0.9.6/icons/checkbox.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/checkbox.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/* XPM */
-static char * checkbox_xpm[] = {
-"21 21 5 1",
-" 	c None",
-".	c #848284",
-"+	c #FFFFFF",
-"@	c #000000",
-"#	c #C6C3C6",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"    ............+    ",
-"    .@@@@@@@@@@#+    ",
-"    .@+++++++++#+    ",
-"    .@+++++++@+#+    ",
-"    .@++++++@@+#+    ",
-"    .@+@+++@@@+#+    ",
-"    .@+@@+@@@++#+    ",
-"    .@+@@@@@+++#+    ",
-"    .@++@@@++++#+    ",
-"    .@+++@+++++#+    ",
-"    .@+++++++++#+    ",
-"    .###########+    ",
-"    +++++++++++++    ",
-"                     ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/choice.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/choice.png differ
diff -Nru wxglade-0.9.6/icons/choice.xpm wxglade-1.0.1/icons/choice.xpm
--- wxglade-0.9.6/icons/choice.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/choice.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/* XPM */
-static char * choice_xpm[] = {
-"21 21 24 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"@	c #D5D5D5",
-"#	c #7C7C7C",
-"$	c #040404",
-"%	c #D6D6D6",
-"&	c #171717",
-"*	c #D4D4D4",
-"=	c #E2E2E2",
-"-	c #101010",
-";	c #0C0C0C",
-">	c #D8D8D8",
-",	c #131313",
-"'	c #D7D7D7",
-")	c #D2D2D2",
-"!	c #FBFBFB",
-"~	c #070707",
-"{	c #111111",
-"]	c #010101",
-"^	c #1B1B1B",
-"/	c #090909",
-"(	c #0F0F0F",
-"_	c #0A0A0A",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"....................+",
-".@@@@@@@@@@@@@@@@@@#$",
-".@@@@@@@@@@@@@@@@@@#$",
-".%@@@@@@@@@@@@@@@@@#+",
-".%@@@@@@@@@@@@@@@@@#&",
-".%@@@@@@@@*@@...@@@#+",
-".%@@@@@@@@@@@.==-@@#+",
-".%@@@@@@@@@@@@+++@@#;",
-".%@@@@@@@@@@@@@@@@@#+",
-".%@@@@@@@@@@>%@@@@@#,",
-".%@'%@@@@@@@@@@*')@#+",
-"!@@@@@@@%%%%%@@@@@@#+",
-".###################~",
-"++{]^+]++++++++/+++(_",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/closed_folder.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/closed_folder.png differ
diff -Nru wxglade-0.9.6/icons/closed_folder.xpm wxglade-1.0.1/icons/closed_folder.xpm
--- wxglade-0.9.6/icons/closed_folder.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/closed_folder.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-/* XPM */
-static char * closed_folder_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #808080",
-"+	c #FFFF00",
-"@	c #C0C0C0",
-"#	c #FFFFFF",
-"$	c #000000",
-"                ",
-"                ",
-"   .....        ",
-"  .+@+@+.       ",
-" .+@+@+@+...... ",
-" .############.$",
-" .#+@+@+@+@+@+.$",
-" .#@+@+@+@+@+@.$",
-" .#+@+@+@+@+@+.$",
-" .#@+@+@+@+@+@.$",
-" .#+@+@+@+@+@+.$",
-" .#@+@+@+@+@+@.$",
-" .#+@+@+@+@+@+.$",
-" ..............$",
-"  $$$$$$$$$$$$$$",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/color_picker.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/color_picker.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/combo_box.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/combo_box.png differ
diff -Nru wxglade-0.9.6/icons/combo_box.xpm wxglade-1.0.1/icons/combo_box.xpm
--- wxglade-0.9.6/icons/combo_box.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/combo_box.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/* XPM */
-static char * combo_box_xpm[] = {
-"21 21 5 1",
-" 	c None",
-".	c #848284",
-"+	c #000000",
-"@	c #C6C3C6",
-"#	c #FFFFFF",
-"                     ",
-"                     ",
-".....................",
-".+++++++++++++++++++@",
-".+#####@@@@@@@@@@@@+@",
-".+#####@##########.+@",
-".+#####@#@@@@@@@@@.+@",
-".+#####@#@@@@@@@@@.+@",
-".+#####@#@@@@@@@@@.+@",
-".+#####@#@++++++.@.+@",
-".+#####@#@@++++.@@.+@",
-".+#####@#@@@++.@@@.+@",
-".+#####@#@@@@.@@@@.+@",
-".+#####@#@@@@@@@@@.+@",
-".+#####@#@@@@@@@@@.+@",
-".+#####@#@@@@@@@@@.+@",
-".+#####@...........+@",
-".+#####+++++++++++++@",
-".@@@@@@@@@@@@@@@@@@@@",
-"#####################",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/custom.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/custom.png differ
diff -Nru wxglade-0.9.6/icons/custom.xpm wxglade-1.0.1/icons/custom.xpm
--- wxglade-0.9.6/icons/custom.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/custom.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/* XPM */
-static char * custom_xpm[] = {
-"21 21 15 1",
-" 	c None",
-".	c #7B7B7B",
-"+	c #000000",
-"@	c #FFFFFF",
-"#	c #DEDEDE",
-"$	c #D6D6D6",
-"%	c #E38E8E",
-"&	c #DFA7A7",
-"*	c #FF0000",
-"=	c #F52F2F",
-"-	c #DABEBE",
-";	c #F14747",
-">	c #FA1818",
-",	c #EC5F5F",
-"'	c #E87777",
-"                     ",
-" ................... ",
-" .++++++++++++++++@# ",
-" .+$$$$$$$$$$$$$$$@# ",
-" .+$$$$$$$$$$$$$$$@# ",
-" .+$$$$$$%%&$$$$$$@# ",
-" .+$$$$%****=-$$$$@# ",
-" .+$$$-**&$%*=$$$$@# ",
-" .+$$$-%&$$$**$$$$@# ",
-" .+$$$$$$$$;*=$$$$@# ",
-" .+$$$$$$$;*>-$$$$@# ",
-" .+$$$$$$,*=$$$$$$@# ",
-" .+$$$$$$;*%$$$$$$@# ",
-" .+$$$$$$&%-$$$$$$@# ",
-" .+$$$$$$;*%$$$$$$@# ",
-" .+$$$$$$';&$$$$$$@# ",
-" .+$$$$$$$$$$$$$$$@# ",
-" .+$$$$$$$$$$$$$$$@# ",
-" .@@@@@@@@@@@@@@@@@# ",
-" .################## ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/datepicker_ctrl.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/datepicker_ctrl.png differ
diff -Nru wxglade-0.9.6/icons/datepicker_ctrl.xpm wxglade-1.0.1/icons/datepicker_ctrl.xpm
--- wxglade-0.9.6/icons/datepicker_ctrl.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/datepicker_ctrl.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/* XPM */
-static char * datepicker_ctrl_xpm[] = {
-"21 21 24 1",
-" 	c None",
-".	c #000000",
-"+	c #060608",
-"@	c #000002",
-"#	c #020202",
-"$	c #010101",
-"%	c #080808",
-"&	c #131313",
-"*	c #FFFFFF",
-"=	c #F7F7F7",
-"-	c #FDFDFD",
-";	c #FCFCFC",
-">	c #787878",
-",	c #C6C3C6",
-"'	c #FBFBFB",
-")	c #0C0C0C",
-"!	c #090909",
-"~	c #BFBFBF",
-"{	c #0B0B0B",
-"]	c #0A0A0A",
-"^	c #F6F6F6",
-"/	c #030303",
-"(	c #FEFEFE",
-"_	c #040404",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-".+.@..@.@.@#$$.#%....",
-"&**********=.--**;;>#",
-".**----.---*#-,,,,,>.",
-".******.***'.-,...,>$",
-"$******.***-)-,,!,,>.",
-"%**---.-----.-,,,~,>{",
-"]^...*.*...*/-,,,,,>]",
-".*(*********.>>>>>>>.",
-"_{.$$$$$$$$$$$$$$$$$$",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/dialog.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/dialog.png differ
diff -Nru wxglade-0.9.6/icons/dialog.xpm wxglade-1.0.1/icons/dialog.xpm
--- wxglade-0.9.6/icons/dialog.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/dialog.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-/* XPM */
-static char * dialog_xpm[] = {
-"21 21 173 2",
-"  	c None",
-". 	c #7D7F7E",
-"+ 	c #666A69",
-"@ 	c #747877",
-"# 	c #696F6D",
-"$ 	c #7F838C",
-"% 	c #7A7796",
-"& 	c #706B93",
-"* 	c #7A759D",
-"= 	c #928EB3",
-"- 	c #79759A",
-"; 	c #716D8E",
-"> 	c #928FAE",
-", 	c #686580",
-"' 	c #817F94",
-") 	c #737282",
-"! 	c #6F6F79",
-"~ 	c #787E7C",
-"{ 	c #191F1D",
-"] 	c #4C5552",
-"^ 	c #E7F0ED",
-"/ 	c #00050D",
-"( 	c #0E0D2F",
-"_ 	c #090331",
-": 	c #120C38",
-"< 	c #06002C",
-"[ 	c #07022B",
-"} 	c #050126",
-"| 	c #120E2F",
-"1 	c #14112E",
-"2 	c #000013",
-"3 	c #100F21",
-"4 	c #191925",
-"5 	c #000005",
-"6 	c #7D8884",
-"7 	c #000400",
-"8 	c #AFBAB6",
-"9 	c #8D9894",
-"0 	c #040B13",
-"a 	c #FBFAFF",
-"b 	c #FEF9FF",
-"c 	c #F6F1FF",
-"d 	c #1A153D",
-"e 	c #0A062B",
-"f 	c #181437",
-"g 	c #00001B",
-"h 	c #E3E0FB",
-"i 	c #121026",
-"j 	c #CBCADC",
-"k 	c #00000B",
-"l 	c #07080D",
-"m 	c #75807C",
-"n 	c #788480",
-"o 	c #6A7672",
-"p 	c #798581",
-"q 	c #737C81",
-"r 	c #78798E",
-"s 	c #797695",
-"t 	c #747190",
-"u 	c #7B7897",
-"v 	c #827F9E",
-"w 	c #6B6885",
-"x 	c #8D8AA5",
-"y 	c #6E6C82",
-"z 	c #78768B",
-"A 	c #7A7989",
-"B 	c #80808C",
-"C 	c #06060E",
-"D 	c #67726E",
-"E 	c #F7FFFF",
-"F 	c #F3FFFB",
-"G 	c #F8FFFF",
-"H 	c #F4F7FF",
-"I 	c #FAF9FF",
-"J 	c #FEFDFF",
-"K 	c #F9F8FF",
-"L 	c #FDFCFF",
-"M 	c #FAFAFF",
-"N 	c #7D7D89",
-"O 	c #000007",
-"P 	c #828D89",
-"Q 	c #F3FEFA",
-"R 	c #E3EEEA",
-"S 	c #F9FFFF",
-"T 	c #FCFFFF",
-"U 	c #FCFDFF",
-"V 	c #F4F5F7",
-"W 	c #FEFFFF",
-"X 	c #F7F7FF",
-"Y 	c #FEFEFF",
-"Z 	c #7D7D87",
-"` 	c #707674",
-" .	c #FBFFFF",
-"..	c #F5FEFB",
-"+.	c #89928F",
-"@.	c #F0F9F4",
-"#.	c #787E74",
-"$.	c #686B60",
-"%.	c #FEFFF8",
-"&.	c #7A7D76",
-"*.	c #767875",
-"=.	c #727375",
-"-.	c #77787C",
-";.	c #FAFBFF",
-">.	c #7D7E83",
-",.	c #8D8F8E",
-"'.	c #F9FDFC",
-").	c #F2F6F5",
-"!.	c #F6FCFA",
-"~.	c #F6FDF6",
-"{.	c #FBFFF1",
-"].	c #FEFFF3",
-"^.	c #FEFFF4",
-"/.	c #FEFFF6",
-"(.	c #F4F7F0",
-"_.	c #F9FBF6",
-":.	c #FEFFFD",
-"<.	c #7D7E82",
-"[.	c #000004",
-"}.	c #6B6B6B",
-"|.	c #FFFFFF",
-"1.	c #FEFFFB",
-"2.	c #FDFFF3",
-"3.	c #EDF0E5",
-"4.	c #FEFFFA",
-"5.	c #F0F2ED",
-"6.	c #F4F6F5",
-"7.	c #FAFBFD",
-"8.	c #7D7E80",
-"9.	c #000002",
-"0.	c #858384",
-"a.	c #FDF9FA",
-"b.	c #E5E3E4",
-"c.	c #FFFEFF",
-"d.	c #6D6D6B",
-"e.	c #6D7069",
-"f.	c #84877E",
-"g.	c #E4E6E1",
-"h.	c #8A8C89",
-"i.	c #7E807F",
-"j.	c #000100",
-"k.	c #7B7778",
-"l.	c #FFFDFF",
-"m.	c #E8E4E5",
-"n.	c #8D8B8C",
-"o.	c #090909",
-"p.	c #010302",
-"q.	c #F1F2F4",
-"r.	c #747579",
-"s.	c #010206",
-"t.	c #FAFCFB",
-"u.	c #7D7F7C",
-"v.	c #858182",
-"w.	c #F7F3F4",
-"x.	c #FBF7F8",
-"y.	c #EDEEF2",
-"z.	c #F8F9FD",
-"A.	c #7D7B7C",
-"B.	c #848283",
-"C.	c #6A6869",
-"D.	c #878586",
-"E.	c #727272",
-"F.	c #797979",
-"G.	c #79797B",
-"H.	c #777777",
-"I.	c #898989",
-"J.	c #000000",
-"K.	c #080808",
-"L.	c #0F0F0F",
-"M.	c #070707",
-"N.	c #010101",
-"O.	c #060606",
-"P.	c #020202",
-"                                          ",
-"                                          ",
-"                                          ",
-"    . + @ # $ % & * = - ; > , ' ) !       ",
-"    ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5     ",
-"    6 7 8 9 0 a b c d e f g h i j k l     ",
-"    m n o p q r s t u v w x y z A B C     ",
-"    D E E F G H I J J a K L a J M N O     ",
-"    P G Q R S T U V W W X Y Y Y M Z O     ",
-"    `  ...+.@.#.$.%.&.*.W =.-.W ;.>.5     ",
-"    ,.'.).!.~.{.].^./.(._.:.W W ;.<.[.    ",
-"    }.|.|.W 1./.2.3.%.4.5.:.6.W 7.8.9.    ",
-"    0.a.b.c.d.e.f.4.g.h.. i.W W 7.. j.    ",
-"    k.l.c.m.n.o.p.q.W r.s.[.W W t.u.j.    ",
-"    v.w.x.c.c.|.y.W W z.W z.W W t.u.j.    ",
-"    A.B.C.D.E.F.G.G.G.G.G.G.G.H.I.}.J.    ",
-"      J.K.L.M.N.N.N.N.N.N.N.N.J.N.O.P.    ",
-"                                          ",
-"                                          ",
-"                                          ",
-"                                          "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/flexgrid_sizer.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/flexgrid_sizer.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/frame.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/frame.png differ
diff -Nru wxglade-0.9.6/icons/frame.xpm wxglade-1.0.1/icons/frame.xpm
--- wxglade-0.9.6/icons/frame.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/frame.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/* XPM */
-static char * frame_xpm[] = {
-"21 21 11 1",
-" 	c None",
-".	c #7B7B7B",
-"+	c #F2F2F2",
-"@	c #00007B",
-"#	c #FF0000",
-"$	c #FFFF00",
-"%	c #000000",
-"&	c #00FFFF",
-"*	c #00FF00",
-"=	c #FFFFFF",
-"-	c #D6D6D6",
-"                     ",
-"                     ",
-"....................+",
-".@#$@@@@@@@@@@@@@@@.%",
-".@&*@===@==@@@@@-%-.%",
-"....................%",
-".-=================.%",
-".-=================.%",
-".-=================.%",
-".-=================.%",
-".-=================.%",
-".-=================.%",
-".-=================.%",
-".-=================.%",
-".-=================.%",
-".-=================.%",
-"....................%",
-"+%%%%%%%%%%%%%%%%%%%%",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gauge.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gauge.png differ
diff -Nru wxglade-0.9.6/icons/gauge.xpm wxglade-1.0.1/icons/gauge.xpm
--- wxglade-0.9.6/icons/gauge.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gauge.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* XPM */
-static char * gauge_xpm[] = {
-"21 21 6 1",
-" 	c None",
-".	c #7B7B7B",
-"+	c #FFFFFF",
-"@	c #000000",
-"#	c #D6D6D6",
-"$	c #DEDEDE",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-" ..................  ",
-" .++++++.@########+  ",
-" .+$$$$$.@########+  ",
-" .+$$$$$.@########+  ",
-" .+$$$$$.@########+  ",
-" .+$$$$$.@########+  ",
-" .+$$$$$.@########+  ",
-" ........@########+  ",
-" .@@@@@@@@########+  ",
-" ++++++++++++++++++  ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gridbag_sizer.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gridbag_sizer.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/grid.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/grid.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/grid_sizer.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/grid_sizer.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/grid_sizer_slot_template.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/grid_sizer_slot_template.png differ
diff -Nru wxglade-0.9.6/icons/grid_sizer.xpm wxglade-1.0.1/icons/grid_sizer.xpm
--- wxglade-0.9.6/icons/grid_sizer.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/grid_sizer.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* XPM */
-static char * grid_sizer_xpm[] = {
-"21 21 19 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"@	c #D8D8D8",
-"#	c #7B7B7B",
-"$	c #060606",
-"%	c #0A0A0A",
-"&	c #141414",
-"*	c #FBFBFB",
-"=	c #7A7A7A",
-"-	c #0E0E0E",
-";	c #040404",
-">	c #010101",
-",	c #0B0B0B",
-"'	c #101010",
-")	c #050505",
-"!	c #030303",
-"~	c #080808",
-"{	c #020202",
-"..........+.........+",
-".@@@@@@@@#$.@@@@@@@#%",
-".@@@@@@@@#+.@@@@@@@#+",
-".@@@@@@@@#&.@@@@@@@#%",
-".@@@@@@@@#+.@@@@@@@#+",
-"*==#######+.########-",
-";>>>>>>>>+,+;$$>++;+,",
-"..........+.........+",
-".@@@@@@@@#'.@@@@@@@#)",
-".@@@@@@@@#+.@@@@@@@#+",
-".@@@@@@@@#!.@@@@@@@#+",
-".@@@@@@@@#+.@@@@@@@#~",
-".#########+.########+",
-";++++++++-+{~++;+!!++",
-"..........+.........'",
-".@@@@@@@@#;.@@@@@@@#;",
-".@@@@@@@@#{.@@@@@@@#+",
-".@@@@@@@@#$.@@@@@@@#+",
-".@@@@@@@@#%.@@@@@@@#%",
-".#########+.########+",
-";+++++++++;!+{+++{)++"};
diff -Nru wxglade-0.9.6/icons/grid.xpm wxglade-1.0.1/icons/grid.xpm
--- wxglade-0.9.6/icons/grid.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/grid.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/* XPM */
-static char * C:\devel\wxGlade\icons\grid_xpm[] = {
-"21 21 5 1",
-" 	c None",
-".	c #000000",
-"+	c #6C77B5",
-"@	c #C9C7C7",
-"#	c #FFFFFF",
-".....................",
-".++++@++++@++++@++++.",
-".++++@++++@++++@++++.",
-".@@@@@@@@@@@@@@@@@@@.",
-".++++@####@####@####.",
-".++++@####@####@####.",
-".@@@@@@@@@@@@@@@@@@@.",
-".++++@####@####@####.",
-".++++@####@####@####.",
-".@@@@@@@@@@@@@@@@@@@.",
-".++++@####@####@####.",
-".++++@####@####@####.",
-".@@@@@@@@@@@@@@@@@@@.",
-".++++@####@####@####.",
-".++++@####@####@####.",
-".@@@@@@@@@@@@@@@@@@@.",
-".++++@####@####@####.",
-".++++@####@####@####.",
-".@@@@@@@@@@@@@@@@@@@.",
-".++++@####@####@####.",
-"....................."};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/about.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/about.png differ
diff -Nru wxglade-0.9.6/icons/gtk/about.xpm wxglade-1.0.1/icons/gtk/about.xpm
--- wxglade-0.9.6/icons/gtk/about.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/about.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/* XPM */
-static char * about_xpm[] = {
-"14 14 53 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #FFFBF7",
-"@	c #EFEBE7",
-"#	c #F7F3F7",
-"$	c #E7E3DF",
-"%	c #494941",
-"&	c #F7E7D7",
-"*	c #E7CB96",
-"=	c #DFAE61",
-"-	c #E7B651",
-";	c #E7CBA6",
-">	c #C7C3BE",
-",	c #515149",
-"'	c #969696",
-")	c #D7CBC7",
-"!	c #E7BA49",
-"~	c #DFAE41",
-"{	c #C78638",
-"]	c #C7A68E",
-"^	c #DFDBD7",
-"/	c #C77D38",
-"(	c #A66551",
-"_	c #D7D3CF",
-":	c #D7A641",
-"<	c #AE5D30",
-"[	c #9E5D49",
-"}	c #DFCFCF",
-"|	c #000000",
-"1	c #F7EFEF",
-"2	c #C79249",
-"3	c #B67130",
-"4	c #A64D28",
-"5	c #963828",
-"6	c #A68679",
-"7	c #AEA6A6",
-"8	c #595951",
-"9	c #302C28",
-"0	c #E7DBCF",
-"a	c #BE9271",
-"b	c #9E5541",
-"c	c #AE8E8E",
-"d	c #A69E96",
-"e	c #181810",
-"f	c #BEB6B6",
-"g	c #797569",
-"h	c #CFCBCF",
-"i	c #383830",
-"j	c #282820",
-"k	c #8E8686",
-"l	c #BEBAB6",
-"m	c #413C38",
-"n	c #080C08",
-"              ",
-"      ... +@  ",
-"  ++.++#.++$% ",
-"  $+&*=-=;@>, ",
-"  ')--!-~{]$^ ",
-"@+.*!!!-~/(_.+",
-" @.;:~!~{<[}@)",
-" |^12//3456789",
-"  1+0abb[c_de ",
-"  +.@fgf^@+hi ",
-"  _^'jek1+1li ",
-"  %iee  g'km9 ",
-"         nne  ",
-"              "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/copy.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/copy.png differ
diff -Nru wxglade-0.9.6/icons/gtk/copy.xpm wxglade-1.0.1/icons/gtk/copy.xpm
--- wxglade-0.9.6/icons/gtk/copy.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/copy.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/* XPM */
-static char * copy_xpm[] = {
-"14 14 71 1",
-" 	c None",
-".	c #767676",
-"+	c #BEBEBE",
-"@	c #979797",
-"#	c #3B3B37",
-"$	c #A0A090",
-"%	c #707064",
-"&	c #8E8E8E",
-"*	c #70706D",
-"=	c #94948F",
-"-	c #CACAB8",
-";	c #B7B7A4",
-">	c #555552",
-",	c #A6A6A6",
-"'	c #474747",
-")	c #7D7D70",
-"!	c #4F4F4C",
-"~	c #777773",
-"{	c #7E7E71",
-"]	c #CECEB9",
-"^	c #E0E0C8",
-"/	c #4B4B43",
-"(	c #787875",
-"_	c #ACACA1",
-":	c #D6D6C0",
-"<	c #6E6E63",
-"[	c #68685D",
-"}	c #CDCDB8",
-"|	c #DDDDC6",
-"1	c #E3E3CC",
-"2	c #4C4C44",
-"3	c #B1B1AC",
-"4	c #8C8C81",
-"5	c #DADAC3",
-"6	c #D4D4BE",
-"7	c #585852",
-"8	c #E2E2CA",
-"9	c #E8E8D0",
-"0	c #4E4E46",
-"a	c #919181",
-"b	c #CECEB8",
-"c	c #DFDFC8",
-"d	c #969686",
-"e	c #71716F",
-"f	c #CACAB5",
-"g	c #E5E5CE",
-"h	c #ECECD4",
-"i	c #4F4F47",
-"j	c #B3B3A0",
-"k	c #DCDCC5",
-"l	c #E2E2CB",
-"m	c #E7E7D0",
-"n	c #E5E5CD",
-"o	c #474740",
-"p	c #45453D",
-"q	c #ADAD9B",
-"r	c #606058",
-"s	c #44443D",
-"t	c #DBDBC4",
-"u	c #E7E7CF",
-"v	c #C6C6B2",
-"w	c #808073",
-"x	c #70706F",
-"y	c #D6D6D6",
-"z	c #727270",
-"A	c #ACAC9A",
-"B	c #737367",
-"C	c #545450",
-"D	c #5F5F5F",
-"E	c #5E5E57",
-"F	c #000000",
-"              ",
-"              ",
-"   ..         ",
-"+@#$%&  &+    ",
-"&*=-;>,')!    ",
-"&~{]^/(_:<,   ",
-"&[}|123456'   ",
-",7|890abc1de  ",
-" 'fghijklmno  ",
-"  pqr'stuhvw. ",
-"  xx,yzA5BC&  ",
-"  +&DD,E',    ",
-"  &FFF ,      ",
-"    ,,        "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/cut.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/cut.png differ
diff -Nru wxglade-0.9.6/icons/gtk/cut.xpm wxglade-1.0.1/icons/gtk/cut.xpm
--- wxglade-0.9.6/icons/gtk/cut.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/cut.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-/* XPM */
-static char * cut_xpm[] = {
-"14 14 11 1",
-" 	c None",
-".	c #767676",
-"+	c #5F5F5F",
-"@	c #2F2F2F",
-"#	c #BEBEBE",
-"$	c #8E8E8E",
-"%	c #D6D6D6",
-"&	c #A6A6A6",
-"*	c #474747",
-"=	c #171717",
-"-	c #000000",
-"              ",
-"              ",
-"          .   ",
-"        +@    ",
-"       .@#    ",
-"#$$#  +@%%#$& ",
-"+$+@ .@#&*@+& ",
-"+$+@*=--**    ",
-"#$$#&=$$      ",
-"   &*=        ",
-"  &.%*        ",
-"  $+.&        ",
-"  #$&         ",
-"              "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/exit.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/exit.png differ
diff -Nru wxglade-0.9.6/icons/gtk/exit.xpm wxglade-1.0.1/icons/gtk/exit.xpm
--- wxglade-0.9.6/icons/gtk/exit.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/exit.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* XPM */
-static char * exit_xpm[] = {
-"14 14 36 1",
-" 	c None",
-".	c #888888",
-"+	c #555555",
-"@	c #91918C",
-"#	c #B6B6B0",
-"$	c #000000",
-"%	c #CDCDCD",
-"&	c #ABABAB",
-"*	c #444444",
-"=	c #E4E4DC",
-"-	c #1E1213",
-";	c #BCBCBC",
-">	c #4C2E30",
-",	c #935B5E",
-"'	c #605755",
-")	c #B8B8B2",
-"!	c #666662",
-"~	c #C8C8C1",
-"{	c #2C1819",
-"]	c #784244",
-"^	c #844A4B",
-"/	c #8D5254",
-"(	c #A36366",
-"_	c #C2797D",
-":	c #AA6E71",
-"<	c #52524F",
-"[	c #8C8C87",
-"}	c #191919",
-"|	c #BDBDB7",
-"1	c #767672",
-"2	c #2D2D2C",
-"3	c #92928D",
-"4	c #010101",
-"5	c #565656",
-"6	c #5A5A5A",
-"7	c #8B8B8B",
-"              ",
-"              ",
-"      .++++++.",
-"      +@####$+",
-"    %&*#====$+",
-"    &--#====$+",
-";+++*>,'=)!~$+",
-"&{]^/(_:<[}|$+",
-"&{]^/(_:<===$+",
-";+++*>,'====$+",
-"    &--#====$+",
-"    %&*#==12$+",
-"      +@344445",
-"      .+566667"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/generate.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/generate.png differ
diff -Nru wxglade-0.9.6/icons/gtk/generate.xpm wxglade-1.0.1/icons/gtk/generate.xpm
--- wxglade-0.9.6/icons/gtk/generate.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/generate.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/* XPM */
-static char * generate_xpm[] = {
-"14 14 79 1",
-" 	c None",
-".	c #A6A6A6",
-"+	c #27251C",
-"@	c #28261C",
-"#	c #4A4942",
-"$	c #BEBEBE",
-"%	c #66624E",
-"&	c #A19972",
-"*	c #A49C74",
-"=	c #928B67",
-"-	c #56544A",
-";	c #8E8E8E",
-">	c #26241B",
-",	c #B1A87D",
-"'	c #9C946E",
-")	c #8C8563",
-"!	c #14130E",
-"~	c #ADA57A",
-"{	c #B6AD80",
-"]	c #938C68",
-"^	c #65614E",
-"/	c #756F52",
-"(	c #56544B",
-"_	c #767676",
-":	c #4E4A3E",
-"<	c #6A6652",
-"[	c #4B4735",
-"}	c #423E2E",
-"|	c #958D69",
-"1	c #BFB687",
-"2	c #6C674C",
-"3	c #69644A",
-"4	c #676148",
-"5	c #74736E",
-"6	c #99926C",
-"7	c #CBC18F",
-"8	c #CDC391",
-"9	c #CFC592",
-"0	c #CEC492",
-"a	c #C8BF8E",
-"b	c #6B654B",
-"c	c #C7BE8D",
-"d	c #D2C895",
-"e	c #D1C793",
-"f	c #C3BA8A",
-"g	c #D4CA96",
-"h	c #D1C794",
-"i	c #716B4F",
-"j	c #5A584D",
-"k	c #474747",
-"l	c #BCB385",
-"m	c #AAA278",
-"n	c #A39C73",
-"o	c #C2B989",
-"p	c #D2C894",
-"q	c #CAC08E",
-"r	c #7F7959",
-"s	c #7E7859",
-"t	c #D0C693",
-"u	c #D1C894",
-"v	c #A9A177",
-"w	c #D0C692",
-"x	c #CEC592",
-"y	c #9A926D",
-"z	c #5F5F5F",
-"A	c #847D5D",
-"B	c #CCC290",
-"C	c #CEC491",
-"D	c #413E2D",
-"E	c #59574D",
-"F	c #ABA278",
-"G	c #847E5D",
-"H	c #B0A87D",
-"I	c #C5BC8B",
-"J	c #99916C",
-"K	c #8C8562",
-"L	c #BBB284",
-"M	c #3D3A2B",
-"N	c #73726D",
-" .+@#$        ",
-".%&*=-        ",
-";>,')! .;$    ",
-";>~{]!.^/(..  ",
-" _:<[]}|1234. ",
-"  ..567890ab. ",
-"   .3cdefghij$",
-"   klcdmnopqr;",
-"   _s,tuvwxy<.",
-"    zABt9CcD. ",
-"    EFGHIJ=K_ ",
-"    $EzsLMNN  ",
-"       _k.    ",
-"              "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/new.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/new.png differ
diff -Nru wxglade-0.9.6/icons/gtk/new.xpm wxglade-1.0.1/icons/gtk/new.xpm
--- wxglade-0.9.6/icons/gtk/new.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/new.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-/* XPM */
-static char * new_xpm[] = {
-"14 14 74 1",
-" 	c None",
-".	c #A6A6A6",
-"+	c #8E8E8E",
-"@	c #50504D",
-"#	c #707064",
-"$	c #474740",
-"%	c #474747",
-"&	c #7A7A6D",
-"*	c #B1B19F",
-"=	c #DCDCC5",
-"-	c #B5B5A4",
-";	c #767676",
-">	c #BEBEBE",
-",	c #4B4B4B",
-"'	c #52524C",
-")	c #CBCBB5",
-"!	c #D6D6C0",
-"~	c #D8D8C1",
-"{	c #DDDDC5",
-"]	c #E2E2CA",
-"^	c #88887A",
-"/	c #949494",
-"(	c #828282",
-"_	c #6F6F68",
-":	c #CDCDB7",
-"<	c #D7D7C0",
-"[	c #DADAC3",
-"}	c #E0E0C8",
-"|	c #E5E5CD",
-"1	c #D7D7C1",
-"2	c #6A6A64",
-"3	c #9D9D9B",
-"4	c #B2B2AF",
-"5	c #8F8F80",
-"6	c #D6D6BF",
-"7	c #DFDFC7",
-"8	c #E8E8CF",
-"9	c #EAEAD2",
-"0	c #EFEFD6",
-"a	c #CFCFBA",
-"b	c #9E9E99",
-"c	c #7F7F7A",
-"d	c #A3A392",
-"e	c #E4E4CC",
-"f	c #EBEBD2",
-"g	c #F2F2D9",
-"h	c #F3F3DA",
-"i	c #848479",
-"j	c #1A1A19",
-"k	c #B9B9A5",
-"l	c #D9D9C2",
-"m	c #E1E1CA",
-"n	c #E7E7CF",
-"o	c #EEEED5",
-"p	c #F4F4DB",
-"q	c #E8E8D1",
-"r	c #757569",
-"s	c #5E5E59",
-"t	c #DDDDC6",
-"u	c #E9E9D0",
-"v	c #F5F5DC",
-"w	c #BBBBA8",
-"x	c #D8D8C2",
-"y	c #F0F0D7",
-"z	c #99998E",
-"A	c #EDEDD4",
-"B	c #F1F1D8",
-"C	c #68685D",
-"D	c #63635E",
-"E	c #D2D2BC",
-"F	c #A9A997",
-"G	c #71716F",
-"H	c #909082",
-"I	c #545450",
-"       ..     ",
-"     +@#$     ",
-"   .%&*=-;    ",
-" >,')!~{]^/   ",
-" +(_:<[}|12   ",
-" +34567890a%  ",
-" +bcd[ef0ghi. ",
-" +jklmnogppqr.",
-" +s[teu0gvvvw%",
-"  %x]nfyhv0i% ",
-"  .zn9ABh[C.  ",
-"   DEoynF;    ",
-"   +^BmCG     ",
-"    ;HI       "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/open.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/open.png differ
diff -Nru wxglade-0.9.6/icons/gtk/open.xpm wxglade-1.0.1/icons/gtk/open.xpm
--- wxglade-0.9.6/icons/gtk/open.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/open.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/* XPM */
-static char * open_xpm[] = {
-"14 14 30 1",
-" 	c None",
-".	c #767676",
-"+	c #BEBEBE",
-"@	c #8E8E8E",
-"#	c #A6A6A6",
-"$	c #514F4A",
-"%	c #333029",
-"&	c #77705F",
-"*	c #999489",
-"=	c #B4B4B3",
-"-	c #666052",
-";	c #474747",
-">	c #5B574E",
-",	c #88806D",
-"'	c #DDD9CD",
-")	c #C6C5C0",
-"!	c #555454",
-"~	c #22201B",
-"{	c #A49C88",
-"]	c #BBB4A4",
-"^	c #FFFEF7",
-"/	c #AAA9A4",
-"(	c #5A5852",
-"_	c #555044",
-":	c #99907B",
-"<	c #555452",
-"[	c #AFA896",
-"}	c #F3F1E9",
-"|	c #11100D",
-"1	c #706F6C",
-"              ",
-"              ",
-"        ..    ",
-" +@ #@$%&*=@@ ",
-" $-;>-,'')!-~ ",
-" $,{]^^/(_::% ",
-" @-]^)<-,:::% ",
-"  ;[}%::::::% ",
-"  #_'%::::::% ",
-"   $,%:::,-;# ",
-"   @-%:::$@   ",
-"    ;%&>;     ",
-"    #|1#      ",
-"              "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/paste.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/paste.png differ
diff -Nru wxglade-0.9.6/icons/gtk/paste.xpm wxglade-1.0.1/icons/gtk/paste.xpm
--- wxglade-0.9.6/icons/gtk/paste.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/paste.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/* XPM */
-static char * paste_xpm[] = {
-"14 14 91 1",
-" 	c None",
-".	c #BEBEBE",
-"+	c #8E8E8E",
-"@	c #45443F",
-"#	c #45433E",
-"$	c #A6A6A6",
-"%	c #767676",
-"&	c #5D5D59",
-"*	c #8A897E",
-"=	c #CFCCBD",
-"-	c #CECABB",
-";	c #474747",
-">	c #2F2F2F",
-",	c #45453F",
-"'	c #A2A193",
-")	c #A4A499",
-"!	c #6F6F69",
-"~	c #6E6C68",
-"{	c #B3B0A5",
-"]	c #88867C",
-"^	c #D1CFBE",
-"/	c #D0CFBE",
-"(	c #747471",
-"_	c #9D9B94",
-":	c #6C6962",
-"<	c #BCB9AC",
-"[	c #B4B2A5",
-"}	c #5C5C58",
-"|	c #D6D6D6",
-"1	c #CFCEBD",
-"2	c #89877F",
-"3	c #9E9B90",
-"4	c #CCC9BA",
-"5	c #CBC9BA",
-"6	c #C9C7B8",
-"7	c #43423D",
-"8	c #767674",
-"9	c #373731",
-"0	c #A19F93",
-"a	c #CECBBB",
-"b	c #CDCABB",
-"c	c #CAC8B8",
-"d	c #4B4B46",
-"e	c #6C6C67",
-"f	c #979788",
-"g	c #C6C6B2",
-"h	c #73726B",
-"i	c #CDC9BB",
-"j	c #CAC8B9",
-"k	c #4C4C4A",
-"l	c #8D8D89",
-"m	c #BCBCAE",
-"n	c #DADAC3",
-"o	c #7E7E71",
-"p	c #CAC9B9",
-"q	c #C9C5B7",
-"r	c #2E2E2B",
-"s	c #868679",
-"t	c #CECEB9",
-"u	c #DEDEC7",
-"v	c #BFBFAB",
-"w	c #575753",
-"x	c #42423C",
-"y	c #C7C4B5",
-"z	c #C4C1B1",
-"A	c #BFBDAB",
-"B	c #393933",
-"C	c #CACAB5",
-"D	c #E2E2CB",
-"E	c #E9E9D1",
-"F	c #CCCCB7",
-"G	c #747472",
-"H	c #969285",
-"I	c #BDB9A7",
-"J	c #B9B5A2",
-"K	c #10100E",
-"L	c #A3A392",
-"M	c #E2E2CA",
-"N	c #E6E6CF",
-"O	c #EDEDD5",
-"P	c #F2F2D9",
-"Q	c #62625A",
-"R	c #6A685F",
-"S	c #69675E",
-"T	c #65655D",
-"U	c #E6E6CE",
-"V	c #DADAC4",
-"W	c #8F8F80",
-"X	c #545450",
-"Y	c #949485",
-"Z	c #3E3E37",
-"              ",
-"   .+@#$   .. ",
-"  %&*=-; $;>> ",
-"$,')!~{]+$;>> ",
-";^/(_:<[}||.. ",
-" @123456789$  ",
-" 80ab5cdefg;  ",
-" $hi4j6klmno+ ",
-"  ;4p6qrstuvw ",
-"   xyzABCuDEF;",
-"   GHIJKLMNOPQ",
-"   $RS;$TUVWX%",
-"    $$  ;YZ+. ",
-"         %    "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/prefs.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/prefs.png differ
diff -Nru wxglade-0.9.6/icons/gtk/prefs.xpm wxglade-1.0.1/icons/gtk/prefs.xpm
--- wxglade-0.9.6/icons/gtk/prefs.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/prefs.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/* XPM */
-static char * prefs_xpm[] = {
-"14 14 79 1",
-" 	c None",
-".	c #A6A6A6",
-"+	c #787878",
-"@	c #474747",
-"#	c #727272",
-"$	c #B2B2B2",
-"%	c #DFDFDF",
-"&	c #767676",
-"*	c #797259",
-"=	c #BEBEBE",
-"-	c #8E8E8E",
-";	c #4C4C4C",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #8B8B8B",
-")	c #77756F",
-"!	c #998C61",
-"~	c #564F36",
-"{	c #606060",
-"]	c #969696",
-"^	c #E5E5E5",
-"/	c #CBA6A6",
-"(	c #DADADA",
-"_	c #DCDCDC",
-":	c #C9C9C9",
-"<	c #574E2F",
-"[	c #5E5E5E",
-"}	c #C7C7C7",
-"|	c #E6E6E6",
-"1	c #E9E9E9",
-"2	c #AE7575",
-"3	c #BCBCBC",
-"4	c #AFAFAF",
-"5	c #D0D0D0",
-"6	c #7E7C76",
-"7	c #949494",
-"8	c #D5BBBB",
-"9	c #CEA2A2",
-"0	c #BC8F8F",
-"a	c #CACACA",
-"b	c #7F7F7F",
-"c	c #E2DFDF",
-"d	c #C9A2A2",
-"e	c #C9A5A5",
-"f	c #7D7B75",
-"g	c #988B60",
-"h	c #574F36",
-"i	c #D6D6D4",
-"j	c #5E5E5B",
-"k	c #7B7B7B",
-"l	c #E8E8E8",
-"m	c #CFC198",
-"n	c #4B401D",
-"o	c #37311F",
-"p	c #94948F",
-"q	c #BABAB1",
-"r	c #B4B4A9",
-"s	c #909085",
-"t	c #C7CAC5",
-"u	c #5D605B",
-"v	c #636560",
-"w	c #B5B5A9",
-"x	c #B9B9AF",
-"y	c #B9B9B0",
-"z	c #767670",
-"A	c #5C5C5C",
-"B	c #919191",
-"C	c #CDCDC8",
-"D	c #C4C4BF",
-"E	c #D8D9D8",
-"F	c #E1E1DE",
-"G	c #DCDCDA",
-"H	c #E3E3E3",
-"I	c #AEAEAE",
-"J	c #7D7D7D",
-"K	c #494949",
-"L	c #757575",
-"M	c #909082",
-"N	c #545450",
-"     .+@.   . ",
-"    @#$%@  &*.",
-"=-@;>,>>'-)!~.",
-"{]%^/(_$:{!<. ",
-"[}|123456!~.  ",
-"-7890a^b!<+.  ",
-" @cde^fgh.ij. ",
-" .k^lmnopqrs@ ",
-"  {:tuvwxyzA  ",
-"  -BCDEFG&-=  ",
-"   @H^>I@.    ",
-"   .J,KL      ",
-"    .@        ",
-"    &MN       "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/refresh.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/refresh.png differ
diff -Nru wxglade-0.9.6/icons/gtk/refresh.xpm wxglade-1.0.1/icons/gtk/refresh.xpm
--- wxglade-0.9.6/icons/gtk/refresh.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/refresh.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-/* XPM */
-static char * refresh_xpm[] = {
-"14 14 11 1",
-" 	c None",
-".	c #000000",
-"+	c #566B43",
-"@	c #4C603C",
-"#	c #526741",
-"$	c #5A7046",
-"%	c #37452B",
-"&	c #425334",
-"*	c #445636",
-"=	c #475937",
-"-	c #5C7449",
-"      .       ",
-"     ..       ",
-"    .+@..     ",
-"    #$##@..   ",
-"   . ..  .%.  ",
-"  .   .   .%. ",
-" ..        .. ",
-" ..        .. ",
-" .&.   .   .  ",
-"  .*...#=     ",
-"   .##-#@.    ",
-"    ...@*     ",
-"       ..     ",
-"       .      "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/remove.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/remove.png differ
diff -Nru wxglade-0.9.6/icons/gtk/remove.xpm wxglade-1.0.1/icons/gtk/remove.xpm
--- wxglade-0.9.6/icons/gtk/remove.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/remove.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/* XPM */
-static char * remove_xpm[] = {
-"14 14 79 1",
-" 	c None",
-".	c #BEBEBE",
-"+	c #8E8E8E",
-"@	c #878787",
-"#	c #545852",
-"$	c #757F6F",
-"%	c #81857E",
-"&	c #5D6557",
-"*	c #43493E",
-"=	c #697261",
-"-	c #474747",
-";	c #A6A6A6",
-">	c #727B6C",
-",	c #BECAB6",
-"'	c #B3BFA8",
-")	c #6C7664",
-"!	c #565D50",
-"~	c #676F5F",
-"{	c #9BA98F",
-"]	c #98A58C",
-"^	c #32362E",
-"/	c #586752",
-"(	c #C0CCBB",
-"_	c #C8D1C1",
-":	c #ACB8A1",
-"<	c #9FAC92",
-"[	c #99A68D",
-"}	c #7D9175",
-"|	c #252922",
-"1	c #434A3D",
-"2	c #697B63",
-"3	c #84997E",
-"4	c #7C9277",
-"5	c #708669",
-"6	c #61735B",
-"7	c #566552",
-"8	c #3A4238",
-"9	c #3F413E",
-"0	c #4B5748",
-"a	c #3C433A",
-"b	c #3A4038",
-"c	c #363B34",
-"d	c #313530",
-"e	c #2F322E",
-"f	c #363E34",
-"g	c #83957E",
-"h	c #81927B",
-"i	c #82937E",
-"j	c #677B63",
-"k	c #596955",
-"l	c #586653",
-"m	c #455242",
-"n	c #606060",
-"o	c #919191",
-"p	c #BFBFBF",
-"q	c #050505",
-"r	c #080808",
-"s	c #353535",
-"t	c #82957E",
-"u	c #80917B",
-"v	c #677B62",
-"w	c #576652",
-"x	c #455142",
-"y	c #879D81",
-"z	c #7B8D75",
-"A	c #859781",
-"B	c #6A7F64",
-"C	c #596855",
-"D	c #5C6D57",
-"E	c #445141",
-"F	c #4B5149",
-"G	c #52634C",
-"H	c #4F5E4A",
-"I	c #4C5C48",
-"J	c #495845",
-"K	c #465443",
-"L	c #1B1B1B",
-"M	c #4C4C4C",
-"N	c #A8A8A8",
-"              ",
-"   .+++++     ",
-"  @#$%&*=-;   ",
-" +>,')!~{]^   ",
-" +/(_:<{[}|   ",
-" ;123456789   ",
-"  -0abcdef+   ",
-"  -ghijklmnop ",
-"  -ghijklmqrs ",
-"  -tuivkwxqrr ",
-"  -yzABCDEqr  ",
-"   FGHIJKLM   ",
-"   .+++++N    ",
-"              "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/save_as.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/save_as.png differ
diff -Nru wxglade-0.9.6/icons/gtk/save_as.xpm wxglade-1.0.1/icons/gtk/save_as.xpm
--- wxglade-0.9.6/icons/gtk/save_as.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/save_as.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-/* XPM */
-static char * save_as_xpm[] = {
-"14 14 96 2",
-"  	c None",
-". 	c #A6A6A6",
-"+ 	c #BEBEBE",
-"@ 	c #8E8E8E",
-"# 	c #6F6236",
-"$ 	c #3F381F",
-"% 	c #767676",
-"& 	c #455254",
-"* 	c #293E42",
-"= 	c #474747",
-"- 	c #776C46",
-"; 	c #7E6F3D",
-"> 	c #6E6D66",
-", 	c #3E4647",
-"' 	c #96A6A9",
-") 	c #D0DFE1",
-"! 	c #7A959A",
-"~ 	c #5B5F60",
-"{ 	c #76888B",
-"] 	c #CDDDE0",
-"^ 	c #E4ECED",
-"/ 	c #C0C0C1",
-"( 	c #7A6F4A",
-"_ 	c #333E41",
-": 	c #79949A",
-"< 	c #CDDCE0",
-"[ 	c #D8DADA",
-"} 	c #F9F9F9",
-"| 	c #C1C1C1",
-"1 	c #465053",
-"2 	c #121B1D",
-"3 	c #7E9FA5",
-"4 	c #CBDCDF",
-"5 	c #E3E1E0",
-"6 	c #CECAC8",
-"7 	c #7B704A",
-"8 	c #7E7C76",
-"9 	c #BCD3D8",
-"0 	c #344F55",
-"a 	c #2D3739",
-"b 	c #ADC6CB",
-"c 	c #E1E0DF",
-"d 	c #73653B",
-"e 	c #4F4B3D",
-"f 	c #6F7878",
-"g 	c #B8CFD2",
-"h 	c #53858F",
-"i 	c #5D959F",
-"j 	c #393D3E",
-"k 	c #666A6B",
-"l 	c #69878D",
-"m 	c #EDF1F2",
-"n 	c #B9B3AF",
-"o 	c #9FA1A2",
-"p 	c #94B0B5",
-"q 	c #729AA2",
-"r 	c #3E5D63",
-"s 	c #406871",
-"t 	c #49767F",
-"u 	c #355359",
-"v 	c #364548",
-"w 	c #94BBC3",
-"x 	c #BAD2D6",
-"y 	c #64939C",
-"z 	c #748D93",
-"A 	c #CDD1D2",
-"B 	c #E9E9E9",
-"C 	c #5F7377",
-"D 	c #48747D",
-"E 	c #41666E",
-"F 	c #0C1213",
-"G 	c #6E9BA5",
-"H 	c #67A0AB",
-"I 	c #AFB9BC",
-"J 	c #9DA6A9",
-"K 	c #E2E6E7",
-"L 	c #E5E5E5",
-"M 	c #AAB2B3",
-"N 	c #638F97",
-"O 	c #1A282B",
-"P 	c #020405",
-"Q 	c #253235",
-"R 	c #669BA5",
-"S 	c #7B979D",
-"T 	c #8F9596",
-"U 	c #9EBBC0",
-"V 	c #CACECF",
-"W 	c #6C6F70",
-"X 	c #404445",
-"Y 	c #65696A",
-"Z 	c #2F4C52",
-"` 	c #65949D",
-" .	c #BCC4C6",
-"..	c #788284",
-"+.	c #333737",
-"@.	c #989898",
-"                      . .   ",
-"              + @   . # $   ",
-"            % & * = - ; >   ",
-"      + @ , ' ) ! # ; %     ",
-"    % ~ { ] ^ / ( ; >       ",
-". _ : < [ } | # ; 1 2       ",
-"= 3 4 5 6 | 7 ; 8 9 0 %     ",
-"  a b c 6 d e f g h i j +   ",
-"  k l m n o p q r s t u @   ",
-"  . v w x y z A B C D E F   ",
-"    = G H I J K L M N O P   ",
-"      Q R S T U V W X %     ",
-"      Y Z `  ...+.@.+       ",
-"        % = = %             "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/save.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/save.png differ
diff -Nru wxglade-0.9.6/icons/gtk/save.xpm wxglade-1.0.1/icons/gtk/save.xpm
--- wxglade-0.9.6/icons/gtk/save.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/save.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-/* XPM */
-static char * save_xpm[] = {
-"14 14 87 1",
-" 	c None",
-".	c #8E8E8E",
-"+	c #4A5254",
-"@	c #3F4344",
-"#	c #BEBEBE",
-"$	c #A6A6A6",
-"%	c #474747",
-"&	c #7A878A",
-"*	c #A5B7BA",
-"=	c #455A5F",
-"-	c #5A5E5E",
-";	c #657072",
-">	c #C3D4D7",
-",	c #E2EAEC",
-"'	c #F7F9FA",
-")	c #84A0A6",
-"!	c #1D2527",
-"~	c #62777B",
-"{	c #A6B6BA",
-"]	c #E4ECED",
-"^	c #FFFFFF",
-"/	c #CADADD",
-"(	c #475A5E",
-"_	c #767676",
-":	c #2E3638",
-"<	c #9CB5BB",
-"[	c #E5ECED",
-"}	c #F6F9F9",
-"|	c #9BB9BF",
-"1	c #6C6E6E",
-"2	c #788C90",
-"3	c #ECF2F3",
-"4	c #F9FBFB",
-"5	c #D0DEE1",
-"6	c #83A7B0",
-"7	c #424E50",
-"8	c #ACC4C9",
-"9	c #F7F9F9",
-"0	c #FDFDFD",
-"a	c #F6F8F9",
-"b	c #C4D5D9",
-"c	c #83A1A7",
-"d	c #617F86",
-"e	c #5B7980",
-"f	c #64848C",
-"g	c #859FA5",
-"h	c #D6E2E5",
-"i	c #D1DEE1",
-"j	c #9BB8BF",
-"k	c #6B848A",
-"l	c #A9B4B7",
-"m	c #949B9C",
-"n	c #6E8C93",
-"o	c #5F7E86",
-"p	c #485D61",
-"q	c #2D3739",
-"r	c #80A4AC",
-"s	c #76989F",
-"t	c #B6BEC1",
-"u	c #CBD0D2",
-"v	c #E5E6E7",
-"w	c #D2D4D5",
-"x	c #7C8B8E",
-"y	c #65878E",
-"z	c #2D3C3F",
-"A	c #6B6F6F",
-"B	c #6C848A",
-"C	c #C9D0D1",
-"D	c #607377",
-"E	c #C4D0D2",
-"F	c #D4D4D4",
-"G	c #8C9395",
-"H	c #212B2E",
-"I	c #666768",
-"J	c #3D4A4D",
-"K	c #6C9199",
-"L	c #96ACB1",
-"M	c #CDD0D1",
-"N	c #929697",
-"O	c #646869",
-"P	c #575757",
-"Q	c #1D2729",
-"R	c #1F2A2C",
-"S	c #414242",
-"T	c #6F7070",
-"U	c #909082",
-"V	c #545450",
-"              ",
-"       .+@#   ",
-"     $%&*=.   ",
-"   .-;>,')!   ",
-" $%~{]'^^/(_  ",
-" :<[^^^^^}|@# ",
-" 123^^^^456=. ",
-" $7890abcdef! ",
-"  %ghijklmnop_",
-"   qrstuvwxyz%",
-"   ABsCDEFGHI$",
-"   $JKLMNOP   ",
-"    $QRST$    ",
-"    _UV       "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/gtk/tutorial.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/gtk/tutorial.png differ
diff -Nru wxglade-0.9.6/icons/gtk/tutorial.xpm wxglade-1.0.1/icons/gtk/tutorial.xpm
--- wxglade-0.9.6/icons/gtk/tutorial.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/gtk/tutorial.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/* XPM */
-static char * tutorial_xpm[] = {
-"14 14 61 1",
-" 	c None",
-".	c #8E8E8E",
-"+	c #A6A6A6",
-"@	c #767676",
-"#	c #3A4E56",
-"$	c #465E67",
-"%	c #3E555E",
-"&	c #474747",
-"*	c #BEBEBE",
-"=	c #41484A",
-"-	c #6B8E9B",
-";	c #5F828F",
-">	c #5E808D",
-",	c #1F2A2F",
-"'	c #C0C0C0",
-")	c #445962",
-"!	c #658896",
-"~	c #49636D",
-"{	c #5B5F60",
-"]	c #374950",
-"^	c #678A98",
-"/	c #3E4D52",
-"(	c #8D8D8C",
-"_	c #686965",
-":	c #678895",
-"<	c #618491",
-"[	c #3C3C3C",
-"}	c #AEAFAD",
-"|	c #4D4E4C",
-"1	c #3A5058",
-"2	c #678A97",
-"3	c #B4B4B3",
-"4	c #777974",
-"5	c #524646",
-"6	c #373236",
-"7	c #212D31",
-"8	c #3A4746",
-"9	c #56696A",
-"0	c #5A7B87",
-"a	c #ACACAA",
-"b	c #323331",
-"c	c #382828",
-"d	c #CEB6B4",
-"e	c #F1F0EC",
-"f	c #B1B1AE",
-"g	c #666664",
-"h	c #4B4A49",
-"i	c #6A6B68",
-"j	c #756C6D",
-"k	c #483C3C",
-"l	c #6D7475",
-"m	c #C8CFCC",
-"n	c #E1E0DD",
-"o	c #B2B3B1",
-"p	c #4F504F",
-"q	c #495153",
-"r	c #747C7B",
-"s	c #979B98",
-"t	c #686F69",
-"u	c #696D6E",
-"v	c #0A0E0F",
-"              ",
-"     ......+  ",
-"    @#$%%%%&  ",
-"   *=-;>>>,'  ",
-"   .)!>>>~{'  ",
-"  +]^>>>>/(_  ",
-"  &:<>>>>[}|  ",
-" .12>>>>,34@  ",
-" 567890~{ab   ",
-" cdeefgh.i.   ",
-" jklmeenop*   ",
-"   +&qrst@    ",
-"     *.uv     ",
-"              "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/hyperlink_ctrl.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/hyperlink_ctrl.png differ
diff -Nru wxglade-0.9.6/icons/hyperlink_ctrl.xpm wxglade-1.0.1/icons/hyperlink_ctrl.xpm
--- wxglade-0.9.6/icons/hyperlink_ctrl.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/hyperlink_ctrl.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* XPM */
-static char *dummy[]={
-"21 21 19 1",
-". c None",
-"b c #000000",
-"c c #090909",
-"g c #1b1b1b",
-"p c #242424",
-"m c #555555",
-"o c #5c5c5c",
-"i c #5d5d5d",
-"a c #5f5f5f",
-"k c #6f6f6f",
-"n c #8a8a8a",
-"q c #a5a5a5",
-"f c #b4b4b4",
-"e c #c4c4c4",
-"d c #cfcfcf",
-"j c #d0d0d0",
-"# c #d7d7d7",
-"h c #fdfdfd",
-"l c #fefefe",
-".....................",
-".....................",
-".....................",
-".....................",
-".....................",
-".....................",
-".#abcadabcaeabcaf....",
-"...bg...bg...bg......",
-"...bg...bg...bg......",
-"...bg...bg...bg......",
-"...bbbbbbg...bg......",
-"...bg...bg...bg..hi..",
-"...bg...bg...bg..jk..",
-"...bg...bg...bg.lmn..",
-".#abcadabcaeabcopbq..",
-".....................",
-".....................",
-".....................",
-".....................",
-".....................",
-"....................."};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/icon16.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/icon16.png differ
diff -Nru wxglade-0.9.6/icons/icon16.xpm wxglade-1.0.1/icons/icon16.xpm
--- wxglade-0.9.6/icons/icon16.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/icon16.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/* XPM */
-static char *icon16[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 80 1",
-"  c #0FA60FA65779",
-". c #000000007D41",
-"X c #29D529D569D5",
-"o c #0FA645720000",
-"O c #00005D210000",
-"+ c #00006D620000",
-"@ c #13F6696413F6",
-"# c #1BE37CC30000",
-"$ c #1B267D901C18",
-"% c #29D559C51BE3",
-"& c #509B00000000",
-"* c #57790FA60FA6",
-"= c #7D4100000000",
-"- c #7D427D420000",
-"; c #80007DF20000",
-": c #47D347D35779",
-"> c #47D3538C47D3",
-", c #577947D347D3",
-"< c #5779577947D3",
-"1 c #509B509B509B",
-"2 c #5EED50FC50FC",
-"3 c #5BE35BE369D5",
-"4 c #7D4280008000",
-"5 c #800080007D41",
-"6 c #000000008FA6",
-"7 c #1BE31BE38B7F",
-"8 c #1BE31BE39BE3",
-"9 c #1B461B469F30",
-"0 c #00000000E42C",
-"q c blue",
-"w c #0000A78C0000",
-"e c #0000A7F50000",
-"r c #0000C4C10000",
-"t c #0000C5390000",
-"y c #8000951B8000",
-"u c #8FA600000000",
-"i c #87ED18511851",
-"p c #915400000000",
-"a c #9BE31BE31BE3",
-"s c #E1D400000000",
-"d c red",
-"f c #8FA68FA60000",
-"g c #8604860413F6",
-"h c #8DF18C1D1BE3",
-"j c #90B590B50000",
-"k c #9BE39BE31BE3",
-"l c #9CEF9CEF1BFE",
-"z c #9BE39BE38000",
-"x c #DF38DF380000",
-"c c #E41CE0680000",
-"v c yellow",
-"b c #87ED88768876",
-"n c #83098D7B8309",
-"m c #8DF18DF18B7F",
-"M c #8FA68FA68FA6",
-"N c #820A820A9EC8",
-"B c #9DB581648164",
-"V c #90FB90FB8309",
-"C c #911E911E911E",
-"Z c #915591559264",
-"A c #940B9341940B",
-"S c #9851985198D9",
-"D c #98D9987398D9",
-"F c #9BE39BE39BE3",
-"G c #9CEF9CEF9CEF",
-"H c #C203C203C65F",
-"J c #C2A3C6E7C6E7",
-"K c #C65FC31BC65F",
-"L c #DF40DF40DF41",
-"P c #E0DEE0DEE0DE",
-"I c #DF58DF5CE41C",
-"U c #E0DEE0DEE5CB",
-"Y c #DF38E41CE41C",
-"T c #E41CE41CDF88",
-"R c #E1AAE1AAE121",
-"E c #E394E1BFE41C",
-"W c #E394E394E122",
-"Q c #E5D4E211E5CB",
-"! c #E6CCE6CCE1C2",
-"~ c gray100",
-/* pixels */
-"&pp*4CMMMMMMMMC1",
-"uddaY~~~~~~~~~~M",
-"uddaY~~~~~~~~~~M",
-"=ssiJPLLLLLLLTT4",
-",BB2bGFFFFFGmX9 ",
-"M~~FL~~~~~~~T8q6",
-"M~~FL~~~~~~~T70.",
-"M~~FL~~~~~~~P3N:",
-"M~~GL~~~~~~~LF~M",
-"M~~DL~~~~~~~LF~M",
-"M~~DL~~~~~~~LF~M",
-"M~~SHIIIIIEQKF~M",
-"M~~Vgkkklh%w@n~M",
-"M~~zxvvvvc#twy~M",
-"M~~zcvvvvc#een~M",
-"1ZZ<-ffjg;o++>C1"
-};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/icon.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/icon.png differ
diff -Nru wxglade-0.9.6/icons/icon.xpm wxglade-1.0.1/icons/icon.xpm
--- wxglade-0.9.6/icons/icon.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/icon.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* XPM */
-static char *mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-"  c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-"                                ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-"                                ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++      ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++                    ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-"                                "
-};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/layout1.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/layout1.png differ
diff -Nru wxglade-0.9.6/icons/layout1.xpm wxglade-1.0.1/icons/layout1.xpm
--- wxglade-0.9.6/icons/layout1.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/layout1.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/* XPM */
-static char * D:\Python\wxglade\wxglade_dev_08\icons\layout1_xpm[] = {
-"21 21 15 1",
-" 	c None",
-".	c #7B7B7B",
-"+	c #F2F2F2",
-"@	c #00007B",
-"#	c #FFFFFF",
-"$	c #D6D6D6",
-"%	c #000000",
-"&	c #E5E5E5",
-"*	c #B2B2B2",
-"=	c #0000FF",
-"-	c #666666",
-";	c #999999",
-">	c #7F7F7F",
-",	c #FFFF00",
-"'	c #00FF00",
-"                     ",
-"  ................+  ",
-"  .@@###@##@@@@@$.%  ",
-"  ................%  ",
-"  .&&&&&&.$######.%  ",
-"  .*&=%-&.#$;;;##.%  ",
-"  .&&>,&&.#$#####.%  ",
-"  .*&%>'&.##$;;;#.%  ",
-"  .&&>,&&.#$#####.%  ",
-"  ........##$####.%  ",
-"  .$$$$$$.##$;;##.%  ",
-"  .$$$$$$.###$;;;.%  ",
-"  .$*###$.###$###.%  ",
-"  .$$$$$$.###$;;#.%  ",
-"  .$*###$.###$###.%  ",
-"  .$$$$$$.###$;;#.%  ",
-"  .$*$$$$.####$##.%  ",
-"  .$$$$$$.#######.%  ",
-"  ................%  ",
-"  +%%%%%%%%%%%%%%%%  ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/layout2.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/layout2.png differ
diff -Nru wxglade-0.9.6/icons/layout2.xpm wxglade-1.0.1/icons/layout2.xpm
--- wxglade-0.9.6/icons/layout2.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/layout2.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/* XPM */
-static char * D:\Python\wxglade\wxglade_dev_08\icons\layout2_xpm[] = {
-"21 21 15 1",
-" 	c None",
-".	c #7B7B7B",
-"+	c #F2F2F2",
-"@	c #00007B",
-"#	c #FFFFFF",
-"$	c #D6D6D6",
-"%	c #000000",
-"&	c #E5E5E5",
-"*	c #B2B2B2",
-"=	c #0000FF",
-"-	c #666666",
-";	c #999999",
-">	c #7F7F7F",
-",	c #FFFF00",
-"'	c #00FF00",
-"                     ",
-"  ................+  ",
-"  .@@###@##@@@@@$.%  ",
-"  ................%  ",
-"  .&&&&&&.$######.%  ",
-"  .*&=%-&.#$;;;##.%  ",
-"  .&&>,&&.#$#####.%  ",
-"  .*&%>'&.##$;;;#.%  ",
-"  .&&>,&&.#$#####.%  ",
-"  .&&&&&&.##$####.%  ",
-"  ................%  ",
-"  .$$$$$$$$$$$$$$.%  ",
-"  .$*##########$$.%  ",
-"  .$$$$$$$$$$$$$$.%  ",
-"  .$*##########$$.%  ",
-"  .$$$$$$$$$$$$$$.%  ",
-"  .$*$$$$$$$$$$$$.%  ",
-"  .$$$$$$$$$$$$$$.%  ",
-"  ................%  ",
-"  +%%%%%%%%%%%%%%%%  ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/layout3.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/layout3.png differ
diff -Nru wxglade-0.9.6/icons/layout3.xpm wxglade-1.0.1/icons/layout3.xpm
--- wxglade-0.9.6/icons/layout3.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/layout3.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/* XPM */
-static char * D:\Python\wxglade\wxglade_dev_08\icons\layout3_xpm[] = {
-"21 21 14 1",
-" 	c None",
-".	c #7B7B7B",
-"+	c #F2F2F2",
-"@	c #00007B",
-"#	c #FFFFFF",
-"$	c #000000",
-"%	c #B2B2B2",
-"&	c #E5E5E5",
-"*	c #0000FF",
-"=	c #666666",
-"-	c #7F7F7F",
-";	c #FFFF00",
-">	c #D6D6D6",
-",	c #999999",
-"                     ",
-"    ...........+     ",
-"    .@@###@#@@.$     ",
-"    ...........$     ",
-"    .%&*$=&&&&.$     ",
-"    .&&-;&&&&&.$     ",
-"    ...........$     ",
-"    .>########.$     ",
-"    .#>,,,####.$     ",
-"    .#>#######.$     ",
-"    .##>,,,###.$     ",
-"    .#>#######.$     ",
-"    ...........$     ",
-"    .>>>>>>>>>.$     ",
-"    .>%#####>>.$     ",
-"    .>>>>>>>>>.$     ",
-"    .>%#####>>.$     ",
-"    .>>>>>>>>>.$     ",
-"    ...........$     ",
-"    +$$$$$$$$$$$     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/list_box.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/list_box.png differ
diff -Nru wxglade-0.9.6/icons/list_box.xpm wxglade-1.0.1/icons/list_box.xpm
--- wxglade-0.9.6/icons/list_box.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/list_box.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* XPM */
-static char * list_box_xpm[] = {
-"21 21 6 1",
-" 	c None",
-".	c #848284",
-"+	c #000000",
-"@	c #FFFFFF",
-"#	c #C6C3C6",
-"$	c #000084",
-"                     ",
-"...............++++++",
-".@@@@@@@@@@@@@@+@@@#+",
-".@@@$$$$$$$$$@@+@..#+",
-".@@@@@@@@@@@@@@+@++#+",
-".@@@$$$$$$$$@@@+####+",
-".@@@@@@@@@@@@@@++++++",
-".@@@$$$$$$$$$@@+@#@#+",
-".@@@@@@@@@@@@@@+#@#@+",
-".@@@$$$$$$$$@@@+@#@#+",
-".$$$$$$$$$$$$$$+#@#@+",
-".$$$@@@@@@@@@$$+@#@#+",
-".$$$$$$$$$$$$$$+#@#@+",
-".@@@$$$$$$$$@@@+@#@#+",
-".@@@@@@@@@@@@@@++++++",
-".@@@$$$$$$$$$@@+@@@#+",
-".@@@@@@@@@@@@@@+@++#+",
-".@@@$$$$$$$$@@@+@..#+",
-".@@@@@@@@@@@@@@+####+",
-".++++++++++++++++++++",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/list_ctrl.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/list_ctrl.png differ
diff -Nru wxglade-0.9.6/icons/list_ctrl.xpm wxglade-1.0.1/icons/list_ctrl.xpm
--- wxglade-0.9.6/icons/list_ctrl.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/list_ctrl.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-/* XPM */
-static char * list_ctrl_xpm[] = {
-"21 21 4 1",
-" 	c None",
-".	c #000000",
-"+	c #DEDEDE",
-"@	c #FFFFFF",
-".....................",
-".++++++++++.++++++++.",
-".++++++++++.++++++++.",
-".++++++++++.++++++++.",
-".....................",
-".@@@@@@@@@@@@@@@@@@@.",
-".@.........@.......@.",
-".@@@@@@@@@@@@@@@@@@@.",
-".@.........@.......@.",
-".@@@@@@@@@@@@@@@@@@@.",
-".@.........@.......@.",
-".@@@@@@@@@@@@@@@@@@@.",
-".@.........@.......@.",
-".@@@@@@@@@@@@@@@@@@@.",
-".@.........@.......@.",
-".@@@@@@@@@@@@@@@@@@@.",
-".@.........@.......@.",
-".@@@@@@@@@@@@@@@@@@@.",
-".@.........@.......@.",
-".@@@@@@@@@@@@@@@@@@@.",
-"....................."};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/menubar.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/menubar.png differ
diff -Nru wxglade-0.9.6/icons/menubar.xpm wxglade-1.0.1/icons/menubar.xpm
--- wxglade-0.9.6/icons/menubar.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/menubar.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,207 +0,0 @@
-/* XPM */
-static char * menubar_xpm[] = {
-"21 21 183 2",
-"  	c None",
-". 	c #F8F6F7",
-"+ 	c #FFFBFC",
-"@ 	c #FFFEFC",
-"# 	c #FCFCFA",
-"$ 	c #FEFFFD",
-"% 	c #EBEDEC",
-"& 	c #FFFFFF",
-"* 	c #F7F2F6",
-"= 	c #FFFDFF",
-"- 	c #FFFEFF",
-"; 	c #EEEEEE",
-"> 	c #F7F7F7",
-", 	c #F6F6F6",
-"' 	c #000000",
-") 	c #FDF9FA",
-"! 	c #DED8DA",
-"~ 	c #DAD6D5",
-"{ 	c #D7D7D5",
-"] 	c #CFD4D0",
-"^ 	c #DFE4E0",
-"/ 	c #E2E7E3",
-"( 	c #D1D2D4",
-"_ 	c #D8D6D9",
-": 	c #DFD8DF",
-"< 	c #D5CFD3",
-"[ 	c #D6D4D7",
-"} 	c #D7D7D7",
-"| 	c #E2E2E2",
-"1 	c #D2D2D2",
-"2 	c #DBDBDB",
-"3 	c #C1C1C1",
-"4 	c #898989",
-"5 	c #D7D1D3",
-"6 	c #D9D5D4",
-"7 	c #E4E4E2",
-"8 	c #D2D7D3",
-"9 	c #707571",
-"0 	c #E1E2E4",
-"a 	c #D3D1D4",
-"b 	c #E9E2E9",
-"c 	c #E5DFE3",
-"d 	c #737174",
-"e 	c #E3E3E3",
-"f 	c #DADADA",
-"g 	c #757575",
-"h 	c #D8D8D8",
-"i 	c #747474",
-"j 	c #DDD7D9",
-"k 	c #E0DCDB",
-"l 	c #C3C3C1",
-"m 	c #EAEFEB",
-"n 	c #DFE0E2",
-"o 	c #E6E4E7",
-"p 	c #CFC8CF",
-"q 	c #E3DDE1",
-"r 	c #848285",
-"s 	c #D6D6D6",
-"t 	c #737373",
-"u 	c #D5D5D5",
-"v 	c #838383",
-"w 	c #DBD5D7",
-"x 	c #DCD8D7",
-"y 	c #DFDFDD",
-"z 	c #BEC3BF",
-"A 	c #DEE3DF",
-"B 	c #757A76",
-"C 	c #DDDBDE",
-"D 	c #DBD4DB",
-"E 	c #D0CACE",
-"F 	c #757376",
-"G 	c #E1E1E1",
-"H 	c #C7C7C7",
-"I 	c #CACACA",
-"J 	c #8B8B8B",
-"K 	c #E2DCDE",
-"L 	c #FEFAF9",
-"M 	c #FFFFFD",
-"N 	c #FAFFFB",
-"O 	c #F3F8F4",
-"P 	c #FCFFFD",
-"Q 	c #F4F5F7",
-"R 	c #716A71",
-"S 	c #8D878B",
-"T 	c #79777A",
-"U 	c #DCDCDC",
-"V 	c #868686",
-"W 	c #777777",
-"X 	c #6D6D6D",
-"Y 	c #787878",
-"Z 	c #CDC7C9",
-"` 	c #FFFEFD",
-" .	c #E0E0DE",
-"..	c #D4D9D5",
-"+.	c #DCE1DD",
-"@.	c #D8D9DB",
-"#.	c #E7E5E8",
-"$.	c #837C83",
-"%.	c #D2CCD0",
-"&.	c #C9C9C9",
-"*.	c #ECECEC",
-"=.	c #CCCCCC",
-"-.	c #878787",
-";.	c #FAF6F7",
-">.	c #969092",
-",.	c #EEEAE9",
-"'.	c #DEDEDC",
-").	c #777C78",
-"!.	c #787D79",
-"~.	c #747975",
-"{.	c #7F8082",
-"].	c #D7D5D8",
-"^.	c #878087",
-"/.	c #7D777B",
-"(.	c #7E7C7F",
-"_.	c #7D7D7D",
-":.	c #7F7F7F",
-"<.	c #818181",
-"[.	c #7E7E7E",
-"}.	c #707070",
-"|.	c #030000",
-"1.	c #0C0608",
-"2.	c #E7E7E5",
-"3.	c #CED3CF",
-"4.	c #DDE2DE",
-"5.	c #D5DAD6",
-"6.	c #DBDCDE",
-"7.	c #E1DFE2",
-"8.	c #827B82",
-"9.	c #040002",
-"0.	c #020003",
-"a.	c #010101",
-"b.	c #020202",
-"c.	c #F6F2F1",
-"d.	c #7C817D",
-"e.	c #858A86",
-"f.	c #898A8C",
-"g.	c #7F787F",
-"h.	c #090307",
-"i.	c #FDF9F8",
-"j.	c #EAEAE8",
-"k.	c #D1D6D2",
-"l.	c #D5D6D8",
-"m.	c #EAE8EB",
-"n.	c #756E75",
-"o.	c #FFFCFB",
-"p.	c #DADAD8",
-"q.	c #6E736F",
-"r.	c #888D89",
-"s.	c #808581",
-"t.	c #797A7C",
-"u.	c #ECEAED",
-"v.	c #0C060A",
-"w.	c #DCDCDA",
-"x.	c #E1E6E2",
-"y.	c #D0D5D1",
-"z.	c #D6D7D9",
-"A.	c #E9E7EA",
-"B.	c #766F76",
-"C.	c #0B0509",
-"D.	c #DBDBD9",
-"E.	c #767B77",
-"F.	c #7C7D7F",
-"G.	c #DAD8DB",
-"H.	c #7E777E",
-"I.	c #050003",
-"J.	c #F4F0EF",
-"K.	c #E5EAE6",
-"L.	c #D3D8D4",
-"M.	c #DEDFE1",
-"N.	c #D5D3D6",
-"O.	c #8B848B",
-"P.	c #070105",
-"Q.	c #7A7A78",
-"R.	c #717370",
-"S.	c #7D7F7E",
-"T.	c #7A7A7A",
-"U.	c #8C8A8D",
-"V.	c #716B6F",
-"W.	c #000201",
-"X.	c #020001",
-"Y.	c #040001",
-"Z.	c #050001",
-"                                          ",
-"                                          ",
-"  . + @ # $ $ % & * = = - & ; & > & & , ' ",
-"  ) ! ~ { ] ^ / ( _ : < [ } | 1 2 2 3 4 ' ",
-"  - 5 6 7 8 ] 9 0 a b c d | 1 e f g h i ' ",
-"  - j k l m ^ 9 n o p q r e s 2 1 t u v ' ",
-"  + w x y z A B n C D E F G H h I J } t ' ",
-"  - K L M N O P Q - R S T U v V W X f Y ' ",
-"  - Z `  .../ +.@.#.$.%.[ U U &.u *.=.-.' ",
-"  ;.>.,.'.).!.~.{.].^./.(.W _.:.<.X [.}.' ",
-"  |.1.` 2.3.4.5.6.7.8.9.0.a.a.a.a.a.a.a.b.",
-"      c.{ d.e.).f.].g.h.                  ",
-"      i.j.4.3.k.l.m.n.9.                  ",
-"      o.p.q.r.s.t.u.n.v.                  ",
-"      ` w.x.y.+.z.A.B.C.                  ",
-"      ` D.!.!.E.F.G.H.I.                  ",
-"      J.'.K.L.A M.N.O.P.                  ",
-"      M Q.R.).S.T.U.V.9.                  ",
-"        W.W.a.a.X.Y.Z.Y.                  ",
-"                                          ",
-"                                          "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/copy.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/copy.png differ
diff -Nru wxglade-0.9.6/icons/msw/copy.xpm wxglade-1.0.1/icons/msw/copy.xpm
--- wxglade-0.9.6/icons/msw/copy.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/copy.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-/* XPM */
-static char * copy_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #000080",
-"+	c #808080",
-"@	c #FFFFFF",
-"#	c #000000",
-"                ",
-" ......         ",
-"+.@@@@..        ",
-"+.@@@@.@#       ",
-"+.@##@.......   ",
-"+.@@@@+.@@@@.#  ",
-"+.@####.@@@@.@# ",
-"+.@@@@+.@##@....",
-"+.@####.@@@@@@@.",
-"+.@@@@+.@#####@.",
-"+.......@@@@@@@.",
-"+++++++.@#####@.",
-"      +.@@@@@@@.",
-"      +.........",
-"      ++++++++  ",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/cut.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/cut.png differ
diff -Nru wxglade-0.9.6/icons/msw/cut.xpm wxglade-1.0.1/icons/msw/cut.xpm
--- wxglade-0.9.6/icons/msw/cut.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/cut.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/* XPM */
-static char * cut_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #808080",
-"+	c #000080",
-"      .   .     ",
-"      .   .     ",
-"      +   +     ",
-"      +. .+     ",
-"      ++ ++     ",
-"      .+ +.     ",
-"       +++      ",
-"       .+.      ",
-"       +++      ",
-"       + +++    ",
-"     +++ + .+   ",
-"    +. + +  +   ",
-"    +  + +. +   ",
-"    + .+  ++    ",
-"     ++         ",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/exit.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/exit.png differ
diff -Nru wxglade-0.9.6/icons/msw/exit.xpm wxglade-1.0.1/icons/msw/exit.xpm
--- wxglade-0.9.6/icons/msw/exit.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/exit.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-/* XPM */
-static char * exit_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000",
-"+	c #FF0000",
-"@	c #FFFFFF",
-"                ",
-"            ... ",
-"      .     .+. ",
-"      ..    .+. ",
-"      .@.   .+. ",
-"   ....@@.  .+. ",
-"   .@@@@@@. .+. ",
-"  ..@@@@@@@..+. ",
-"  ..@@@@@@. .+. ",
-"  .....@@.. .+. ",
-"  .....@..  .+. ",
-"      ...   .+. ",
-"      ..    .+. ",
-"      .     .+. ",
-"            ... ",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/generate.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/generate.png differ
diff -Nru wxglade-0.9.6/icons/msw/generate.xpm wxglade-1.0.1/icons/msw/generate.xpm
--- wxglade-0.9.6/icons/msw/generate.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/generate.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-/* XPM */
-static char * generate_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #000080",
-"+	c #FFFFFF",
-"@	c #000000",
-"#	c #C0C0C0",
-"$	c #0000FF",
-"                ",
-"                ",
-"              . ",
-"             .+ ",
-"            .+. ",
-"           .+.. ",
-"          .+... ",
-" @@@@@@@ .+...  ",
-" @+++++#.+...   ",
-" @++++#.+...    ",
-" @+++#.+...     ",
-" @+++#....      ",
-" @++#.+..       ",
-" @++#$$         ",
-" @@#$           ",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/new.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/new.png differ
diff -Nru wxglade-0.9.6/icons/msw/new.xpm wxglade-1.0.1/icons/msw/new.xpm
--- wxglade-0.9.6/icons/msw/new.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/new.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-/* XPM */
-static char * new_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #808080",
-"#	c #C0C0C0",
-"                ",
-"                ",
-"   .......      ",
-"   .+++++..     ",
-"  @.+++++.+.    ",
-"  @.+++++....   ",
-"  @.++++++##.   ",
-"  @.++++++++.   ",
-"  @.++++++++.   ",
-"  @.++++++++.   ",
-"  @.++++++++.   ",
-"  @.++++++++.   ",
-"  @.++++++++.   ",
-"  @..........   ",
-"  @@@@@@@@@     ",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/open.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/open.png differ
diff -Nru wxglade-0.9.6/icons/msw/open.xpm wxglade-1.0.1/icons/msw/open.xpm
--- wxglade-0.9.6/icons/msw/open.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/open.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-/* XPM */
-static char * open_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFF00",
-"@	c #FFFFFF",
-"#	c #808080",
-"$	c #808000",
-"                ",
-"                ",
-"          ...   ",
-"         .   . .",
-"   ...        ..",
-"  .+@+...... ...",
-"  .@+@+@+@+.    ",
-" #.+@+@+@+@.    ",
-" #.@+@+.........",
-" #.+@+.$$$$$$$$.",
-" #.@+.$$$$$$$$. ",
-" #.+.$$..$$$$.  ",
-" #..$$$$$$$$.   ",
-" #..........    ",
-" #########      ",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/paste.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/paste.png differ
diff -Nru wxglade-0.9.6/icons/msw/paste.xpm wxglade-1.0.1/icons/msw/paste.xpm
--- wxglade-0.9.6/icons/msw/paste.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/paste.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/* XPM */
-static char * paste_xpm[] = {
-"16 16 8 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFF00",
-"@	c #808000",
-"#	c #C0C0C0",
-"$	c #808080",
-"%	c #FFFFFF",
-"&	c #000080",
-"                ",
-"      ....      ",
-"  .....++.....  ",
-" .@#@.+..+.#@#. ",
-"$.#$.%%%%%%.$@. ",
-"$.@$........$#. ",
-"$.#@#@##&&&&&&. ",
-"$.@#@#@$&%%%%&& ",
-"$.#@#@#$&%%%%&%&",
-"$.@#@#@$&%..%&&&",
-"$.#@#@#$&%%%%%%&",
-"$.@#@#@$&%....%&",
-" $......&%%%%%%&",
-"  $$$$$$&&&&&&&&",
-"       $$$$$$$  ",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/prefs.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/prefs.png differ
diff -Nru wxglade-0.9.6/icons/msw/prefs.xpm wxglade-1.0.1/icons/msw/prefs.xpm
--- wxglade-0.9.6/icons/msw/prefs.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/prefs.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/* XPM */
-static char * prefs_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"       ..... .. ",
-"      .+.+++... ",
-" .....+.+.+++.. ",
-" .++.+.+.+.++.. ",
-" .+.+.+.+.+.... ",
-" .++.+++.+.. .. ",
-" .+++++++.+.    ",
-" .+++++++++.    ",
-" .+..+....+.    ",
-" .+++++++++.    ",
-" .+..+....+.    ",
-" .+++++++++.    ",
-" ...........    ",
-"                ",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/refresh.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/refresh.png differ
diff -Nru wxglade-0.9.6/icons/msw/refresh.xpm wxglade-1.0.1/icons/msw/refresh.xpm
--- wxglade-0.9.6/icons/msw/refresh.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/refresh.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-/* XPM */
-static char * refresh_xpm[] = {
-"14 14 2 1",
-" 	c None",
-".	c #000080",
-"              ",
-"    ......    ",
-"   ........   ",
-"  ...    ..   ",
-" ...      ..  ",
-".....         ",
-" ...       .  ",
-"  .       ... ",
-"         .....",
-"  ..      ... ",
-"  ..     ...  ",
-"   ........   ",
-"    ......    ",
-"              "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/remove.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/remove.png differ
diff -Nru wxglade-0.9.6/icons/msw/remove.xpm wxglade-1.0.1/icons/msw/remove.xpm
--- wxglade-0.9.6/icons/msw/remove.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/remove.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-/* XPM */
-static char * remove_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #000000",
-"+	c #C0C0C0",
-"@	c #808080",
-"#	c #FFFFFF",
-"                ",
-"                ",
-"     .....      ",
-"  ....++++....  ",
-"  .@@@@@@@@@@.  ",
-"  .@+@+#@+@+@.  ",
-"   .@@@@@@@@.   ",
-"   .@+@+#@+@.   ",
-"   .@+@+#@+@.   ",
-"   .@+@+#@+@.   ",
-"   .@+@+#@+@.   ",
-"   .@+@+#@+@.   ",
-"   .@+@+#@+@.   ",
-"   .@+@+#@+@.   ",
-"    ........    ",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/save_as.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/save_as.png differ
diff -Nru wxglade-0.9.6/icons/msw/save_as.xpm wxglade-1.0.1/icons/msw/save_as.xpm
--- wxglade-0.9.6/icons/msw/save_as.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/save_as.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-/* XPM */
-static char * save_as_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #000000",
-"+	c #808000",
-"@	c #C0C0C0",
-"#	c #FFFFFF",
-"$	c #808080",
-"                ",
-"                ",
-"...........     ",
-".+.@#@#@.@.     ",
-".+.#@...........",
-".+.@#.+.@#@#@.@.",
-".+.#$.+.#@#@#...",
-".+....+.@#@#@.+.",
-".+++$.+.#@#@#.+.",
-".+....+.......+.",
-".+.$$.+++++++++.",
-".+.$$.+.......+.",
-" .....+.$$$.@.+.",
-"    $.+.$$$.@.+.",
-"    $$..........",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/save.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/save.png differ
diff -Nru wxglade-0.9.6/icons/msw/save.xpm wxglade-1.0.1/icons/msw/save.xpm
--- wxglade-0.9.6/icons/msw/save.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/save.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-/* XPM */
-static char * save_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #000000",
-"+	c #808000",
-"@	c #C0C0C0",
-"#	c #FFFFFF",
-"$	c #808080",
-"                ",
-"                ",
-" .............  ",
-" .+.@#@#@#@.@.  ",
-" .+.#@#@#@#...  ",
-" .+.@#@#@#@.+.  ",
-" .+.#@#@#@#.+.  ",
-" .+.@#@#@#@.+.  ",
-" .++.......++.  ",
-" .+++++++++++.  ",
-" .++........+.  ",
-" .++..$..@@.+.  ",
-" .++.$.$.@@.+.  ",
-" .++..$..@@.+.  ",
-"  ............  ",
-"                "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/msw/tutorial.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/msw/tutorial.png differ
diff -Nru wxglade-0.9.6/icons/msw/tutorial.xpm wxglade-1.0.1/icons/msw/tutorial.xpm
--- wxglade-0.9.6/icons/msw/tutorial.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/msw/tutorial.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* XPM */
-static char * tutorial_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #FFFF00",
-"#	c #000080",
-"$	c #C0C0C0",
-"%	c #808080",
-"                ",
-"     ......     ",
-"   ..++@+@+..   ",
-"  .@+@####+@+.  ",
-"  .++##@$##++.  ",
-" .+@+#%++##@++. ",
-" .+++@+@%#%++@. ",
-" .+@+++%#++@++. ",
-" .+++@+#%@+++@. ",
-"  .@+++@+++@+.  ",
-"  .++@+##@+++.  ",
-"   .+++@+++..   ",
-"   .+@.....     ",
-"   .+.          ",
-"   ..           ",
-"   .            "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/notebook.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/notebook.png differ
diff -Nru wxglade-0.9.6/icons/notebook.xpm wxglade-1.0.1/icons/notebook.xpm
--- wxglade-0.9.6/icons/notebook.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/notebook.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* XPM */
-static char * notebook_xpm[] = {
-"21 21 19 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #6C6C6C",
-"@	c #D9D9D9",
-"#	c #989898",
-"$	c #020202",
-"%	c #D8D8D8",
-"&	c #7C7C7C",
-"*	c #000000",
-"=	c #050505",
-"-	c #010101",
-";	c #101010",
-">	c #060606",
-",	c #7E7E7E",
-"'	c #0F0F0F",
-")	c #0C0C0C",
-"!	c #0E0E0E",
-"~	c #0B0B0B",
-"{	c #030303",
-"                     ",
-"                     ",
-"                     ",
-" ......+....+....+   ",
-" .@@@@@+####+####+   ",
-" .@@@@@+####+####+   ",
-" .@@@@@+####+####+   ",
-" .@@@@@+...........$ ",
-" .%@@@@@@@@@@@@@@@&* ",
-" .@@@@@@@@@@@@@@@@&= ",
-" .@@@@@@@@@@@@@@@@&* ",
-" .@@@@@@@@@@@@@@@@&- ",
-" .@@@@@@@@@@@@@@@@&; ",
-" .@@@@@@@@@@@@@@@@&> ",
-" .@@@@@@@@@@@@@@@@&* ",
-" .@@@@@@@@@@@@@@@@&* ",
-" .&&&&&&&&&&&&&&,&&' ",
-" *)*!~*********=-*~{ ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/panel.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/panel.png differ
diff -Nru wxglade-0.9.6/icons/panel.xpm wxglade-1.0.1/icons/panel.xpm
--- wxglade-0.9.6/icons/panel.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/panel.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/* XPM */
-static char * panel_xpm[] = {
-"21 21 36 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #FBFBFB",
-"@	c #F8F8F8",
-"#	c #000000",
-"$	c #F5F5F5",
-"%	c #D7D7D7",
-"&	c #D1D1D1",
-"*	c #777777",
-"=	c #0C0C0C",
-"-	c #FDFDFD",
-";	c #D2D2D2",
-">	c #CECECE",
-",	c #181818",
-"'	c #D6D6D6",
-")	c #D8D8D8",
-"!	c #FCFCFC",
-"~	c #DBDBDB",
-"{	c #D0D0D0",
-"]	c #0B0B0B",
-"^	c #090909",
-"/	c #DADADA",
-"(	c #080808",
-"_	c #191919",
-":	c #D9D9D9",
-"<	c #D4D4D4",
-"[	c #0A0A0A",
-"}	c #F1F1F1",
-"|	c #F3F3F3",
-"1	c #D5D5D5",
-"2	c #0D0D0D",
-"3	c #0F0F0F",
-"4	c #060606",
-"5	c #020202",
-"6	c #101010",
-"7	c #040404",
-".+........@.........#",
-"$%%%%%%%%%%%%%%%%%&*=",
-"-%%%%%%%%%%%%%%%%%;*#",
-".%%%%%%%%%%%%%%%%%>*,",
-".%'%%%%%%%%%%%%%%);*#",
-"!%)%%%%%%%%%%%%%%~{*]",
-".%%%%%%%%%%%%%)%%~%*^",
-"-%'%%%%%%%%%%%%%%%/*#",
-"+%%%%%%%%%%%%%%%%'&*#",
-".%%%%%%%%%%%%%%%%%%*(",
-".%%%%%%%%%%%%%%%%%%*#",
-"+%%%%%%%%%%%%%%%%%{*_",
-".%%%%%%%%%%:%%%%%%<*#",
-"@%%%%%%%%%%%%%%%%%'*[",
-".%%%%%%%%%%%%%%%%%'*#",
-"}%%%%%%%%%%%%%%%%%~*#",
-".%%%%%%%%%%%%%%%%%~*#",
-".%%%%%%%%%%%%%%%%%%*#",
-"|%%%%%%%%%%%%%%%1%%*2",
-".*******************3",
-"##[^#45#6#4###5#7#4=#"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/pin_design.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/pin_design.png differ
diff -Nru wxglade-0.9.6/icons/pin_design.xpm wxglade-1.0.1/icons/pin_design.xpm
--- wxglade-0.9.6/icons/pin_design.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/pin_design.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/* XPM */
-static char * D:\Python\wxglade\wxglade_dev_08\icons\pin_design_xpm[] = {
-"21 21 56 1",
-" 	c None",
-".	c #AA0000",
-"+	c #860000",
-"@	c #800000",
-"#	c #B50000",
-"$	c #7B7B7B",
-"%	c #9F7070",
-"&	c #7A0000",
-"*	c #4B0000",
-"=	c #940000",
-"-	c #970000",
-";	c #550000",
-">	c #410000",
-",	c #9E6A6A",
-"'	c #F2F2F2",
-")	c #00007B",
-"!	c #FF0000",
-"~	c #CB5700",
-"{	c #290000",
-"]	c #F50000",
-"^	c #7C0000",
-"/	c #93000A",
-"(	c #000000",
-"_	c #00FFFF",
-":	c #720100",
-"<	c #A00000",
-"[	c #D50000",
-"}	c #430000",
-"|	c #D6D6D6",
-"1	c #530000",
-"2	c #C80000",
-"3	c #4C0000",
-"4	c #FFFFFF",
-"5	c #992323",
-"6	c #810000",
-"7	c #630000",
-"8	c #A83030",
-"9	c #F6E0E0",
-"0	c #350000",
-"a	c #700000",
-"b	c #C60000",
-"c	c #6A0000",
-"d	c #FBE3E3",
-"e	c #A32C2C",
-"f	c #9E2B2B",
-"g	c #756868",
-"h	c #606060",
-"i	c #C6C6C6",
-"j	c #121212",
-"k	c #111111",
-"l	c #F7F7F7",
-"m	c #D7D7D7",
-"n	c #EDEDED",
-"o	c #505050",
-"p	c #F5F5F5",
-"q	c #FBFBFB",
-"                     ",
-"     .+@#            ",
-"$$$%&*=-;>,$$$$$$$$$'",
-"$)!~{]!!!^/))))))))$(",
-"$)_:<!!!![})))))|(|$(",
-"$$$12!!!!23$$$$$$$$$(",
-"$|456!!!!7844444444$(",
-"$|490ab2c}d44444444$(",
-"$|44de3*fg444444444$(",
-"$|444444h(i44444444$(",
-"$|4444444jk44444444$(",
-"$|4444444l(m4444444$(",
-"$|44444444no4444444$(",
-"$|444444444pq444444$(",
-"$|44444444444444444$(",
-"$|44444444444444444$(",
-"$$$$$$$$$$$$$$$$$$$$(",
-"'((((((((((((((((((((",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/radio_box.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/radio_box.png differ
diff -Nru wxglade-0.9.6/icons/radio_box.xpm wxglade-1.0.1/icons/radio_box.xpm
--- wxglade-0.9.6/icons/radio_box.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/radio_box.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-/* XPM */
-static char * radio_box_xpm[] = {
-"21 21 76 1",
-" 	c None",
-".	c #D4D4D4",
-"+	c #DEDEDE",
-"@	c #DCDCDC",
-"#	c #DADADA",
-"$	c #000000",
-"%	c #0F0F0F",
-"&	c #E4E4E4",
-"*	c #E2E2E2",
-"=	c #CACACA",
-"-	c #D2D2D2",
-";	c #CCCCCC",
-">	c #EEEEEE",
-",	c #D8D8D8",
-"'	c #DDDDDD",
-")	c #7A7A7A",
-"!	c #8C8C8C",
-"~	c #7F7F7F",
-"{	c #C9C9C9",
-"]	c #0B0B0B",
-"^	c #D7D7D7",
-"/	c #080808",
-"(	c #E0E0E0",
-"_	c #8F8F8F",
-":	c #727272",
-"<	c #828282",
-"[	c #7B7B7B",
-"}	c #6B6B6B",
-"|	c #FFFFFF",
-"1	c #7C7C7C",
-"2	c #F8F8F8",
-"3	c #F7F7F7",
-"4	c #030303",
-"5	c #191919",
-"6	c #C4C4C4",
-"7	c #090909",
-"8	c #C1C1C1",
-"9	c #F4F4F4",
-"0	c #F5F5F5",
-"a	c #898989",
-"b	c #797979",
-"c	c #CDCDCD",
-"d	c #0C0C0C",
-"e	c #E5E5E5",
-"f	c #C2C2C2",
-"g	c #EAEAEA",
-"h	c #D6D6D6",
-"i	c #CBCBCB",
-"j	c #CFCFCF",
-"k	c #686868",
-"l	c #6C6C6C",
-"m	c #D5D5D5",
-"n	c #D1D1D1",
-"o	c #D9D9D9",
-"p	c #E3E3E3",
-"q	c #C8C8C8",
-"r	c #757575",
-"s	c #FCFCFC",
-"t	c #777777",
-"u	c #DBDBDB",
-"v	c #DFDFDF",
-"w	c #848284",
-"x	c #D3D3D3",
-"y	c #FDFDFD",
-"z	c #787878",
-"A	c #C6C3C6",
-"B	c #717171",
-"C	c #808080",
-"D	c #D0D0D0",
-"E	c #7D7D7D",
-"F	c #F9F9F9",
-"G	c #868686",
-"H	c #747474",
-"I	c #848484",
-"J	c #888888",
-"K	c #FBFBFB",
-"                     ",
-" .+@#$$%&$*=-.*+;>,' ",
-" )!~{]@$^$$/(_:<~[}| ",
-" 123+$$4+56789|0||a> ",
-" b|@cde$f$/$,ghi+jk| ",
-" l|;mnco'pq+f@m^+@rs ",
-" t|uo.vjwwww+h=@nx<y ",
-" z|^hhww$$$$ww-,hh1| ",
-" z|^hw$$||||$$|,hh1| ",
-" z|^hw$||||||A|,hh1| ",
-" z|^w$|||$$|||A|hh1| ",
-" z|^w$||$$$$||A|hh1| ",
-" z|^w$||$$$$||A|hh1| ",
-" z|^w$|||$$|||A|hh1| ",
-" z|^hw$||||||A|,hh1| ",
-" B|qmwAA||||AA|m,-C| ",
-" z|#^^||AAAA||n^+DEF ",
-" B|*hhhh||||xn,(o8C| ",
-" z|hhhhhhhhhhhhhhhEF ",
-" Gz}11111111~1rHzIJ| ",
-" 3||||||||||K|||||+| "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/radio_button.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/radio_button.png differ
diff -Nru wxglade-0.9.6/icons/radio_button.xpm wxglade-1.0.1/icons/radio_button.xpm
--- wxglade-0.9.6/icons/radio_button.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/radio_button.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/* XPM */
-static char * radio_button_xpm[] = {
-"21 21 5 1",
-" 	c None",
-".	c #848284",
-"+	c #000000",
-"@	c #FFFFFF",
-"#	c #C6C3C6",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"        ....         ",
-"      ..++++..       ",
-"     .++@@@@++@      ",
-"     .+@@@@@@#@      ",
-"    .+@@@++@@@#@     ",
-"    .+@@++++@@#@     ",
-"    .+@@++++@@#@     ",
-"    .+@@@++@@@#@     ",
-"     .+@@@@@@#@      ",
-"     .##@@@@##@      ",
-"      @@####@@       ",
-"        @@@@         ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/search_ctrl.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/search_ctrl.png differ
diff -Nru wxglade-0.9.6/icons/search_ctrl.xpm wxglade-1.0.1/icons/search_ctrl.xpm
--- wxglade-0.9.6/icons/search_ctrl.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/search_ctrl.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/* XPM */
-static char * D:\Python\wxglade\wxglade_dev_08\icons\search_ctrl_xpm[] = {
-"21 21 51 1",
-" 	c None",
-".	c #7B7B7B",
-"+	c #FFFFFF",
-"@	c #000000",
-"#	c #D6D6D6",
-"$	c #929292",
-"%	c #252525",
-"&	c #050505",
-"*	c #1F1F1F",
-"=	c #4F4F4F",
-"-	c #1B1B1B",
-";	c #8D8D8D",
-">	c #B2B2B2",
-",	c #989898",
-"'	c #2E2E2E",
-")	c #202020",
-"!	c #B8B8B8",
-"~	c #030303",
-"{	c #EFEFEF",
-"]	c #FEFEFE",
-"^	c #F9F9F9",
-"/	c #4B4B4B",
-"(	c #757575",
-"_	c #292929",
-":	c #7C7C7C",
-"<	c #E5E5E5",
-"[	c #040404",
-"}	c #060606",
-"|	c #D5D5D5",
-"1	c #FCFCFC",
-"2	c #0F0F0F",
-"3	c #808080",
-"4	c #424242",
-"5	c #E3E3E3",
-"6	c #212121",
-"7	c #919191",
-"8	c #222222",
-"9	c #3B3B3B",
-"0	c #D3D3D3",
-"a	c #B9B9B9",
-"b	c #010101",
-"c	c #FDFDFD",
-"d	c #848484",
-"e	c #070707",
-"f	c #888888",
-"g	c #F3F3F3",
-"h	c #5A5A5A",
-"i	c #CECECE",
-"j	c #D2D2D2",
-"k	c #959595",
-"l	c #A9A9A9",
-"                     ",
-"                     ",
-"....................+",
-".@@@@@@@@@@@@@@@@@@#+",
-".@+++++++++++++++++#+",
-".@+++$%&*$+++++++@+#+",
-".@++=-;>,')++++++@+#+",
-".@+!~{]^++/(+++++@+#+",
-".@+_:]+++]<[+++++@+#+",
-".@+@<]+++++@+++++@+#+",
-".@+}|+++1+!2+++++@+#+",
-".@+34+++1567+++++@+#+",
-".@++890+ab-++++++@+#+",
-".@++cd}@e4f++++++@+#+",
-".@++++++gh@i+++++@+#+",
-".@+++++++j@/+++++@+#+",
-".@++++++++kl+++++++#+",
-".###################+",
-"+++++++++++++++++++++",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/sizer_h.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/sizer_h.png differ
diff -Nru wxglade-0.9.6/icons/sizer_h.xpm wxglade-1.0.1/icons/sizer_h.xpm
--- wxglade-0.9.6/icons/sizer_h.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/sizer_h.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* XPM */
-static char * D:\Python\Sources35\wxglade\icons\sizer_h_xpm[] = {
-"21 21 22 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #020202",
-"@	c #050505",
-"#	c #000000",
-"$	c #D8D8D8",
-"%	c #7A7A7A",
-"&	c #0A0A0A",
-"*	c #0B0B0B",
-"=	c #0D0D0D",
-"-	c #D9D9D9",
-";	c #010101",
-">	c #D6D6D6",
-",	c #060606",
-"'	c #030303",
-")	c #D7D7D7",
-"!	c #070707",
-"~	c #DADADA",
-"{	c #F0F0F0",
-"]	c #0F0F0F",
-"^	c #0C0C0C",
-"/	c #040404",
-"......+......@......#",
-".$$$$%#.$$$$%#.$$$$%#",
-".$$$$%&.$$$$%*.$$$$%=",
-".$$$$%#.$$$$%#.$$$$%#",
-".-$$$%;.$$$$%#.$$>$%#",
-".-$$$%;.$$$$%#.$$>$%#",
-".-$$$%;.$$$$%#.$$>$%#",
-".-$$$%;.$$$$%#.$$>$%#",
-".-$$$%;.$$$$%#.$$>$%#",
-".-$$$%;.$$$$%#.$$$$%#",
-".-$$$%;.$$$$%#.$$$$%#",
-".-$$$%;.$$$$%#.$$$$%#",
-".$$$$%,.$$$$%'.$$$$%+",
-".$$$$%&.$$$$%#.$$$$%#",
-".$)$$%#.$$$$%!.$$$$%,",
-".$$$$%#.$$$$%'.$~$$%+",
-".$$$$%#.$$$$%#.$$$$%#",
-".$$$$%#.$$$$%+.$$$$%;",
-".$$$$%+.$$$$%#.$$$$%#",
-"{%%%%%+{%%%%%;{%%%%%#",
-"]';^##,#@@##/#/#++#/#"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/sizer.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/sizer.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/sizer_slot_h.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/sizer_slot_h.png differ
diff -Nru wxglade-0.9.6/icons/sizer_slot_h.xpm wxglade-1.0.1/icons/sizer_slot_h.xpm
--- wxglade-0.9.6/icons/sizer_slot_h.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/sizer_slot_h.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/* XPM */
-static char * D:\Python\Sources35\wxglade\icons\sizer_slot_h_xpm[] = {
-"21 21 23 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #747474",
-"@	c #050505",
-"#	c #727272",
-"$	c #E3E3E3",
-"%	c #D8D8D8",
-"&	c #7A7A7A",
-"*	c #000000",
-"=	c #7C7C7C",
-"-	c #0B0B0B",
-";	c #7E7E7E",
-">	c #737373",
-",	c #787878",
-"'	c #030303",
-")	c #070707",
-"!	c #020202",
-"~	c #F0F0F0",
-"{	c #010101",
-"]	c #808080",
-"^	c #757575",
-"/	c #040404",
-"(	c #767676",
-"......+......@......#",
-".....$#.%%%%&*.....$#",
-".....$=.%%%%&-.....$;",
-".....$#.%%%%&*.....$#",
-".....$>.%%%%&*.....$#",
-".....$>.%%%%&*.....$#",
-".....$>.%%%%&*.....$#",
-".....$>.%%%%&*.....$#",
-".....$>.%%%%&*.....$#",
-".....$>.%%%%&*.....$#",
-".....$>.%%%%&*.....$#",
-".....$>.%%%%&*.....$#",
-".....$,.%%%%&'.....$+",
-".....$=.%%%%&*.....$#",
-".....$#.%%%%&).....$,",
-".....$#.%%%%&'.....$+",
-".....$#.%%%%&*.....$#",
-".....$#.%%%%&!.....$>",
-".....$+.%%%%&*.....$#",
-".$$$$$+~&&&&&{.$$$$$#",
-"]^>;##,*@@**/*(#++#(#"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/sizer_slot.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/sizer_slot.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/sizer_slot_v.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/sizer_slot_v.png differ
diff -Nru wxglade-0.9.6/icons/sizer_slot_v.xpm wxglade-1.0.1/icons/sizer_slot_v.xpm
--- wxglade-0.9.6/icons/sizer_slot_v.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/sizer_slot_v.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/* XPM */
-static char * D:\Python\Sources35\wxglade\icons\sizer_slot_v_xpm[] = {
-"21 21 23 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #808080",
-"@	c #E3E3E3",
-"#	c #757575",
-"$	c #737373",
-"%	c #7E7E7E",
-"&	c #727272",
-"*	c #747474",
-"=	c #7C7C7C",
-"-	c #787878",
-";	c #F0F0F0",
-">	c #000000",
-",	c #D8D8D8",
-"'	c #7A7A7A",
-")	c #050505",
-"!	c #040404",
-"~	c #0B0B0B",
-"{	c #030303",
-"]	c #070707",
-"^	c #020202",
-"/	c #010101",
-"(	c #767676",
-"....................+",
-"...................@#",
-"...................@$",
-"...................@%",
-"...................@&",
-".@@@@@@@@@@@@@@@@@@@&",
-"*&=&$$$$$$$$-=&&&&**-",
-"...................;>",
-".,,,,,,,,,,,,,,,,,,')",
-".,,,,,,,,,,,,,,,,,,')",
-".,,,,,,,,,,,,,,,,,,'>",
-".,,,,,,,,,,,,,,,,,,'>",
-".'''''''''''''''''''!",
-")>~>>>>>>>>>{>]{>^>/>",
-"....................(",
-"...................@&",
-"...................@*",
-"...................@*",
-"...................@&",
-".@@@@@@@@@@@@@@@@@@@(",
-"&&%&&&&&&&&&*&-*&$&&&"};
diff -Nru wxglade-0.9.6/icons/sizer_slot.xpm wxglade-1.0.1/icons/sizer_slot.xpm
--- wxglade-0.9.6/icons/sizer_slot.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/sizer_slot.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/* XPM */
-static char * D:\Python\Sources35\wxglade\icons\sizer_slot_v_xpm[] = {
-"21 21 23 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #808080",
-"@	c #E3E3E3",
-"#	c #757575",
-"$	c #737373",
-"%	c #7E7E7E",
-"&	c #727272",
-"*	c #747474",
-"=	c #7C7C7C",
-"-	c #787878",
-";	c #F0F0F0",
-">	c #000000",
-",	c #D8D8D8",
-"'	c #7A7A7A",
-")	c #050505",
-"!	c #040404",
-"~	c #0B0B0B",
-"{	c #030303",
-"]	c #070707",
-"^	c #020202",
-"/	c #010101",
-"(	c #767676",
-"....................+",
-"...................@#",
-"...................@$",
-"...................@%",
-"...................@&",
-".@@@@@@@@@@@@@@@@@@@&",
-"*&=&$$$$$$$$-=&&&&**-",
-"...................;>",
-".,,,,,,,,,,,,,,,,,,')",
-".,,,,,,,,,,,,,,,,,,')",
-".,,,,,,,,,,,,,,,,,,'>",
-".,,,,,,,,,,,,,,,,,,'>",
-".'''''''''''''''''''!",
-")>~>>>>>>>>>{>]{>^>/>",
-"....................(",
-"...................@&",
-"...................@*",
-"...................@*",
-"...................@&",
-".@@@@@@@@@@@@@@@@@@@(",
-"&&%&&&&&&&&&*&-*&$&&&"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/sizer_v.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/sizer_v.png differ
diff -Nru wxglade-0.9.6/icons/sizer_v.xpm wxglade-1.0.1/icons/sizer_v.xpm
--- wxglade-0.9.6/icons/sizer_v.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/sizer_v.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* XPM */
-static char * D:\Python\Sources35\wxglade\icons\sizer_v_xpm[] = {
-"21 21 22 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #F0F0F0",
-"@	c #0F0F0F",
-"#	c #D8D8D8",
-"$	c #D9D9D9",
-"%	c #7A7A7A",
-"&	c #030303",
-"*	c #D7D7D7",
-"=	c #010101",
-"-	c #0C0C0C",
-";	c #000000",
-">	c #020202",
-",	c #0A0A0A",
-"'	c #060606",
-")	c #050505",
-"!	c #040404",
-"~	c #0B0B0B",
-"{	c #070707",
-"]	c #DADADA",
-"^	c #D6D6D6",
-"/	c #0D0D0D",
-"...................+@",
-".###$$$$$$$$#######%&",
-".#############*####%=",
-".##################%-",
-".##################%;",
-".%%%%%%%%%%%%%%%%%%%;",
-">;,;========',;;;;>>'",
-"...................+;",
-".##################%)",
-".##################%)",
-".##################%;",
-".##################%;",
-".%%%%%%%%%%%%%%%%%%%!",
-");~;;;;;;;;;&;{&;>;=;",
-"...................+!",
-".##################%;",
-".##############]###%>",
-".###^^^^^##########%>",
-".##################%;",
-".%%%%%%%%%%%%%%%%%%%!",
-";;/;;;;;;;;;>;'>;=;;;"};
diff -Nru wxglade-0.9.6/icons/sizer.xpm wxglade-1.0.1/icons/sizer.xpm
--- wxglade-0.9.6/icons/sizer.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/sizer.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* XPM */
-static char * sizer_xpm[] = {
-"21 21 22 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #F0F0F0",
-"@	c #0F0F0F",
-"#	c #D8D8D8",
-"$	c #D9D9D9",
-"%	c #7A7A7A",
-"&	c #030303",
-"*	c #D7D7D7",
-"=	c #010101",
-"-	c #0C0C0C",
-";	c #000000",
-">	c #020202",
-",	c #0A0A0A",
-"'	c #060606",
-")	c #050505",
-"!	c #040404",
-"~	c #0B0B0B",
-"{	c #070707",
-"]	c #DADADA",
-"^	c #D6D6D6",
-"/	c #0D0D0D",
-"...................+@",
-".###$$$$$$$$#######%&",
-".#############*####%=",
-".##################%-",
-".##################%;",
-".%%%%%%%%%%%%%%%%%%%;",
-">;,;========',;;;;>>'",
-"...................+;",
-".##################%)",
-".##################%)",
-".##################%;",
-".##################%;",
-".%%%%%%%%%%%%%%%%%%%!",
-");~;;;;;;;;;&;{&;>;=;",
-"...................+!",
-".##################%;",
-".##############]###%>",
-".###^^^^^##########%>",
-".##################%;",
-".%%%%%%%%%%%%%%%%%%%!",
-";;/;;;;;;;;;>;'>;=;;;"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/slider.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/slider.png differ
diff -Nru wxglade-0.9.6/icons/slider.xpm wxglade-1.0.1/icons/slider.xpm
--- wxglade-0.9.6/icons/slider.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/slider.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* XPM */
-static char * slider_xpm[] = {
-"21 21 6 1",
-" 	c None",
-".	c #000000",
-"+	c #7B7B7B",
-"@	c #FFFFFF",
-"#	c #D6D6D6",
-"$	c #DEDEDE",
-"                     ",
-"                     ",
-"   ..     ..         ",
-"  .  .   .  .        ",
-"  .  .   .  .        ",
-"  .  .   .  .        ",
-"  .  .   .  .        ",
-"   ..  .  ..         ",
-"                     ",
-"                     ",
-"+++++++++++++++++++++",
-"+...................@",
-"+.@@@@@@@@.########$@",
-"+.@###+##+.########$@",
-"+.@###+##+.########$@",
-"+.@+++++++.########$@",
-"+..........########$@",
-"+.$$$$$$$$$$$$$$$$$$@",
-"+@@@@@@@@@@@@@@@@@@@@",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/slot.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/slot.png differ
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/spacer.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/spacer.png differ
diff -Nru wxglade-0.9.6/icons/spacer.xpm wxglade-1.0.1/icons/spacer.xpm
--- wxglade-0.9.6/icons/spacer.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/spacer.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/* XPM */
-static char * spacer_xpm[] = {
-"21 21 3 1",
-" 	c None",
-".	c #000000",
-"+	c #929292",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-" .                .  ",
-" .+               .+ ",
-" .+  .        .   .+ ",
-" .+ ..        ..  .+ ",
-" .+.............. .+ ",
-" .+ ..++++++++..++.+ ",
-" .+  .+       .++ .+ ",
-" .+   +        +  .+ ",
-" .+               .+ ",
-"  +                + ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/spinbtn.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/spinbtn.png differ
diff -Nru wxglade-0.9.6/icons/spinbtn.xpm wxglade-1.0.1/icons/spinbtn.xpm
--- wxglade-0.9.6/icons/spinbtn.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/spinbtn.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/* XPM */
-static char * spinbtn_xpm[] = {
-"21 21 7 1",
-" 	c None",
-".	c #141414",
-"+	c #D6D6D6",
-"@	c #D4D4D4",
-"#	c #000000",
-"$	c #0A0A0A",
-"%	c #0D0D0D",
-"                     ",
-"                     ",
-"                     ",
-"     ...........     ",
-"     .+++@+@+++.     ",
-"     .++++#++++.     ",
-"     .+++...+++.     ",
-"     .++.....++.     ",
-"     .+.......+.     ",
-"     .+++++++++.     ",
-"     ...........     ",
-"     $+++++++++$     ",
-"     .+.......+.     ",
-"     .++.....++.     ",
-"     .+++...+++.     ",
-"     .++++.++++.     ",
-"     .+++++++++.     ",
-"     #%%%%%%%%%#     ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/spin_ctrl_double.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/spin_ctrl_double.png differ
diff -Nru wxglade-0.9.6/icons/spin_ctrl_double.xpm wxglade-1.0.1/icons/spin_ctrl_double.xpm
--- wxglade-0.9.6/icons/spin_ctrl_double.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/spin_ctrl_double.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/* XPM */
-static char * spin_ctrl_xpm[] = {
-"21 21 38 1",
-" 	c None",
-".	c #000000",
-"+	c #060608",
-"@	c #000002",
-"#	c #020202",
-"$	c #010101",
-"%	c #080808",
-"&	c #131313",
-"*	c #FFFFFF",
-"=	c #F7F7F7",
-"-	c #FDFDFD",
-";	c #EBEBEB",
-">	c #FCFCFC",
-",	c #D4D4D4",
-"'	c #070707",
-")	c #CFCFCF",
-"!	c #8F8F8F",
-"~	c #FBFBFB",
-"{	c #040404",
-"]	c #050505",
-"^	c #7C7C7C",
-"/	c #0C0C0C",
-"(	c #090909",
-"_	c #111111",
-":	c #6B6B6B",
-"<	c #0B0B0B",
-"[	c #0A0A0A",
-"}	c #F6F6F6",
-"|	c #FEFEFE",
-"1	c #030303",
-"2	c #CDCDCD",
-"3	c #BFBFBF",
-"4	c #737373",
-"5	c #787878",
-"6	c #838383",
-"7	c #797979",
-"8	c #828282",
-"9	c #888888",
-"                     ",
-"   ..     ..         ",
-"  .  .   .  .        ",
-"  .  .   .  .        ",
-"  .  .   .  .        ",
-"  .  .   .  .        ",
-"   ..  .  ..         ",
-"                     ",
-"                     ",
-" .+.@.@.@.@.#$.#%... ",
-" &**********=.-*;>*# ",
-" .**--------*#>,')!. ",
-" .**********~.*.{]^$ ",
-" $**********-/**=**. ",
-" %**---------.*.(_:< ",
-" [}|*********1*2.34[ ",
-" .*|*********.56789. ",
-" {<.$$$$$$$$$$$$$$$$ ",
-"                     ",
-"                     ",
-"                     "}
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/spin_ctrl.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/spin_ctrl.png differ
diff -Nru wxglade-0.9.6/icons/spin_ctrl.xpm wxglade-1.0.1/icons/spin_ctrl.xpm
--- wxglade-0.9.6/icons/spin_ctrl.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/spin_ctrl.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/* XPM */
-static char * spin_ctrl_xpm[] = {
-"21 21 38 1",
-" 	c None",
-".	c #000000",
-"+	c #060608",
-"@	c #000002",
-"#	c #020202",
-"$	c #010101",
-"%	c #080808",
-"&	c #131313",
-"*	c #FFFFFF",
-"=	c #F7F7F7",
-"-	c #FDFDFD",
-";	c #EBEBEB",
-">	c #FCFCFC",
-",	c #D4D4D4",
-"'	c #070707",
-")	c #CFCFCF",
-"!	c #8F8F8F",
-"~	c #FBFBFB",
-"{	c #040404",
-"]	c #050505",
-"^	c #7C7C7C",
-"/	c #0C0C0C",
-"(	c #090909",
-"_	c #111111",
-":	c #6B6B6B",
-"<	c #0B0B0B",
-"[	c #0A0A0A",
-"}	c #F6F6F6",
-"|	c #FEFEFE",
-"1	c #030303",
-"2	c #CDCDCD",
-"3	c #BFBFBF",
-"4	c #737373",
-"5	c #787878",
-"6	c #838383",
-"7	c #797979",
-"8	c #828282",
-"9	c #888888",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-" .+.@.@.@.@.#$.#%... ",
-" &**********=.-*;>*# ",
-" .**--------*#>,')!. ",
-" .**********~.*.{]^$ ",
-" $**********-/**=**. ",
-" %**---------.*.(_:< ",
-" [}|*********1*2.34[ ",
-" .*|*********.56789. ",
-" {<.$$$$$$$$$$$$$$$$ ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/splitter_slot-bottom.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/splitter_slot-bottom.png differ
diff -Nru wxglade-0.9.6/icons/splitter_slot-bottom.xpm wxglade-1.0.1/icons/splitter_slot-bottom.xpm
--- wxglade-0.9.6/icons/splitter_slot-bottom.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/splitter_slot-bottom.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* XPM */
-static char * D:\Python\Sources35\wxglade_dev\icons\splitter_slot_bottom_xpm[] = {
-"21 21 19 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #FEFEFE",
-"@	c #FCFCFC",
-"#	c #727272",
-"$	c #E3E3E3",
-"%	c #7C7C7C",
-"&	c #F8F8F8",
-"*	c #000000",
-"=	c #D6D6D6",
-"-	c #D7D7D7",
-";	c #787878",
-">	c #D5D5D5",
-",	c #DADADA",
-"'	c #D8D8D8",
-")	c #7A7A7A",
-"!	c #020202",
-"~	c #121212",
-"{	c #0D0D0D",
-".......++++++++++++@#",
-"...................$#",
-"...................$#",
-"...................$#",
-"...................$#",
-"...................$#",
-"...................$#",
-"............%%%%%..$#",
-"............%...%%.$#",
-".$$$$$$$$$$$%@..%%$$#",
-"############%...%%###",
-".&..........%%%%%%+.*",
-".==========-=;%%%%-%*",
-".==========>>>>>>>>%*",
-".====>,=====-------%*",
-".==================%*",
-".======>==,--------%*",
-".===---------------%*",
-".='================%*",
-".%))))))))))))))))))*",
-"!~*!!!!!!!!!!!!!!!!*{"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/splitter_slot-left.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/splitter_slot-left.png differ
diff -Nru wxglade-0.9.6/icons/splitter_slot-left.xpm wxglade-1.0.1/icons/splitter_slot-left.xpm
--- wxglade-0.9.6/icons/splitter_slot-left.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/splitter_slot-left.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* XPM */
-static char * D:\Python\Sources35\wxglade_dev\icons\splitter_slot_left_xpm[] = {
-"21 21 22 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"@	c #FEFEFE",
-"#	c #FBFBFB",
-"$	c #FCFCFC",
-"%	c #7A7A7A",
-"&	c #D6D6D6",
-"*	c #E3E3E3",
-"=	c #7C7C7C",
-"-	c #D7D7D7",
-";	c #7D7D7D",
-">	c #D3D3D3",
-",	c #7E7E7E",
-"'	c #161616",
-")	c #F2F2F2",
-"!	c #D9D9D9",
-"~	c #787878",
-"{	c #797979",
-"]	c #020202",
-"^	c #F8F8F8",
-"/	c #050505",
-"..........+......@#$%",
-"$&&&&&&&&%+........*%",
-"@&&&&&&&&=+@.......*%",
-"@&&&&&&&&=+@.......*%",
-"@&&&&&&&&=+@.......*%",
-"@&&&&&&&&=+@.......*%",
-"@&&&&&&&&=+@.......*%",
-"@&&&&&&&&=+@.......*%",
-"@&&&&&&&&=+@.......*%",
-"@&&&&&&&&=+@.......*%",
-"@&&&&&&&-;+........*%",
-"@&&&&&&&>,').......*%",
-"@&&&&&&=====.......*%",
-"@&&&&&&=...==......*%",
-"@&&&&&&=$..==......*%",
-"@&&&&&&=...==......*%",
-"@&&&&&&======......*%",
-"@!&&&&&&~====......*%",
-".&&&&&&&&{]........*%",
-".=========+^********%",
-"++++++++++/%%%%%%%%%%"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/splitter_slot-right.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/splitter_slot-right.png differ
diff -Nru wxglade-0.9.6/icons/splitter_slot-right.xpm wxglade-1.0.1/icons/splitter_slot-right.xpm
--- wxglade-0.9.6/icons/splitter_slot-right.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/splitter_slot-right.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* XPM */
-static char * D:\Python\Sources35\wxglade_dev\icons\splitter_slot_right_xpm[] = {
-"21 21 25 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #727272",
-"@	c #FEFEFE",
-"#	c #FBFBFB",
-"$	c #FCFCFC",
-"%	c #0D0D0D",
-"&	c #E3E3E3",
-"*	c #D6D6D6",
-"=	c #7A7A7A",
-"-	c #000000",
-";	c #D7D7D7",
-">	c #D5D5D5",
-",	c #020202",
-"'	c #DADADA",
-")	c #F2F2F2",
-"!	c #7C7C7C",
-"~	c #787878",
-"{	c #797979",
-"]	c #D8D8D8",
-"^	c #F8F8F8",
-"/	c #121212",
-"(	c #111111",
-"_	c #090909",
-":	c #080808",
-"..........+......@#$%",
-"$........&+.*******=-",
-"@........&+@;>;*;;*=,",
-"@........&+@;>;*;;*=,",
-"@........&+@;>;*;;*=,",
-"@........&+@;>;*;;*=,",
-"@........&+@;>;*;;*=,",
-"@........&+@;>;*;;*=,",
-"@........&+@;>;*;;*=,",
-"@........&+@;>**;;*=,",
-"@........&+.****';*=,",
-"@........&+)*****;*=,",
-"@......!!!!!*****;*=,",
-"@......!...!!***>;*=,",
-"@......!$..!!*'**;*=,",
-"@......!...!!*>**;*=,",
-"@......!!!!!!****;*=,",
-"@.......~!!!!******=,",
-".........{+.******]=-",
-".&&&&&&&&&+^!!!!!!!!/",
-"+++++++++++-(--_:%--,"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/splitter_slot-top.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/splitter_slot-top.png differ
diff -Nru wxglade-0.9.6/icons/splitter_slot-top.xpm wxglade-1.0.1/icons/splitter_slot-top.xpm
--- wxglade-0.9.6/icons/splitter_slot-top.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/splitter_slot-top.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/* XPM */
-static char * D:\Python\Sources35\wxglade_dev\icons\splitter_slot_top_xpm[] = {
-"21 21 18 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #FEFEFE",
-"@	c #FCFCFC",
-"#	c #000000",
-"$	c #D6D6D6",
-"%	c #D9D9D9",
-"&	c #7C7C7C",
-"*	c #D3D3D3",
-"=	c #D7D7D7",
-"-	c #797979",
-";	c #7D7D7D",
-">	c #7A7A7A",
-",	c #020202",
-"'	c #F8F8F8",
-")	c #727272",
-"!	c #787878",
-"~	c #E3E3E3",
-"...++++++++++++++++@#",
-".$$%$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$&&&&&$$&#",
-".$$$$$$$$*=$&...&&$&#",
-".&-&&&&&&&;&&@..&&&>#",
-".#,,,,,,,,##&...&&###",
-".'..........&&&&&&+.)",
-".............!&&&&.~)",
-"...................~)",
-"...................~)",
-"...................~)",
-"...................~)",
-"...................~)",
-"...................~)",
-".~~~~~~~~~~~~~~~~~~~)",
-")))))))))))))))))))))"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/splitter_window-h.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/splitter_window-h.png differ
diff -Nru wxglade-0.9.6/icons/splitter_window-h.xpm wxglade-1.0.1/icons/splitter_window-h.xpm
--- wxglade-0.9.6/icons/splitter_window-h.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/splitter_window-h.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* XPM */
-static char * D:\Python\Sources35\wxglade_dev\icons\splitter_window_h_xpm[] = {
-"21 21 29 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #FCFCFC",
-"@	c #FEFEFE",
-"#	c #000000",
-"$	c #D6D6D6",
-"%	c #D9D9D9",
-"&	c #7C7C7C",
-"*	c #D7D7D7",
-"=	c #D3D3D3",
-"-	c #787878",
-";	c #7A7A7A",
-">	c #7D7D7D",
-",	c #7E7E7E",
-"'	c #797979",
-")	c #161616",
-"!	c #020202",
-"~	c #050505",
-"{	c #F2F2F2",
-"]	c #F8F8F8",
-"^	c #111111",
-"/	c #D5D5D5",
-"(	c #DADADA",
-"_	c #090909",
-":	c #080808",
-"<	c #0D0D0D",
-"[	c #FBFBFB",
-"}	c #D8D8D8",
-"|	c #121212",
-".+@@@@@@@@@@@@@@@@..#",
-".$$$$$$$$$$$$$$$$%$&#",
-".$$$$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$$$$$$$$&#",
-".$$$$$$$$$$$&&&&&$$&#",
-".$$$$$$$$$*=&.+.&-$&#",
-".;&&&&&&&&>,&...&&'&#",
-"###########)&...&&!#~",
-"..@@@@@@@@.{&&&&&&.]#",
-".$********$$$&&&&&$&^",
-".$////////$$$$$$$$$&#",
-".$*******$$$$$(/$$$&#",
-".$$$$$$$$$$$$$$$$$$&_",
-".$********($$/$$$$$&:",
-"@$***************$$&<",
-"[$$$$$$$$$$$$$$$$$}&#",
-"+;;;;;;;;;;;;;;;;;;&#",
-"<#!!!!!!!!!!!!!!!!#|!"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/splitter_window.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/splitter_window.png differ
diff -Nru wxglade-0.9.6/icons/splitter_window.xpm wxglade-1.0.1/icons/splitter_window.xpm
--- wxglade-0.9.6/icons/splitter_window.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/splitter_window.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* XPM */
-static char * splitter_window_xpm[] = {
-"21 21 29 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"@	c #FEFEFE",
-"#	c #FBFBFB",
-"$	c #FCFCFC",
-"%	c #0D0D0D",
-"&	c #D6D6D6",
-"*	c #7A7A7A",
-"=	c #7C7C7C",
-"-	c #D7D7D7",
-";	c #D5D5D5",
-">	c #020202",
-",	c #7D7D7D",
-"'	c #DADADA",
-")	c #D3D3D3",
-"!	c #7E7E7E",
-"~	c #161616",
-"{	c #F2F2F2",
-"]	c #D9D9D9",
-"^	c #787878",
-"/	c #797979",
-"(	c #D8D8D8",
-"_	c #F8F8F8",
-":	c #121212",
-"<	c #050505",
-"[	c #111111",
-"}	c #090909",
-"|	c #080808",
-"..........+......@#$%",
-"$&&&&&&&&*+.&&&&&&&*+",
-"@&&&&&&&&=+@-;-&--&*>",
-"@&&&&&&&&=+@-;-&--&*>",
-"@&&&&&&&&=+@-;-&--&*>",
-"@&&&&&&&&=+@-;-&--&*>",
-"@&&&&&&&&=+@-;-&--&*>",
-"@&&&&&&&&=+@-;-&--&*>",
-"@&&&&&&&&=+@-;-&--&*>",
-"@&&&&&&&&=+@-;&&--&*>",
-"@&&&&&&&-,+.&&&&'-&*>",
-"@&&&&&&&)!~{&&&&&-&*>",
-"@&&&&&&=====&&&&&-&*>",
-"@&&&&&&=...==&&&;-&*>",
-"@&&&&&&=$..==&'&&-&*>",
-"@&&&&&&=...==&;&&-&*>",
-"@&&&&&&======&&&&-&*>",
-"@]&&&&&&^====&&&&&&*>",
-".&&&&&&&&/>.&&&&&&(*+",
-".=========+_========:",
-"++++++++++<+[++}|%++>"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/static_bitmap.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/static_bitmap.png differ
diff -Nru wxglade-0.9.6/icons/static_bitmap.xpm wxglade-1.0.1/icons/static_bitmap.xpm
--- wxglade-0.9.6/icons/static_bitmap.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/static_bitmap.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/* XPM */
-static char * static_bitmap_xpm[] = {
-"21 21 8 1",
-" 	c None",
-".	c #001815",
-"+	c #F20000",
-"@	c #FBE800",
-"#	c #110C00",
-"$	c #110095",
-"%	c #060400",
-"&	c #060D00",
-"                     ",
-"                     ",
-"  ..........         ",
-"  .++++++++.         ",
-"  .++++++++.....     ",
-"  .+++++++.@@@@@.    ",
-"  .++++++.@@@@@@@.   ",
-"  .+++++.@@@@@@@@@.  ",
-"  .+++++.@@@@@@@@@.  ",
-"  .+++++.@@@@@@@@@.  ",
-"  .+++++.@@@@@@@@@.  ",
-"  ........@@@@@@@#   ",
-"    .$$$$$%@@@@@&    ",
-"    .$$$$$$.....     ",
-"    .$$$$$$$$$.      ",
-"    .$$$$$$$$$.      ",
-"    .$$$$$$$$$.      ",
-"    ...........      ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/static_line.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/static_line.png differ
diff -Nru wxglade-0.9.6/icons/static_line.xpm wxglade-1.0.1/icons/static_line.xpm
--- wxglade-0.9.6/icons/static_line.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/static_line.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/* XPM */
-static char * static_line_xpm[] = {
-"21 21 21 1",
-" 	c None",
-".	c #D5D5D5",
-"+	c #BFBFBF",
-"@	c #939393",
-"#	c #787878",
-"$	c #747474",
-"%	c #7A7A7A",
-"&	c #777777",
-"*	c #7C7C7C",
-"=	c #757575",
-"-	c #818181",
-";	c #737373",
-">	c #919191",
-",	c #CACACA",
-"'	c #E8E8E8",
-")	c #F5F5F5",
-"!	c #FEFEFE",
-"~	c #FFFFFF",
-"{	c #FDFDFD",
-"]	c #FAFAFA",
-"^	c #F3F3F3",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-".....................",
-"+@#$%%&********=-*;>,",
-"')!~~!{~~~~~~~~{!!]^'",
-".....................",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/static_text.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/static_text.png differ
diff -Nru wxglade-0.9.6/icons/static_text.xpm wxglade-1.0.1/icons/static_text.xpm
--- wxglade-0.9.6/icons/static_text.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/static_text.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/* XPM */
-static char * static_text_xpm[] = {
-"21 21 12 1",
-" 	c None",
-".	c #040603",
-"+	c #010002",
-"@	c #040005",
-"#	c #0A050C",
-"$	c #060005",
-"%	c #000000",
-"&	c #020202",
-"*	c #0E0E0E",
-"=	c #030303",
-"-	c #010101",
-";	c #050505",
-"                     ",
-"                     ",
-"                     ",
-"          .          ",
-"         .+.         ",
-"         .@#         ",
-"        $.@..        ",
-"        .....        ",
-"        .%%...       ",
-"       %. &...       ",
-"       .* &%%.=      ",
-"      %.  .....      ",
-"      .........-     ",
-"     ..=........     ",
-"     ..     ...%.    ",
-"    ...     .....    ",
-"   %..%     %.....   ",
-"   ;=.%%   .......   ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/statusbar.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/statusbar.png differ
diff -Nru wxglade-0.9.6/icons/statusbar.xpm wxglade-1.0.1/icons/statusbar.xpm
--- wxglade-0.9.6/icons/statusbar.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/statusbar.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-/* XPM */
-static char * statusbar_xpm[] = {
-"21 21 65 1",
-" 	c None",
-".	c #F7F7F7",
-"+	c #DBDBDB",
-"@	c #D6D6D6",
-"#	c #8D8D8D",
-"$	c #FDFDFD",
-"%	c #DADADA",
-"&	c #D4D4D4",
-"*	c #737373",
-"=	c #FEFEFE",
-"-	c #808080",
-";	c #7A7A7A",
-">	c #FFFFFF",
-",	c #FAFAFA",
-"'	c #F2F2F2",
-")	c #F9F9F9",
-"!	c #F5F5F5",
-"~	c #D5D5D5",
-"{	c #DEDEDE",
-"]	c #D8D8D8",
-"^	c #D9D9D9",
-"/	c #D2D2D2",
-"(	c #DCDCDC",
-"_	c #C9C9C9",
-":	c #D1D1D1",
-"<	c #D0D0D0",
-"[	c #D7D7D7",
-"}	c #CFCFCF",
-"|	c #E0E0E0",
-"1	c #888888",
-"2	c #727272",
-"3	c #7E7E7E",
-"4	c #838383",
-"5	c #797979",
-"6	c #6D6D6D",
-"7	c #777777",
-"8	c #8A8A8A",
-"9	c #787878",
-"0	c #CECECE",
-"a	c #E2E2E2",
-"b	c #E1E1E1",
-"c	c #DDDDDD",
-"d	c #E4E4E4",
-"e	c #E3E3E3",
-"f	c #E5E5E5",
-"g	c #818181",
-"h	c #8B8B8B",
-"i	c #C6C6C6",
-"j	c #EEEEEE",
-"k	c #E6E6E6",
-"l	c #DFDFDF",
-"m	c #F0F0F0",
-"n	c #FBFBFB",
-"o	c #F1F1F1",
-"p	c #E9E9E9",
-"q	c #CDCDCD",
-"r	c #B9B9B9",
-"s	c #CCCCCC",
-"t	c #080808",
-"u	c #010101",
-"v	c #000000",
-"w	c #020202",
-"x	c #070707",
-"y	c #060606",
-"z	c #0A0A0A",
-"                     ",
-"                     ",
-"                     ",
-"   .+@#              ",
-"   $%&*              ",
-"   =@@-              ",
-"   =@@;              ",
-"   =@@>>,'=>=)!>>>   ",
-"   =@@~&{%]^/%(~_]   ",
-"   =@@:<+[&~}[^^|@   ",
-"   =@@-1;23435-678   ",
-"   =@@90ab|:+cdef|   ",
-"   =@@g|([d%f%+|]e   ",
-"   >}]hije~{k{l^f~   ",
-"   ,&/m=>=n>=.>>$>   ",
-"   ob+p%:~%][%q+@r   ",
-"   >(s&q0@[:~l~<l@   ",
-"   tuvvwxywvuwyvzt   ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/text_ctrl.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/text_ctrl.png differ
diff -Nru wxglade-0.9.6/icons/text_ctrl.xpm wxglade-1.0.1/icons/text_ctrl.xpm
--- wxglade-0.9.6/icons/text_ctrl.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/text_ctrl.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/* XPM */
-static char * text_ctrl_xpm[] = {
-"21 21 5 1",
-" 	c None",
-".	c #7B7B7B",
-"+	c #FFFFFF",
-"@	c #000000",
-"#	c #D6D6D6",
-"                     ",
-"                     ",
-"....................+",
-".@@@@@@@@@@@@@@@@@@#+",
-".@+++++++++++++++++#+",
-".@+++++++++++++++@+#+",
-".@++++++++@++++++@+#+",
-".@++++++++@++++++@+#+",
-".@+++@@@++@#@@+++@+#+",
-".@++@#+#@+@@+.@++@+#+",
-".@++++++@+@+++@++@+#+",
-".@+++@@@@+@+++@++@+#+",
-".@++@#++@+@+++@++@+#+",
-".@++@#++@+@++.@++@+#+",
-".@+++@@@@+@@@@+++@+#+",
-".@+++++++++++++++@+#+",
-".@+++++++++++++++++#+",
-".###################+",
-"+++++++++++++++++++++",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/toggle_button.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/toggle_button.png differ
diff -Nru wxglade-0.9.6/icons/toggle_button.xpm wxglade-1.0.1/icons/toggle_button.xpm
--- wxglade-0.9.6/icons/toggle_button.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/toggle_button.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* XPM */
-static char * toggle_button_xpm[] = {
-"21 21 22 1",
-" 	c None",
-".	c #7C7C7C",
-"+	c #FCFCFC",
-"@	c #000000",
-"#	c #060606",
-"$	c #BEBEBE",
-"%	c #C2C2C2",
-"&	c #BFBFBF",
-"*	c #010101",
-"=	c #C1C1C1",
-"-	c #050505",
-";	c #0C0C0C",
-">	c #040404",
-",	c #070707",
-"'	c #0E0E0E",
-")	c #111111",
-"!	c #080808",
-"~	c #030303",
-"{	c #020202",
-"]	c #BCBCBC",
-"^	c #0D0D0D",
-"/	c #1D1D1D",
-"                     ",
-"                     ",
-"                     ",
-" ..................+ ",
-" .@@@@@@@@@@@@@@#@@+ ",
-" .@$$$$$$$$$$$$$$$$+ ",
-" .@$$$%$$$&&$$$$$$$+ ",
-" .@$$$$$$$$$$$$$$$$+ ",
-" .@$$$$#@$$*$$@$$$$+ ",
-" .@$=$@$$-$@$$;$$$$+ ",
-" .@$$$>$$@$,@$@$$$$+ ",
-" .@$$$'$$)$!$~@$$$$+ ",
-" .@$%$@$${${$$@$$$$+ ",
-" .@$]$$@@$$^=$/$$$$+ ",
-" .@$$$$$$$$$$$$$$$$+ ",
-" .@$$$$$$$$$$$$$$$$+ ",
-" .@$$$$$$$$$$$$$$$$+ ",
-" +++++++++++++++++++ ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/toolbar.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/toolbar.png differ
diff -Nru wxglade-0.9.6/icons/toolbar.xpm wxglade-1.0.1/icons/toolbar.xpm
--- wxglade-0.9.6/icons/toolbar.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/toolbar.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* XPM */
-static char * toolbar_xpm[] = {
-"21 21 6 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"@	c #DEDEDE",
-"#	c #7B7B7B",
-"$	c #D6D6D6",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-" ..................+ ",
-" .@@@@#$$$$$$$$$$$#+ ",
-" ..@@@#$$$$$$$$$$$#+ ",
-" .@#.@#$$$$$$$$$$$#+ ",
-" .@@@##$$$$$$$$$$$#+ ",
-" ..@@@#$$$$$$$$$$$#+ ",
-" .@#.@#$$$$$$$$$$$#+ ",
-" .@@@##$$$$$$$$$$$#+ ",
-" ..@@@#$$$$$$$$$$$#+ ",
-" .@#.@#$$$$$$$$$$$#+ ",
-" .@@@##$$$$$$$$$$$#+ ",
-" .#################+ ",
-" +++++++++++++++++++ ",
-"                     ",
-"                     ",
-"                     ",
-"                     "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/tree_ctrl.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/tree_ctrl.png differ
diff -Nru wxglade-0.9.6/icons/tree_ctrl.xpm wxglade-1.0.1/icons/tree_ctrl.xpm
--- wxglade-0.9.6/icons/tree_ctrl.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/tree_ctrl.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/* XPM */
-static char * tree_ctrl_xpm[] = {
-"21 21 6 1",
-" 	c None",
-".	c #000000",
-"+	c #00FFFF",
-"@	c #7B797B",
-"#	c #FFFF00",
-"$	c #00FF00",
-"  ...                ",
-"  .+. @@@@@@         ",
-"  ...                ",
-"   .                 ",
-"   .  ...            ",
-"   ....#. @@@@@@     ",
-"   .  ...            ",
-"   .   .             ",
-"   .   .  ...        ",
-"   .   ....$. @@@@@@ ",
-"   .   .  ...        ",
-"   .   .             ",
-"   .   .  ...        ",
-"   .   ....$. @@@@@@ ",
-"   .      ...        ",
-"   .                 ",
-"   .  ...            ",
-"   ....#. @@@@@@     ",
-"      ...            ",
-"       .             ",
-"       .             "};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/wrap_sizer_h.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/wrap_sizer_h.png differ
diff -Nru wxglade-0.9.6/icons/wrap_sizer_h.xpm wxglade-1.0.1/icons/wrap_sizer_h.xpm
--- wxglade-0.9.6/icons/wrap_sizer_h.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/wrap_sizer_h.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/* XPM */
-static char * D:\Python\wxglade\wxglade_dev_08\icons\wrap_sizer_h_xpm[] = {
-"21 21 23 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #FBFBFB",
-"@	c #040404",
-"#	c #D8D8D8",
-"$	c #7A7A7A",
-"%	c #010101",
-"&	c #7B7B7B",
-"*	c #000000",
-"=	c #0E0E0E",
-"-	c #060606",
-";	c #141414",
-">	c #0B0B0B",
-",	c #101010",
-"'	c #030303",
-")	c #020202",
-"!	c #0A0A0A",
-"~	c #747474",
-"{	c #E3E3E3",
-"]	c #727272",
-"^	c #737373",
-"/	c #DEE5F0",
-"(	c #767676",
-".....+@......@......@",
-".####$%.####&*.####&*",
-".####$%.####&*.####&*",
-".####&%.####&*.####&*",
-".####&%.####&*.####&*",
-".####&%.####&*.####&*",
-".####&%.####&*.####&*",
-".####&%.####&*.####&*",
-".####&%.####&*.####&*",
-".&&&&&*.&&&&&=.&&&&&*",
-"*-*;**>*,*'****@)-!*@",
-"......*.............~",
-".####&@............{]",
-".####&-............{^",
-".####&-............{]",
-".####&%............{~",
-".####&*............{]",
-".####&*............{^",
-".####&@............{]",
-".&&&&&*/{{{{{{{{{{{{]",
-"*!*!*=>(]~~]]~~]~~](]"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/wrap_sizer.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/wrap_sizer.png differ
diff -Nru wxglade-0.9.6/icons/wrap_sizer.xpm wxglade-1.0.1/icons/wrap_sizer.xpm
--- wxglade-0.9.6/icons/wrap_sizer.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/wrap_sizer.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* XPM */
-static char * D:\Python\wxglade\wxglade_dev_08\icons\wrap_sizer_xpm[] = {
-"21 21 22 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"@	c #D8D8D8",
-"#	c #7B7B7B",
-"$	c #060606",
-"%	c #0A0A0A",
-"&	c #141414",
-"*	c #FBFBFB",
-"=	c #7A7A7A",
-"-	c #0E0E0E",
-";	c #040404",
-">	c #010101",
-",	c #0B0B0B",
-"'	c #767676",
-")	c #101010",
-"!	c #E3E3E3",
-"~	c #727272",
-"{	c #747474",
-"]	c #030303",
-"^	c #020202",
-"/	c #737373",
-"..........+.........+",
-".@@@@@@@@#$.@@@@@@@#%",
-".@@@@@@@@#+.@@@@@@@#+",
-".@@@@@@@@#&.@@@@@@@#%",
-".@@@@@@@@#+.@@@@@@@#+",
-"*==#######+.########-",
-";>>>>>>>>+,+;$$>++;+,",
-"..........+.........'",
-".@@@@@@@@#)........!~",
-".@@@@@@@@#+........!{",
-".@@@@@@@@#]........!{",
-".@@@@@@@@#+........!~",
-".#########+........!~",
-";++++++++-+........!{",
-"..........+........!{",
-".@@@@@@@@#;........!~",
-".@@@@@@@@#^........!{",
-".@@@@@@@@#$........!{",
-".@@@@@@@@#%........!~",
-".#########+!!!!!!!!!'",
-";+++++++++;{~/~{~/~~~"};
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/icons/wxglade.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/icons/wxglade.png differ
diff -Nru wxglade-0.9.6/icons/wxglade.xpm wxglade-1.0.1/icons/wxglade.xpm
--- wxglade-0.9.6/icons/wxglade.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/icons/wxglade.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/* XPM */
-static char * wxglade_xpm[] = {
-"32 32 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FF0000",
-"@	c #FFFFFF",
-"#	c #0000FF",
-"$	c #FFFF00",
-"%	c #00BF00",
-"................................",
-".++++++.@@@@@@@@@@@@@@@@@@@@@@@.",
-".++++++.@@@@@@@@@@@@@@@@@@@@@@@.",
-".++++++.@@@@@@@@@@@@@@@@@@@@@@@.",
-".++++++.@@@@@@@@@@@@@@@@@@@@@@@.",
-".++++++.@@@@@@@@@@@@@@@@@@@@@@@.",
-".++++++.@@@@@@@@@@@@@@@@@@@@@@@.",
-".++++++.@@@@@@@@@@@@@@@@@@@@@@@.",
-"................................",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.####.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.####.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.####.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.####.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.####.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@......",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.@@@@.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.@@@@.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.@@@@.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.@@@@.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.@@@@.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.@@@@.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.@@@@.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.@@@@.",
-".@@@@@@.@@@@@@@@@@@@@@@@@@.@@@@.",
-".@@@@@@....................@@@@.",
-".@@@@@@.$$$$$$$$$$$$.%%%%%.@@@@.",
-".@@@@@@.$$$$$$$$$$$$.%%%%%.@@@@.",
-".@@@@@@.$$$$$$$$$$$$.%%%%%.@@@@.",
-".@@@@@@.$$$$$$$$$$$$.%%%%%.@@@@.",
-".@@@@@@.$$$$$$$$$$$$.%%%%%.@@@@.",
-".@@@@@@.$$$$$$$$$$$$.%%%%%.@@@@.",
-"................................"};
diff -Nru wxglade-0.9.6/install/BuildingWinInstaller.txt wxglade-1.0.1/install/BuildingWinInstaller.txt
--- wxglade-0.9.6/install/BuildingWinInstaller.txt	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/install/BuildingWinInstaller.txt	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,63 @@
+Building a wxGlade Installer HOWTO
+----------------------------------
+
+Alberto Griggio  2007/04/20
+Carsten Grohmann 2015/08/04
+
+1. Setup PyInstaller
+--------------------
+
+Install the current version of PyInstaller from http://www.pyinstaller.org.
+Follow the instruction published at PyInstallers homepage.
+
+This procedure is tested using PyInstaller versions 2.1
+
+Check if pyinstaller well configured
+Type:
+pyinstaller --version
+
+The result should be 2.n
+
+2. Generate an executable
+-------------------------
+
+- Open a command prompt and change into source base directory
+
+- To generate the version file "version.py" manually with content below:
+  #
+  # This is an automatically generated file. Manual changes will be
+  # overwritten without warning.
+  #
+
+  __version__ = "<release version>"
+
+- Generate binary for standalone edition
+  Type:
+  install\pyinstaller\build.bat
+
+  If everything works, you should now have two new subdirectories
+  "build" and "dist".
+
+- Now you should have a working executable in "dist/bdist", called
+  "wxglade.exe".
+
+  If it works, you can move on to the next step
+
+3. Generate an installer
+------------------------
+
+- Download and install Inno Setup from here:
+  http://www.jrsoftware.org/isinfo.php
+
+- To create the installer for the Standalone Edition open
+  "wxglade-SAE-installer.iss" with Inno Setup and run it.
+
+- To create the regular installer open "wxglade-installer.iss" with Inno
+  Setup and run it.
+
+- If everything works, you should have the installer executables in the
+  "dist" directory. "wxGlade-SAE-<version>-setup.exe" is the installer of the
+  Standalone Edition. And "wxGlade-<version>-setup.exe" is the regular
+  installer.
+
+- All done!
diff -Nru wxglade-0.9.6/install/README.txt wxglade-1.0.1/install/README.txt
--- wxglade-0.9.6/install/README.txt	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/install/README.txt	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,10 @@
+This directory is for building Windows installers.
+Currently this is not being used as wxGlade is distributed as source only.
+
+
+To start wxGlade, enter 'python3 wxglade.py' or 'python wxglade.py'
+in your shell or use whatever is required to start a python application on
+your platform.
+If you want to build a GUI for wxPython Classic or Phoenix:
+Start wxGlade in your target version - if it runs under Phoenix, it will
+create Phoenix code.
diff -Nru wxglade-0.9.6/LICENSE.txt wxglade-1.0.1/LICENSE.txt
--- wxglade-0.9.6/LICENSE.txt	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/LICENSE.txt	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 Copyright (c) 2002-2007 Alberto Griggio  <agriggio@users.sourceforge.net>
 Copyright (c) 2011-2016 Carsten Grohmann <mail@carsten-grohmann.de>
-Copyright (c) 2017 Dietmar Schwertberger
+Copyright (c) 2017-2020 Dietmar Schwertberger
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
diff -Nru wxglade-0.9.6/log.py wxglade-1.0.1/log.py
--- wxglade-0.9.6/log.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/log.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,24 +5,24 @@
 
 wxGlade uses the python logging instance with three log handler attached.
 
-The first handler L{StringHandler} is used to cache messages later displaying calling getBufferAsList() or
+The first handler StringHandler is used to cache messages later displaying calling getBufferAsList() or
 getBufferAsString().
 
-The second handler C{logging.StreamHandler} to print error messages to sys.stderr.
+The second handler logging.StreamHandler to print error messages to sys.stderr.
 
-The third handler C{logging.FileHandler} writes all messages into a file. This
+The third handler logging.FileHandler writes all messages into a file. This
 behaviour is useful to store logged exceptions permanently.
 
 @todo: Integrate Unicode logging fix.
 
 @copyright: 2013-2016 Carsten Grohmann
-@copyright: 2017 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
-import datetime, inspect
+import datetime
 import logging, logging.handlers
-import os, sys, types, traceback
+import os, sys, traceback
 
 try:
     _nameToLevel = logging._levelNames
@@ -181,7 +181,10 @@
 
     # instantiate console handler
     console_logger = logging.StreamHandler()
-    console_logger.setLevel(logging.INFO)
+    if config.debugging:
+        console_logger.setLevel(logging.DEBUG)
+    else:
+        console_logger.setLevel(logging.INFO)
     console_logger.setFormatter(default_formatter)
     logger.addHandler(console_logger)
 
@@ -294,15 +297,12 @@
 
     Return the message for this LogRecord after merging any user-supplied arguments with the message.
     This specific version tries to handle Unicode user-supplied arguments."""
-    if not hasattr(types, "UnicodeType"):  # if no unicode support... # XXX
-        msg = str(self.msg)
-    else:
-        msg = self.msg
-        if not isinstance(msg, types.StringTypes):
-            try:
-                msg = str(self.msg)
-            except UnicodeError:
-                msg = self.msg      # Defer encoding till later
+    msg = self.msg
+    if not isinstance(msg, compat.basestring):
+        try:
+            msg = compat.unicode(msg)
+        except UnicodeError:
+            msg = self.msg      # Defer encoding till later
     if self.args:
         try:
             msg = msg % self.args
diff -Nru wxglade-0.9.6/main.py wxglade-1.0.1/main.py
--- wxglade-0.9.6/main.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/main.py	2020-12-31 14:04:48.000000000 +0000
@@ -4,7 +4,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2011-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -15,7 +15,7 @@
 
 # import project modules
 import application
-import common, config, compat, misc, clipboard, history
+import common, config, compat, misc, history
 import new_properties as np
 import preferencesdialog, msgdialog, bugdialog, about
 import log
@@ -44,19 +44,20 @@
             wx.MessageBox( _("Please only drop one file at a time"), "wxGlade", wx.ICON_ERROR )
             return False
         if not filenames or not os.path.exists(filenames[0]): return False
-        # first check whether it's being dropped on the property panel
+        # find control under drop point; this does also work if a dialog is open
         x0,y0 = self.parent.GetClientAreaOrigin()
         screen_xy = self.parent.ClientToScreen( (x-x0,y-y0) )
         ctrl = c = wx.FindWindowAtPoint( screen_xy )
+        # go up the hierarchy and find a widget with an 'on_drop_files' method
         while c:
-            if c is self.parent.property_panel:
-                handled = self.parent.property_panel.on_drop_files(screen_xy, ctrl, filenames[0])
-                if handled:
-                    return True
-                else:
-                    break
+            if hasattr(c, "on_drop_files"):
+                handled = c.on_drop_files(screen_xy, ctrl, filenames)
+                if handled: return True
+            if c is self.parent.property_panel: break
+            if isinstance(c, wx.Dialog): return False  # when a dialog is open, don't open wxg or xrc files
             c = c.GetParent()
 
+        # not handled by a control; try to open .wxg or .XRC file
         if not self.parent.ask_save(): return False
 
         path = filenames[0]
@@ -96,14 +97,15 @@
         self.SetSizer(sizer)
         self.Layout()
 
-    def on_drop_files(self, screen_xy, ctrl, filename):
+    def on_drop_files(self, screen_xy, ctrl, filenames):
+        if not self.current_widget: return False
         for p_name in self.current_widget.PROPERTIES:
             if p_name[0].isupper(): continue
             prop = self.current_widget.properties.get(p_name)
             if not prop or not hasattr(prop, "on_drop_file"): continue
             if ( hasattr(prop, "label_ctrl") and prop.label_ctrl.ScreenRect.Contains( screen_xy ) and
                  prop.label_ctrl.IsShownOnScreen() ) or prop.has_control(ctrl):
-                return prop.on_drop_file(filename)
+                return prop.on_drop_file(filenames[0])
         return False
 
     ####################################################################################################################
@@ -114,6 +116,7 @@
             return
         self.next_widget = widget
         if self.current_widget:
+            # this might not be executed if there was an error during creation of the property editors
             for editor in self.current_widget.properties.values():
                 editor.destroy_editor()
             self.current_widget = None   # delete the reference
@@ -131,16 +134,18 @@
 
         self.current_widget = None
         self.create_editor(edit_widget)
+        # this code might not be reached in case of an error
         self.current_widget = edit_widget
         if edit_widget:
             # XXX set status bar
-            self.heading.SetValue( _('Properties - %s - <%s>:') % (edit_widget.klass, edit_widget.name) )
+            klass = edit_widget.get_prop_value("class", edit_widget.WX_CLASS)
+            self.heading.SetValue( _('Properties - %s - <%s>:') % (klass, edit_widget.name) )
         else:
             self.heading.SetValue( _('Properties') )
 
     def create_editor(self, edit_widget):
         # fill the frame with a notebook of property editors
-        
+
         if not self.notebook: return  # already deleted
         self.current_widget_class = edit_widget.__class__
         if wx.Platform != "__WXMSW__" :
@@ -152,10 +157,10 @@
         select_page = self.pagenames[selection]  if selection!=-1  else None
 
         # clear notebook pages
-        if self.notebook.PageCount:
-            #self.notebook.DeleteAllPages()  # deletes also the windows on the pages
-            while self.notebook.PageCount:
-                self.notebook.DeletePage(self.notebook.PageCount-1)
+        #self.notebook.DeleteAllPages()  # deletes also the windows on the pages
+        while self.notebook.PageCount:
+            print("DELETE PAGE; new widget:", edit_widget)
+            self.notebook.DeletePage(self.notebook.PageCount-1)
 
         self.pagenames = pagenames = []
         self.sizers = []
@@ -207,7 +212,7 @@
     def start_page(self, name):
         # create a ScrolledWindow and a Panel; with only ScrolledWindow, scrolling on gtk 3 does not work
         scrolled = wx.ScrolledWindow( self.notebook, name=name)
-        panel = wx.Panel(scrolled)
+        panel = wx.Panel(scrolled, name="%s properties"%name)
         if wx.VERSION[0]<3:
             panel.SetBackgroundColour(scrolled.GetBackgroundColour())
         return panel
@@ -232,7 +237,9 @@
         w_scrollbar = wx.SystemSettings.GetMetric(wx.SYS_VSCROLL_X)  # width a of a scrollbar
 
         panel = [w for w in scrolled.GetChildren() if isinstance(w, wx.Panel)][0]
-        wm, hm = panel.GetSizer().GetMinSize()
+        szr = panel.GetSizer()
+        if not szr: return
+        wm, hm = szr.GetMinSize()
         if hs<hm:
             # best size is smaller than the available height -> enable scrolling
             scrolled.SetScrollbars(1, 5, 1, int(math.ceil(hm/5.0)))
@@ -259,37 +266,45 @@
             # Mac OS: inital event on creation
             event.Skip()
 
-    def flush(self):
-        np.flush_current_property()
-
 
+# don't use any more for application; causes crashes on Cent OS 7; still used when testing
 class wxGladeArtProvider(wx.ArtProvider):
     def CreateBitmap(self, artid, client, size):
         if wx.Platform == '__WXGTK__' and artid == wx.ART_FOLDER:
-            return wx.Bitmap(os.path.join(config.icons_path, 'closed_folder.xpm'), wx.BITMAP_TYPE_XPM)
+            return wx.Bitmap(os.path.join(config.icons_path, 'closed_folder.png'))
         return wx.NullBitmap
 
 
-
 class wxGladePalettePanel(wx.Panel):
+
     def __init__(self, parent):
         wx.Panel.__init__(self, parent)
         common.palette = self # for building the buttons
         self.SetBackgroundColour( compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_BTNFACE) )
+
         # load the available code generators
         all_widgets = common.init_codegen()
         if not config.use_gui: return
-        self.all_togglebuttons = []
+        self.all_togglebuttons = []  # used by reset_togglebuttons
+
+        # for keyboard navigation:
+        self._id_to_coordinate = {}
+        self._ids_by_row = []
+        self._section_to_row = {}
+
         # build the palette for all_widgets
         sizer = wx.FlexGridSizer(0, 2, 0, 0)
         maxlen = max([len(all_widgets[sect]) for sect in all_widgets])  # the maximum number of buttons in a section
-        for section in all_widgets:
+        for row, section in enumerate(all_widgets):
+            self._section_to_row[section] = row
+            self._ids_by_row.append([])
             if section:
                 label = wx.StaticText(self, -1, "%s:" % section.replace('&', '&&'))
                 sizer.Add( label, 1, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 2 )
-            #bsizer = wx.GridSizer(cols=maxlen, hgap=2, vgap=2)
             bsizer = wx.BoxSizer()
-            for button in all_widgets[section]:
+            for col, button in enumerate(all_widgets[section]):
+                self._ids_by_row[-1].append(button.Id)
+                self._id_to_coordinate[button.Id] = (row,col)
                 bsizer.Add(button, flag=wx.ALL, border=1)
                 if isinstance(button, wx.ToggleButton):
                     self.all_togglebuttons.append(button)
@@ -300,6 +315,7 @@
             self._highlight_colour = None
         else:
             self._highlight_colour = wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHT)
+        self.Bind(wx.EVT_CHAR_HOOK, self.on_char)
 
     def reset_togglebuttons(self, keep=None):
         # un-toggle all buttons except keep
@@ -312,14 +328,66 @@
                 button.SetBackgroundColour(wx.NullColour)
             if button.GetValue(): button.SetValue(False)
 
+    def on_char(self, event):
+        key = (event.GetKeyCode(), event.GetModifiers())    # modifiers: 1,2,4 for Alt, Ctrl, Shift
+        if key[1]: return event.Skip()
+
+        focused = self.FindFocus()
+        if not focused or not focused.Id in self._id_to_coordinate:
+            return event.Skip()
+
+        row, col = self._id_to_coordinate[focused.Id]
+        new_row = new_col = None
+        if key[0]==wx.WXK_UP:
+            if row>0: new_row = row-1
+        elif key[0]==wx.WXK_DOWN:
+            if row < len(self._ids_by_row)-1: new_row = row+1
+        elif key[0]==wx.WXK_LEFT:
+            if col>0: new_col = col-1
+        elif key[0]==wx.WXK_RIGHT:
+            if col < len(self._ids_by_row[row])-1: new_col = col+1
+        elif key[0]==wx.WXK_HOME:
+            new_col = 0
+        elif key[0]==wx.WXK_END:
+            new_col = len(self._ids_by_row[row])-1
+        elif key[0]==wx.WXK_PAGEUP:
+            new_row = 0
+        elif key[0]==wx.WXK_PAGEDOWN:
+            new_row = len(self._ids_by_row)-1
+        elif (ord("A") <= key[0] <= ord("Z")) and chr(key[0]) in misc.palette_hotkeys:
+            section = misc.palette_hotkeys[chr(key[0])]
+            new_row = self._section_to_row[section]
+            new_col = 0
+        else:
+            return event.Skip()
+
+        if new_row is None and new_col is None:
+            # limits hit
+            wx.Bell()
+        else:
+            if new_col is None: new_col = min(col, len(self._ids_by_row[new_row])-1)
+            if new_row is None: new_row = row
+            focus = self.FindWindowById(self._ids_by_row[new_row][new_col])
+            if focus: focus.SetFocus()
+
+import shell_frame
+class ShellFrame(shell_frame.ShellFrame):
+    def on_btn_assign(self, event):
+        # insert a variable assignment
+        widget = misc.focused_widget
+        if not widget:
+            event.Skip()
+            return
+        path = widget.get_path()
+        command = 'widget = common.root.find_widget_from_path("%s")\r\n'%path
+        #self.shell.push(command) # or .write ?
+        self.shell.write(command)
+
 
 class wxGladeFrame(wx.Frame):
     "Main frame of wxGlade"
     def __init__(self):
-        self._logger = logging.getLogger(self.__class__.__name__)
         version = config.version
-        if version=='"faked test version"':
-            version = "%s on Python %d.%d"%(version, sys.version_info.major, sys.version_info.minor)
         pos, size, layout = self.init_layout_settings()
         wx.Frame.__init__(self, None, -1, "wxGlade v%s" % version, pos=pos, size=size,
                           style=wx.DEFAULT_FRAME_STYLE, name='MainFrame')
@@ -336,7 +404,7 @@
 
         # create the property and the tree frame
         common.property_panel = self.property_panel = wxGladePropertyPanel(self.splitter2)
-        app = application.Application()
+        common.root = app = application.Application()
         common.app_tree = self.tree = WidgetTree(self.splitter1, app)
 
         self.splitter1.SplitVertically(self.splitter2, self.tree)
@@ -354,7 +422,7 @@
         self.create_statusbar()  # create statusbar for display of messages
 
         self.Show()
-        misc.set_focused_widget(common.app_tree.app)
+        #misc.set_focused_widget(common.root)
         self.Bind(wx.EVT_CLOSE, self.on_close)
 
         # disable autosave checks during unittests
@@ -376,7 +444,6 @@
             size = (self.splitter2.GetSashPosition(), self.splitter1.GetSashPosition())
         elif layout==2:
             size = (self.GetClientSize()[0], self.splitter2.GetSashPosition())
-        print("Palette size", size)
 
     def on_char_hook(self, event):
         # bound to EVT_CHAR_HOOK
@@ -453,7 +520,7 @@
         file_menu.AppendSeparator() # ----------------------------------------------------------------------------------
 
         GENERATE_CODE = append_menu_item(file_menu, -1, _("&Generate Code\tCtrl+G"), wx.ART_EXECUTABLE_FILE)
-        misc.bind_menu_item(self, GENERATE_CODE, lambda: common.app_tree.app.generate_code())
+        misc.bind_menu_item(self, GENERATE_CODE, lambda: common.root.generate_code())
 
         file_menu.AppendSeparator() # ----------------------------------------------------------------------------------
 
@@ -485,7 +552,7 @@
         item = append_menu_item(edit_menu, -1, _('Template Manager...'))
         misc.bind_menu_item(self, item, self.manage_templates)
 
-        item = append_menu_item(edit_menu, wx.ID_PREFERENCES, _('Preferences...'), "prefs.xpm")
+        item = append_menu_item(edit_menu, wx.ID_PREFERENCES, _('Preferences...'), "prefs.png")
         misc.bind_menu_item(self, item, self.edit_preferences)
 
         menu_bar.Append(edit_menu, _("&Edit"))
@@ -493,13 +560,13 @@
         # Windows menu: layout and focus ===============================================================================
         view_menu = wx.Menu(style=wx.MENU_TEAROFF)
 
-        i = append_menu_item(view_menu, -1, _("Layout &1: Tree\tAlt-1"), "../layout1.xpm")
+        i = append_menu_item(view_menu, -1, _("Layout &1: Tree\tAlt-1"), "../layout1.png")
         misc.bind_menu_item(self, i, self.switch_layout, 0)
         
-        i = append_menu_item(view_menu, -1, _("Layout &2: Properties\tAlt-2"), "../layout2.xpm")
+        i = append_menu_item(view_menu, -1, _("Layout &2: Properties\tAlt-2"), "../layout2.png")
         misc.bind_menu_item(self, i, self.switch_layout, 1)
 
-        i = append_menu_item(view_menu, -1, _("Layout &3: Narrow\tAlt-3"), "../layout3.xpm")
+        i = append_menu_item(view_menu, -1, _("Layout &3: Narrow\tAlt-3"), "../layout3.png")
         misc.bind_menu_item(self, i, self.switch_layout, 2)
         view_menu.AppendSeparator()
 
@@ -509,6 +576,9 @@
         i = append_menu_item(view_menu, -1, _("Focus &Properties\tF3"))
         misc.bind_menu_item(self, i, self.show_props_window )
 
+        i = append_menu_item(view_menu, -1, _("Focus Pa&lette\tF4"))
+        misc.bind_menu_item(self, i, self.show_palette )
+
         # submenu focus sections >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
         view_props_menu = wx.Menu()
         # randomly select set of shortcuts to be displayed:
@@ -522,13 +592,13 @@
         view_menu.AppendSubMenu(view_props_menu, _("Focus Properties &Section"))
         view_menu.AppendSeparator() # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
-        i = append_menu_item(view_menu, -1, _("Show/Hide &Design\tF4"))
+        i = append_menu_item(view_menu, -1, _("Show/Hide &Design\tF6"))
         misc.bind_menu_item(self, i, self.show_design_window)
         self._m_pin_design_window = i = append_menu_item(view_menu, -1, _("&Pin &Design\tCtrl-P"),  kind=wx.ITEM_CHECK)
         misc.bind_menu_item(self, i, self.pin_design_window)
         view_menu.AppendSeparator() # ----------------------------------------------------------------------------------
 
-        item = append_menu_item(view_menu, wx.ID_REFRESH, _("&Refresh Preview\tF5"), "refresh.xpm")
+        item = append_menu_item(view_menu, wx.ID_REFRESH, _("&Refresh Preview\tF5"), "refresh.png")
         misc.bind_menu_item(self, item, self.preview)
 
         menu_bar.Append(view_menu, _("&Windows"))
@@ -550,6 +620,11 @@
         misc.bind_menu_item(self, i, self.show_releases)
         help_menu.AppendSeparator() # ----------------------------------------------------------------------------------
 
+        if config.debugging:
+            i = append_menu_item(help_menu, -1, 'Shell\tF7')
+            misc.bind_menu_item(self, i, self.create_shell_window)
+            help_menu.AppendSeparator()
+
         item = append_menu_item(help_menu, wx.ID_ABOUT, _('About'), wx.ART_INFORMATION)
         misc.bind_menu_item(self, item, self.show_about_box)
 
@@ -581,7 +656,6 @@
         self.Bind(wx.EVT_MENU_RANGE, self.open_from_history, id=wx.ID_FILE1, id2=wx.ID_FILE1+num_entries-1)
 
     def _add_label_tool(self, tb, size, id, label, bmp, itemtype, msg, msg_long=None):
-        os.path.join(config.icons_path, "layout2.xpm")
         ADD = tb.AddLabelTool  if compat.IS_CLASSIC else  tb.AddTool
         if compat.IS_PHOENIX:
             method = getattr(tb, "AddTool")
@@ -592,7 +666,7 @@
             bmp = wx.Bitmap( os.path.join(config.icons_path, bmp) )
         else:
             # a wx.ART_... constant
-            bmp = wx.ArtProvider.GetBitmap(bmp, wx.ART_OTHER, size)
+            bmp = wx.ArtProvider.GetBitmap(bmp, wx.ART_TOOLBAR, size)
         return ADD(-1, _(label), bmp, wx.NullBitmap, itemtype, _(msg), _(msg_long or msg))
 
     def create_toolbar(self):
@@ -604,48 +678,51 @@
         self.SetToolBar(tb)
         size = (21,21)
         add = functools.partial(self._add_label_tool, tb, size)
-        t = add( wx.ID_NEW, "New", wx.ART_NEW, wx.ITEM_NORMAL, "Open a new file (Ctrl+N)")
+        t = add( wx.ID_NEW, "New", wx.ART_NEW, wx.ITEM_NORMAL, "Start a new file (Ctrl+N)")
         self.Bind(wx.EVT_TOOL, self.new_app, t)
         
-        t = add( wx.ID_OPEN, "Open", wx.ART_FILE_OPEN, wx.ITEM_NORMAL, "Open a file (Ctrl+O)")
+        t = add( wx.ID_OPEN, "Open", wx.ART_FILE_OPEN, wx.ITEM_NORMAL, "Open an existing file (Ctrl+O)")
         self.Bind(wx.EVT_TOOL, self.open_app, t)
         
         t = add( wx.ID_SAVE, "Save", wx.ART_FILE_SAVE, wx.ITEM_NORMAL, "Save file (Ctrl+S)")
         self.Bind(wx.EVT_TOOL, self.save_app, t)
 
         if config.debugging and hasattr(wx, "ART_PLUS"):
-            t = add( wx.ID_SAVE, "Add", wx.ART_PLUS, wx.ITEM_NORMAL, "Add widget (Ctrl+A)")
+            t = add( -1, "Add", wx.ART_PLUS, wx.ITEM_NORMAL, "Add widget (Ctrl+A)")
             t.Enable(False)
 
             # XXX switch between wx.ART_DELETE for filled slots and wx.ART_MINUS for empty slots
-            t = add( wx.ID_SAVE, "Remove", wx.ART_MINUS, wx.ITEM_NORMAL, "Add widget (Ctrl+A)")
+            t = add( -1, "Remove", wx.ART_MINUS, wx.ITEM_NORMAL, "Add widget (Ctrl+A)")
             t.Enable(False)
 
             tb.AddSeparator()
 
-        self._tool_redo = t = add( wx.ID_SAVE, "Re-do", wx.ART_REDO, wx.ITEM_NORMAL, "Re-do (Ctrl+Y)" )
+        self._tool_redo = t = add( wx.ID_REDO, "Re-do", wx.ART_REDO, wx.ITEM_NORMAL, "Re-do (Ctrl+Y)" )
         t.Enable(False)
-        self._tool_repeat = t = add( wx.ID_SAVE, "Repeat", wx.ART_REDO, wx.ITEM_NORMAL, "Repeat  (Ctrl+R)" )
+        self.Bind(wx.EVT_TOOL, lambda evt: common.history.redo(misc.focused_widget), t)
+        
+        self._tool_repeat = t = add( -1, "Repeat", wx.ART_REDO, wx.ITEM_NORMAL, "Repeat (Ctrl+R)" )
         t.Enable(False)
+        self.Bind(wx.EVT_TOOL, lambda evt: common.history.repeat(misc.focused_widget), t)
 
         tb.AddSeparator()
         t = add(-1, "Generate Code", wx.ART_EXECUTABLE_FILE, wx.ITEM_NORMAL, "Generate Code (Ctrl+G)" )
-        self.Bind(wx.EVT_TOOL, lambda event: common.app_tree.app.generate_code(), t)
+        self.Bind(wx.EVT_TOOL, lambda event: common.root.generate_code(), t)
         tb.AddSeparator()
         
-        t1 = add(-1, "Layout 1", "layout1.xpm", wx.ITEM_RADIO, "Switch layout: Tree", 
+        t1 = add(-1, "Layout 1", "layout1.png", wx.ITEM_RADIO, "Switch layout: Tree", 
                                                                "Switch layout: Palette and Properties left, Tree right")
         self.Bind(wx.EVT_TOOL, lambda event: self.switch_layout(0), t1)
-        t2 = add(-1, "Layout 2", "layout2.xpm", wx.ITEM_RADIO,"Switch layout: Properties",
+        t2 = add(-1, "Layout 2", "layout2.png", wx.ITEM_RADIO,"Switch layout: Properties",
                                                               "Switch layout: Palette and Tree top,  Properties bottom") 
         self.Bind(wx.EVT_TOOL, lambda event: self.switch_layout(1), t2)
-        t3 = add(-1, "Layout 3", "layout3.xpm", wx.ITEM_RADIO, "Switch layout: narrow",
+        t3 = add(-1, "Layout 3", "layout3.png", wx.ITEM_RADIO, "Switch layout: narrow",
                                                      "Switch layout: Palette, Tree and Properties on top of each other")
         self.Bind(wx.EVT_TOOL, lambda event: self.switch_layout(2), t3)
         self._layout_tools = [t1,t2,t3]
 
         tb.AddSeparator()
-        t = add(-1, "Pin Design Window", "pin_design.xpm", wx.ITEM_CHECK, "Pin Design Window",
+        t = add(-1, "Pin Design Window", "pin_design.png", wx.ITEM_CHECK, "Pin Design Window",
                                                                           "Pin Design Window to stay on top")
         self.Bind(wx.EVT_TOOL, lambda event: self.pin_design_window(), t)
         self._t_pin_design_window = t
@@ -657,38 +734,6 @@
 
         self.toolbar.Realize()
 
-    def open_from_history(self, event):
-        if not self.ask_save():
-            return
-        pos = event.GetId() - wx.ID_FILE1
-        filename = self.file_history.GetHistoryFile(pos)
-        if not os.path.exists(filename):
-            wx.MessageBox( _("The file %s doesn't exist.") % filename,
-                           _('Information'), style=wx.CENTER | wx.ICON_INFORMATION | wx.OK )
-            self.file_history.RemoveFileFromHistory(pos)
-            common.remove_autosaved(filename)
-            return
-        if common.check_autosaved(filename):
-            res = wx.MessageBox( _('There seems to be auto saved data for this file: do you want to restore it?'),
-                                 _('Auto save detected'), style=wx.ICON_QUESTION | wx.YES_NO )
-            if res == wx.YES:
-                common.restore_from_autosaved(filename)
-            else:
-                common.remove_autosaved(filename)
-        else:
-            common.remove_autosaved(filename)
-
-        if filename == common.app_tree.app.filename:
-            # if we are re-loading the file, go the the previous position
-            path = common.app_tree.get_selected_path()
-        else:
-            path = None
-
-        self._open_app(filename)
-        self.cur_dir = os.path.dirname(filename)
-        if path is not None:
-            common.app_tree.select_path(path)  # re-loaded file -> go to previous position
-
     def init_autosave(self):
         # ALB 2004-10-15, autosave support...
         self.autosave_timer = None
@@ -704,7 +749,7 @@
         elif not res:
             self.autosave_timer.Stop()
             config.preferences.autosave = False
-            self._logger.info(_('Disable autosave function permanently'))
+            logging.info(_('Disable autosave function permanently'))
             wx.MessageBox(
                 _('The autosave function failed. It has been disabled\n'
                   'permanently due to this error. Use the preferences\n'
@@ -722,8 +767,8 @@
             filename = common.get_name_for_autosave()
             if self._open_app(filename, add_to_history=False):
                 self.cur_dir = os.path.dirname(filename)
-                common.app_tree.app.saved = False
-                common.app_tree.app.filename = None
+                common.root.saved = False
+                common.root.filename = None
                 self.user_message(_('Auto save loaded'))
         common.remove_autosaved()
 
@@ -740,14 +785,9 @@
         # return the toplevel for a preview or design window
         if misc.focused_widget and not isinstance(misc.focused_widget, application.Application):
             # a widget is selected, find the toplevel window for it
-            return misc.get_toplevel_widget(misc.focused_widget)
+            return misc.focused_widget.toplevel_parent
         # find main toplevel window
-        toplevel_name = common.app_tree.app.top_window
-        toplevel = None
-        for c in common.app_tree.app.node.children or []:
-            if c.widget.name==toplevel_name:
-                toplevel = c.widget
-        return toplevel
+        return common.root._get_top_window()
 
     def preview(self):
         """Generate preview of the current loaded project.
@@ -759,6 +799,10 @@
         if toplevel is not None:
             toplevel.preview(refresh=True)
 
+    def show_palette(self):
+        if self.IsIconized(): self.Iconize(False)
+        self.palette.SetFocus()
+
     def show_tree(self):
         if self.IsIconized(): self.Iconize(False)
         common.app_tree.SetFocus()
@@ -766,8 +810,6 @@
     def show_props_window(self, section=None):
         # XXX implement: if a section is active already, then go to first property of the page
         if not self.property_panel.notebook: return
-        # current page: self.property_panel.notebook.Selection
-        # self.property_panel.notebook.FindWindowByName("Layout")
         if self.IsIconized(): self.Iconize(False)
         self.property_panel.pagenames
         if not section:
@@ -775,7 +817,19 @@
         else:
             if not section in self.property_panel.pagenames:
                 return
-            self.property_panel.notebook.ChangeSelection( self.property_panel.pagenames.index(section) )
+            i = self.property_panel.pagenames.index(section)
+            if self.property_panel.notebook.GetSelection() != i:
+                self.property_panel.notebook.ChangeSelection(i)
+            else:
+                self.property_panel.notebook.SetFocus()
+                # try to set the focus if the widget has changed; this is not yet implemented for many property types
+                widget = self.property_panel.current_widget
+                if ( widget and (widget is not np.current_property.owner) and
+                     section in widget.PROPERTIES ):
+                    i_p = widget.PROPERTIES.index(section) + 1
+                    if i_p<len(widget.PROPERTIES):
+                        prop = widget.properties.get(widget.PROPERTIES[i_p])
+                        if prop: prop.set_focus()
         self.Raise()
 
     def show_design_window(self):
@@ -784,7 +838,7 @@
 
         if toplevel.widget:
             focus = toplevel.widget.FindFocus()
-            focused = focus and focus.GetTopLevelParent() is toplevel.widget
+            focused = focus and focus.GetTopLevelParent() is toplevel.widget.GetTopLevelParent()
 
         if toplevel.widget and toplevel.widget.IsShownOnScreen() and not focused:
             # just raise it
@@ -793,7 +847,7 @@
             toplevel.widget.GetTopLevelParent().Raise()
             return
         # open or close
-        common.app_tree.show_toplevel(None, widget=toplevel)
+        common.app_tree.show_toplevel(None, editor=toplevel)
 
     def pin_design_window(self):
         common.pin_design_window = not common.pin_design_window
@@ -817,6 +871,11 @@
             else:
                 toplevel.widget.Raise()
 
+    def create_shell_window(self):
+        common.shell = ShellFrame(None)
+        if misc.focused_widget: common.shell.txt_path.SetValue( misc.focused_widget.get_path() )
+        common.shell.Show()
+
     # status bar for message display ###################################################################################
     def create_statusbar(self):
         self.CreateStatusBar(1)
@@ -829,7 +888,8 @@
         sb = self.GetStatusBar()
         if sb:
             sb.SetStatusText(msg)
-            self.clear_sb_timer.Start(5000, True)
+            if msg:
+                self.clear_sb_timer.Start(5000, True)
 
     def on_clear_sb_timer(self, event):
         sb = self.GetStatusBar()
@@ -840,7 +900,7 @@
         """checks whether the current app has changed and needs to be saved:
         if so, prompts the user;
         returns False if the operation has been cancelled"""
-        if not common.app_tree.app.saved:
+        if not common.root.saved:
             ok = wx.MessageBox(_("Save changes to the current app?"),
                                _("Confirm"), wx.YES_NO|wx.CANCEL|wx.CENTRE|wx.ICON_QUESTION)
             if ok == wx.YES:
@@ -850,16 +910,16 @@
 
     def new_app(self, event=None):
         "creates a new wxGlade project"
-        if self.ask_save():
-            common.app_tree.clear()
-            common.app_tree.app.new()
-            common.app_tree.app.filename = None
-            common.app_tree.app.saved = True
-            self.user_message("")
-            common.remove_autosaved()
-            if config.preferences.autosave and self.autosave_timer is not None:
-                self.autosave_timer.Start()
-            misc.set_focused_widget(common.app_tree.root.widget)
+        if not self.ask_save(): return
+        common.root.clear()
+        common.root.new()
+        common.root.filename = None
+        self.user_message("")
+        misc.rebuild_tree(common.root)
+        common.root.saved = True
+        common.remove_autosaved()
+        if config.preferences.autosave and self.autosave_timer is not None:
+            self.autosave_timer.Start()
 
     def new_app_from_template(self):
         "creates a new wxGlade project from an existing template file"
@@ -867,7 +927,7 @@
         infile = template.select_template()
         if infile:
             self._open_app(infile, add_to_history=False)
-            common.app_tree.app.template_data = None
+            common.root.template_data = None
 
     def open_app(self, event=None):
         """loads a wxGlade project from an xml file
@@ -875,48 +935,81 @@
         NOTE2: the note above should not be True anymore :) """
         if not self.ask_save():
             return
-        default_path = os.path.dirname(common.app_tree.app.filename or "") or self.cur_dir
+        default_path = os.path.dirname(common.root.filename or "") or self.cur_dir
         infile = wx.FileSelector(_("Open file"),
                                    wildcard="wxGlade files (*.wxg)|*.wxg|wxGlade Template files (*.wgt)|*.wgt|"
                                             "XML files (*.xml)|*.xml|All files|*",
                                    flags=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST, default_path=default_path)
         if not infile: return
-        if common.check_autosaved(infile):
-            if wx.MessageBox( _("There seems to be auto saved data for this file: do you want to restore it?"),
-                              _("Auto save detected"), style=wx.ICON_QUESTION|wx.YES_NO ) == wx.YES:
-                common.restore_from_autosaved(infile)
+        self._open(infile)
+
+    def open_from_history(self, event):
+        if not self.ask_save():
+            return
+        pos = event.GetId() - wx.ID_FILE1
+        filename = self.file_history.GetHistoryFile(pos)
+        if not os.path.exists(filename):
+            wx.MessageBox( _("The file %s doesn't exist.") % filename,
+                           _('Information'), style=wx.CENTER | wx.ICON_INFORMATION | wx.OK )
+            self.file_history.RemoveFileFromHistory(pos)
+            common.remove_autosaved(filename)
+            return
+        self._open(filename)
+
+    def _open(self, filename):
+        # called by open_app and open_from_history
+        if common.check_autosaved(filename):
+            res = wx.MessageBox( _('There seems to be auto saved data for this file: do you want to restore it?'),
+                                 _('Auto save detected'), style=wx.ICON_QUESTION | wx.YES_NO )
+            if res == wx.YES:
+                common.restore_from_autosaved(filename)
             else:
-                common.remove_autosaved(infile)
-        if infile == common.app_tree.app.filename:
-            # if we are re-loading the file, go the the previous position
-            path = common.app_tree.get_selected_path()
+                common.remove_autosaved(filename)
         else:
-            path = None
-        self._open_app(infile)
-        self.cur_dir = os.path.dirname(infile)
+            common.remove_autosaved(filename)
+
+        path = position = None
+        if filename == common.root.filename:
+            # if we are re-loading the file, store path and position
+            if misc.focused_widget:
+                path = misc.focused_widget.get_path()
+                if misc.focused_widget.widget is not None and not misc.focused_widget.IS_ROOT:
+                    toplevel = misc.get_toplevel_parent(misc.focused_widget.widget)
+                    if toplevel: position = toplevel.GetPosition()
+
+        self._open_app(filename)
+        self.cur_dir = os.path.dirname(filename)
+        if not path: return
+        editor = common.root.find_widget_from_path(path)
+        if not editor: return
+        misc.set_focused_widget(editor)
+        if editor is common.root: return
+        editor.toplevel_parent.create()
+
+        common.app_tree.ExpandAllChildren(editor.item)
 
-        if path is not None:
-            common.app_tree.select_path(path)  # re-loaded file -> go to previous position
+        if not position or not editor.widget: return
+        misc.get_toplevel_parent(editor.widget).SetPosition(position)
 
     def _open_app(self, filename, use_progress_dialog=True, add_to_history=True):
         "Load a new wxGlade project"
-
         error_msg = None
         infile = None
 
         start = time.time()
 
-        common.app_tree.clear()
-        common.app_tree.app.init()
+        common.root.clear()
+        common.root.init()
+        common.app_tree.DeleteChildren(common.root.item)
         common.app_tree.auto_expand = False  # disable auto-expansion of nodes
 
         try:
             try:
-                self._logger.info( _('Read wxGlade project from file "%s"'), filename )
+                logging.info( _('Read wxGlade project from file "%s"'), filename )
                 input_file_version = None
 
                 if not isinstance(filename, list):
-                    common.app_tree.app.filename = filename
+                    common.root.filename = filename
                     # decoding will done automatically by SAX XML library
                     if compat.PYTHON2:
                         infile = open(filename)
@@ -925,17 +1018,17 @@
                     if hasattr(infile, "seek"):
                         # try to read file version number from the first few lines
                         import re
-                        version_re = re.compile("<!-- generated by wxGlade (\d+)\.(\d+)\.(\d+)(\S*)\s*")
+                        version_re = re.compile(r"<!-- generated by wxGlade (\d+)\.(\d+)\.(\d+)(\S*)\s*")
                         for n in range(3):
                             match = version_re.match( infile.readline() )
                             if match:
                                 major, minor, sub, extension = match.groups()
-                                input_file_version = (int(major), int(minor), int(major), extension)
+                                input_file_version = (int(major), int(minor), int(sub), extension)
                                 break
                         infile.seek(0)
 
                 else:
-                    common.app_tree.app.filename = None
+                    common.root.filename = None
 
                 if use_progress_dialog and config.preferences.show_progress:
                     p = ProgressXmlWidgetBuilder(filename, input_file_version, input_file=infile)
@@ -966,33 +1059,33 @@
                 infile.close()
 
             if error_msg:
-                common.app_tree.clear()
-                common.app_tree.app.new()
-                common.app_tree.app.saved = True
+                common.root.clear()
+                common.root.new()
+                common.root.saved = True
                 common.app_tree.auto_expand = True  # re-enable auto-expansion of nodes
 
                 wx.MessageBox(error_msg, _('Error'), wx.OK | wx.CENTRE | wx.ICON_ERROR)
 
                 return False
 
-        misc.set_focused_widget(common.app_tree.root.widget, force=True)
+        misc.rebuild_tree(common.root, freeze=True)
 
         common.app_tree.auto_expand = True  # re-enable auto-expansion of nodes
 
-        common.app_tree.expand()
-        if common.app_tree.app.is_template:
-            self._logger.info(_("Template loaded"))
-            common.app_tree.app.template_data = template.Template(filename)
-            common.app_tree.app.filename = None
+        common.app_tree.Expand(common.root.item)
+        if common.root.is_template:
+            logging.info(_("Template loaded"))
+            common.root.template_data = template.Template(filename)
+            common.root.filename = None
 
         end = time.time()
-        self._logger.info(_('Loading time: %.5f'), end - start)
+        logging.info(_('Loading time: %.5f'), end - start)
 
-        common.app_tree.app.saved = True
+        common.root.saved = True
         #common.property_panel.Raise()
 
         if hasattr(self, 'file_history') and filename is not None and add_to_history and \
-           (not common.app_tree.app.is_template):
+           (not common.root.is_template):
             self.file_history.AddFileToHistory(misc.wxstr(filename))
 
         if config.preferences.autosave and self.autosave_timer is not None:
@@ -1008,32 +1101,32 @@
 
     def save_app(self, event=None):
         "saves a wxGlade project onto an xml file"
-        self.property_panel.flush()
-        if not common.app_tree.app.filename or common.app_tree.app.is_template:
+        np.flush_current_property()
+        if not common.root.filename or common.root.is_template:
             self.save_app_as()
         else:
             # check whether we are saving a template
-            ext = os.path.splitext(common.app_tree.app.filename)[1].lower()
+            ext = os.path.splitext(common.root.filename)[1].lower()
             if ext == ".wgt":
-                common.app_tree.app.is_template = True
-            self._save_app(common.app_tree.app.filename)
+                common.root.is_template = True
+            self._save_app(common.root.filename)
 
     def _save_app(self, filename):
         try:
             obuffer = []
-            common.app_tree.write(obuffer)
+            common.root.write(obuffer)
             common.save_file(filename, obuffer, 'wxg')
         except EnvironmentError as inst:
             if config.debugging: raise
-            common.app_tree.app.saved = False
+            common.root.saved = False
             bugdialog.ShowEnvironmentError(_('Saving this project failed'), inst)
         except Exception as inst:
             if config.debugging: raise
-            common.app_tree.app.saved = False
+            common.root.saved = False
             fn = os.path.basename(filename).encode('ascii', 'replace')
             bugdialog.Show(_('Save File "%s"') % fn, inst)
         else:
-            common.app_tree.app.saved = True
+            common.root.saved = True
             common.remove_autosaved()
             if config.preferences.autosave and self.autosave_timer is not None:
                 self.autosave_timer.Start()
@@ -1046,7 +1139,7 @@
                               wildcard="wxGlade files (*.wxg)|*.wxg|wxGlade Template files (*.wgt) |*.wgt|"
                               "XML files (*.xml)|*.xml|All files|*",
                               flags=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT,
-                              default_filename=common.app_tree.app.filename or self.cur_dir)
+                              default_filename=common.root.filename or (self.cur_dir+os.sep+"wxglade.wxg"))
         if not fn: return
 
         # check for file extension and add default extension if missing
@@ -1054,9 +1147,9 @@
         if not ext:
             fn = "%s.wxg" % fn
 
-        common.app_tree.app.filename = fn
+        common.root.filename = fn
         #remove the template flag so we can save the file.
-        common.app_tree.app.properties["is_template"].set(False)
+        common.root.properties["is_template"].set(False)
 
         self.save_app()
         self.cur_dir = os.path.dirname(fn)
@@ -1064,11 +1157,11 @@
 
     def save_app_as_template(self):
         "save a wxGlade project as a template"
-        data = getattr(common.app_tree.app, 'template_data', None)
+        data = getattr(common.root, 'template_data', None)
         outfile, data = template.save_template(data)
         if outfile:
-            common.app_tree.app.properties["is_template"].set(True)
-            common.app_tree.app.template_data = data
+            common.root.properties["is_template"].set(True)
+            common.root.template_data = data
             self._save_app(outfile)
 
     def on_close(self, event):
@@ -1083,8 +1176,8 @@
                 self._store_layout()
                 prefs.set_dict("layout", self.layout_settings)
                 prefs.changed = True
-            common.app_tree.clear()
-            common.app_tree.app.new()
+            common.root.clear()
+            common.root.new()
             try:
                 common.save_preferences()
             except Exception as e:
@@ -1097,7 +1190,7 @@
             event.Veto()
 
     def show_about_box(self):
-        "show the about dialog;  @see: L{about.wxGladeAboutBox}"
+        "show the about dialog;  see: about.wxGladeAboutBox"
         about_box = about.wxGladeAboutBox()
         about_box.ShowModal()
         about_box.Destroy()
@@ -1157,7 +1250,7 @@
                 ibuffer = ['%s\n'%line for line in tmp.split('\n')]
 
                 self._open_app(ibuffer)
-                common.app_tree.app.saved = False
+                common.root.saved = False
             except Exception as inst:
                 fn = os.path.basename(infilename).encode('ascii', 'replace')
                 bugdialog.Show(_('Import File "%s"') % fn, inst)
@@ -1175,7 +1268,7 @@
     # user interface helpers
     def _set_icon(self):
         icon = compat.wx_EmptyIcon()
-        bmp = wx.Bitmap( os.path.join(config.icons_path, "icon.xpm"), wx.BITMAP_TYPE_XPM )
+        bmp = wx.Bitmap( os.path.join(config.icons_path, "icon.png") )
         icon.CopyFromBitmap(bmp)
         self.SetIcon(icon)
     def init_layout_settings(self):
@@ -1294,6 +1387,27 @@
 
     def _check_geometry(self, x,y,width,height):
         # check whether a significant part would be visible
+        # also, at least a part of the top edge needs to be visible
+        if width<150 or height<150: return False
+
+        # check top line
+        top_line = wx.Rect(x,y,width,1)
+        min_visible = int(round(width/3))
+        top_line_OK = False
+        for d in range(wx.Display.GetCount()):
+            display = wx.Display(d)
+            client_area = display.ClientArea
+            if not client_area.width or not client_area.height:
+                # the display info is broken on some installations
+                continue
+            intersection = client_area.Intersect(top_line)
+            if intersection.width>=min_visible:
+                top_line_OK = True
+                break
+
+        if not top_line_OK: return False
+
+        # check rectangle
         geometry = wx.Rect(x,y,width,height)
 
         for d in range(wx.Display.GetCount()):
@@ -1311,7 +1425,7 @@
 class wxGlade(wx.App):
     """wxGlade application class
     
-    @ivar _exception_orig: Reference to original implementation of logging.exception()"""
+    _exception_orig: Reference to original implementation of logging.exception()"""
 
     def OnInit(self):
         sys.stdout = sys.__stdout__
@@ -1321,7 +1435,7 @@
         sys.excepthook = self.graphical_exception_handler
 
         # use graphical implementation to show caught exceptions
-        self._exception_orig = logging.exception
+        self._exception_orig = logging.exception  # Reference to original implementation of logging.exception()
         logging.exception = self.exception
 
         # needed for wx >= 2.3.4 to disable wxPyAssertionError exceptions
@@ -1331,13 +1445,20 @@
         common.init_preferences()
 
         self.locale = wx.Locale(wx.LANGUAGE_DEFAULT)  # avoid PyAssertionErrors
-        #compat.wx_ArtProviderPush(wxGladeArtProvider())  causes crashes on Cent OS 7
+        #compat.wx_ArtProviderPush(wxGladeArtProvider())
 
         frame = wxGladeFrame()
         self.SetTopWindow(frame)
         self.SetExitOnFrameDelete(True)
 
-        self.Bind(wx.EVT_IDLE, self.OnIdle)
+        self.init_idle()
+
+        if config.inform_screen_reader:
+            message = ("It seems you have a screen reader software installed.\n"
+                       "Please be aware that there are some options to improve wxGlade accessibility\n"
+                       "with screen readers.\n"
+                       "See menu Edit -> Preferences -> Accessibility.")
+            wx.CallLater(1000, wx.MessageBox, message, "Accessibility Info")
 
         return True
 
@@ -1347,19 +1468,26 @@
         logging.exception = self._exception_orig
         return 0
 
-    def OnIdle(self, event):
-        "Idle tasks - currently show error messages only;  @see: L{show_msgdialog()}"
-        self.show_msgdialog()
-        event.Skip()
+    def init_idle(self):
+        if wx.Platform == "__WXMAC__" and compat.IS_CLASSIC:
+            # it seems that EVT_IDLE makes wx.CallAfter stall from time to time, so we use a timer
+            wx.CallLater(200, self.OnIdle)
+        else:
+            self.Bind(wx.EVT_IDLE, self.OnIdle)
+
+    def OnIdle(self, event=None):
+        "Idle tasks - currently show error messages only;  see: show_msgdialog()"
+        try:
+            self.show_msgdialog()
+        finally:
+            if wx.Platform == "__WXMAC__" and compat.IS_CLASSIC:
+                wx.CallLater(200, self.OnIdle)
 
     def show_msgdialog(self):
-        """\
+        """
         Check for log messages and show them
 
-        @see: L{main.wxGlade.OnIdle()}
-        @see: L{log.getBufferAsList()}
-        @see: L{msgdialog.MessageDialog}
-        """
+        see: main.wxGlade.OnIdle(), log.getBufferAsList(), msgdialog.MessageDialog"""
         log_msg = log.getBufferAsString()
         if not log_msg:
             return
@@ -1379,43 +1507,29 @@
         msg_dialog.Destroy()
 
     def graphical_exception_handler(self, exc_type, exc_value, exc_tb):
-        """\
-        Show detailed information about uncaught exceptions in
-        L{bugdialog.BugReport}.
+        """Show detailed information about uncaught exceptions in bugdialog.BugReport.
 
         The shown exception will be logged to the log file in parallel.
+        The exception information will be cleared after the bug dialog has closed.
 
-        The exception information will be cleared after the bug dialog has
-        closed.
-
-        @param exc_type:  Type of the exception (normally a class object)
-        @param exc_value: The "value" of the exception
-        @param exc_tb:    Call stack of the exception
+        exc_type:  Type of the exception (normally a class object)
+        exc_value: The "value" of the exception
+        exc_tb:    Call stack of the exception
 
-        @see: L{bugdialog.BugReport()}
-        @see: L{bugdialog.Show()}
-        """
+        see: bugdialog.BugReport(), bugdialog.Show()"""
         bugdialog.ShowEI(exc_type, exc_value, exc_tb)
         if compat.PYTHON2: sys.exc_clear()
 
     def exception(self, msg, *args, **kwargs):
-        """\
-        Graphical replacement of C{logging.exception()}.
-
-        All exception details logged with C{logging.exception()} will be shown
-        in L{bugdialog.BugReport}.
+        """Graphical replacement of logging.exception().
 
+        All exception details logged with logging.exception() will be shown in bugdialog.BugReport.
         The shown exception will be logged to the log file ding.
+        The exception information will be cleared after the bug dialog has closed.
 
-        The exception information will be cleared after the bug dialog has
-        closed.
-
-        @param msg: Short description of the exception
-        @type msg:  str
+        msg: Short description of the exception
 
-        @see: L{bugdialog.BugReport}
-        @see: L{bugdialog.ShowEI()}
-        """
+        see: bugdialog.BugReport, bugdialog.ShowEI()"""
         if args:
             try:
                 msg = msg % args
@@ -1439,6 +1553,14 @@
             win.import_xrc(filename)
         else:
             win._open_app(filename, False)
+
+            # mainly for debugging we want the first window to be opened already
+            if filename and config.open_design_window and common.root.children:
+                editor = common.root.children[0]
+                misc.set_focused_widget(editor)
+                editor.create()
+                common.app_tree.ExpandAllChildren(editor.item)
+
         win.cur_dir = os.path.dirname(filename)
     #win = app.GetTopWindow()
     ##win.import_xrc(r"D:\Python\Sources35\wxglade\wxglade_dev\tests\casefiles\CalendarCtrl.xrc")
diff -Nru wxglade-0.9.6/misc.py wxglade-1.0.1/misc.py
--- wxglade-0.9.6/misc.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/misc.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,30 +3,35 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import common, config, compat
-import logging, os, re
+import logging, os, re, time
 import wx
 
 
 
-# the SizerSlot which has the "mouse focus"; used to restore the mouse cursor if the user cancelled adding a widget
-currently_under_mouse = None
-
 _get_xpm_bitmap_re = re.compile(r'"(?:[^"]|\\")*"')
 _item_bitmaps = {}
 
-design_windows = []
+
+# handle currently focused widget ######################################################################################
 
 focused_widget = None  # the currently selected widget in GUI mode (for tree and property_panel)
 _next_focused_widget = None  # for delayed setting, to ensure that only the last call has an effect
+focused_time = 0.0  # sometimes, widgets ignore focus related events during a dead time of e.g. 50ms after setting focus
+
+flush_functions = []  # these will be called before the focused widget is set; currently only used by new_properties
+
 
 def set_focused_widget(widget, force=False, delayed=False):
     if not config.use_gui: return
-    global focused_widget, _next_focused_widget
+    global focused_widget, _next_focused_widget, focused_time
+
+    for f in flush_functions:
+        f()
 
     if delayed:
         _next_focused_widget = widget
@@ -38,15 +43,25 @@
     # set focused widget; tell tree and property panel
     if focused_widget:
         focused_widget.update_view(selected=False)
+        set_focus = focused_widget.WX_CLASS in ("wxSpinCtrl", "wxSpinCtrlDouble")
+    else:
+        set_focus = False
     focused_widget = widget
     common.app_tree.set_current_widget(widget)
     common.property_panel.set_widget(widget, force)
     if common.history: common.history.set_widget(widget)
     common.main.set_widget(widget)  # to update menu and toolbar
+    if common.shell:
+        common.shell.txt_path.SetValue( widget and widget.get_path() or "" )
+
+    focused_time = time.time()
     if widget and widget.widget:
         # ensure that it is visible and selection is displayed, if applicable
         show_widget(widget)
         widget.update_view(selected=True)
+        # set focus in Design window to move away from certain widgets
+        if set_focus and hasattr(widget.widget, "HasFocus") and not widget.widget.HasFocus():
+            widget.widget.SetFocus()
 
 
 def _set_focused_widget(widget, force=False):
@@ -56,16 +71,24 @@
     set_focused_widget(widget, force)
 
 
+def rebuild_tree(widget=None, recursive=True, focus=True, freeze=False):
+    # re-build tree control for the widget and it's children; set focus to it; called after creation or modification
+    common.root.saved = False
+    common.app_tree.build(widget, recursive, freeze)
+    if focus and widget is not None:
+        set_focused_widget(widget, force=widget==common.root)
+
+
 def show_widget(widget):
     # ensure that notebook pages are selected such that widget is visible
     if not widget.widget: return
     while True:
-        if not widget.node or not widget.node.parent: break  # Application.node is None
-        parent = widget.node.parent.widget
+        if not widget.parent: break  # Application.node is None
+        parent = widget.parent
         if parent.__class__.__name__=="EditNotebook":
             # a widget under a wxNotebook without a panel: select page
-            if parent.widget and widget in parent.pages:
-                parent.widget.SetSelection( parent.pages.index(widget) )
+            if parent.widget and widget in parent.children:
+                parent.widget.SetSelection( parent.children.index(widget) )
 
         widget = parent  # go up one level
 
@@ -134,6 +157,7 @@
         self.owner = owner
         self.parent = parent
         if wx.Platform == '__WXMSW__': self.parent = owner
+        assert isinstance(self.parent, wx.Window)
         self.tag_pos = None
         self.tags = None
         self.update()
@@ -161,6 +185,7 @@
         if self.visible != visible:
             self.visible = visible
             if self.visible:
+                if not self.parent: return
                 if not self.tags:
                     self.tags = [SelectionTag(self.parent) for i in range(4)]
                 for i,pos in enumerate(self.tag_pos):
@@ -211,7 +236,7 @@
 
 def format_for_version(version):
     "Return the version information in a string; e.g. format_for_version((2, 8)) -> '2.8'"
-    # see: L{wxglade.codegen.BaseLangCodeWriter.for_version}
+    # see: wxglade.codegen.BaseLangCodeWriter.for_version
     return '%s.%s' % version
 
 def format_supported_by(version):
@@ -224,8 +249,12 @@
 
 
 def get_toplevel_parent(obj):
-    if not isinstance(obj, wx.Window):
+    if isinstance(obj, wx.Sizer):
+        obj = obj.ContainingWindow
+    elif not isinstance(obj, wx.Window):
         obj = obj.widget
+    if hasattr(obj, "ContainingWindow"):
+        obj = obj.ContainingWindow
     while obj and not obj.IsTopLevel():
         obj = obj.GetParent()
     return obj
@@ -233,16 +262,15 @@
 
 def get_toplevel_widget(widget):
     from edit_windows import EditBase, TopLevelBase
-    from edit_sizers import Sizer, SizerSlot
-    if isinstance(widget, Sizer):
-        widget = widget.window
+    from edit_sizers import SizerSlot
+    if widget.IS_SIZER: widget = widget.window
     assert isinstance(widget, (EditBase,SizerSlot)), _("EditBase or SizerBase object needed")
     while widget and not isinstance(widget, TopLevelBase):
         widget = widget.parent
     return widget
 
 
-def check_wx_version(major, minor=0, release=0, revision=0):
+def check_wx_version_at_least(major, minor=0, release=0, revision=0):
     "returns True if the current wxPython version is at least major.minor.release"
     return wx.VERSION[:-1] >= (major, minor, release, revision)
 
@@ -272,27 +300,27 @@
 ########################################################################################################################
 # menu helpers
 
-def append_menu_item(menu, id, text, xpm_file_or_artid=None, **kwargs): # XXX change: move id to the end of the argument list?
+def append_menu_item(menu, id, text, file_or_artid=None, **kwargs): # XXX change: move id to the end of the argument list?
     if compat.IS_CLASSIC and "helpString" in kwargs:
         kwargs["help"] = kwargs["helpString"]
         del kwargs["helpString"]
     item = wx.MenuItem(menu, id, text, **kwargs)
-    if xpm_file_or_artid is not None:
+    if file_or_artid is not None:
         path = 'msw/'  if wx.Platform == '__WXMSW__'  else  'gtk/'
         path = os.path.join(config.icons_path, path)
         bmp = None
-        if not isinstance(xpm_file_or_artid, bytes) or not xpm_file_or_artid.startswith(b'wxART_'):
+        if not isinstance(file_or_artid, bytes) or not file_or_artid.startswith(b'wxART_'):
             try:
-                bmp = _item_bitmaps[xpm_file_or_artid]
+                bmp = _item_bitmaps[file_or_artid]
             except KeyError:
-                f = os.path.join(path, xpm_file_or_artid)
+                f = os.path.join(path, file_or_artid)
                 if os.path.isfile(f):
-                    bmp = _item_bitmaps[xpm_file_or_artid] = wx.Bitmap(f, wx.BITMAP_TYPE_XPM)
+                    bmp = _item_bitmaps[file_or_artid] = wx.Bitmap(f)
                 else:
                     bmp = None
         else:
-            # xpm_file_or_artid is an id for wx.ArtProvider
-            bmp = wx.ArtProvider.GetBitmap( xpm_file_or_artid, wx.ART_MENU, (16, 16) )
+            # file_or_artid is an id for wx.ArtProvider
+            bmp = wx.ArtProvider.GetBitmap( file_or_artid, wx.ART_MENU, (16, 16) )
         if bmp is not None:
             try:
                 item.SetBitmap(bmp)
@@ -340,9 +368,11 @@
 def _can_remove():
     global focused_widget
     if focused_widget is None or not hasattr(focused_widget, "remove"): return False
-    if focused_widget.klass=="sizerslot" and hasattr(focused_widget, "sizer"):
-        sizer = focused_widget.sizer
-        if sizer.is_virtual() or focused_widget.sizer._IS_GRIDBAG:
+    if focused_widget.IS_SLOT:
+        # XXX change this later on, to remove e.g. notebook pages, but not when parent.CHILDREN is an int
+        if focused_widget.parent.CHILDREN == -1: return True
+        if focused_widget.parent.WX_CLASS in ("wxNotebook",): return True
+        if not focused_widget.parent.IS_SIZER or focused_widget.sizer._IS_GRIDBAG:
             wx.Bell()
             return False
     return True
@@ -360,14 +390,14 @@
 @restore_focus
 def _cut():
     global focused_widget
-    if not _can_remove() or focused_widget.klass=="sizerslot":
+    if not _can_remove():
         wx.Bell()
         return
     clipboard.cut(focused_widget)
     #focused_widget = None
 
 def _copy():
-    if focused_widget is None or focused_widget.klass=="sizerslot":
+    if focused_widget is None or focused_widget.IS_SLOT:
         wx.Bell()
         return
     clipboard.copy(focused_widget)
@@ -384,10 +414,12 @@
 def _insert():
     global focused_widget
     if not focused_widget: return
-    if not hasattr(focused_widget, "sizer") or not hasattr(focused_widget, "pos"): return
-    if focused_widget.sizer._IS_GRIDBAG: return
-    method = getattr(focused_widget.sizer, "insert_slot", None)
-    if method: method(focused_widget.pos)
+    parent = focused_widget.parent
+    if not parent or not parent.IS_SIZER: return
+    if parent._IS_GRIDBAG: return
+    #method = getattr(focused_widget.sizer, "insert_slot", None)
+    method = getattr(parent, "insert_slot", None)
+    if method: method(focused_widget.index)
 
 @restore_focus
 def _add():
@@ -399,6 +431,9 @@
         method = getattr(focused_widget.sizer, "add_slot", None)
     if method: method()
 
+
+currently_under_mouse = None  # set when the mouse enters a sizer slot widget; see edit_base.Slot/SizeSlot
+
 def _cancel():
     if not common.adding_widget: return
     common.adding_widget = common.adding_sizer = False
@@ -409,45 +444,67 @@
     compat.SetToolTip(common.app_tree, "")
     common.main.user_message("Canceled")
 
+@restore_focus
+def drop():
+    global focused_widget
+    method = None
+    if not focused_widget: return
+    if not focused_widget.check_drop_compatibility():
+        wx.Bell()
+        return
+    if focused_widget.IS_SLOT:
+        method = getattr(focused_widget, "on_drop_widget", None)
+    elif common.adding_sizer:
+        method = getattr(focused_widget, "drop_sizer", None)
+    #if not method:
+        #if not hasattr(focused_widget, "sizer"): return
+        #method = getattr(focused_widget.sizer, "add_slot", None)
+    if method: method(None, False)  # don't reset, but continue adding
 
+
+@restore_focus
 def navigate(up):
-    # XXX reafactor this into Tree?
-    # must be a design window
-    if focused_widget:
-        focused_item = focused_widget.node.item
-    else:
-        focused_item = common.app_tree.GetFocusedItem()
-    if focused_item is None:
-        return
+    # move up or down in tree
+    focus = focused_widget
+    if not focus:
+        # get from Tree widget
+        item = common.app_tree.GetFocusedItem()
+        focus = common.app_tree._GetItemData(item)
+    if focus is None: return
+    siblings = [focus]  if focus.IS_ROOT else  focus.parent.get_all_children()
+    if not siblings: return
+    idx = siblings.index(focus)
     if up:
-        item = common.app_tree.GetPrevSibling(focused_item)
-        if not item:
-            # no upper sibling -> go up
-            item = common.app_tree.GetItemParent(focused_item)
-            #item = common.app_tree.GetFirstChild(focused_item)
+        if idx>0:
+            focus = siblings[idx-1]
+            children = focus.get_all_children()
+            if children: focus = children[-1]
         else:
-            # go down again
-            while common.app_tree.ItemHasChildren(item):
-                item = common.app_tree.GetLastChild(item)
+            # no upper sibling -> go up
+            focus = focus.parent
     else:
-        if common.app_tree.ItemHasChildren(focused_item):
-            item, token = common.app_tree.GetFirstChild(focused_item)
+        # down: look for children
+        children = focus.get_all_children()
+        if children:
+            # go to first child
+            focus = children[0]
         else:
-            item = common.app_tree.GetNextSibling(focused_item)
-            if not item:
-                item = focused_item
+            if idx+1<len(siblings):
+                # go to next sibling
+                focus = siblings[idx+1]
+            else:
+                # go up one or more levels
                 while True:
-                    parent = common.app_tree.GetItemParent(item)
-                    if not parent: return
-                    if common.app_tree.ItemHasChildren(parent):
-                        item = common.app_tree.GetNextSibling(parent)
-                        if common.app_tree._GetItemData( common.app_tree.GetNextSibling(parent) ):
+                    if not focus.parent: return
+                    siblings = focus.parent.get_all_children()
+                    if siblings:
+                        idx = siblings.index(focus)
+                        if idx+1<len(siblings):
+                            focus = siblings[idx+1]
                             break
-                    item = parent
+                    focus = focus.parent
 
-    widget = getattr(common.app_tree._GetItemData(item), "widget", None)
-    if not widget: return
-    set_focused_widget(widget)
+    if focus: set_focused_widget(focus)
 
 
 # accelerator tables to enable keyboard shortcuts for the popup menus of the various widgets (remove, cut, copy, paste)
@@ -463,9 +520,16 @@
     ("", wx.WXK_UP):     (navigate,  (True, )),
     ("", wx.WXK_DOWN):   (navigate,  (False,)),
 
-    ("",  wx.WXK_ESCAPE):(_cancel, ())
+    ("",  wx.WXK_ESCAPE):(_cancel, ()),
+
+    ("", wx.WXK_RETURN): (drop,    ()),
 }
 
+if wx.Platform == "__WXMAC__":
+    # on Windows this one would go up in the hierarchy when in the Tree control
+    accel_table_editors["", wx.WXK_BACK] = (_remove, ())
+
+
 # for the palette window
 accel_table_editors_palette = {
     ("",  wx.WXK_ESCAPE):(_cancel, ())
@@ -479,8 +543,10 @@
 
     ("",  wx.WXK_F2):    ((common,"main","show_tree"),            ()),
     ("",  wx.WXK_F3):    ((common,"main","show_props_window"),    ()),
-    ("",  wx.WXK_F4):    ((common,"main","show_design_window"),   ()),
+    ("",  wx.WXK_F4):    ((common,"main","show_palette"),         ()),
     ("",  wx.WXK_F5):    ((common,"main","preview"),              ()),
+    ("",  wx.WXK_F6):    ((common,"main","show_design_window"),   ()),
+    ("",  wx.WXK_F7):    ((common,"main","create_shell_window"),  ()),
 
     ("",  wx.WXK_F8):    ((common,"main","show_props_window"),    ("Common",)),
     ("C", ord('M')):     ((common,"main","show_props_window"),    ("Common",)),
@@ -504,7 +570,7 @@
     ("A", ord('3')):     ((common,"main","switch_layout"),        (2,)),
 
     ("C", ord('S')):     ((common,"main","save_app"),             ()),
-    ("C", ord('G')):     ((common,"app_tree","app","generate_code"), ()),
+    ("C", ord('G')):     ((common,"root","generate_code"), ()),
 
     ("C", ord('N')):     ((common,"main","new_app"),              ()), 
     ("C", ord('O')):     ((common,"main","open_app"),             ()),
@@ -548,6 +614,9 @@
         args = (globals()[args],)
     wx.CallAfter(function, *args)
 
+# for key handler in palette window:
+palette_hotkeys = {"S":"Sizers"}  # key to section name
+
 
 def _reverse_dict(src):
     "Returns a dictionary whose keys are 'src' values and values 'src' keys."
@@ -606,7 +675,7 @@
     if encoding is None:
         if common.app_tree is None:
             return str(s)
-        encoding = common.app_tree.app.encoding
+        encoding = common.root.encoding
     if isinstance(s, compat.unicode): return s
     s = str(s)
     if isinstance(s, compat.unicode): return s
@@ -631,27 +700,49 @@
                 try:
                     data = zipfile.ZipFile(archive).read(name)
                     data = [d[1:-1] for d in _get_xpm_bitmap_re.findall(data)]
-                    bmp = wx.BitmapFromXPMData(data)
+                    bmp = wx.BitmapFromXPMData(data)  # XXX
                 except:
                     logging.exception(_('Internal Error'))
                     bmp = wx.NullBitmap
     else:
-        bmp = wx.Bitmap(path, wx.BITMAP_TYPE_XPM)
+        bmp = wx.Bitmap(path)
     return bmp
 
 
 def get_absolute_path(path, for_preview=False):
     "Get an absolute path relative to the current output directory (where the code is generated)."
+    if os.path.sep!="\\":
+        path = path.replace("\\", os.path.sep)
     if os.path.isabs(path):
         return path
-    p = common.app_tree.app.output_path
+    p = common.root.output_path
     if for_preview:
-        p = getattr(common.app_tree.app, 'real_output_path', u'')
+        p = getattr(common.root, 'real_output_path', u'')
+    if os.path.sep!="\\":
+        p = p.replace("\\", os.path.sep)
     if not os.path.isabs(p):
         # a path relative to the application filename
-        appdir = os.path.dirname(common.app_tree.app.filename)
+        appdir = os.path.dirname(common.root.filename)
         p = os.path.abspath( os.path.join(appdir, p) )
 
     if not os.path.isdir(p): p = os.path.dirname(p)
 
     return os.path.abspath( os.path.join(p, path) )
+
+
+def get_relative_path(filename):
+    # returns a relative path if filename is inside the project directory
+    if filename:
+        project_path = common.root.filename
+        if project_path:
+            project_path = os.path.abspath( os.path.dirname(project_path) )
+            if filename.startswith(project_path):
+                filename = "./" + os.path.relpath(filename, project_path)
+        if os.path.sep=="\\":
+            filename = filename.replace("\\", "/")
+    return filename
+
+
+def RelativeFileSelector(message="Select the file", *args, **kwargs):
+    # returns a relative path if the selected file is inside the project directory
+    return get_relative_path( wx.FileSelector(_(message), *args, **kwargs) )
diff -Nru wxglade-0.9.6/msw.py wxglade-1.0.1/msw.py
--- wxglade-0.9.6/msw.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/msw.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,12 +1,12 @@
 """\
 Microsoft Windows specific helpers
 
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import sys, os
-import win32api, win32con
+import win32api, win32con, pywintypes
 
 
 class RegistryCurrentUser:
@@ -100,3 +100,21 @@
             except:
                 print("Could not register file extension %s"%fileextension)
 
+
+def check_for_key(keyname, branch=None):
+    if branch is None:
+        branch = win32con.HKEY_CURRENT_USER
+    try:
+        handle = win32api.RegOpenKeyEx(branch, keyname, 0, win32con.KEY_READ)
+        win32api.RegCloseKey(handle)
+        return True
+    except pywintypes.error:
+        return False
+
+
+def check_for_screen_reader():
+    if check_for_key("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\nvda.exe", win32con.HKEY_LOCAL_MACHINE):
+        return "NVDA"
+    if check_for_key("Software\\Freedom Scientific\\JAWS"):
+        return "JAWS"
+    return None
diff -Nru wxglade-0.9.6/new_properties.py wxglade-1.0.1/new_properties.py
--- wxglade-0.9.6/new_properties.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/new_properties.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,17 +5,24 @@
 
 Interface to owner modified; see below for class PropertyOwner
 
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import common, config, compat, logging, misc
 from collections import OrderedDict
-import re, sys, os
+import re, os
 import wx
 
+if wx.Platform != '__WXMSW__':
+    import wx.lib.stattext
+
+
 class _DefaultArgument(object):
-    pass
+    def __bool__(self):
+        return False
+    def __nonzero__(self):
+        return False
 _DefaultArgument = _DefaultArgument()
 
 
@@ -44,6 +51,8 @@
     if not current_property or not current_property.editing: return
     current_property.flush()
 
+misc.flush_functions.append(flush_current_property)
+
 
 class Property(object):
     "Base class for property editors"
@@ -56,11 +65,11 @@
     GROW = False # if this is True, no spacer is added after the control, so it may grow down to the lower edge
     HAS_DATA = True
     min_version = None  # can be overwritten in instances; currently only used by BitmapProperty
+    _error = _warning = None  # used by TextProperty and derived classes
 
     def __init__(self, value, default_value=_DefaultArgument, name=None):#, write_always=False):
-        self._logger = logging.getLogger(self.__class__.__name__)
         self.value = value
-        self.previous_value = None  # only set during call of self.owner.properties_modified
+        self.previous_value = None  # only set during call of self.owner.properties_changed
         # when the property is assigned to an instance property, these will be set:
         self.owner = None
         self.name = name
@@ -108,11 +117,20 @@
             self.update_display()
         if notify: self._notify()
 
+    def set_temp(self, value):
+        # set e.g. to a temporary class name during preview; restored in CodeWriter.clean_up()
+        if value==self.value: return
+        if not hasattr(self.owner, "_restore_data"): self.owner._restore_data ={}
+        if not self.name in self.owner._restore_data:
+            self.owner._restore_data[self.name] = self.value
+        self.value = value
+
     def load(self, value, activate=None, deactivate=None, notify=False):
         # called from xml_parse ... add_property(self, name, val)
         # a derived class like TextProperty may implement a load method, e.g. to unescape strings
         # (this should actually handled by xml_parse itself, but this might have side effects)
         self.set(value, activate, deactivate, notify)
+        self.previous_value = None
 
     def set_default(self, default_value):
         default_value = self._set_converter(default_value)
@@ -175,7 +193,7 @@
 
     def _notify(self):
         self.modified = True
-        common.app_tree.app.saved = False
+        common.root.saved = False
         self.owner.properties_changed([self.name])
 
     def toggle_active(self, active=None, refresh=True):
@@ -239,7 +257,7 @@
     def update_display(self, start_editing=False):
         # when the value has changed
         # if start_editing: self.editing = True
-        # if not self.editing: return
+        # if not self.editing or not self...: return
         pass
 
     def activate_controls(self):
@@ -253,10 +271,10 @@
         for controlname in self.CONTROLNAMES:
             if controlname=="enabler": continue
             control = getattr(self, controlname, None)
-            if control is None: continue
+            if not control: continue
             if isinstance(control, (tuple,list)):
                 for c in control:
-                    if c is not None: c.Enable(active)
+                    if c: c.Enable(active)
             else:
                 control.Enable(active)
 
@@ -273,10 +291,13 @@
         return False
 
     # editor helpers
-    def _get_label(self, label, panel):
-        import wx.lib.stattext
+    def _get_label(self, label, panel, name=None):
         width, height = panel.GetTextExtent(label)
         width = max(width, config.label_width)
+        if wx.Platform == '__WXMSW__':
+            if name is not None:
+                return wx.StaticText( panel, -1, label, size=(width,height), name=name )
+            return wx.StaticText( panel, -1, label, size=(width,height) )
         return wx.lib.stattext.GenStaticText( panel, -1, label, size=(width,height) )
 
     def on_focus(self, event=None):
@@ -287,12 +308,16 @@
 
     def flush(self):
         pass
+    
+    def set_focus(self):
+        pass
 
     ####################################################################################################################
     # helpers
     def _mangle(self, label):
         "Returns a mangled version of label, suitable for displaying the name of a property"
         return misc.wxstr(misc.capitalize(label).replace('_', ' '))
+
     def _find_label(self):
         "check self.LABEL; then go through base classes and check the _PROPERTY_LABELS dictionaries"
         if self.LABEL: return self.LABEL
@@ -304,23 +329,26 @@
             if self.name in cls._PROPERTY_LABELS:
                 return cls._PROPERTY_LABELS[self.name]
         return self._mangle(self.name)
+
     def _find_tooltip(self):
         "go through base classes and check the _PROPERTY_HELP dictionaries"
         if self.TOOLTIP: return self.TOOLTIP
-        import inspect
+        ret = []
+        if self._error:   ret.extend( [self._error, ""] )
+        if self._warning: ret.extend( [self._warning, ""] )
 
+        import inspect
         classes = inspect.getmro(self.owner.__class__)
-        help = None
         for cls in classes:
             if hasattr(cls, "_PROPERTY_HELP") and self.name in cls._PROPERTY_HELP:
-                help = cls._PROPERTY_HELP[self.name]
+                ret.append( cls._PROPERTY_HELP[self.name] )
                 break
         if self.min_version:
             min_version_s = ".".join( (str(v) for v in self.min_version) )
             min_version_s = "This property is only supported on wx %s or later."%min_version_s
-            if help:
-                help = "%s\n\n%s"%(help, min_version_s)
-        return help
+            ret.extend( ["", min_version_s] )
+        return "\n".join(ret) or None
+
     def _set_tooltip(self, *controls):
         tooltip = self._find_tooltip()
         if not tooltip: return
@@ -372,6 +400,7 @@
         val = self.value
         if not val: spin.SetValue(1)  # needed for GTK to display a '0'
         spin.SetValue(val)
+        spin.SetSelection(-1,-1)
         return spin
 
     def create_editor(self, panel, sizer):
@@ -380,22 +409,20 @@
 
         hsizer = wx.BoxSizer(wx.HORIZONTAL)
         # label
-        label = self.label_ctrl = self._get_label(self._find_label(), panel)
-        #hsizer.Add(label, 2, wx.ALL | wx.ALIGN_CENTER, 3)
+        label_text = self._find_label()
+        label = self.label_ctrl = self._get_label(label_text, panel)
         hsizer.Add(label, 0, wx.ALL | wx.ALIGN_CENTER, 3)
         # checkbox, if applicable
         self.enabler = None
         if self.deactivated is not None:
-            self.enabler = wx.CheckBox(panel, -1, '')#, size=(1,-1))
+            self.enabler = wx.CheckBox(panel, -1, '')
+            if config.preferences.use_checkboxes_workaround:
+                size = self.enabler.GetSize()
+                self.enabler.SetLabel("Enable %s"%label_text)
+                self.enabler.SetMaxSize(size)
             self.enabler.SetValue(not self.deactivated)
             self.enabler.Bind( wx.EVT_CHECKBOX, lambda event: self.toggle_active(event.IsChecked()) )
             hsizer.Add(self.enabler, 0, wx.ALIGN_CENTER_VERTICAL|wx.LEFT, 3)
-        #else:
-            #hsizer.AddSpacer(20)
-        # the spin control
-        #if self.val_range[1] is None:
-            #self.spin = wx.SpinCtrl( panel, -1, min=self.val_range[0] )
-        #else:
         self.spin = self.create_spin_ctrl(panel)
 
         if self.deactivated is not None:
@@ -412,17 +439,10 @@
         self.spin.Bind(wx.EVT_KILL_FOCUS, self.on_kill_focus) # by default, the value is only set when the focus is lost
         self.spin.Bind(wx.EVT_SET_FOCUS, self.on_focus)
         if wx.Platform == '__WXMAC__' or self.immediate:
-            self.spin.Bind(wx.EVT_SPINCTRL, self.on_spin)
-            self.spin.Bind(wx.EVT_TEXT_ENTER, self.on_spin)   # we want the enter key (see style above)
+            self.spin.Bind(wx.EVT_SPINCTRL, self._on_spin)
+        self.spin.Bind(wx.EVT_TEXT_ENTER, self._on_enter)   # we want the enter key (see style above)
         self.editing = True
 
-    def _create_spin_ctrl(self, panel):
-        style = wx.TE_PROCESS_ENTER | wx.SP_ARROW_KEYS
-        self.spin = wx.SpinCtrl( panel, -1, style=style, min=self.val_range[0], max=self.val_range[1] )
-        val = self.value
-        if not val: self.spin.SetValue(1)  # needed for GTK to display a '0'
-        self.spin.SetValue(val)
-
     def on_kill_focus(self, event=None):
         if event is not None: event.Skip()
         self.flush()
@@ -435,15 +455,26 @@
 
     def update_display(self, start_editing=False):
         if start_editing: self.editing = True
-        if not self.editing: return
+        if not self.editing or not self.spin: return
         self.spin.SetValue(self.value)
 
-    def on_spin(self, event):
+    def _on_spin(self, event):
         event.Skip()
         set_current_property(self)
         if self.spin:
             self._check_for_user_modification(self.spin.GetValue())
 
+    def _on_enter(self, event):
+        # in an EVT_TEXT_ENTER handler self.spin.GetValue() will return the old value on macOS
+        try:
+            # on macOS, invalid strings may be entered
+            value = self._set_converter( event.GetString() )
+        except:
+            self.spin.SetValue(self.value)
+            wx.Bell()
+            return
+        self._check_for_user_modification( value )
+
     def set_range(self, min_v, max_v):
         new_range = (min_v, max_v)
         if new_range==self.val_range: return
@@ -524,23 +555,20 @@
         SpinProperty.create_editor(self, panel, sizer)
 
 
-class LayoutPosProperty(SpinProperty):
-    readonly = True
-    TOOLTIP = "Position of item within sizer; 1-based"
-
-    def __init__(self, value):
-        SpinProperty.__init__(self, value, val_range=(1,1000), immediate=False, default_value=_DefaultArgument, name="pos")
-
-    #def create_editor(self, panel, sizer):
-        #SpinProperty.create_editor(self, panel, sizer)
-
-    def write(self, *args, **kwds):
-        # maybe, for GridBagSizers row/col should be written
-        pass
+#class LayoutPosProperty(SpinProperty):
+    #readonly = True
+    #TOOLTIP = "Position of item within sizer\nCan't be edited; use Cut & Paste or Drag & Drop to reposition an item."
+
+    #def __init__(self, value):
+        #SpinProperty.__init__(self, value, val_range=(0,1000), immediate=False, default_value=_DefaultArgument, name="pos")
+
+    #def write(self, *args, **kwds):
+        ## maybe, for GridBagSizers row/col should be written
+        #pass
 
 
 class LayoutSpanProperty(Property):
-    TOOLTIP = "cell spanning for GridBagSizer items: rows, columns"
+    TOOLTIP = "cell spanning for GridBagSizer items: rows, columns\nOnly editable if the adjacent cells are empty."
     # (int,int)
     CONTROLNAMES = ["rowspin","colspin"]
     def __init__(self, value):
@@ -565,31 +593,32 @@
         return "%d, %d"%self.value
 
     def create_editor(self, panel, sizer):
-        if not _is_gridbag(self.owner.sizer): return
-        max_rows, max_cols = self.owner.sizer.check_span_range(self.owner.pos, *self.value)
+        if not _is_gridbag(self.owner.parent): return
+        max_rows, max_cols = self.owner.parent.check_span_range(self.owner.index, *self.value)
 
         hsizer = wx.BoxSizer(wx.HORIZONTAL)
         # label
         self.label_ctrl = label = self._get_label(self._find_label(), panel)
-        #hsizer.Add(label, 2, wx.ALL | wx.ALIGN_CENTER, 3)
         hsizer.Add(label, 0, wx.ALL | wx.ALIGN_CENTER, 3)
         # checkbox, if applicable
         self.enabler = None
 
         style = wx.TE_PROCESS_ENTER | wx.SP_ARROW_KEYS
-        self.rowspin = wx.SpinCtrl( panel, -1, style=style, min=1, max=max_rows, size=(30,-1) )
-        self.colspin = wx.SpinCtrl( panel, -1, style=style, min=1, max=max_cols, size=(30,-1) )
+        self.rowspin = wx.SpinCtrl( panel, -1, style=style, min=1, max=max_rows)  # don't set size here as the
+        self.colspin = wx.SpinCtrl( panel, -1, style=style, min=1, max=max_cols)  # combination withe SetSelection fails
         val = self.value
         self.rowspin.SetValue(val and val[0] or 1)
         self.colspin.SetValue(val and val[1] or 1)
         self.rowspin.Enable(max_rows!=1)
         self.colspin.Enable(max_cols!=1)
+        self.rowspin.SetSelection(-1, -1)
+        self.colspin.SetSelection(-1, -1)
 
-        # layout of the controls / sizers
+        # layout of the controls / sizers; when adding the spins, set min size as well
         hsizer.Add(wx.StaticText(panel, -1, _("Rows:")), 1, wx.LEFT | wx.ALIGN_CENTER_VERTICAL, 3)
-        hsizer.Add(self.rowspin, 5, wx.ALL | wx.ALIGN_CENTER, 3)
+        si = hsizer.Add(self.rowspin, 5, wx.ALL | wx.ALIGN_CENTER, 3).SetMinSize( (30,-1) )
         hsizer.Add(wx.StaticText(panel, -1, _("Cols:")), 1, wx.LEFT | wx.ALIGN_CENTER_VERTICAL, 3)
-        hsizer.Add(self.colspin, 5, wx.ALL | wx.ALIGN_CENTER, 3)
+        hsizer.Add(self.colspin, 5, wx.ALL | wx.ALIGN_CENTER, 3).SetMinSize( (30,-1) )
         sizer.Add(hsizer, 0, wx.EXPAND)
 
         self._set_tooltip(label, self.rowspin, self.colspin)
@@ -616,7 +645,7 @@
 
     def update_display(self, start_editing=False):
         if start_editing: self.editing = True
-        if not self.editing: return
+        if not self.editing or not self.rowspin or not self.colspin: return
         self.rowspin.SetValue(self.value[0])
         self.colspin.SetValue(self.value[1])
 
@@ -626,14 +655,14 @@
         if self.rowspin and self.colspin:
             self._check_for_user_modification( (self.rowspin.GetValue(),self.colspin.GetValue() ) )
             # update ranges
-            max_rows, max_cols = self.owner.sizer.check_span_range(self.owner.pos, *self.value)
+            max_rows, max_cols = self.owner.parent.check_span_range(self.owner.index, *self.value)
             self.rowspin.SetRange(1,max_rows)
             self.colspin.SetRange(1,max_cols)
             self.rowspin.Enable(max_rows!=1)
             self.colspin.Enable(max_cols!=1)
 
     def write(self, outfile, tabs=0):
-        if _is_gridbag(self.owner.sizer):
+        if _is_gridbag(self.owner.parent):
             Property.write(self, outfile, tabs)
 
 
@@ -650,9 +679,16 @@
         self.checkbox.SetValue( bool(self.value) )
 
     def create_editor(self, panel, sizer):
-        self.checkbox = wx.CheckBox(panel, -1, '')
+        label_text = self._find_label()
+        self.checkbox = wx.CheckBox(panel, -1, '', name=label_text)
         self._display_value()
-        self.label_ctrl = label = self._get_label(self._find_label(), panel)
+        self.label_ctrl = label = self._get_label(label_text, panel, name=label_text)
+
+        if config.preferences.use_checkboxes_workaround:
+            size = self.checkbox.GetSize()
+            self.checkbox.SetLabel(label_text)
+            self.checkbox.SetMaxSize(size)
+
         hsizer = wx.BoxSizer(wx.HORIZONTAL)
         #hsizer.Add(label, 2, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 3)
         hsizer.Add(label, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 3)
@@ -667,7 +703,7 @@
 
     def update_display(self, start_editing=False):
         if start_editing: self.editing = True
-        if not self.editing: return
+        if not self.editing or not self.checkbox: return
         self._display_value()
 
     def on_change_val(self, event):
@@ -728,8 +764,9 @@
 
     def update_display(self, start_editing=False):
         if start_editing: self.editing = True
-        if not self.editing: return
+        if not self.editing or not self.options: return
         self.options.SetSelection( self.values.index(self.value) )
+        if self.blocked: self.options.Disable()
 
     def on_radio(self, event):
         event.Skip()
@@ -738,7 +775,7 @@
         self._check_for_user_modification(new_value)
 
     def enable_item(self, index, enable=True):
-        if not self.editing: return
+        if not self.editing or not self.options: return
         self.options.EnableItem(index, enable)
 
 
@@ -760,6 +797,12 @@
         self.value_set = self._decode_value(value)
         self.enabler = self._choices = None
         Property.__init__(self, None, default_value, name) # with value=None, as this is to be calculated on demand only
+        self._ignore_names = set()  # flag values to be ignored for DesignWindow
+        self._one_required = None
+
+    def set_owner(self, owner, attributename):
+        Property.set_owner(self, owner, attributename)
+        self._check_value()
 
     def _ensure_values(self):
         if self._names is None or self._values is None: raise ValueError("implementation error")
@@ -788,7 +831,7 @@
             if self.value_set: self._ensure_values()
             self.value = 0
             for i, name in enumerate(self._names):
-                if name in self.value_set:
+                if name in self.value_set and not name in self._ignore_names:
                     value = self._values[i]
                     if value is not None: self.value |= value
         return Property.get(self)
@@ -799,6 +842,7 @@
         if new_value_set!=self.value_set:
             self.value_set = new_value_set
         Property.set(self, None, activate, deactivate, notify)  # with None, as this is to be calculated on demand only
+        self._check_value()
 
     def add(self, value, activate=False, deactivate=False, notify=True):
         if value in self.value_set: return
@@ -875,6 +919,7 @@
 
     def _change_value(self, value, checked):
         "user has clicked checkbox or History is setting"
+        self.previous_value = set(self.value_set)
         if checked:
             if value in self.value_set: return
             self.value_set.add(value)
@@ -883,6 +928,8 @@
             else:
                 excludes = self.style_defs[value].get("exclude",[])
             self.value_set.difference_update( excludes )
+            excludes = self.style_defs[value].get("disable",[])
+            self.value_set.difference_update( excludes )
         else:
             if value in self.value_set:
                 self.value_set.remove(value)
@@ -908,6 +955,7 @@
         self._notify()
         common.history.set_property_changed(self, value, checked)
         self.update_display()
+        self.previous_value = None
 
     def update_display(self, start_editing=False):
         # when the value has changed
@@ -915,7 +963,7 @@
         if not self.editing: return
         checked = self.get_list_value()
         for i,checkbox in enumerate(self._choices):
-            if checkbox is None: continue
+            if not checkbox: continue
             name = self._names[i]
             if checked[i] and not checkbox.GetValue():
                 checkbox.SetValue(True)
@@ -923,24 +971,40 @@
                 checkbox.SetValue(False)
             # display included flags in grey and excluded flags red
             if self.EXCLUDES:
+                # mutually exclusive, e.g. ALIGN_RIGHT if ALIGN_CENTER is set
+                # red / enabled / can be checked and will then deactivate the other one
                 excludes = self.EXCLUDES.get(name, [])
             else:
                 excludes = self.style_defs[name].get("exclude",[])
-            default_color = wx.BLACK if not "rename_to" in self.style_defs[name] else wx.Colour(130,130,130)
-            if checked[i] and not name in self.value_set:
-                checkbox.SetForegroundColour(wx.Colour(120,120,100))  # grey
-            elif self.value_set.intersection( excludes ):
-                checkbox.SetForegroundColour(wx.RED)
+            if self.EXCLUDES2:
+                # dynamically excluded, e.g. horizontal alignment flag in horizontal sizer
+                # grey / disabled / can not be checked
+                excludes2 = self.EXCLUDES2
             else:
-                supported_by = self.style_defs.get(name, {}).get("supported_by", None)
-                if supported_by:
-                    checkbox.SetForegroundColour(wx.BLUE)
+                # disable if any of the flags in 'disabled' is set
+                excludes2 = self.style_defs[name].get("disabled",None)
+                if excludes2 is not None and self.value_set.intersection( excludes2 ):
+                    excludes2 = [name]
+            if not config.preferences.no_checkbox_label_colours:
+                default_color = wx.NullColour if not "rename_to" in self.style_defs[name] else wx.Colour(130,130,130)
+                if checked[i] and not name in self.value_set:
+                    checkbox.SetForegroundColour(wx.Colour(120,120,100))  # grey
+                elif self.value_set.intersection( excludes ):
+                    checkbox.SetForegroundColour(wx.RED)
                 else:
-                    checkbox.SetForegroundColour(default_color)
-            if self.EXCLUDES2 and name in self.EXCLUDES2:
-                checkbox.SetForegroundColour(wx.RED)
+                    supported_by = self.style_defs.get(name, {}).get("supported_by", None)
+                    if supported_by:
+                        checkbox.SetForegroundColour(wx.BLUE)
+                    else:
+                        checkbox.SetForegroundColour(default_color)
+            if self._one_required and name in self._one_required and checked[i]:
+                wx.CallAfter( checkbox.Disable )
+            elif excludes2 and name in excludes2:
+                if not config.preferences.no_checkbox_label_colours: checkbox.SetForegroundColour(wx.RED)
                 checkbox.Disable()
-            elif self.EXCLUDES2 is not None:
+            elif excludes2 is not None:
+                checkbox.Enable()
+            elif self._one_required and name in self._one_required and not checked[i]:
                 checkbox.Enable()
             checkbox.Refresh()
 
@@ -1023,19 +1087,19 @@
     FLAG_DESCRIPTION = OrderedDict()
     FLAG_DESCRIPTION['Border'   ] = ['wxALL', 'wxLEFT', 'wxRIGHT', 'wxTOP', 'wxBOTTOM']
     FLAG_DESCRIPTION['Alignment'] = ['wxEXPAND', 'wxALIGN_RIGHT', 'wxALIGN_BOTTOM', 'wxALIGN_CENTER',
-                                     'wxALIGN_CENTER_HORIZONTAL', 'wxALIGN_CENTER_VERTICAL',
-                                     'wxSHAPED', 'wxFIXED_MINSIZE']
+                                     'wxALIGN_CENTER_HORIZONTAL', 'wxALIGN_CENTER_VERTICAL']
+    FLAG_DESCRIPTION['Size'     ] = ['wxSHAPED', 'wxFIXED_MINSIZE', 'wxRESERVE_SPACE_EVEN_IF_HIDDEN']
     REMOVE = set( ['wxADJUST_MINSIZE',] )
     RENAMES =  {'wxALIGN_CENTRE':'wxALIGN_CENTER',
                 'wxALIGN_CENTRE_VERTICAL':'wxALIGN_CENTER_VERTICAL'}
 
-    COMBINATIONS = { "wxALL":set( 'wxLEFT|wxRIGHT|wxTOP|wxBOTTOM'.split("|") ),
-                     "wxALIGN_CENTER":set( 'wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL'.split("|") ) }
-    EXCLUDES = {'wxALIGN_RIGHT':            set(['wxALIGN_CENTER","wxALIGN_CENTER_HORIZONTAL']),
-                'wxALIGN_BOTTOM':           set(['wxALIGN_CENTER","wxALIGN_CENTER_VERTICAL']),
-                'wxALIGN_CENTER_HORIZONTAL':set(["wxALIGN_RIGHT"]),
-                'wxALIGN_CENTER_VERTICAL':  set(["wxALIGN_BOTTOM"]),
-                'wxALIGN_CENTER':           set(["wxALIGN_BOTTOM","wxALIGN_RIGHT"]) }
+    COMBINATIONS = { 'wxALL':set( 'wxLEFT|wxRIGHT|wxTOP|wxBOTTOM'.split('|') ),
+                     'wxALIGN_CENTER':set( 'wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL'.split('|') ) }
+    EXCLUDES = {'wxALIGN_RIGHT':            set(['wxALIGN_CENTER','wxALIGN_CENTER_HORIZONTAL']),
+                'wxALIGN_BOTTOM':           set(['wxALIGN_CENTER','wxALIGN_CENTER_VERTICAL']),
+                'wxALIGN_CENTER_HORIZONTAL':set(['wxALIGN_RIGHT']),
+                'wxALIGN_CENTER_VERTICAL':  set(['wxALIGN_BOTTOM']),
+                'wxALIGN_CENTER':           set(['wxALIGN_BOTTOM','wxALIGN_RIGHT']) }
 
     FLAG_NAMES  = sum( FLAG_DESCRIPTION.values(), [] )
     FLAG_VALUES = [getattr(wx, name[2:]) for name in FLAG_NAMES]
@@ -1047,10 +1111,12 @@
 
     def _check_value(self, added=None):
         # remove flags that are not applicable; set EXCLUDE2
-        if self.name != "flag" or not self.owner.sizer: return
-        excludes, remove, msg = self.owner.sizer._check_flags(self.value_set, added)
-        if remove:
-            self.value_set.difference_update(remove)
+        if self.name != "flag" or not self.owner.parent.IS_SIZER: return
+        excludes, replace, msg = self.owner.parent._check_flags(self.value_set, added)
+        if replace:
+            for key, value in replace.items():
+                self.value_set.remove(key)
+                if value is not None: self.value_set.add(value)
             self.value = None  # calculate value from value_set on demand
         self.EXCLUDES2 = excludes
 
@@ -1119,7 +1185,7 @@
                 try:
                     style_def = self.style_defs[v]
                 except:
-                    self._logger.warning( _('Style "%s" not supported for widget "%s"')%(v, self.owner.WX_CLASS) )
+                    logging.warning( _('Style "%s" not supported for widget "%s"')%(v, self.owner.WX_CLASS) )
                     value.remove(v)
                     continue
                 if "exclude" in style_def:
@@ -1215,15 +1281,20 @@
     _HORIZONTAL_LAYOUT = True # label, checkbox, text in the same line; otherwise text will be in the second line
     CONTROLNAMES = ["enabler", "text"]
     validation_re = None # for derived classes
+    control_re = re.compile( r"[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]" )  # match ASCII control characters for stripping them
     STRIP = False
     _PROPORTION = 1
     def __init__(self, value="", multiline=False, strip=False, default_value=_DefaultArgument, name=None, fixed_height=False):
         self.multiline = multiline
-        self.text = self.previous_value = None
+        self.text = None
         self.strip = strip
         self.fixed_height = fixed_height  # don't grow the edit field in vertical
         Property.__init__(self, value, default_value, name)
 
+    def toggle_active(self, active=None, refresh=True):
+        Property.toggle_active(self, active, refresh)
+        if self.text: self._set_colours(self.check_value(self.value))
+
     def _set_converter(self, value):
         # used by set()
         if self.STRIP or self.strip:
@@ -1269,7 +1340,9 @@
         return "".join(ret)
 
     def load(self, value, activate=None, deactivate=None, notify=False):
-        if value: value = self._unescape(value)
+        if value:
+            value = self._unescape(value)
+            if self.validation_re and self.validation_re.flags & re.IGNORECASE: value = value.lower()
         self.set(value, activate, deactivate, notify)
 
     def create_editor(self, panel, sizer):
@@ -1277,13 +1350,18 @@
 
         hsizer = wx.BoxSizer(wx.HORIZONTAL)
         # label
-        self.label_ctrl = label = self._get_label(self._find_label(), panel)
+        label_text = self._find_label()
+        self.label_ctrl = label = self._get_label(label_text, panel)
         #hsizer.Add(label, 2, wx.ALL | wx.ALIGN_CENTER, 3)
         hsizer.Add(label, 0, wx.ALL | wx.ALIGN_CENTER, 3)
         # checkbox, if applicable
         self.enabler = None
         if self.deactivated is not None and not self.auto_activated:
-            self.enabler = wx.CheckBox(panel, -1, '')#, size=(1,-1))
+            self.enabler = wx.CheckBox(panel, -1, '')
+            if config.preferences.use_checkboxes_workaround:
+                size = self.enabler.GetSize()
+                self.enabler.SetLabel("Enable %s"%label_text)
+                self.enabler.SetMaxSize(size)
             self.enabler.SetValue(not self.deactivated)
             self.enabler.Bind( wx.EVT_CHECKBOX, lambda event: self.toggle_active(event.IsChecked()) )
             #hsizer.Add(self.enabler, 0, wx.ALIGN_CENTER_VERTICAL)
@@ -1301,7 +1379,7 @@
                 self.enabler.Disable()
         elif self.deactivated is not None:
             self.text.Enable(not self.deactivated)
-            panel.Bind( wx.EVT_LEFT_DOWN, self._on_text_click )
+        panel.Bind( wx.EVT_LEFT_DOWN, self._on_text_click )
         # layout of the controls / sizers
         if self._HORIZONTAL_LAYOUT:
             #self.text.SetMaxSize( (-1,200) )
@@ -1333,13 +1411,13 @@
         self._set_colours()
         self._set_tooltip(label, self.text, self.enabler, *self.additional_controls)
         self.editing = True
-        
+
         if hasattr(self, "_on_label_dblclick"):
             label.Bind(wx.EVT_LEFT_DCLICK, self._on_label_dblclick)
             label.SetForegroundColour(wx.BLUE)
 
     def _on_text_click(self, event):
-        if self.deactivated and not self.auto_activated and self.text:
+        if not self.blocked and self.deactivated and not self.auto_activated and self.text:
             text_rect = self.text.GetClientRect()
             text_rect.Offset(self.text.Position)
             if text_rect.Contains(event.Position):
@@ -1369,18 +1447,18 @@
         text.Bind(wx.EVT_SET_FOCUS, self.on_focus)
         # XXX
         text.Bind(wx.EVT_CHAR, self.on_char)
-        if self.validation_re:
-            text.Bind(wx.EVT_TEXT, self._on_text)
+        text.Bind(wx.EVT_TEXT, self._on_text)
         return text
 
     def _on_text(self, event):
         if self.deactivated or self.blocked: return
-        if self.check(event.GetString()):
-            self.text.SetBackgroundColour( compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW) )
-            self.text.Refresh()
-        else:
-            self.text.SetBackgroundColour(wx.RED)
-            self.text.Refresh()
+        text = event.GetString()
+        if not self.validation_re and self.control_re.search(text):
+            # strip most ASCII control characters
+            self.text.SetValue(self.control_re.sub("", text))
+            wx.Bell()
+            return
+        self._set_colours( self.check_value(text) )
         event.Skip()
 
     def create_additional_controls(self, panel, sizer, hsizer):
@@ -1390,12 +1468,34 @@
     def update_display(self, start_editing=False):
         # when the value has changed
         if start_editing: self.editing = True
-        if not self.editing: return
+        if not self.editing or not self.text: return
         self.text.SetValue(self._convert_to_text(self.value) or "")
         self._set_colours()
 
-    def _set_colours(self):
-        pass
+    def set_check_result(self, warning=None, error=None):
+        if warning==self._warning and error==self._error: return
+        self._warning = warning
+        self._error = error
+
+        if not self.text: return
+        compat.SetToolTip(self.text, self._find_tooltip())
+        self._set_colours()
+
+    def _set_colours(self, warning_error=None):
+        # set color to indicate errors and warnings
+        if not self.text: return
+        if warning_error:
+            warning, error = warning_error
+        else:
+            warning, error = self._warning, self._error
+        if error:
+            bgcolor = wx.RED
+        elif warning:
+            bgcolor = wx.Colour(255, 255, 0, 255)  # yellow
+        else:
+            bgcolor = wx.WHITE
+        self.text.SetBackgroundColour( bgcolor )
+        self.text.Refresh()
 
     def _convert_to_text(self, value):
         """convert from self.value to string that will be displayed/edited in TextCtrl
@@ -1418,6 +1518,13 @@
     def on_kill_focus(self, event):
         event.Skip()
         self.flush()
+    
+    def set_focus(self):
+        if self.blocked: return
+        if self.deactivated is False:
+            if self.enabler: self.enabler.SetFocus()
+        else:
+            if self.text: self.text.SetFocus()
 
     def _check_for_user_modification(self, new_value=None, force=False, activate=False):
         if new_value is None:
@@ -1427,18 +1534,36 @@
             self.text.SetValue( self._convert_to_text(self.value))
             return
         self.previous_value = self.value
-        return Property._check_for_user_modification(self, new_value, force, activate)
+        ret = Property._check_for_user_modification(self, new_value, force, activate)
+        self.check(self.value)  # a value can be valid, but e.g. a non-unique name to be visualized in color
+        return ret
 
     def _convert_from_text(self, text=None):
         "convert from TextCtrl input value to self.value; change in derived classes"
-        if text is None: value = self.text.GetValue()
+        if text is None: text = self.text.GetValue()
         return text
 
-    def check(self, value):
-        "checks whether the string value matches the validation regular expression"
-        if not self.validation_re: return True
-        return bool( self.validation_re.match(value) )
-    
+    def check_value(self, value):
+        "return (warning, error)"
+        if value is None:
+            return (None, "empty")
+        if not isinstance(value, compat.unicode): value = self._convert_to_text(value)
+        if self.validation_re and not self.validation_re.match(value):
+            return (None, "invalid")
+        warning, error = self._check(value)
+        return warning, error
+
+    def check(self, value=None):
+        if value is None: value = self.value
+        if isinstance(value, compat.unicode):
+            self.set_check_result( *self.check_value(value) )
+        else:
+            self.set_check_result()  # if it's not a text, it must be valid
+
+    def _check(self, value):
+        # called from check, if value matches validation_re
+        return None, None
+
     def flush(self):
         if self.text is None: return
         if self.text.IsBeingDeleted(): return
@@ -1446,6 +1571,7 @@
         self._check_for_user_modification()
 
 
+
 class TextPropertyA(TextProperty):
     deactivated = False
 class TextPropertyD(TextProperty):
@@ -1479,13 +1605,13 @@
                 return None
         return str(float(value))
 
-    def check(self, value):
-        if not self.validation_re.match(value): return False
-        if self.val_range is None: return True
-        v = float(value)
-        if v<self.val_range[0] or v>self.val_range[1]:
-            return False
-        return True
+    def _check(self, value):
+        # called from check if the format was OK
+        if self.val_range is not None:
+            v = float(value)
+            if v<self.val_range[0] or v>self.val_range[1]:
+                return (None, "out of range")
+        return (None, None)
 
     def _set_converter(self, value):
         if isinstance(value, compat.unicode):
@@ -1505,41 +1631,48 @@
 class NameProperty(TextProperty):
     #validation_re  = re.compile(r'^[a-zA-Z_]+[\w-]*(\[\w*\])*$')  # Python 3 only, including non-ASCII characters
     validation_re  = re.compile(r'^[a-zA-Z_]+[a-zA-Z0-9_-]*$')  # Python 2 also; for lisp a hyphen - is allowed
+
     def _check_name_uniqueness(self, name):
         # check whether the name is unique
-        if config.preferences.allow_duplicate_names: return
+        if self.owner.IS_TOPLEVEL:
+            for child in self.owner.parent.children:
+                if child is self.owner: continue
+                if child.name==name: return False
+            return True
         if name == self.value: return True
-        if common.app_tree.has_name(name,self.owner.node):
+        if name in self.owner.toplevel_parent.names:
             return False
         return True
 
-    def _on_text(self, event):
-        if self.deactivated or self.blocked: return
-        name = event.GetString()
-        match = self.validation_re.match(name)
-        if match:
-            if self._check_name_uniqueness(name):
-                self.text.SetBackgroundColour( compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW) )
-            else:
-                self.text.SetBackgroundColour( wx.Colour(255, 255, 0, 255) )  # YELLOW
-        else:
-            self.text.SetBackgroundColour(wx.RED)
-        self.text.Refresh()
-        event.Skip()
+    # return (result, message) where result is [True, False, "warn"]
+    def _check(self, value):
+        # called from check if the format was OK
+        if value and "-" in value and common.root.language!="lisp":
+            return (None, "invalid")
+        if self._check_name_uniqueness(value):
+            return (None,None)
+        if self.owner.IS_TOPLEVEL:
+            return ("Name not unique", None)
+        return (None, "Name not unique")
 
     def _convert_from_text(self, value):
         "normalize string to e.g. '-1, -1'; return None if invalid"
         match = self.validation_re.match(value)
         #if not match: return self.value
         if not match: return None
-        if not self._check_name_uniqueness(value): return None
+        if value and "-" in value and common.root.language!="lisp": return None
+        if not self.owner.IS_TOPLEVEL and not self._check_name_uniqueness(value): return None
         return value
 
-    def check(self, value):
-        # check whether it's valid to set value
-        check = self._convert_from_text(value)
-        if check is None: return False
-        return True
+
+class InstanceClassPropertyD(TextProperty):
+    deactivated = True
+    validation_re = re.compile(r'^[a-zA-Z_]+[\w:.0-9-]*$')
+
+
+class BaseClassesPropertyD(TextProperty):
+    deactivated = True
+    validation_re = re.compile(r'^[a-zA-Z_]+[\w:.0-9-\,]*$')
 
 
 class ClassProperty(TextProperty):
@@ -1548,68 +1681,46 @@
     _UNIQUENESS_MSG2 = ("Name not unique; imported class may be overwritten, as\n"
                         "wxGlade is currently creating code like from '... import ...'.")
 
-    def create_text_ctrl(self, panel, value):
-        text = TextProperty.create_text_ctrl(self, panel, value)
-        self._check(value, text)  # do the check now, not only on changes; to indicated non-unique class names
-        return text
-
     def _check_class_uniqueness(self, klass):
         """Check whether the class name is unique, as otherwise the source code would be overwritten.
         Returns string message if not unique, None else."""
-        if klass==self.owner.base: return None
+        if klass==self.owner.WX_CLASS: return None
         if "." in klass:
             leaf = klass.rsplit(".",1)[-1]
         else:
             leaf = None
-        this_node = self.owner.node
 
         # shortcut: check sibilings first
-        siblings = this_node.parent.children
+        siblings = self.owner.parent.get_all_children()
         for node in siblings:
-            if node.widget is self.owner: continue
-            if node.widget.klass==klass:
+            if node is self.owner or not node.check_prop("class"): continue
+            if node.klass==klass:
                 return self._UNIQUENESS_MSG1
-            if leaf and "." in node.widget.klass and leaf==node.widget.klass.rsplit(".",1)[-1]:
+            if leaf and "." in node.klass and leaf==node.klass.rsplit(".",1)[-1]:
                 return self._UNIQUENESS_MSG2
 
         # check recursively, starting from root
         def check(children):
             for c in children:
+                if c is None or c.IS_SLOT: continue
                 if c.children:
                     result = check(c.children)
                     if result: return result
-                if node is not this_node:
-                    w = node.widget
-                    if w.klass==w.base: continue
-                    if w.klass==klass:
-                        return self._UNIQUENESS_MSG1
-                    if leaf and "." in w.klass and leaf==w.klass.rsplit(".",1)[-1]:
-                        return self._UNIQUENESS_MSG2
+                if c is self.owner or not c.check_prop("class"): continue
+                if c.klass==klass:
+                    return self._UNIQUENESS_MSG1
+                if leaf and "." in c.klass and leaf==c.klass.rsplit(".",1)[-1]:
+                    return self._UNIQUENESS_MSG2
             return None
-        return check(common.app_tree.root.children)
+        return check(common.root.children)
 
     def _check(self, klass, ctrl=None):
-        # called by _on_text and create_text_ctrl to validate and indicate
-        if not self.text and not ctrl: return
-        if ctrl is None: ctrl = self.text
-        if not self.validation_re.match(klass):
-            ctrl.SetBackgroundColour(wx.RED)
-            compat.SetToolTip(ctrl, "Name is not valid.")
-        else:
-            msg = self._check_class_uniqueness(klass)
-            if not msg:
-                ctrl.SetBackgroundColour( compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW) )
-                compat.SetToolTip( ctrl, self._find_tooltip() )
-            else:
-                ctrl.SetBackgroundColour( wx.Colour(255, 255, 0, 255) )  # YELLOW
-                compat.SetToolTip(ctrl, msg)
-        ctrl.Refresh()
+        msg = self._check_class_uniqueness(klass)
+        return (msg, None)
 
-    def _on_text(self, event):
-        if self.deactivated or self.blocked: return
-        klass = event.GetString()
-        self._check(klass)
-        event.Skip()
+
+class ClassPropertyD(ClassProperty):
+    deactivated = True
 
 
 class IntPairPropertyD(TextPropertyD):
@@ -1627,9 +1738,11 @@
     def _convert_from_text(self, value):
         "normalize string to e.g. '-1, -1'; return None if invalid"
         match = self.validation_re.match(value)
-        #if not match: return self.value
         if not match: return None
-        return self.normalization%match.groups()
+        ret = self.normalization%match.groups()
+        if self.validation_re.flags & re.IGNORECASE:
+            ret = ret.lower()
+        return ret
 
     def get_tuple(self, widget=None):
         a, b = self.value.split(",")
@@ -1638,14 +1751,20 @@
 
 class SizePropertyD(IntPairPropertyD):
     d = r"(\s*[dD]?)" # the trailig d for "dialog units"
-    validation_re = re.compile( _leading + _ge_m1 + _comma + _ge_m1 + d + _trailing )  # match pair of integers >=- 1
+    validation_re = re.compile( _leading + _ge_m1 + _comma + _ge_m1 + d + _trailing, re.IGNORECASE )
     del d
     normalization = "%s, %s%s" # for normalization % valiation_re.match(...).groups()
 
     def set(self, value, activate=None, deactivate=None, notify=False):
         IntPairPropertyD.set(self, value, activate, deactivate, notify)
+
     def get_size(self, widget=None):
         "widget argument is used to calculate size in Dialog units, using wx.DLG_SZE"
+        if not self.is_active():
+            if widget:
+                return widget.GetBestSize()
+            raise ValueError("internal error")
+
         w, h = self.value.split(",")
 
         if h[-1] in 'dD':
@@ -1726,13 +1845,13 @@
 
 class ComboBoxProperty(TextProperty):
     _CB_STYLE = wx.CB_DROPDOWN
-    def __init__(self, value="", choices=[], default_value=_DefaultArgument, name=None):
+    def __init__(self, value="", choices=[], strip=False, default_value=_DefaultArgument, name=None):
         self.choices = choices
-        TextProperty.__init__(self, value, False, default_value, name)
+        TextProperty.__init__(self, value, False, strip, default_value, name)
 
     def create_text_ctrl(self, panel, value):
-        combo = wx.ComboBox( panel, -1, self.value, choices=self.choices, style=self._CB_STYLE )
-        combo.SetStringSelection(self.value)
+        combo = wx.ComboBox( panel, -1, value or "", choices=self.choices, style=self._CB_STYLE )
+        combo.SetStringSelection(value or "")
         combo.Bind(wx.EVT_COMBOBOX, self.on_combobox)
         combo.Bind(wx.EVT_KILL_FOCUS, self.on_kill_focus)
         combo.Bind(wx.EVT_SET_FOCUS, self.on_focus)
@@ -1745,7 +1864,7 @@
             self.choices[:] = choices
         if not self.value in self.choices:
             self.value = ""
-        if not self.editing: return
+        if not self.editing or not self.text: return
         # update choices, but keep current selection, if possible
         self.text.SetItems(self.choices)
         if self.value in self.choices:
@@ -1779,6 +1898,15 @@
 class ListBoxProperty(ComboBoxProperty):
     _CB_STYLE = wx.CB_DROPDOWN | wx.CB_READONLY
 
+    def _on_text_click(self, event):
+        if self.deactivated and not self.auto_activated and self.text:
+            text_rect = self.text.GetClientRect()
+            text_rect.Offset(self.text.Position)
+            if text_rect.Contains(event.Position):
+                self.toggle_active(active=True)
+                return
+        event.Skip()
+
 #class ListBoxProperty(ComboBoxProperty):
     #def __init__(self, value="", choices=[], default_value=_DefaultArgument, name=None):
         #self.choices = choices
@@ -1871,7 +1999,7 @@
     def update_display(self, start_editing=False):
         TextProperty.update_display(self, start_editing)
         self._update_button()
-        
+    
     def has_control(self, control):
         if TextProperty.has_control(self, control): return True
         if self.button and control is self.button:  return True
@@ -1920,7 +2048,7 @@
 
     def _on_label_dblclick(self, event):
         # show directory in explorer/finder
-        app_filename = common.app_tree.app.filename
+        app_filename = common.root.filename
         if not self.value and not app_filename: return
         import os,sys
         directory = self.value or app_filename
@@ -1944,13 +2072,9 @@
     def on_drop_file(self, filename):
         if not wx.GetKeyState(wx.WXK_ALT) and not wx.GetKeyState(wx.WXK_CONTROL):
             # insert relative filename, if available and the filename is under the project directory
-            project_path = common.app_tree.app.filename
-            if project_path:
-                project_path = os.path.abspath( os.path.dirname(project_path) )
-                if filename.startswith(project_path):
-                    filename = "./" + os.path.relpath(filename, project_path)
-        if os.path.sep=="\\":
-            filename = filename.replace("\\", "/")
+            filename = misc.get_relative_path(filename)
+
+        if os.path.sep=="\\": filename = filename.replace("\\", "/")
 
         self._check_for_user_modification(filename, activate=True)
         self.update_display()
@@ -1963,7 +2087,7 @@
 
 class BitmapProperty(FileNameProperty):
     def __init__(self, value="", name=None, min_version=None):
-        self._size = self._warning = self._error = None
+        self._size = None  # will be set when a bitmap is loaded
         style = wx.FD_OPEN | wx.FD_FILE_MUST_EXIST
         FileNameProperty.__init__(self, value, style, "", name)
         self.min_version = min_version
@@ -1975,36 +2099,19 @@
             self._size = bmp.Size
         if self.text: compat.SetToolTip(self.text, self._find_tooltip())
 
-    def set_check_result(self, warning=None, error=None):
-        self._warning = warning
-        self._error = error
-
-        if not self.text: return
-        compat.SetToolTip(self.text, self._find_tooltip())
-        self._set_colours()
-
-    def _set_colours(self):
-        # set color to indicate errors and warnings
-        bgcolor = wx.WHITE
-        if self._warning:
-            bgcolor = Colour(255, 255, 0, 255)  # yellow
-        if self._error:
-            bgcolor = wx.RED
-        self.text.SetBackgroundColour( bgcolor )
-        self.text.Refresh()
-
     def _find_tooltip(self):
         ret = []
-        if self._error:   ret.append(self._error)
-        if self._warning: ret.append(self._warning)
         if self._size:
-            if ret: ret.append("")
             ret.append( "Size: %s\n"%self._size )
         t = FileNameProperty._find_tooltip(self)
         if t: ret.append( t )
         if ret and not self._warning and not self._error:
-            ret.append( '\n\nYou can either drop or select a file or you can specify the bitmap using '
-                        'hand-crafted statements with the prefixes "art:", "code:", "empty:" or "var:".\n'
+            ret.append( '\n\nIf the bitmap should be loaded from a file, use the "..." button or just\n'
+                        'drop a file on the text field.\n'
+                        'When dropping a file from inside the project directory, a relative path is\n'
+                        'entered unless you hold the ALT or CTRL key.\n\n'
+                        'Alternatively, you can specify the bitmap using hand-crafted statements\n'
+                        'with the prefixes "art:", "code:", "empty:" or "var:".\n'
                         'Double-click to see the wxGlade documentation how to write such statements.' )
         return "\n".join(ret)
 
@@ -2083,10 +2190,11 @@
             value = misc.color_to_string(value)
         return value
 
-    def get_color(self):
+    def get_color(self, color=None):
         # return a wx.Colour instance
-        if not self.is_active(): return self.default_value
-        color = self.get()
+        if color is None:
+            if not self.is_active(): return self.default_value
+            color = self.get()
         if color is None: return self.default_value
         if color=="wxNullColour": return wx.NullColour
         if color in self.str_to_colors:
@@ -2111,13 +2219,35 @@
         else:
             self.button.SetBackgroundColour(color)
 
+    def _convert_from_text(self, value):
+        # returns a string if valid, None otherwise
+        try:
+            if not self.get_color(value): return None
+            return value
+        except:
+            return None
+    
+    def _convert_to_text(self, value):
+        # just used when user entered an invalid value to reset to either None/"" or a string
+        if value is None: return ""
+        return value
 
+    def check_value(self, value):
+        "return (warning, error)"
+        try:
+            checked = self.get_color(value)
+        except:
+            checked = None
+        if not checked:  # get_color returned None or raised an exception
+            return (None, "invalid")
+        return (None,None)
 
 
 class ColorPropertyD(ColorProperty):
     deactivated = True
 
 class FontProperty(DialogProperty):
+    # keep this in sync with wxGladeFontDialog
     font_families_to = {'default': wx.FONTFAMILY_DEFAULT,
                         'decorative': wx.FONTFAMILY_DECORATIVE, 'roman': wx.FONTFAMILY_ROMAN,
                         'swiss': wx.FONTFAMILY_SWISS, 'script': wx.FONTFAMILY_SCRIPT, 'modern': wx.FONTFAMILY_MODERN }
@@ -2130,8 +2260,8 @@
     font_families_to['teletype'] = wx.FONTFAMILY_TELETYPE
     font_families_from[wx.FONTFAMILY_TELETYPE] = 'teletype'
 
-    validation_re = re.compile(" *\[(\d+), *'(default|decorative|roman|swiss|script|modern)', *"
-                               "'(normal|slant|italic)', *'(normal|light|bold)', *(0|1), *'([a-zA-Z _]*)'] *")
+    validation_re = re.compile(r" *\[(\d+), *'(default|teletype|decorative|roman|swiss|script|modern)', *"
+                               r"'(normal|slant|italic)', *'(normal|light|bold)', *(0|1), *'([a-zA-Z _]*)'] *")
     normalization = "[%s, '%s', '%s', '%s', %s, '%s']"
 
     # for writing code
@@ -2146,10 +2276,10 @@
         try:
             props = [common.encode_to_unicode(s) for s in self.value]
         except:
-            self._logger.exception(_('Internal Error'))
+            logging.exception(_('Internal Error'))
             return
         if len(props) < 6:
-            self._logger.error( _('error in the value of the property "%s"'), self.name )
+            logging.error( _('error in the value of the property "%s"'), self.name )
             return
         inner_xml =  common.format_xml_tag(u'size',       props[0], tabs+1)
         inner_xml += common.format_xml_tag(u'family',     props[1], tabs+1)
@@ -2214,6 +2344,7 @@
     GROW = True
     _PROPORTION = 5
     validation_res = None # one per column
+    UPPERCASE_COLS = None # True,False,None per column for upper,lower,any
     EDITABLE_COLS = None
     IS_KEY_VALUE = False # set to True if the values in the first column are unique
     SKIP_EMPTY = False
@@ -2240,6 +2371,12 @@
         self.cur_row = self.cur_col = 0
         self.editing_values = None # before pressing Apply; stored here because the editor grid might be deleted
         self.grid = None
+        self._last_focus = None
+        self._initialize_indices()
+
+    def _get_default_row(self, index):
+        # e.g. NotebookPagesProperty may override this
+        return self.default_row[:]
 
     def set(self, value, *args, **kwargs):
         Property.set(self, value, *args, **kwargs)
@@ -2247,6 +2384,13 @@
         self.editing_values = None
         self.update_display()
 
+    def insert(self, index, item):
+        assert not self.deactivated
+        value = self.get()
+        value.insert(index, item)
+        self.editing_values = None
+        self.set(value)
+
     def get(self):
         if self.deactivated:
             return self.default_value
@@ -2284,16 +2428,16 @@
             add_btn = insert_btn = remove_btn = None
             if self.can_add:
                 add_btn = wx.Button(panel, wx.ID_ANY, _("  A&dd  "), style=wx.BU_EXACTFIT)
-                compat.SetToolTip(add_btn, "Ctrl-A")
-                add_btn.Bind(wx.EVT_BUTTON, self.add_row)
+                compat.SetToolTip(add_btn, "Ctrl-A, Alt-D")
+                add_btn.Bind(wx.EVT_BUTTON, self.on_button_add)
             if self.can_insert:
                 insert_btn = wx.Button(panel, wx.ID_ANY, _("  &Insert  "), style=wx.BU_EXACTFIT)
-                insert_btn.Bind(wx.EVT_BUTTON, self.insert_row)
-                compat.SetToolTip(insert_btn, "Ctrl-I")
+                insert_btn.Bind(wx.EVT_BUTTON, self.on_button_insert)
+                compat.SetToolTip(insert_btn, "Ctrl-I, Alt-I")
             if self.can_remove:
                 remove_btn = wx.Button(panel, wx.ID_ANY, _("  &Remove  "), style=wx.BU_EXACTFIT)
-                remove_btn.Bind(wx.EVT_BUTTON, self.remove_row)
-                compat.SetToolTip(remove_btn, "Ctrl-R")
+                remove_btn.Bind(wx.EVT_BUTTON, self.on_button_remove)
+                compat.SetToolTip(remove_btn, "Ctrl-R, Alt-R")
             self.buttons = [add_btn, insert_btn, remove_btn]
             for btn in self.buttons:
                 if btn: btn_sizer.Add( btn, 0, wx.LEFT | wx.RIGHT | extra_flag, 4 )
@@ -2308,6 +2452,22 @@
         else:
             self.buttons = []
 
+        # optional accessibility: navigation and editors to edit a row #################################################
+        self.editors = []
+        if config.preferences.show_gridproperty_editors:
+            edit_sizer = wx.FlexGridSizer(len(self.col_defs), 2, 3, 3)
+            edit_sizer.AddGrowableCol(1)
+            for i, (label,datatype) in enumerate(self.col_defs):
+                edit_sizer.Add(wx.StaticText(panel, -1, _(label)), 0, wx.ALIGN_CENTER_VERTICAL)
+                editor = wx.TextCtrl(panel)
+                edit_sizer.Add(editor, 1, wx.EXPAND)
+                self.editors.append(editor)
+                editor.Bind(wx.EVT_KILL_FOCUS, self.on_kill_focus_editor)
+                editor.Bind(wx.EVT_SET_FOCUS, self.on_focus_editor)
+                # use EVT_CHAR_HOOK as EVT_CHAR and EVT_KEY_DOWN don't work for Enter key, even with TE_PROCESS_ENTER
+                editor.Bind(wx.EVT_CHAR_HOOK, self.on_char_editor)
+                editor.Bind(wx.EVT_TEXT, self.on_text_editor)
+
         # the grid #####################################################################################################
         self.grid = wx.grid.Grid(panel, -1)
         self.grid.Name = self.name
@@ -2329,6 +2489,9 @@
         # add the button sizer and the grid to the sizer ###############################################################
         if self.buttons:
             box_sizer.Add(btn_sizer, 0, wx.BOTTOM | wx.EXPAND, 2)
+        if self.editors:
+            box_sizer.Add(edit_sizer, 0, wx.BOTTOM | wx.EXPAND, 2)
+
         box_sizer.Add(self.grid, 1, wx.EXPAND)
         # add our sizer to the main sizer   XXX change if required
         sizer.Add(box_sizer, self._PROPORTION, wx.EXPAND)
@@ -2343,7 +2506,7 @@
         else:
             self.grid.Bind(wx.grid.EVT_GRID_CELL_CHANGED, self.on_cell_changed)
             self.grid.Bind(wx.grid.EVT_GRID_CELL_CHANGING, self.on_cell_changing)  # for validation
-        self.grid.Bind(wx.EVT_SET_FOCUS, self.on_focus)
+        self.grid.Bind(wx.EVT_SET_FOCUS, self.on_grid_focus)
 
         self._set_tooltip(self.grid.GetGridWindow(), *self.buttons)
 
@@ -2351,14 +2514,20 @@
         # On wx 2.8 the EVT_CHAR_HOOK handler for the control does not get called, so on_char will be called from main
         #self.grid.Bind(wx.EVT_CHAR_HOOK, self.on_char)
         self._width_delta = None
+        self._last_focus = None
+
+    def on_grid_focus(self, event):
+        self.on_focus(event)  # Skip will be called
+        self._last_focus = "grid"
 
     def on_char(self, event):
+        # key handler for grid
         if isinstance(self.grid.FindFocus(), wx.TextCtrl):
             # a cell is being edited
             event.Skip()
             return True  # avoid propagation
         self.on_focus()
-        key = (event.GetKeyCode(), event.GetModifiers())
+        key = (event.GetKeyCode(), event.GetModifiers())  # modifiers: 1,2,4 for Alt, Ctrl, Shift
 
         # handle F2 key
         if key==(wx.WXK_F2,0) and self.grid.CanEnableCellControl():
@@ -2369,18 +2538,18 @@
         # handle Ctrl-I, Ctrl-A, Ctrl-R; Alt-A will be handled by the button itself
         if key in ((73,2),(73,1)) and self.can_insert:
             # Ctrl-I, Alt-I
-            self.insert_row(event)
+            self.insert_row(set_focus=True, highlight=False)
         elif key in ((65,2),(68,1)) and self.can_add:
             # Ctrl-A, Alt-D
-            self.add_row(event)
+            self.add_row(set_index=True, delay=False)
         elif key==(65,1) and not self.immediate:
             # Alt-A
-            self.apply(event)
-        elif key==(82,2) and self.can_remove:
-            # Ctrl-R
-            self.remove_row(event)
+            self.apply()
+        elif key in ((82,2),(82,1)) and self.can_remove:
+            # Ctrl-R, Alt-R
+            self.remove_row(set_focus=True, highlight=False)
         elif key in ((84,2),(84,1)): # Ctrl-T, Alt-T
-            self.reset(event)
+            self.reset()
         elif key==(67,2):  # Ctrl-C
             if not self._copy(): event.Skip()
         elif key==(86,2):  # Ctrl-V
@@ -2388,7 +2557,6 @@
         elif key==(88,2):  # Ctrl-X
             if not self._cut(): event.Skip()
         else:
-            #event.Skip()
             return False
         return True  # handled
 
@@ -2500,7 +2668,7 @@
         else:
             wx.Bell()
             return
-        # check and convert values; XXX use validation_res
+        # check and convert values; XXX use validation_res and UPPERCASE_COLS
         for row_value in value:
             for i,v in enumerate(row_value):
                 col = paste_columns[i]
@@ -2584,11 +2752,45 @@
         self.cur_row = event.GetRow()
         self.cur_col = event.GetCol()
         event.Skip()
+        self._last_focus = "grid"
         self.on_focus()
+        self._update_editors()
+
+    def _set_index(self, row=None, col=None):
+        # optionally, change the index; always select the grid row or cell
+        value = self.editing_values if self.editing_values is not None else self.value
+        row_count = len(value)
+        if self.can_add and self.immediate: row_count += 1
+        if row is not None:
+            self.cur_row = row
+        if self.cur_row<0:
+            self.cur_row = 0
+        elif self.cur_row >= row_count:
+            self.cur_row = row_count - 1
+        if col is not None:
+            self.cur_col = col
+
+        self._update_editors()
+
+        if not self.grid: return
+        self.grid.ClearSelection()
+        if self.cur_row>=0:
+            self.grid.MakeCellVisible(self.cur_row, 0)
+            if self._last_focus=="grid":
+                if hasattr(self.grid, "GoToCell"):
+                    self.grid.GoToCell( self.cur_row, self.cur_col )
+                else:
+                    self.grid.SetGridCursor(self.cur_row, self.cur_col)  # calls MakeCellVisible
+            else:
+                self.grid.SelectRow(self.cur_row)  # this will move the focus from the editor to the grid
+
+        if self.editors and self._last_focus=="editor":
+            self.restore_editor_focus()
 
     def update_display(self, start_editing=False):
+        # update complete grid and editors
         if start_editing: self.editing = True
-        if not self.editing: return
+        if not self.editing or not self.grid: return
 
         # values is a list of lists with the values of the cells
         value = self.editing_values if self.editing_values is not None else self.value
@@ -2617,6 +2819,7 @@
         self._update_apply_button()
         self._update_remove_button()
         self._update_indices()
+        self._update_editors()
 
     def apply(self, event=None):
         """Apply the edited value; called by Apply button.
@@ -2648,7 +2851,7 @@
         self.editing_values = None
         self._initialize_indices()
         self._update_indices()
-
+        self._update_editors()
         self._update_apply_button()
         if event is not None: event.Skip()
     
@@ -2660,7 +2863,16 @@
         self.editing_values = None
         self._initialize_indices()
         self.update_display()
-        event.Skip()
+        if event: event.Skip()
+
+    def _validate(self, row, col, value, bell=True):
+        if not self.validation_res or not self.validation_res[col]:
+            return True
+        validation_re = self.validation_res[col]
+        match = validation_re.match(value)
+        if match: return True
+        if bell: wx.Bell()
+        return False
 
     def _get_new_value(self):
         # returns None if not edited
@@ -2711,36 +2923,56 @@
         for i, index in enumerate(self.indices):
             self.grid.SetRowLabelValue(i, index)
 
-    # edit handlers; add/remove/insert button handlers #################################################################
+    # grid event handlers ##############################################################################################
     def on_cell_changing(self, event):
-        # XXX validate; event.Veto if not valid
-        self.on_focus()
-        if not self.validation_res: return
+        # Phoenix only: handler for EVT_GRID_CELL_CHANGING
+        # validate; event.Veto if not valid
         row,col = event.Row, event.Col
+        value = event.GetString()
+        if not self._validate(row, col, value):
+            return event.Veto()  # after that, the editor's result will not be applied
+        return event.Skip()
 
     def on_cell_changed(self, event):
-        # user has entered a value
+        # user has entered a value into the grid
+        # Phoenix: handler for EVT_GRID_CELL_CHANGED  (after EVT_GRID_CELL_CHANGING without Veto)
+        # Classic: handler for EVT_GRID_CMD_CELL_CHANGE
         self.on_focus()
         row,col = event.Row, event.Col
-        value = event.GetEventObject().GetCellValue(row,col)  # the new value
-        if self.validation_res and self.validation_res[col]:
-            validation_re = self.validation_res[col]
-            match = validation_re.match(value)
-            if not match:
-                wx.Bell()
-                event.Veto()
-                return
+        value = event.GetEventObject().GetCellValue(row, col) # event.GetString would return the old value here
+        if not self._validate(row, col, value):
+            return event.Veto()                               # after that, the cell will be set to the old value again
+        self._on_value_edited(row, col, value)                # this can add a row
+        event.Skip()
+        self._update_editors()
+
+    def _on_value_edited(self, row, col, value, set_index=None, delay=True):
+        # returns False if the new value is not OK
+        # grid and editors need to be updated outside
+        # set_index is used in case a row is added
+
+        if not self._validate(row, col, value):
+            wx.Bell()
+            return False
+
+        if self.UPPERCASE_COLS:
+            value_ = value
+            if self.UPPERCASE_COLS[col] is True:
+                value = value.upper()
+            elif self.UPPERCASE_COLS[col] is False:
+                value = value.lower()
+            if value != value_:
+                self.grid.SetCellValue(row, col, value)
 
         if self.immediate or (not self.can_add and not self.can_insert and not self.can_insert):
             if row>=len(self.value):
-                self.add_row(None)
-            # immediate
+                self.add_row(row=set_index, delay=delay)
+            # immediate, i.e. no editing_values
             if self.value[row] is None:
                 self.value[row] = self.default_row[:]
             self.value[row][col] = value
             self._notify()
-            event.Skip()
-            return
+            return True
 
         activate_apply = not self.editing_values
         data = self._ensure_editing_copy()
@@ -2755,63 +2987,232 @@
             #value = bool(value)
         data[row][col] = value
         if activate_apply: self._update_apply_button()
+        return True
+
+    # event handlers for the optional property editors (text controls) #################################################
+    def on_focus_editor(self, event):
+        # track whether grid or editors had the last focus
+        self._last_focus = "editor"
+        self._last_focus_id = event.GetEventObject().GetId()
+        if self.cur_row is not None and self.cur_row>=0 and self.cur_row<self.grid.NumberRows:
+            self.grid.SelectRow(self.cur_row)
+        event.Skip()
+
+    def restore_editor_focus(self):
+        # restore focus after a button (Add/Insert/Remove) has been pressed
+        if self._last_focus!="editor": return
+        ctrl = self.grid.Parent.FindWindowById(self._last_focus_id)
+        if ctrl: ctrl.SetFocus()
+
+    def on_text_editor(self, event):
+        # editor text control content changed; validate and display result / update values
+        ctrl = event.GetEventObject()
+        col = self.editors.index( ctrl )
+        if not self._validate(self.cur_row, col, event.GetString(), bell=False ):
+            ctrl.SetBackgroundColour(wx.RED)
+            ctrl.Refresh()
+            return
+        ctrl.SetBackgroundColour(wx.NullColour)
+        ctrl.Refresh()
+        event.Skip()
+
+    def _on_editor_edited(self, event, set_index=None):
+        # called from key or focus event handler; set value if valid
+        ctrl = event.GetEventObject()
+        if not ctrl: return False
+        if not self.grid or not self.grid.NumberRows: return False
+        col = self.editors.index( ctrl )
+
+        ret = False
+
+        value = ctrl.GetValue()
+        if value == self.grid.GetCellValue(self.cur_row, col):
+            return False
+
+        if self._on_value_edited(self.cur_row, col, value, set_index=set_index, delay=False):
+            value = self._ensure_editing_copy()[self.cur_row][col]
+            self.grid.SetCellValue(self.cur_row, col, value)
+            #self.grid.Refresh()
+            ret = True
+
+        return ret
+
+    def on_kill_focus_editor(self, event):
+        self._on_editor_edited(event)
+        self._update_editors(event.GetEventObject())
         event.Skip()
 
-    def add_row(self, event):
+    def on_char_editor(self, event):
+        # EVT_CHAR_HOOK handler for the text controls if config.show
+        key = (event.GetKeyCode(), event.GetModifiers())    # modifiers: 1,2,4 for Alt, Ctrl, Shift
+
+        if key[0] == wx.WXK_ESCAPE:
+            self._update_editors()
+            return
+
+        if key[0] in (wx.WXK_RETURN, wx.WXK_UP, wx.WXK_DOWN):
+            # flush and if cursor key was hit, go to another line
+            row = self.cur_row
+            if key[0]==wx.WXK_UP:
+                row -= 1
+            elif key[0]==wx.WXK_DOWN:
+                row += 1
+            self._on_editor_edited(event, set_index=row)
+            self._set_index(row)
+            return
+
+        # handle Ctrl-I, Ctrl-A, Ctrl-R; Alt-A will be handled by the button itself
+        if key in ((73,2),(73,1)) and self.can_insert:
+            # Ctrl-I, Alt-I
+            self.insert_row(set_focus=False, highlight=True)
+        elif key in ((65,2),(68,1)) and self.can_add:
+            # Ctrl-A, Alt-D
+            self.add_row(set_index=False, delay=False)
+        #elif key==(65,1) and not self.immediate:
+            ## Alt-A
+            #self.apply(event)
+        elif key in ((82,2),(82,1)) and self.can_remove:
+            # Ctrl-R, Alt-R
+            self.remove_row(set_focus=False, highlight=True)
+        #elif key in ((84,2),(84,1)): # Ctrl-T, Alt-T
+            #self.reset(event, from_editor)
+        else:
+            event.Skip()
+
+    def _update_editors(self, ctrl=None):
+        if not self.editors: return
+        value = self.editing_values if self.editing_values is not None else self.value
+
+        try:
+            row = value[self.cur_row]
+        except IndexError:
+            row = None
+            
+        for i, (label,datatype) in enumerate(self.col_defs):
+            editor = self.editors[i]
+            if ctrl is not None and editor is not ctrl: continue
+            if row is None and not self.can_add:
+                editor.Clear()
+                editor.Disable()
+            elif row is None:
+                editor.Clear()
+                editor.Enable()
+            else:
+                editor.SetValue(str(row[i]))
+                editor.Enable()
+
+    # add/insert/remove rows; update action buttons; set focus to grid if buttons are pressed ##########################
+    def _set_grid_focus(self, row=None):
+        if row is None: row = self.cur_row
+        self.grid.ClearSelection()
+        if hasattr(self.grid, "GoToCell"):
+            self.grid.GoToCell( row, self.cur_col )
+        else:
+            self.grid.SetGridCursor(row,self.cur_col)  # calls MakeCellVisible
+        self.grid.SetFocus()
+
+    def on_button_add(self, event):
+        if self._last_focus=="grid":
+            self.add_row(set_index=True)
+        elif self._last_focus=="editor":
+            self.add_row(set_index=True)
+            self.restore_editor_focus()
+        else:
+            self.add_row(set_index=True)
+
+    def add_row(self, row=None, set_index=False, delay=True):
         self.on_focus()
         values = self._ensure_editing_copy()
-        self.grid.AppendRows()
-        self.grid.MakeCellVisible(len(values), 0)
-        self.grid.ForceRefresh()
-        values.append( self.default_row[:] )
+        if row is None:
+            row = len(values)
+            if self.can_add and self.immediate: row += 1
+        values.append( self._get_default_row( len(values) ) )
+
         if self.with_index:
             self.indices.append("")
         self._update_remove_button()
         self._update_apply_button()
         self._update_indices()
-        if compat.version >= (3,0):
-            self.grid.GoToCell( len(values)-1, self.cur_col )
-            self.grid.SetFocus()
+        if delay:
+            #  - don't modify the grid within a EVT_GRID_CELL_CHANGED handler
+            # - use CallLater to avoid GoToCell causing on_cell_changed being called due to self.grid.GoToCell
+            wx.CallLater(100, self._add_grid_row, row, set_index)
+        else:
+            self._add_grid_row(row, set_index)
+
+    def _add_grid_row(self, row, set_index=False):
+        # called via CallAfter from add_row; either when "Add" is required or when the user has edited the last row
+        if not self.grid: return
+        self.grid.AppendRows()
+        # fill the grid with default values; these are not in self.value unless the user edits them
+        last_row = self.grid.NumberRows-1
+        for col, value in enumerate( self._get_default_row(row) ):
+            self.grid.SetCellValue(last_row, col, compat.unicode(value))
+        if set_index:
+            self._set_index(row)
+
+    def on_button_remove(self, event):
+        if self._last_focus=="grid":
+            self.remove_row(set_focus=True, highlight=False)
+        elif self._last_focus=="editor":
+            self.remove_row(set_focus=False, highlight=True)
+            self.restore_editor_focus()
+        else:
+            self.remove_row(set_focus=False, highlight=False)
 
-    def remove_row(self, event):
+    def remove_row(self, set_focus=True, highlight=False):
         self.on_focus()
+        values = self._ensure_editing_copy()
+        row = self.cur_row
         if self.immediate and self.can_add and self.cur_row==self.grid.GetNumberRows()-1:
-            return
+            # cursor is in last row, which is empty and not related to values
+            # check whether the row before is empty, if yes, we still can remove; if not, return
+            if self.cur_row==0 or values[self.cur_row-1]!=self.default_row:
+                if set_focus: self._set_grid_focus()
+                return
+            row -= 1
         if not self.can_remove_last and self.grid.GetNumberRows()==1:
             self._logger.warning( _('You can not remove the last entry!') )
             return
-        values = self._ensure_editing_copy()
         if values:
-            cur_row = self.cur_row
-            self.grid.DeleteRows(self.cur_row)  # self.cur_row will change due to selection change
-            del values[cur_row]
+            self.grid.DeleteRows(self.cur_row)
+            del values[row]
             if self.with_index:
-                del self.indices[cur_row]
+                del self.indices[self.cur_row]
             if self.cur_row>=len(values) and self.cur_row>0:
                 self.cur_row -= 1
 
         self._update_remove_button()
         self._update_apply_button()
         self._update_indices()
-        if compat.version >= (3,0):
-            self.grid.GoToCell( self.cur_row, self.cur_col )
-            self.grid.SetFocus()
+        self._set_index()
+
+    def on_button_insert(self, event):
+        if self._last_focus=="grid":
+            self.insert_row(set_focus=True, highlight=False)
+        elif self._last_focus=="editor":
+            self.insert_row(set_focus=False, highlight=True)
+            self.restore_editor_focus()
+        else:
+            self.insert_row(set_focus=False, highlight=False)
 
-    def insert_row(self, event):
+    def insert_row(self, set_focus=True, highlight=False):
         self.on_focus()
         self.grid.InsertRows(self.cur_row)
         self.grid.MakeCellVisible(self.cur_row, 0)
         self.grid.ForceRefresh()
         values = self._ensure_editing_copy()
-        values.insert(self.cur_row, self.default_row[:])
+        row = self._get_default_row(self.cur_row)
+        values.insert(self.cur_row, row)
+        if self.cur_row==-1: self.cur_row=0
         if self.with_index:
             self.indices.insert(self.cur_row, "")
+        for col, value in enumerate( values[self.cur_row] ):
+            self.grid.SetCellValue(self.cur_row, col, compat.unicode(value))
         self._update_remove_button()
         self._update_apply_button()
         self._update_indices()
-        if compat.version >= (3,0):
-            self.grid.GoToCell( self.cur_row, self.cur_col )
-            self.grid.SetFocus()
+        self._set_index()
 
     def _ensure_editing_copy(self):
         if self.immediate: return self.value
@@ -2822,10 +3223,11 @@
     def _update_remove_button(self):
         """Enable or disable remove button
 
-        The state of the remove button depends on the number of rows and L{self.can_remove_last}."""
-        if not self.grid or not self.buttons: return
-        if self.can_remove and not self.can_remove_last:
-            self.buttons[-1].Enable(self.grid.GetNumberRows() > 1)
+        The state of the remove button depends on the number of rows and self.can_remove_last."""
+        if not self.grid or not self.buttons or not self.can_remove: return
+            #if  and not self.can_remove_last:
+        enable = self.grid.GetNumberRows() > 1
+        self.buttons[-1].Enable(enable)
 
     def _update_apply_button(self):
         if not self.grid or not self.buttons or self.immediate: return
@@ -2834,7 +3236,7 @@
 
     # helpers ##########################################################################################################
     def _set_col_sizes(self, sizes):
-        """sets the width of the columns.
+        """called from create_editor; sets the width of the columns.
         sizes is a list of integers with the size of each column: a value of 0 stands for a default size,
         while -1 means to expand the column to fitthe available space (at most one column can have size -1)"""
         col_to_expand = -1
@@ -2883,7 +3285,8 @@
     LABEL = 'Extra properties for this widget'
     TOOLTIP = ('You can use this property to add some extra custom properties to this widget.\n\n'
                'For each property "prop" with value "val", wxGlade will generate a'
-               '"widget.SetProp(val)" line (or a "<prop>val</prop>" line for XRC).')
+               '"widget.SetProp(val)" line (or a "<prop>val</prop>" line for XRC).\n'
+               'This code is inserted after extracode_post.')
     _PROPORTION = 3
     SKIP_EMPTY = True
 
@@ -2947,6 +3350,45 @@
         return
 
 
+class DisplayProperty(TextProperty):
+    #TOOLTIP = None
+
+    def __init__(self, value):
+        multiline = "\n" in value
+        #self.TOOLTIP = value
+        TextProperty.__init__(self, value, multiline, fixed_height=True)
+
+    def create_editor(self, panel, sizer):
+        self.text = wx.TextCtrl(panel, value=self.value, style=wx.TE_READONLY|wx.TE_MULTILINE|wx.TE_NO_VSCROLL)
+        self.text.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE))
+
+        # layout of the controls / sizers
+        proportion = self._PROPORTION
+        if self.multiline: # for multiline make it higher
+            h = self.text.GetCharHeight()
+            if self.multiline=="grow":
+                sizer.SetItemMinSize(self.text, -1, h * 1.5)
+                proportion = 0
+            else:
+                sizer.SetItemMinSize(self.text, -1, h * 3)
+        sizer.Add(self.text, proportion, wx.ALL |wx.EXPAND, 3)
+
+        compat.SetToolTip(self.text, self.value)
+        #self._set_tooltip(label, self.text, self.enabler, *self.additional_controls)
+
+
+    def write(self, output, tabs=0):
+        return
+
+
+########################################################################################################################
+# functions to modify property lists in place
+
+def insert_after(PROPERTIES, after, *add):
+    i = PROPERTIES.index(after)
+    for j, name in enumerate(add):
+        PROPERTIES.insert(i+1+j, name)
+
 ########################################################################################################################
 
 class PropertyOwner(object):
@@ -2977,7 +3419,7 @@
         if name!="properties" and name in self.properties and config.debugging:
             raise ValueError("implementation error: property about to be overwritten")
         object.__setattr__(self, name, value)
-    def copy_properties(self, other, properties):
+    def copy_properties(self, other, properties, notify=True):
         "copy named properties from other"
         # with short cut for properties with 'values_set'
         for p in properties:
@@ -2993,27 +3435,59 @@
                 old = prop.get()
             if new!=old:
                 prop.set(new)
-        self.properties_changed(properties)
+        if notify:
+            self.properties_changed(properties)
+
     def check_property_modification(self, name, value, new_value):
         # return False in derived class to veto a user modification
         return True
-    def properties_changed(self, modified):
-        """properties edited; trigger actions like widget or sizer update;
-        'modified' is None or a list of property names;
-        the properties_changed method of a derived class may add properties to 'modified' before calling base classes"""
+    
+    def _properties_changed(self, modified, actions):
+        # action method(s)
         pass
+
+    def properties_changed(self, modified):
+        # in derived classes, actions might be triggered depending on 'actions'
+        actions = set()
+        self._properties_changed(modified, actions)
+        return actions
+
     def get_properties(self, without=set()):
         # return list of properties to be written to XML file
         ret = []
         for name in self.property_names:
-            if name in ("class","name","base") or name in without: continue
+            if name in ("class","name","instance_class") or name in without: continue
             prop = self.properties[name]
             if not prop.HAS_DATA: continue
             if prop.attributename in without: continue  # for e.g. option/proportion
             if prop is not None: ret.append(prop)
         return ret
+
+    def restore_properties(self):
+        # restore values that were overwritten by obj.properties["name"].set_temp(value)
+        d = getattr(self, "_restore_data", None)
+        if d is None: return
+        for name, value in d.items():
+            self.properties[name].value = value
+        del self._restore_data
+
     def check_prop(self, name):
         if not name in self.properties: return False
         prop = self.properties[name]
         if prop.blocked: return False
-        return prop.is_active()
\ No newline at end of file
+        return prop.is_active()
+
+    def get_prop_value(self, name, default):
+        # return property value if property exists, else the default
+        if not self.check_prop(name): return default
+        return self.properties[name].get()
+
+    def check_prop_truth(self, name):
+        # return True if property exists, is active and not blocked and the value is tested for truth
+        return self.get_prop_value(name, False) and True or False
+
+    def check_prop_nodefault(self, name):
+        # return True if property exists, is active and not blocked and the value is not the default value
+        if not self.check_prop(name): return False
+        p = self.properties[name]
+        return p.value!=p.default_value
diff -Nru wxglade-0.9.6/NEWS.txt wxglade-1.0.1/NEWS.txt
--- wxglade-0.9.6/NEWS.txt	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/NEWS.txt	2020-12-31 14:04:48.000000000 +0000
@@ -1,3 +1,29 @@
+Version 1.0
+
+General:
+ - sizers only required where wx requires them; not required e.g. for Frame->Panel (used to be Frame->Sizer->Panel)
+ - better handling of display updates when properties are edited
+ - accessibility and usability improvements
+ - Dialog example
+ - documentation update
+
+Internal:
+ - internal structures refactored
+ - add shell window and Tree Printer
+
+Widgets:
+ - all: separate class related properties into Class / Base Classes / Instance Class
+ - Dialog: add StdDialogButtonSizer and standard buttons (stock items); support SetAffirmativeId, SetEscapeId
+ - Button: support for image direction
+ - MenuBar: support lambda event handlers
+ - ToolBar: easy selection of standard icons
+ - GridBagSizer: better icons; indicate overlapped slots in the Tree view
+
+Generated Code:
+ - no separation into __set_properties/__do_layout any more
+ - support for instantiation classes
+
+
 Version 0.9
 General:
  - new user interface; use Alt-1,-2,-3, the menu or the toolbar to switch between layouts
diff -Nru wxglade-0.9.6/plugins.py wxglade-1.0.1/plugins.py
--- wxglade-0.9.6/plugins.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/plugins.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,50 +2,36 @@
 Functions to import modules
 
 @copyright: 2016 Carsten Grohmann
+@copyright: 2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
-import logging
-import os
-import re
-import sys
-import zipfile
+import os, re, sys, zipfile, logging
 from collections import OrderedDict
 
-import common
-import config
+import common, config, misc
 
-rec_section = re.compile(r'\[(?P<section>[^]]+)\]')
-"""Regex tp match section headers"""
+# Regex tp match section headers; optionally with a hotkey character
+rec_section = re.compile(r'\[(?P<section>[^]]+)\](\:(?P<hotkey>[A-Z]))?')
 
+# Regex to match modules
 rec_module = re.compile(r'^(?P<module>\w+)')
-"""Regex to match modules"""
 
 
-def load_widgets_from_dir(widget_dir, submodule='',
-                          default_section='not_set'):
-    """\
-    Load and initialise the all widgets listed in widgets.txt in the given directory.
+def load_widgets_from_dir(widget_dir, submodule='', default_section='not_set'):
+    """Load and initialise the all widgets listed in widgets.txt in the given directory.
 
     If you need to import a submodule instead, just specify the name of the submodule and "<module name>.<submodule>"
     will be imported. This is useful to import language specific code generators.
 
-    @param widget_dir: Directory to search for widgets
-    @type widget_dir:  str
+    widget_dir:      Directory to search for widgets
+    submodule:       Submodule to import
+    default_section: Section name to group all widgets, if no section has been found
 
-    @param submodule: Submodule to import
-    @type submodule:  str
+    returns: In GUI-Mode: OrderedDict with module sections as key and assigned list of wxBitmapButtons
+             In batch mode: empty OrderedDict
 
-    @param default_section: Section name to group all widgets, if no section has been found
-    @type default_section: str
-
-    @return: In GUI-Mode: a dict with module sections as key and assigned list of wxBitmapButtons, the dict is empty
-             in batch mode.
-    @rtype:  OrderedDict
-
-    @see: L{import_module()}
-    @see: L{config.use_gui} - for "GUI" or "batch" mode
-    """
+    see: import_module(); config.use_gui - for "GUI" or "batch" mode"""
     buttons = OrderedDict()
 
     # language code generators e.g. perl_codegen
@@ -69,23 +55,18 @@
     
             # step 1: import widget module
             module = import_module(widget_dir, fqmn)
-            if not module:
-                # error already logged
-                continue
+            if not module: continue  # error already logged
     
             # step 2: use individual initialisation if available
             if hasattr(module, 'initialize'):
                 button = module.initialize()
-                if config.use_gui and button:
-                    buttons[section].append(button)
+                if config.use_gui and button: buttons[section].append(button)
     
             # step 3: import and initialise Python codegen as well as widget GUI elements
             elif not submodule:
                 result, button = _init_codegen_gui(widget_dir, module_name)
-                if not result:
-                    continue
-                if config.use_gui and button:
-                    buttons[section].append(button)
+                if not result: continue
+                if config.use_gui and button: buttons[section].append(button)
     
             # step 4: do special initialisation for wconfig submodules
             elif submodule and submodule == 'wconfig':
@@ -99,8 +80,6 @@
     
             if config.use_gui and not submodule.endswith('codegen'):
                 logging.info('\t%s', module_name)
-            else:
-                logging.debug(_('Widget %s imported'), module_name)
     return buttons
 
 
@@ -126,21 +105,18 @@
     cursect = default_section
 
     for line in module_lines:
-
         # remove empty lines, comment lines and tailing comments
         line = line.rstrip()
-        if not line:
-            continue
-        if line.startswith('#'):
-            continue
+        if not line or line.startswith('#'): continue
 
-        if cursect not in content:
-            content[cursect] = []
+        if cursect not in content: content[cursect] = []
 
         # section heading
         mo = rec_section.match(line)
         if mo:
             cursect = mo.group('section')
+            hotkey = mo.group('hotkey')
+            if hotkey: misc.palette_hotkeys[hotkey] = cursect
             continue
 
         mo = rec_module.match(line)
@@ -156,17 +132,12 @@
 
 
 def _process_widget_config(module):
-    """\
-    Process widget configuration stored in modules 'config' dictionary. The
-    processed configuration will be stored in L{config.widget_config}.
+    """Process widget configuration stored in modules 'config' dictionary.
+    The processed configuration will be stored in config.widget_config.
 
-    @param module: Already imported module
-    @type module: module
-
-    @see: L{config.widget_config}
-
-    @rtype: bool
-    """
+    module: Already imported module
+    
+    returns bool"""
     name = getattr(module, '__name__', str(module))
     if not hasattr(module, 'config'):
         logging.debug(_('Missing configuration in module %s'), name)
@@ -191,37 +162,24 @@
 
 
 def _init_codegen_gui(widget_dir, widget_name):
-    """\
-    Initialise Python code generator for the widget as well as widget GUI parts.
-
-    @param widget_dir: Directory to search for widgets
-    @type widget_dir:  str
-
-    @param widget_name: Widget
-    @type widget_name:  str
-
-    @rtype: (bool, wx.BitmapButton)
-    """
+    """Initialise Python code generator for the widget as well as widget GUI parts.
+    returns (bool, wx.BitmapButton)"""
     widget_button = None
 
     # initialise Python code generator
     codegen_name = '%s.codegen' % widget_name
     codegen_module = import_module(widget_dir, codegen_name)
-    if not codegen_module:
-        # error already logged
-        return False, None
+    if not codegen_module: return False, None  # error already logged
+
     if not hasattr(codegen_module, 'initialize'):
         logging.warning(_('Missing function "initialize()" in imported  module %s. Skip initialisation.'), codegen_name)
         return False, None
     codegen_module.initialize()
 
-    ## initialise GUI part
-    #if config.use_gui:
     gui_name = '%s.%s' % (widget_name, widget_name)
     gui_module = import_module(widget_dir, gui_name)
-    if not gui_module:
-        # error already logged
-        return False, None
+    if not gui_module: return False, None  # error already logged
+
     if not hasattr(gui_module, 'initialize'):
         logging.warning(_('Missing function "initialize()" in imported module %s. Skip initialisation.'), gui_name)
         return False, None
@@ -231,37 +189,26 @@
 
 
 def import_module(widget_dir, module_name):
-    """\
-    Import a single module from a ZIP file or from the directory structure.
+    """Import a single module from a ZIP file or from the directory structure.
 
-    The consistency of ZIP files will be checked by calling L{is_valid_zip()}.
+    The consistency of ZIP files will be checked by calling is_valid_zip().
 
-    If widget ZIP files are found, they will be process first and the default
-    Python imports will be the second.
+    If widget ZIP files are found, they will be process first and the default Python imports will be the second.
 
-    widget_dir will be added to the Python search path temporarily if it's
-    not path of sys.path already.
+    widget_dir will be added to the Python search path temporarily if it's not path of sys.path already.
 
     Example::
         >>> import_module('./mywidgets', 'static_text')
        <module 'static_text' from 'mywidgets/static_text.zip/static_text/__init__.pyc'>
 
-    @param widget_dir: Directory to search for widgets
-    @type widget_dir:  str
-
-    @param module_name: Name of the module to import
-    @type module_name:  str
+    widget_dir:  Directory to search for widgets
+    module_name: Name of the module to import
 
-    @return: Imported module or None in case of errors
-    @rtype:  Module | None
-
-    @see: L{is_valid_zip()}
-    """
+    returns Imported module or None in case of errors"""
     # split module name into module name and sub module name
     basemodule = module_name.split('.', 1)[0]
 
-    if widget_dir not in sys.path:
-        sys.path.append(widget_dir)
+    if widget_dir not in sys.path: sys.path.append(widget_dir)
 
     zip_filename = os.path.join(widget_dir, '%s.zip' % basemodule)
     if os.path.exists(zip_filename):
@@ -300,21 +247,14 @@
 
 
 def is_valid_zip(filename, module_name):
-    """\
-    Check the consistency of the given ZIP files. It's a formal check as well
-    as a check of the content.
-
-    @param filename: Name of the ZIP file to check
-    @type filename:  str
+    """Check the consistency of the given ZIP files. It's a formal check as well as a check of the content.
 
-    @param module_name: Name of the module to import
-    @type module_name:  str
+    filename:    Name of the ZIP file to check
+    module_name: Name of the module to import
 
-    @return: True, if the ZIP is a valid widget zip file
-    @rtype:  bool
+    returns: True, if the ZIP is a valid widget zip file
 
-    @see: L{_get_zipfile_filelist()}
-    """
+    see: _get_zipfile_filelist()"""
     if not os.path.exists(filename):
         logging.debug(_('File %s does not exists.'), filename)
         return False
@@ -352,15 +292,7 @@
 
 
 def _get_zipfile_filelist(filename):
-    """\
-    Return the file list of a zip file. The list will be empty if an error
-    occurred.
-
-    @param filename: ZIP file name
-    @type filename:  str
-
-    @rtype: list
-    """
+    "Return the file list of a zip file. The list will be empty if an error occurred"
     zfile = None
     namelist = []
     try:
@@ -375,7 +307,6 @@
             logging.warning( _('ZIP file %s is bigger than 4GB (%s). Ignoring ZIP file.'), filename, inst )
             return []
     finally:
-        if zfile:
-            zfile.close()
+        if zfile: zfile.close()
 
     return namelist
diff -Nru wxglade-0.9.6/po/de.po wxglade-1.0.1/po/de.po
--- wxglade-0.9.6/po/de.po	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/po/de.po	2020-12-31 14:04:48.000000000 +0000
@@ -1,28 +1,28 @@
-# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
+# Benjamin Weis <benjamin.weis@gmx.com>, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-02-09 23:22+0100\n"
-"PO-Revision-Date: 2008-07-28 20:15+0200\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2019-05-25 15:09+0200\n"
+"Last-Translator: Benjamin Weis <benjamin.weis@gmx.com>\n"
+"Language-Team: German <>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: about.py:49
 msgid "About wxGlade"
-msgstr ""
+msgstr "Über wxGlade"
 
 #: about.py:59
 msgid "wxGlade - License"
-msgstr ""
+msgstr "wxGlade - Lizenz"
 
 #: about.py:64
 msgid ""
@@ -30,48 +30,51 @@
 "You can get a copy at \n"
 "http://www.opensource.org/licenses/mit-license.php"
 msgstr ""
+"Die Lizenz kann nicht gefunden werden!\n"
+"Sie erhalten eine Kopie unter \n"
+"http://www.opensource.org/licenses/mit-license.php"
 
 #: about.py:67 edit_windows.py:149 main.py:620 main.py:637 main.py:692
 #: main.py:705 main.py:753 main.py:815 zmain.py:482 zmain.py:499 zmain.py:538
 #: zmain.py:551 zmain.py:587 edit_sizers/edit_sizers.py:651
 msgid "Error"
-msgstr ""
+msgstr "Fehler"
 
 #: about.py:80
 msgid "Can't find the credits file!\n"
-msgstr ""
+msgstr "Datei credits kann nicht gefunden werden!\n"
 
 #: about.py:80
 msgid "Oops!"
-msgstr ""
+msgstr "Hoppla!"
 
 #: clipboard.py:40 clipboard.py:38
 msgid "Invalid data in the clipboard"
-msgstr ""
+msgstr "Ungültige Daten in der Zwischenablage"
 
 #: clipboard.py:65 clipboard.py:63
 msgid "Data can't be copied to clipboard."
-msgstr ""
+msgstr "Daten können nicht in die Zwischenablage kopiert werden."
 
 #: clipboard.py:71 clipboard.py:105 clipboard.py:69 clipboard.py:103
 msgid "Clipboard can't be opened."
-msgstr ""
+msgstr "Zwischenablage kann nicht geöffnet werden."
 
 #: clipboard.py:98 clipboard.py:96
 msgid "Data can't be copied from clipboard."
-msgstr ""
+msgstr "Daten können nicht aus der Zwischenablage kopiert werden."
 
 #: clipboard.py:129 clipboard.py:127
 msgid "Please only drop one file at a time"
-msgstr ""
+msgstr "Bitte nur eine Datei auf einmal ablegen"
 
 #: color_dialog.py:18 color_dialog.py:19
 msgid "System colour"
-msgstr ""
+msgstr "Systemfarbe"
 
 #: color_dialog.py:22 color_dialog.py:23
 msgid "Custom colour"
-msgstr ""
+msgstr "Benutzerdefinierte Farbe"
 
 #: color_dialog.py:25 configUI.py:38 color_dialog.py:26
 #: edit_sizers/edit_sizers.py:395 edit_sizers/edit_sizers.py:1808
@@ -79,27 +82,27 @@
 #: widgets/gauge/gauge.py:104 widgets/menubar/menubar.py:71
 #: widgets/menubar/menubar.py:777 widgets/notebook/notebook.py:339
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: color_dialog.py:26 configUI.py:39 color_dialog.py:27
 #: edit_sizers/edit_sizers.py:396 edit_sizers/edit_sizers.py:1809
 #: widgets/menubar/menubar.py:73 widgets/menubar/menubar.py:778
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #: color_dialog.py:70 color_dialog.py:71
 msgid "Select widget colour"
-msgstr ""
+msgstr "Steuerelement-Farbe auswählen"
 
 #: common.py:92
 #, python-format
 msgid "\"%s\" is not a valid code generator module"
-msgstr ""
+msgstr "\"%s\" ist kein gültiges Codegenerator-Modul"
 
 #: common.py:96
 #, python-format
 msgid "loaded code generator for %s"
-msgstr ""
+msgstr "Codegenerator für %s geladen"
 
 #: common.py:127
 #, python-format
@@ -108,17 +111,17 @@
 
 #: common.py:128
 msgid "loading widget modules:"
-msgstr ""
+msgstr "Steuerelement-Module werden geladen:"
 
 #: common.py:137
 #, python-format
 msgid "ERROR loading \"%s\""
-msgstr ""
+msgstr "FEHLER beim Laden von \"%s\""
 
 #: common.py:203
 #, python-format
 msgid "Add a %s"
-msgstr ""
+msgstr "%s hinzufügen"
 
 #: config.py:60
 #, python-format
@@ -126,126 +129,134 @@
 "Error reading config file:\n"
 "%s"
 msgstr ""
+"Fehler beim Lesen der Konfigurationsdatei:\n"
+"%s"
 
 #: config.py:103
 msgid "Choose a directory:"
-msgstr ""
+msgstr "Wählen Sie ein Verzeichnis aus:"
 
 #: config.py:246
 msgid "Changes will take effect after wxGlade is restarted"
-msgstr ""
+msgstr "Änderungen werden nach dem Neustart von wxGlade wirksam"
 
 #: config.py:247
 msgid "Preferences saved"
-msgstr ""
+msgstr "Einstellungen gespeichert"
 
 #: configUI.py:15
 msgid "Local widget path"
-msgstr ""
+msgstr "Lokaler Steuerelement-Pfad"
 
 #: configUI.py:17
 msgid "Use icons in menu items"
-msgstr ""
+msgstr "Symbole in Menüeinträgen verwenden"
 
 #: configUI.py:18
 msgid "Show properties and tree windows as small frames (Win32 only)"
-msgstr ""
+msgstr "Eigenschaften und Baumfenster als kleine Rahmen anzeigen (nur Win32)"
 
 #: configUI.py:19
 msgid "Show progress dialog when loading wxg files"
-msgstr ""
+msgstr "Fortschrittsdialog beim Laden von wxg-Dateien anzeigen"
 
 #: configUI.py:20
 msgid "Remember position and size of wxGlade windows"
-msgstr ""
+msgstr "Position und Größe der wxGlade-Fenster merken"
 
 #: configUI.py:21
 msgid "Show \"handles\" of sizers"
-msgstr ""
+msgstr "\"Handles\" von Sizern anzeigen"
 
 #: configUI.py:22
 msgid "Use native file dialogs on KDE"
-msgstr ""
+msgstr "Native Dateidialoge unter KDE verwenden"
 
 #: configUI.py:27
 msgid "Use dialog units by default for size properties"
-msgstr ""
+msgstr "Dialogeinheiten standardmäßig für Größeneigenschaften verwenden"
 
 #: configUI.py:28
 msgid "Create backup wxg files"
-msgstr ""
+msgstr "wxg-Sicherungsdateien erstellen"
 
 #: configUI.py:29
 msgid "Create backup files for generated source"
-msgstr ""
+msgstr "Sicherungsdateien für generierte Quelle erstellen"
 
 #: configUI.py:30
 msgid "Allow duplicate widget names"
-msgstr ""
+msgstr "Doppelte Steuerelement-Namen erlauben"
 
 #: configUI.py:31
 msgid "Default border width for widgets"
-msgstr ""
+msgstr "Standard-Rahmenbreite für Steuerelemente"
 
 #: configUI.py:33
 msgid "Auto save wxg files every "
-msgstr ""
+msgstr "wxg-Dateien automatisch speichern alle "
 
 #: configUI.py:35
 msgid "Backup options"
-msgstr ""
+msgstr "Sicherungsoptionen"
 
 #: configUI.py:35
 msgid "append ~ to filename"
-msgstr ""
+msgstr "~ an den Dateinamen anfügen"
 
 #: configUI.py:35
 msgid "append .bak to filename"
-msgstr ""
+msgstr ".bak an den Dateinamen anfügen"
 
 #: configUI.py:47
 msgid "wxGlade: preferences"
-msgstr ""
+msgstr "wxGlade: Einstellungen"
 
 #: configUI.py:83
 msgid ""
 "Initial path for \n"
 "file opening/saving dialogs:"
 msgstr ""
+"Initialer Pfad für \n"
+"Öffnen/Speichern-Dateidialoge:"
 
 #: configUI.py:86
 msgid ""
 "Initial path for \n"
 "code generation file dialogs:"
 msgstr ""
+"Initialer Pfad für \n"
+"Codegenerierungs-Dateidialoge:"
 
 #: configUI.py:90
 msgid "Number of items in file history"
-msgstr ""
+msgstr "Anzahl der Elemente im Dateiverlauf"
 
 #: configUI.py:93
 msgid ""
 "Number of buttons per row\n"
 "in the main palette"
 msgstr ""
+"Anzahl der Schaltflächen pro Zeile\n"
+"in der Hauptpalette"
 
 #: configUI.py:122
 msgid "Interface"
-msgstr ""
+msgstr "Oberfläche"
 
 #: configUI.py:123
 msgid "Other"
-msgstr ""
+msgstr "Andere"
 
 #: wxglade.py:76 wxglade.py:78
 #, python-format
 msgid "Error: no writer for language \"%s\" available"
-msgstr ""
+msgstr "Fehler: kein Schreiber für die Sprache \"%s\" verfügbar"
 
 #: wxglade.py:80 wxglade.py:82
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "Fehler: %s"
 
 #: wxglade.py:90 wxglade.py:92
 msgid ""
@@ -259,14 +270,25 @@
 "                                multi-file mode)\n"
 "    "
 msgstr ""
+"wxGlade-Aufruf:\n"
+"- um die GUI zu starten: python wxglade.py [WXG_DATEI]\n"
+"- um Code von der Kommandozeile aus zu generieren.: python wxglade.py "
+"OPTIONEN... DATEI\n"
+"  OPTIONEN sind die folgenden:\n"
+"  -g, --generate-code=SPRACHE  (erforderlich) geben Sie die Ausgabesprache "
+"an\n"
+"  -o, --output=PFAD             (optional) Name der Ausgabedatei (in\n"
+"                                Einzeldatei-Modus) oder Verzeichnis (im\n"
+"                                Mehrfachdatei-Modus)\n"
+"    "
 
 #: wxglade.py:101 wxglade.py:103
 msgid "Valid LANGUAGE values:"
-msgstr ""
+msgstr "Gültige LANGUAGE-Werte:"
 
 #: edit_widget.py:103
 msgid "'name' attribute missing"
-msgstr ""
+msgstr "Attribut 'name' fehlt"
 
 #: edit_windows.py:57
 msgid ""
@@ -274,6 +296,10 @@
 "subclass of the widget. How this name affects code generation depends on the "
 "kind (i.e. language) of output. See the docs for more details."
 msgstr ""
+"Wenn Sie den Standardwert ändern, wird er als Name der Unterklasse des "
+"Steuerelements interpretiert. Wie sich dieser Name auf die Codegenerierung "
+"auswirkt, hängt von der Art (d.h. der Sprache) der Ausgabe ab. Siehe die "
+"Dokumentation für weitere Details."
 
 #: edit_windows.py:148 edit_sizers/edit_sizers.py:650
 #, python-format
@@ -281,87 +307,95 @@
 "Name \"%s\" is already in use.\n"
 "Please enter a different one."
 msgstr ""
+"Name \"%s\" wird bereits verwendet.\n"
+"Bitte geben Sie einen anderen ein."
 
 #: edit_windows.py:161 edit_windows.py:261 edit_sizers/edit_sizers.py:664
 #: edit_sizers/edit_sizers.py:706
 #, python-format
 msgid "Properties - <%s>"
-msgstr ""
+msgstr "Eigenschaften - <%s>"
 
 #: edit_windows.py:179 edit_windows.py:1024 edit_sizers/edit_sizers.py:87
 #: edit_sizers/edit_sizers.py:215 widgets/menubar/menubar.py:666
 msgid "Remove\tDel"
-msgstr ""
+msgstr "Entfernen\tEntf"
 
 #: edit_windows.py:181 edit_sizers/edit_sizers.py:498
 msgid "Copy\tCtrl+C"
-msgstr ""
+msgstr "Kopieren\tStrg+C"
 
 #: edit_windows.py:183 edit_sizers/edit_sizers.py:499
 msgid "Cut\tCtrl+X"
-msgstr ""
+msgstr "Ausschneiden\tStrg+X"
 
 #: edit_windows.py:480 edit_sizers/edit_sizers.py:634
 #: widgets/menubar/menubar.py:587
 msgid "Common"
-msgstr ""
+msgstr "Allgemein"
 
 #: edit_windows.py:946
 msgid "Preview"
-msgstr ""
+msgstr "Vorschau"
 
 #: edit_windows.py:960
 msgid "Close Preview"
-msgstr ""
+msgstr "Vorschau schließen"
 
 #: edit_windows.py:1026 widgets/menubar/menubar.py:668
 msgid "Hide"
-msgstr ""
+msgstr "Ausblenden"
 
 #: edit_windows.py:1033 edit_sizers/edit_sizers.py:89
 msgid "Paste\tCtrl+V"
-msgstr ""
+msgstr "Einfügen\tStrg+V"
 
 #: edit_windows.py:1041
 msgid ""
 "\n"
 "wxGlade-WARNING: sizer already set for this window"
 msgstr ""
+"\n"
+"wxGlade-WARNUNG: Für dieses Fenster ist der Sizer bereits festgelegt"
 
 #: edit_windows.py:1050
 msgid ""
 "\n"
 "wxGlade-WARNING: only sizers can be pasted here"
 msgstr ""
+"\n"
+"wxGlade-WARNUNG: hier können nur Sizer eingefügt werden"
 
 #: events_mixin.py:22
 msgid "Event"
-msgstr ""
+msgstr "Ereignis"
 
 #: events_mixin.py:23
 msgid "Handler"
-msgstr ""
+msgstr "Handler"
 
 #: font_dialog.py:30
 msgid "Family:"
-msgstr ""
+msgstr "Familie:"
 
 #: font_dialog.py:31
 msgid "Style:"
-msgstr ""
+msgstr "Stil:"
 
+# Beschreibt die Strichstärke.
 #: font_dialog.py:32
 msgid "Weight:"
-msgstr ""
+msgstr "Stärke:"
 
 #: font_dialog.py:97
 msgid "Select font attributes"
-msgstr ""
+msgstr "Schriftartattribute auswählen"
 
 #: kdefiledialog.py:69
 #, python-format
 msgid "File '%s' already exists: do you really want to overwrite it?"
 msgstr ""
+"Datei '%s' ist bereits vorhanden: Möchten Sie sie wirklich überschreiben?"
 
 #: kdefiledialog.py:77 kdefiledialog.py:118
 msgid "Fork Error"
@@ -369,11 +403,11 @@
 
 #: layout_option_property.py:40 layout_option_property.py:42
 msgid "Option"
-msgstr ""
+msgstr "Option"
 
 #: layout_option_property.py:62 layout_option_property.py:64
 msgid "Position"
-msgstr ""
+msgstr "Position"
 
 #: layout_option_property.py:72 layout_option_property.py:74
 msgid "Span"
@@ -381,131 +415,135 @@
 
 #: main.py:165 zmain.py:148
 msgid "Show &Tree\tCtrl+T"
-msgstr ""
+msgstr "&Baum anzeigen\tStrg+T"
 
 #: main.py:168 zmain.py:151
 msgid "Show &Properties\tCtrl+P"
-msgstr ""
+msgstr "&Eigenschaften anzeigen\tStrg+P"
 
 #: main.py:172 zmain.py:155
 msgid "&New\tCtrl+N"
-msgstr ""
+msgstr "&Neu\tStrg+N"
 
 #: main.py:174 zmain.py:157
 msgid "&Open...\tCtrl+O"
-msgstr ""
+msgstr "&Öffnen...\tStrg+O"
 
 #: main.py:176 zmain.py:159
 msgid "&Save\tCtrl+S"
-msgstr ""
+msgstr "&Speichern\tStrg+S"
 
 #: main.py:178 zmain.py:161
 msgid "Save As...\tShift+Ctrl+S"
-msgstr ""
+msgstr "Speichern unter...\tUmschalt+Strg+S"
 
 #: main.py:182
 msgid "&Refresh\tf5"
-msgstr ""
+msgstr "Aktualisie&ren\tf5"
 
 #: main.py:184 zmain.py:165
 msgid "&Generate Code\tCtrl+G"
-msgstr ""
+msgstr "Code &generieren\tStrg+G"
 
 #: main.py:189
 msgid "&Import from XRC...\tCtrl+I"
-msgstr ""
+msgstr "Aus XRC &importieren...\tStrg+I"
 
 #: main.py:193 zmain.py:169
 msgid "E&xit\tCtrl+Q"
-msgstr ""
+msgstr "&Beenden\tStrg+Q"
 
 #: main.py:196 zmain.py:172
 msgid "Preferences..."
-msgstr ""
+msgstr "Einstellungen..."
 
 #: main.py:197 zmain.py:173
 msgid "&File"
-msgstr ""
+msgstr "&Datei"
 
 #: main.py:198 zmain.py:174
 msgid "&View"
-msgstr ""
+msgstr "&Ansicht"
 
 #: main.py:200 zmain.py:176
 msgid "Contents\tF1"
-msgstr ""
+msgstr "Inhaltsverzeichnis\tF1"
 
 #: main.py:202 zmain.py:178
 msgid "About..."
-msgstr ""
+msgstr "Über..."
 
 #: main.py:203 main.py:210 zmain.py:179
 msgid "&Help"
-msgstr ""
+msgstr "&Hilfe"
 
 #: main.py:228 main.py:573
 msgid ""
 "There seems to be auto saved data for this file: do you want to restore it?"
 msgstr ""
+"Es scheint automatisch gespeicherte Daten für diese Datei zu geben: Möchten "
+"Sie sie wiederherstellen?"
 
 #: main.py:230 main.py:478 main.py:575
 msgid "Auto save detected"
-msgstr ""
+msgstr "Automatische Speicherung erkannt"
 
 #: main.py:274 zmain.py:219
 msgid "Core components"
-msgstr ""
+msgstr "Kernkomponenten"
 
 #: main.py:274 zmain.py:219
 msgid "Custom components"
-msgstr ""
+msgstr "Benutzerdefinierte Komponenten"
 
 #: main.py:347 zmain.py:292
 msgid "Properties - <app>"
-msgstr ""
+msgstr "Eigenschaften - <App>"
 
 #: main.py:380 zmain.py:324
 msgid "wxGlade: Tree"
-msgstr ""
+msgstr "wxGlade: Baum"
 
 #: main.py:475
 msgid ""
 "There seems to be auto saved data from last wxGlade session: do you want to "
 "restore it?"
 msgstr ""
+"Es scheint automatisch gespeicherte Daten der letzten wxGlade-Sitzung zu "
+"geben: Möchten Sie sie wiederherstellen?"
 
 #: main.py:484
 msgid "Recovery from auto save complete"
-msgstr ""
+msgstr "Wiederherstellung aus der automatischen Speicherung abgeschlossen"
 
 #: main.py:491
 msgid "Auto saving... done"
-msgstr ""
+msgstr "Automatisches Speichern... fertig"
 
 #: main.py:525 zmain.py:421
 msgid "Save changes to the current app?"
-msgstr ""
+msgstr "Änderungen an der aktuellen App speichern?"
 
 #: main.py:525 zmain.py:421
 msgid "Confirm"
-msgstr ""
+msgstr "Bestätigen"
 
 #: main.py:549
 msgid "Impossible to reload an unsaved application"
-msgstr ""
+msgstr "Es ist unmöglich, eine nicht gespeicherte Anwendung neu zu laden"
 
 #: main.py:550
 msgid "Alert"
-msgstr ""
+msgstr "Alarm"
 
 #: main.py:565 zmain.py:445
 msgid "Open file"
-msgstr ""
+msgstr "Datei öffnen"
 
 #: main.py:619 zmain.py:481
 #, python-format
 msgid "Error loading file %s: %s"
-msgstr ""
+msgstr "Fehler beim Laden der Datei %s: %s"
 
 #: main.py:632 zmain.py:494
 #, python-format
@@ -519,17 +557,17 @@
 
 #: main.py:653
 msgid "Loaded template"
-msgstr ""
+msgstr "Vorlage geladen"
 
 #: main.py:657
 #, python-format
 msgid "Loading time: %.5f"
-msgstr ""
+msgstr "Ladezeit: %.5f"
 
 #: main.py:669
 #, python-format
 msgid "Loaded %s (%.2f seconds)"
-msgstr ""
+msgstr "%s geladen (%.2f Sekunden)"
 
 #: main.py:692 zmain.py:538
 #, python-format
@@ -537,6 +575,8 @@
 "Error saving app:\n"
 "%s"
 msgstr ""
+"Fehler beim Speichern der App:\n"
+"%s"
 
 #: main.py:698 zmain.py:544
 #, python-format
@@ -551,11 +591,11 @@
 #: main.py:714
 #, python-format
 msgid "Saved %s"
-msgstr ""
+msgstr "%s gespeichert"
 
 #: main.py:720 zmain.py:560
 msgid "Save project as..."
-msgstr ""
+msgstr "Projekt speichern unter..."
 
 #: main.py:752 zmain.py:587
 #, python-format
@@ -563,10 +603,12 @@
 "Error saving preferences:\n"
 "%s"
 msgstr ""
+"Fehler beim Speichern der Einstellungen:\n"
+"%s"
 
 #: main.py:797
 msgid "Import file"
-msgstr ""
+msgstr "Datei importieren"
 
 #: main.py:810
 #, python-format
@@ -580,85 +622,85 @@
 
 #: misc.py:404
 msgid "<Design> - "
-msgstr ""
+msgstr "<Design> - "
 
 #: tree.py:32
 msgid "Properties - <>"
-msgstr ""
+msgstr "Eigenschaften - <>"
 
 #: tree.py:267
 msgid "Application"
-msgstr ""
+msgstr "Applikation"
 
 #: tree.py:280
 msgid "Show"
-msgstr ""
+msgstr "Anzeigen"
 
 #: tree.py:448
 #, python-format
 msgid "wxGlade: Tree %s"
-msgstr ""
+msgstr "wxGlade: Baum %s"
 
 #: widget_properties.py:641
 msgid "All Files|*"
-msgstr ""
+msgstr "Alle Dateien|*"
 
 #: widget_properties.py:642
 msgid "Choose a file"
-msgstr ""
+msgstr "Wählen Sie eine Datei aus"
 
 #: widget_properties.py:765
 #, python-format
 msgid "error in the value of the property \"%s\""
-msgstr ""
+msgstr "Fehler im Wert der Eigenschaft \"%s\""
 
 #: widget_properties.py:918
 msgid "  Apply  "
-msgstr ""
+msgstr "  Anwenden  "
 
 #: widget_properties.py:921
 msgid "  Add  "
-msgstr ""
+msgstr "  Hinzufügen  "
 
 #: widget_properties.py:924
 msgid "  Insert  "
-msgstr ""
+msgstr "  Einfügen  "
 
 #: widget_properties.py:927
 msgid "  Remove  "
-msgstr ""
+msgstr "  Entfernen  "
 
 #: xml_parse.py:253
 msgid "Loading..."
-msgstr ""
+msgstr "Wird geladen..."
 
 #: xml_parse.py:253
 msgid "Please wait while loading the app"
-msgstr ""
+msgstr "Bitte warten Sie, während die App geladen wird"
 
 #: zmain.py:445 zmain.py:561
 msgid "wxGlade files (*.wxg)|*.wxg|XML files (*.xml)|*.xml|All files|*"
-msgstr ""
+msgstr "wxGlade-Dateien (*.wxg)|*.wxg|XML-Dateien (*.xml)|*.xml|Alle Dateien|*"
 
 #: edit_sizers/edit_sizers.py:83
 msgid "Options"
-msgstr ""
+msgstr "Optionen"
 
 #: edit_sizers/edit_sizers.py:286 edit_sizers/edit_sizers.py:287
 msgid "Select sizer type"
-msgstr ""
+msgstr "Sizer-Typ auswählen"
 
 #: edit_sizers/edit_sizers.py:389
 msgid "Select a position"
-msgstr ""
+msgstr "Wählen Sie eine Position aus"
 
 #: edit_sizers/edit_sizers.py:495 edit_sizers/edit_sizers.py:1492
 msgid "Add slot"
-msgstr ""
+msgstr "Slot hinzufügen"
 
 #: edit_sizers/edit_sizers.py:496 edit_sizers/edit_sizers.py:1493
 msgid "Insert slot..."
-msgstr ""
+msgstr "Slot einfügen..."
 
 #: edit_sizers/edit_sizers.py:626
 msgid "Fit parent"
@@ -666,132 +708,142 @@
 
 #: edit_sizers/edit_sizers.py:1494
 msgid "Add row"
-msgstr ""
+msgstr "Zeile hinzufügen"
 
 #: edit_sizers/edit_sizers.py:1495
 msgid "Add column"
-msgstr ""
+msgstr "Spalte hinzufügen"
 
 #: edit_sizers/edit_sizers.py:1496
 msgid "Insert row..."
-msgstr ""
+msgstr "Zeile einfügen..."
 
 #: edit_sizers/edit_sizers.py:1497
 msgid "Insert column..."
-msgstr ""
+msgstr "Spalte einfügen..."
 
 #: edit_sizers/edit_sizers.py:1885
 msgid "Growable Rows"
-msgstr ""
+msgstr "Zunehmende Zeilen"
 
 #: edit_sizers/edit_sizers.py:1885
 msgid "Select growable rows"
-msgstr ""
+msgstr "Zunehmende Zeilen auswählen"
 
 #: edit_sizers/edit_sizers.py:1891
 msgid "Growable Columns"
-msgstr ""
+msgstr "Zunehmende Spalten"
 
 #: edit_sizers/edit_sizers.py:1892
 msgid "Select growable columns"
-msgstr ""
+msgstr "Zunehmende Spalten auswählen"
 
 #: edit_sizers/edit_sizers.py:2002
 msgid "Orientation"
-msgstr ""
+msgstr "Ausrichtung"
 
 #: edit_sizers/edit_sizers.py:2003 edit_sizers/edit_sizers.py:2049
 msgid "Horizontal"
-msgstr ""
+msgstr "Horizontal"
 
 #: edit_sizers/edit_sizers.py:2003
 msgid "Vertical"
-msgstr ""
+msgstr "Vertikal"
 
 #: edit_sizers/edit_sizers.py:2006
 msgid "Slots: "
-msgstr ""
+msgstr "Slots: "
 
 #: edit_sizers/edit_sizers.py:2016
 msgid "Has a Static Box"
-msgstr ""
+msgstr "Hat eine statische Box"
 
 #: edit_sizers/edit_sizers.py:2022
 msgid "Label: "
-msgstr ""
+msgstr "Beschriftung: "
 
 #: edit_sizers/edit_sizers.py:2098
 msgid "Select sizer attributes"
-msgstr ""
+msgstr "Sizer-Attribute auswählen"
 
 #: widgets/bitmap_button/bitmap_button.py:120
 msgid "Select the image for the button"
-msgstr ""
+msgstr "Wählen Sie das Bild für die Schaltfläche aus"
 
 #: widgets/gauge/gauge.py:32
 msgid "Creates a horizontal gauge."
-msgstr ""
+msgstr "Erstellt ein horizontales Maß."
 
 #: widgets/gauge/gauge.py:33
 msgid "Creates a vertical gauge."
-msgstr ""
+msgstr "Erstellt ein vertikales Maß."
 
 #: widgets/gauge/gauge.py:34
 msgid "Under Windows 95, creates a horizontal progress bar."
-msgstr ""
+msgstr "Unter Windows 95 wird ein horizontaler Fortschrittsbalken erstellt."
 
 #: widgets/gauge/gauge.py:35
 msgid ""
 "Creates smooth progress bar with one pixel wide update step (not supported "
 "by all platforms)."
 msgstr ""
+"Erstellt einen sanften Fortschrittsbalken mit einem ein Pixel breiten "
+"Aktualisierungsschritt (nicht von allen Plattformen unterstützt)."
 
 #: widgets/gauge/gauge.py:91 widgets/slider/slider.py:131
 msgid "Select style"
-msgstr ""
+msgstr "Stil auswählen"
 
 #: widgets/grid/grid.py:199
 msgid ""
 "The following properties are meaningful\n"
 "only if 'Create grid' is selected"
 msgstr ""
+"Die folgenden Eigenschaften sind von Bedeutung\n"
+"nur wenn 'Gitter erstellen' ausgewählt ist"
 
 #: widgets/grid/grid.py:220 widgets/notebook/notebook.py:224
 #: widgets/radio_button/radio_button.py:74 widgets/slider/slider.py:84
 #: widgets/static_text/static_text.py:65 widgets/text_ctrl/text_ctrl.py:76
 #: widgets/tree_ctrl/tree_ctrl.py:105
 msgid "Widget"
-msgstr ""
+msgstr "Steuerelement"
 
 #: widgets/list_box/list_box.py:46
 msgid "Single-selection list."
-msgstr ""
+msgstr "Einfachauswahlliste."
 
 #: widgets/list_box/list_box.py:47
 msgid "Multiple-selection list: the user can toggle multiple items on and off."
 msgstr ""
+"Mehrfachauswahlliste: Der Benutzer kann mehrere Elemente ein- und "
+"ausschalten."
 
 #: widgets/list_box/list_box.py:48
 msgid ""
 "Extended-selection list: the user can select multiple items using the SHIFT "
 "key and the mouse or special key combinations."
 msgstr ""
+"Erweiterte Auswahlliste: Der Benutzer kann mehrere Elemente mit der "
+"UMSCHALT-Taste und der Maus oder speziellen Tastenkombinationen auswählen."
 
 #: widgets/list_box/list_box.py:49
 msgid "Create horizontal scrollbar if contents are too wide (Windows only)."
 msgstr ""
+"Horizontale Bildlaufleiste erstellen, wenn der Inhalt zu breit ist (nur "
+"Windows)."
 
 #: widgets/list_box/list_box.py:50
 msgid "Always show a vertical scrollbar."
-msgstr ""
+msgstr "Vertikale Bildlaufleiste immer anzeigen."
 
 #: widgets/list_box/list_box.py:51
 msgid "Only create a vertical scrollbar if needed."
-msgstr ""
+msgstr "Vertikale Bildlaufleiste nur bei Bedarf erstellen."
 
 #: widgets/list_box/list_box.py:52
 msgid "The listbox contents are sorted in alphabetical order."
-msgstr ""
+msgstr "Der Inhalt der Listbox ist in alphabetischer Reihenfolge sortiert."
 
 #: widgets/list_ctrl/list_ctrl.py:71
 msgid ""
@@ -799,95 +851,115 @@
 "automatically, i.e. you don't set columns as in wxLC_REPORT. In other words, "
 "the list wraps, unlike a wxListBox."
 msgstr ""
+"Mehrspaltige Listenansicht mit optionalen kleinen Symbolen. Die Spalten "
+"werden automatisch berechnet, d.h. Sie legen keine Spalten wie in "
+"wxLC_REPORT fest. Mit anderen Worten, die Liste wird im Gegensatz zu einer "
+"wxListBox umgebrochen."
 
 #: widgets/list_ctrl/list_ctrl.py:72
 msgid "Single or multicolumn report view, with optional header."
-msgstr ""
+msgstr "Ein- oder mehrspaltige Berichtsansicht mit optionaler Kopfzeile."
 
 #: widgets/list_ctrl/list_ctrl.py:73
 msgid "Large icon view, with optional labels."
-msgstr ""
+msgstr "Große Symbolansicht mit optionalen Beschriftungen."
 
 #: widgets/list_ctrl/list_ctrl.py:74
 msgid ""
 "The application provides items text on demand. May only be used with "
 "wxLC_REPORT."
 msgstr ""
+"Die Anwendung stellt auf Anfrage Text für Elemente zur Verfügung. Darf nur "
+"mit wxLC_REPORT verwendet werden."
 
 #: widgets/list_ctrl/list_ctrl.py:75
 msgid "Small icon view, with optional labels."
-msgstr ""
+msgstr "Kleine Symbolansicht mit optionalen Beschriftungen."
 
 #: widgets/list_ctrl/list_ctrl.py:76
 msgid "Icons align to the top. Win32 default, Win32 only."
-msgstr ""
+msgstr "Symbole richten sich nach oben aus. Win32-Standard, nur Win32."
 
 #: widgets/list_ctrl/list_ctrl.py:77
 msgid "Icons align to the left."
-msgstr ""
+msgstr "Symbole richten sich nach links aus."
 
 #: widgets/list_ctrl/list_ctrl.py:78
 msgid "Icons arrange themselves. Win32 only."
-msgstr ""
+msgstr "Symbole richten sich selbst aus. Nur Win32."
 
 #: widgets/list_ctrl/list_ctrl.py:79
 msgid ""
 "Labels are editable: the application will be notified when editing starts."
 msgstr ""
+"Beschriftungen sind editierbar: Die Anwendung wird benachrichtigt, sobald "
+"die Bearbeitung beginnt."
 
 #: widgets/list_ctrl/list_ctrl.py:80
 msgid "No header in report mode."
-msgstr ""
+msgstr "Keine Kopfzeile im Berichtsmodus."
 
 #: widgets/list_ctrl/list_ctrl.py:81
 msgid "Single selection (default is multiple)."
-msgstr ""
+msgstr "Einfachauswahl (Standard ist mehrfach)."
 
 #: widgets/list_ctrl/list_ctrl.py:82
 msgid ""
 "Sort in ascending order (must still supply a comparison callback in "
 "SortItems."
 msgstr ""
+"In aufsteigender Reihenfolge sortieren (muss noch einen Rückruf zum "
+"Vergleich in SortItems liefern."
 
 #: widgets/list_ctrl/list_ctrl.py:83
 msgid ""
 "Sort in descending order (must still supply a comparison callback in "
 "SortItems."
 msgstr ""
+"In absteigender Reihenfolge sortieren (muss noch einen Rückruf zum Vergleich "
+"in SortItems liefern."
 
 #: widgets/list_ctrl/list_ctrl.py:84
 msgid "Draws light horizontal rules between rows in report mode."
 msgstr ""
+"Zeichnet leichte horizontale Linien zwischen den Zeilen im Berichtsmodus."
 
 #: widgets/list_ctrl/list_ctrl.py:85
 msgid "Draws light vertical rules between columns in report mode"
 msgstr ""
+"Zeichnet leichte vertikale Linien zwischen den Spalten im Berichtsmodus"
 
 #: widgets/list_ctrl/list_ctrl.py:86
 msgid ""
 "Displays a thin border around the window. wxBORDER is the old name for this "
 "style."
 msgstr ""
+"Zeigt einen dünnen Rand um das Fenster herum an. wxBORDER ist der alte Name "
+"für diesen Stil."
 
 #: widgets/list_ctrl/list_ctrl.py:87
 msgid "Displays a double border. Windows and Mac only."
-msgstr ""
+msgstr "Zeigt einen doppelten Rand an. Nur für Windows und Mac."
 
 #: widgets/list_ctrl/list_ctrl.py:88
 msgid "Displays a sunken border."
-msgstr ""
+msgstr "Zeigt einen versenkten Rand an."
 
 #: widgets/list_ctrl/list_ctrl.py:89
 msgid "Displays a raised border."
-msgstr ""
+msgstr "Zeigt einen erhöhten Rand an."
 
 #: widgets/list_ctrl/list_ctrl.py:90
 msgid "Displays a border suitable for a static control. Windows only."
 msgstr ""
+"Zeigt einen Rahmen an, der für eine statische Steuerung geeignet ist. Nur "
+"für Windows."
 
 #: widgets/list_ctrl/list_ctrl.py:91
 msgid "Displays no border, overriding the default border style for the window."
 msgstr ""
+"Zeigt keinen Rand an und überschreibt den voreingestellten Rahmenstil für "
+"das Fenster."
 
 #: widgets/list_ctrl/list_ctrl.py:92
 msgid ""
@@ -898,6 +970,14 @@
 "to have normal keyboard navigation take place, you should create and send a "
 "wxNavigationKeyEvent in response to the key events for Tab and Shift-Tab."
 msgstr ""
+"Hiermit legen Sie fest, dass das Fenster alle char/key-Ereignisse für alle "
+"Tasten erhalten möchte - auch für Tasten wie TAB oder EINGABE, die "
+"normalerweise für die Dialognavigation verwendet werden und ohne diesen Stil "
+"nicht generiert werden würden. Wenn Sie diesen Stil verwenden müssen, um die "
+"Pfeile oder ähnliches zu erhalten, aber trotzdem eine normale "
+"Tastaturnavigation durchführen möchten, sollten Sie ein wxNavigationKeyEvent "
+"als Reaktion auf die Tastenereignisse für Tab und Umschalt-Tab erstellen und "
+"senden."
 
 #: widgets/list_ctrl/list_ctrl.py:93
 msgid ""
@@ -905,6 +985,9 @@
 "its size is changed. Since this behaviour is now the default, the style is "
 "now obsolete and no longer has an effect."
 msgstr ""
+"Unter Windows wurde mit diesem Stil das vollständige Neuzeichnen des "
+"Fensters bei Größenänderung deaktiviert. Da dieses Verhalten nun "
+"voreingestellt ist, ist der Stil veraltet und hat keine Wirkung mehr."
 
 #: widgets/list_ctrl/list_ctrl.py:94
 msgid ""
@@ -915,90 +998,97 @@
 "to work you may want to try this. Currently this style applies on GTK+ 2 and "
 "Windows only, and full repainting is always done on other platforms."
 msgstr ""
+"Verwenden Sie diesen Stil, um eine vollständige Neuzeichnung des Fensters zu "
+"erzwingen, wenn es in der Größe geändert wird, anstatt nur den Teil des "
+"Fensters neu zu zeichnen, der von der Größenänderung betroffen ist. Beachten "
+"Sie, dass dies das Standardverhalten vor der Version 2.5.1 war und dass Sie "
+"bei Problemen mit Code, der früher funktioniert hat, dies vielleicht "
+"ausprobieren sollten. Derzeit gilt dieser Stil nur für GTK+ 2 und Windows, "
+"und das vollständige Neuzeichnen erfolgt immer auf anderen Plattformen."
 
 #: widgets/menubar/menubar.py:18
 msgid "Menu editor"
-msgstr ""
+msgstr "Menüeditor"
 
 #: widgets/menubar/menubar.py:24
 msgid "Menu item:"
-msgstr ""
+msgstr "Menüeintrag:"
 
 #: widgets/menubar/menubar.py:32
 msgid "Label"
-msgstr ""
+msgstr "Beschriftung"
 
 #: widgets/menubar/menubar.py:33
 msgid "Id"
-msgstr ""
+msgstr "Kennung"
 
 #: widgets/menubar/menubar.py:34
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
 #: widgets/menubar/menubar.py:35
 msgid "Help String"
-msgstr ""
+msgstr "Hilfe-Zeichenkette"
 
 #: widgets/menubar/menubar.py:36 widgets/menubar/menubar.py:58
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: widgets/menubar/menubar.py:38
 msgid "Event Handler"
-msgstr ""
+msgstr "Ereignis-Handler"
 
 #: widgets/menubar/menubar.py:61
 msgid "Add"
-msgstr ""
+msgstr "Hinzufügen"
 
 #: widgets/menubar/menubar.py:62
 msgid "Remove"
-msgstr ""
+msgstr "Entfernen"
 
 #: widgets/menubar/menubar.py:63
 msgid "Add separator"
-msgstr ""
+msgstr "Trennlinie hinzufügen"
 
 #: widgets/menubar/menubar.py:66
 msgid "Up"
-msgstr ""
+msgstr "Nach oben"
 
 #: widgets/menubar/menubar.py:67
 msgid "Down"
-msgstr ""
+msgstr "Nach unten"
 
 #: widgets/menubar/menubar.py:72
 msgid "Apply"
-msgstr ""
+msgstr "Anwenden"
 
 #: widgets/menubar/menubar.py:120
 msgid "Id   "
-msgstr ""
+msgstr "Kennung   "
 
 #: widgets/menubar/menubar.py:122
 msgid "Label  "
-msgstr ""
+msgstr "Beschriftung  "
 
 #: widgets/menubar/menubar.py:124
 msgid "Name  "
-msgstr ""
+msgstr "Name  "
 
 #: widgets/menubar/menubar.py:126
 msgid "Help String  "
-msgstr ""
+msgstr "Hilfe-Zeichenkette  "
 
 #: widgets/menubar/menubar.py:128
 msgid "Event Handler  "
-msgstr ""
+msgstr "Ereignis-Handler  "
 
 #: widgets/menubar/menubar.py:506
 msgid "Edit menus..."
-msgstr ""
+msgstr "Menüs bearbeiten..."
 
 #: widgets/menubar/menubar.py:766
 msgid "Select menubar class"
-msgstr ""
+msgstr "Menüleistenklasse auswählen"
 
 #: widgets/notebook/notebook.py:331
 msgid "Select tab placement"
@@ -1006,34 +1096,34 @@
 
 #: widgets/notebook/notebook.py:335
 msgid "Top"
-msgstr ""
+msgstr "Oben"
 
 #: widgets/notebook/notebook.py:335
 msgid "Bottom"
-msgstr ""
+msgstr "Unten"
 
 #: widgets/notebook/notebook.py:335
 msgid "Left"
-msgstr ""
+msgstr "Links"
 
 #: widgets/notebook/notebook.py:335
 msgid "Right"
-msgstr ""
+msgstr "Rechts"
 
 #: widgets/radio_button/radio_button.py:37
 msgid "Clicked"
-msgstr ""
+msgstr "Geklickt"
 
 #: widgets/radio_button/radio_button.py:42
 msgid "Marks the beginning of a new group of radio buttons."
-msgstr ""
+msgstr "Markiert den Anfang einer neuen Gruppe von Optionsfeldern."
 
 #: widgets/radio_button/radio_button.py:43
 msgid ""
 "In some circumstances, radio buttons that are not consecutive siblings "
 "trigger a hang bug in Windows (only). If this happens, add this style to "
-"mark the button as not belonging to a group, and implement the mutually-"
-"exclusive group behaviour yourself."
+"mark the button as not belonging to a group, and implement the "
+"mutually-exclusive group behaviour yourself."
 msgstr ""
 
 #: widgets/radio_button/radio_button.py:44
@@ -1041,58 +1131,69 @@
 "Use a checkbox button instead of radio button (currently supported only on "
 "PalmOS)."
 msgstr ""
+"Ein Kontrollkästchen anstatt eines Optionsfeldes verwenden (zur Zeit nur "
+"unter PalmOS unterstützt)."
 
 #: widgets/slider/slider.py:52
 msgid "Displays the slider horizontally (this is the default)."
 msgstr ""
+"Zeigt den Schieberegler horizontal an (dies ist die Standardeinstellung)."
 
 #: widgets/slider/slider.py:53
 msgid "Displays the slider vertically."
-msgstr ""
+msgstr "Zeigt den Schieberegler vertikal an."
 
 #: widgets/slider/slider.py:54
 msgid "Displays tick marks."
-msgstr ""
+msgstr "Zeigt die Häkchen an."
 
 #: widgets/slider/slider.py:55
 msgid "Displays minimum, maximum and value labels."
-msgstr ""
+msgstr "Zeigt die Bezeichnungen für Minimum, Maximum und Wert an."
 
 #: widgets/slider/slider.py:56
 msgid "Displays ticks on the left and forces the slider to be vertical."
 msgstr ""
+"Zeigt die Häkchen auf der linken Seite an und erzwingt einen vertikalen "
+"Schieberegler."
 
 #: widgets/slider/slider.py:57
 msgid "Displays ticks on the right and forces the slider to be vertical."
 msgstr ""
+"Zeigt die Häkchen auf der rechten Seite an und erzwingt einen vertikalen "
+"Schieberegler."
 
 #: widgets/slider/slider.py:58
 msgid "Displays ticks on the top."
-msgstr ""
+msgstr "Zeigt die Häkchen oben an."
 
 #: widgets/slider/slider.py:59
 msgid "Displays ticks on the bottom (this is the default)."
-msgstr ""
+msgstr "Zeigt die Häkchen unten an (dies ist die Standardeinstellung)."
 
 #: widgets/slider/slider.py:60
 msgid "Allows the user to select a range on the slider. Windows only."
 msgstr ""
+"Ermöglicht es dem Benutzer, einen Bereich auf dem Schieberegler auszuwählen. "
+"Nur Windows."
 
 #: widgets/slider/slider.py:61
 msgid ""
 "Inverses the mininum and maximum endpoints on the slider. Not compatible "
 "with wxSL_SELRANGE."
 msgstr ""
+"Invertiert die minimalen und maximalen Endpunkte auf dem Schieberegler. "
+"Nicht kompatibel mit wxSL_SELRANGE."
 
 #: widgets/static_text/static_text.py:42
 msgid "Store as attribute"
-msgstr ""
+msgstr "Als Attribut speichern"
 
 #: widgets/tree_ctrl/tree_ctrl.py:79
 msgid " Tree Control:"
-msgstr ""
+msgstr " Baumsteuerung:"
 
 #: widgets/tree_ctrl/tree_ctrl.py:82
 #, python-format
 msgid " on wxGlade %s"
-msgstr ""
+msgstr " in wxGlade %s"
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/po/tr_TR.mo and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/po/tr_TR.mo differ
diff -Nru wxglade-0.9.6/po/tr_TR.po wxglade-1.0.1/po/tr_TR.po
--- wxglade-0.9.6/po/tr_TR.po	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/po/tr_TR.po	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,1135 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-22 23:35+0300\n"
+"PO-Revision-Date: 2020-08-23 00:25+0300\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+"Last-Translator: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: tr_TR\n"
+
+#: about.py:49
+msgid "About wxGlade"
+msgstr "wxGlade Hakkında"
+
+#: about.py:59
+msgid "wxGlade - License"
+msgstr "wxGlade - License"
+
+#: about.py:64
+msgid ""
+"Can't find the license!\n"
+"You can get a copy at \n"
+"http://www.opensource.org/licenses/mit-license.php"
+msgstr ""
+"Lisans bulunamıyor!\n"
+"bir örneğini http://www.opensource.org/licenses/mit-license.php adresinden "
+"edinebilirsiniz."
+
+#: about.py:67 edit_windows.py:149 main.py:620 main.py:637 main.py:692
+#: main.py:705 main.py:753 main.py:815 zmain.py:482 zmain.py:499 zmain.py:538
+#: zmain.py:551 zmain.py:587 edit_sizers/edit_sizers.py:651
+msgid "Error"
+msgstr "Hata"
+
+#: about.py:80
+msgid "Can't find the credits file!\n"
+msgstr ""
+
+#: about.py:80
+msgid "Oops!"
+msgstr "Oop!"
+
+#: clipboard.py:40 clipboard.py:38
+msgid "Invalid data in the clipboard"
+msgstr "Panodaki data geçersiz"
+
+#: clipboard.py:65 clipboard.py:63
+msgid "Data can't be copied to clipboard."
+msgstr "Data panoya kopyalanamıyor."
+
+#: clipboard.py:71 clipboard.py:105 clipboard.py:69 clipboard.py:103
+msgid "Clipboard can't be opened."
+msgstr "Pano açılamıyor."
+
+#: clipboard.py:98 clipboard.py:96
+msgid "Data can't be copied from clipboard."
+msgstr "Veriler panodan kopyalanamıyor."
+
+#: clipboard.py:129 clipboard.py:127
+msgid "Please only drop one file at a time"
+msgstr "Lütfen bir seferde tek dosya sürükleyin"
+
+#: color_dialog.py:18 color_dialog.py:19
+msgid "System colour"
+msgstr "Sistem rengi"
+
+#: color_dialog.py:22 color_dialog.py:23
+msgid "Custom colour"
+msgstr "Özel renk"
+
+#: color_dialog.py:25 configUI.py:38 color_dialog.py:26
+#: edit_sizers/edit_sizers.py:395 edit_sizers/edit_sizers.py:1808
+#: edit_sizers/edit_sizers.py:2026 edit_sizers/edit_sizers.py:2122
+#: widgets/gauge/gauge.py:104 widgets/menubar/menubar.py:71
+#: widgets/menubar/menubar.py:777 widgets/notebook/notebook.py:339
+msgid "OK"
+msgstr "Tamam"
+
+#: color_dialog.py:26 configUI.py:39 color_dialog.py:27
+#: edit_sizers/edit_sizers.py:396 edit_sizers/edit_sizers.py:1809
+#: widgets/menubar/menubar.py:73 widgets/menubar/menubar.py:778
+msgid "Cancel"
+msgstr "İptal"
+
+#: color_dialog.py:70 color_dialog.py:71
+msgid "Select widget colour"
+msgstr "Bileşen rengini seçin"
+
+#: common.py:92
+#, python-format
+msgid "\"%s\" is not a valid code generator module"
+msgstr "\"%s\" geçerli bir kod üretici modülü değil"
+
+#: common.py:96
+#, python-format
+msgid "loaded code generator for %s"
+msgstr "%s için yüklü kod üreteci"
+
+#: common.py:127
+#, python-format
+msgid "Found widgets listing -> %s"
+msgstr "Bileşen listesi bulundu -> %s"
+
+#: common.py:128
+msgid "loading widget modules:"
+msgstr "Bileşen modülü yükleniyor:"
+
+#: common.py:137
+#, python-format
+msgid "ERROR loading \"%s\""
+msgstr "\"%s\" yüklenirken HATA"
+
+#: common.py:203
+#, python-format
+msgid "Add a %s"
+msgstr "%s ekle"
+
+#: config.py:60
+#, python-format
+msgid ""
+"Error reading config file:\n"
+"%s"
+msgstr ""
+"Yapılandırma dosyasını okurken hata:\n"
+"\n"
+"%s"
+
+#: config.py:103
+msgid "Choose a directory:"
+msgstr "Konum seç:"
+
+#: config.py:246
+msgid "Changes will take effect after wxGlade is restarted"
+msgstr "Değişiklikler, wxGlade yeniden başlatıldıktan sonra geçerli olacak"
+
+#: config.py:247
+msgid "Preferences saved"
+msgstr "Tercihler kaydedildi"
+
+#: configUI.py:15
+msgid "Local widget path"
+msgstr "Yerel bileşen yolu"
+
+#: configUI.py:17
+msgid "Use icons in menu items"
+msgstr "Menü öğelerinde simgeleri kullanın"
+
+#: configUI.py:18
+msgid "Show properties and tree windows as small frames (Win32 only)"
+msgstr ""
+"Özellikleri ve ağaç görünümlerini küçük çerçeveler olarak göster (yalnızca "
+"Win32)"
+
+#: configUI.py:19
+msgid "Show progress dialog when loading wxg files"
+msgstr "Wxg dosyalarını yüklerken ilerleme çubuğunu göster"
+
+#: configUI.py:20
+msgid "Remember position and size of wxGlade windows"
+msgstr ""
+
+#: configUI.py:21
+msgid "Show \"handles\" of sizers"
+msgstr ""
+
+#: configUI.py:22
+msgid "Use native file dialogs on KDE"
+msgstr "KDE'de yerel dosya diyaloglarını kullan"
+
+#: configUI.py:27
+msgid "Use dialog units by default for size properties"
+msgstr ""
+"Boyut özellikleri için varsayılan olarak iletişim kutusu özelliklerini "
+"kullanın"
+
+#: configUI.py:28
+msgid "Create backup wxg files"
+msgstr "Yedek wxg dosyaları oluştur"
+
+#: configUI.py:29
+msgid "Create backup files for generated source"
+msgstr "Oluşturulan kaynaklar için yedekleme dosyaları oluştur"
+
+#: configUI.py:30
+msgid "Allow duplicate widget names"
+msgstr "Yinelenen bileşen adlarına izin ver"
+
+#: configUI.py:31
+msgid "Default border width for widgets"
+msgstr "Bileşenler için varsayılan kenarlık genişliği"
+
+#: configUI.py:33
+msgid "Auto save wxg files every "
+msgstr "Wxg dosyalarını her zaman otomatik kaydet"
+
+#: configUI.py:35
+msgid "Backup options"
+msgstr "Yedekleme seçenekleri"
+
+#: configUI.py:35
+msgid "append ~ to filename"
+msgstr "dosya adlarına ~ ekle"
+
+#: configUI.py:35
+msgid "append .bak to filename"
+msgstr "Dosya adlarına .bak ekle"
+
+#: configUI.py:47
+msgid "wxGlade: preferences"
+msgstr "wxGalde: tercihler"
+
+#: configUI.py:83
+msgid ""
+"Initial path for \n"
+"file opening/saving dialogs:"
+msgstr ""
+"Dosya açma / kaydetme  diyalogları için\n"
+"ilk yol"
+
+#: configUI.py:86
+msgid ""
+"Initial path for \n"
+"code generation file dialogs:"
+msgstr ""
+"Kod oluşturma diyalogları için\n"
+"ilk yol"
+
+#: configUI.py:90
+msgid "Number of items in file history"
+msgstr "Dosya geçmişindeki öğe sayısı"
+
+#: configUI.py:93
+msgid ""
+"Number of buttons per row\n"
+"in the main palette"
+msgstr ""
+"Sıra başına düğme sayısı\n"
+"ana palette"
+
+#: configUI.py:122
+msgid "Interface"
+msgstr "Arayüz"
+
+#: configUI.py:123
+msgid "Other"
+msgstr "Diğer"
+
+#: wxglade.py:76 wxglade.py:78
+#, python-format
+msgid "Error: no writer for language \"%s\" available"
+msgstr "Hata: \"%s\" dili için yazar yok"
+
+#: wxglade.py:80 wxglade.py:82
+#, python-format
+msgid "Error: %s"
+msgstr "Hata: %s"
+
+#: wxglade.py:90 wxglade.py:92
+msgid ""
+"wxGlade usage:\n"
+"- to start the GUI: python wxglade.py [WXG_FILE]\n"
+"- to generate code from the command line: python wxglade.py OPTIONS... FILE\n"
+"  OPTIONS are the following:\n"
+"  -g, --generate-code=LANGUAGE  (required) give the output language\n"
+"  -o, --output=PATH             (optional) name of the output file (in\n"
+"                                single-file mode) or directory (in\n"
+"                                multi-file mode)\n"
+"    "
+msgstr ""
+"wxGlade kullanımı:\n"
+"\n"
+"- GUI'yi başlatmak için: python wxglade.py [WXG_FILE]\n"
+"- komut satırından kod üretmek için: python wxglade.py OPTIONS ... FILE\n"
+"  SEÇENEKLER aşağıdaki gibidir:\n"
+"\n"
+"  -g, --generate-code = DİL (gerekli) çıktı dilini ayarlar\n"
+"  -o, --output = Çıktı dosyasının Yolu (isteğe bağlı)"
+
+#: wxglade.py:101 wxglade.py:103
+msgid "Valid LANGUAGE values:"
+msgstr "Geçerli dil değerleri:"
+
+#: edit_widget.py:103
+msgid "'name' attribute missing"
+msgstr "'isim' öznitelik eksik"
+
+#: edit_windows.py:57
+msgid ""
+"If you change the default value, it will be interpreted as the name of the "
+"subclass of the widget. How this name affects code generation depends on the "
+"kind (i.e. language) of output. See the docs for more details."
+msgstr ""
+"Varsayılan değeri değiştirirseniz, bileşenin alt sınıfının adı olarak "
+"yorumlanacaktır. Bu ismin kod üretimini nasıl etkilediği, çıktının türüne "
+"(yani dile) bağlıdır. Daha fazla ayrıntı için belgelere bakın."
+
+#: edit_windows.py:148 edit_sizers/edit_sizers.py:650
+#, python-format
+msgid ""
+"Name \"%s\" is already in use.\n"
+"Please enter a different one."
+msgstr ""
+"\"%s\" adı zaten kullanılıyor.\\N\n"
+"Lütfen farklı bir tane girin."
+
+#: edit_windows.py:161 edit_windows.py:261 edit_sizers/edit_sizers.py:664
+#: edit_sizers/edit_sizers.py:706
+#, python-format
+msgid "Properties - <%s>"
+msgstr "Özellikler - <%s>"
+
+#: edit_windows.py:179 edit_windows.py:1024 edit_sizers/edit_sizers.py:87
+#: edit_sizers/edit_sizers.py:215 widgets/menubar/menubar.py:666
+msgid "Remove\tDel"
+msgstr "Kaldır\tDel"
+
+#: edit_windows.py:181 edit_sizers/edit_sizers.py:498
+msgid "Copy\tCtrl+C"
+msgstr "Koypala\tCtrl+C"
+
+#: edit_windows.py:183 edit_sizers/edit_sizers.py:499
+msgid "Cut\tCtrl+X"
+msgstr "Kes\tCtrl+X"
+
+#: edit_windows.py:480 edit_sizers/edit_sizers.py:634
+#: widgets/menubar/menubar.py:587
+msgid "Common"
+msgstr ""
+
+#: edit_windows.py:946
+msgid "Preview"
+msgstr "Önizle"
+
+#: edit_windows.py:960
+msgid "Close Preview"
+msgstr "Önizlemeyi kapat"
+
+#: edit_windows.py:1026 widgets/menubar/menubar.py:668
+msgid "Hide"
+msgstr "Gizle"
+
+#: edit_windows.py:1033 edit_sizers/edit_sizers.py:89
+msgid "Paste\tCtrl+V"
+msgstr "Yapıştır\tCtrl+V"
+
+#: edit_windows.py:1041
+msgid ""
+"\n"
+"wxGlade-WARNING: sizer already set for this window"
+msgstr ""
+"\n"
+"wxGlade-UYARI: boyutlandırıcı bu pencere için zaten ayarlanmış"
+
+#: edit_windows.py:1050
+msgid ""
+"\n"
+"wxGlade-WARNING: only sizers can be pasted here"
+msgstr ""
+"\n"
+"wxGlade-UYARI: buraya yalnızca boyutlandırıcılar yapıştırılabilir"
+
+#: events_mixin.py:22
+msgid "Event"
+msgstr "Olay"
+
+#: events_mixin.py:23
+msgid "Handler"
+msgstr "İşleyici"
+
+#: font_dialog.py:30
+msgid "Family:"
+msgstr "Grup:"
+
+#: font_dialog.py:31
+msgid "Style:"
+msgstr "Stil:"
+
+#: font_dialog.py:32
+msgid "Weight:"
+msgstr "Dolgunluk"
+
+#: font_dialog.py:97
+msgid "Select font attributes"
+msgstr "Font niteliklerini seçin"
+
+#: kdefiledialog.py:69
+#, python-format
+msgid "File '%s' already exists: do you really want to overwrite it?"
+msgstr "'%s' dosyası zaten mevcut: gerçekten üzerine yazmak istiyor musunuz?"
+
+#: kdefiledialog.py:77 kdefiledialog.py:118
+msgid "Fork Error"
+msgstr ""
+
+#: layout_option_property.py:40 layout_option_property.py:42
+msgid "Option"
+msgstr "Seçenek"
+
+#: layout_option_property.py:62 layout_option_property.py:64
+msgid "Position"
+msgstr "Konum"
+
+#: layout_option_property.py:72 layout_option_property.py:74
+msgid "Span"
+msgstr "Aralık"
+
+#: main.py:165 zmain.py:148
+msgid "Show &Tree\tCtrl+T"
+msgstr "&Ağaç görünümü\tCtrl+T"
+
+#: main.py:168 zmain.py:151
+msgid "Show &Properties\tCtrl+P"
+msgstr "&Özellikleri Göster\tCtrl+P"
+
+#: main.py:172 zmain.py:155
+msgid "&New\tCtrl+N"
+msgstr "&Yeni\tCtrl+N"
+
+#: main.py:174 zmain.py:157
+msgid "&Open...\tCtrl+O"
+msgstr "A&ç...\tCtrl+O"
+
+#: main.py:176 zmain.py:159
+msgid "&Save\tCtrl+S"
+msgstr "&Kaydet\tCtrl+S"
+
+#: main.py:178 zmain.py:161
+msgid "Save As...\tShift+Ctrl+S"
+msgstr "&Farklı kaydet...\tShift+Ctrl+S"
+
+#: main.py:182
+msgid "&Refresh\tf5"
+msgstr "Y&enile\tf5"
+
+#: main.py:184 zmain.py:165
+msgid "&Generate Code\tCtrl+G"
+msgstr "Kodu oluştur\tCtrl+G"
+
+#: main.py:189
+msgid "&Import from XRC...\tCtrl+I"
+msgstr ""
+
+#: main.py:193 zmain.py:169
+msgid "E&xit\tCtrl+Q"
+msgstr "Çıkı&ş\tCtrl+Q"
+
+#: main.py:196 zmain.py:172
+msgid "Preferences..."
+msgstr "Tercihler..."
+
+#: main.py:197 zmain.py:173
+msgid "&File"
+msgstr "&Dosya"
+
+#: main.py:198 zmain.py:174
+msgid "&View"
+msgstr "&Görünüm"
+
+#: main.py:200 zmain.py:176
+msgid "Contents\tF1"
+msgstr "İçindekiler\tF1"
+
+#: main.py:202 zmain.py:178
+msgid "About..."
+msgstr "Hakkında..."
+
+#: main.py:203 main.py:210 zmain.py:179
+msgid "&Help"
+msgstr "Y&ardım"
+
+#: main.py:228 main.py:573
+msgid ""
+"There seems to be auto saved data for this file: do you want to restore it?"
+msgstr ""
+"Bu dosya için otomatik olarak kaydedilmiş veriler var gibi görünüyor: "
+"Verileri geri yüklemek istiyor musunuz?"
+
+#: main.py:230 main.py:478 main.py:575
+msgid "Auto save detected"
+msgstr "Otomatik kayıt algılandı"
+
+#: main.py:274 zmain.py:219
+msgid "Core components"
+msgstr "Temel bileşenler"
+
+#: main.py:274 zmain.py:219
+msgid "Custom components"
+msgstr "Özel bileşenler"
+
+#: main.py:347 zmain.py:292
+msgid "Properties - <app>"
+msgstr "Özellikler - <app>"
+
+#: main.py:380 zmain.py:324
+msgid "wxGlade: Tree"
+msgstr "wxGlade: Ağaç"
+
+#: main.py:475
+msgid ""
+"There seems to be auto saved data from last wxGlade session: do you want to "
+"restore it?"
+msgstr ""
+
+#: main.py:484
+msgid "Recovery from auto save complete"
+msgstr ""
+
+#: main.py:491
+msgid "Auto saving... done"
+msgstr ""
+
+#: main.py:525 zmain.py:421
+msgid "Save changes to the current app?"
+msgstr ""
+
+#: main.py:525 zmain.py:421
+msgid "Confirm"
+msgstr ""
+
+#: main.py:549
+msgid "Impossible to reload an unsaved application"
+msgstr ""
+
+#: main.py:550
+msgid "Alert"
+msgstr ""
+
+#: main.py:565 zmain.py:445
+msgid "Open file"
+msgstr ""
+
+#: main.py:619 zmain.py:481
+#, python-format
+msgid "Error loading file %s: %s"
+msgstr ""
+
+#: main.py:632 zmain.py:494
+#, python-format
+msgid ""
+"An exception occurred while loading file \"%s\".\n"
+"This is the error message associated with it:\n"
+"        %s\n"
+"For more details, look at the full traceback on the console.\n"
+"If you think this is a wxGlade bug, please report it."
+msgstr ""
+
+#: main.py:653
+msgid "Loaded template"
+msgstr ""
+
+#: main.py:657
+#, python-format
+msgid "Loading time: %.5f"
+msgstr ""
+
+#: main.py:669
+#, python-format
+msgid "Loaded %s (%.2f seconds)"
+msgstr ""
+
+#: main.py:692 zmain.py:538
+#, python-format
+msgid ""
+"Error saving app:\n"
+"%s"
+msgstr ""
+
+#: main.py:698 zmain.py:544
+#, python-format
+msgid ""
+"An exception occurred while saving file \"%s\".\n"
+"This is the error message associated with it:\n"
+"        %s\n"
+"For more details, look at the full traceback on the console.\n"
+"If you think this is a wxGlade bug, please report it."
+msgstr ""
+
+#: main.py:714
+#, python-format
+msgid "Saved %s"
+msgstr ""
+
+#: main.py:720 zmain.py:560
+msgid "Save project as..."
+msgstr ""
+
+#: main.py:752 zmain.py:587
+#, python-format
+msgid ""
+"Error saving preferences:\n"
+"%s"
+msgstr ""
+
+#: main.py:797
+msgid "Import file"
+msgstr ""
+
+#: main.py:810
+#, python-format
+msgid ""
+"An exception occurred while importing file \"%s\".\n"
+"This is the error message associated with it:\n"
+"        %s\n"
+"For more details, look at the full traceback on the console.\n"
+"If you think this is a wxGlade bug, please report it."
+msgstr ""
+
+#: misc.py:404
+msgid "<Design> - "
+msgstr ""
+
+#: tree.py:32
+msgid "Properties - <>"
+msgstr ""
+
+#: tree.py:267
+msgid "Application"
+msgstr ""
+
+#: tree.py:280
+msgid "Show"
+msgstr ""
+
+#: tree.py:448
+#, python-format
+msgid "wxGlade: Tree %s"
+msgstr ""
+
+#: widget_properties.py:641
+msgid "All Files|*"
+msgstr ""
+
+#: widget_properties.py:642
+msgid "Choose a file"
+msgstr ""
+
+#: widget_properties.py:765
+#, python-format
+msgid "error in the value of the property \"%s\""
+msgstr ""
+
+#: widget_properties.py:918
+msgid "  Apply  "
+msgstr ""
+
+#: widget_properties.py:921
+msgid "  Add  "
+msgstr ""
+
+#: widget_properties.py:924
+msgid "  Insert  "
+msgstr ""
+
+#: widget_properties.py:927
+msgid "  Remove  "
+msgstr ""
+
+#: xml_parse.py:253
+msgid "Loading..."
+msgstr ""
+
+#: xml_parse.py:253
+msgid "Please wait while loading the app"
+msgstr ""
+
+#: zmain.py:445 zmain.py:561
+msgid "wxGlade files (*.wxg)|*.wxg|XML files (*.xml)|*.xml|All files|*"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:83
+msgid "Options"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:286 edit_sizers/edit_sizers.py:287
+msgid "Select sizer type"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:389
+msgid "Select a position"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:495 edit_sizers/edit_sizers.py:1492
+msgid "Add slot"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:496 edit_sizers/edit_sizers.py:1493
+msgid "Insert slot..."
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:626
+msgid "Fit parent"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:1494
+msgid "Add row"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:1495
+msgid "Add column"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:1496
+msgid "Insert row..."
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:1497
+msgid "Insert column..."
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:1885
+msgid "Growable Rows"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:1885
+msgid "Select growable rows"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:1891
+msgid "Growable Columns"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:1892
+msgid "Select growable columns"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:2002
+msgid "Orientation"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:2003 edit_sizers/edit_sizers.py:2049
+msgid "Horizontal"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:2003
+msgid "Vertical"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:2006
+msgid "Slots: "
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:2016
+msgid "Has a Static Box"
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:2022
+msgid "Label: "
+msgstr ""
+
+#: edit_sizers/edit_sizers.py:2098
+msgid "Select sizer attributes"
+msgstr ""
+
+#: widgets/bitmap_button/bitmap_button.py:120
+msgid "Select the image for the button"
+msgstr ""
+
+#: widgets/gauge/gauge.py:32
+msgid "Creates a horizontal gauge."
+msgstr ""
+
+#: widgets/gauge/gauge.py:33
+msgid "Creates a vertical gauge."
+msgstr ""
+
+#: widgets/gauge/gauge.py:34
+msgid "Under Windows 95, creates a horizontal progress bar."
+msgstr ""
+
+#: widgets/gauge/gauge.py:35
+msgid ""
+"Creates smooth progress bar with one pixel wide update step (not supported "
+"by all platforms)."
+msgstr ""
+
+#: widgets/gauge/gauge.py:91 widgets/slider/slider.py:131
+msgid "Select style"
+msgstr ""
+
+#: widgets/grid/grid.py:199
+msgid ""
+"The following properties are meaningful\n"
+"only if 'Create grid' is selected"
+msgstr ""
+
+#: widgets/grid/grid.py:220 widgets/notebook/notebook.py:224
+#: widgets/radio_button/radio_button.py:74 widgets/slider/slider.py:84
+#: widgets/static_text/static_text.py:65 widgets/text_ctrl/text_ctrl.py:76
+#: widgets/tree_ctrl/tree_ctrl.py:105
+msgid "Widget"
+msgstr ""
+
+#: widgets/list_box/list_box.py:46
+msgid "Single-selection list."
+msgstr ""
+
+#: widgets/list_box/list_box.py:47
+msgid "Multiple-selection list: the user can toggle multiple items on and off."
+msgstr ""
+
+#: widgets/list_box/list_box.py:48
+msgid ""
+"Extended-selection list: the user can select multiple items using the SHIFT "
+"key and the mouse or special key combinations."
+msgstr ""
+
+#: widgets/list_box/list_box.py:49
+msgid "Create horizontal scrollbar if contents are too wide (Windows only)."
+msgstr ""
+
+#: widgets/list_box/list_box.py:50
+msgid "Always show a vertical scrollbar."
+msgstr ""
+
+#: widgets/list_box/list_box.py:51
+msgid "Only create a vertical scrollbar if needed."
+msgstr ""
+
+#: widgets/list_box/list_box.py:52
+msgid "The listbox contents are sorted in alphabetical order."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:71
+msgid ""
+"Multicolumn list view, with optional small icons. Columns are computed "
+"automatically, i.e. you don't set columns as in wxLC_REPORT. In other words, "
+"the list wraps, unlike a wxListBox."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:72
+msgid "Single or multicolumn report view, with optional header."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:73
+msgid "Large icon view, with optional labels."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:74
+msgid ""
+"The application provides items text on demand. May only be used with "
+"wxLC_REPORT."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:75
+msgid "Small icon view, with optional labels."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:76
+msgid "Icons align to the top. Win32 default, Win32 only."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:77
+msgid "Icons align to the left."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:78
+msgid "Icons arrange themselves. Win32 only."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:79
+msgid ""
+"Labels are editable: the application will be notified when editing starts."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:80
+msgid "No header in report mode."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:81
+msgid "Single selection (default is multiple)."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:82
+msgid ""
+"Sort in ascending order (must still supply a comparison callback in "
+"SortItems."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:83
+msgid ""
+"Sort in descending order (must still supply a comparison callback in "
+"SortItems."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:84
+msgid "Draws light horizontal rules between rows in report mode."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:85
+msgid "Draws light vertical rules between columns in report mode"
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:86
+msgid ""
+"Displays a thin border around the window. wxBORDER is the old name for this "
+"style."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:87
+msgid "Displays a double border. Windows and Mac only."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:88
+msgid "Displays a sunken border."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:89
+msgid "Displays a raised border."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:90
+msgid "Displays a border suitable for a static control. Windows only."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:91
+msgid "Displays no border, overriding the default border style for the window."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:92
+msgid ""
+"Use this to indicate that the window wants to get all char/key events for "
+"all keys - even for keys like TAB or ENTER which are usually used for dialog "
+"navigation and which wouldn't be generated without this style. If you need "
+"to use this style in order to get the arrows or etc., but would still like "
+"to have normal keyboard navigation take place, you should create and send a "
+"wxNavigationKeyEvent in response to the key events for Tab and Shift-Tab."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:93
+msgid ""
+"On Windows, this style used to disable repainting the window completely when "
+"its size is changed. Since this behaviour is now the default, the style is "
+"now obsolete and no longer has an effect."
+msgstr ""
+
+#: widgets/list_ctrl/list_ctrl.py:94
+msgid ""
+"Use this style to force a complete redraw of the window whenever it is "
+"resized instead of redrawing just the part of the window affected by "
+"resizing. Note that this was the behaviour by default before 2.5.1 release "
+"and that if you experience redraw problems with code which previously used "
+"to work you may want to try this. Currently this style applies on GTK+ 2 and "
+"Windows only, and full repainting is always done on other platforms."
+msgstr ""
+
+#: widgets/menubar/menubar.py:18
+msgid "Menu editor"
+msgstr ""
+
+#: widgets/menubar/menubar.py:24
+msgid "Menu item:"
+msgstr ""
+
+#: widgets/menubar/menubar.py:32
+msgid "Label"
+msgstr ""
+
+#: widgets/menubar/menubar.py:33
+msgid "Id"
+msgstr ""
+
+#: widgets/menubar/menubar.py:34
+msgid "Name"
+msgstr ""
+
+#: widgets/menubar/menubar.py:35
+msgid "Help String"
+msgstr ""
+
+#: widgets/menubar/menubar.py:36 widgets/menubar/menubar.py:58
+msgid "Type"
+msgstr ""
+
+#: widgets/menubar/menubar.py:38
+msgid "Event Handler"
+msgstr ""
+
+#: widgets/menubar/menubar.py:61
+msgid "Add"
+msgstr ""
+
+#: widgets/menubar/menubar.py:62
+msgid "Remove"
+msgstr ""
+
+#: widgets/menubar/menubar.py:63
+msgid "Add separator"
+msgstr ""
+
+#: widgets/menubar/menubar.py:66
+msgid "Up"
+msgstr ""
+
+#: widgets/menubar/menubar.py:67
+msgid "Down"
+msgstr ""
+
+#: widgets/menubar/menubar.py:72
+msgid "Apply"
+msgstr ""
+
+#: widgets/menubar/menubar.py:120
+msgid "Id   "
+msgstr ""
+
+#: widgets/menubar/menubar.py:122
+msgid "Label  "
+msgstr ""
+
+#: widgets/menubar/menubar.py:124
+msgid "Name  "
+msgstr ""
+
+#: widgets/menubar/menubar.py:126
+msgid "Help String  "
+msgstr ""
+
+#: widgets/menubar/menubar.py:128
+msgid "Event Handler  "
+msgstr ""
+
+#: widgets/menubar/menubar.py:506
+msgid "Edit menus..."
+msgstr ""
+
+#: widgets/menubar/menubar.py:766
+msgid "Select menubar class"
+msgstr ""
+
+#: widgets/notebook/notebook.py:331
+msgid "Select tab placement"
+msgstr ""
+
+#: widgets/notebook/notebook.py:335
+msgid "Top"
+msgstr ""
+
+#: widgets/notebook/notebook.py:335
+msgid "Bottom"
+msgstr ""
+
+#: widgets/notebook/notebook.py:335
+msgid "Left"
+msgstr ""
+
+#: widgets/notebook/notebook.py:335
+msgid "Right"
+msgstr ""
+
+#: widgets/radio_button/radio_button.py:37
+msgid "Clicked"
+msgstr ""
+
+#: widgets/radio_button/radio_button.py:42
+msgid "Marks the beginning of a new group of radio buttons."
+msgstr ""
+
+#: widgets/radio_button/radio_button.py:43
+msgid ""
+"In some circumstances, radio buttons that are not consecutive siblings "
+"trigger a hang bug in Windows (only). If this happens, add this style to "
+"mark the button as not belonging to a group, and implement the mutually-"
+"exclusive group behaviour yourself."
+msgstr ""
+
+#: widgets/radio_button/radio_button.py:44
+msgid ""
+"Use a checkbox button instead of radio button (currently supported only on "
+"PalmOS)."
+msgstr ""
+
+#: widgets/slider/slider.py:52
+msgid "Displays the slider horizontally (this is the default)."
+msgstr ""
+
+#: widgets/slider/slider.py:53
+msgid "Displays the slider vertically."
+msgstr ""
+
+#: widgets/slider/slider.py:54
+msgid "Displays tick marks."
+msgstr ""
+
+#: widgets/slider/slider.py:55
+msgid "Displays minimum, maximum and value labels."
+msgstr ""
+
+#: widgets/slider/slider.py:56
+msgid "Displays ticks on the left and forces the slider to be vertical."
+msgstr ""
+
+#: widgets/slider/slider.py:57
+msgid "Displays ticks on the right and forces the slider to be vertical."
+msgstr ""
+
+#: widgets/slider/slider.py:58
+msgid "Displays ticks on the top."
+msgstr ""
+
+#: widgets/slider/slider.py:59
+msgid "Displays ticks on the bottom (this is the default)."
+msgstr ""
+
+#: widgets/slider/slider.py:60
+msgid "Allows the user to select a range on the slider. Windows only."
+msgstr ""
+
+#: widgets/slider/slider.py:61
+msgid ""
+"Inverses the mininum and maximum endpoints on the slider. Not compatible "
+"with wxSL_SELRANGE."
+msgstr ""
+
+#: widgets/static_text/static_text.py:42
+msgid "Store as attribute"
+msgstr ""
+
+#: widgets/tree_ctrl/tree_ctrl.py:79
+msgid " Tree Control:"
+msgstr ""
+
+#: widgets/tree_ctrl/tree_ctrl.py:82
+#, python-format
+msgid " on wxGlade %s"
+msgstr ""
diff -Nru wxglade-0.9.6/preferencesdialog.py wxglade-1.0.1/preferencesdialog.py
--- wxglade-0.9.6/preferencesdialog.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/preferencesdialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,9 +1,10 @@
 """
 Dialog for editing wxGlade preferences
 
-@see: L{config.preferences}
+see: config.preferences
 @copyright: 2007 Alberto Griggio
-@copyright: 20013-2016 Carsten Grohmann
+@copyright: 2013-2016 Carsten Grohmann
+@copyright: 2019-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -19,11 +20,29 @@
     def __init__(self, preferences):
         wxGladePreferencesUI.__init__(self, None, -1, "")
 
+        self.check_accessibility()
+
         self.choose_widget_path.Bind(wx.EVT_BUTTON, self.on_widget_path)
 
         self.preferences = preferences
         self.set_values()
 
+    def check_accessibility(self):
+        # add a warning if not NVDA etc. compatible
+        import sys, platform, compat
+        if sys.platform!="win32" or not compat.IS_PHOENIX: return
+        if platform.architecture()[0] != "32bit": return
+        version = wx.VERSION[:3]
+        if version < (4,0,4) or version > (4,0,7): return
+        panel = self.sizer_accessibility.GetContainingWindow()
+        text = wx.StaticText(panel, label="Please be warned that your version of wxPython\n"
+                                          "probably does not support screen readers very well.\n"
+                                          "This is a problem with wxPython versions\n"
+                                          "4.0.4 to 4.0.7 on 32 bit Python on Windows.\n"
+                                          "A workaround is to set the name argument of CheckBox.")
+        self.sizer_accessibility.Insert(0, text, 0, wx.ALL, 10)
+        self.sizer_accessibility.Layout()
+
     def set_values(self):
         try:
             self.open_save_path.SetValue(self.preferences.open_save_path)
@@ -40,6 +59,12 @@
             self.remember_geometry.SetValue( self.preferences.remember_geometry )
             self.local_widget_path.SetValue( self.preferences.local_widget_path )
             self.show_sizer_handle.SetValue( self.preferences.show_sizer_handle )
+            self.show_palette_icons.SetValue( self.preferences.show_palette_icons )
+            self.show_palette_labels.SetValue( self.preferences.show_palette_labels )
+            self.show_gridproperty_editors.SetValue( self.preferences.show_gridproperty_editors )
+            self.use_checkboxes_workaround.SetValue( self.preferences.use_checkboxes_workaround )
+            self.no_checkbox_label_colours.SetValue( self.preferences.no_checkbox_label_colours )
+
             self.allow_duplicate_names.SetValue( self.preferences.allow_duplicate_names )
             self.autosave.SetValue(self.preferences.autosave)
             self.autosave_delay.SetValue(self.preferences.autosave_delay)
@@ -92,8 +117,16 @@
         prefs['remember_geometry'] = self.remember_geometry.GetValue()
         prefs['local_widget_path'] = self.local_widget_path.GetValue()
         prefs['show_sizer_handle'] = self.show_sizer_handle.GetValue()
-        prefs['allow_duplicate_names'] = \
-            self.allow_duplicate_names.GetValue()
+        show_icons = self.show_palette_icons.GetValue()
+        show_text = self.show_palette_labels.GetValue()
+        if not show_icons and not show_text: show_icons = True
+        prefs['show_palette_icons'] = show_icons
+        prefs['show_palette_labels'] = show_text
+        prefs['show_gridproperty_editors'] = self.show_gridproperty_editors.GetValue()
+        prefs['use_checkboxes_workaround'] = self.use_checkboxes_workaround.GetValue()
+        prefs['no_checkbox_label_colours'] = self.no_checkbox_label_colours.GetValue()
+
+        prefs['allow_duplicate_names'] = self.allow_duplicate_names.GetValue()
         prefs['autosave'] = self.autosave.GetValue()
         prefs['autosave_delay'] = self.autosave_delay.GetValue()
         prefs['show_completion'] = self.show_completion.GetValue()
diff -Nru wxglade-0.9.6/preferences_ui.py wxglade-1.0.1/preferences_ui.py
--- wxglade-0.9.6/preferences_ui.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/preferences_ui.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 # -*- coding: ISO-8859-15 -*-
 #
-# generated by wxGlade 0.8.1 on Tue May  1 19:11:39 2018
+# generated by wxGlade 0.9.9pre on Wed Jul 29 22:28:29 2020
 #
 
 import wx
@@ -13,121 +13,183 @@
 import config
 import os
 
-_icon_path = os.path.join(config.icons_path, 'icon.xpm')
+_icon_path = os.path.join(config.icons_path, 'icon.png')
 # end wxGlade
 
 
 class wxGladePreferencesUI(wx.Dialog):
     def __init__(self, *args, **kwds):
         # begin wxGlade: wxGladePreferencesUI.__init__
-        kwds["style"] = wx.DEFAULT_DIALOG_STYLE
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
         wx.Dialog.__init__(self, *args, **kwds)
-        self.notebook_1 = wx.Notebook(self, wx.ID_ANY)
-        self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.show_progress = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show progress dialog when loading wxg files"))
-        self.remember_geometry = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Remember position and size of wxGlade windows"))
-        self.show_sizer_handle = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show \"handles\" of sizers"))
-        self.show_completion = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show success message for code generation"))
-        self.open_save_path = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
-        self.codegen_path = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
-        self.number_history = wx.SpinCtrl(self.notebook_1_pane_1, wx.ID_ANY, "4", min=0, max=100)
-        self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.use_dialog_units = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Use dialog units by default for size properties"))
-        self.codegen_backup = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Create backup files for generated source"))
-        self.allow_duplicate_names = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Allow duplicate widget names"))
-        self.default_border = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Default border width for widgets"))
-        self.default_border_size = wx.SpinCtrl(self.notebook_1_pane_2, wx.ID_ANY, "", min=0, max=20)
-        self.autosave = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Auto save wxg files every "))
-        self.autosave_delay = wx.SpinCtrl(self.notebook_1_pane_2, wx.ID_ANY, "120", min=30, max=300)
-        self.write_timestamp = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Insert timestamp on generated source files"))
-        self.write_generated_from = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Insert .wxg file name on generated source files"))
-        self.wxg_backup = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Create backup wxg files"))
-        self.backup_suffix = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Backup options"), choices=[_("append ~ to filename"), _("append .bak to filename")], majorDimension=2, style=wx.RA_SPECIFY_COLS)
-        self.local_widget_path = wx.TextCtrl(self.notebook_1_pane_2, wx.ID_ANY, "")
-        self.choose_widget_path = wx.Button(self.notebook_1_pane_2, wx.ID_ANY, _("..."), style=wx.BU_EXACTFIT)
-        self.sizer_6_staticbox = wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Local widget path"))
-        self.ok = wx.Button(self, wx.ID_OK, "")
-        self.cancel = wx.Button(self, wx.ID_CANCEL, "")
-        
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: wxGladePreferencesUI.__set_properties
         self.SetTitle(_("wxGlade: preferences"))
         _icon = wx.NullIcon
         _icon.CopyFromBitmap(wx.Bitmap(_icon_path, wx.BITMAP_TYPE_ANY))
         self.SetIcon(_icon)
-        self.show_progress.SetValue(1)
-        self.remember_geometry.SetValue(1)
-        self.show_sizer_handle.SetValue(1)
-        self.show_completion.SetValue(1)
-        self.open_save_path.SetMinSize((196, -1))
-        self.codegen_path.SetMinSize((196, -1))
-        self.number_history.SetMinSize((196, -1))
-        self.codegen_backup.SetValue(1)
-        self.allow_duplicate_names.Hide()
-        self.write_timestamp.SetValue(1)
-        self.wxg_backup.SetValue(1)
-        self.backup_suffix.SetSelection(0)
-        self.ok.SetDefault()
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: wxGladePreferencesUI.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.VERTICAL)
-        self.sizer_6_staticbox.Lower()
-        sizer_6 = wx.StaticBoxSizer(self.sizer_6_staticbox, wx.HORIZONTAL)
-        sizer_7_copy = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=0)
+        sizer_1.Add(self.notebook_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Interface"))
+
         sizer_3 = wx.BoxSizer(wx.VERTICAL)
-        sizer_4 = wx.FlexGridSizer(3, 2, 0, 0)
+
+        self.show_progress = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show progress dialog when loading wxg files"))
+        self.show_progress.SetValue(1)
         sizer_3.Add(self.show_progress, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.remember_geometry = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Remember position and size of wxGlade windows"))
+        self.remember_geometry.SetValue(1)
         sizer_3.Add(self.remember_geometry, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.show_sizer_handle = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show \"handles\" of sizers"))
+        self.show_sizer_handle.SetValue(1)
         sizer_3.Add(self.show_sizer_handle, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.show_completion = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show success message for code generation"))
+        self.show_completion.SetValue(1)
         sizer_3.Add(self.show_completion, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_4 = wx.FlexGridSizer(3, 2, 0, 0)
+        sizer_3.Add(sizer_4, 0, wx.EXPAND, 3)
+
         label_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Initial path for \nfile opening/saving dialogs:"))
         sizer_4.Add(label_1, 0, wx.ALL, 5)
+
+        self.open_save_path = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self.open_save_path.SetMinSize((196, -1))
         sizer_4.Add(self.open_save_path, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         label_2_copy = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Initial path for \ncode generation file dialogs:"))
         sizer_4.Add(label_2_copy, 0, wx.ALL, 5)
+
+        self.codegen_path = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self.codegen_path.SetMinSize((196, -1))
         sizer_4.Add(self.codegen_path, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         label_2 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Number of items in file history"))
         sizer_4.Add(label_2, 0, wx.ALL, 5)
+
+        self.number_history = wx.SpinCtrl(self.notebook_1_pane_1, wx.ID_ANY, "4", min=0, max=100, style=0)
+        self.number_history.SetMinSize((196, -1))
         sizer_4.Add(self.number_history, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        sizer_4.AddGrowableCol(1)
-        sizer_3.Add(sizer_4, 0, wx.EXPAND, 3)
-        self.notebook_1_pane_1.SetSizer(sizer_3)
+
+        self.notebook_1_pane_3 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Accessibility"))
+
+        self.sizer_accessibility = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_3, wx.ID_ANY, _("Palette Panel")), wx.HORIZONTAL)
+        self.sizer_accessibility.Add(sizer_8, 0, wx.EXPAND | wx.LEFT | wx.TOP, 6)
+
+        self.show_palette_icons = wx.CheckBox(self.notebook_1_pane_3, wx.ID_ANY, _("Show icons"))
+        self.show_palette_icons.SetValue(1)
+        sizer_8.Add(self.show_palette_icons, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.show_palette_labels = wx.CheckBox(self.notebook_1_pane_3, wx.ID_ANY, _("Show labels"))
+        sizer_8.Add(self.show_palette_labels, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_10 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_3, wx.ID_ANY, _("Property Panel")), wx.VERTICAL)
+        self.sizer_accessibility.Add(sizer_10, 0, wx.EXPAND | wx.LEFT | wx.TOP, 6)
+
+        self.show_gridproperty_editors = wx.CheckBox(self.notebook_1_pane_3, wx.ID_ANY, _("Show editors for Grid Properties"))
+        self.show_gridproperty_editors.SetToolTipString(_("As grids are not well editable with NVDA, this option will enable separate text controls for e.g. widget Events."))
+        sizer_10.Add(self.show_gridproperty_editors, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.use_checkboxes_workaround = wx.CheckBox(self.notebook_1_pane_3, wx.ID_ANY, _("Use checkbox label workaround"))
+        self.use_checkboxes_workaround.SetToolTipString(_("Use a workaround to add invisible labels to enable/disable checkboxes such that NVDA will indicate the property name.\nThis is not yet tested on all platforms. It may introduce display problems."))
+        self.use_checkboxes_workaround.SetValue(1)
+        sizer_10.Add(self.use_checkboxes_workaround, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.no_checkbox_label_colours = wx.CheckBox(self.notebook_1_pane_3, wx.ID_ANY, _("Don't set checkbox label colours"))
+        self.no_checkbox_label_colours.SetToolTipString(_("When colours are set, screen readers will not recognize the selection state of checkboxes."))
+        sizer_10.Add(self.no_checkbox_label_colours, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Other"))
+
+        sizer_5 = wx.BoxSizer(wx.VERTICAL)
+
+        self.use_dialog_units = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Use dialog units by default for size properties"))
         sizer_5.Add(self.use_dialog_units, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.codegen_backup = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Create backup files for generated source"))
+        self.codegen_backup.SetValue(1)
         sizer_5.Add(self.codegen_backup, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.allow_duplicate_names = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Allow duplicate widget names"))
+        self.allow_duplicate_names.Hide()
         sizer_5.Add(self.allow_duplicate_names, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_5.Add(sizer_7, 0, wx.EXPAND, 0)
+
+        self.default_border = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Default border width for widgets"))
         sizer_7.Add(self.default_border, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.default_border_size = wx.SpinCtrl(self.notebook_1_pane_2, wx.ID_ANY, "", min=0, max=20, style=0)
         sizer_7.Add(self.default_border_size, 0, wx.ALL, 5)
-        sizer_5.Add(sizer_7, 0, wx.EXPAND, 0)
+
+        sizer_7_copy = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_5.Add(sizer_7_copy, 0, wx.EXPAND, 0)
+
+        self.autosave = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Auto save wxg files every "))
         sizer_7_copy.Add(self.autosave, 0, wx.ALIGN_CENTER_VERTICAL | wx.BOTTOM | wx.LEFT | wx.TOP, 5)
+
+        self.autosave_delay = wx.SpinCtrl(self.notebook_1_pane_2, wx.ID_ANY, "120", min=30, max=300, style=0)
         sizer_7_copy.Add(self.autosave_delay, 0, wx.ALL, 5)
+
         label_3 = wx.StaticText(self.notebook_1_pane_2, wx.ID_ANY, _(" seconds"))
         sizer_7_copy.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL | wx.BOTTOM | wx.FIXED_MINSIZE | wx.TOP, 5)
-        sizer_5.Add(sizer_7_copy, 0, wx.EXPAND, 0)
+
+        self.write_timestamp = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Insert timestamp on generated source files"))
+        self.write_timestamp.SetValue(1)
         sizer_5.Add(self.write_timestamp, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.write_generated_from = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Insert .wxg file name on generated source files"))
         sizer_5.Add(self.write_generated_from, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.wxg_backup = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Create backup wxg files"))
+        self.wxg_backup.SetValue(1)
         sizer_5.Add(self.wxg_backup, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.backup_suffix = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Backup options"), choices=[_("append ~ to filename"), _("append .bak to filename")], majorDimension=2, style=wx.RA_SPECIFY_COLS)
+        self.backup_suffix.SetSelection(0)
         sizer_5.Add(self.backup_suffix, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_6 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Local widget path")), wx.HORIZONTAL)
+        sizer_5.Add(sizer_6, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.local_widget_path = wx.TextCtrl(self.notebook_1_pane_2, wx.ID_ANY, "")
         sizer_6.Add(self.local_widget_path, 1, wx.ALL, 3)
+
+        self.choose_widget_path = wx.Button(self.notebook_1_pane_2, wx.ID_ANY, _("..."), style=wx.BU_EXACTFIT)
         sizer_6.Add(self.choose_widget_path, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 3)
-        sizer_5.Add(sizer_6, 0, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_2.SetSizer(sizer_5)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Interface"))
-        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Other"))
-        sizer_1.Add(self.notebook_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT | wx.ALL, 10)
+
+        self.ok = wx.Button(self, wx.ID_OK, "")
+        self.ok.SetDefault()
         sizer_2.Add(self.ok, 0, wx.ALL, 5)
+
+        self.cancel = wx.Button(self, wx.ID_CANCEL, "")
         sizer_2.Add(self.cancel, 0, wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT | wx.ALL, 10)
+
+        self.notebook_1_pane_2.SetSizer(sizer_5)
+
+        self.notebook_1_pane_3.SetSizer(self.sizer_accessibility)
+
+        sizer_4.AddGrowableCol(1)
+
+        self.notebook_1_pane_1.SetSizer(sizer_3)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         self.Centre()
         # end wxGlade
diff -Nru wxglade-0.9.6/README.rst wxglade-1.0.1/README.rst
--- wxglade-0.9.6/README.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/README.rst	2020-12-31 14:04:48.000000000 +0000
@@ -5,7 +5,7 @@
 .. image:: docs/html/_images/wxglade_large.png
    :align: center
    
-Version: 0.9.6
+Version: 1.0.1
 License: MIT (see LICENSE.txt)
 
 THIS PROGRAM COMES WITH NO WARRANTY
@@ -97,8 +97,6 @@
 * What do you want to happen?
 * What actually happened?
 * Provide a short example to reproduce the issue.
-* Maybe, include the internal error log file ``wxglade.log``
-
 
 
 Have fun!
diff -Nru wxglade-0.9.6/README.txt wxglade-1.0.1/README.txt
--- wxglade-0.9.6/README.txt	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/README.txt	2020-12-31 14:04:48.000000000 +0000
@@ -1,12 +1,19 @@
 wxGlade: A GUI builder for wxPython/wxWidgets
 =============================================
 
-Version: 0.9.6
+Version: 1.0.1
 License: MIT (see LICENSE.txt)
 
 THIS PROGRAM COMES WITH NO WARRANTY
 
 
+Introduction
+------------
+
+wxGlade is a GUI builder for wxWidgets/wxPython.
+It can create Python, C++, Perl, Lisp and XRC output.
+
+
 Requirements
 ------------
 
@@ -15,20 +22,41 @@
    (wxPython Phoenix, i.e. release >=4.0.0, is supported)
 
 If you have a choice, you should prefer wxPython Phoenix running on Python 3.x.
+See https://wxpython.org/pages/downloads/ for download and installation instructions.
+On Windows and macOS it can be installed with ``python -mpip install wxPython``.
 
 
 Installation
 ------------
 
-To start the program, enter ``python wxglade.py`` in your shell or use
-whatever is required to start a python application on your platform.
+Download the latest released version as zip archive from
+https://sourceforge.net/projects/wxglade/
+
+Unpack the archive to a known location and maybe add it to the path.
+
+If you are familiar with git, you may instead just clone the repository from
+https://github.com/wxGlade/wxGlade.git
+The master branch should be stable enough for your work and I appreciate bug reports.
+
+
+Running wxGlade
+---------------
+
+To start the program, change directory to the installation directory you unzipped to and
+enter 'python3 wxglade.py' or 'python wxglade.py' in your shell or use whatever is
+required to start a python application on your platform.
+
+You may want to add a desktop shortcut to run the 'wxGlade.py' file (or the 'wxGlade.pyw' file).
+
 If you want to build a GUI for wxPython Classic or Phoenix:
 Start wxGlade in your target version - if it runs under Phoenix, it will
-create Phoenix code.
+create Phoenix code. The .wxg file format is not affected by this. So you may
+use a single .wxg file to generate code for both Classic and Phoenix.
+The generated code should always run under both Python 2.7 and Python 3.
 
 
-Documentation
--------------
+Documentation and Tutorial
+--------------------------
 
 The documentation is at docs\html\index.html and includes a tutorial.
 You can view it from the help menu as well.
@@ -65,9 +93,3 @@
 - What do you want to happen?
 - What actually happened?
 - Provide a short example to reproduce the issue.
-- Maybe, include the internal error log file ``wxglade.log``
-
-
-
-Have fun!
-Dietmar Schwertberger
diff -Nru wxglade-0.9.6/res/dialogs.wxg wxglade-1.0.1/res/dialogs.wxg
--- wxglade-0.9.6/res/dialogs.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/res/dialogs.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,202 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 1.0.0a8 on Sun Oct  4 22:16:14 2020 -->
+
+<application encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" option="0" overwrite="1" path="..\_dialogs.py" source_extension=".cpp" top_window="dialog" use_gettext="0" use_new_namespace="1">
+    <object class="MakeRowColGrowableDlg" name="dialog" base="EditDialog">
+        <title>Make row and/or column growable</title>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>8</border>
+                <flag>wxALL|wxEXPAND</flag>
+                <object class="wxStaticText" name="static_text_1" base="EditStaticText">
+                    <label>You have set a widget's layout to EXPAND.\n\nThe containing row and column are not growable.\nSo EXPAND does not have an effect.</label>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>6</border>
+                <flag>wxALL|wxEXPAND</flag>
+                <object class="wxStaticBoxSizer" name="sizer_2" base="EditStaticBoxSizer">
+                    <orient>wxVERTICAL</orient>
+                    <label>Make growable</label>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>4</border>
+                        <flag>wxALL|wxLEFT|wxRIGHT</flag>
+                        <object class="wxCheckBox" name="cb_row_growable" base="EditCheckBox">
+                            <label>Row</label>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>4</border>
+                        <flag>wxALL|wxLEFT|wxRIGHT</flag>
+                        <object class="wxCheckBox" name="cb_col_growable" base="EditCheckBox">
+                            <label>Column</label>
+                        </object>
+                    </object>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>2</border>
+                <flag>wxALL|wxEXPAND</flag>
+                <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
+                    <orient>wxHORIZONTAL</orient>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>5</border>
+                        <flag>wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL</flag>
+                        <object class="wxCheckBox" name="cb_dont_show_again" base="EditCheckBox">
+                            <label>Don't show this dialog again</label>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>1</option>
+                        <border>0</border>
+                        <flag>wxALIGN_CENTER_VERTICAL</flag>
+                        <object class="spacer" name="spacer" base="EditSpacer">
+                            <width>20</width>
+                            <height>20</height>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>5</border>
+                        <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>
+                        <object class="wxButton" name="button_OK" base="EditButton">
+                            <label>OK</label>
+                            <stockitem>OK</stockitem>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="SelectArtDialog" name="dialog" base="EditDialog">
+        <extracode_post>if compat.version[0]==2:\n    sizer_3.GetItem(self.spin_width).SetMinSize((60,-1))\n    sizer_3.GetItem(self.spin_height).SetMinSize((60,-1))\n</extracode_post>
+        <size>300, 600</size>
+        <title>ART selector</title>
+        <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
+        <affirmative>button_OK</affirmative>
+        <escape>button_CANCEL</escape>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>8</border>
+                <flag>wxALL</flag>
+                <object class="wxStaticText" name="label_1" base="EditStaticText">
+                    <label>Select row and hit OK or Enter:</label>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>4</border>
+                <flag>wxALL|wxEXPAND</flag>
+                <object class="wxListCtrl" name="listctrl" base="EditListCtrl">
+                    <extracode>import compat</extracode>
+                    <extracode_pre>self.art_names = ["NEW", "FILE_OPEN", "FILE_SAVE", "FILE_SAVE_AS", "NEW_DIR", "FOLDER_OPEN",\n"CUT", "COPY", "PASTE", "UNDO", "REDO",\n"PLUS", "MINUS", "CLOSE", "QUIT", "PRINT", "DELETE", "HELP",\n"FIND", "FIND_AND_REPLACE", "ADD_BOOKMARK", "DEL_BOOKMARK",\n"GO_FORWARD", "GO_BACK", "GO_UP", "GO_DOWN", "GO_HOME", "GOTO_FIRST", "GOTO_LAST", "GO_TO_PARENT", "GO_DIR_UP",\n"LIST_VIEW", "REPORT_VIEW",\n"NORMAL_FILE", "EXECUTABLE_FILE", "FOLDER",\n"HELP_BOOK", "HELP_FOLDER", "HELP_PAGE", "HELP_SIDE_PANEL", "HELP_SETTINGS",\n"TICK_MARK", "CROSS_MARK",\n"MISSING_IMAGE",\n"HARDDISK", "FLOPPY", "CDROM",\n"ERROR", "QUESTION", "WARNING", "INFORMATION", "TIP"]\n# not for 2.8: "GOTO_FIRST", "GOTO_LAST", "PLUS", "MINUS"\n\nself.art_list = wx.ImageList(16, 16)\n    </extracode_pre>
+                    <extracode_post>\nfor i, name in enumerate(self.art_names):\n    art_id = getattr(wx, "ART_%s"%name, wx.ART_MISSING_IMAGE)\n    bmp = wx.ArtProvider.GetBitmap(art_id, wx.ART_TOOLBAR, (16,16))\n    self.art_list.Add(bmp)\n\nself.listctrl.SetImageList(self.art_list, wx.IMAGE_LIST_SMALL)\nfor i, name in enumerate(self.art_names):\n    compat.ListCtrl_InsertImageItem(self.listctrl, i,i)  # i is index into ImageList\n    compat.ListCtrl_SetStringItem(self.listctrl, i, 1, name)\n\n\n#index = self.list.InsertItem(self.list.GetItemCount(), data[0], self.idx1)</extracode_post>
+                    <events>
+                        <handler event="EVT_LIST_ITEM_ACTIVATED">lambda evt: self.EndModal(wx.ID_OK)</handler>
+                    </events>
+                    <style>wxLC_REPORT|wxLC_HRULES|wxLC_VRULES</style>
+                    <columns>
+                        <column size="50">Image</column>
+                        <column size="200">Name</column>
+                    </columns>
+                    <rows_number>10</rows_number>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>4</border>
+                <flag>wxALL|wxEXPAND</flag>
+                <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
+                    <orient>wxHORIZONTAL</orient>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>4</border>
+                        <flag>wxLEFT|wxALIGN_CENTER_VERTICAL</flag>
+                        <object class="wxStaticText" name="label_2" base="EditStaticText">
+                            <label>Width</label>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>3</border>
+                        <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>
+                        <object class="wxSpinCtrl" name="spin_width" base="EditSpinCtrl">
+                            <style>wxSP_ARROW_KEYS</style>
+                            <range>1, 100</range>
+                            <value>24</value>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>6</border>
+                        <flag>wxLEFT|wxALIGN_CENTER_VERTICAL</flag>
+                        <object class="wxStaticText" name="label_3" base="EditStaticText">
+                            <label>Height</label>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>3</border>
+                        <flag>wxLEFT|wxALIGN_CENTER_VERTICAL</flag>
+                        <object class="wxSpinCtrl" name="spin_height" base="EditSpinCtrl">
+                            <style>wxSP_ARROW_KEYS</style>
+                            <range>1, 100</range>
+                            <value>24</value>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>6</border>
+                        <flag>wxLEFT|wxALIGN_CENTER_VERTICAL</flag>
+                        <object class="wxStaticText" name="label_4" base="EditStaticText">
+                            <label>pixels</label>
+                        </object>
+                    </object>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="wxStaticLine" name="static_line_1" base="EditStaticLine">
+                    <style>wxLI_HORIZONTAL</style>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>8</border>
+                <flag>wxALL|wxALIGN_RIGHT</flag>
+                <object class="wxStdDialogButtonSizer" name="sizer_2" base="EditStdDialogButtonSizer">
+                    <orient>wxHORIZONTAL</orient>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxButton" name="button_OK" base="EditButton">
+                            <label>OK</label>
+                            <default>1</default>
+                            <stockitem>OK</stockitem>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxButton" name="button_CANCEL" base="EditButton">
+                            <label>Cancel</label>
+                            <stockitem>CANCEL</stockitem>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/res/MenuItemDialog.wxg wxglade-1.0.1/res/MenuItemDialog.wxg
--- wxglade-0.9.6/res/MenuItemDialog.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/res/MenuItemDialog.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade not found on Tue Aug 15 12:23:58 2017 -->
+<!-- generated by wxGlade 1.0.0a8 on Sun Oct  4 20:06:51 2020 -->
 
-<application class="MyApp" encoding="CP1252" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="1" path="D:\Python\Sources35\wxGladeTests\MenuItemDialog.py" source_extension=".cpp" top_window="" use_gettext="0" use_new_namespace="1">
-    <object class="MenuItemDialogD" name="dialog" base="EditDialog">
-        <extracode>if items:\n    self.add_items(items)</extracode>
+<application encoding="CP1252" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" option="0" overwrite="1" path="../widgets/menubar/MenuItemDialog.py" source_extension=".cpp" top_window="dialog" use_gettext="0" use_new_namespace="1">
+    <object class="MenuItemDialog" name="dialog" base="EditDialog">
+        <size>900, 600</size>
         <title>Menu Editor</title>
         <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
-        <centered>0</centered>
-        <sizehints>0</sizehints>
         <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
             <orient>wxVERTICAL</orient>
             <object class="sizeritem">
@@ -31,6 +29,7 @@
                                 <border>4</border>
                                 <flag>wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticText" name="label_6" base="EditStaticText">
+                                    <tooltip>The menu entry text;\nenter &amp; for access keys (using ALT key)\nappend e.g. \\tCtrl-X for keyboard shortcut</tooltip>
                                     <label>Label:</label>
                                 </object>
                             </object>
@@ -40,8 +39,9 @@
                                 <flag>wxEXPAND</flag>
                                 <object class="wxTextCtrl" name="label" base="EditTextCtrl">
                                     <events>
-                                        <handler event="EVT_TEXT">update_item</handler>
+                                        <handler event="EVT_TEXT">on_label_edited</handler>
                                     </events>
+                                    <tooltip>The menu entry text;\nenter &amp; for access keys (using ALT key)\nappend e.g. \\tCtrl-X for keyboard shortcut</tooltip>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -49,6 +49,7 @@
                                 <border>4</border>
                                 <flag>wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticText" name="label_7" base="EditStaticText">
+                                    <tooltip>Enter the name of an event handler method; this will be created as stub.\n\nAlternatively, for Python you may supply a lambda function like e.g.:\nlambda evt: self.on_menu_item('item x')</tooltip>
                                     <label>Event Handler:</label>
                                 </object>
                             </object>
@@ -58,8 +59,9 @@
                                 <flag>wxEXPAND</flag>
                                 <object class="wxTextCtrl" name="event_handler" base="EditTextCtrl">
                                     <events>
-                                        <handler event="EVT_TEXT">update_item</handler>
+                                        <handler event="EVT_TEXT">on_event_handler_edited</handler>
                                     </events>
+                                    <tooltip>Enter the name of an event handler method; this will be created as stub.\n\nAlternatively, for Python you may supply a lambda function like e.g.:\nlambda evt: self.on_menu_item('item x')</tooltip>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -67,6 +69,7 @@
                                 <border>4</border>
                                 <flag>wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticText" name="label_8" base="EditStaticText">
+                                    <tooltip>optional: enter a name to store the menu item as attribute of the menu bar</tooltip>
                                     <label>(Attribute) Name:</label>
                                 </object>
                             </object>
@@ -76,8 +79,9 @@
                                 <flag>wxEXPAND</flag>
                                 <object class="wxTextCtrl" name="name" base="EditTextCtrl">
                                     <events>
-                                        <handler event="EVT_TEXT">update_item</handler>
+                                        <handler event="EVT_TEXT">on_name_edited</handler>
                                     </events>
+                                    <tooltip>optional: enter a name to store the menu item as attribute of the menu bar</tooltip>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -94,7 +98,7 @@
                                 <flag>wxEXPAND</flag>
                                 <object class="wxTextCtrl" name="help_str" base="EditTextCtrl">
                                     <events>
-                                        <handler event="EVT_TEXT">update_item</handler>
+                                        <handler event="EVT_TEXT">on_help_str_edited</handler>
                                     </events>
                                 </object>
                             </object>
@@ -103,6 +107,7 @@
                                 <border>4</border>
                                 <flag>wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticText" name="label_10" base="EditStaticText">
+                                    <tooltip>optional: enter wx ID</tooltip>
                                     <label>ID:</label>
                                 </object>
                             </object>
@@ -111,8 +116,9 @@
                                 <border>0</border>
                                 <object class="wxTextCtrl" name="id" base="EditTextCtrl">
                                     <events>
-                                        <handler event="EVT_TEXT">update_item</handler>
+                                        <handler event="EVT_TEXT">on_id_edited</handler>
                                     </events>
+                                    <tooltip>optional: enter wx ID</tooltip>
                                 </object>
                             </object>
                         </object>
@@ -121,9 +127,9 @@
                         <option>0</option>
                         <border>4</border>
                         <flag>wxALL|wxEXPAND</flag>
-                        <object class="wxRadioBox" name="check_radio" base="EditRadioBox">
+                        <object class="wxRadioBox" name="type" base="EditRadioBox">
                             <events>
-                                <handler event="EVT_RADIOBOX">update_item</handler>
+                                <handler event="EVT_RADIOBOX">on_type_edited</handler>
                             </events>
                             <label>Type</label>
                             <dimension>1</dimension>
@@ -139,7 +145,7 @@
                     <object class="sizeritem">
                         <option>1</option>
                         <border>0</border>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                        <flag>wxEXPAND</flag>
                         <object class="spacer" name="spacer" base="EditSpacer">
                             <width>20</width>
                             <height>20</height>
@@ -156,8 +162,12 @@
                                 <border>5</border>
                                 <flag>wxALL</flag>
                                 <object class="wxButton" name="ok" base="EditButton">
-                                    <label>button_1</label>
-                                    <stockitem>OK</stockitem>
+                                    <events>
+                                        <handler event="EVT_BUTTON">on_OK</handler>
+                                    </events>
+                                    <id>wxID_OK</id>
+                                    <tooltip>Alt+O or Alt+Enter or Ctrl+Enter</tooltip>
+                                    <label>&amp;OK</label>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -165,8 +175,12 @@
                                 <border>5</border>
                                 <flag>wxALL</flag>
                                 <object class="wxButton" name="cancel" base="EditButton">
-                                    <label>button_1</label>
-                                    <stockitem>CANCEL</stockitem>
+                                    <events>
+                                        <handler event="EVT_BUTTON">on_cancel</handler>
+                                    </events>
+                                    <id>wxID_CANCEL</id>
+                                    <tooltip>Alt+C or Alt+F4</tooltip>
+                                    <label>&amp;Cancel</label>
                                 </object>
                             </object>
                         </object>
@@ -187,7 +201,8 @@
                             <events>
                                 <handler event="EVT_BUTTON">move_item_left</handler>
                             </events>
-                            <label>&lt;</label>
+                            <tooltip>Move the selected item up by one menu level (Alt-Left)</tooltip>
+                            <label>&amp;&lt;</label>
                         </object>
                     </object>
                     <object class="sizeritem">
@@ -198,7 +213,8 @@
                             <events>
                                 <handler event="EVT_BUTTON">move_item_right</handler>
                             </events>
-                            <label>&gt;</label>
+                            <tooltip>Move the selected item down by one menu level (Alt-Right)</tooltip>
+                            <label>&amp;&gt;</label>
                         </object>
                     </object>
                     <object class="sizeritem">
@@ -209,7 +225,8 @@
                             <events>
                                 <handler event="EVT_BUTTON">move_item_up</handler>
                             </events>
-                            <label>Up</label>
+                            <tooltip>Move selected item up (Alt-Up)</tooltip>
+                            <label>&amp;Up</label>
                         </object>
                     </object>
                     <object class="sizeritem">
@@ -220,7 +237,8 @@
                             <events>
                                 <handler event="EVT_BUTTON">move_item_down</handler>
                             </events>
-                            <label>Down</label>
+                            <tooltip>Move selected item down (Alt-Down)</tooltip>
+                            <label>&amp;Down</label>
                         </object>
                     </object>
                     <object class="sizeritem">
@@ -240,6 +258,7 @@
                             <events>
                                 <handler event="EVT_BUTTON">add_item</handler>
                             </events>
+                            <tooltip>Alt+A</tooltip>
                             <label>&amp;Add</label>
                         </object>
                     </object>
@@ -251,6 +270,7 @@
                             <events>
                                 <handler event="EVT_BUTTON">remove_item</handler>
                             </events>
+                            <tooltip>Alt+R</tooltip>
                             <label>&amp;Remove</label>
                         </object>
                     </object>
@@ -262,7 +282,8 @@
                             <events>
                                 <handler event="EVT_BUTTON">add_separator</handler>
                             </events>
-                            <label>Add Separator</label>
+                            <tooltip>Alt+S</tooltip>
+                            <label>Add &amp;Separator</label>
                         </object>
                     </object>
                     <object class="sizeritem">
@@ -285,7 +306,17 @@
                         <handler event="EVT_LIST_END_LABEL_EDIT">on_label_edited</handler>
                         <handler event="EVT_LIST_ITEM_SELECTED">show_item</handler>
                     </events>
-                    <style>wxLC_REPORT|wxLC_EDIT_LABELS|wxLC_SINGLE_SEL|wxBORDER_DEFAULT|wxSUNKEN_BORDER|wxBORDER_SUNKEN|wxNO_FULL_REPAINT_ON_RESIZE</style>
+                    <tooltip>For navigation use the mouse or the up/down arrows</tooltip>
+                    <style>wxLC_REPORT|wxLC_EDIT_LABELS|wxLC_SINGLE_SEL|wxBORDER_SUNKEN</style>
+                    <columns>
+                        <column size="30">Level</column>
+                        <column size="180">Label</column>
+                        <column size="180">Event Handler</column>
+                        <column size="120">Name</column>
+                        <column size="35">Type</column>
+                        <column size="250">Help String</column>
+                        <column size="50">ID</column>
+                    </columns>
                 </object>
             </object>
         </object>
diff -Nru wxglade-0.9.6/res/preferences_ui.wxg wxglade-1.0.1/res/preferences_ui.wxg
--- wxglade-0.9.6/res/preferences_ui.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/res/preferences_ui.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.8.1 on Tue May  1 19:11:38 2018 -->
+<!-- generated by wxGlade 0.9.9pre on Wed Jul 29 22:38:02 2020 -->
 
 <application encoding="ISO-8859-15" for_version="2.8" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" option="0" overwrite="1" path="../preferences_ui.py" source_extension=".cpp" top_window="wxGladePreferencesUI" use_gettext="1" use_new_namespace="1">
     <object class="wxGladePreferencesUI" name="wxGladePreferencesUI" base="EditDialog">
@@ -17,6 +17,7 @@
                 <object class="wxNotebook" name="notebook_1" base="EditNotebook">
                     <tabs>
                         <tab window="notebook_1_pane_1">Interface</tab>
+                        <tab window="notebook_1_pane_3">Accessibility</tab>
                         <tab window="notebook_1_pane_2">Other</tab>
                     </tabs>
                     <object class="wxPanel" name="notebook_1_pane_1" base="EditPanel">
@@ -120,6 +121,76 @@
                                         </object>
                                     </object>
                                 </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="wxPanel" name="notebook_1_pane_3" base="EditPanel">
+                        <style>wxTAB_TRAVERSAL</style>
+                        <object class="wxBoxSizer" name="sizer_accessibility" base="EditBoxSizer">
+                            <orient>wxVERTICAL</orient>
+                            <attribute>1</attribute>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>6</border>
+                                <flag>wxLEFT|wxTOP|wxEXPAND</flag>
+                                <object class="wxStaticBoxSizer" name="sizer_8" base="EditStaticBoxSizer">
+                                    <orient>wxHORIZONTAL</orient>
+                                    <label>Palette Panel</label>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>5</border>
+                                        <flag>wxALL|wxEXPAND</flag>
+                                        <object class="wxCheckBox" name="show_palette_icons" base="EditCheckBox">
+                                            <label>Show icons</label>
+                                            <checked>1</checked>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>5</border>
+                                        <flag>wxALL|wxEXPAND</flag>
+                                        <object class="wxCheckBox" name="show_palette_labels" base="EditCheckBox">
+                                            <label>Show labels</label>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>6</border>
+                                <flag>wxLEFT|wxTOP|wxEXPAND</flag>
+                                <object class="wxStaticBoxSizer" name="sizer_10" base="EditStaticBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <label>Property Panel</label>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>5</border>
+                                        <flag>wxALL|wxEXPAND</flag>
+                                        <object class="wxCheckBox" name="show_gridproperty_editors" base="EditCheckBox">
+                                            <tooltip>As grids are not well editable with NVDA, this option will enable separate text controls for e.g. widget Events.</tooltip>
+                                            <label>Show editors for Grid Properties</label>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>5</border>
+                                        <flag>wxALL|wxEXPAND</flag>
+                                        <object class="wxCheckBox" name="use_checkboxes_workaround" base="EditCheckBox">
+                                            <tooltip>Use a workaround to add invisible labels to enable/disable checkboxes such that NVDA will indicate the property name.\nThis is not yet tested on all platforms. It may introduce display problems.</tooltip>
+                                            <label>Use checkbox label workaround</label>
+                                            <checked>1</checked>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>5</border>
+                                        <flag>wxALL|wxEXPAND</flag>
+                                        <object class="wxCheckBox" name="no_checkbox_label_colours" base="EditCheckBox">
+                                            <tooltip>When colours are set, screen readers will not recognize the selection state of checkboxes.</tooltip>
+                                            <label>Don't set checkbox label colours</label>
+                                        </object>
+                                    </object>
+                                </object>
                             </object>
                         </object>
                     </object>
diff -Nru wxglade-0.9.6/res/shell_frame.wxg wxglade-1.0.1/res/shell_frame.wxg
--- wxglade-0.9.6/res/shell_frame.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/res/shell_frame.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.9.9pre on Fri Jun  5 22:04:30 2020 -->
+
+<application encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" option="0" overwrite="0" path="../shell_frame.py" source_extension=".cpp" top_window="shell_frame" use_gettext="0" use_new_namespace="1">
+    <object class="ShellFrame" name="shell_frame" base="EditFrame">
+        <size>800, 668</size>
+        <title>wxGlade Shell </title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <icon>icons/wxglade128.ico</icon>
+        <object class="wxPanel" name="panel" base="EditPanel">
+            <object class="wxBoxSizer" name="sizer" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxFlexGridSizer" name="grid_sizer" base="EditFlexGridSizer">
+                        <rows>1</rows>
+                        <cols>3</cols>
+                        <vgap>0</vgap>
+                        <hgap>0</hgap>
+                        <growable_cols>1</growable_cols>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <flag>wxALIGN_CENTER_VERTICAL</flag>
+                            <object class="wxStaticText" name="label" base="EditStaticText">
+                                <label>Path:</label>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <flag>wxEXPAND</flag>
+                            <object class="wxTextCtrl" name="txt_path" base="EditTextCtrl">
+                                <style>wxTE_READONLY</style>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <object class="wxButton" name="btn_assign" base="EditButton">
+                                <events>
+                                    <handler event="EVT_BUTTON">on_btn_assign</handler>
+                                </events>
+                                <label>Assign to variable</label>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>2</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="wx.py.shell.Shell" name="shell" base="CustomWidget">
+                        <extracode>import wx.py.shell\n</extracode>
+                        <extracode_post># insert some variables into the shell's locals\nimport common, misc\nself.shell.interp.locals["common"] = common\nself.shell.interp.locals["misc"] = misc\n\n</extracode_post>
+                        <arguments>
+                            <argument>$parent</argument>
+                            <argument>$id</argument>
+                            <argument>introText = "\nThis is the shell.\nModules 'common' and 'misc' are imported already.\n\n"</argument>
+                        </arguments>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/res/ToolsDialog.py wxglade-1.0.1/res/ToolsDialog.py
--- wxglade-0.9.6/res/ToolsDialog.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/res/ToolsDialog.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: CP1252 -*-
-#
-# generated by wxGlade not found on Tue Aug 15 12:41:20 2017
-#
-
-import wx
-
-# begin wxGlade: dependencies
-# end wxGlade
-
-# begin wxGlade: extracode
-if items:
-    self.add_items(items)
-# end wxGlade
-
-
-class ToolsDialog(wx.Dialog):
-    def __init__(self, *args, **kwds):
-        # begin wxGlade: ToolsDialog.__init__
-        kwds["style"] = wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
-        wx.Dialog.__init__(self, *args, **kwds)
-        self.label = wx.TextCtrl(self, wx.ID_ANY, "")
-        self.primary_bitmap = wx.TextCtrl(self, wx.ID_ANY, "")
-        self.primary_bitmap_button = wx.Button(self, wx.ID_ANY, "...")
-        self.disabled_bitmap = wx.TextCtrl(self, wx.ID_ANY, "")
-        self.disabled_bitmap_button = wx.Button(self, wx.ID_ANY, "...")
-        self.event_handler = wx.TextCtrl(self, wx.ID_ANY, "")
-        self.name = wx.TextCtrl(self, wx.ID_ANY, "")
-        self.help_str = wx.TextCtrl(self, wx.ID_ANY, "")
-        self.id = wx.TextCtrl(self, wx.ID_ANY, "")
-        self.check_radio = wx.RadioBox(self, wx.ID_ANY, "Type", choices=["Normal", "Checkable", "Radio"], majorDimension=1, style=wx.RA_SPECIFY_COLS)
-        self.ok = wx.Button(self, wx.ID_OK, "")
-        self.cancel = wx.Button(self, wx.ID_CANCEL, "")
-        self.move_up = wx.Button(self, wx.ID_ANY, "Up")
-        self.move_down = wx.Button(self, wx.ID_ANY, "Down")
-        self.add = wx.Button(self, wx.ID_ANY, "&Add")
-        self.remove = wx.Button(self, wx.ID_ANY, "&Remove")
-        self.add_sep = wx.Button(self, wx.ID_ANY, "Add Separator")
-        self.items = wx.ListCtrl(self, wx.ID_ANY, style=wx.BORDER_DEFAULT | wx.BORDER_SUNKEN | wx.LC_EDIT_LABELS | wx.LC_REPORT | wx.LC_SINGLE_SEL)
-
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_TEXT, self.update_item, self.label)
-        self.Bind(wx.EVT_TEXT, self.update_item, self.primary_bitmap)
-        self.Bind(wx.EVT_BUTTON, self.move_item_up, self.primary_bitmap_button)
-        self.Bind(wx.EVT_TEXT, self.update_item, self.disabled_bitmap)
-        self.Bind(wx.EVT_BUTTON, self.move_item_up, self.disabled_bitmap_button)
-        self.Bind(wx.EVT_TEXT, self.update_item, self.event_handler)
-        self.Bind(wx.EVT_TEXT, self.update_item, self.name)
-        self.Bind(wx.EVT_TEXT, self.update_item, self.help_str)
-        self.Bind(wx.EVT_TEXT, self.update_item, self.id)
-        self.Bind(wx.EVT_RADIOBOX, self.update_item, self.check_radio)
-        self.Bind(wx.EVT_BUTTON, self.move_item_up, self.move_up)
-        self.Bind(wx.EVT_BUTTON, self.move_item_down, self.move_down)
-        self.Bind(wx.EVT_BUTTON, self.add_item, self.add)
-        self.Bind(wx.EVT_BUTTON, self.remove_item, self.remove)
-        self.Bind(wx.EVT_BUTTON, self.add_separator, self.add_sep)
-        self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.on_label_edited, self.items)
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.show_item, self.items)
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: ToolsDialog.__set_properties
-        self.SetTitle("Menu Editor")
-        self.check_radio.SetSelection(0)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: ToolsDialog.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.VERTICAL)
-        grid_sizer = wx.FlexGridSizer(7, 2, 0, 0)
-        sizer_primary_bitmap = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_primary_bitmap = wx.BoxSizer(wx.HORIZONTAL)
-        label_6 = wx.StaticText(self, wx.ID_ANY, "Label:")
-        grid_sizer.Add(label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        grid_sizer.Add(self.label, 1, wx.EXPAND, 0)
-        label_11 = wx.StaticText(self, wx.ID_ANY, "Primary Bitmap:")
-        grid_sizer.Add(label_11, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        sizer_primary_bitmap.Add(self.primary_bitmap, 1, 0, 0)
-        sizer_primary_bitmap.Add(self.primary_bitmap_button, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 0)
-        grid_sizer.Add(sizer_primary_bitmap, 1, wx.EXPAND, 0)
-        label_12 = wx.StaticText(self, wx.ID_ANY, "Disabled Bitmap:")
-        grid_sizer.Add(label_12, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        sizer_primary_bitmap.Add(self.disabled_bitmap, 1, 0, 0)
-        sizer_primary_bitmap.Add(self.disabled_bitmap_button, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 0)
-        grid_sizer.Add(sizer_primary_bitmap, 1, wx.EXPAND, 0)
-        label_7 = wx.StaticText(self, wx.ID_ANY, "Event Handler:")
-        grid_sizer.Add(label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        grid_sizer.Add(self.event_handler, 1, wx.EXPAND, 0)
-        label_8 = wx.StaticText(self, wx.ID_ANY, "(Attribute) Name:")
-        grid_sizer.Add(label_8, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        grid_sizer.Add(self.name, 1, wx.EXPAND, 0)
-        label_9 = wx.StaticText(self, wx.ID_ANY, "Help String:")
-        grid_sizer.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        grid_sizer.Add(self.help_str, 1, wx.EXPAND, 0)
-        label_10 = wx.StaticText(self, wx.ID_ANY, "ID:")
-        grid_sizer.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        grid_sizer.Add(self.id, 0, 0, 0)
-        grid_sizer.AddGrowableCol(1)
-        sizer_5.Add(grid_sizer, 2, wx.EXPAND, 0)
-        sizer_5.Add(self.check_radio, 0, wx.ALL, 4)
-        sizer_5.Add((20, 20), 1, wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 0)
-        sizer_6.Add(self.ok, 0, wx.ALL, 5)
-        sizer_6.Add(self.cancel, 0, wx.ALL, 5)
-        sizer_5.Add(sizer_6, 0, wx.EXPAND, 0)
-        sizer_1.Add(sizer_5, 0, wx.EXPAND, 0)
-        sizer_2.Add(self.move_up, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
-        sizer_2.Add(self.move_down, 0, wx.BOTTOM | wx.RIGHT | wx.TOP, 8)
-        sizer_2.Add((20, 20), 1, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_2.Add(self.add, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
-        sizer_2.Add(self.remove, 0, wx.BOTTOM | wx.TOP, 8)
-        sizer_2.Add(self.add_sep, 0, wx.ALL, 8)
-        sizer_2.Add((20, 20), 2, wx.ALIGN_CENTER_VERTICAL, 0)
-        sizer_1.Add(sizer_2, 0, wx.EXPAND, 0)
-        sizer_1.Add(self.items, 1, wx.EXPAND, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.Fit(self)
-        self.Layout()
-        # end wxGlade
-
-    def update_item(self, event):  # wxGlade: ToolsDialog.<event_handler>
-        print("Event handler 'update_item' not implemented!")
-        event.Skip()
-
-    def move_item_up(self, event):  # wxGlade: ToolsDialog.<event_handler>
-        print("Event handler 'move_item_up' not implemented!")
-        event.Skip()
-
-    def move_item_down(self, event):  # wxGlade: ToolsDialog.<event_handler>
-        print("Event handler 'move_item_down' not implemented!")
-        event.Skip()
-
-    def add_item(self, event):  # wxGlade: ToolsDialog.<event_handler>
-        print("Event handler 'add_item' not implemented!")
-        event.Skip()
-
-    def remove_item(self, event):  # wxGlade: ToolsDialog.<event_handler>
-        print("Event handler 'remove_item' not implemented!")
-        event.Skip()
-
-    def add_separator(self, event):  # wxGlade: ToolsDialog.<event_handler>
-        print("Event handler 'add_separator' not implemented!")
-        event.Skip()
-
-    def on_label_edited(self, event):  # wxGlade: ToolsDialog.<event_handler>
-        print("Event handler 'on_label_edited' not implemented!")
-        event.Skip()
-
-    def show_item(self, event):  # wxGlade: ToolsDialog.<event_handler>
-        print("Event handler 'show_item' not implemented!")
-        event.Skip()
-
-# end of class ToolsDialog
-class MyApp(wx.App):
-    def OnInit(self):
-        self.dialog = ToolsDialog(None, wx.ID_ANY, "")
-        self.SetTopWindow(self.dialog)
-        self.dialog.ShowModal()
-        self.dialog.Destroy()
-        return True
-
-# end of class MyApp
-
-if __name__ == "__main__":
-    app = MyApp(0)
-    app.MainLoop()
\ No newline at end of file
diff -Nru wxglade-0.9.6/res/ToolsDialog.wxg wxglade-1.0.1/res/ToolsDialog.wxg
--- wxglade-0.9.6/res/ToolsDialog.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/res/ToolsDialog.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade not found on Mon Aug 28 23:37:48 2017 -->
+<!-- generated by wxGlade 1.0.0a8 on Sun Oct  4 20:06:04 2020 -->
 
-<application class="MyApp" encoding="CP1252" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="app" option="0" overwrite="1" path="ToolsDialog.py" source_extension=".cpp" top_window="dialog" use_gettext="0" use_new_namespace="1">
+<application encoding="CP1252" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="0" option="0" overwrite="1" path="../widgets/toolbar/ToolsDialog.py" source_extension=".cpp" top_window="dialog" use_gettext="0" use_new_namespace="1">
     <object class="ToolsDialog" name="dialog" base="EditDialog">
-        <extracode>if items:\n    self.add_items(items)</extracode>
-        <title>Menu Editor</title>
+        <size>900, 600</size>
+        <title>Toolbar Editor</title>
         <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
         <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
             <orient>wxVERTICAL</orient>
@@ -15,7 +15,7 @@
                 <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer">
                     <orient>wxHORIZONTAL</orient>
                     <object class="sizeritem">
-                        <option>2</option>
+                        <option>3</option>
                         <border>0</border>
                         <flag>wxEXPAND</flag>
                         <object class="wxFlexGridSizer" name="grid_sizer" base="EditFlexGridSizer">
@@ -29,6 +29,7 @@
                                 <border>4</border>
                                 <flag>wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticText" name="label_6" base="EditStaticText">
+                                    <tooltip>The menu entry text;\nenter &amp; for access keys (using ALT key)\nappend e.g. \\\tCtrl-X for keyboard shortcut</tooltip>
                                     <label>Label:</label>
                                     <attribute>1</attribute>
                                 </object>
@@ -39,8 +40,9 @@
                                 <flag>wxEXPAND</flag>
                                 <object class="wxTextCtrl" name="label" base="EditTextCtrl">
                                     <events>
-                                        <handler event="EVT_TEXT">update_item</handler>
+                                        <handler event="EVT_TEXT">on_label_edited</handler>
                                     </events>
+                                    <tooltip>The menu entry text;\nenter &amp; for access keys (using ALT key)\nappend e.g. \\\tCtrl-X for keyboard shortcut</tooltip>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -62,8 +64,22 @@
                                         <border>0</border>
                                         <object class="wxTextCtrl" name="bitmap1" base="EditTextCtrl">
                                             <events>
-                                                <handler event="EVT_TEXT">update_item</handler>
+                                                <handler event="EVT_TEXT">on_bitmap1_edited</handler>
+                                            </events>
+                                            <tooltip>If the bitmap should be loaded from a file, use the "..." button or just\ndrop a file on the text field.\nWhen dropping a file from inside the project directory, a relative path is\nentered unless you hold the ALT or CTRL key.</tooltip>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxLEFT|wxTOP|wxBOTTOM</flag>
+                                        <object class="wxButton" name="bitmap1_button_ART" base="EditButton">
+                                            <events>
+                                                <handler event="EVT_BUTTON">select_bitmap1_art</handler>
                                             </events>
+                                            <size>20, -1</size>
+                                            <tooltip>Select standard art</tooltip>
+                                            <label>A</label>
                                         </object>
                                     </object>
                                     <object class="sizeritem">
@@ -72,7 +88,7 @@
                                         <flag>wxLEFT|wxTOP|wxBOTTOM</flag>
                                         <object class="wxButton" name="bitmap1_button" base="EditButton">
                                             <events>
-                                                <handler event="EVT_BUTTON">move_item_up</handler>
+                                                <handler event="EVT_BUTTON">select_bitmap1</handler>
                                             </events>
                                             <label>...</label>
                                         </object>
@@ -98,8 +114,9 @@
                                         <border>0</border>
                                         <object class="wxTextCtrl" name="bitmap2" base="EditTextCtrl">
                                             <events>
-                                                <handler event="EVT_TEXT">update_item</handler>
+                                                <handler event="EVT_TEXT">on_bitmap2_edited</handler>
                                             </events>
+                                            <tooltip>If the bitmap should be loaded from a file, use the "..." button or just\ndrop a file on the text field.\nWhen dropping a file from inside the project directory, a relative path is\nentered unless you hold the ALT or CTRL key.</tooltip>
                                         </object>
                                     </object>
                                     <object class="sizeritem">
@@ -108,7 +125,7 @@
                                         <flag>wxLEFT|wxTOP|wxBOTTOM</flag>
                                         <object class="wxButton" name="bitmap2_button" base="EditButton">
                                             <events>
-                                                <handler event="EVT_BUTTON">move_item_up</handler>
+                                                <handler event="EVT_BUTTON">select_bitmap2</handler>
                                             </events>
                                             <label>...</label>
                                         </object>
@@ -120,6 +137,7 @@
                                 <border>4</border>
                                 <flag>wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticText" name="label_7" base="EditStaticText">
+                                    <tooltip>Enter the name of an event handler method; this will be created as stub</tooltip>
                                     <label>Event Handler:</label>
                                     <attribute>1</attribute>
                                 </object>
@@ -128,10 +146,11 @@
                                 <option>1</option>
                                 <border>0</border>
                                 <flag>wxEXPAND</flag>
-                                <object class="wxTextCtrl" name="event_handler" base="EditTextCtrl">
+                                <object class="wxTextCtrl" name="handler" base="EditTextCtrl">
                                     <events>
-                                        <handler event="EVT_TEXT">update_item</handler>
+                                        <handler event="EVT_TEXT">on_event_handler_edited</handler>
                                     </events>
+                                    <tooltip>Enter the name of an event handler method; this will be created as stub</tooltip>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -139,6 +158,7 @@
                                 <border>4</border>
                                 <flag>wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticText" name="label_9" base="EditStaticText">
+                                    <tooltip>This will be displayed as tooltip</tooltip>
                                     <label>Short Help:</label>
                                     <attribute>1</attribute>
                                 </object>
@@ -147,10 +167,11 @@
                                 <option>1</option>
                                 <border>0</border>
                                 <flag>wxEXPAND</flag>
-                                <object class="wxTextCtrl" name="help" base="EditTextCtrl">
+                                <object class="wxTextCtrl" name="short_help" base="EditTextCtrl">
                                     <events>
-                                        <handler event="EVT_TEXT">update_item</handler>
+                                        <handler event="EVT_TEXT">on_help_str_edited</handler>
                                     </events>
+                                    <tooltip>This will be displayed as tooltip</tooltip>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -158,6 +179,7 @@
                                 <border>4</border>
                                 <flag>wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticText" name="label_13" base="EditStaticText">
+                                    <tooltip>This will be displayed in the status bar</tooltip>
                                     <label>Long Help:</label>
                                 </object>
                             </object>
@@ -167,8 +189,9 @@
                                 <flag>wxEXPAND</flag>
                                 <object class="wxTextCtrl" name="long_help" base="EditTextCtrl">
                                     <events>
-                                        <handler event="EVT_TEXT">update_item</handler>
+                                        <handler event="EVT_TEXT">on_long_help_str_edited</handler>
                                     </events>
+                                    <tooltip>This will be displayed in the status bar</tooltip>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -176,6 +199,7 @@
                                 <border>4</border>
                                 <flag>wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxStaticText" name="label_10" base="EditStaticText">
+                                    <tooltip>optional: enter wx ID</tooltip>
                                     <label>ID:</label>
                                     <attribute>1</attribute>
                                 </object>
@@ -185,8 +209,9 @@
                                 <border>0</border>
                                 <object class="wxTextCtrl" name="id" base="EditTextCtrl">
                                     <events>
-                                        <handler event="EVT_TEXT">update_item</handler>
+                                        <handler event="EVT_TEXT">on_id_edited</handler>
                                     </events>
+                                    <tooltip>optional: enter wx ID</tooltip>
                                 </object>
                             </object>
                         </object>
@@ -195,9 +220,9 @@
                         <option>0</option>
                         <border>4</border>
                         <flag>wxALL</flag>
-                        <object class="wxRadioBox" name="check_radio" base="EditRadioBox">
+                        <object class="wxRadioBox" name="type" base="EditRadioBox">
                             <events>
-                                <handler event="EVT_RADIOBOX">update_item</handler>
+                                <handler event="EVT_RADIOBOX">on_type_edited</handler>
                             </events>
                             <label>Type</label>
                             <dimension>1</dimension>
@@ -213,7 +238,7 @@
                     <object class="sizeritem">
                         <option>1</option>
                         <border>0</border>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                        <flag>wxEXPAND</flag>
                         <object class="spacer" name="spacer" base="EditSpacer">
                             <width>20</width>
                             <height>20</height>
@@ -230,8 +255,12 @@
                                 <border>5</border>
                                 <flag>wxALL</flag>
                                 <object class="wxButton" name="ok" base="EditButton">
-                                    <label>button_1</label>
-                                    <stockitem>OK</stockitem>
+                                    <events>
+                                        <handler event="EVT_BUTTON">on_OK</handler>
+                                    </events>
+                                    <id>wxID_OK</id>
+                                    <tooltip>Alt+O or Alt+Enter or Ctrl+Enter</tooltip>
+                                    <label>&amp;OK</label>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -239,8 +268,12 @@
                                 <border>5</border>
                                 <flag>wxALL</flag>
                                 <object class="wxButton" name="cancel" base="EditButton">
-                                    <label>button_1</label>
-                                    <stockitem>CANCEL</stockitem>
+                                    <events>
+                                        <handler event="EVT_BUTTON">on_cancel</handler>
+                                    </events>
+                                    <id>wxID_CANCEL</id>
+                                    <tooltip>Alt+C or Alt+F4</tooltip>
+                                    <label>&amp;Cancel</label>
                                 </object>
                             </object>
                         </object>
@@ -261,6 +294,7 @@
                             <events>
                                 <handler event="EVT_BUTTON">move_item_up</handler>
                             </events>
+                            <tooltip>Move selected item up (Alt-Up)</tooltip>
                             <label>Up</label>
                         </object>
                     </object>
@@ -272,6 +306,7 @@
                             <events>
                                 <handler event="EVT_BUTTON">move_item_down</handler>
                             </events>
+                            <tooltip>Move selected item down (Alt-Down)</tooltip>
                             <label>Down</label>
                         </object>
                     </object>
@@ -292,6 +327,7 @@
                             <events>
                                 <handler event="EVT_BUTTON">add_item</handler>
                             </events>
+                            <tooltip>Alt+A</tooltip>
                             <label>&amp;Add</label>
                         </object>
                     </object>
@@ -303,6 +339,7 @@
                             <events>
                                 <handler event="EVT_BUTTON">remove_item</handler>
                             </events>
+                            <tooltip>Alt+R</tooltip>
                             <label>&amp;Remove</label>
                         </object>
                     </object>
@@ -314,7 +351,8 @@
                             <events>
                                 <handler event="EVT_BUTTON">add_separator</handler>
                             </events>
-                            <label>Add Separator</label>
+                            <tooltip>Alt+S</tooltip>
+                            <label>Add &amp;Separator</label>
                         </object>
                     </object>
                     <object class="sizeritem">
@@ -337,7 +375,18 @@
                         <handler event="EVT_LIST_END_LABEL_EDIT">on_label_edited</handler>
                         <handler event="EVT_LIST_ITEM_SELECTED">show_item</handler>
                     </events>
-                    <style>wxLC_REPORT|wxLC_EDIT_LABELS|wxLC_SINGLE_SEL|wxBORDER_DEFAULT|wxBORDER_SUNKEN</style>
+                    <tooltip>For navigation use the mouse or the up/down arrows</tooltip>
+                    <style>wxLC_REPORT|wxLC_EDIT_LABELS|wxLC_SINGLE_SEL|wxBORDER_SUNKEN</style>
+                    <columns>
+                        <column size="180">Label</column>
+                        <column size="180">Primary Bitmap</column>
+                        <column size="120">Disabled Bitmap</column>
+                        <column size="120">Short Help</column>
+                        <column size="180">Long Help</column>
+                        <column size="50">Type</column>
+                        <column size="120">Event Handler</column>
+                        <column size="50">Id</column>
+                    </columns>
                 </object>
             </object>
         </object>
diff -Nru wxglade-0.9.6/setup.py wxglade-1.0.1/setup.py
--- wxglade-0.9.6/setup.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/setup.py	2020-12-31 14:04:48.000000000 +0000
@@ -84,7 +84,7 @@
 the moment it can generate Python, C++, Perl, Lisp and XRC (wxWidgets'
 XML resources) code."""
 
-text_files = ['CHANGES.txt', 'CONTRIBUTING.txt', 'CREDITS.txt',
+text_files = ['CONTRIBUTING.txt', 'CREDITS.txt',
               'LICENSE.txt', 'NEWS.txt', 'README.txt', 'docs/Todo.txt',]
 
 data_files = [
diff -Nru wxglade-0.9.6/shell_frame.py wxglade-1.0.1/shell_frame.py
--- wxglade-0.9.6/shell_frame.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/shell_frame.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,63 @@
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 0.9.9pre on Wed Apr  1 22:51:19 2020
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import wx.py.shell
+# end wxGlade
+
+
+class ShellFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: ShellFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((800, 668))
+        self.SetTitle("wxGlade Shell ")
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.Bitmap("icons/wxglade128.ico", wx.BITMAP_TYPE_ANY))
+        self.SetIcon(_icon)
+        
+        self.panel = wx.Panel(self, wx.ID_ANY)
+        
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        
+        grid_sizer = wx.FlexGridSizer(1, 3, 0, 0)
+        sizer.Add(grid_sizer, 0, wx.EXPAND, 0)
+        
+        label = wx.StaticText(self.panel, wx.ID_ANY, "Path:")
+        grid_sizer.Add(label, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        
+        self.txt_path = wx.TextCtrl(self.panel, wx.ID_ANY, "", style=wx.TE_READONLY)
+        grid_sizer.Add(self.txt_path, 0, wx.EXPAND, 0)
+        
+        self.btn_assign = wx.Button(self.panel, wx.ID_ANY, "Assign to variable")
+        grid_sizer.Add(self.btn_assign, 0, 0, 0)
+        
+        self.shell = wx.py.shell.Shell(self.panel, wx.ID_ANY, introText = "\nThis is the shell.\nModules 'common' and 'misc' are imported already.\n\n")
+        # insert some variables into the shell's locals
+        import common, misc
+        self.shell.interp.locals["common"] = common
+        self.shell.interp.locals["misc"] = misc
+        
+        sizer.Add(self.shell, 2, wx.EXPAND, 0)
+        
+        grid_sizer.AddGrowableCol(1)
+        
+        self.panel.SetSizer(sizer)
+        
+        self.Layout()
+
+        self.Bind(wx.EVT_BUTTON, self.on_btn_assign, self.btn_assign)
+        # end wxGlade
+
+    def on_btn_assign(self, event):  # wxGlade: ShellFrame.<event_handler>
+        print("Event handler 'on_btn_assign' not implemented!")
+        event.Skip()
+# end of class ShellFrame
diff -Nru wxglade-0.9.6/sphinx/acknowledgements.rst wxglade-1.0.1/sphinx/acknowledgements.rst
--- wxglade-0.9.6/sphinx/acknowledgements.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/acknowledgements.rst	2020-12-31 14:04:48.000000000 +0000
@@ -19,7 +19,7 @@
 
  * Copyright (c) 2002-2007 Alberto Griggio
  * Copyright (c) 2011-2016 Carsten Grohmann
- * Copyright (c) 2016-2019 Dietmar Schwertberger
+ * Copyright (c) 2016-2020 Dietmar Schwertberger
 
 
 **Use and distribution of wxGlade is governed by the MIT license:**
diff -Nru wxglade-0.9.6/sphinx/conf.py wxglade-1.0.1/sphinx/conf.py
--- wxglade-0.9.6/sphinx/conf.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/conf.py	2020-12-31 14:04:48.000000000 +0000
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.9'
+version = '1.0.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.6'
+release = '1.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Nru wxglade-0.9.6/sphinx/custom_widgets.rst wxglade-1.0.1/sphinx/custom_widgets.rst
--- wxglade-0.9.6/sphinx/custom_widgets.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/custom_widgets.rst	2020-12-31 14:04:48.000000000 +0000
@@ -9,6 +9,7 @@
 .. |custom| image:: images/custom.png
 
 
+
 Sometimes you may want to use a widget that is not supported by wxGlade.
 
 For this, just insert a CustomWidget |custom| as placeholder.
@@ -20,6 +21,7 @@
 .. |CustomWidgetPropertiesCommon| image:: images/CustomWidgetPropertiesCommon.png
    :width: 300
    :align: middle
+   :alt: Instance class: wx.html.HtmlWindow
 
 .. |CustomWidgetProperties| image:: images/CustomWidgetProperties.png
    :width: 300
@@ -28,6 +30,7 @@
 .. |CustomWidgetPropertiesCode| image:: images/CustomWidgetPropertiesCode.png
    :width: 300
    :align: middle
+   :alt: import wx.html
 
 
 
@@ -37,7 +40,7 @@
    :align: center
 
    * - **Properties -> Common:** |br| |br|
-       Property "Class" is the name of the class that will be instantiated. |br|
+       Property "Instance Class" is the name of the class that will be instantiated. |br|
        In this example: :guilabel:`wx.html.HtmlWindow`
      - |CustomWidgetPropertiesCommon| 
    * - **Properties -> Widget:** |br| |br|
@@ -64,8 +67,8 @@
 The Arguments :guilabel:`$parent` and :guilabel:`$id` were replaced with the required code. There are two more magic arguments: :guilabel:`$width` and :guilabel:`$height`.
 
 The files can be found in the folder ``wxglade/examples/html``:
- * `matplotlib_example.wxg <../../examples/html/html_example.wxg>`_
- * `matplotlib_example.py <../../examples/html/html_example.py>`_
+ * `html_example.wxg <../../examples/html/html_example.wxg>`_
+ * `html_example.py <../../examples/html/html_example.py>`_
 
 Custom constructor
 ==================
@@ -115,7 +118,7 @@
 .. |matplotlib_class| image:: images/matplotlib_class.png
    :width: 460
    :align: middle
-   :alt: Class name
+   :alt: Instance class: FigureCanvas
 
 .. |matplotlib_arguments| image:: images/matplotlib_arguments.png
    :width: 460
diff -Nru wxglade-0.9.6/sphinx/dialogs.rst wxglade-1.0.1/sphinx/dialogs.rst
--- wxglade-0.9.6/sphinx/dialogs.rst	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/sphinx/dialogs.rst	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,78 @@
+.. |br| raw:: html
+
+   <br/>
+
+################
+Dialogs
+################
+
+.. |dialog| image:: images/dialog.png
+
+Most applications consist of a 'permanent' main window - typically a frame - and 'temporary' dialogs.
+
+
+See ``wxglade/examples/dialog`` for an example application how to create and use dialogs.
+The example opens the dialog on pressing a button or selecting a menu entry.
+
+
+.. |DialogExample| image:: images/DialogExample.png
+   :width: 300
+   :align: middle
+
++--------------------------------------------------------------------------------------------------------------------+
+|.. image:: images/DialogExample.png                                                                                 |
+|    :width: 200                                                                                                     |
+|    :alt: screenshot from running examples/dialog/dialog.py with the dialog open                                    |
++--------------------------------------------------------------------------------------------------------------------+
+
+
+When you add a new dialog |dialog|, you will be offered to add some default buttons like :guilabel:`OK` and :guilabel:`Cancel`:
+
++--------------------------------------------------------------------------------------------------------------------+
+|.. image:: images/NewDialog.png                                                                                     |
+|    :height: 200                                                                                                    |
+|    :alt: screenshot for new dialog                                                                                 |
++--------------------------------------------------------------------------------------------------------------------+
+
+
+These will be placed in a :guilabel:`StdDialogButtonSizer` which will arrange the buttons such that the ordering matches
+the OS style guide.
+
+Also, the buttons will use :guilabel:`StockItems` and e.g. :code:`button.SetDefault`,
+:code:`dialog.SetAffirmativeId` and :code:`dialog.SetEscapeId` will be called.
+
+These are the generated lines of code that are specific for stock item buttons and using them in a dialog: ::
+
+   sizer_2 = wx.StdDialogButtonSizer()
+   ...
+   self.button_OK = wx.Button(self, wx.ID_OK, "")
+   self.button_OK.SetDefault()
+   sizer_2.AddButton(self.button_OK)
+
+   self.button_CANCEL = wx.Button(self, wx.ID_CANCEL, "")
+   sizer_2.AddButton(self.button_CANCEL)
+
+   sizer_2.Realize()
+   ...
+   self.SetAffirmativeId(self.button_OK.GetId())   # select this button when Enter is hit
+   self.SetEscapeId(self.button_CANCEL.GetId())    # select this button when Escape is hit
+
+
+The dialog is created and used like this: ::
+
+   with MyDialog(self) as dlg:
+       # fill dialog widgets with values here
+       # show as modal dialog
+       if dlg.ShowModal() == wx.ID_OK:
+           print("User has hit OK")
+
+Please note that the dialog in the example file does not have the size property defined.
+Therefore the dialog will be created with the minimum size that fits the content.
+
+
+The files can be found in the folder ``wxglade/examples/dialog``:
+ * `dialog.wxg <../../examples/dialog/dialog.wxg>`_
+ * `dialog.py <../../examples/dialog/dialog.py>`_
+
+
+
diff -Nru wxglade-0.9.6/sphinx/further_reading.rst wxglade-1.0.1/sphinx/further_reading.rst
--- wxglade-0.9.6/sphinx/further_reading.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/further_reading.rst	2020-12-31 14:04:48.000000000 +0000
@@ -10,16 +10,22 @@
 ################
 
 
- * Download wxPython Phoenix including the **html documentation**, demo and source archive from https://pypi.python.org/pypi/wxPython .
- * Unpack the demo directory from the source archive and run demo.py .
+ * Run the **wxPython demo** to explore the widgets and see example code for each. See note below where to find it.
+ * Have a look at the **wxPython API documentation** at https://docs.wxpython.org/
+ * Have a look at the **Overview Documents** at https://docs.wxpython.org/Overviews.html .
  * Get the **book** `wxPython in Action <https://www.amazon.com/gp/product/1932394621?ie=UTF8&tag=wxpython-20&linkCode=as2&camp=1789&creative=9325&creativeASIN=1932394621>`_ 
    by Noel Rappin and Robin Dunn. It's written for the Classic wxPython version, but most of it is still applicable.
- * Bookmark the **wxPython Phoenix API documentation** at https://wxpython.org/Phoenix/docs/html/main.html .
- * Have a look at the **Overview Documents** at https://wxpython.org/Phoenix/docs/html/Overviews.html .
  * If you have been using wxPython before already, bookmark the comparison of **wxPython Phoenix vs. the older Classic** version at https://wxpython.org/Phoenix/docs/html/classic_vs_phoenix.html .
+ * For **wxPython** specific questions you can find help at the **discussion site** https://discuss.wxpython.org/
+ * For **wxGlade** specific questions please ask on the **mailing list** or report a bug on the **issue tracker**.
+   Both are linked from the help menu.
 
 
-.. note:: The demo is the most important resource for exploring the available controls!
+.. note:: **The wxPython demo is the most important resource for exploring the available controls!**
+          |br|
+          If you don't have the demo, have a look here: https://extras.wxpython.org/wxPython4/extras/
+          |br|
+          Go to the subdirectory matching your wxPython version and download the demo archive. |br|
+          Then run demo.py
 
-Maybe also have a look at the samples directory.
 
diff -Nru wxglade-0.9.6/sphinx/index.rst wxglade-1.0.1/sphinx/index.rst
--- wxglade-0.9.6/sphinx/index.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/index.rst	2020-12-31 14:04:48.000000000 +0000
@@ -25,9 +25,10 @@
    wxbasics
    tutorial
    source_code
+   dialogs
+   custom_widgets
    menu_status_tool
    bitmaps
-   custom_widgets
-   reference
    further_reading
+   reference
    acknowledgements
diff -Nru wxglade-0.9.6/sphinx/intro.rst wxglade-1.0.1/sphinx/intro.rst
--- wxglade-0.9.6/sphinx/intro.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/intro.rst	2020-12-31 14:04:48.000000000 +0000
@@ -3,31 +3,79 @@
    <br/>
 
 
-################
-wxGlade Overview
-################
+################################
+wxGlade Overview and Quick Start
+################################
 
-***************
-Running wxGlade
-***************
+******************
+Installing wxGlade
+******************
 
-**Start:**
-To run wxGlade, start the wxglade.py or wxglade.pyw program file with the Python interpreter.
+For some Linux flavors there are system packages for wxGlade.
+
+Other than that, there is no real installation.
+Just download the latest released version as zip archive from https://sourceforge.net/projects/wxglade/files/wxglade/
+or from the git release page at https://github.com/wxGlade/wxGlade/releases
+
+Unpack the archive to a known location and maybe add it to the path.
+
+
+If you are familiar with git, you may instead just clone the repository from https://github.com/wxGlade/wxGlade.git
+
+The master branch should be stable enough for your work and I appreciate bug reports.
 
-**Other Prerequisites:**
-On Windows, the win32 extensions should be installed: https://sourceforge.net/projects/pywin32/
-If they are available, wxGlade will register for .wxg files such that you can open them via double-click.
 
 **Supported Python and wxPython Versions:**
  * The *Classic* wxPython versions 2.8 and 3.0 are supported as well as wxPython 4 *Phoenix* running under Python 3
  * Phoenix plus Python 2 will probably also work, but this is not tested at all. wxPython 2.8 is generally less tested than the more recent versions.
  * When running Python 3 + Phoenix or Python 2 + Classic, the generated Python code will not be compatible to the other version.
 
+
+**Other Prerequisites:**
+On Windows, the win32 extensions should be installed: https://pypi.org/project/pywin32/
+If they are available, wxGlade will register for .wxg files such that you can open them via double-click.
+
+
+***************
+Running wxGlade
+***************
+
+To start the program, change directory to the installation directory and enter :code:`python3 wxglade.py`
+or :code:`python wxglade.py` in your shell or use whatever is required to start a python application on your platform.
+
+You may want to add a desktop shortcut to run the ``wxGlade.py`` file (or the ``wxGlade.pyw`` file).
+
 .. note::
-    For the best user experience, run wxGlade with your target wxPython revision (i.e. 2.8 or 3.0).
+    For the best user experience, run wxGlade with your target wxPython revision (e.g. 2.8, 3.0, 4.0, 4.1).
+    
     If you use a different revision, the *Design* and *Preview* window might not look identical to your final
     program, as some styles are not supported under all revisions.
 
+.. note::
+    If you want to build a GUI for wxPython *Classic* (<=3.0) or *Phoenix* (>=4.0):
+    Start wxGlade in your target version - if it runs under *Phoenix*, it will create *Phoenix* code.
+    
+    The ``.wxg`` file format is not affected by this.
+    So you may use a single ``.wxg`` file to generate code for both *Classic* and *Phoenix*.
+    The generated code should always run under both Python 2.7 and Python 3.
+
+
+*************
+Accessibility
+*************
+
+wxGlade attempts to be accessible not only via mouse and screen but also via keyboard and screen readers.
+
+Keep in mind for your own applications that accessibility and usability go hand in hand.
+Keep your user intefaces simple and straightforward.
+
+
+If you are using a screen reader like NVDA or JAWS:
+
+Go to "Edit -> Preferences... -> Accessibility" to enable better compatibility.
+
+If you observe problems, please provide feedback via the mailing list or the Github issue tracker.
+
 
 ***************
 Program Windows
@@ -44,18 +92,22 @@
 .. |wPalette| image:: images/wPalette.png
    :width: 200
    :align: middle
+   :alt: Press F4 to focus the Palette panel
 
 .. |wTree| image:: images/wTree.png
    :width: 200
    :align: middle
+   :alt: Press F2 to focus the Tree view control
 
 .. |wProperties| image:: images/wProperties.png
    :width: 200
    :align: middle
+   :alt: Press F3 to focus the Properties notebook; see reference section for more shortcuts
 
 .. |wDesign| image:: images/wDesign.png
    :width: 200
    :align: middle
+   :alt: Press F6 to show the Design window
 
 
 .. list-table::
@@ -71,18 +123,26 @@
        This tree visualizes and allows editing the structure of the project with it's
        application, windows, sizers and controls. |br|
        On selection of an item, it's properties will be shown in the *Properties* notebook.
+       |br| |br|
+       Press :kbd:`F2` to focus the **Tree** view control.
    * - |wProperties|
      - Main window **Properties** notebook: |br| |br|
        This lets you display and edit the properties of applications, windows and controls. |br|
        To edit an item, select it in the *Tree* or *Design* window.
+       |br| |br|
+       Press :kbd:`F3` to focus the **Properties** notebook; see reference section for more shortcuts.
    * - |wDesign|
      - **Design** window: |br| |br|
        This one visualizes the design of the window. It is not 100% identical to the final window. |br|
        To open this window, double-click a window's icon in the *Tree* window.
+       |br| |br|
+       Press :kbd:`F6` to show the **Design** window.
    * -
      - **Preview** window |br| |br|
        A preview of the current window. |br|
        It should look 100% identical to the window when it is used in the application.
+       |br| |br|
+       Press :kbd:`F5` for the **Preview** window.
 
 
 .. seealso:: :doc:`reference` **for keyboard shortcuts and mouse actions.**
@@ -112,6 +172,7 @@
 
 There are additional examples in ``wxglade/examples`` showing how to use the CustomWidget to integrate some widgets that are not directly supported by wxGlade. The wxGlade design window will only display a placeholder for these.
 
+ * ``dialog``: create a dialog; show it on a button press or menu item selection; retrieve the result
  * ``html``: use :code:`wx.html.HtmlWindow` to display simple HTML pages
  * ``html2``: use :code:`wx.html2.WebView` to display HTML with Javascript and CSS (not available on wxPython 2.8)
  * ``lib_plot``: use :code:`wx.lib.plot.PlotCanvas` for plotting
diff -Nru wxglade-0.9.6/sphinx/menu_status_tool.rst wxglade-1.0.1/sphinx/menu_status_tool.rst
--- wxglade-0.9.6/sphinx/menu_status_tool.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/menu_status_tool.rst	2020-12-31 14:04:48.000000000 +0000
@@ -160,11 +160,30 @@
  * `Calculator_Main.py <../../examples/Calculator/Calculator_Main.py>`_.
 
 
+Lambda Event Handlers
+=====================
+
+When creating Python code, you may also specify a lambda function as event handler.
+
+E.g. you may want to have three menu items named :code:`Insert A`, :code:`Insert B` and :code:`Insert C`.
+Instead of three separate handlers, you may enter three lambda functions that will call the same method or function
+with different arguments each:
+
+
++-----------------------------------------------------------------------+
+|.. image:: images/MenuLambdaEventHandlers.png                          |
+|    :alt: lambda evt: self.on_menu_insert_abc("A")                     |
++-----------------------------------------------------------------------+
+
+
+Of course you need to implement a method :code:`on_menu_insert_abc`.
+
+
 *********************************************************************
 Status Bar Editor
 *********************************************************************
 
-To attach a status bar to a frame, go to *Properties -> Widget* and check :guilabel:`Has StatusBar`.
+To attach a status bar to a frame, go to *Properties -> Widget* and check cHas StatusBar`.
 This will add a statusbar icon to the *Tree* window, just below the frame's icon.
 (Similar to :guilabel:`Has MenuBar` in the first screenshot on this page.)
 
diff -Nru wxglade-0.9.6/sphinx/reference.rst wxglade-1.0.1/sphinx/reference.rst
--- wxglade-0.9.6/sphinx/reference.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/reference.rst	2020-12-31 14:04:48.000000000 +0000
@@ -9,16 +9,56 @@
 Reference: Keyboard and Mouse Actions
 #####################################
 
+On *Classic* versions of wxPython, the keyboard shortcuts will not work in the *Preview* window.
 
-**Tree control in the main window:**
 
+**Main Window / All**
 
 +-----------------------------------------------+------------------------------------------------------+
 + Key/Mouse                                     | Action                                               |
 +===============================================+======================================================+
+| :kbd:`F2`                                     | Go to *Tree* control in main window                  |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`F3`                                     | Go to *Properties* control in main window            |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`F8` or :kbd:`Ctrl-M`                    | Go to *Properties -> Common*                         |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`F9` or :kbd:`Ctrl-L`                    | Go to *Properties -> Layout*                         |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`F10` or :kbd:`Ctrl-W`                   | Go to *Properties -> Widget*                         |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`F11` or :kbd:`Ctrl-E`                   | Go to *Properties -> Events*                         |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`F12` or :kbd:`Ctrl-D`                   | Go to *Properties -> CoDe*                           |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`F4`                                     | Go to *Palette* control in main window               |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`F5`                                     | Show/Refresh *Preview* Window                        |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`F6`                                     | Show/Hide *Design* Window                            |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`Ctrl+S`                                 | Save file                                            |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`Ctrl+G`                                 | Generate Code                                        |
++-----------------------------------------------+------------------------------------------------------+
+
+
+**Tree control in the main window:**
+
++-----------------------------------------------+------------------------------------------------------+
++ Key/Mouse                                     | Action                                               |
++===============================================+======================================================+
+| :kbd:`F2`                                     | Edit control name (and label for some controls)      |
++-----------------------------------------------+------------------------------------------------------+
 | Double Click on toplevel control like Frame   | Show Design Window Expand child items                |
 +-----------------------------------------------+------------------------------------------------------+
-| Cursor Up/Down                                | Navigate through tree                                |
+| :kbd:`Enter` on toplevel window               | Show design window                                   |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`Arrow up/down`                          | Navigate through tree                                |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`Arrow right/left`                       | Expand / collapse                                    |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`Enter` on empty slot                    | Add item to slot                                     |
 +-----------------------------------------------+------------------------------------------------------+
 | Right Click on Application right after loading| Expand all items                                     |
 +-----------------------------------------------+------------------------------------------------------+
@@ -30,8 +70,6 @@
 +-----------------------------------------------+------------------------------------------------------+
 | Ctrl Drag & Drop                              | Copy item(s) to another slot                         |
 +-----------------------------------------------+------------------------------------------------------+
-| :kbd:`F2`                                     | Edit control name (and label for some controls)      |
-+-----------------------------------------------+------------------------------------------------------+
 
 
 **Tree view and Design window**
@@ -63,46 +101,48 @@
 +===============================================+======================================================+
 | :kbd:`Alt-A`                                  | Apply changes                                        |
 +-----------------------------------------------+------------------------------------------------------+
-| :kbd:`Ctrl-I`                                 | Insert entry                                         |
+| :kbd:`Ctrl-I` or :kbd:`Alt-I`                 | Insert entry                                         |
 +-----------------------------------------------+------------------------------------------------------+
-| :kbd:`Ctrl-A`                                 | Add entry                                            |
+| :kbd:`Ctrl-A` or :kbd:`Alt-D`                 | Add entry                                            |
 +-----------------------------------------------+------------------------------------------------------+
-| :kbd:`Ctrl-R`                                 | Remove entry                                         |
+| :kbd:`Ctrl-R` or :kbd:`Alt-R`                 | Remove entry                                         |
 +-----------------------------------------------+------------------------------------------------------+
-| :kbd:`Alt-A`                                  | Reset / discard changes                              |
+| :kbd:`Ctrl-T` or :kbd:`Alt-T`                 | Reset / discard changes                              |
 +-----------------------------------------------+------------------------------------------------------+
 
 
-**Menu Editor**
+**Palette in the main window:**
 
 +-----------------------------------------------+------------------------------------------------------+
 + Key/Mouse                                     | Action                                               |
 +===============================================+======================================================+
-| Arrow up/down                                 | go to previous/next menu item                        |
+| :kbd:`Arrow up/down`                          | Navigate between rows                                |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`Arrow right/left`,                      | Navigate within row                                  |
+| :kbd:`Tab`, :kbd:`Pos1`, :kbd:`End`           |                                                      |
++-----------------------------------------------+------------------------------------------------------+
+| :kbd:`W`, :kbd:`C`, :kbd:`B`, :kbd:`I`,       | Navigate to row                                      |
+| :kbd:`N`, :kbd:`D`, :kbd:`T`, :kbd:`M`,       |                                                      |
+| :kbd:`R`, :kbd:`S`                            |                                                      |
 +-----------------------------------------------+------------------------------------------------------+
 
 
-**Main Window / All**
+
+**Menu and Toolbar Editors**
 
 +-----------------------------------------------+------------------------------------------------------+
 + Key/Mouse                                     | Action                                               |
 +===============================================+======================================================+
-| :kbd:`F2`                                     | Show *Tree* Window                                   |
+| :kbd:`Arrow up/down`                          | go to previous/next menu item                        |
 +-----------------------------------------------+------------------------------------------------------+
-| :kbd:`F3`                                     | Show *Properties* Window                             |
+| :kbd:`Alt-A` or :kbd:`Alt-Enter`              | OK / accept changes and close dialog                 |
+| or :kbd:`Ctrl-Enter`                          |                                                      |
 +-----------------------------------------------+------------------------------------------------------+
-| :kbd:`F4`                                     | Show *Palette* Window                                |
+| :kbd:`Alt-C` or :kbd:`Alt-F4`                 | Cancel / discard changes and close dialog            |
 +-----------------------------------------------+------------------------------------------------------+
-| :kbd:`F5`                                     | Show/Refresh *Preview* Window                        |
-+-----------------------------------------------+------------------------------------------------------+
-| :kbd:`F6`                                     | Show/Hide *Design* Window                            |
-+-----------------------------------------------+------------------------------------------------------+
-| :kbd:`Ctrl+S`                                 | Save file                                            |
-+-----------------------------------------------+------------------------------------------------------+
-| :kbd:`Ctrl+G`                                 | Generate Code                                        |
+| :kbd:`Alt-Arrow up/down/left/right`           | move item up/down/left/right                         |
 +-----------------------------------------------+------------------------------------------------------+
 
-On *Classic* versions of wxPython, the keyboard shortcuts will not work in the *Preview* window.
 
 
 Some more keyboard shortcuts can be found in the menus.
diff -Nru wxglade-0.9.6/sphinx/source_code.rst wxglade-1.0.1/sphinx/source_code.rst
--- wxglade-0.9.6/sphinx/source_code.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/source_code.rst	2020-12-31 14:04:48.000000000 +0000
@@ -25,20 +25,20 @@
 
  * Python code for wxWidgets 3.0 or Phoenix
  * all code in a single file
- * output file name "Calculator.py"
+ * output file name "Calculator_GUI.py"
  * an application should be created, not just the window
 
 So we select the root element "Application" in the *Tree* view and set the properties accordingly:
 
-+-----------------------------------------------------------------------+
-|.. image:: images/Calculator_06_ApplicationProperties.png              |
-|    :width: 200                                                        |
-|    :alt: Application Properties                                       |
-+-----------------------------------------------------------------------+
++--------------------------------------------------------------------------------------------------------------------+
+|.. image:: images/Calculator_06_ApplicationProperties.png                                                           |
+|    :width: 200                                                                                                     |
+|    :alt: Application Properties: Name: app, Class: MyApp, Single file, Python, 3.0, Output path: Calculator_GUI.py |
++--------------------------------------------------------------------------------------------------------------------+
 
 To actually create the source code, press the button "Generate Source" or hit :kbd:`Ctrl-G`.
 
-The **generated source** looks like this:
+The **generated source** looks like this (some lines removed at the red lines):
 
 +-----------------------------------------------------------------------+
 |.. image:: images/Calculator_06_PythonCode.png                         |
@@ -63,10 +63,12 @@
 The Properties could look like these:
 
 .. image:: images/Toplevel_App.png
-    :alt: wxGlade title
-
+    :alt: Application Properties: Name: app, Class: MyApp, Top window: frame
+    
+    
 .. image:: images/Toplevel_Frame.png
-    :alt: wxGlade title
+    :alt: Frame Properties: Name: frame, Class: CalculatorFrame
+
 
 The toplevel window will be invoked from the generated application code::
 
@@ -95,78 +97,76 @@
 Code for Windows
 *********************************
 
-This is the full code for our main window :code:`CalculatorFrame`.
-
-
-The code is separated into creation of controls, definition of properties and layout generation::
-
+This is the full Python code for our main window :code:`CalculatorFrame`::
 
     class CalculatorFrame(wx.Frame):
         def __init__(self, *args, **kwds):
             # begin wxGlade: CalculatorFrame.__init__
-            kwds["style"] = wx.DEFAULT_FRAME_STYLE
+            kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
             wx.Frame.__init__(self, *args, **kwds)
-            self.panel_1 = wx.Panel(self, wx.ID_ANY)
-            self.text_value1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
-            self.radiobox_operator = wx.RadioBox(self.panel_1, wx.ID_ANY, "",
-                choices=["+", "-", "*", "/"], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
-            self.text_value2 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
-            self.text_result = wx.TextCtrl(self.panel_1, wx.ID_ANY, "",
-                style=wx.TE_MULTILINE | wx.TE_READONLY)
-            self.btn_execute = wx.Button(self.panel_1, wx.ID_ANY, "Execute")
-            self.btn_reset = wx.Button(self.panel_1, wx.ID_ANY, "Reset")
+            self.SetSize((400, 300))
+            self.SetTitle("Calculator")
     
-            self.__set_properties()
-            self.__do_layout()
+            self.notebook_1 = wx.Notebook(self, wx.ID_ANY)
     
-            # end wxGlade
+            self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+            self.notebook_1.AddPage(self.notebook_1_pane_1, "Calculate")
     
-        def __set_properties(self):
-            # begin wxGlade: CalculatorFrame.__set_properties
-            self.SetTitle("Calculator")
+            sizer_1 = wx.BoxSizer(wx.VERTICAL)
+    
+            grid_sizer_1 = wx.FlexGridSizer(4, 2, 0, 0)
+            sizer_1.Add(grid_sizer_1, 1, wx.EXPAND, 0)
+    
+            label_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, "Value 1:")
+            grid_sizer_1.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+    
+            self.text_value1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+            grid_sizer_1.Add(self.text_value1, 1, wx.EXPAND, 0)
+    
+            label_4 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, "Operator:")
+            grid_sizer_1.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+    
+            self.radiobox_operator = wx.RadioBox(self.notebook_1_pane_1, wx.ID_ANY, "", choices=["+", "-", "*", "/"], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
             self.radiobox_operator.SetSelection(0)
+            grid_sizer_1.Add(self.radiobox_operator, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+    
+            label_2 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, "Value 2:")
+            grid_sizer_1.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+    
+            self.text_value2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+            grid_sizer_1.Add(self.text_value2, 1, wx.EXPAND, 0)
+    
+            label_3 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, "Result:")
+            grid_sizer_1.Add(label_3, 0, 0, 0)
+    
+            self.text_result = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
             self.text_result.SetBackgroundColour(wx.Colour(212, 208, 200))
-            self.btn_execute.SetDefault()
-            # end wxGlade
+            grid_sizer_1.Add(self.text_result, 1, wx.EXPAND, 0)
     
-        def __do_layout(self):
-            # begin wxGlade: CalculatorFrame.__do_layout
-            sizer_1 = wx.BoxSizer(wx.VERTICAL)
-            sizer_2 = wx.BoxSizer(wx.VERTICAL)
             sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
-            sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-            sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
-            sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-            sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-            label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "Value 1:")
-            sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-            sizer_3.Add(self.text_value1, 1, 0, 0)
-            sizer_2.Add(sizer_3, 0, wx.EXPAND, 0)
-            label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, "Operator:")
-            sizer_7.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-            sizer_7.Add(self.radiobox_operator, 0, 0, 0)
-            sizer_2.Add(sizer_7, 0, wx.EXPAND, 0)
-            label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, "Value 2:")
-            sizer_4.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-            sizer_4.Add(self.text_value2, 1, 0, 0)
-            sizer_2.Add(sizer_4, 0, wx.EXPAND, 0)
-            static_line_1 = wx.StaticLine(self.panel_1, wx.ID_ANY)
-            sizer_2.Add(static_line_1, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
-            label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, "Result:")
-            sizer_5.Add(label_3, 0, 0, 0)
-            sizer_5.Add(self.text_result, 1, wx.EXPAND, 0)
-            sizer_2.Add(sizer_5, 1, wx.EXPAND, 0)
-            sizer_6.Add(self.btn_execute, 0, wx.ALL, 5)
-            sizer_6.Add(self.btn_reset, 0, wx.ALL, 5)
-            sizer_2.Add(sizer_6, 0, wx.ALIGN_CENTER, 0)
-            self.panel_1.SetSizer(sizer_2)
-            sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
-            self.SetSizer(sizer_1)
+            sizer_1.Add(sizer_6, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+    
+            self.button_execute = wx.Button(self.notebook_1_pane_1, wx.ID_ANY, "Execute")
+            self.button_execute.SetDefault()
+            sizer_6.Add(self.button_execute, 0, wx.ALL, 5)
+    
+            self.button_reset = wx.Button(self.notebook_1_pane_1, wx.ID_ANY, "Reset")
+            sizer_6.Add(self.button_reset, 0, wx.ALL, 5)
+    
+            self.text_log = wx.TextCtrl(self.notebook_1, wx.ID_ANY, "1+1 = 2")
+            self.text_log.SetBackgroundColour(wx.Colour(212, 208, 200))
+            self.notebook_1.AddPage(self.text_log, "Log")
+    
+            grid_sizer_1.AddGrowableRow(3)
+            grid_sizer_1.AddGrowableCol(1)
+    
+            self.notebook_1_pane_1.SetSizer(sizer_1)
+    
             self.Layout()
-            self.SetSize((400, 300))
             # end wxGlade
 
 
+
 When you run the Python file, the application is run and the frame created:
 
 +-----------------------------------------------------------------------+
@@ -270,7 +270,7 @@
 **********************************
 
 There are two ways to implement functionality for your application:
- * Directly edit the code file()s) written by wxGlade.
+ * Directly edit the code file(s) written by wxGlade.
  * Import the generated module(s) and override class and event handler in your own code files.
 
 For anything else than simple glue code, the latter is the recommended approach.
@@ -284,7 +284,7 @@
 +-----------------------------------------------------------------------+
 |.. image:: images/Calculator_06_ApplicationKeepUserCode.png            |
 |    :width: 200                                                        |
-|    :alt: Option: Keep User Code                                       |
+|    :alt: Application Properties: Keep User Code checked               |
 +-----------------------------------------------------------------------+
 
 
@@ -359,7 +359,6 @@
     # -*- coding: UTF-8 -*-
     
     import wx
-    import gettext
     from Calculator_GUI import CalculatorFrame
     
     
@@ -394,7 +393,6 @@
     
     
     if __name__ == "__main__":
-        gettext.install("app") # replace with the appropriate catalog name
         app = MyApp(0)
         app.MainLoop()
 
@@ -405,7 +403,6 @@
  * `Calculator_Main.py <../../examples/Calculator/Calculator_Main.py>`_
 
 
-
 Additionally, these files demonstrate a menu bar which will be explained in the next section :doc:`menu_status_tool`.
 
 
diff -Nru wxglade-0.9.6/sphinx/tutorial.rst wxglade-1.0.1/sphinx/tutorial.rst
--- wxglade-0.9.6/sphinx/tutorial.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/tutorial.rst	2020-12-31 14:04:48.000000000 +0000
@@ -52,37 +52,43 @@
     :width: 30
     :alt: New Frame dialog
 
-.. |NewSizer_CalculatorVertical| image:: images/NewSizer_CalculatorVertical.png
+.. |NewSizer_CalculatorHorizontal| image:: images/NewSizer_CalculatorHorizontal.png
     :width: 30
     :alt: New Sizer dialog
 
 
 
 1. Select "File->New" to **create a new file** and "File->Save" to save a .wxg file to a directory.
+
 2. **Add the frame**:
 
    * click on the Frame icon |frame| on the "Windows" line of the *Palette* panels
    * as class name, enter :guilabel:`CalculatorFrame`: |NewFrame_CalculatorFrame|
-
-3. A frame with a sizer |sizer| and one slot is now visible in the *Tree* view and the *Design* window
+   * leave "Add panel and sizer" checked
+3. A frame with a panel and a sizer |sizer| with one slot is now visible in the *Tree* view and the *Design* window
    (there the slot is visualized by a hatched area)
-4. It would be possible to place controls directly on the frame, but usually a **panel** is added first, as a frame is really just a frame around the other things. |br|
-   To add the panel:
+4. To extend the **vertical box sizer** to six slots:
 
-   * in the *Palette* of the main window (again on the "Windows" line) click on the Panel icon |panel|
-     to start the placement
-   * in the *Tree* view or the *Design* window, click in the slot to place the panel there
-
-5. On the panel we need a **vertical box sizer** with six slots:
+   * go to the slot in the *Tree* view or the *Design* window
+   * use right mouse click "Add slots" or hit :kbd:`Ctrl-Shift-A`
+   * select :guilabel:`5` and hit :guilabel:`OK`
+   * alternatively you may hit :kbd:`Ctrl-A` five times
+6. Now add a **horizontal box sizer** to the first slot:
 
    * in the *Palette* on the "Sizer" line click on the BoxSizer icon |sizer| to start the placement
-   * in the *Tree* view or the *Design* window, click on the panel to place the sizer there
+   * in the *Tree* view or the *Design* window, click on the first slot to place the sizer there
    * a dialog will open
-   * set "Orientation"  to :guilabel:`Vertical` and the number of slots to :guilabel:`6`  |NewSizer_CalculatorVertical|
+   * set "Orientation"  to :guilabel:`Horizontal` and the number of slots to :guilabel:`2`  |NewSizer_CalculatorHorizontal|
+7. Place a **StaticText** |static_text| as label (found on the "Static" line of *Palette*) in the top left slot.
+   You will be asked to enter a label text. Enter :guilabel:`Value 1:` for this.
+8. Place a **TextControl** |text_ctrl| (found on the "Inputs" line) in the top right slot
 
-6. Now add a **horizontal box sizer** to the first slot: do as before, but keep "Orientation" as :guilabel:`Horizontal`
-   and set the number of slots to :guilabel:`2`
-7. Place a **StaticText** |static_text| as label (found on the "Static" line of *Palette*) in the top left slot and a **TextControl** |text_ctrl| (found on the "Inputs" line) in the right
+
+.. note::
+   It would be possible to place sizer and controls directly on the frame, but usually a panel is added first,
+   as a frame is really just a frame around the other things. |br|
+   Especially for Windows, always add a panel to have correct background colours and keyboard navigation
+   between widgets (using the :kbd:`Tab` key)
 
 
 Adjust properties:
@@ -95,23 +101,18 @@
 |    :width: 200                            |
 +-------------------------------------------+
 
-The label does not yet display anything useful and the window title is not meaningful. |br|
+The window title is not meaningful. |br|
 Also, layout and alignment need to be changed, but we'll change this later on.
 
 
 **So, some properties of the label and the text need to be modified:**
 
-
-1. Select the label in the *Tree* view or the *Design* window.
+1. Select the frame in the *Tree* or the *Design* window.
 2. If not yet visible, make the *Properties* notebook of the main window visible by dragging the sashes
    (the separators between the three parts of the main window).
-3. In the *Properties* notebook of the main window:
-
-   * Edit the label to display :guilabel:`Value 1:` by entering this on the editor's notebook tab "Widget". |br|
-     (You could also edit the label directly in the *Tree* window by clicking into the label and/or pressing :kbd:`F2`.)
-
-4. Select the frame in the *Tree* and go to *Properties -> Widget -> Title* and change it from :guilabel:`frame` to :guilabel:`Calculator`.
-5. You may want to define a default size for the frame: |br|
+3. Go to *Properties -> Widget -> Title* and change it from :guilabel:`frame` to :guilabel:`Calculator`.
+  (You could also edit the title directly in the *Tree* window by clicking into the label and/or pressing :kbd:`F2`.)
+4. You may want to define a default size for the frame: |br|
    Go to *Properties -> Common -> Size* and set it to :guilabel:`400,300`. |br|
    Without this, the frame will be created with the minimum possible size to fit all controls.
 
@@ -156,7 +157,7 @@
  * select the fith, empty slot
  * then hit :kbd:`Ctrl-V` (or use the context menu)
 
-You may of course copy in the *Design* window and paste in the *Tree* or vice versa.
+You may of course copy in the *Design* window and paste into the *Tree* or vice versa.
  
 * **Drag & Drop in Design Window:**
 
@@ -184,8 +185,9 @@
  2. Go to *Properties -> Widget*
  3. In the section "Style", enable :guilabel:`wxTE_MULTILINE` and :guilabel:`wxTE_READONLY`
  4. Go to *Properties -> Common*
- 5. Click the "..." button right to :guilabel:`Background` and select grey colour or |br|
-    just enter :guilabel:`#d4d0c8` into the text control.
+ 5. Click the "..." button right to :guilabel:`Background` and select
+    :guilabel:`System Colour: wxSYS_COLOUR_BTNFACE` or |br|
+    another colour or just enter :guilabel:`wxSYS_COLOUR_BTNFACE` into the text control.
 
 The last step is to have a grey background.
 For single line read-only text controls, this is done automatically by wx, but not with multiple lines.
@@ -193,9 +195,9 @@
 
 **In the next steps fill the remaining slots of the main sizer:**
 
-* insert a two-slot horizontal sizer with a label and a radio box into SLOT 2 |radio_box|
-* place a horizontal line into SLOT 4 |static_line|
-* insert a two-slot horizontal sizer with two buttons into SLOT 6 |button|
+* insert a two-slot horizontal sizer with a label :guilabel:`Operator:` and a radio box into SLOT 1 |radio_box|
+* place a horizontal line into SLOT 3 |static_line|
+* insert a two-slot horizontal sizer with two buttons into SLOT 5 |button|
 * For the first button, select the checkbox *Properties -> Widget -> Default*. |br|
   This will make this button the default one, i.e. when the user hits Enter it will have the same effect as
   pressing this default button.
@@ -237,7 +239,7 @@
 
 * Set the names of the text controls to :guilabel:`text_value1`, :guilabel:`text_value2` and :guilabel:`text_result`.
 * Set the name of the radio box to :guilabel:`radiobox_operator`
-* Set the labels to :guilabel:`Value 1:`, :guilabel:`Operator:`, :guilabel:`Value 2:` and :guilabel:`Result:`
+* Set the labels to :guilabel:`Value 2:` and :guilabel:`Result:`
 * Set the name of the first button to :guilabel:`button_execute` and the label to :guilabel:`Execute`.
 * Set the name of the second button to :guilabel:`button_reset` and the label to :guilabel:`Reset`.
 
@@ -282,7 +284,7 @@
 
 1. We want the rows with the values, operators and buttons **not to grow vertically**:
 
-   * select one of the horizontal sizers (e.g. :guilabel:`sizer_3` around :guilabel:`Value 1`)
+   * select one of the horizontal sizers (e.g. :guilabel:`sizer_2` around :guilabel:`Value 1`)
    * set *Properties -> Layout -> Proportion* to :guilabel:`0`
    * select the next of the sizers (e.g. around :guilabel:`Operator`)
    * either set *Properties -> Layout -> Proportion* to :guilabel:`0`
@@ -291,7 +293,7 @@
 
 2. We want the text controls to **grow horizontally** to fill the available space:
 
-   * select one of the text controls (e.g. text_value1)
+   * select one of the text controls (e.g. :guilabel:`text_value1`)
    * set *Properties -> Layout -> Proportion* to :guilabel:`1`
    * do the same for the other controls, either by modifying the Proportion properties
      or by hitting :kbd:`Ctrl-Y` to apply the last change to the selected control
@@ -310,19 +312,27 @@
 
 5. We want the buttons at the bottom to be **centered**; so the layout of the sizer around them needs to be set:
 
+   * select sizer
    * go to *Properties -> Layout -> Alignment*
    * de-select the checkbox :guilabel:`wxEXPAND`
    * select the checkbox :guilabel:`wxALIGN_CENTER_HORIZONTAL`
 
-6. We want a small **border** above and beyond the horizontal line and around each of the buttons:
+6. We want a small **border above and beyond** the horizontal line and around each of the buttons:
 
-   * select the horizontal line
+   * select the horizontal line :guilabel:`static_line_1`
    * set *Properties -> Layout -> Border* to :guilabel:`5`
    * uncheck *Properties -> Layout -> Border ->* :guilabel:`wxLEFT` and :guilabel:`wxRIGHT`
    * select the first button
    * set *Properties -> Layout -> Border* to :guilabel:`5`
    * do the same with the second button (e.g. by selecting it and then hitting :kbd:`Ctrl-Y`)
 
+7. We want a small **border around** beyond the pairs of label and value:
+
+   * select the horizontal sizer :guilabel:`sizer_2` around the first line
+   * set *Properties -> Layout -> Border* to :guilabel:`4`
+   * do the same with the sizers around :guilabel:`Operator` and :guilabel:`Value 2`
+   (e.g. by selecting it and then hitting :kbd:`Ctrl-Y`)
+
 
 At this point, it's time for a **preview**: |br|
 Select "Preview" from the context menu or the main menu or from the *Properties* notebook when the frame is selected.
@@ -409,7 +419,8 @@
 Part 3: Add a Notebook
 *********************************************************************
 
-For many applications it's desirable to place the GUI elements on a notebook control. For our calculator e.g. we may want to have the controls on the first page and a log on the second page:
+For many applications it's desirable to place the GUI elements on a notebook control.
+For our calculator e.g. we may want to have the controls on the first page and a log on the second page:
 
 
 +----------------------------------------------------------+
@@ -417,86 +428,74 @@
 |     :height: 120                                         |
 |     :alt: Calculator with a notebook: Design Window      |
 |                                                          |
-| .. image:: images/Calculator_Notebook_Preview.png        |
-|     :height: 120                                         |
-|     :alt: Calculator with a notebook: Preview, page 2    |
-|                                                          |
 | .. image:: images/Calculator_Notebook_Tree.png           |
 |     :height: 120                                         |
 |     :alt: Calculator with a notebook: Tree Window        |
 +----------------------------------------------------------+
 
+A notebook can be added to an empty sizer slot or as direct child of a frame, splitter or another notebook.
+In our case, we want to keep the existing controls.
+So we cut the panel sizer, add a notebook and then paste the panel to the first notebook page.
 
-A notebook can only be added to an empty sizer slot. In our case, we want to keep the existing controls. So we add a slot to the toplevel sizer, create the notebook there and then move the controls to the first notebook page. After that we delete the empty slot.
-
-**Create a slot for the notebook:**
+**Cut the toplevel panel:**
 
-* Go to the toplevel sizer and select "Add Slot":
+* Go to the toplevel panel :guilabel:`panel_1` in the *Tree* view or the *Design* window
+  and select "Cut" or hit :kbd:`Ctrl-X`:
 
-.. |Calculator_Notebook_AddSlot| image:: images/Calculator_Notebook_AddSlot.png
+.. |Calculator_Notebook_CutPanel| image:: images/Calculator_Notebook_CutPanel.png
     :height: 120
-    :alt: Add Slot for Notebook
+    :alt: Right mouse click on panel -> "Cut"
 
-.. |Calculator_Notebook_AddedSlot| image:: images/Calculator_Notebook_AddedSlot.png
-    :height: 120
-    :alt: Slot for Notebook
 
-.. |Calculator_Notebook_AddedSlot_Design| image:: images/Calculator_Notebook_AddedSlot_Design.png
+.. list-table::
+   :header-rows: 0
+
+   * - |Calculator_Notebook_CutPanel|
+
+The panel and it's children are now on the clipboard and can be pasted back later.
+The frame does not have a child now; this is visualized by an empty slot. Note that in the Tree view
+this :guilabel:`SLOT` looks different from a sizer slot:
+
+.. |Calculator_Notebook_FrameSlot| image:: images/Calculator_Notebook_FrameSlot.png
     :height: 120
-    :alt: Slot for Notebook
+    :alt: Frame without child, visualized with just an empty SLOT
 
 
 .. list-table::
    :header-rows: 0
 
-   * - |Calculator_Notebook_AddSlot|
-       -> the slot will be at the bottom:
-       |Calculator_Notebook_AddedSlot|
-       |Calculator_Notebook_AddedSlot_Design|
-
+   * - |Calculator_Notebook_FrameSlot|
 
 
 **Add a notebook:**
 
 * click on the Notebook icon |notebook| in the section "Containers" of the *Palette* panel to start placing a notebook
-* click on the hatched area in the *Design* window or on the sizer slot |sizer_slot| in the *Tree* control of the
+* click on the hatched area in the *Design* window or on the frame's slot |frame_slot| in the *Tree* control of the
   main window
-* in the dialog, select :guilabel:`wxNB_TOP` to place the notebook tabs at the top
-
-The newly created notebook will have one page already, which consists of just a panel. It will have a default name like :guilabel:`notebook_1_pane_1`.
+* in the dialog, select :guilabel:`wxNB_TOP` to place the notebook tabs at the top;
+  keep "Pages" :guilabel:`1` and uncheck :guilabel:`Add panels`.
 
-**Fill the first page:**
+The newly created notebook will have one page already, which does not contain anything.
+It will have a default name like :guilabel:`notebook_1_pane_1`.
 
-Move the existing controls to the first notebook page:
 
 
+**Paste the panel to the notebook page:**
 
-.. |Calculator_Notebook_DragNDrop| image:: images/Calculator_Notebook_DragNDrop.png
-    :height: 120
-    :alt: Drag main_sizer to notebook_1_pane_1
+ * Go to the empty notebook page :guilabel:`[notebook_1_pane_1]` in the *Tree* view or the *Design* window
+   and select "Paste" or hit :kbd:`Ctrl-V`: 
 
-.. |Calculator_Notebook_DragNDrop_Done| image:: images/Calculator_Notebook_DragNDrop_Done.png
-    :height: 120
-    :alt: After dragging main_sizer to notebook_1_pane_1; the original panel is empty now
+The panel including sizer and all controls is now the first page of the notebook:
 
-.. |Calculator_Notebook_DragNDrop_Done_Design| image:: images/Calculator_Notebook_DragNDrop_Done_Design.png
+.. |Calculator_Notebook_Pasted| image:: images/Calculator_Notebook_Pasted.png
     :height: 120
-    :alt: Design window with single notebook page
-
 
 .. list-table::
    :header-rows: 0
 
-   * - * drag the containing sizer to the notebook pane |br|
-         (i.e. the panel for the first page) |br| |br|
-         (alternatively, use Cut & Paste)
-     - |Calculator_Notebook_DragNDrop|
-   * - * delete the old, empty panel |br|
-         and then the empty slot:
-     - |Calculator_Notebook_DragNDrop_Done|
-   * - |br| The *Design* window should look like this, |br|
-       i.e. it has a notebook, but with only a single page:
-     - |Calculator_Notebook_DragNDrop_Done_Design|
+   * - |Calculator_Notebook_Pasted|
+
+
 
 **Add second notebook page and set the tab labels:**
 
@@ -518,21 +517,52 @@
      - |Calculator_Notebook|
 
 
+Alternatively, you may select "Add Notebook Tab" in the *Tree* view or the *Design* window and rename the tabs in 
+the *Tree* view. E.g. by changing :guilabel:`[notebook_1_pane_1] panel_1` to :guilabel:`[Calculator] panel_1`.
+
+Once you are familiar with the *Tree* view, this is the fastest way.
+
+.. |Calculator_Notebook_Renaming| image:: images/Calculator_Notebook_Renaming.png
+    :height: 120
+
+.. |Calculator_Notebook_Adding| image:: images/Calculator_Notebook_Adding.png
+    :height: 120
+
+.. list-table::
+   :header-rows: 0
+
+   * - |Calculator_Notebook_Renaming|
+   * - |Calculator_Notebook_Adding|
+
+
+
+.. note::
+  After adding a page to a notebook, this will contain a panel by default.
+  You may delete this if you want e.g. to place a splitter on the page or e.g. a text control that should fill the
+  whole page.
+
+
 **Fill the second page:**
 
-You should know how to do this by now:
+There are two ways to place the text control on the second page:
+
+1. Add a single-slot sizer to the notebook page panel. Then place the text control in the sizer slot.
+2. Remove the panel from the notebook page and add a text control instead.
+
+Here we will take the second option:
 
-* add a sizer to the notebook pane (with a single slot)
-* add a text control to the sizer slot
-* set the layout: a "Proportion" of :guilabel:`1` and :guilabel:`wxEXPAND` such that the text control will fill the whole page
+* remove the panel (which probably has the name :guilabel:`notebook_1_pane_1`)
+* the empty page will be displayed in the *Tree* view as :guilabel:`PAGE 1`
+* add a text control to :guilabel:`PAGE 1`
 * set the widget style to :guilabel:`wxTE_MULTILINE` and :guilabel:`wxTE_READONLY`
-* set the widget background color to :guilabel:`#d4d0c8`
+* set the widget background color to :guilabel:`wxSYS_COLOUR_BTNFACE`
+* rename to :guilabel:`text_log`
+
 
 This file can be found in the folder ``wxglade/examples/Calculator``:
 `Calculator-04-Notebook.wxg <../../examples/Calculator/Calculator-04-Notebook.wxg>`_
 
 
-
 *********************************************************************
 Part 4: Use of Spacers
 *********************************************************************
@@ -576,7 +606,8 @@
      - |Calculator_Spacers_Design0|
 
    * - 
-       * insert spacers into these slots |br| (e.g. with "Width" :guilabel:`20` and "Height" :guilabel:`0`) 
+       * insert spacers |spacer| into these slots |br| (e.g. with "Width" :guilabel:`20` and
+         "Height" :guilabel:`20`) 
        * set "Proportion" to :guilabel:`1` |br| 
          to make them grow 
      - |Calculator_Spacers_Design|
@@ -586,10 +617,10 @@
    * - |br| In the *Properties* notebook you can see |br|
        the settings to make the spacers grow:
      - |Calculator_Spacers_Properties|
-   * - As the spacers have a height of 0, you will not see them in the design window. |br| |br|
-       If you don't like this, you may actually set the "Height" property to a different value and
-       maybe even set :guilabel:`EXPAND`. For the actual window this will not make a difference,
-       as the spacers are invisible, but the spacers will be visible in the *Design* window:
+   * - As the spacers have a height of :guilabel:`20`, they're now looking a bit odd in the *Design* window. |br|
+       You may want to make them disappear by setting the theight to :guilabel:`0` or to fill the available space
+       by checking :guilabel:`EXPAND`. |br|
+       For the actual window this will not make a difference in this case.
      - |Calculator_Spacers2|
 
 
@@ -614,7 +645,7 @@
   The editing logic is a bit different from the other sizers.
 
 
-For our calculator we need the FlexGridSizer as the first column is fixed and the second column should grow.
+For our calculator we need the *FlexGridSizer* as the first column is fixed and the second column should grow.
 The result will look like this:
 
 
@@ -634,7 +665,8 @@
 
 .. |VerticalSizer_InsertSlot| image:: images/Calculator_GridSizer_InsertSlot.png
     :height: 80
-    :alt: InsertSlot into vertical sizer
+    :alt: InsertSlot into vertical sizer: right mouse click on sizer XXX
+
 
 .. |FlexGridSizerDlg| image:: images/FlexGridSizerDlg.png
     :height: 80
@@ -657,12 +689,12 @@
 * Add a GridSizer |grid_sizer| to this slot
 * In the grid sizer dialog, select :guilabel:`FlexGrid`, :guilabel:`4` rows and :guilabel:`2` cols: |br|
   |FlexGridSizerDlg|
-* Move the labels and controls to the slots of the newly created sizer
-* Delete the old sizer
+* Move the labels and controls to the slots of the newly created sizer.
+* Delete the old sizers and spacers.
 * In *Properties -> Grid*: make column 2 and row 4 growable: |br|
   |FlexGridSizer_Properties|
 * To make the text controls :guilabel:`text_value1` and :guilabel:`text_value2` actually fill the growable column: |br|
-  activate *Properties -> Layout -> Alignment ->* :guilabel:`wxEXPAND` for both of them
+  activate *Properties -> Layout -> Alignment ->* :guilabel:`wxEXPAND` for both of them.
 
 The logic with :guilabel:`wxEXPAND` is a bit different than with non-grid sizers.
 If it is active, the control will grow horizontally and vertically.
@@ -693,6 +725,16 @@
    * Repeat: :kbd:`Ctrl-R` or "Edit->Re-do" or toolbar second right-arrow
 
 
+Please keep in mind how to create a good structure:
+
+  * Always use the simplest available sizers.
+    Usually you will need mainly box sizers and maybe one or two FlexGridSizers.
+  * Use nested sizers to match the hierarchical / logical structure of your project. This will make it easy
+    to re-arrange things to find the best user interface.
+  * Never ever try to use a grid sizer as main sizer of a window trying to resemble pixel placement or
+    Tkinter's grid geometry manager. This is a mess to create and maintain.
+
+
 *********************************************************************
 Next steps
 *********************************************************************
diff -Nru wxglade-0.9.6/sphinx/wxbasics.rst wxglade-1.0.1/sphinx/wxbasics.rst
--- wxglade-0.9.6/sphinx/wxbasics.rst	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/sphinx/wxbasics.rst	2020-12-31 14:04:48.000000000 +0000
@@ -31,16 +31,27 @@
 
 You may want to visit these pages for more information:
  * The wxPython home page: https://wxpython.org/
+ * The **wxPython API** documentation: https://docs.wxpython.org/
  * An overview including a `Hello World` application example: https://wxpython.org/pages/overview/
  * A more comprehensive `Getting Started` guide: https://wiki.wxpython.org/Getting%20Started
  * The wxWidgets home page: https://www.wxwidgets.org/
 
 
-
 The wxGlade documentation is intended to be readable without previous wx knowledge.
 It will teach you how to create windows, handle events and how to integrate with your 'business logic' code.
 Sooner or later you will have to look into the wx documentation, though.
 
+If you are new to wx/Python, make sure that you work through this documentation at least up to and including section
+"Create and Use Source Code".
+
+Also please note that the **wxPython demo** is probably most important resource for exploring the available controls!
+The demo has examples and example code for most widgets, including the more complicated and powerful ones like the
+grid control.
+
+If you don't have the demo, have a look here: https://extras.wxpython.org/wxPython4/extras/ |br|
+Go to the subdirectory matching your wxPython version and download the demo archive. |br|
+Then unpack the archive and run ``demo.py``.
+
 
 
 ************************
@@ -48,10 +59,12 @@
 ************************
 
 
-With wxWidgets/wxPython and similar toolkits, usually controls are not placed at pixel positions on their windows, but the layout of a window is managed by *sizers*.
+With wxWidgets / wxPython and similar toolkits, usually controls are not placed at pixel positions on their windows, but the layout of a window is managed by *sizers*.
  - There are *horizontal box sizers*, *vertical box sizers* and *grid sizers*.
  - The *box sizers* may have a label and a box around them. In that case they're called *static box sizers*.
  - Each sizer and contained sizer items can be fixed size or grow to fill the available space, e.g. when the window is resized.
+ - Typically in a main window or frame the sizer makes the contents fill the available space, while dialogs will
+   be sized to the minimum required space.
 
 Sizer Examples
 ==============
@@ -185,7 +198,9 @@
 |     :width: 200                                                      |
 +----------------------------------------------------------------------+
 
-This window is managed by |green| **one vertical box sizer with six slots** |endcolor| for the five rows, plus a horizontal line and five |blue| **horizontal box sizers** |endcolor| for the horizontally arranged controls they contain (e.g. one label and one button):
+This window is managed by |green| **one vertical box sizer with six slots** |endcolor| for the five rows,
+plus a horizontal line and five |blue| **horizontal box sizers** |endcolor| for the horizontally arranged controls
+they contain (i.e. label plus text control, label plus radio box or button plus button):
 
 .. list-table::
    :header-rows: 0
@@ -198,8 +213,9 @@
        The inputs for Value 1 and 2 are set to grow horizontally;
        the Result output is growing horizontally and EXPANDing vertically. 
      - In the *Tree* window, you can see the hierarchical structure: |br|
-       |Calculator_06_tree| |br|
-       Note that horizontal and vertical sizers are |br| visualized with different icons: |sizer_h| |sizer| .
+       |Calculator_06_tree| |br| |br|
+       Note that |blue| horizontal |endcolor| and |green| vertical |endcolor| sizers are |br| 
+       visualized with different icons: |sizer_h| |sizer| .
 
 
 Later we'll have a look at alternative structures which allow better alignment of the fields.
@@ -210,9 +226,9 @@
       Usually you will need mainly box sizers and maybe one or two FlexGridSizers.
     * Use nested sizers to match the hierarchical / logical structure of your project. This will make it easy
       to re-arrange things to find the best user interface.
-    * Never ever try to use a GridBagSizer as main sizer of a window trying to resemble pixel placement or
+    * **Never ever try to use a Grid(Bag)Sizer as main sizer** of a window trying to resemble pixel placement or
       Tkinter's grid geometry manager. This is a mess to create and maintain.
-      Actually, a GridBagSizer is almost never needed.
+      Actually, a GridBagSizer is rarely needed.
 
 
 
@@ -220,14 +236,3 @@
    :width: 200
    :align: middle
 
-
-wxGlade Requirements and Restrictions
-=====================================
-
-The user interface and internal data structures of wxGlade impose some restrictions on the structure of a window.
-A frame or panel cannnot have a widget as direct child. They always need a toplevel sizer first. So don't be surprised to see constructions like these:
-
- - frame -> sizer with single slot -> panel -> sizer ....
- - frame -> sizer with single slot -> notebook -> ...
-
-On the other hand, a notebook or a splitter can have widgets as direct children.
diff -Nru wxglade-0.9.6/template.py wxglade-1.0.1/template.py
--- wxglade-0.9.6/template.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/template.py	2020-12-31 14:04:48.000000000 +0000
@@ -72,9 +72,6 @@
     """
 
     def __init__(self):
-        # initialise instance logger
-        self._logger = logging.getLogger(self.__class__.__name__)
-
         templates_ui.TemplateListDialog.__init__(self, None, -1, "")
         self.templates = []
         self.fill_template_list()
@@ -129,7 +126,7 @@
                 try:
                     os.unlink(self.selected_template)
                 except Exception:
-                    self._logger.exception(_('Internal Error'))
+                    logging.exception(_('Internal Error'))
                 self.fill_template_list()
                 self.selected_template = None
 
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_28_Classic.py wxglade-1.0.1/tests/casefiles/AllWidgets_28_Classic.py
--- wxglade-0.9.6/tests/casefiles/AllWidgets_28_Classic.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_28_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,11 +5,11 @@
 #
 
 import wx
-import wx.calendar
-import wx.grid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.calendar
+import wx.grid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -22,7 +22,11 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((800, 417))
-        
+        self.SetTitle(_("All Widgets"))
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
+        self.SetIcon(_icon)
+
         # Menu Bar
         self.All_Widgets_menubar = wx.MenuBar()
         global mn_IDUnix; mn_IDUnix = wx.NewId()
@@ -40,7 +44,7 @@
         self.Bind(wx.EVT_MENU, self.onSelectWindows, id=mn_IDWindows)
         wxglade_tmp_menu.AppendSeparator()
         self.All_Widgets_menubar.mn_RemoveTabs = wxglade_tmp_menu.Append(wx.ID_ANY, _("Remove Tabs"), _("Remove all leading tabs"), wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.onRemoveTabs, id=self.All_Widgets_menubar.mn_RemoveTabs.GetId())
+        self.Bind(wx.EVT_MENU, self.onRemoveTabs, self.All_Widgets_menubar.mn_RemoveTabs)
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Edit"))
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.ID_HELP, _("Manual"), _("Show the application manual"))
@@ -50,343 +54,496 @@
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.All_Widgets_menubar)
         # Menu Bar end
+
         self.All_Widgets_statusbar = self.CreateStatusBar(1, wx.ST_SIZEGRIP)
-        
+        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
+        for i in range(len(All_Widgets_statusbar_fields)):
+            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
+
         # Tool Bar
         self.All_Widgets_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.All_Widgets_toolbar)
         self.All_Widgets_toolbar.AddLabelTool(wx.ID_UP, _("UpDown"), wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, _("Up or Down"), _("Up or Down"))
         self.All_Widgets_toolbar.AddLabelTool(wx.ID_OPEN, _("Open"), wx.EmptyBitmap(32, 32), wx.NullBitmap, wx.ITEM_NORMAL, _("Open a new file"), _("Open a new file"))
+        self.SetToolBar(self.All_Widgets_toolbar)
+        self.All_Widgets_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxBitmapButton = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
+        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
+
+        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
+
+        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
+        self.bitmap_button_icon1.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_empty1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.EmptyBitmap(10, 10))
-        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
+        self.bitmap_button_empty1.SetDefault()
+        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_icon2.SetBitmapDisabled(wx.EmptyBitmap(32, 32))
+        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
+        self.bitmap_button_icon2.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_art = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
+        self.bitmap_button_art.SetDefault()
+        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
+
+        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_3 = wx.Button(self.notebook_1_wxButton, wx.ID_BOLD, "")
+        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_wxCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
+
+        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.calendar_ctrl_1 = wx.calendar.CalendarCtrl(self.notebook_1_wxCalendarCtrl, wx.ID_ANY, style=wx.calendar.CAL_MONDAY_FIRST | wx.calendar.CAL_SEQUENTIAL_MONTH_SELECTION | wx.calendar.CAL_SHOW_SURROUNDING_WEEKS)
+        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxCheckBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
+
+        sizer_21 = wx.GridSizer(2, 3, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("one (unchecked)"))
+        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
+
         self.checkbox_2 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("two (checked)"))
+        self.checkbox_2.SetValue(1)
+        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
+
         self.checkbox_3 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("three"), style=wx.CHK_2STATE)
+        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
+
         self.checkbox_4 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("four (unchecked)"), style=wx.CHK_3STATE)
+        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
+        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
+
         self.checkbox_5 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("five (checked)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
+        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
+
         self.checkbox_6 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("six (undetermined)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
+        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
+
         self.notebook_1_wxCheckListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
+
+        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.check_list_box_1 = wx.CheckListBox(self.notebook_1_wxCheckListBox, wx.ID_ANY, choices=[_("one"), _("two"), _("three"), _("four")])
+        self.check_list_box_1.SetSelection(2)
+        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxChoice = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.choice_empty = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[])
+        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
+
         self.choice_filled = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")])
+        self.choice_filled.SetSelection(1)
+        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxComboBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
+
         self.combo_box_empty = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[], style=0)
+        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
+
         self.combo_box_filled = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[_("Item 1 (pre-selected)"), _("Item 2")], style=0)
+        self.combo_box_filled.SetSelection(0)
+        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxDatePickerCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
+
+        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.datepicker_ctrl_1 = wx.DatePickerCtrl(self.notebook_1_wxDatePickerCtrl, wx.ID_ANY, style=wx.DP_SHOWCENTURY)
+        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.notebook_1_wxGauge = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
+
+        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.gauge_1 = wx.Gauge(self.notebook_1_wxGauge, wx.ID_ANY, 20)
+        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxGrid = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
+
+        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.grid_1 = wx.grid.Grid(self.notebook_1_wxGrid, wx.ID_ANY, size=(1, 1))
+        self.grid_1.CreateGrid(10, 3)
+        self.grid_1.SetSelectionMode(wx.grid.Grid.SelectRows)
+        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxHyperlinkCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
+
+        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.hyperlink_1 = wx.HyperlinkCtrl(self.notebook_1_wxHyperlinkCtrl, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"))
+        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
+
         self.notebook_1_wxListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
+
+        sizer_4 = wx.BoxSizer(wx.VERTICAL)
+
         self.list_box_empty = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[], style=0)
+        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
+
         self.list_box_filled = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")], style=wx.LB_MULTIPLE | wx.LB_SORT)
+        self.list_box_filled.SetSelection(1)
+        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxListCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.list_ctrl_1 = wx.ListCtrl(self.notebook_1_wxListCtrl, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_REPORT)
+        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
+
+        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
+
         self.radio_box_empty1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty1"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
+        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled1"), choices=[_("choice 1"), _("choice 2 (pre-selected)"), _("choice 3")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.radio_box_filled1.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_empty2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty2"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled2"), choices=[_("choice 1"), _("choice 2 (pre-selected)")], majorDimension=0, style=wx.RA_SPECIFY_COLS)
+        self.radio_box_filled2.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
+
+        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
+
+        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
+        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
+
         self.radio_btn_1 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Alice"), style=wx.RB_GROUP)
+        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_2 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Bob"))
+        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_3 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Malroy"))
+        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSlider = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
+
+        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.slider_1 = wx.Slider(self.notebook_1_wxSlider, wx.ID_ANY, 5, 0, 10, style=0)
+        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSpinButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"))
+
+        sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.tc_spin_button = wx.TextCtrl(self.notebook_1_wxSpinButton, wx.ID_ANY, _("1"), style=wx.TE_RIGHT)
+        sizer_16.Add(self.tc_spin_button, 1, wx.ALL, 5)
+
         self.spin_button = wx.SpinButton(self.notebook_1_wxSpinButton, wx.ID_ANY )
+        sizer_16.Add(self.spin_button, 1, wx.ALL, 5)
+
         self.notebook_1_wxSpinCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
+
+        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.spin_ctrl_1 = wx.SpinCtrl(self.notebook_1_wxSpinCtrl, wx.ID_ANY, "4", min=0, max=100)
+        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxSplitterWindow_horizontal = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
+
+        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_1 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_horizontal, wx.ID_ANY, style=0)
+        self.splitter_1.SetMinimumPaneSize(20)
+        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_1 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_top_pane = wx.StaticText(self.splitter_1_pane_1, wx.ID_ANY, _("top pane"))
+        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_2 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_buttom_pane = wx.StaticText(self.splitter_1_pane_2, wx.ID_ANY, _("bottom pane"))
+        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSplitterWindow_vertical = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
+
+        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_2 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_vertical, wx.ID_ANY, style=0)
+        self.splitter_2.SetMinimumPaneSize(20)
+        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_1 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_32 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_left_pane = wx.StaticText(self.splitter_2_pane_1, wx.ID_ANY, _("left pane"))
+        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_2 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_33 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_right_pane = wx.StaticText(self.splitter_2_pane_2, wx.ID_ANY, _("right pane"))
+        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticBitmap = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
+
+        sizer_11 = wx.BoxSizer(wx.VERTICAL)
+
         self.bitmap_empty = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.EmptyBitmap(32, 32))
-        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_empty, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_file, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_nofile = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("non-existing.bmp", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_nofile, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
+        sizer_11.Add(self.bitmap_art, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticLine = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
+
+        sizer_9 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
+
         self.static_line_2 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
+        sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_3 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
+        sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_4 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
+        sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_5 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
+        sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticText = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
+
+        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
+        grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
+        self.label_4.SetToolTipString(_("Background colour won't show, check documentation for more details"))
+        grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
+        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
+        self.label_5.SetToolTipString(_("Background colour won't show, check documentation for more details"))
+        grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_Spacer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
+
+        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
+
         self.label_3 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("Two labels with a"))
+        grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
+
+        grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
+
         self.label_2 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("spacer between"))
+        grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxTextCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
+
+        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.text_ctrl = wx.TextCtrl(self.notebook_1_wxTextCtrl, wx.ID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), style=wx.TE_CHARWRAP | wx.TE_MULTILINE | wx.TE_WORDWRAP)
+        sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxToggleButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
+
+        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_2 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 1"))
+        sizer_23.Add(self.button_2, 1, wx.ALL, 5)
+
         self.button_4 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 2"), style=wx.BU_BOTTOM | wx.BU_EXACTFIT)
+        sizer_23.Add(self.button_4, 1, wx.ALL, 5)
+
         self.notebook_1_wxTreeCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
+
+        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.tree_ctrl_1 = wx.TreeCtrl(self.notebook_1_wxTreeCtrl, wx.ID_ANY, style=0)
+        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
         self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
+        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
 
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
-        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
-        # end wxGlade
+        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
 
-    def __set_properties(self):
-        # begin wxGlade: All_Widgets_Frame.__set_properties
-        self.SetTitle(_("All Widgets"))
-        _icon = wx.NullIcon
-        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
-        self.SetIcon(_icon)
-        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
 
-        # statusbar fields
-        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
-        for i in range(len(All_Widgets_statusbar_fields)):
-            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
-        self.All_Widgets_toolbar.Realize()
-        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
-        self.bitmap_button_icon1.SetDefault()
-        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
-        self.bitmap_button_empty1.SetDefault()
-        self.bitmap_button_icon2.SetBitmapDisabled(wx.EmptyBitmap(20, 20))
-        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
-        self.bitmap_button_icon2.SetDefault()
-        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
-        self.bitmap_button_art.SetDefault()
-        self.checkbox_2.SetValue(1)
-        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
-        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
-        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
-        self.check_list_box_1.SetSelection(2)
-        self.choice_filled.SetSelection(1)
-        self.combo_box_filled.SetSelection(0)
-        self.grid_1.CreateGrid(10, 3)
-        self.grid_1.SetSelectionMode(wx.grid.Grid.SelectRows)
-        self.list_box_filled.SetSelection(1)
-        self.radio_box_filled1.SetSelection(1)
-        self.radio_box_filled2.SetSelection(1)
-        self.splitter_1.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
-        self.splitter_2.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
-        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetToolTipString(_("Background colour won't show, check documentation for more details"))
-        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
-        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
-        self.label_5.SetToolTipString(_("Background colour won't show, check documentation for more details"))
-        # end wxGlade
+        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
+
+        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
+
+        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
+
+        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
+
+        self.splitter_2_pane_2.SetSizer(sizer_33)
+
+        self.splitter_2_pane_1.SetSizer(sizer_32)
+
+        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
+
+        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
+
+        self.splitter_1_pane_2.SetSizer(sizer_31)
+
+        self.splitter_1_pane_1.SetSizer(sizer_30)
+
+        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
+
+        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
+
+        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
+
+        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
+
+        self.notebook_1_wxSlider.SetSizer(sizer_22)
+
+        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
+
+        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
+
+        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
+
+        self.notebook_1_wxListBox.SetSizer(sizer_4)
+
+        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
+
+        self.notebook_1_wxGrid.SetSizer(sizer_19)
+
+        self.notebook_1_wxGauge.SetSizer(sizer_15)
+
+        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
+
+        self.notebook_1_wxComboBox.SetSizer(sizer_6)
+
+        self.notebook_1_wxChoice.SetSizer(sizer_5)
+
+        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
+
+        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
+
+        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
+
+        self.notebook_1_wxButton.SetSizer(sizer_28)
 
-    def __do_layout(self):
-        # begin wxGlade: All_Widgets_Frame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
-        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
-        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_9 = wx.BoxSizer(wx.VERTICAL)
-        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_11 = wx.BoxSizer(wx.VERTICAL)
-        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_33 = wx.BoxSizer(wx.VERTICAL)
-        sizer_32 = wx.BoxSizer(wx.VERTICAL)
-        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
-        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
-        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.VERTICAL)
-        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.VERTICAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_21 = wx.GridSizer(2, 3, 0, 0)
-        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
-        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
         sizer_13.AddGrowableRow(0)
         sizer_13.AddGrowableRow(1)
         sizer_13.AddGrowableCol(0)
         sizer_13.AddGrowableCol(1)
-        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_wxButton.SetSizer(sizer_28)
-        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
-        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
-        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
-        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
-        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
-        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
-        self.notebook_1_wxChoice.SetSizer(sizer_5)
-        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
-        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
-        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
-        self.notebook_1_wxComboBox.SetSizer(sizer_6)
-        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER | wx.ALL, 5)
-        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
-        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
-        self.notebook_1_wxGauge.SetSizer(sizer_15)
-        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
-        self.notebook_1_wxGrid.SetSizer(sizer_19)
-        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
-        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
-        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListBox.SetSizer(sizer_4)
-        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
-        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
-        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
-        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
-        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSlider.SetSizer(sizer_22)
-        sizer_16.Add(self.tc_spin_button, 1, wx.ALL, 5)
-        sizer_16.Add(self.spin_button, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
-        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
-        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_1.SetSizer(sizer_30)
-        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_2.SetSizer(sizer_31)
-        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
-        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
-        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_1.SetSizer(sizer_32)
-        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_2.SetSizer(sizer_33)
-        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
-        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
-        sizer_11.Add(self.bitmap_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_file, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_nofile, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_art, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
-        sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
-        sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
-        grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
-        grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
-        sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
-        sizer_23.Add(self.button_2, 1, wx.ALL, 5)
-        sizer_23.Add(self.button_4, 1, wx.ALL, 5)
-        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
-        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
-        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
-        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
-        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
-        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
-        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
-        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
+
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
+        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
         # end wxGlade
 
     def onSelectUnix(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_28.cpp wxglade-1.0.1/tests/casefiles/AllWidgets_28.cpp
--- wxglade-0.9.6/tests/casefiles/AllWidgets_28.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_28.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,40 +21,10 @@
 {
     // begin wxGlade: All_Widgets_Frame::All_Widgets_Frame
     SetSize(wxSize(800, 417));
-    notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
-    notebook_1_wxTreeCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxToggleButton = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxTextCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_Spacer = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxStaticText = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxStaticLine = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxStaticBitmap = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxSplitterWindow_vertical = new wxScrolledWindow(notebook_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-    splitter_2 = new wxSplitterWindow(notebook_1_wxSplitterWindow_vertical, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
-    splitter_2_pane_2 = new wxPanel(splitter_2, wxID_ANY);
-    splitter_2_pane_1 = new wxPanel(splitter_2, wxID_ANY);
-    notebook_1_wxSplitterWindow_horizontal = new wxScrolledWindow(notebook_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-    splitter_1 = new wxSplitterWindow(notebook_1_wxSplitterWindow_horizontal, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
-    splitter_1_pane_2 = new wxPanel(splitter_1, wxID_ANY);
-    splitter_1_pane_1 = new wxPanel(splitter_1, wxID_ANY);
-    notebook_1_wxSpinCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxSpinButton = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxSlider = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxRadioButton = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxRadioBox = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxListCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxListBox = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxHyperlinkCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxGrid = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxGauge = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxDatePickerCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxComboBox = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxChoice = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxCheckListBox = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxCheckBox = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxCalendarCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxButton = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxBitmapButton = new wxPanel(notebook_1, wxID_ANY);
+    SetTitle(_("All Widgets"));
+    wxIcon _icon;
+    _icon.CopyFromBitmap(wxArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, wxSize(32, 32)));
+    SetIcon(_icon);
     All_Widgets_menubar = new wxMenuBar();
     wxMenu *wxglade_tmp_menu;
     wxglade_tmp_menu = new wxMenu();
@@ -80,23 +50,76 @@
     All_Widgets_menubar->Append(wxglade_tmp_menu, _("&Help"));
     SetMenuBar(All_Widgets_menubar);
     All_Widgets_statusbar = CreateStatusBar(1, wxST_SIZEGRIP);
+    int All_Widgets_statusbar_widths[] = { -1 };
+    All_Widgets_statusbar->SetStatusWidths(1, All_Widgets_statusbar_widths);
+    
+    // statusbar fields
+    const wxString All_Widgets_statusbar_fields[] = {
+        _("All Widgets statusbar"),
+    };
+    for(int i = 0; i < All_Widgets_statusbar->GetFieldsCount(); ++i) {
+        All_Widgets_statusbar->SetStatusText(All_Widgets_statusbar_fields[i], i);
+    }
     All_Widgets_toolbar = new wxToolBar(this, -1);
     SetToolBar(All_Widgets_toolbar);
     All_Widgets_toolbar->AddTool(wxID_UP, _("UpDown"), wxArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, wxSize(32, 32)), wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, wxSize(32, 32)), wxITEM_CHECK, _("Up or Down"), _("Up or Down"));
     All_Widgets_toolbar->AddTool(wxID_OPEN, _("Open"), wxBitmap(32, 32), wxNullBitmap, wxITEM_NORMAL, _("Open a new file"), _("Open a new file"));
     All_Widgets_toolbar->Realize();
-    bitmap_button_icon1 = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxBitmap(wxT("icon.xpm"), wxBITMAP_TYPE_ANY));
+    wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
+    notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
+    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
+    notebook_1_wxBitmapButton = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxBitmapButton, _("wxBitmapButton"));
+    wxFlexGridSizer* sizer_13 = new wxFlexGridSizer(2, 2, 0, 0);
+    bitmap_button_icon1 = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxBitmap(wxT("icon.png"), wxBITMAP_TYPE_ANY));
+    bitmap_button_icon1->SetSize(bitmap_button_icon1->GetBestSize());
+    bitmap_button_icon1->SetDefault();
+    sizer_13->Add(bitmap_button_icon1, 1, wxALL|wxEXPAND, 5);
     bitmap_button_empty1 = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxBitmap(10, 10));
-    bitmap_button_icon2 = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxBitmap(wxT("icon.xpm"), wxBITMAP_TYPE_ANY), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    bitmap_button_empty1->SetSize(bitmap_button_empty1->GetBestSize());
+    bitmap_button_empty1->SetDefault();
+    sizer_13->Add(bitmap_button_empty1, 1, wxALL|wxEXPAND, 5);
+    bitmap_button_icon2 = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxBitmap(wxT("icon.png"), wxBITMAP_TYPE_ANY), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    bitmap_button_icon2->SetBitmapDisabled(wxBitmap(32, 32));
+    bitmap_button_icon2->SetSize(bitmap_button_icon2->GetBestSize());
+    bitmap_button_icon2->SetDefault();
+    sizer_13->Add(bitmap_button_icon2, 1, wxALL|wxEXPAND, 5);
     bitmap_button_art = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, wxSize(32, 32)), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    bitmap_button_art->SetSize(bitmap_button_art->GetBestSize());
+    bitmap_button_art->SetDefault();
+    sizer_13->Add(bitmap_button_art, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxButton = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxButton, _("wxButton"));
+    wxBoxSizer* sizer_28 = new wxBoxSizer(wxHORIZONTAL);
     button_3 = new wxButton(notebook_1_wxButton, wxID_BOLD, wxEmptyString);
+    sizer_28->Add(button_3, 0, wxALL, 5);
+    notebook_1_wxCalendarCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"));
+    wxBoxSizer* sizer_12 = new wxBoxSizer(wxHORIZONTAL);
     calendar_ctrl_1 = new wxCalendarCtrl(notebook_1_wxCalendarCtrl, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_MONDAY_FIRST|wxCAL_SEQUENTIAL_MONTH_SELECTION|wxCAL_SHOW_SURROUNDING_WEEKS);
+    sizer_12->Add(calendar_ctrl_1, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxCheckBox = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxCheckBox, _("wxCheckBox"));
+    wxGridSizer* sizer_21 = new wxGridSizer(2, 3, 0, 0);
     checkbox_1 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("one (unchecked)"));
+    sizer_21->Add(checkbox_1, 0, wxEXPAND, 0);
     checkbox_2 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("two (checked)"));
+    checkbox_2->SetValue(1);
+    sizer_21->Add(checkbox_2, 0, wxEXPAND, 0);
     checkbox_3 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("three"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
+    sizer_21->Add(checkbox_3, 0, wxEXPAND, 0);
     checkbox_4 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("four (unchecked)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE);
+    checkbox_4->Set3StateValue(wxCHK_UNCHECKED);
+    sizer_21->Add(checkbox_4, 0, wxEXPAND, 0);
     checkbox_5 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("five (checked)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER);
+    checkbox_5->Set3StateValue(wxCHK_CHECKED);
+    sizer_21->Add(checkbox_5, 0, wxEXPAND, 0);
     checkbox_6 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("six (undetermined)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER);
+    checkbox_6->Set3StateValue(wxCHK_UNDETERMINED);
+    sizer_21->Add(checkbox_6, 0, wxEXPAND, 0);
+    notebook_1_wxCheckListBox = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxCheckListBox, _("wxCheckListBox"));
+    wxBoxSizer* sizer_26 = new wxBoxSizer(wxHORIZONTAL);
     const wxString check_list_box_1_choices[] = {
         _("one"),
         _("two"),
@@ -104,317 +127,278 @@
         _("four"),
     };
     check_list_box_1 = new wxCheckListBox(notebook_1_wxCheckListBox, wxID_ANY, wxDefaultPosition, wxDefaultSize, 4, check_list_box_1_choices);
+    check_list_box_1->SetSelection(2);
+    sizer_26->Add(check_list_box_1, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxChoice = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxChoice, _("wxChoice"));
+    wxBoxSizer* sizer_5 = new wxBoxSizer(wxHORIZONTAL);
     const wxString choice_empty_choices[] = {};
     choice_empty = new wxChoice(notebook_1_wxChoice, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_empty_choices);
+    sizer_5->Add(choice_empty, 1, wxALL, 5);
     const wxString choice_filled_choices[] = {
         _("Item 1"),
         _("Item 2 (pre-selected)"),
     };
     choice_filled = new wxChoice(notebook_1_wxChoice, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, choice_filled_choices);
+    choice_filled->SetSelection(1);
+    sizer_5->Add(choice_filled, 1, wxALL, 5);
+    notebook_1_wxComboBox = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxComboBox, _("wxComboBox"));
+    wxBoxSizer* sizer_6 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* sizer_7 = new wxBoxSizer(wxHORIZONTAL);
+    sizer_6->Add(sizer_7, 1, wxEXPAND, 0);
     const wxString combo_box_empty_choices[] = {};
     combo_box_empty = new wxComboBox(notebook_1_wxComboBox, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0, combo_box_empty_choices, 0);
+    sizer_7->Add(combo_box_empty, 1, wxALL, 5);
     const wxString combo_box_filled_choices[] = {
         _("Item 1 (pre-selected)"),
         _("Item 2"),
     };
     combo_box_filled = new wxComboBox(notebook_1_wxComboBox, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 2, combo_box_filled_choices, 0);
+    combo_box_filled->SetSelection(0);
+    sizer_7->Add(combo_box_filled, 1, wxALL, 5);
+    notebook_1_wxDatePickerCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"));
+    wxBoxSizer* sizer_17 = new wxBoxSizer(wxHORIZONTAL);
     datepicker_ctrl_1 = new wxDatePickerCtrl(notebook_1_wxDatePickerCtrl, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_SHOWCENTURY);
+    sizer_17->Add(datepicker_ctrl_1, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    notebook_1_wxGauge = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxGauge, _("wxGauge"));
+    wxBoxSizer* sizer_15 = new wxBoxSizer(wxHORIZONTAL);
     gauge_1 = new wxGauge(notebook_1_wxGauge, wxID_ANY, 20);
+    sizer_15->Add(gauge_1, 1, wxALL, 5);
+    notebook_1_wxGrid = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxGrid, _("wxGrid"));
+    wxBoxSizer* sizer_19 = new wxBoxSizer(wxHORIZONTAL);
     grid_1 = new wxGrid(notebook_1_wxGrid, wxID_ANY);
+    grid_1->CreateGrid(10, 3);
+    grid_1->SetSelectionMode(wxGrid::wxGridSelectRows);
+    sizer_19->Add(grid_1, 1, wxEXPAND, 0);
+    notebook_1_wxHyperlinkCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"));
+    wxBoxSizer* sizer_20 = new wxBoxSizer(wxHORIZONTAL);
     hyperlink_1 = new wxHyperlinkCtrl(notebook_1_wxHyperlinkCtrl, wxID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"));
+    sizer_20->Add(hyperlink_1, 0, wxALL, 5);
+    notebook_1_wxListBox = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxListBox, _("wxListBox"));
+    wxBoxSizer* sizer_4 = new wxBoxSizer(wxVERTICAL);
     const wxString list_box_empty_choices[] = {};
     list_box_empty = new wxListBox(notebook_1_wxListBox, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_empty_choices, 0);
+    sizer_4->Add(list_box_empty, 1, wxALL|wxEXPAND, 5);
     const wxString list_box_filled_choices[] = {
         _("Item 1"),
         _("Item 2 (pre-selected)"),
     };
     list_box_filled = new wxListBox(notebook_1_wxListBox, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, list_box_filled_choices, wxLB_MULTIPLE|wxLB_SORT);
+    list_box_filled->SetSelection(1);
+    sizer_4->Add(list_box_filled, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxListCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxListCtrl, _("wxListCtrl"));
+    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
     list_ctrl_1 = new wxListCtrl(notebook_1_wxListCtrl, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN|wxLC_REPORT);
+    sizer_3->Add(list_ctrl_1, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxRadioBox = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxRadioBox, _("wxRadioBox"));
+    wxGridSizer* grid_sizer_1 = new wxGridSizer(2, 2, 0, 0);
     const wxString radio_box_empty1_choices[] = {};
     radio_box_empty1 = new wxRadioBox(notebook_1_wxRadioBox, wxID_ANY, _("radio_box_empty1"), wxDefaultPosition, wxDefaultSize, 0, radio_box_empty1_choices, 1, wxRA_SPECIFY_ROWS);
+    grid_sizer_1->Add(radio_box_empty1, 1, wxALL|wxEXPAND, 5);
     const wxString radio_box_filled1_choices[] = {
         _("choice 1"),
         _("choice 2 (pre-selected)"),
         _("choice 3"),
     };
     radio_box_filled1 = new wxRadioBox(notebook_1_wxRadioBox, wxID_ANY, _("radio_box_filled1"), wxDefaultPosition, wxDefaultSize, 3, radio_box_filled1_choices, 0, wxRA_SPECIFY_ROWS);
+    radio_box_filled1->SetSelection(1);
+    grid_sizer_1->Add(radio_box_filled1, 1, wxALL|wxEXPAND, 5);
     const wxString radio_box_empty2_choices[] = {};
     radio_box_empty2 = new wxRadioBox(notebook_1_wxRadioBox, wxID_ANY, _("radio_box_empty2"), wxDefaultPosition, wxDefaultSize, 0, radio_box_empty2_choices, 1, wxRA_SPECIFY_COLS);
+    grid_sizer_1->Add(radio_box_empty2, 1, wxALL|wxEXPAND, 5);
     const wxString radio_box_filled2_choices[] = {
         _("choice 1"),
         _("choice 2 (pre-selected)"),
     };
     radio_box_filled2 = new wxRadioBox(notebook_1_wxRadioBox, wxID_ANY, _("radio_box_filled2"), wxDefaultPosition, wxDefaultSize, 2, radio_box_filled2_choices, 0, wxRA_SPECIFY_COLS);
-    radio_btn_1 = new wxRadioButton(notebook_1_wxRadioButton, wxID_ANY, _("Alice"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-    text_ctrl_1 = new wxTextCtrl(notebook_1_wxRadioButton, wxID_ANY, wxEmptyString);
-    radio_btn_2 = new wxRadioButton(notebook_1_wxRadioButton, wxID_ANY, _("Bob"));
-    text_ctrl_2 = new wxTextCtrl(notebook_1_wxRadioButton, wxID_ANY, wxEmptyString);
-    radio_btn_3 = new wxRadioButton(notebook_1_wxRadioButton, wxID_ANY, _("Malroy"));
-    text_ctrl_3 = new wxTextCtrl(notebook_1_wxRadioButton, wxID_ANY, wxEmptyString);
-    slider_1 = new wxSlider(notebook_1_wxSlider, wxID_ANY, 5, 0, 10, wxDefaultPosition, wxDefaultSize, 0);
-    tc_spin_button = new wxTextCtrl(notebook_1_wxSpinButton, wxID_ANY, _("1"), wxDefaultPosition, wxDefaultSize, wxTE_RIGHT);
-    spin_button = new wxSpinButton(notebook_1_wxSpinButton, wxID_ANY);
-    spin_ctrl_1 = new wxSpinCtrl(notebook_1_wxSpinCtrl, wxID_ANY, wxT("4"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100);
-    label_top_pane = new wxStaticText(splitter_1_pane_1, wxID_ANY, _("top pane"));
-    label_buttom_pane = new wxStaticText(splitter_1_pane_2, wxID_ANY, _("bottom pane"));
-    label_left_pane = new wxStaticText(splitter_2_pane_1, wxID_ANY, _("left pane"));
-    label_right_pane = new wxStaticText(splitter_2_pane_2, wxID_ANY, _("right pane"));
-    bitmap_empty = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxBitmap(32, 32));
-    bitmap_file = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxBitmap(wxT("icon.xpm"), wxBITMAP_TYPE_ANY));
-    bitmap_nofile = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxBitmap(wxT("non-existing.bmp"), wxBITMAP_TYPE_ANY));
-    bitmap_art = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxArtProvider::GetBitmap(wxART_PRINT, wxART_OTHER, wxSize(32, 32)));
-    static_line_2 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL);
-    static_line_3 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL);
-    static_line_4 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY);
-    static_line_5 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY);
-    label_1 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("red text (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-    label_4 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("black on red (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-    label_5 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("green on pink (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-    label_3 = new wxStaticText(notebook_1_Spacer, wxID_ANY, _("Two labels with a"));
-    label_2 = new wxStaticText(notebook_1_Spacer, wxID_ANY, _("spacer between"));
-    text_ctrl = new wxTextCtrl(notebook_1_wxTextCtrl, wxID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), wxDefaultPosition, wxDefaultSize, wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_WORDWRAP);
-    button_2 = new wxToggleButton(notebook_1_wxToggleButton, wxID_ANY, _("Toggle Button 1"));
-    button_4 = new wxToggleButton(notebook_1_wxToggleButton, wxID_ANY, _("Toggle Button 2"), wxDefaultPosition, wxDefaultSize, wxBU_BOTTOM|wxBU_EXACTFIT);
-    tree_ctrl_1 = new wxTreeCtrl(notebook_1_wxTreeCtrl, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
-    static_line_1 = new wxStaticLine(this, wxID_ANY);
-    button_5 = new wxButton(this, wxID_CLOSE, wxEmptyString);
-    button_1 = new wxButton(this, wxID_OK, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void All_Widgets_Frame::set_properties()
-{
-    // begin wxGlade: All_Widgets_Frame::set_properties
-    SetTitle(_("All Widgets"));
-    wxIcon _icon;
-    _icon.CopyFromBitmap(wxArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, wxSize(32, 32)));
-    SetIcon(_icon);
-    int All_Widgets_statusbar_widths[] = { -1 };
-    All_Widgets_statusbar->SetStatusWidths(1, All_Widgets_statusbar_widths);
-
-    // statusbar fields
-    const wxString All_Widgets_statusbar_fields[] = {
-        _("All Widgets statusbar"),
-    };
-    for(int i = 0; i < All_Widgets_statusbar->GetFieldsCount(); ++i) {
-        All_Widgets_statusbar->SetStatusText(All_Widgets_statusbar_fields[i], i);
-    }
-    bitmap_button_icon1->SetSize(bitmap_button_icon1->GetBestSize());
-    bitmap_button_icon1->SetDefault();
-    bitmap_button_empty1->SetSize(bitmap_button_empty1->GetBestSize());
-    bitmap_button_empty1->SetDefault();
-    bitmap_button_icon2->SetBitmapDisabled(wxBitmap(20, 20));
-    bitmap_button_icon2->SetSize(bitmap_button_icon2->GetBestSize());
-    bitmap_button_icon2->SetDefault();
-    bitmap_button_art->SetSize(bitmap_button_art->GetBestSize());
-    bitmap_button_art->SetDefault();
-    checkbox_2->SetValue(1);
-    checkbox_4->Set3StateValue(wxCHK_UNCHECKED);
-    checkbox_5->Set3StateValue(wxCHK_CHECKED);
-    checkbox_6->Set3StateValue(wxCHK_UNDETERMINED);
-    check_list_box_1->SetSelection(2);
-    choice_filled->SetSelection(1);
-    combo_box_filled->SetSelection(0);
-    grid_1->CreateGrid(10, 3);
-    grid_1->SetSelectionMode(wxGrid::wxGridSelectRows);
-    list_box_filled->SetSelection(1);
-    radio_box_filled1->SetSelection(1);
     radio_box_filled2->SetSelection(1);
-    splitter_1->SetMinimumPaneSize(20);
-    notebook_1_wxSplitterWindow_horizontal->SetScrollRate(10, 10);
-    splitter_2->SetMinimumPaneSize(20);
-    notebook_1_wxSplitterWindow_vertical->SetScrollRate(10, 10);
-    label_1->SetForegroundColour(wxColour(255, 0, 0));
-    label_4->SetBackgroundColour(wxColour(255, 0, 0));
-    label_4->SetToolTip(_("Background colour won't show, check documentation for more details"));
-    label_5->SetBackgroundColour(wxColour(255, 0, 255));
-    label_5->SetForegroundColour(wxColour(0, 255, 0));
-    label_5->SetToolTip(_("Background colour won't show, check documentation for more details"));
-    // end wxGlade
-}
-
-
-void All_Widgets_Frame::do_layout()
-{
-    // begin wxGlade: All_Widgets_Frame::do_layout
-    wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
-    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 2, 0, 0);
-    wxBoxSizer* sizer_24 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_23 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_18 = new wxBoxSizer(wxHORIZONTAL);
-    wxFlexGridSizer* grid_sizer_4 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxFlexGridSizer* grid_sizer_3 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxBoxSizer* sizer_9 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_10 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_11 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_25 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_33 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_32 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_29 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_31 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_30 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_14 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_16 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_22 = new wxBoxSizer(wxHORIZONTAL);
+    grid_sizer_1->Add(radio_box_filled2, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxRadioButton = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxRadioButton, _("wxRadioButton"));
     wxStaticBoxSizer* sizer_8 = new wxStaticBoxSizer(new wxStaticBox(notebook_1_wxRadioButton, wxID_ANY, _("My RadioButton Group")), wxHORIZONTAL);
     wxFlexGridSizer* grid_sizer_2 = new wxFlexGridSizer(3, 2, 0, 0);
-    wxGridSizer* grid_sizer_1 = new wxGridSizer(2, 2, 0, 0);
-    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_4 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_20 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_19 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_15 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_17 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_6 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_7 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_5 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_26 = new wxBoxSizer(wxHORIZONTAL);
-    wxGridSizer* sizer_21 = new wxGridSizer(2, 3, 0, 0);
-    wxBoxSizer* sizer_12 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_28 = new wxBoxSizer(wxHORIZONTAL);
-    wxFlexGridSizer* sizer_13 = new wxFlexGridSizer(2, 2, 0, 0);
-    sizer_13->Add(bitmap_button_icon1, 1, wxALL|wxEXPAND, 5);
-    sizer_13->Add(bitmap_button_empty1, 1, wxALL|wxEXPAND, 5);
-    sizer_13->Add(bitmap_button_icon2, 1, wxALL|wxEXPAND, 5);
-    sizer_13->Add(bitmap_button_art, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxBitmapButton->SetSizer(sizer_13);
-    sizer_13->AddGrowableRow(0);
-    sizer_13->AddGrowableRow(1);
-    sizer_13->AddGrowableCol(0);
-    sizer_13->AddGrowableCol(1);
-    sizer_28->Add(button_3, 0, wxALL, 5);
-    notebook_1_wxButton->SetSizer(sizer_28);
-    sizer_12->Add(calendar_ctrl_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxCalendarCtrl->SetSizer(sizer_12);
-    sizer_21->Add(checkbox_1, 0, wxEXPAND, 0);
-    sizer_21->Add(checkbox_2, 0, wxEXPAND, 0);
-    sizer_21->Add(checkbox_3, 0, wxEXPAND, 0);
-    sizer_21->Add(checkbox_4, 0, wxEXPAND, 0);
-    sizer_21->Add(checkbox_5, 0, wxEXPAND, 0);
-    sizer_21->Add(checkbox_6, 0, wxEXPAND, 0);
-    notebook_1_wxCheckBox->SetSizer(sizer_21);
-    sizer_26->Add(check_list_box_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxCheckListBox->SetSizer(sizer_26);
-    sizer_5->Add(choice_empty, 1, wxALL, 5);
-    sizer_5->Add(choice_filled, 1, wxALL, 5);
-    notebook_1_wxChoice->SetSizer(sizer_5);
-    sizer_7->Add(combo_box_empty, 1, wxALL, 5);
-    sizer_7->Add(combo_box_filled, 1, wxALL, 5);
-    sizer_6->Add(sizer_7, 1, wxEXPAND, 0);
-    notebook_1_wxComboBox->SetSizer(sizer_6);
-    sizer_17->Add(datepicker_ctrl_1, 1, wxALIGN_CENTER|wxALL, 5);
-    notebook_1_wxDatePickerCtrl->SetSizer(sizer_17);
-    sizer_15->Add(gauge_1, 1, wxALL, 5);
-    notebook_1_wxGauge->SetSizer(sizer_15);
-    sizer_19->Add(grid_1, 1, wxEXPAND, 0);
-    notebook_1_wxGrid->SetSizer(sizer_19);
-    sizer_20->Add(hyperlink_1, 0, wxALL, 5);
-    notebook_1_wxHyperlinkCtrl->SetSizer(sizer_20);
-    sizer_4->Add(list_box_empty, 1, wxALL|wxEXPAND, 5);
-    sizer_4->Add(list_box_filled, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxListBox->SetSizer(sizer_4);
-    sizer_3->Add(list_ctrl_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxListCtrl->SetSizer(sizer_3);
-    grid_sizer_1->Add(radio_box_empty1, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_1->Add(radio_box_filled1, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_1->Add(radio_box_empty2, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_1->Add(radio_box_filled2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxRadioBox->SetSizer(grid_sizer_1);
+    sizer_8->Add(grid_sizer_2, 1, wxEXPAND, 0);
+    radio_btn_1 = new wxRadioButton(notebook_1_wxRadioButton, wxID_ANY, _("Alice"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
     grid_sizer_2->Add(radio_btn_1, 1, wxALL|wxEXPAND, 5);
+    text_ctrl_1 = new wxTextCtrl(notebook_1_wxRadioButton, wxID_ANY, wxEmptyString);
     grid_sizer_2->Add(text_ctrl_1, 1, wxALL|wxEXPAND, 5);
+    radio_btn_2 = new wxRadioButton(notebook_1_wxRadioButton, wxID_ANY, _("Bob"));
     grid_sizer_2->Add(radio_btn_2, 1, wxALL|wxEXPAND, 5);
+    text_ctrl_2 = new wxTextCtrl(notebook_1_wxRadioButton, wxID_ANY, wxEmptyString);
     grid_sizer_2->Add(text_ctrl_2, 1, wxALL|wxEXPAND, 5);
+    radio_btn_3 = new wxRadioButton(notebook_1_wxRadioButton, wxID_ANY, _("Malroy"));
     grid_sizer_2->Add(radio_btn_3, 1, wxALL|wxEXPAND, 5);
+    text_ctrl_3 = new wxTextCtrl(notebook_1_wxRadioButton, wxID_ANY, wxEmptyString);
     grid_sizer_2->Add(text_ctrl_3, 1, wxALL|wxEXPAND, 5);
-    sizer_8->Add(grid_sizer_2, 1, wxEXPAND, 0);
-    notebook_1_wxRadioButton->SetSizer(sizer_8);
+    notebook_1_wxSlider = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxSlider, _("wxSlider"));
+    wxBoxSizer* sizer_22 = new wxBoxSizer(wxHORIZONTAL);
+    slider_1 = new wxSlider(notebook_1_wxSlider, wxID_ANY, 5, 0, 10, wxDefaultPosition, wxDefaultSize, 0);
     sizer_22->Add(slider_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxSlider->SetSizer(sizer_22);
+    notebook_1_wxSpinButton = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"));
+    wxBoxSizer* sizer_16 = new wxBoxSizer(wxHORIZONTAL);
+    tc_spin_button = new wxTextCtrl(notebook_1_wxSpinButton, wxID_ANY, _("1"), wxDefaultPosition, wxDefaultSize, wxTE_RIGHT);
     sizer_16->Add(tc_spin_button, 1, wxALL, 5);
+    spin_button = new wxSpinButton(notebook_1_wxSpinButton, wxID_ANY);
     sizer_16->Add(spin_button, 1, wxALL, 5);
-    notebook_1_wxSpinButton->SetSizer(sizer_16);
+    notebook_1_wxSpinCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxSpinCtrl, _("wxSpinCtrl"));
+    wxBoxSizer* sizer_14 = new wxBoxSizer(wxHORIZONTAL);
+    spin_ctrl_1 = new wxSpinCtrl(notebook_1_wxSpinCtrl, wxID_ANY, wxT("4"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100);
     sizer_14->Add(spin_ctrl_1, 1, wxALL, 5);
-    notebook_1_wxSpinCtrl->SetSizer(sizer_14);
+    notebook_1_wxSplitterWindow_horizontal = new wxScrolledWindow(notebook_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    notebook_1_wxSplitterWindow_horizontal->SetScrollRate(10, 10);
+    notebook_1->AddPage(notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"));
+    wxBoxSizer* sizer_29 = new wxBoxSizer(wxHORIZONTAL);
+    splitter_1 = new wxSplitterWindow(notebook_1_wxSplitterWindow_horizontal, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    splitter_1->SetMinimumPaneSize(20);
+    sizer_29->Add(splitter_1, 1, wxALL|wxEXPAND, 5);
+    splitter_1_pane_1 = new wxPanel(splitter_1, wxID_ANY);
+    wxBoxSizer* sizer_30 = new wxBoxSizer(wxHORIZONTAL);
+    label_top_pane = new wxStaticText(splitter_1_pane_1, wxID_ANY, _("top pane"));
     sizer_30->Add(label_top_pane, 1, wxALL|wxEXPAND, 5);
-    splitter_1_pane_1->SetSizer(sizer_30);
+    splitter_1_pane_2 = new wxPanel(splitter_1, wxID_ANY);
+    wxBoxSizer* sizer_31 = new wxBoxSizer(wxHORIZONTAL);
+    label_buttom_pane = new wxStaticText(splitter_1_pane_2, wxID_ANY, _("bottom pane"));
     sizer_31->Add(label_buttom_pane, 1, wxALL|wxEXPAND, 5);
-    splitter_1_pane_2->SetSizer(sizer_31);
-    splitter_1->SplitHorizontally(splitter_1_pane_1, splitter_1_pane_2);
-    sizer_29->Add(splitter_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxSplitterWindow_horizontal->SetSizer(sizer_29);
+    notebook_1_wxSplitterWindow_vertical = new wxScrolledWindow(notebook_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    notebook_1_wxSplitterWindow_vertical->SetScrollRate(10, 10);
+    notebook_1->AddPage(notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"));
+    wxBoxSizer* sizer_25 = new wxBoxSizer(wxHORIZONTAL);
+    splitter_2 = new wxSplitterWindow(notebook_1_wxSplitterWindow_vertical, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    splitter_2->SetMinimumPaneSize(20);
+    sizer_25->Add(splitter_2, 1, wxALL|wxEXPAND, 5);
+    splitter_2_pane_1 = new wxPanel(splitter_2, wxID_ANY);
+    wxBoxSizer* sizer_32 = new wxBoxSizer(wxVERTICAL);
+    label_left_pane = new wxStaticText(splitter_2_pane_1, wxID_ANY, _("left pane"));
     sizer_32->Add(label_left_pane, 1, wxALL|wxEXPAND, 5);
-    splitter_2_pane_1->SetSizer(sizer_32);
+    splitter_2_pane_2 = new wxPanel(splitter_2, wxID_ANY);
+    wxBoxSizer* sizer_33 = new wxBoxSizer(wxVERTICAL);
+    label_right_pane = new wxStaticText(splitter_2_pane_2, wxID_ANY, _("right pane"));
     sizer_33->Add(label_right_pane, 1, wxALL|wxEXPAND, 5);
-    splitter_2_pane_2->SetSizer(sizer_33);
-    splitter_2->SplitVertically(splitter_2_pane_1, splitter_2_pane_2);
-    sizer_25->Add(splitter_2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxSplitterWindow_vertical->SetSizer(sizer_25);
+    notebook_1_wxStaticBitmap = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxStaticBitmap, _("wxStaticBitmap"));
+    wxBoxSizer* sizer_11 = new wxBoxSizer(wxVERTICAL);
+    bitmap_empty = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxBitmap(32, 32));
     sizer_11->Add(bitmap_empty, 1, wxALL|wxEXPAND, 5);
+    bitmap_file = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxBitmap(wxT("icon.png"), wxBITMAP_TYPE_ANY));
     sizer_11->Add(bitmap_file, 1, wxALL|wxEXPAND, 5);
+    bitmap_nofile = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxBitmap(wxT("non-existing.bmp"), wxBITMAP_TYPE_ANY));
     sizer_11->Add(bitmap_nofile, 1, wxALL|wxEXPAND, 5);
+    bitmap_art = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxArtProvider::GetBitmap(wxART_PRINT, wxART_OTHER, wxSize(32, 32)));
     sizer_11->Add(bitmap_art, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxStaticBitmap->SetSizer(sizer_11);
+    notebook_1_wxStaticLine = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxStaticLine, _("wxStaticLine"));
+    wxBoxSizer* sizer_9 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* sizer_10 = new wxBoxSizer(wxHORIZONTAL);
+    sizer_9->Add(sizer_10, 1, wxEXPAND, 0);
+    static_line_2 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL);
     sizer_10->Add(static_line_2, 1, wxALL|wxEXPAND, 5);
+    static_line_3 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL);
     sizer_10->Add(static_line_3, 1, wxALL|wxEXPAND, 5);
-    sizer_9->Add(sizer_10, 1, wxEXPAND, 0);
+    static_line_4 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY);
     sizer_9->Add(static_line_4, 1, wxALL|wxEXPAND, 5);
+    static_line_5 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY);
     sizer_9->Add(static_line_5, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxStaticLine->SetSizer(sizer_9);
+    notebook_1_wxStaticText = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxStaticText, _("wxStaticText"));
+    wxFlexGridSizer* grid_sizer_3 = new wxFlexGridSizer(1, 3, 0, 0);
+    label_1 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("red text (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    label_1->SetForegroundColour(wxColour(255, 0, 0));
     grid_sizer_3->Add(label_1, 1, wxALL|wxEXPAND, 5);
+    label_4 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("black on red (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    label_4->SetBackgroundColour(wxColour(255, 0, 0));
+    label_4->SetToolTip(_("Background colour won't show, check documentation for more details"));
     grid_sizer_3->Add(label_4, 1, wxALL|wxEXPAND, 5);
+    label_5 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("green on pink (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    label_5->SetBackgroundColour(wxColour(255, 0, 255));
+    label_5->SetForegroundColour(wxColour(0, 255, 0));
+    label_5->SetToolTip(_("Background colour won't show, check documentation for more details"));
     grid_sizer_3->Add(label_5, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxStaticText->SetSizer(grid_sizer_3);
+    notebook_1_Spacer = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_Spacer, _("Spacer"));
+    wxFlexGridSizer* grid_sizer_4 = new wxFlexGridSizer(1, 3, 0, 0);
+    label_3 = new wxStaticText(notebook_1_Spacer, wxID_ANY, _("Two labels with a"));
     grid_sizer_4->Add(label_3, 1, wxALL|wxEXPAND, 5);
     grid_sizer_4->Add(60, 20, 1, wxALL|wxEXPAND, 5);
+    label_2 = new wxStaticText(notebook_1_Spacer, wxID_ANY, _("spacer between"));
     grid_sizer_4->Add(label_2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_Spacer->SetSizer(grid_sizer_4);
+    notebook_1_wxTextCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxTextCtrl, _("wxTextCtrl"));
+    wxBoxSizer* sizer_18 = new wxBoxSizer(wxHORIZONTAL);
+    text_ctrl = new wxTextCtrl(notebook_1_wxTextCtrl, wxID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), wxDefaultPosition, wxDefaultSize, wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_WORDWRAP);
     sizer_18->Add(text_ctrl, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxTextCtrl->SetSizer(sizer_18);
+    notebook_1_wxToggleButton = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxToggleButton, _("wxToggleButton"));
+    wxBoxSizer* sizer_23 = new wxBoxSizer(wxHORIZONTAL);
+    button_2 = new wxToggleButton(notebook_1_wxToggleButton, wxID_ANY, _("Toggle Button 1"));
     sizer_23->Add(button_2, 1, wxALL, 5);
+    button_4 = new wxToggleButton(notebook_1_wxToggleButton, wxID_ANY, _("Toggle Button 2"), wxDefaultPosition, wxDefaultSize, wxBU_BOTTOM|wxBU_EXACTFIT);
     sizer_23->Add(button_4, 1, wxALL, 5);
-    notebook_1_wxToggleButton->SetSizer(sizer_23);
-    sizer_24->Add(tree_ctrl_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxTreeCtrl->SetSizer(sizer_24);
-    notebook_1->AddPage(notebook_1_wxBitmapButton, _("wxBitmapButton"));
-    notebook_1->AddPage(notebook_1_wxButton, _("wxButton"));
-    notebook_1->AddPage(notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"));
-    notebook_1->AddPage(notebook_1_wxCheckBox, _("wxCheckBox"));
-    notebook_1->AddPage(notebook_1_wxCheckListBox, _("wxCheckListBox"));
-    notebook_1->AddPage(notebook_1_wxChoice, _("wxChoice"));
-    notebook_1->AddPage(notebook_1_wxComboBox, _("wxComboBox"));
-    notebook_1->AddPage(notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"));
-    notebook_1->AddPage(notebook_1_wxGauge, _("wxGauge"));
-    notebook_1->AddPage(notebook_1_wxGrid, _("wxGrid"));
-    notebook_1->AddPage(notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"));
-    notebook_1->AddPage(notebook_1_wxListBox, _("wxListBox"));
-    notebook_1->AddPage(notebook_1_wxListCtrl, _("wxListCtrl"));
-    notebook_1->AddPage(notebook_1_wxRadioBox, _("wxRadioBox"));
-    notebook_1->AddPage(notebook_1_wxRadioButton, _("wxRadioButton"));
-    notebook_1->AddPage(notebook_1_wxSlider, _("wxSlider"));
-    notebook_1->AddPage(notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"));
-    notebook_1->AddPage(notebook_1_wxSpinCtrl, _("wxSpinCtrl"));
-    notebook_1->AddPage(notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"));
-    notebook_1->AddPage(notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"));
-    notebook_1->AddPage(notebook_1_wxStaticBitmap, _("wxStaticBitmap"));
-    notebook_1->AddPage(notebook_1_wxStaticLine, _("wxStaticLine"));
-    notebook_1->AddPage(notebook_1_wxStaticText, _("wxStaticText"));
-    notebook_1->AddPage(notebook_1_Spacer, _("Spacer"));
-    notebook_1->AddPage(notebook_1_wxTextCtrl, _("wxTextCtrl"));
-    notebook_1->AddPage(notebook_1_wxToggleButton, _("wxToggleButton"));
+    notebook_1_wxTreeCtrl = new wxPanel(notebook_1, wxID_ANY);
     notebook_1->AddPage(notebook_1_wxTreeCtrl, _("wxTreeCtrl"));
-    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
+    wxBoxSizer* sizer_24 = new wxBoxSizer(wxHORIZONTAL);
+    tree_ctrl_1 = new wxTreeCtrl(notebook_1_wxTreeCtrl, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    sizer_24->Add(tree_ctrl_1, 1, wxALL|wxEXPAND, 5);
+    static_line_1 = new wxStaticLine(this, wxID_ANY);
     sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
+    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 2, 0, 0);
+    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
+    button_5 = new wxButton(this, wxID_CLOSE, wxEmptyString);
     sizer_2->Add(button_5, 0, wxALIGN_RIGHT|wxALL, 5);
+    button_1 = new wxButton(this, wxID_OK, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
     sizer_2->Add(button_1, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
-    SetSizer(sizer_1);
-    sizer_1->SetSizeHints(this);
+    
+    notebook_1_wxTreeCtrl->SetSizer(sizer_24);
+    notebook_1_wxToggleButton->SetSizer(sizer_23);
+    notebook_1_wxTextCtrl->SetSizer(sizer_18);
+    notebook_1_Spacer->SetSizer(grid_sizer_4);
+    notebook_1_wxStaticText->SetSizer(grid_sizer_3);
+    notebook_1_wxStaticLine->SetSizer(sizer_9);
+    notebook_1_wxStaticBitmap->SetSizer(sizer_11);
+    splitter_2_pane_2->SetSizer(sizer_33);
+    splitter_2_pane_1->SetSizer(sizer_32);
+    splitter_2->SplitVertically(splitter_2_pane_1, splitter_2_pane_2);
+    notebook_1_wxSplitterWindow_vertical->SetSizer(sizer_25);
+    splitter_1_pane_2->SetSizer(sizer_31);
+    splitter_1_pane_1->SetSizer(sizer_30);
+    splitter_1->SplitHorizontally(splitter_1_pane_1, splitter_1_pane_2);
+    notebook_1_wxSplitterWindow_horizontal->SetSizer(sizer_29);
+    notebook_1_wxSpinCtrl->SetSizer(sizer_14);
+    notebook_1_wxSpinButton->SetSizer(sizer_16);
+    notebook_1_wxSlider->SetSizer(sizer_22);
+    notebook_1_wxRadioButton->SetSizer(sizer_8);
+    notebook_1_wxRadioBox->SetSizer(grid_sizer_1);
+    notebook_1_wxListCtrl->SetSizer(sizer_3);
+    notebook_1_wxListBox->SetSizer(sizer_4);
+    notebook_1_wxHyperlinkCtrl->SetSizer(sizer_20);
+    notebook_1_wxGrid->SetSizer(sizer_19);
+    notebook_1_wxGauge->SetSizer(sizer_15);
+    notebook_1_wxDatePickerCtrl->SetSizer(sizer_17);
+    notebook_1_wxComboBox->SetSizer(sizer_6);
+    notebook_1_wxChoice->SetSizer(sizer_5);
+    notebook_1_wxCheckListBox->SetSizer(sizer_26);
+    notebook_1_wxCheckBox->SetSizer(sizer_21);
+    notebook_1_wxCalendarCtrl->SetSizer(sizer_12);
+    notebook_1_wxButton->SetSizer(sizer_28);
+    sizer_13->AddGrowableRow(0);
+    sizer_13->AddGrowableRow(1);
+    sizer_13->AddGrowableCol(0);
+    sizer_13->AddGrowableCol(1);
+    notebook_1_wxBitmapButton->SetSizer(sizer_13);
     sizer_1->AddGrowableRow(0);
     sizer_1->AddGrowableCol(0);
+    SetSizer(sizer_1);
+    sizer_1->SetSizeHints(this);
     Layout();
     Centre();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_28.h wxglade-1.0.1/tests/casefiles/AllWidgets_28.h
--- wxglade-0.9.6/tests/casefiles/AllWidgets_28.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_28.h	2020-12-31 14:04:48.000000000 +0000
@@ -53,10 +53,6 @@
     All_Widgets_Frame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: All_Widgets_Frame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: All_Widgets_Frame::attributes
@@ -66,99 +62,99 @@
     wxMenuBar* All_Widgets_menubar;
     wxStatusBar* All_Widgets_statusbar;
     wxToolBar* All_Widgets_toolbar;
+    wxNotebook* notebook_1;
+    wxPanel* notebook_1_wxBitmapButton;
     wxBitmapButton* bitmap_button_icon1;
     wxBitmapButton* bitmap_button_empty1;
     wxBitmapButton* bitmap_button_icon2;
     wxBitmapButton* bitmap_button_art;
-    wxPanel* notebook_1_wxBitmapButton;
-    wxButton* button_3;
     wxPanel* notebook_1_wxButton;
-    wxCalendarCtrl* calendar_ctrl_1;
+    wxButton* button_3;
     wxPanel* notebook_1_wxCalendarCtrl;
+    wxCalendarCtrl* calendar_ctrl_1;
+    wxPanel* notebook_1_wxCheckBox;
     wxCheckBox* checkbox_1;
     wxCheckBox* checkbox_2;
     wxCheckBox* checkbox_3;
     wxCheckBox* checkbox_4;
     wxCheckBox* checkbox_5;
     wxCheckBox* checkbox_6;
-    wxPanel* notebook_1_wxCheckBox;
-    wxCheckListBox* check_list_box_1;
     wxPanel* notebook_1_wxCheckListBox;
+    wxCheckListBox* check_list_box_1;
+    wxPanel* notebook_1_wxChoice;
     wxChoice* choice_empty;
     wxChoice* choice_filled;
-    wxPanel* notebook_1_wxChoice;
+    wxPanel* notebook_1_wxComboBox;
     wxComboBox* combo_box_empty;
     wxComboBox* combo_box_filled;
-    wxPanel* notebook_1_wxComboBox;
-    wxDatePickerCtrl* datepicker_ctrl_1;
     wxPanel* notebook_1_wxDatePickerCtrl;
-    wxGauge* gauge_1;
+    wxDatePickerCtrl* datepicker_ctrl_1;
     wxPanel* notebook_1_wxGauge;
-    wxGrid* grid_1;
+    wxGauge* gauge_1;
     wxPanel* notebook_1_wxGrid;
-    wxHyperlinkCtrl* hyperlink_1;
+    wxGrid* grid_1;
     wxPanel* notebook_1_wxHyperlinkCtrl;
+    wxHyperlinkCtrl* hyperlink_1;
+    wxPanel* notebook_1_wxListBox;
     wxListBox* list_box_empty;
     wxListBox* list_box_filled;
-    wxPanel* notebook_1_wxListBox;
-    wxListCtrl* list_ctrl_1;
     wxPanel* notebook_1_wxListCtrl;
+    wxListCtrl* list_ctrl_1;
+    wxPanel* notebook_1_wxRadioBox;
     wxRadioBox* radio_box_empty1;
     wxRadioBox* radio_box_filled1;
     wxRadioBox* radio_box_empty2;
     wxRadioBox* radio_box_filled2;
-    wxPanel* notebook_1_wxRadioBox;
+    wxPanel* notebook_1_wxRadioButton;
     wxRadioButton* radio_btn_1;
     wxTextCtrl* text_ctrl_1;
     wxRadioButton* radio_btn_2;
     wxTextCtrl* text_ctrl_2;
     wxRadioButton* radio_btn_3;
     wxTextCtrl* text_ctrl_3;
-    wxPanel* notebook_1_wxRadioButton;
-    wxSlider* slider_1;
     wxPanel* notebook_1_wxSlider;
+    wxSlider* slider_1;
+    wxPanel* notebook_1_wxSpinButton;
     wxTextCtrl* tc_spin_button;
     wxSpinButton* spin_button;
-    wxPanel* notebook_1_wxSpinButton;
-    wxSpinCtrl* spin_ctrl_1;
     wxPanel* notebook_1_wxSpinCtrl;
-    wxStaticText* label_top_pane;
+    wxSpinCtrl* spin_ctrl_1;
+    wxScrolledWindow* notebook_1_wxSplitterWindow_horizontal;
+    wxSplitterWindow* splitter_1;
     wxPanel* splitter_1_pane_1;
-    wxStaticText* label_buttom_pane;
+    wxStaticText* label_top_pane;
     wxPanel* splitter_1_pane_2;
-    wxSplitterWindow* splitter_1;
-    wxScrolledWindow* notebook_1_wxSplitterWindow_horizontal;
-    wxStaticText* label_left_pane;
+    wxStaticText* label_buttom_pane;
+    wxScrolledWindow* notebook_1_wxSplitterWindow_vertical;
+    wxSplitterWindow* splitter_2;
     wxPanel* splitter_2_pane_1;
-    wxStaticText* label_right_pane;
+    wxStaticText* label_left_pane;
     wxPanel* splitter_2_pane_2;
-    wxSplitterWindow* splitter_2;
-    wxScrolledWindow* notebook_1_wxSplitterWindow_vertical;
+    wxStaticText* label_right_pane;
+    wxPanel* notebook_1_wxStaticBitmap;
     wxStaticBitmap* bitmap_empty;
     wxStaticBitmap* bitmap_file;
     wxStaticBitmap* bitmap_nofile;
     wxStaticBitmap* bitmap_art;
-    wxPanel* notebook_1_wxStaticBitmap;
+    wxPanel* notebook_1_wxStaticLine;
     wxStaticLine* static_line_2;
     wxStaticLine* static_line_3;
     wxStaticLine* static_line_4;
     wxStaticLine* static_line_5;
-    wxPanel* notebook_1_wxStaticLine;
+    wxPanel* notebook_1_wxStaticText;
     wxStaticText* label_1;
     wxStaticText* label_4;
     wxStaticText* label_5;
-    wxPanel* notebook_1_wxStaticText;
+    wxPanel* notebook_1_Spacer;
     wxStaticText* label_3;
     wxStaticText* label_2;
-    wxPanel* notebook_1_Spacer;
-    wxTextCtrl* text_ctrl;
     wxPanel* notebook_1_wxTextCtrl;
+    wxTextCtrl* text_ctrl;
+    wxPanel* notebook_1_wxToggleButton;
     wxToggleButton* button_2;
     wxToggleButton* button_4;
-    wxPanel* notebook_1_wxToggleButton;
-    wxTreeCtrl* tree_ctrl_1;
     wxPanel* notebook_1_wxTreeCtrl;
-    wxNotebook* notebook_1;
+    wxTreeCtrl* tree_ctrl_1;
     wxStaticLine* static_line_1;
     wxButton* button_5;
     wxButton* button_1;
@@ -167,13 +163,13 @@
     DECLARE_EVENT_TABLE();
 
 public:
-    void onSelectUnix(wxCommandEvent &event); // wxGlade: <event_handler>
-    void onSelectWindows(wxCommandEvent &event); // wxGlade: <event_handler>
-    void onRemoveTabs(wxCommandEvent &event); // wxGlade: <event_handler>
-    void onShowManual(wxCommandEvent &event); // wxGlade: <event_handler>
-    void OnNotebookPageChanged(wxNotebookEvent &event); // wxGlade: <event_handler>
-    void OnNotebookPageChanging(wxNotebookEvent &event); // wxGlade: <event_handler>
-    void onStartConverting(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void onSelectUnix(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void onSelectWindows(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void onRemoveTabs(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void onShowManual(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void OnNotebookPageChanged(wxNotebookEvent &event); // wxGlade: <event_handler>
+    virtual void OnNotebookPageChanging(wxNotebookEvent &event); // wxGlade: <event_handler>
+    virtual void onStartConverting(wxCommandEvent &event); // wxGlade: <event_handler>
 }; // wxGlade: end class
 
 
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_28.lisp wxglade-1.0.1/tests/casefiles/AllWidgets_28.lisp
--- wxglade-0.9.6/tests/casefiles/AllWidgets_28.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_28.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -60,137 +60,137 @@
         (All-Widgets-menubar :initform nil :accessor slot-All-Widgets-menubar)
         (All-Widgets-statusbar :initform nil :accessor slot-All-Widgets-statusbar)
         (All-Widgets-toolbar :initform nil :accessor slot-All-Widgets-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-wxBitmapButton :initform nil :accessor slot-notebook-1-wxBitmapButton)
+        (sizer-13 :initform nil :accessor slot-sizer-13)
         (bitmap-button-icon1 :initform nil :accessor slot-bitmap-button-icon1)
         (bitmap-button-empty1 :initform nil :accessor slot-bitmap-button-empty1)
         (bitmap-button-icon2 :initform nil :accessor slot-bitmap-button-icon2)
         (bitmap-button-art :initform nil :accessor slot-bitmap-button-art)
-        (sizer-13 :initform nil :accessor slot-sizer-13)
-        (notebook-1-wxBitmapButton :initform nil :accessor slot-notebook-1-wxBitmapButton)
-        (button-3 :initform nil :accessor slot-button-3)
-        (sizer-28 :initform nil :accessor slot-sizer-28)
         (notebook-1-wxButton :initform nil :accessor slot-notebook-1-wxButton)
-        (sizer-12 :initform nil :accessor slot-sizer-12)
+        (sizer-28 :initform nil :accessor slot-sizer-28)
+        (button-3 :initform nil :accessor slot-button-3)
         (notebook-1-wxCalendarCtrl :initform nil :accessor slot-notebook-1-wxCalendarCtrl)
+        (sizer-12 :initform nil :accessor slot-sizer-12)
+        (notebook-1-wxCheckBox :initform nil :accessor slot-notebook-1-wxCheckBox)
+        (sizer-21 :initform nil :accessor slot-sizer-21)
         (checkbox-1 :initform nil :accessor slot-checkbox-1)
         (checkbox-2 :initform nil :accessor slot-checkbox-2)
         (checkbox-3 :initform nil :accessor slot-checkbox-3)
         (checkbox-4 :initform nil :accessor slot-checkbox-4)
         (checkbox-5 :initform nil :accessor slot-checkbox-5)
         (checkbox-6 :initform nil :accessor slot-checkbox-6)
-        (sizer-21 :initform nil :accessor slot-sizer-21)
-        (notebook-1-wxCheckBox :initform nil :accessor slot-notebook-1-wxCheckBox)
-        (check-list-box-1 :initform nil :accessor slot-check-list-box-1)
-        (sizer-26 :initform nil :accessor slot-sizer-26)
         (notebook-1-wxCheckListBox :initform nil :accessor slot-notebook-1-wxCheckListBox)
+        (sizer-26 :initform nil :accessor slot-sizer-26)
+        (check-list-box-1 :initform nil :accessor slot-check-list-box-1)
+        (notebook-1-wxChoice :initform nil :accessor slot-notebook-1-wxChoice)
+        (sizer-5 :initform nil :accessor slot-sizer-5)
         (choice-empty :initform nil :accessor slot-choice-empty)
         (choice-filled :initform nil :accessor slot-choice-filled)
-        (sizer-5 :initform nil :accessor slot-sizer-5)
-        (notebook-1-wxChoice :initform nil :accessor slot-notebook-1-wxChoice)
+        (notebook-1-wxComboBox :initform nil :accessor slot-notebook-1-wxComboBox)
+        (sizer-6 :initform nil :accessor slot-sizer-6)
+        (sizer-7 :initform nil :accessor slot-sizer-7)
         (combo-box-empty :initform nil :accessor slot-combo-box-empty)
         (combo-box-filled :initform nil :accessor slot-combo-box-filled)
-        (sizer-7 :initform nil :accessor slot-sizer-7)
-        (sizer-6 :initform nil :accessor slot-sizer-6)
-        (notebook-1-wxComboBox :initform nil :accessor slot-notebook-1-wxComboBox)
-        (datepicker-ctrl-1 :initform nil :accessor slot-datepicker-ctrl-1)
-        (sizer-17 :initform nil :accessor slot-sizer-17)
         (notebook-1-wxDatePickerCtrl :initform nil :accessor slot-notebook-1-wxDatePickerCtrl)
-        (gauge-1 :initform nil :accessor slot-gauge-1)
-        (sizer-15 :initform nil :accessor slot-sizer-15)
+        (sizer-17 :initform nil :accessor slot-sizer-17)
+        (datepicker-ctrl-1 :initform nil :accessor slot-datepicker-ctrl-1)
         (notebook-1-wxGauge :initform nil :accessor slot-notebook-1-wxGauge)
-        (grid-1 :initform nil :accessor slot-grid-1)
-        (sizer-19 :initform nil :accessor slot-sizer-19)
+        (sizer-15 :initform nil :accessor slot-sizer-15)
+        (gauge-1 :initform nil :accessor slot-gauge-1)
         (notebook-1-wxGrid :initform nil :accessor slot-notebook-1-wxGrid)
-        (hyperlink-1 :initform nil :accessor slot-hyperlink-1)
-        (sizer-20 :initform nil :accessor slot-sizer-20)
+        (sizer-19 :initform nil :accessor slot-sizer-19)
+        (grid-1 :initform nil :accessor slot-grid-1)
         (notebook-1-wxHyperlinkCtrl :initform nil :accessor slot-notebook-1-wxHyperlinkCtrl)
+        (sizer-20 :initform nil :accessor slot-sizer-20)
+        (hyperlink-1 :initform nil :accessor slot-hyperlink-1)
+        (notebook-1-wxListBox :initform nil :accessor slot-notebook-1-wxListBox)
+        (sizer-4 :initform nil :accessor slot-sizer-4)
         (list-box-empty :initform nil :accessor slot-list-box-empty)
         (list-box-filled :initform nil :accessor slot-list-box-filled)
-        (sizer-4 :initform nil :accessor slot-sizer-4)
-        (notebook-1-wxListBox :initform nil :accessor slot-notebook-1-wxListBox)
-        (list-ctrl-1 :initform nil :accessor slot-list-ctrl-1)
-        (sizer-3 :initform nil :accessor slot-sizer-3)
         (notebook-1-wxListCtrl :initform nil :accessor slot-notebook-1-wxListCtrl)
+        (sizer-3 :initform nil :accessor slot-sizer-3)
+        (list-ctrl-1 :initform nil :accessor slot-list-ctrl-1)
+        (notebook-1-wxRadioBox :initform nil :accessor slot-notebook-1-wxRadioBox)
+        (grid-sizer-1 :initform nil :accessor slot-grid-sizer-1)
         (radio-box-empty1 :initform nil :accessor slot-radio-box-empty1)
         (radio-box-filled1 :initform nil :accessor slot-radio-box-filled1)
         (radio-box-empty2 :initform nil :accessor slot-radio-box-empty2)
         (radio-box-filled2 :initform nil :accessor slot-radio-box-filled2)
-        (grid-sizer-1 :initform nil :accessor slot-grid-sizer-1)
-        (notebook-1-wxRadioBox :initform nil :accessor slot-notebook-1-wxRadioBox)
+        (notebook-1-wxRadioButton :initform nil :accessor slot-notebook-1-wxRadioButton)
+        (sizer-8 :initform nil :accessor slot-sizer-8)
+        (grid-sizer-2 :initform nil :accessor slot-grid-sizer-2)
         (radio-btn-1 :initform nil :accessor slot-radio-btn-1)
         (text-ctrl-1 :initform nil :accessor slot-text-ctrl-1)
         (radio-btn-2 :initform nil :accessor slot-radio-btn-2)
         (text-ctrl-2 :initform nil :accessor slot-text-ctrl-2)
         (radio-btn-3 :initform nil :accessor slot-radio-btn-3)
         (text-ctrl-3 :initform nil :accessor slot-text-ctrl-3)
-        (grid-sizer-2 :initform nil :accessor slot-grid-sizer-2)
-        (sizer-8 :initform nil :accessor slot-sizer-8)
-        (notebook-1-wxRadioButton :initform nil :accessor slot-notebook-1-wxRadioButton)
-        (slider-1 :initform nil :accessor slot-slider-1)
-        (sizer-22 :initform nil :accessor slot-sizer-22)
         (notebook-1-wxSlider :initform nil :accessor slot-notebook-1-wxSlider)
+        (sizer-22 :initform nil :accessor slot-sizer-22)
+        (slider-1 :initform nil :accessor slot-slider-1)
+        (notebook-1-wxSpinButton :initform nil :accessor slot-notebook-1-wxSpinButton)
+        (sizer-16 :initform nil :accessor slot-sizer-16)
         (tc-spin-button :initform nil :accessor slot-tc-spin-button)
         (spin-button :initform nil :accessor slot-spin-button)
-        (sizer-16 :initform nil :accessor slot-sizer-16)
-        (notebook-1-wxSpinButton :initform nil :accessor slot-notebook-1-wxSpinButton)
-        (spin-ctrl-1 :initform nil :accessor slot-spin-ctrl-1)
-        (sizer-14 :initform nil :accessor slot-sizer-14)
         (notebook-1-wxSpinCtrl :initform nil :accessor slot-notebook-1-wxSpinCtrl)
-        (label-top-pane :initform nil :accessor slot-label-top-pane)
-        (sizer-30 :initform nil :accessor slot-sizer-30)
+        (sizer-14 :initform nil :accessor slot-sizer-14)
+        (spin-ctrl-1 :initform nil :accessor slot-spin-ctrl-1)
+        (notebook-1-wxSplitterWindow-horizontal :initform nil :accessor slot-notebook-1-wxSplitterWindow-horizontal)
+        (sizer-29 :initform nil :accessor slot-sizer-29)
+        (splitter-1 :initform nil :accessor slot-splitter-1)
         (splitter-1-pane-1 :initform nil :accessor slot-splitter-1-pane-1)
-        (label-buttom-pane :initform nil :accessor slot-label-buttom-pane)
-        (sizer-31 :initform nil :accessor slot-sizer-31)
+        (sizer-30 :initform nil :accessor slot-sizer-30)
+        (label-top-pane :initform nil :accessor slot-label-top-pane)
         (splitter-1-pane-2 :initform nil :accessor slot-splitter-1-pane-2)
-        (splitter-1 :initform nil :accessor slot-splitter-1)
-        (sizer-29 :initform nil :accessor slot-sizer-29)
-        (notebook-1-wxSplitterWindow-horizontal :initform nil :accessor slot-notebook-1-wxSplitterWindow-horizontal)
-        (label-left-pane :initform nil :accessor slot-label-left-pane)
-        (sizer-32 :initform nil :accessor slot-sizer-32)
+        (sizer-31 :initform nil :accessor slot-sizer-31)
+        (label-buttom-pane :initform nil :accessor slot-label-buttom-pane)
+        (notebook-1-wxSplitterWindow-vertical :initform nil :accessor slot-notebook-1-wxSplitterWindow-vertical)
+        (sizer-25 :initform nil :accessor slot-sizer-25)
+        (splitter-2 :initform nil :accessor slot-splitter-2)
         (splitter-2-pane-1 :initform nil :accessor slot-splitter-2-pane-1)
-        (label-right-pane :initform nil :accessor slot-label-right-pane)
-        (sizer-33 :initform nil :accessor slot-sizer-33)
+        (sizer-32 :initform nil :accessor slot-sizer-32)
+        (label-left-pane :initform nil :accessor slot-label-left-pane)
         (splitter-2-pane-2 :initform nil :accessor slot-splitter-2-pane-2)
-        (splitter-2 :initform nil :accessor slot-splitter-2)
-        (sizer-25 :initform nil :accessor slot-sizer-25)
-        (notebook-1-wxSplitterWindow-vertical :initform nil :accessor slot-notebook-1-wxSplitterWindow-vertical)
+        (sizer-33 :initform nil :accessor slot-sizer-33)
+        (label-right-pane :initform nil :accessor slot-label-right-pane)
+        (notebook-1-wxStaticBitmap :initform nil :accessor slot-notebook-1-wxStaticBitmap)
+        (sizer-11 :initform nil :accessor slot-sizer-11)
         (bitmap-empty :initform nil :accessor slot-bitmap-empty)
         (bitmap-file :initform nil :accessor slot-bitmap-file)
         (bitmap-nofile :initform nil :accessor slot-bitmap-nofile)
         (bitmap-art :initform nil :accessor slot-bitmap-art)
-        (sizer-11 :initform nil :accessor slot-sizer-11)
-        (notebook-1-wxStaticBitmap :initform nil :accessor slot-notebook-1-wxStaticBitmap)
+        (notebook-1-wxStaticLine :initform nil :accessor slot-notebook-1-wxStaticLine)
+        (sizer-9 :initform nil :accessor slot-sizer-9)
+        (sizer-10 :initform nil :accessor slot-sizer-10)
         (static-line-2 :initform nil :accessor slot-static-line-2)
         (static-line-3 :initform nil :accessor slot-static-line-3)
-        (sizer-10 :initform nil :accessor slot-sizer-10)
         (static-line-4 :initform nil :accessor slot-static-line-4)
         (static-line-5 :initform nil :accessor slot-static-line-5)
-        (sizer-9 :initform nil :accessor slot-sizer-9)
-        (notebook-1-wxStaticLine :initform nil :accessor slot-notebook-1-wxStaticLine)
+        (notebook-1-wxStaticText :initform nil :accessor slot-notebook-1-wxStaticText)
+        (grid-sizer-3 :initform nil :accessor slot-grid-sizer-3)
         (label-1 :initform nil :accessor slot-label-1)
         (label-4 :initform nil :accessor slot-label-4)
         (label-5 :initform nil :accessor slot-label-5)
-        (grid-sizer-3 :initform nil :accessor slot-grid-sizer-3)
-        (notebook-1-wxStaticText :initform nil :accessor slot-notebook-1-wxStaticText)
+        (notebook-1-Spacer :initform nil :accessor slot-notebook-1-Spacer)
+        (grid-sizer-4 :initform nil :accessor slot-grid-sizer-4)
         (label-3 :initform nil :accessor slot-label-3)
         (label-2 :initform nil :accessor slot-label-2)
-        (grid-sizer-4 :initform nil :accessor slot-grid-sizer-4)
-        (notebook-1-Spacer :initform nil :accessor slot-notebook-1-Spacer)
-        (text-ctrl :initform nil :accessor slot-text-ctrl)
-        (sizer-18 :initform nil :accessor slot-sizer-18)
         (notebook-1-wxTextCtrl :initform nil :accessor slot-notebook-1-wxTextCtrl)
+        (sizer-18 :initform nil :accessor slot-sizer-18)
+        (text-ctrl :initform nil :accessor slot-text-ctrl)
+        (notebook-1-wxToggleButton :initform nil :accessor slot-notebook-1-wxToggleButton)
+        (sizer-23 :initform nil :accessor slot-sizer-23)
         (button-2 :initform nil :accessor slot-button-2)
         (button-4 :initform nil :accessor slot-button-4)
-        (sizer-23 :initform nil :accessor slot-sizer-23)
-        (notebook-1-wxToggleButton :initform nil :accessor slot-notebook-1-wxToggleButton)
-        (tree-ctrl-1 :initform nil :accessor slot-tree-ctrl-1)
-        (sizer-24 :initform nil :accessor slot-sizer-24)
         (notebook-1-wxTreeCtrl :initform nil :accessor slot-notebook-1-wxTreeCtrl)
-        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (sizer-24 :initform nil :accessor slot-sizer-24)
+        (tree-ctrl-1 :initform nil :accessor slot-tree-ctrl-1)
         (static-line-1 :initform nil :accessor slot-static-line-1)
-        (button-5 :initform nil :accessor slot-button-5)
-        (button-1 :initform nil :accessor slot-button-1)
         (sizer-2 :initform nil :accessor slot-sizer-2)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (button-5 :initform nil :accessor slot-button-5)
+        (button-1 :initform nil :accessor slot-button-1)))
 
 (defun make-All_Widgets_Frame ()
         (let ((obj (make-instance 'All_Widgets_Frame)))
@@ -204,6 +204,8 @@
         ;;; begin wxGlade: All_Widgets_Frame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
         (slot-top-window obj).wxWindow_SetSize((800, 417))
+        (wxFrame_SetTitle (slot-top-window obj) (_"All Widgets"))
+        ;;; generating code for setting icons is not implemented
         
         ;;; Menu Bar
         (setf (slot-All-Widgets-menubar obj) (wxMenuBar_Create 0))
@@ -228,341 +230,496 @@
         		(wxMenuBar_Append (slot-All-Widgets-menubar obj) wxglade_tmp_menu (_"&Help")))
         (wxFrame_SetMenuBar (slot-top-window obj) (slot-All-Widgets-menubar obj))
         ;;; Menu Bar end
-
+        
         (setf (slot-All-Widgets-statusbar obj) (wxFrame_CreateStatusBar (slot-top-window obj) 1 wxST_SIZEGRIP))
+        (wxStatusBar_SetStatusWidths (slot-All-Widgets-statusbar obj) 1 (vector -1))
+        (wxStatusBar_SetStatusText (slot-All-Widgets-statusbar obj) (_"All Widgets statusbar") 0)
         
-	;;; Tool Bar
+        ;;; Tool Bar
         (setf (slot-All-Widgets-toolbar obj) (wxToolBar_Create (slot-top-window obj) -1 -1 -1 -1 -1 wxTB_HORIZONTAL))
-        (wxFrame_SetToolBar (slot-top-window obj) (slot-All-Widgets-toolbar obj))
         (wxToolBar_AddTool (slot-All-Widgets-toolbar obj) wxID_UP (_"UpDown") wxArtProvider_GetBitmap(wxART_GO_UP wxART_OTHER wxSize_Create(32 32)) wxArtProvider_GetBitmap(wxART_GO_DOWN wxART_OTHER wxSize_Create(32 32)) wxITEM_CHECK (_"Up or Down") (_"Up or Down"))
         (wxToolBar_AddTool (slot-All-Widgets-toolbar obj) wxID_OPEN (_"Open") wxBitmap_Create(32 32) wxNullBitmap wxITEM_NORMAL (_"Open a new file") (_"Open a new file"))
+        (wxFrame_SetToolBar (slot-top-window obj) (slot-All-Widgets-toolbar obj))
+        (wxToolBar_Realize (slot-All-Widgets-toolbar obj))
         ;;; Tool Bar end
+        
+        (setf (slot-sizer-1 obj) (wxGridSizer_Create 3 1 0 0))
+        
         (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxNB_BOTTOM))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
+        
         (setf (slot-notebook-1-wxBitmapButton obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        (setf (slot-bitmap-button-icon1 obj) (wxBitmapButton_Create (slot-notebook-1-wxBitmapButton obj) wxID_ANY (wxBitmap_CreateLoad "icon.xpm" wxBITMAP_TYPE_ANY) -1 -1 -1 -1 wxBU_EXACTFIT|wxBU_NOTEXT|wxBU_AUTODRAW))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxBitmapButton obj) (_"wxBitmapButton") 1 -1)
+        
+        (setf (slot-sizer-13 obj) (wxGridSizer_Create 2 2 0 0))
+        
+        (setf (slot-bitmap-button-icon1 obj) (wxBitmapButton_Create (slot-notebook-1-wxBitmapButton obj) wxID_ANY (wxBitmap_CreateLoad "icon.png" wxBITMAP_TYPE_ANY) -1 -1 -1 -1 wxBU_EXACTFIT|wxBU_NOTEXT|wxBU_AUTODRAW))
+        (slot-bitmap-button-icon1 obj).wxWindow_SetSize((slot-bitmap-button-icon1 obj).wxWindow_GetBestSize())
+        (wxButton_SetDefault (slot-bitmap-button-icon1 obj))
+        (wxSizer_AddWindow (slot-sizer-13 obj) (slot-bitmap-button-icon1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-bitmap-button-empty1 obj) (wxBitmapButton_Create (slot-notebook-1-wxBitmapButton obj) wxID_ANY wxBitmap_Create(10 10) -1 -1 -1 -1 wxBU_EXACTFIT|wxBU_NOTEXT|wxBU_AUTODRAW))
-        (setf (slot-bitmap-button-icon2 obj) (wxBitmapButton_Create (slot-notebook-1-wxBitmapButton obj) wxID_ANY (wxBitmap_CreateLoad "icon.xpm" wxBITMAP_TYPE_ANY) -1 -1 -1 -1 (logior wxBORDER_NONE wxBU_BOTTOM)))
+        (slot-bitmap-button-empty1 obj).wxWindow_SetSize((slot-bitmap-button-empty1 obj).wxWindow_GetBestSize())
+        (wxButton_SetDefault (slot-bitmap-button-empty1 obj))
+        (wxSizer_AddWindow (slot-sizer-13 obj) (slot-bitmap-button-empty1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-bitmap-button-icon2 obj) (wxBitmapButton_Create (slot-notebook-1-wxBitmapButton obj) wxID_ANY (wxBitmap_CreateLoad "icon.png" wxBITMAP_TYPE_ANY) -1 -1 -1 -1 (logior wxBORDER_NONE wxBU_BOTTOM)))
+        (wxBitmapButton_SetBitmapDisabled (slot-(slot-bitmap-button-icon2 obj) obj) wxBitmap_Create(32 32))
+        (slot-bitmap-button-icon2 obj).wxWindow_SetSize((slot-bitmap-button-icon2 obj).wxWindow_GetBestSize())
+        (wxButton_SetDefault (slot-bitmap-button-icon2 obj))
+        (wxSizer_AddWindow (slot-sizer-13 obj) (slot-bitmap-button-icon2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-bitmap-button-art obj) (wxBitmapButton_Create (slot-notebook-1-wxBitmapButton obj) wxID_ANY wxArtProvider_GetBitmap(wxART_GO_UP wxART_OTHER wxSize_Create(32 32)) -1 -1 -1 -1 (logior wxBORDER_NONE wxBU_BOTTOM)))
+        (slot-bitmap-button-art obj).wxWindow_SetSize((slot-bitmap-button-art obj).wxWindow_GetBestSize())
+        (wxButton_SetDefault (slot-bitmap-button-art obj))
+        (wxSizer_AddWindow (slot-sizer-13 obj) (slot-bitmap-button-art obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-wxButton obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxButton obj) (_"wxButton") 1 -1)
+        
+        (setf (slot-sizer-28 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-button-3 obj) (wxButton_Create (slot-notebook-1-wxButton obj) wxID_BOLD "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-28 obj) (slot-button-3 obj) 0 wxALL 5 nil)
+        
         (setf (slot-notebook-1-wxCalendarCtrl obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxCalendarCtrl obj) (_"wxCalendarCtrl") 1 -1)
+        
+        (setf (slot-sizer-12 obj) (wxBoxSizer_Create wxHORIZONTAL))
         
         ;;; WARNING: Code for instance "calendar-ctrl-1" of "wxCalendarCtrl" not generated: no suitable writer found
         
+        
         (setf (slot-notebook-1-wxCheckBox obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxCheckBox obj) (_"wxCheckBox") 1 -1)
+        
+        (setf (slot-sizer-21 obj) (wxGridSizer_Create 2 3 0 0))
+        
         (setf (slot-checkbox-1 obj) (wxCheckBox_Create (slot-notebook-1-wxCheckBox obj) wxID_ANY (_"one (unchecked)") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-1 obj) 0 wxEXPAND 0 nil)
+        
         (setf (slot-checkbox-2 obj) (wxCheckBox_Create (slot-notebook-1-wxCheckBox obj) wxID_ANY (_"two (checked)") -1 -1 -1 -1 0))
+        (wxCheckBox_SetValue (slot-checkbox-2 obj) 1)
+        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-2 obj) 0 wxEXPAND 0 nil)
+        
         (setf (slot-checkbox-3 obj) (wxCheckBox_Create (slot-notebook-1-wxCheckBox obj) wxID_ANY (_"three") -1 -1 -1 -1 wxCHK_2STATE))
+        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-3 obj) 0 wxEXPAND 0 nil)
+        
         (setf (slot-checkbox-4 obj) (wxCheckBox_Create (slot-notebook-1-wxCheckBox obj) wxID_ANY (_"four (unchecked)") -1 -1 -1 -1 wxCHK_3STATE))
+        (wxCheckBox_Set3StateValue (slot-checkbox-4 obj) wxCHK_UNCHECKED)
+        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-4 obj) 0 wxEXPAND 0 nil)
+        
         (setf (slot-checkbox-5 obj) (wxCheckBox_Create (slot-notebook-1-wxCheckBox obj) wxID_ANY (_"five (checked)") -1 -1 -1 -1 (logior wxCHK_3STATE wxCHK_ALLOW_3RD_STATE_FOR_USER)))
+        (wxCheckBox_Set3StateValue (slot-checkbox-5 obj) wxCHK_CHECKED)
+        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-5 obj) 0 wxEXPAND 0 nil)
+        
         (setf (slot-checkbox-6 obj) (wxCheckBox_Create (slot-notebook-1-wxCheckBox obj) wxID_ANY (_"six (undetermined)") -1 -1 -1 -1 (logior wxCHK_3STATE wxCHK_ALLOW_3RD_STATE_FOR_USER)))
+        (wxCheckBox_Set3StateValue (slot-checkbox-6 obj) wxCHK_UNDETERMINED)
+        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-6 obj) 0 wxEXPAND 0 nil)
+        
         (setf (slot-notebook-1-wxCheckListBox obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxCheckListBox obj) (_"wxCheckListBox") 1 -1)
+        
+        (setf (slot-sizer-26 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-check-list-box-1 obj) (wxCheckListBox_Create (slot-notebook-1-wxCheckListBox obj) wxID_ANY -1 -1 -1 -1 4 (vector (_"one") (_"two") (_"three") (_"four")) 0))
+        (wxCheckListBox_SetSelection (slot-check-list-box-1 obj) 2)
+        (wxSizer_AddWindow (slot-sizer-26 obj) (slot-check-list-box-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-wxChoice obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxChoice obj) (_"wxChoice") 1 -1)
+        
+        (setf (slot-sizer-5 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-choice-empty obj) (wxChoice_Create (slot-notebook-1-wxChoice obj) wxID_ANY -1 -1 -1 -1 0 (vector )  0))
+        (wxSizer_AddWindow (slot-sizer-5 obj) (slot-choice-empty obj) 1 wxALL 5 nil)
+        
         (setf (slot-choice-filled obj) (wxChoice_Create (slot-notebook-1-wxChoice obj) wxID_ANY -1 -1 -1 -1 2 (vector (_"Item 1") (_"Item 2 (pre-selected)"))  0))
+        (wxChoice_SetSelection (slot-choice-filled obj) 1)
+        (wxSizer_AddWindow (slot-sizer-5 obj) (slot-choice-filled obj) 1 wxALL 5 nil)
+        
         (setf (slot-notebook-1-wxComboBox obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxComboBox obj) (_"wxComboBox") 1 -1)
+        
+        (setf (slot-sizer-6 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-sizer-7 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-sizer-6 obj) (slot-sizer-7 obj) 1 wxEXPAND 0 nil)
+        
         (setf (slot-combo-box-empty obj) (wxComboBox_Create (slot-notebook-1-wxComboBox obj) wxID_ANY "" -1 -1 -1 -1 0 (vector ) 0))
+        (wxSizer_AddWindow (slot-sizer-7 obj) (slot-combo-box-empty obj) 1 wxALL 5 nil)
+        
         (setf (slot-combo-box-filled obj) (wxComboBox_Create (slot-notebook-1-wxComboBox obj) wxID_ANY "" -1 -1 -1 -1 2 (vector (_"Item 1 (pre-selected)") (_"Item 2")) 0))
+        (wxComboBox_SetSelection (slot-combo-box-filled obj) 0)
+        (wxSizer_AddWindow (slot-sizer-7 obj) (slot-combo-box-filled obj) 1 wxALL 5 nil)
+        
         (setf (slot-notebook-1-wxDatePickerCtrl obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxDatePickerCtrl obj) (_"wxDatePickerCtrl") 1 -1)
+        
+        (setf (slot-sizer-17 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-datepicker-ctrl-1 obj) (wxDatePickerCtrl_Create (slot-notebook-1-wxDatePickerCtrl obj) wxID_ANY -1 -1 -1 -1 wxDP_SHOWCENTURY))
+        (wxSizer_AddWindow (slot-sizer-17 obj) (slot-datepicker-ctrl-1 obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
         (setf (slot-notebook-1-wxGauge obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxGauge obj) (_"wxGauge") 1 -1)
+        
+        (setf (slot-sizer-15 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-gauge-1 obj) (wxGauge_Create (slot-notebook-1-wxGauge obj) wxID_ANY 20 -1 -1 -1 -1 wxGA_HORIZONTAL))
+        (wxSizer_AddWindow (slot-sizer-15 obj) (slot-gauge-1 obj) 1 wxALL 5 nil)
+        
         (setf (slot-notebook-1-wxGrid obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxGrid obj) (_"wxGrid") 1 -1)
+        
+        (setf (slot-sizer-19 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-grid-1 obj) (wxGrid_Create (slot-notebook-1-wxGrid obj) wxID_ANY -1 -1 -1 -1 wxWANTS_CHARS))
+        (wxGrid_CreateGrid (slot-grid-1 obj) 10 3 0)
+        (wxGrid_SetSelectionMode (slot-grid-1 obj) wxGridSelectRows)
+        (wxSizer_AddWindow (slot-sizer-19 obj) (slot-grid-1 obj) 1 wxEXPAND 0 nil)
+        
         (setf (slot-notebook-1-wxHyperlinkCtrl obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxHyperlinkCtrl obj) (_"wxHyperlinkCtrl") 1 -1)
+        
+        (setf (slot-sizer-20 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-hyperlink-1 obj) (wxHyperlinkCtrl_Create (slot-notebook-1-wxHyperlinkCtrl obj) wxID_ANY (_"Homepage wxGlade") (_"http://wxglade.sf.net") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-20 obj) (slot-hyperlink-1 obj) 0 wxALL 5 nil)
+        
         (setf (slot-notebook-1-wxListBox obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        (setf (slot-list-box-empty obj) (wxListBox_Create (slot-notebook-1-wxListBox obj) wxID_ANY -1 -1 -1 -1 0 (vector ) 0))
-        (setf (slot-list-box-filled obj) (wxListBox_Create (slot-notebook-1-wxListBox obj) wxID_ANY -1 -1 -1 -1 2 (vector (_"Item 1") (_"Item 2 (pre-selected)")) (logior wxLB_MULTIPLE wxLB_SORT)))
-        (setf (slot-notebook-1-wxListCtrl obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxListBox obj) (_"wxListBox") 1 -1)
+        
+        (setf (slot-sizer-4 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-list-box-empty obj) (wxListBox_Create (slot-notebook-1-wxListBox obj) wxID_ANY -1 -1 -1 -1 0 (vector ) 0))
+        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-list-box-empty obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-list-box-filled obj) (wxListBox_Create (slot-notebook-1-wxListBox obj) wxID_ANY -1 -1 -1 -1 2 (vector (_"Item 1") (_"Item 2 (pre-selected)")) (logior wxLB_MULTIPLE wxLB_SORT)))
+        (wxListBox_SetSelection (slot-list-box-filled obj) 1)
+        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-list-box-filled obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-notebook-1-wxListCtrl obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxListCtrl obj) (_"wxListCtrl") 1 -1)
+        
+        (setf (slot-sizer-3 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-list-ctrl-1 obj) (wxListCtrl_Create (slot-notebook-1-wxListCtrl obj) wxID_ANY -1 -1 -1 -1 (logior wxBORDER_SUNKEN wxLC_REPORT)))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-list-ctrl-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-wxRadioBox obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxRadioBox obj) (_"wxRadioBox") 1 -1)
+        
+        (setf (slot-grid-sizer-1 obj) (wxGridSizer_Create 2 2 0 0))
+        
         (setf (slot-radio-box-empty1 obj) (wxRadioBox_Create (slot-notebook-1-wxRadioBox obj) wxID_ANY (_"radio_box_empty1") -1 -1 -1 -1 0 (vector ) 1 wxRA_SPECIFY_ROWS))
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-radio-box-empty1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-radio-box-filled1 obj) (wxRadioBox_Create (slot-notebook-1-wxRadioBox obj) wxID_ANY (_"radio_box_filled1") -1 -1 -1 -1 3 (vector (_"choice 1") (_"choice 2 (pre-selected)") (_"choice 3")) 0 wxRA_SPECIFY_ROWS))
+        (wxRadioBox_SetSelection (slot-radio-box-filled1 obj) 1)
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-radio-box-filled1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-radio-box-empty2 obj) (wxRadioBox_Create (slot-notebook-1-wxRadioBox obj) wxID_ANY (_"radio_box_empty2") -1 -1 -1 -1 0 (vector ) 1 wxRA_SPECIFY_COLS))
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-radio-box-empty2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-radio-box-filled2 obj) (wxRadioBox_Create (slot-notebook-1-wxRadioBox obj) wxID_ANY (_"radio_box_filled2") -1 -1 -1 -1 2 (vector (_"choice 1") (_"choice 2 (pre-selected)")) 0 wxRA_SPECIFY_COLS))
+        (wxRadioBox_SetSelection (slot-radio-box-filled2 obj) 1)
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-radio-box-filled2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-wxRadioButton obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxRadioButton obj) (_"wxRadioButton") 1 -1)
+        
+        (setf (slot-sizer-8 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-notebook-1-wxRadioButton obj) (_"My RadioButton Group")) wxHORIZONTAL))
+        
+        (setf (slot-grid-sizer-2 obj) (wxGridSizer_Create 3 2 0 0))
+        (wxSizer_AddSizer (slot-sizer-8 obj) (slot-grid-sizer-2 obj) 1 wxEXPAND 0 nil)
+        
         (setf (slot-radio-btn-1 obj) (wxRadioButton_Create (slot-notebook-1-wxRadioButton obj) wxID_ANY (_"Alice") -1 -1 -1 -1 wxRB_GROUP))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-radio-btn-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-notebook-1-wxRadioButton obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-text-ctrl-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-radio-btn-2 obj) (wxRadioButton_Create (slot-notebook-1-wxRadioButton obj) wxID_ANY (_"Bob") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-radio-btn-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-text-ctrl-2 obj) (wxTextCtrl_Create (slot-notebook-1-wxRadioButton obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-text-ctrl-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-radio-btn-3 obj) (wxRadioButton_Create (slot-notebook-1-wxRadioButton obj) wxID_ANY (_"Malroy") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-radio-btn-3 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-text-ctrl-3 obj) (wxTextCtrl_Create (slot-notebook-1-wxRadioButton obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-text-ctrl-3 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-wxSlider obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxSlider obj) (_"wxSlider") 1 -1)
+        
+        (setf (slot-sizer-22 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-slider-1 obj) (wxSlider_Create (slot-notebook-1-wxSlider obj) wxID_ANY 5 0 10 -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-22 obj) (slot-slider-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-wxSpinButton obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxSpinButton obj) (_"wxSpinButton (with wxTextCtrl)") 1 -1)
+        
+        (setf (slot-sizer-16 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-tc-spin-button obj) (wxTextCtrl_Create (slot-notebook-1-wxSpinButton obj) wxID_ANY (_"1") -1 -1 -1 -1 wxTE_RIGHT))
+        (wxSizer_AddWindow (slot-sizer-16 obj) (slot-tc-spin-button obj) 1 wxALL 5 nil)
+        
         (setf (slot-spin-button obj) (wxSpinButton_Create (slot-notebook-1-wxSpinButton obj) wxID_ANY -1 -1 -1 -1 wxSP_VERTICAL))
+        (wxSizer_AddWindow (slot-sizer-16 obj) (slot-spin-button obj) 1 wxALL 5 nil)
+        
         (setf (slot-notebook-1-wxSpinCtrl obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxSpinCtrl obj) (_"wxSpinCtrl") 1 -1)
+        
+        (setf (slot-sizer-14 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-spin-ctrl-1 obj) (wxSpinCtrl_Create (slot-notebook-1-wxSpinCtrl obj) wxID_ANY 4 -1 -1 -1 -1 wxSP_ARROW_KEYS 0 100 4))
+        (wxSizer_AddWindow (slot-sizer-14 obj) (slot-spin-ctrl-1 obj) 1 wxALL 5 nil)
+        
         (setf (slot-notebook-1-wxSplitterWindow-horizontal obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-notebook-1-wxSplitterWindow-horizontal obj) 10  10)
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxSplitterWindow-horizontal obj) (_"wxSplitterWindow (horizontally)") 1 -1)
+        
+        (setf (slot-sizer-29 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-splitter-1 obj) (wxSplitterWindow_Create (slot-notebook-1-wxSplitterWindow-horizontal obj) wxID_ANY -1 -1 -1 -1 0))
+        wxSplitterWindow_SetMinimumPaneSize (slot-splitter-1 obj) 20)
+        (wxSizer_AddWindow (slot-sizer-29 obj) (slot-splitter-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-splitter-1-pane-1 obj) (wxPanel_Create (slot-splitter-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        
+        (setf (slot-sizer-30 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-label-top-pane obj) (wxStaticText_Create (slot-splitter-1-pane-1 obj) wxID_ANY (_"top pane") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-30 obj) (slot-label-top-pane obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-splitter-1-pane-2 obj) (wxPanel_Create (slot-splitter-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        
+        (setf (slot-sizer-31 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-label-buttom-pane obj) (wxStaticText_Create (slot-splitter-1-pane-2 obj) wxID_ANY (_"bottom pane") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-31 obj) (slot-label-buttom-pane obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-wxSplitterWindow-vertical obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-notebook-1-wxSplitterWindow-vertical obj) 10  10)
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxSplitterWindow-vertical obj) (_"wxSplitterWindow (vertically)") 1 -1)
+        
+        (setf (slot-sizer-25 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-splitter-2 obj) (wxSplitterWindow_Create (slot-notebook-1-wxSplitterWindow-vertical obj) wxID_ANY -1 -1 -1 -1 0))
+        wxSplitterWindow_SetMinimumPaneSize (slot-splitter-2 obj) 20)
+        (wxSizer_AddWindow (slot-sizer-25 obj) (slot-splitter-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-splitter-2-pane-1 obj) (wxPanel_Create (slot-splitter-2 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        
+        (setf (slot-sizer-32 obj) (wxBoxSizer_Create wxVERTICAL))
+        
         (setf (slot-label-left-pane obj) (wxStaticText_Create (slot-splitter-2-pane-1 obj) wxID_ANY (_"left pane") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-32 obj) (slot-label-left-pane obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-splitter-2-pane-2 obj) (wxPanel_Create (slot-splitter-2 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        
+        (setf (slot-sizer-33 obj) (wxBoxSizer_Create wxVERTICAL))
+        
         (setf (slot-label-right-pane obj) (wxStaticText_Create (slot-splitter-2-pane-2 obj) wxID_ANY (_"right pane") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-33 obj) (slot-label-right-pane obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-wxStaticBitmap obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxStaticBitmap obj) (_"wxStaticBitmap") 1 -1)
+        
+        (setf (slot-sizer-11 obj) (wxBoxSizer_Create wxVERTICAL))
+        
         (setf (slot-bitmap-empty obj) (wxStaticBitmap_Create (slot-notebook-1-wxStaticBitmap obj) wxID_ANY  wxBitmap_Create(32 32) -1 -1 -1 -1 0))
-        (setf (slot-bitmap-file obj) (wxStaticBitmap_Create (slot-notebook-1-wxStaticBitmap obj) wxID_ANY  (wxBitmap_CreateLoad "icon.xpm" wxBITMAP_TYPE_ANY) -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-empty obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-bitmap-file obj) (wxStaticBitmap_Create (slot-notebook-1-wxStaticBitmap obj) wxID_ANY  (wxBitmap_CreateLoad "icon.png" wxBITMAP_TYPE_ANY) -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-file obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-bitmap-nofile obj) (wxStaticBitmap_Create (slot-notebook-1-wxStaticBitmap obj) wxID_ANY  (wxBitmap_CreateLoad "non-existing.bmp" wxBITMAP_TYPE_ANY) -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-nofile obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-bitmap-art obj) (wxStaticBitmap_Create (slot-notebook-1-wxStaticBitmap obj) wxID_ANY  wxArtProvider_GetBitmap(wxART_PRINT wxART_OTHER wxSize_Create(32 32)) -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-art obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-wxStaticLine obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxStaticLine obj) (_"wxStaticLine") 1 -1)
+        
+        (setf (slot-sizer-9 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-sizer-10 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-sizer-9 obj) (slot-sizer-10 obj) 1 wxEXPAND 0 nil)
+        
         (setf (slot-static-line-2 obj) (wxStaticLine_Create (slot-notebook-1-wxStaticLine obj) wxID_ANY -1 -1 -1 -1 wxLI_VERTICAL))
+        (wxSizer_AddWindow (slot-sizer-10 obj) (slot-static-line-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-static-line-3 obj) (wxStaticLine_Create (slot-notebook-1-wxStaticLine obj) wxID_ANY -1 -1 -1 -1 wxLI_VERTICAL))
+        (wxSizer_AddWindow (slot-sizer-10 obj) (slot-static-line-3 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-static-line-4 obj) (wxStaticLine_Create (slot-notebook-1-wxStaticLine obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
+        (wxSizer_AddWindow (slot-sizer-9 obj) (slot-static-line-4 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-static-line-5 obj) (wxStaticLine_Create (slot-notebook-1-wxStaticLine obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
+        (wxSizer_AddWindow (slot-sizer-9 obj) (slot-static-line-5 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-wxStaticText obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-notebook-1-wxStaticText obj) wxID_ANY (_"red text (RGB)") -1 -1 -1 -1 wxALIGN_CENTER))
-        (setf (slot-label-4 obj) (wxStaticText_Create (slot-notebook-1-wxStaticText obj) wxID_ANY (_"black on red (RGB)") -1 -1 -1 -1 wxALIGN_CENTER))
-        (setf (slot-label-5 obj) (wxStaticText_Create (slot-notebook-1-wxStaticText obj) wxID_ANY (_"green on pink (RGB)") -1 -1 -1 -1 wxALIGN_CENTER))
-        (setf (slot-notebook-1-Spacer obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        (setf (slot-label-3 obj) (wxStaticText_Create (slot-notebook-1-Spacer obj) wxID_ANY (_"Two labels with a") -1 -1 -1 -1 0))
-        (setf (slot-label-2 obj) (wxStaticText_Create (slot-notebook-1-Spacer obj) wxID_ANY (_"spacer between") -1 -1 -1 -1 0))
-        (setf (slot-notebook-1-wxTextCtrl obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        (setf (slot-text-ctrl obj) (wxTextCtrl_Create (slot-notebook-1-wxTextCtrl obj) wxID_ANY (_"This\nis\na\nmultiline\nwxTextCtrl") -1 -1 -1 -1 (logior wxTE_CHARWRAP wxTE_MULTILINE wxTE_WORDWRAP)))
-        (setf (slot-notebook-1-wxToggleButton obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        (setf (slot-button-2 obj) (wxToggleButton_Create (slot-notebook-1-wxToggleButton obj) wxID_ANY (_"Toggle Button 1") -1 -1 -1 -1 0))
-        (setf (slot-button-4 obj) (wxToggleButton_Create (slot-notebook-1-wxToggleButton obj) wxID_ANY (_"Toggle Button 2") -1 -1 -1 -1 (logior wxBU_BOTTOM wxBU_EXACTFIT)))
-        (setf (slot-notebook-1-wxTreeCtrl obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        (setf (slot-tree-ctrl-1 obj) (wxTreeCtrl_Create (slot-notebook-1-wxTreeCtrl obj) wxID_ANY -1 -1 -1 -1 0))
-        (setf (slot-static-line-1 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
-        (setf (slot-button-5 obj) (wxButton_Create (slot-top-window obj) wxID_CLOSE "" -1 -1 -1 -1 0))
-        (setf (slot-button-1 obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 wxBU_TOP))
-
-        (wxEvtHandler_Connect (slot-top-window obj) obj.notebook-1 (expwxEVT_NOTEBOOK_PAGE_CHANGED)
-        (wxClosure_Create #'OnNotebookPageChanged obj))
-        (wxEvtHandler_Connect (slot-top-window obj) obj.notebook-1 (expwxEVT_NOTEBOOK_PAGE_CHANGING)
-        (wxClosure_Create #'OnNotebookPageChanging obj))
-        (wxEvtHandler_Connect (slot-top-window obj) obj.button-1 (expwxEVT_BUTTON)
-        (wxClosure_Create #'onStartConverting obj))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj All_Widgets_Frame))
-        ;;; begin wxGlade: All_Widgets_Frame.__set_properties
-        (wxFrame_SetTitle (slot-top-window obj) (_"All Widgets"))
-        ;;; generating code for setting icons is not implemented
-        (wxStatusBar_SetStatusWidths (slot-All-Widgets-statusbar obj) 1 (vector -1))
-        (wxStatusBar_SetStatusText (slot-All-Widgets-statusbar obj) (_"All Widgets statusbar") 0)
-        (wxToolBar_Realize (slot-All-Widgets-toolbar obj))
-        (slot-bitmap-button-icon1 obj).wxWindow_SetSize((slot-bitmap-button-icon1 obj).wxWindow_GetBestSize())
-        (wxButton_SetDefault (slot-bitmap-button-icon1 obj))
-        (slot-bitmap-button-empty1 obj).wxWindow_SetSize((slot-bitmap-button-empty1 obj).wxWindow_GetBestSize())
-        (wxButton_SetDefault (slot-bitmap-button-empty1 obj))
-        (wxBitmapButton_SetBitmapDisabled (slot-(slot-bitmap-button-icon2 obj) obj) wxBitmap_Create(20 20))
-        (slot-bitmap-button-icon2 obj).wxWindow_SetSize((slot-bitmap-button-icon2 obj).wxWindow_GetBestSize())
-        (wxButton_SetDefault (slot-bitmap-button-icon2 obj))
-        (slot-bitmap-button-art obj).wxWindow_SetSize((slot-bitmap-button-art obj).wxWindow_GetBestSize())
-        (wxButton_SetDefault (slot-bitmap-button-art obj))
-        (wxCheckBox_SetValue (slot-checkbox-2 obj) 1)
-        (wxCheckBox_Set3StateValue (slot-checkbox-4 obj) wxCHK_UNCHECKED)
-        (wxCheckBox_Set3StateValue (slot-checkbox-5 obj) wxCHK_CHECKED)
-        (wxCheckBox_Set3StateValue (slot-checkbox-6 obj) wxCHK_UNDETERMINED)
-        (wxCheckListBox_SetSelection (slot-check-list-box-1 obj) 2)
-        (wxChoice_SetSelection (slot-choice-filled obj) 1)
-        (wxComboBox_SetSelection (slot-combo-box-filled obj) 0)
-        (wxGrid_CreateGrid (slot-grid-1 obj) 10 3 0)
-        (wxGrid_SetSelectionMode (slot-grid-1 obj) wxGridSelectRows)
-        (wxListBox_SetSelection (slot-list-box-filled obj) 1)
-        (wxRadioBox_SetSelection (slot-radio-box-filled1 obj) 1)
-        (wxRadioBox_SetSelection (slot-radio-box-filled2 obj) 1)
-        wxSplitterWindow_SetMinimumPaneSize (slot-splitter-1 obj) 20)
-        (wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-notebook-1-wxSplitterWindow-horizontal obj) 10  10)
-        wxSplitterWindow_SetMinimumPaneSize (slot-splitter-2 obj) 20)
-        (wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-notebook-1-wxSplitterWindow-vertical obj) 10  10)
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxStaticText obj) (_"wxStaticText") 1 -1)
+        
+        (setf (slot-grid-sizer-3 obj) (wxGridSizer_Create 1 3 0 0))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-notebook-1-wxStaticText obj) wxID_ANY (_"red text (RGB)") -1 -1 -1 -1 wxALIGN_CENTER_HORIZONTAL))
         (wxWindow_SetForegroundColour (slot-label-1 obj) (wxColour_CreateRGB 255, 0, 0))
+        (wxSizer_AddWindow (slot-grid-sizer-3 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-label-4 obj) (wxStaticText_Create (slot-notebook-1-wxStaticText obj) wxID_ANY (_"black on red (RGB)") -1 -1 -1 -1 wxALIGN_CENTER_HORIZONTAL))
         (wxWindow_SetBackgroundColour (slot-label-4 obj) (wxColour_CreateRGB 255, 0, 0))
         (wxWindow_SetToolTip (slot-label-4 obj)(_"Background colour won't show, check documentation for more details"))
+        (wxSizer_AddWindow (slot-grid-sizer-3 obj) (slot-label-4 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-label-5 obj) (wxStaticText_Create (slot-notebook-1-wxStaticText obj) wxID_ANY (_"green on pink (RGB)") -1 -1 -1 -1 wxALIGN_CENTER_HORIZONTAL))
         (wxWindow_SetBackgroundColour (slot-label-5 obj) (wxColour_CreateRGB 255, 0, 255))
         (wxWindow_SetForegroundColour (slot-label-5 obj) (wxColour_CreateRGB 0, 255, 0))
         (wxWindow_SetToolTip (slot-label-5 obj)(_"Background colour won't show, check documentation for more details"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj All_Widgets_Frame))
-        ;;; begin wxGlade: All_Widgets_Frame.__do_layout
-        (setf (slot-sizer-1 obj) (wxGridSizer_Create 3 1 0 0))
-        (setf (slot-sizer-2 obj) (wxGridSizer_Create 1 2 0 0))
-        (setf (slot-sizer-24 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-23 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-18 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-grid-sizer-4 obj) (wxGridSizer_Create 1 3 0 0))
-        (setf (slot-grid-sizer-3 obj) (wxGridSizer_Create 1 3 0 0))
-        (setf (slot-sizer-9 obj) (wxBoxSizer_Create wxVERTICAL))
-        (setf (slot-sizer-10 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-11 obj) (wxBoxSizer_Create wxVERTICAL))
-        (setf (slot-sizer-25 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-33 obj) (wxBoxSizer_Create wxVERTICAL))
-        (setf (slot-sizer-32 obj) (wxBoxSizer_Create wxVERTICAL))
-        (setf (slot-sizer-29 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-31 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-30 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-14 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-16 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-22 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-8 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-notebook-1-wxRadioButton obj) (_"My RadioButton Group")) wxHORIZONTAL))
-        (setf (slot-grid-sizer-2 obj) (wxGridSizer_Create 3 2 0 0))
-        (setf (slot-grid-sizer-1 obj) (wxGridSizer_Create 2 2 0 0))
-        (setf (slot-sizer-3 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-4 obj) (wxBoxSizer_Create wxVERTICAL))
-        (setf (slot-sizer-20 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-19 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-15 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-17 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-6 obj) (wxBoxSizer_Create wxVERTICAL))
-        (setf (slot-sizer-7 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-5 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-26 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-21 obj) (wxGridSizer_Create 2 3 0 0))
-        (setf (slot-sizer-12 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-28 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-13 obj) (wxGridSizer_Create 2 2 0 0))
-        (wxSizer_AddWindow (slot-sizer-13 obj) (slot-bitmap-button-icon1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-13 obj) (slot-bitmap-button-empty1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-13 obj) (slot-bitmap-button-icon2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-13 obj) (slot-bitmap-button-art obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxBitmapButton obj) (slot-sizer-13 obj))
-        (wxFlexGridSizer_AddGrowableRow (slot-sizer-13 obj) 0)
-        (wxFlexGridSizer_AddGrowableRow (slot-sizer-13 obj) 1)
-        (wxFlexGridSizer_AddGrowableCol (slot-sizer-13 obj) 0)
-        (wxFlexGridSizer_AddGrowableCol (slot-sizer-13 obj) 1)
-        (wxSizer_AddWindow (slot-sizer-28 obj) (slot-button-3 obj) 0 wxALL 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxButton obj) (slot-sizer-28 obj))
-        (wxWindow_SetSizer (slot-notebook-1-wxCalendarCtrl obj) (slot-sizer-12 obj))
-        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-1 obj) 0 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-2 obj) 0 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-3 obj) 0 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-4 obj) 0 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-5 obj) 0 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-sizer-21 obj) (slot-checkbox-6 obj) 0 wxEXPAND 0 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxCheckBox obj) (slot-sizer-21 obj))
-        (wxSizer_AddWindow (slot-sizer-26 obj) (slot-check-list-box-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxCheckListBox obj) (slot-sizer-26 obj))
-        (wxSizer_AddWindow (slot-sizer-5 obj) (slot-choice-empty obj) 1 wxALL 5 nil)
-        (wxSizer_AddWindow (slot-sizer-5 obj) (slot-choice-filled obj) 1 wxALL 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxChoice obj) (slot-sizer-5 obj))
-        (wxSizer_AddWindow (slot-sizer-7 obj) (slot-combo-box-empty obj) 1 wxALL 5 nil)
-        (wxSizer_AddWindow (slot-sizer-7 obj) (slot-combo-box-filled obj) 1 wxALL 5 nil)
-        (wxSizer_AddSizer (slot-sizer-6 obj) (slot-sizer-7 obj) 1 wxEXPAND 0 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxComboBox obj) (slot-sizer-6 obj))
-        (wxSizer_AddWindow (slot-sizer-17 obj) (slot-datepicker-ctrl-1 obj) 1 (logior wxALIGN_CENTER wxALL) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxDatePickerCtrl obj) (slot-sizer-17 obj))
-        (wxSizer_AddWindow (slot-sizer-15 obj) (slot-gauge-1 obj) 1 wxALL 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxGauge obj) (slot-sizer-15 obj))
-        (wxSizer_AddWindow (slot-sizer-19 obj) (slot-grid-1 obj) 1 wxEXPAND 0 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxGrid obj) (slot-sizer-19 obj))
-        (wxSizer_AddWindow (slot-sizer-20 obj) (slot-hyperlink-1 obj) 0 wxALL 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxHyperlinkCtrl obj) (slot-sizer-20 obj))
-        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-list-box-empty obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-list-box-filled obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxListBox obj) (slot-sizer-4 obj))
-        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-list-ctrl-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxListCtrl obj) (slot-sizer-3 obj))
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-radio-box-empty1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-radio-box-filled1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-radio-box-empty2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-radio-box-filled2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxRadioBox obj) (slot-grid-sizer-1 obj))
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-radio-btn-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-text-ctrl-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-radio-btn-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-text-ctrl-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-radio-btn-3 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-text-ctrl-3 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddSizer (slot-sizer-8 obj) (slot-grid-sizer-2 obj) 1 wxEXPAND 0 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxRadioButton obj) (slot-sizer-8 obj))
-        (wxSizer_AddWindow (slot-sizer-22 obj) (slot-slider-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxSlider obj) (slot-sizer-22 obj))
-        (wxSizer_AddWindow (slot-sizer-16 obj) (slot-tc-spin-button obj) 1 wxALL 5 nil)
-        (wxSizer_AddWindow (slot-sizer-16 obj) (slot-spin-button obj) 1 wxALL 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxSpinButton obj) (slot-sizer-16 obj))
-        (wxSizer_AddWindow (slot-sizer-14 obj) (slot-spin-ctrl-1 obj) 1 wxALL 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxSpinCtrl obj) (slot-sizer-14 obj))
-        (wxSizer_AddWindow (slot-sizer-30 obj) (slot-label-top-pane obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-splitter-1-pane-1 obj) (slot-sizer-30 obj))
-        (wxSizer_AddWindow (slot-sizer-31 obj) (slot-label-buttom-pane obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-splitter-1-pane-2 obj) (slot-sizer-31 obj))
-        (SplitHorizontally splitter-1 splitter_1_pane_1 splitter_1_pane_2 )
-        (wxSizer_AddWindow (slot-sizer-29 obj) (slot-splitter-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxSplitterWindow-horizontal obj) (slot-sizer-29 obj))
-        (wxSizer_AddWindow (slot-sizer-32 obj) (slot-label-left-pane obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-splitter-2-pane-1 obj) (slot-sizer-32 obj))
-        (wxSizer_AddWindow (slot-sizer-33 obj) (slot-label-right-pane obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-splitter-2-pane-2 obj) (slot-sizer-33 obj))
-        (SplitVertically splitter-2 splitter_2_pane_1 splitter_2_pane_2 )
-        (wxSizer_AddWindow (slot-sizer-25 obj) (slot-splitter-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxSplitterWindow-vertical obj) (slot-sizer-25 obj))
-        (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-empty obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-file obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-nofile obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-art obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxStaticBitmap obj) (slot-sizer-11 obj))
-        (wxSizer_AddWindow (slot-sizer-10 obj) (slot-static-line-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-10 obj) (slot-static-line-3 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddSizer (slot-sizer-9 obj) (slot-sizer-10 obj) 1 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-sizer-9 obj) (slot-static-line-4 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-9 obj) (slot-static-line-5 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxStaticLine obj) (slot-sizer-9 obj))
-        (wxSizer_AddWindow (slot-grid-sizer-3 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-3 obj) (slot-label-4 obj) 1 (logior wxALL wxEXPAND) 5 nil)
         (wxSizer_AddWindow (slot-grid-sizer-3 obj) (slot-label-5 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxStaticText obj) (slot-grid-sizer-3 obj))
+        
+        (setf (slot-notebook-1-Spacer obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-Spacer obj) (_"Spacer") 1 -1)
+        
+        (setf (slot-grid-sizer-4 obj) (wxGridSizer_Create 1 3 0 0))
+        
+        (setf (slot-label-3 obj) (wxStaticText_Create (slot-notebook-1-Spacer obj) wxID_ANY (_"Two labels with a") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-grid-sizer-4 obj) (slot-label-3 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (wxSizer_AddWindow (slot-grid-sizer-4 obj) ((60, 20) obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-label-2 obj) (wxStaticText_Create (slot-notebook-1-Spacer obj) wxID_ANY (_"spacer between") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-grid-sizer-4 obj) (slot-label-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-Spacer obj) (slot-grid-sizer-4 obj))
+        
+        (setf (slot-notebook-1-wxTextCtrl obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxTextCtrl obj) (_"wxTextCtrl") 1 -1)
+        
+        (setf (slot-sizer-18 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
+        (setf (slot-text-ctrl obj) (wxTextCtrl_Create (slot-notebook-1-wxTextCtrl obj) wxID_ANY (_"This\nis\na\nmultiline\nwxTextCtrl") -1 -1 -1 -1 (logior wxTE_CHARWRAP wxTE_MULTILINE wxTE_WORDWRAP)))
         (wxSizer_AddWindow (slot-sizer-18 obj) (slot-text-ctrl obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxTextCtrl obj) (slot-sizer-18 obj))
+        
+        (setf (slot-notebook-1-wxToggleButton obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxToggleButton obj) (_"wxToggleButton") 1 -1)
+        
+        (setf (slot-sizer-23 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
+        (setf (slot-button-2 obj) (wxToggleButton_Create (slot-notebook-1-wxToggleButton obj) wxID_ANY (_"Toggle Button 1") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-23 obj) (slot-button-2 obj) 1 wxALL 5 nil)
+        
+        (setf (slot-button-4 obj) (wxToggleButton_Create (slot-notebook-1-wxToggleButton obj) wxID_ANY (_"Toggle Button 2") -1 -1 -1 -1 (logior wxBU_BOTTOM wxBU_EXACTFIT)))
         (wxSizer_AddWindow (slot-sizer-23 obj) (slot-button-4 obj) 1 wxALL 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxToggleButton obj) (slot-sizer-23 obj))
-        (wxSizer_AddWindow (slot-sizer-24 obj) (slot-tree-ctrl-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-wxTreeCtrl obj) (slot-sizer-24 obj))
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxBitmapButton obj) (_"wxBitmapButton") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxButton obj) (_"wxButton") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxCalendarCtrl obj) (_"wxCalendarCtrl") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxCheckBox obj) (_"wxCheckBox") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxCheckListBox obj) (_"wxCheckListBox") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxChoice obj) (_"wxChoice") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxComboBox obj) (_"wxComboBox") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxDatePickerCtrl obj) (_"wxDatePickerCtrl") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxGauge obj) (_"wxGauge") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxGrid obj) (_"wxGrid") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxHyperlinkCtrl obj) (_"wxHyperlinkCtrl") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxListBox obj) (_"wxListBox") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxListCtrl obj) (_"wxListCtrl") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxRadioBox obj) (_"wxRadioBox") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxRadioButton obj) (_"wxRadioButton") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxSlider obj) (_"wxSlider") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxSpinButton obj) (_"wxSpinButton (with wxTextCtrl)") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxSpinCtrl obj) (_"wxSpinCtrl") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxSplitterWindow-horizontal obj) (_"wxSplitterWindow (horizontally)") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxSplitterWindow-vertical obj) (_"wxSplitterWindow (vertically)") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxStaticBitmap obj) (_"wxStaticBitmap") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxStaticLine obj) (_"wxStaticLine") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxStaticText obj) (_"wxStaticText") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-Spacer obj) (_"Spacer") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxTextCtrl obj) (_"wxTextCtrl") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxToggleButton obj) (_"wxToggleButton") 1 -1)
+        
+        (setf (slot-notebook-1-wxTreeCtrl obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
         (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-wxTreeCtrl obj) (_"wxTreeCtrl") 1 -1)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-sizer-24 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
+        (setf (slot-tree-ctrl-1 obj) (wxTreeCtrl_Create (slot-notebook-1-wxTreeCtrl obj) wxID_ANY -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-24 obj) (slot-tree-ctrl-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-static-line-1 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-static-line-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-2 obj) (wxGridSizer_Create 1 2 0 0))
+        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 0 wxALIGN_RIGHT 0 nil)
+        
+        (setf (slot-button-5 obj) (wxButton_Create (slot-top-window obj) wxID_CLOSE "" -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-5 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
+        (setf (slot-button-1 obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 wxBU_TOP))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-1 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
-        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 0 wxALIGN_RIGHT 0 nil)
-        (wxWindow_SetSizer (slot-frame obj) (slot-sizer-1 obj))
-        (wxSizer_SetSizeHints (slot-slot-sizer-1 obj) (slot-frame obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxTreeCtrl obj) (slot-sizer-24 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxToggleButton obj) (slot-sizer-23 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxTextCtrl obj) (slot-sizer-18 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-Spacer obj) (slot-grid-sizer-4 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxStaticText obj) (slot-grid-sizer-3 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxStaticLine obj) (slot-sizer-9 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxStaticBitmap obj) (slot-sizer-11 obj))
+        
+        (wxWindow_SetSizer (slot-splitter-2-pane-2 obj) (slot-sizer-33 obj))
+        
+        (wxWindow_SetSizer (slot-splitter-2-pane-1 obj) (slot-sizer-32 obj))
+        
+        (SplitVertically splitter-2 splitter_2_pane_1 splitter_2_pane_2 )
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxSplitterWindow-vertical obj) (slot-sizer-25 obj))
+        
+        (wxWindow_SetSizer (slot-splitter-1-pane-2 obj) (slot-sizer-31 obj))
+        
+        (wxWindow_SetSizer (slot-splitter-1-pane-1 obj) (slot-sizer-30 obj))
+        
+        (SplitHorizontally splitter-1 splitter_1_pane_1 splitter_1_pane_2 )
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxSplitterWindow-horizontal obj) (slot-sizer-29 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxSpinCtrl obj) (slot-sizer-14 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxSpinButton obj) (slot-sizer-16 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxSlider obj) (slot-sizer-22 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxRadioButton obj) (slot-sizer-8 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxRadioBox obj) (slot-grid-sizer-1 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxListCtrl obj) (slot-sizer-3 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxListBox obj) (slot-sizer-4 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxHyperlinkCtrl obj) (slot-sizer-20 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxGrid obj) (slot-sizer-19 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxGauge obj) (slot-sizer-15 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxDatePickerCtrl obj) (slot-sizer-17 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxComboBox obj) (slot-sizer-6 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxChoice obj) (slot-sizer-5 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxCheckListBox obj) (slot-sizer-26 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxCheckBox obj) (slot-sizer-21 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxCalendarCtrl obj) (slot-sizer-12 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-wxButton obj) (slot-sizer-28 obj))
+        
+        (wxFlexGridSizer_AddGrowableRow (slot-sizer-13 obj) 0)
+        (wxFlexGridSizer_AddGrowableRow (slot-sizer-13 obj) 1)
+        (wxFlexGridSizer_AddGrowableCol (slot-sizer-13 obj) 0)
+        (wxFlexGridSizer_AddGrowableCol (slot-sizer-13 obj) 1)
+        (wxWindow_SetSizer (slot-notebook-1-wxBitmapButton obj) (slot-sizer-13 obj))
+        
         (wxFlexGridSizer_AddGrowableRow (slot-sizer-1 obj) 0)
         (wxFlexGridSizer_AddGrowableCol (slot-sizer-1 obj) 0)
+        (wxWindow_SetSizer (slot-frame obj) (slot-sizer-1 obj))
+        (wxSizer_SetSizeHints (slot-slot-sizer-1 obj) (slot-frame obj))
+        
         (wxFrame_layout (slot-All-Widgets self))
         (wxFrame_Centre (slot-top-window obj) wxBOTH)
+
+        (wxEvtHandler_Connect (slot-top-window obj) obj.notebook-1 (expwxEVT_NOTEBOOK_PAGE_CHANGED)
+        (wxClosure_Create #'OnNotebookPageChanged obj))
+        (wxEvtHandler_Connect (slot-top-window obj) obj.notebook-1 (expwxEVT_NOTEBOOK_PAGE_CHANGING)
+        (wxClosure_Create #'OnNotebookPageChanging obj))
+        (wxEvtHandler_Connect (slot-top-window obj) obj.button-1 (expwxEVT_BUTTON)
+        (wxClosure_Create #'onStartConverting obj))
         ;;; end wxGlade
         )
 
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_28_Phoenix.py wxglade-1.0.1/tests/casefiles/AllWidgets_28_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/AllWidgets_28_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_28_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,11 +5,11 @@
 #
 
 import wx
-import wx.adv
-import wx.grid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.adv
+import wx.grid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -22,7 +22,11 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((800, 417))
-        
+        self.SetTitle(_("All Widgets"))
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
+        self.SetIcon(_icon)
+
         # Menu Bar
         self.All_Widgets_menubar = wx.MenuBar()
         global mn_IDUnix; mn_IDUnix = wx.NewId()
@@ -40,7 +44,7 @@
         self.Bind(wx.EVT_MENU, self.onSelectWindows, id=mn_IDWindows)
         wxglade_tmp_menu.AppendSeparator()
         self.All_Widgets_menubar.mn_RemoveTabs = wxglade_tmp_menu.Append(wx.ID_ANY, _("Remove Tabs"), _("Remove all leading tabs"), wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.onRemoveTabs, id=self.All_Widgets_menubar.mn_RemoveTabs.GetId())
+        self.Bind(wx.EVT_MENU, self.onRemoveTabs, self.All_Widgets_menubar.mn_RemoveTabs)
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Edit"))
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.ID_HELP, _("Manual"), _("Show the application manual"))
@@ -50,343 +54,496 @@
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.All_Widgets_menubar)
         # Menu Bar end
+
         self.All_Widgets_statusbar = self.CreateStatusBar(1, wx.ST_SIZEGRIP)
-        
+        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
+        for i in range(len(All_Widgets_statusbar_fields)):
+            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
+
         # Tool Bar
         self.All_Widgets_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.All_Widgets_toolbar)
         self.All_Widgets_toolbar.AddTool(wx.ID_UP, _("UpDown"), wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, _("Up or Down"), _("Up or Down"))
         self.All_Widgets_toolbar.AddTool(wx.ID_OPEN, _("Open"), wx.Bitmap(32, 32), wx.NullBitmap, wx.ITEM_NORMAL, _("Open a new file"), _("Open a new file"))
+        self.SetToolBar(self.All_Widgets_toolbar)
+        self.All_Widgets_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxBitmapButton = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
+        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
+
+        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
+
+        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
+        self.bitmap_button_icon1.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_empty1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap(10, 10))
-        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
+        self.bitmap_button_empty1.SetDefault()
+        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_icon2.SetBitmapDisabled(wx.Bitmap(32, 32))
+        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
+        self.bitmap_button_icon2.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_art = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
+        self.bitmap_button_art.SetDefault()
+        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
+
+        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_3 = wx.Button(self.notebook_1_wxButton, wx.ID_BOLD, "")
+        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_wxCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
+
+        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.calendar_ctrl_1 = wx.adv.CalendarCtrl(self.notebook_1_wxCalendarCtrl, wx.ID_ANY, style=wx.adv.CAL_MONDAY_FIRST | wx.adv.CAL_SEQUENTIAL_MONTH_SELECTION | wx.adv.CAL_SHOW_SURROUNDING_WEEKS)
+        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxCheckBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
+
+        sizer_21 = wx.GridSizer(2, 3, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("one (unchecked)"))
+        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
+
         self.checkbox_2 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("two (checked)"))
+        self.checkbox_2.SetValue(1)
+        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
+
         self.checkbox_3 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("three"), style=wx.CHK_2STATE)
+        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
+
         self.checkbox_4 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("four (unchecked)"), style=wx.CHK_3STATE)
+        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
+        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
+
         self.checkbox_5 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("five (checked)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
+        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
+
         self.checkbox_6 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("six (undetermined)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
+        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
+
         self.notebook_1_wxCheckListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
+
+        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.check_list_box_1 = wx.CheckListBox(self.notebook_1_wxCheckListBox, wx.ID_ANY, choices=[_("one"), _("two"), _("three"), _("four")])
+        self.check_list_box_1.SetSelection(2)
+        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxChoice = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.choice_empty = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[])
+        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
+
         self.choice_filled = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")])
+        self.choice_filled.SetSelection(1)
+        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxComboBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
+
         self.combo_box_empty = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[], style=0)
+        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
+
         self.combo_box_filled = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[_("Item 1 (pre-selected)"), _("Item 2")], style=0)
+        self.combo_box_filled.SetSelection(0)
+        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxDatePickerCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
+
+        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.datepicker_ctrl_1 = wx.adv.DatePickerCtrl(self.notebook_1_wxDatePickerCtrl, wx.ID_ANY, style=wx.adv.DP_SHOWCENTURY)
+        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.notebook_1_wxGauge = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
+
+        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.gauge_1 = wx.Gauge(self.notebook_1_wxGauge, wx.ID_ANY, 20)
+        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxGrid = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
+
+        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.grid_1 = wx.grid.Grid(self.notebook_1_wxGrid, wx.ID_ANY, size=(1, 1))
+        self.grid_1.CreateGrid(10, 3)
+        self.grid_1.SetSelectionMode(wx.grid.Grid.SelectRows)
+        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxHyperlinkCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
+
+        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.hyperlink_1 = wx.adv.HyperlinkCtrl(self.notebook_1_wxHyperlinkCtrl, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"))
+        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
+
         self.notebook_1_wxListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
+
+        sizer_4 = wx.BoxSizer(wx.VERTICAL)
+
         self.list_box_empty = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[], style=0)
+        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
+
         self.list_box_filled = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")], style=wx.LB_MULTIPLE | wx.LB_SORT)
+        self.list_box_filled.SetSelection(1)
+        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxListCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.list_ctrl_1 = wx.ListCtrl(self.notebook_1_wxListCtrl, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_REPORT)
+        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
+
+        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
+
         self.radio_box_empty1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty1"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
+        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled1"), choices=[_("choice 1"), _("choice 2 (pre-selected)"), _("choice 3")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.radio_box_filled1.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_empty2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty2"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled2"), choices=[_("choice 1"), _("choice 2 (pre-selected)")], majorDimension=0, style=wx.RA_SPECIFY_COLS)
+        self.radio_box_filled2.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
+
+        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
+
+        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
+        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
+
         self.radio_btn_1 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Alice"), style=wx.RB_GROUP)
+        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_2 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Bob"))
+        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_3 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Malroy"))
+        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSlider = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
+
+        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.slider_1 = wx.Slider(self.notebook_1_wxSlider, wx.ID_ANY, 5, 0, 10, style=0)
+        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSpinButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"))
+
+        sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.tc_spin_button = wx.TextCtrl(self.notebook_1_wxSpinButton, wx.ID_ANY, _("1"), style=wx.TE_RIGHT)
+        sizer_16.Add(self.tc_spin_button, 1, wx.ALL, 5)
+
         self.spin_button = wx.SpinButton(self.notebook_1_wxSpinButton, wx.ID_ANY )
+        sizer_16.Add(self.spin_button, 1, wx.ALL, 5)
+
         self.notebook_1_wxSpinCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
+
+        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.spin_ctrl_1 = wx.SpinCtrl(self.notebook_1_wxSpinCtrl, wx.ID_ANY, "4", min=0, max=100)
+        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxSplitterWindow_horizontal = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
+
+        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_1 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_horizontal, wx.ID_ANY, style=0)
+        self.splitter_1.SetMinimumPaneSize(20)
+        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_1 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_top_pane = wx.StaticText(self.splitter_1_pane_1, wx.ID_ANY, _("top pane"))
+        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_2 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_buttom_pane = wx.StaticText(self.splitter_1_pane_2, wx.ID_ANY, _("bottom pane"))
+        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSplitterWindow_vertical = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
+
+        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_2 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_vertical, wx.ID_ANY, style=0)
+        self.splitter_2.SetMinimumPaneSize(20)
+        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_1 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_32 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_left_pane = wx.StaticText(self.splitter_2_pane_1, wx.ID_ANY, _("left pane"))
+        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_2 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_33 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_right_pane = wx.StaticText(self.splitter_2_pane_2, wx.ID_ANY, _("right pane"))
+        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticBitmap = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
+
+        sizer_11 = wx.BoxSizer(wx.VERTICAL)
+
         self.bitmap_empty = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap(32, 32))
-        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_empty, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_file, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_nofile = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("non-existing.bmp", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_nofile, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
+        sizer_11.Add(self.bitmap_art, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticLine = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
+
+        sizer_9 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
+
         self.static_line_2 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
+        sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_3 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
+        sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_4 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
+        sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_5 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
+        sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticText = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
+
+        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
+        grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
+        self.label_4.SetToolTipString(_("Background colour won't show, check documentation for more details"))
+        grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
+        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
+        self.label_5.SetToolTipString(_("Background colour won't show, check documentation for more details"))
+        grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_Spacer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
+
+        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
+
         self.label_3 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("Two labels with a"))
+        grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
+
+        grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
+
         self.label_2 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("spacer between"))
+        grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxTextCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
+
+        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.text_ctrl = wx.TextCtrl(self.notebook_1_wxTextCtrl, wx.ID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), style=wx.TE_CHARWRAP | wx.TE_MULTILINE | wx.TE_WORDWRAP)
+        sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxToggleButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
+
+        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_2 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 1"))
+        sizer_23.Add(self.button_2, 1, wx.ALL, 5)
+
         self.button_4 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 2"), style=wx.BU_BOTTOM | wx.BU_EXACTFIT)
+        sizer_23.Add(self.button_4, 1, wx.ALL, 5)
+
         self.notebook_1_wxTreeCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
+
+        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.tree_ctrl_1 = wx.TreeCtrl(self.notebook_1_wxTreeCtrl, wx.ID_ANY, style=0)
+        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
         self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
+        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
 
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
-        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
-        # end wxGlade
+        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
 
-    def __set_properties(self):
-        # begin wxGlade: All_Widgets_Frame.__set_properties
-        self.SetTitle(_("All Widgets"))
-        _icon = wx.NullIcon
-        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
-        self.SetIcon(_icon)
-        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
 
-        # statusbar fields
-        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
-        for i in range(len(All_Widgets_statusbar_fields)):
-            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
-        self.All_Widgets_toolbar.Realize()
-        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
-        self.bitmap_button_icon1.SetDefault()
-        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
-        self.bitmap_button_empty1.SetDefault()
-        self.bitmap_button_icon2.SetBitmapDisabled(wx.Bitmap(20, 20))
-        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
-        self.bitmap_button_icon2.SetDefault()
-        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
-        self.bitmap_button_art.SetDefault()
-        self.checkbox_2.SetValue(1)
-        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
-        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
-        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
-        self.check_list_box_1.SetSelection(2)
-        self.choice_filled.SetSelection(1)
-        self.combo_box_filled.SetSelection(0)
-        self.grid_1.CreateGrid(10, 3)
-        self.grid_1.SetSelectionMode(wx.grid.Grid.SelectRows)
-        self.list_box_filled.SetSelection(1)
-        self.radio_box_filled1.SetSelection(1)
-        self.radio_box_filled2.SetSelection(1)
-        self.splitter_1.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
-        self.splitter_2.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
-        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetToolTipString(_("Background colour won't show, check documentation for more details"))
-        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
-        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
-        self.label_5.SetToolTipString(_("Background colour won't show, check documentation for more details"))
-        # end wxGlade
+        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
+
+        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
+
+        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
+
+        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
+
+        self.splitter_2_pane_2.SetSizer(sizer_33)
+
+        self.splitter_2_pane_1.SetSizer(sizer_32)
+
+        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
+
+        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
+
+        self.splitter_1_pane_2.SetSizer(sizer_31)
+
+        self.splitter_1_pane_1.SetSizer(sizer_30)
+
+        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
+
+        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
+
+        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
+
+        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
+
+        self.notebook_1_wxSlider.SetSizer(sizer_22)
+
+        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
+
+        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
+
+        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
+
+        self.notebook_1_wxListBox.SetSizer(sizer_4)
+
+        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
+
+        self.notebook_1_wxGrid.SetSizer(sizer_19)
+
+        self.notebook_1_wxGauge.SetSizer(sizer_15)
+
+        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
+
+        self.notebook_1_wxComboBox.SetSizer(sizer_6)
+
+        self.notebook_1_wxChoice.SetSizer(sizer_5)
+
+        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
+
+        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
+
+        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
+
+        self.notebook_1_wxButton.SetSizer(sizer_28)
 
-    def __do_layout(self):
-        # begin wxGlade: All_Widgets_Frame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
-        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
-        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_9 = wx.BoxSizer(wx.VERTICAL)
-        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_11 = wx.BoxSizer(wx.VERTICAL)
-        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_33 = wx.BoxSizer(wx.VERTICAL)
-        sizer_32 = wx.BoxSizer(wx.VERTICAL)
-        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
-        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
-        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.VERTICAL)
-        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.VERTICAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_21 = wx.GridSizer(2, 3, 0, 0)
-        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
-        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
         sizer_13.AddGrowableRow(0)
         sizer_13.AddGrowableRow(1)
         sizer_13.AddGrowableCol(0)
         sizer_13.AddGrowableCol(1)
-        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_wxButton.SetSizer(sizer_28)
-        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
-        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
-        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
-        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
-        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
-        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
-        self.notebook_1_wxChoice.SetSizer(sizer_5)
-        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
-        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
-        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
-        self.notebook_1_wxComboBox.SetSizer(sizer_6)
-        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER | wx.ALL, 5)
-        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
-        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
-        self.notebook_1_wxGauge.SetSizer(sizer_15)
-        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
-        self.notebook_1_wxGrid.SetSizer(sizer_19)
-        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
-        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
-        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListBox.SetSizer(sizer_4)
-        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
-        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
-        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
-        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
-        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSlider.SetSizer(sizer_22)
-        sizer_16.Add(self.tc_spin_button, 1, wx.ALL, 5)
-        sizer_16.Add(self.spin_button, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
-        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
-        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_1.SetSizer(sizer_30)
-        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_2.SetSizer(sizer_31)
-        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
-        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
-        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_1.SetSizer(sizer_32)
-        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_2.SetSizer(sizer_33)
-        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
-        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
-        sizer_11.Add(self.bitmap_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_file, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_nofile, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_art, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
-        sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
-        sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
-        grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
-        grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
-        sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
-        sizer_23.Add(self.button_2, 1, wx.ALL, 5)
-        sizer_23.Add(self.button_4, 1, wx.ALL, 5)
-        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
-        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
-        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
-        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
-        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
-        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
-        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
-        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
+
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
+        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
         # end wxGlade
 
     def onSelectUnix(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_28.pl wxglade-1.0.1/tests/casefiles/AllWidgets_28.pl
--- wxglade-0.9.6/tests/casefiles/AllWidgets_28.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_28.pl	2020-12-31 14:04:48.000000000 +0000
@@ -7,9 +7,9 @@
 
 use Wx qw[:allclasses];
 use strict;
-use Wx::ArtProvider qw/:artid :clientid/;
 
 # begin wxGlade: dependencies
+use Wx::ArtProvider qw/:artid :clientid/;
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -41,6 +41,11 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(800, 417));
+    $self->SetTitle(_T("All Widgets"));
+    my $icon = &Wx::wxNullIcon;
+    $icon->CopyFromBitmap(Wx::ArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, Wx::Size->new(32, 32)));
+    $self->SetIcon($icon);
+    
     
 
     # Menu Bar
@@ -70,114 +75,499 @@
     
     # Menu Bar end
 
+    
     $self->{All_Widgets_statusbar} = $self->CreateStatusBar(1, wxST_SIZEGRIP);
+    $self->{All_Widgets_statusbar}->SetStatusWidths(-1);
+    
+    # statusbar fields
+    my( @All_Widgets_statusbar_fields ) = (
+        _T("All Widgets statusbar"),
+    );
+    
+    if( @All_Widgets_statusbar_fields ) {
+        $self->{All_Widgets_statusbar}->SetStatusText($All_Widgets_statusbar_fields[$_], $_)
+        for 0 .. $#All_Widgets_statusbar_fields ;
+    }
+    
     
     # Tool Bar
     $self->{All_Widgets_toolbar} = Wx::ToolBar->new($self, -1);
-    $self->SetToolBar($self->{All_Widgets_toolbar});
     $self->{All_Widgets_toolbar}->AddTool(wxID_UP, _T("UpDown"), Wx::ArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, Wx::Size->new(32, 32)), Wx::ArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, Wx::Size->new(32, 32)), wxITEM_CHECK, _T("Up or Down"), _T("Up or Down"));
     $self->{All_Widgets_toolbar}->AddTool(wxID_OPEN, _T("Open"), Wx::Bitmap->new(32, 32), wxNullBitmap, wxITEM_NORMAL, _T("Open a new file"), _T("Open a new file"));
+    $self->SetToolBar($self->{All_Widgets_toolbar});
+    $self->{All_Widgets_toolbar}->Realize();
     # Tool Bar end
+    
+    $self->{sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
+    
     $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
+    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
     $self->{notebook_1_wxBitmapButton} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{bitmap_button_icon1} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::Bitmap->new("icon.xpm", wxBITMAP_TYPE_ANY));
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxBitmapButton}, _T("wxBitmapButton"));
+    
+    $self->{sizer_13} = Wx::FlexGridSizer->new(2, 2, 0, 0);
+    
+    $self->{bitmap_button_icon1} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::Bitmap->new("icon.png", wxBITMAP_TYPE_ANY));
+    $self->{bitmap_button_icon1}->SetSize($self->{bitmap_button_icon1}->GetBestSize());
+    $self->{bitmap_button_icon1}->SetDefault();
+    $self->{sizer_13}->Add($self->{bitmap_button_icon1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{bitmap_button_empty1} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::Bitmap->new(10, 10));
-    $self->{bitmap_button_icon2} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::Bitmap->new("icon.xpm", wxBITMAP_TYPE_ANY), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    $self->{bitmap_button_empty1}->SetSize($self->{bitmap_button_empty1}->GetBestSize());
+    $self->{bitmap_button_empty1}->SetDefault();
+    $self->{sizer_13}->Add($self->{bitmap_button_empty1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{bitmap_button_icon2} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::Bitmap->new("icon.png", wxBITMAP_TYPE_ANY), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    $self->{bitmap_button_icon2}->SetBitmapDisabled(Wx::Bitmap->new(32, 32));
+    $self->{bitmap_button_icon2}->SetSize($self->{bitmap_button_icon2}->GetBestSize());
+    $self->{bitmap_button_icon2}->SetDefault();
+    $self->{sizer_13}->Add($self->{bitmap_button_icon2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{bitmap_button_art} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::ArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, Wx::Size->new(32, 32)), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    $self->{bitmap_button_art}->SetSize($self->{bitmap_button_art}->GetBestSize());
+    $self->{bitmap_button_art}->SetDefault();
+    $self->{sizer_13}->Add($self->{bitmap_button_art}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxButton} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxButton}, _T("wxButton"));
+    
+    $self->{sizer_28} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{button_3} = Wx::Button->new($self->{notebook_1_wxButton}, wxID_BOLD, "");
+    $self->{sizer_28}->Add($self->{button_3}, 0, wxALL, 5);
+    
     $self->{notebook_1_wxCalendarCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxCalendarCtrl}, _T("wxCalendarCtrl"));
+    
+    $self->{sizer_12} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{calendar_ctrl_1} = Wx::CalendarCtrl->new($self->{notebook_1_wxCalendarCtrl}, wxID_ANY, Wx::DateTime->new, wxDefaultPosition, wxDefaultSize, wxCAL_MONDAY_FIRST|wxCAL_SEQUENTIAL_MONTH_SELECTION|wxCAL_SHOW_SURROUNDING_WEEKS);
+    $self->{sizer_12}->Add($self->{calendar_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxCheckBox} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxCheckBox}, _T("wxCheckBox"));
+    
+    $self->{sizer_21} = Wx::GridSizer->new(2, 3, 0, 0);
+    
     $self->{checkbox_1} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("one (unchecked)"));
+    $self->{sizer_21}->Add($self->{checkbox_1}, 0, wxEXPAND, 0);
+    
     $self->{checkbox_2} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("two (checked)"));
+    $self->{checkbox_2}->SetValue(1);
+    $self->{sizer_21}->Add($self->{checkbox_2}, 0, wxEXPAND, 0);
+    
     $self->{checkbox_3} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("three"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
+    $self->{sizer_21}->Add($self->{checkbox_3}, 0, wxEXPAND, 0);
+    
     $self->{checkbox_4} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("four (unchecked)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE);
+    $self->{checkbox_4}->Set3StateValue(wxCHK_UNCHECKED);
+    $self->{sizer_21}->Add($self->{checkbox_4}, 0, wxEXPAND, 0);
+    
     $self->{checkbox_5} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("five (checked)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER);
+    $self->{checkbox_5}->Set3StateValue(wxCHK_CHECKED);
+    $self->{sizer_21}->Add($self->{checkbox_5}, 0, wxEXPAND, 0);
+    
     $self->{checkbox_6} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("six (undetermined)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER);
+    $self->{checkbox_6}->Set3StateValue(wxCHK_UNDETERMINED);
+    $self->{sizer_21}->Add($self->{checkbox_6}, 0, wxEXPAND, 0);
+    
     $self->{notebook_1_wxCheckListBox} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxCheckListBox}, _T("wxCheckListBox"));
+    
+    $self->{sizer_26} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{check_list_box_1} = Wx::CheckListBox->new($self->{notebook_1_wxCheckListBox}, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("one"), _T("two"), _T("three"), _T("four")], );
+    $self->{check_list_box_1}->SetSelection(2);
+    $self->{sizer_26}->Add($self->{check_list_box_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxChoice} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxChoice}, _T("wxChoice"));
+    
+    $self->{sizer_5} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{choice_empty} = Wx::Choice->new($self->{notebook_1_wxChoice}, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], );
+    $self->{sizer_5}->Add($self->{choice_empty}, 1, wxALL, 5);
+    
     $self->{choice_filled} = Wx::Choice->new($self->{notebook_1_wxChoice}, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("Item 1"), _T("Item 2 (pre-selected)")], );
+    $self->{choice_filled}->SetSelection(1);
+    $self->{sizer_5}->Add($self->{choice_filled}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxComboBox} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxComboBox}, _T("wxComboBox"));
+    
+    $self->{sizer_6} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_7} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_6}->Add($self->{sizer_7}, 1, wxEXPAND, 0);
+    
     $self->{combo_box_empty} = Wx::ComboBox->new($self->{notebook_1_wxComboBox}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, [], 0);
+    $self->{sizer_7}->Add($self->{combo_box_empty}, 1, wxALL, 5);
+    
     $self->{combo_box_filled} = Wx::ComboBox->new($self->{notebook_1_wxComboBox}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, [_T("Item 1 (pre-selected)"), _T("Item 2")], 0);
+    $self->{combo_box_filled}->SetSelection(0);
+    $self->{sizer_7}->Add($self->{combo_box_filled}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxDatePickerCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxDatePickerCtrl}, _T("wxDatePickerCtrl"));
+    
+    $self->{sizer_17} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{datepicker_ctrl_1} = Wx::DatePickerCtrl->new($self->{notebook_1_wxDatePickerCtrl}, wxID_ANY, Wx::DateTime->new(), wxDefaultPosition, wxDefaultSize, wxDP_SHOWCENTURY);
+    $self->{sizer_17}->Add($self->{datepicker_ctrl_1}, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
     $self->{notebook_1_wxGauge} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxGauge}, _T("wxGauge"));
+    
+    $self->{sizer_15} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{gauge_1} = Wx::Gauge->new($self->{notebook_1_wxGauge}, wxID_ANY, 20);
+    $self->{sizer_15}->Add($self->{gauge_1}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxGrid} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxGrid}, _T("wxGrid"));
+    
+    $self->{sizer_19} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{grid_1} = Wx::Grid->new($self->{notebook_1_wxGrid}, wxID_ANY);
+    $self->{grid_1}->CreateGrid(10, 3);
+    $self->{grid_1}->SetSelectionMode(wxGridSelectRows);
+    $self->{sizer_19}->Add($self->{grid_1}, 1, wxEXPAND, 0);
+    
     $self->{notebook_1_wxHyperlinkCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxHyperlinkCtrl}, _T("wxHyperlinkCtrl"));
+    
+    $self->{sizer_20} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{hyperlink_1} = Wx::HyperlinkCtrl->new($self->{notebook_1_wxHyperlinkCtrl}, wxID_ANY, _T("Homepage wxGlade"), _T("http://wxglade.sf.net"));
+    $self->{sizer_20}->Add($self->{hyperlink_1}, 0, wxALL, 5);
+    
     $self->{notebook_1_wxListBox} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxListBox}, _T("wxListBox"));
+    
+    $self->{sizer_4} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{list_box_empty} = Wx::ListBox->new($self->{notebook_1_wxListBox}, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], 0);
+    $self->{sizer_4}->Add($self->{list_box_empty}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{list_box_filled} = Wx::ListBox->new($self->{notebook_1_wxListBox}, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("Item 1"), _T("Item 2 (pre-selected)")], wxLB_MULTIPLE|wxLB_SORT);
+    $self->{list_box_filled}->SetSelection(1);
+    $self->{sizer_4}->Add($self->{list_box_filled}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxListCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxListCtrl}, _T("wxListCtrl"));
+    
+    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{list_ctrl_1} = Wx::ListCtrl->new($self->{notebook_1_wxListCtrl}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN|wxLC_REPORT);
+    $self->{sizer_3}->Add($self->{list_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxRadioBox} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxRadioBox}, _T("wxRadioBox"));
+    
+    $self->{grid_sizer_1} = Wx::GridSizer->new(2, 2, 0, 0);
+    
     $self->{radio_box_empty1} = Wx::RadioBox->new($self->{notebook_1_wxRadioBox}, wxID_ANY, _T("radio_box_empty1"), wxDefaultPosition, wxDefaultSize, [], 1, wxRA_SPECIFY_ROWS);
+    $self->{grid_sizer_1}->Add($self->{radio_box_empty1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{radio_box_filled1} = Wx::RadioBox->new($self->{notebook_1_wxRadioBox}, wxID_ANY, _T("radio_box_filled1"), wxDefaultPosition, wxDefaultSize, [_T("choice 1"), _T("choice 2 (pre-selected)"), _T("choice 3")], 0, wxRA_SPECIFY_ROWS);
+    $self->{radio_box_filled1}->SetSelection(1);
+    $self->{grid_sizer_1}->Add($self->{radio_box_filled1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{radio_box_empty2} = Wx::RadioBox->new($self->{notebook_1_wxRadioBox}, wxID_ANY, _T("radio_box_empty2"), wxDefaultPosition, wxDefaultSize, [], 1, wxRA_SPECIFY_COLS);
+    $self->{grid_sizer_1}->Add($self->{radio_box_empty2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{radio_box_filled2} = Wx::RadioBox->new($self->{notebook_1_wxRadioBox}, wxID_ANY, _T("radio_box_filled2"), wxDefaultPosition, wxDefaultSize, [_T("choice 1"), _T("choice 2 (pre-selected)")], 0, wxRA_SPECIFY_COLS);
+    $self->{radio_box_filled2}->SetSelection(1);
+    $self->{grid_sizer_1}->Add($self->{radio_box_filled2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxRadioButton} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxRadioButton}, _T("wxRadioButton"));
+    
+    $self->{sizer_8} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_wxRadioButton}, wxID_ANY, _T("My RadioButton Group")), wxHORIZONTAL);
+    
+    $self->{grid_sizer_2} = Wx::FlexGridSizer->new(3, 2, 0, 0);
+    $self->{sizer_8}->Add($self->{grid_sizer_2}, 1, wxEXPAND, 0);
+    
     $self->{radio_btn_1} = Wx::RadioButton->new($self->{notebook_1_wxRadioButton}, wxID_ANY, _T("Alice"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+    $self->{grid_sizer_2}->Add($self->{radio_btn_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{text_ctrl_1} = Wx::TextCtrl->new($self->{notebook_1_wxRadioButton}, wxID_ANY, "");
+    $self->{grid_sizer_2}->Add($self->{text_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{radio_btn_2} = Wx::RadioButton->new($self->{notebook_1_wxRadioButton}, wxID_ANY, _T("Bob"));
+    $self->{grid_sizer_2}->Add($self->{radio_btn_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{text_ctrl_2} = Wx::TextCtrl->new($self->{notebook_1_wxRadioButton}, wxID_ANY, "");
+    $self->{grid_sizer_2}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{radio_btn_3} = Wx::RadioButton->new($self->{notebook_1_wxRadioButton}, wxID_ANY, _T("Malroy"));
+    $self->{grid_sizer_2}->Add($self->{radio_btn_3}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{text_ctrl_3} = Wx::TextCtrl->new($self->{notebook_1_wxRadioButton}, wxID_ANY, "");
+    $self->{grid_sizer_2}->Add($self->{text_ctrl_3}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxSlider} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxSlider}, _T("wxSlider"));
+    
+    $self->{sizer_22} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{slider_1} = Wx::Slider->new($self->{notebook_1_wxSlider}, wxID_ANY, 5, 0, 10, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{sizer_22}->Add($self->{slider_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxSpinButton} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxSpinButton}, _T("wxSpinButton (with wxTextCtrl)"));
+    
+    $self->{sizer_16} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{tc_spin_button} = Wx::TextCtrl->new($self->{notebook_1_wxSpinButton}, wxID_ANY, _T("1"), wxDefaultPosition, wxDefaultSize, wxTE_RIGHT);
+    $self->{sizer_16}->Add($self->{tc_spin_button}, 1, wxALL, 5);
+    
     $self->{spin_button} = Wx::SpinButton->new($self->{notebook_1_wxSpinButton}, wxID_ANY,);
+    $self->{sizer_16}->Add($self->{spin_button}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxSpinCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxSpinCtrl}, _T("wxSpinCtrl"));
+    
+    $self->{sizer_14} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{spin_ctrl_1} = Wx::SpinCtrl->new($self->{notebook_1_wxSpinCtrl}, wxID_ANY, "4", wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 4);
+    $self->{sizer_14}->Add($self->{spin_ctrl_1}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxSplitterWindow_horizontal} = Wx::ScrolledWindow->new($self->{notebook_1}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    $self->{notebook_1_wxSplitterWindow_horizontal}->SetScrollRate(10, 10);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxSplitterWindow_horizontal}, _T("wxSplitterWindow (horizontally)"));
+    
+    $self->{sizer_29} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{splitter_1} = Wx::SplitterWindow->new($self->{notebook_1_wxSplitterWindow_horizontal}, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{splitter_1}->SetMinimumPaneSize(20);
+    $self->{sizer_29}->Add($self->{splitter_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{splitter_1_pane_1} = Wx::Panel->new($self->{splitter_1}, wxID_ANY);
+    
+    $self->{sizer_30} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{label_top_pane} = Wx::StaticText->new($self->{splitter_1_pane_1}, wxID_ANY, _T("top pane"));
+    $self->{sizer_30}->Add($self->{label_top_pane}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{splitter_1_pane_2} = Wx::Panel->new($self->{splitter_1}, wxID_ANY);
+    
+    $self->{sizer_31} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{label_buttom_pane} = Wx::StaticText->new($self->{splitter_1_pane_2}, wxID_ANY, _T("bottom pane"));
+    $self->{sizer_31}->Add($self->{label_buttom_pane}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxSplitterWindow_vertical} = Wx::ScrolledWindow->new($self->{notebook_1}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    $self->{notebook_1_wxSplitterWindow_vertical}->SetScrollRate(10, 10);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxSplitterWindow_vertical}, _T("wxSplitterWindow (vertically)"));
+    
+    $self->{sizer_25} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{splitter_2} = Wx::SplitterWindow->new($self->{notebook_1_wxSplitterWindow_vertical}, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{splitter_2}->SetMinimumPaneSize(20);
+    $self->{sizer_25}->Add($self->{splitter_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{splitter_2_pane_1} = Wx::Panel->new($self->{splitter_2}, wxID_ANY);
+    
+    $self->{sizer_32} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{label_left_pane} = Wx::StaticText->new($self->{splitter_2_pane_1}, wxID_ANY, _T("left pane"));
+    $self->{sizer_32}->Add($self->{label_left_pane}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{splitter_2_pane_2} = Wx::Panel->new($self->{splitter_2}, wxID_ANY);
+    
+    $self->{sizer_33} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{label_right_pane} = Wx::StaticText->new($self->{splitter_2_pane_2}, wxID_ANY, _T("right pane"));
+    $self->{sizer_33}->Add($self->{label_right_pane}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxStaticBitmap} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticBitmap}, _T("wxStaticBitmap"));
+    
+    $self->{sizer_11} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{bitmap_empty} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::Bitmap->new(32, 32));
-    $self->{bitmap_file} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::Bitmap->new("icon.xpm", wxBITMAP_TYPE_ANY));
+    $self->{sizer_11}->Add($self->{bitmap_empty}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{bitmap_file} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::Bitmap->new("icon.png", wxBITMAP_TYPE_ANY));
+    $self->{sizer_11}->Add($self->{bitmap_file}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{bitmap_nofile} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::Bitmap->new("non-existing.bmp", wxBITMAP_TYPE_ANY));
+    $self->{sizer_11}->Add($self->{bitmap_nofile}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{bitmap_art} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::ArtProvider::GetBitmap(wxART_PRINT, wxART_OTHER, Wx::Size->new(32, 32)));
+    $self->{sizer_11}->Add($self->{bitmap_art}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxStaticLine} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticLine}, _T("wxStaticLine"));
+    
+    $self->{sizer_9} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_10} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_9}->Add($self->{sizer_10}, 1, wxEXPAND, 0);
+    
     $self->{static_line_2} = Wx::StaticLine->new($self->{notebook_1_wxStaticLine}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL);
+    $self->{sizer_10}->Add($self->{static_line_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{static_line_3} = Wx::StaticLine->new($self->{notebook_1_wxStaticLine}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL);
+    $self->{sizer_10}->Add($self->{static_line_3}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{static_line_4} = Wx::StaticLine->new($self->{notebook_1_wxStaticLine}, wxID_ANY);
+    $self->{sizer_9}->Add($self->{static_line_4}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{static_line_5} = Wx::StaticLine->new($self->{notebook_1_wxStaticLine}, wxID_ANY);
+    $self->{sizer_9}->Add($self->{static_line_5}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxStaticText} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{label_1} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("red text (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-    $self->{label_4} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("black on red (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-    $self->{label_5} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("green on pink (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticText}, _T("wxStaticText"));
+    
+    $self->{grid_sizer_3} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    
+    $self->{label_1} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("red text (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    $self->{label_1}->SetForegroundColour(Wx::Colour->new(255, 0, 0));
+    $self->{grid_sizer_3}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{label_4} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("black on red (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    $self->{label_4}->SetBackgroundColour(Wx::Colour->new(255, 0, 0));
+    $self->{label_4}->SetToolTipString(_T("Background colour won't show, check documentation for more details"));
+    $self->{grid_sizer_3}->Add($self->{label_4}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{label_5} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("green on pink (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    $self->{label_5}->SetBackgroundColour(Wx::Colour->new(255, 0, 255));
+    $self->{label_5}->SetForegroundColour(Wx::Colour->new(0, 255, 0));
+    $self->{label_5}->SetToolTipString(_T("Background colour won't show, check documentation for more details"));
+    $self->{grid_sizer_3}->Add($self->{label_5}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_Spacer} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_Spacer}, _T("Spacer"));
+    
+    $self->{grid_sizer_4} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    
     $self->{label_3} = Wx::StaticText->new($self->{notebook_1_Spacer}, wxID_ANY, _T("Two labels with a"));
+    $self->{grid_sizer_4}->Add($self->{label_3}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{grid_sizer_4}->Add(60, 20, 1, wxALL|wxEXPAND, 5);
+    
     $self->{label_2} = Wx::StaticText->new($self->{notebook_1_Spacer}, wxID_ANY, _T("spacer between"));
+    $self->{grid_sizer_4}->Add($self->{label_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxTextCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxTextCtrl}, _T("wxTextCtrl"));
+    
+    $self->{sizer_18} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{text_ctrl} = Wx::TextCtrl->new($self->{notebook_1_wxTextCtrl}, wxID_ANY, _T("This\nis\na\nmultiline\nwxTextCtrl"), wxDefaultPosition, wxDefaultSize, wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_WORDWRAP);
+    $self->{sizer_18}->Add($self->{text_ctrl}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxToggleButton} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxToggleButton}, _T("wxToggleButton"));
+    
+    $self->{sizer_23} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{button_2} = Wx::ToggleButton->new($self->{notebook_1_wxToggleButton}, wxID_ANY, _T("Toggle Button 1"));
+    $self->{sizer_23}->Add($self->{button_2}, 1, wxALL, 5);
+    
     $self->{button_4} = Wx::ToggleButton->new($self->{notebook_1_wxToggleButton}, wxID_ANY, _T("Toggle Button 2"), wxDefaultPosition, wxDefaultSize, wxBU_BOTTOM|wxBU_EXACTFIT);
+    $self->{sizer_23}->Add($self->{button_4}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxTreeCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxTreeCtrl}, _T("wxTreeCtrl"));
+    
+    $self->{sizer_24} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{tree_ctrl_1} = Wx::TreeCtrl->new($self->{notebook_1_wxTreeCtrl}, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{sizer_24}->Add($self->{tree_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 2, 0, 0);
+    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
+    
     $self->{button_5} = Wx::Button->new($self, wxID_CLOSE, "");
+    $self->{sizer_2}->Add($self->{button_5}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
     $self->{button_1} = Wx::Button->new($self, wxID_OK, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->{sizer_2}->Add($self->{button_1}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    $self->{notebook_1_wxTreeCtrl}->SetSizer($self->{sizer_24});
+    
+    $self->{notebook_1_wxToggleButton}->SetSizer($self->{sizer_23});
+    
+    $self->{notebook_1_wxTextCtrl}->SetSizer($self->{sizer_18});
+    
+    $self->{notebook_1_Spacer}->SetSizer($self->{grid_sizer_4});
+    
+    $self->{notebook_1_wxStaticText}->SetSizer($self->{grid_sizer_3});
+    
+    $self->{notebook_1_wxStaticLine}->SetSizer($self->{sizer_9});
+    
+    $self->{notebook_1_wxStaticBitmap}->SetSizer($self->{sizer_11});
+    
+    $self->{splitter_2_pane_2}->SetSizer($self->{sizer_33});
+    
+    $self->{splitter_2_pane_1}->SetSizer($self->{sizer_32});
+    
+    $self->{splitter_2}->SplitVertically($self->{splitter_2_pane_1}, $self->{splitter_2_pane_2}, );
+    
+    $self->{notebook_1_wxSplitterWindow_vertical}->SetSizer($self->{sizer_25});
+    
+    $self->{splitter_1_pane_2}->SetSizer($self->{sizer_31});
+    
+    $self->{splitter_1_pane_1}->SetSizer($self->{sizer_30});
+    
+    $self->{splitter_1}->SplitHorizontally($self->{splitter_1_pane_1}, $self->{splitter_1_pane_2}, );
+    
+    $self->{notebook_1_wxSplitterWindow_horizontal}->SetSizer($self->{sizer_29});
+    
+    $self->{notebook_1_wxSpinCtrl}->SetSizer($self->{sizer_14});
+    
+    $self->{notebook_1_wxSpinButton}->SetSizer($self->{sizer_16});
+    
+    $self->{notebook_1_wxSlider}->SetSizer($self->{sizer_22});
+    
+    $self->{notebook_1_wxRadioButton}->SetSizer($self->{sizer_8});
+    
+    $self->{notebook_1_wxRadioBox}->SetSizer($self->{grid_sizer_1});
+    
+    $self->{notebook_1_wxListCtrl}->SetSizer($self->{sizer_3});
+    
+    $self->{notebook_1_wxListBox}->SetSizer($self->{sizer_4});
+    
+    $self->{notebook_1_wxHyperlinkCtrl}->SetSizer($self->{sizer_20});
+    
+    $self->{notebook_1_wxGrid}->SetSizer($self->{sizer_19});
+    
+    $self->{notebook_1_wxGauge}->SetSizer($self->{sizer_15});
+    
+    $self->{notebook_1_wxDatePickerCtrl}->SetSizer($self->{sizer_17});
+    
+    $self->{notebook_1_wxComboBox}->SetSizer($self->{sizer_6});
+    
+    $self->{notebook_1_wxChoice}->SetSizer($self->{sizer_5});
+    
+    $self->{notebook_1_wxCheckListBox}->SetSizer($self->{sizer_26});
+    
+    $self->{notebook_1_wxCheckBox}->SetSizer($self->{sizer_21});
+    
+    $self->{notebook_1_wxCalendarCtrl}->SetSizer($self->{sizer_12});
+    
+    $self->{notebook_1_wxButton}->SetSizer($self->{sizer_28});
+    
+    $self->{sizer_13}->AddGrowableRow(0);
+    $self->{sizer_13}->AddGrowableRow(1);
+    $self->{sizer_13}->AddGrowableCol(0);
+    $self->{sizer_13}->AddGrowableCol(1);
+    $self->{notebook_1_wxBitmapButton}->SetSizer($self->{sizer_13});
+    
+    $self->{sizer_1}->AddGrowableRow(0);
+    $self->{sizer_1}->AddGrowableCol(0);
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->SetSizeHints($self);
+    
+    $self->Layout();
+    $self->Centre();
     Wx::Event::EVT_MENU($self, $self->{mn_Unix}->GetId, $self->can('onSelectUnix'));
     Wx::Event::EVT_MENU($self, $self->{mn_Windows}->GetId, $self->can('onSelectWindows'));
     Wx::Event::EVT_MENU($self, $self->{mn_RemoveTabs}->GetId, $self->can('onRemoveTabs'));
@@ -192,241 +582,6 @@
 }
 
 
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: All_Widgets_Frame::__set_properties
-    $self->SetTitle(_T("All Widgets"));
-    my $icon = &Wx::wxNullIcon;
-    $icon->CopyFromBitmap(Wx::ArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, Wx::Size->new(32, 32)));
-    $self->SetIcon($icon);
-    $self->{All_Widgets_statusbar}->SetStatusWidths(-1);
-
-    # statusbar fields
-    my( @All_Widgets_statusbar_fields ) = (
-        _T("All Widgets statusbar"),
-    );
-
-    if( @All_Widgets_statusbar_fields ) {
-        $self->{All_Widgets_statusbar}->SetStatusText($All_Widgets_statusbar_fields[$_], $_)
-        for 0 .. $#All_Widgets_statusbar_fields ;
-    }
-    $self->{All_Widgets_toolbar}->Realize();
-    $self->{bitmap_button_icon1}->SetSize($self->{bitmap_button_icon1}->GetBestSize());
-    $self->{bitmap_button_icon1}->SetDefault();
-    $self->{bitmap_button_empty1}->SetSize($self->{bitmap_button_empty1}->GetBestSize());
-    $self->{bitmap_button_empty1}->SetDefault();
-    $self->{bitmap_button_icon2}->SetBitmapDisabled(Wx::Bitmap->new(20, 20));
-    $self->{bitmap_button_icon2}->SetSize($self->{bitmap_button_icon2}->GetBestSize());
-    $self->{bitmap_button_icon2}->SetDefault();
-    $self->{bitmap_button_art}->SetSize($self->{bitmap_button_art}->GetBestSize());
-    $self->{bitmap_button_art}->SetDefault();
-    $self->{checkbox_2}->SetValue(1);
-    $self->{checkbox_4}->Set3StateValue(wxCHK_UNCHECKED);
-    $self->{checkbox_5}->Set3StateValue(wxCHK_CHECKED);
-    $self->{checkbox_6}->Set3StateValue(wxCHK_UNDETERMINED);
-    $self->{check_list_box_1}->SetSelection(2);
-    $self->{choice_filled}->SetSelection(1);
-    $self->{combo_box_filled}->SetSelection(0);
-    $self->{grid_1}->CreateGrid(10, 3);
-    $self->{grid_1}->SetSelectionMode(wxGridSelectRows);
-    $self->{list_box_filled}->SetSelection(1);
-    $self->{radio_box_filled1}->SetSelection(1);
-    $self->{radio_box_filled2}->SetSelection(1);
-    $self->{splitter_1}->SetMinimumPaneSize(20);
-    $self->{notebook_1_wxSplitterWindow_horizontal}->SetScrollRate(10, 10);
-    $self->{splitter_2}->SetMinimumPaneSize(20);
-    $self->{notebook_1_wxSplitterWindow_vertical}->SetScrollRate(10, 10);
-    $self->{label_1}->SetForegroundColour(Wx::Colour->new(255, 0, 0));
-    $self->{label_4}->SetBackgroundColour(Wx::Colour->new(255, 0, 0));
-    $self->{label_4}->SetToolTipString(_T("Background colour won't show, check documentation for more details"));
-    $self->{label_5}->SetBackgroundColour(Wx::Colour->new(255, 0, 255));
-    $self->{label_5}->SetForegroundColour(Wx::Colour->new(0, 255, 0));
-    $self->{label_5}->SetToolTipString(_T("Background colour won't show, check documentation for more details"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: All_Widgets_Frame::__do_layout
-    $self->{sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
-    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 2, 0, 0);
-    $self->{sizer_24} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_23} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_18} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{grid_sizer_4} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    $self->{grid_sizer_3} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    $self->{sizer_9} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_10} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_11} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_25} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_33} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_32} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_29} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_31} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_30} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_14} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_16} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_22} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_8} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_wxRadioButton}, wxID_ANY, _T("My RadioButton Group")), wxHORIZONTAL);
-    $self->{grid_sizer_2} = Wx::FlexGridSizer->new(3, 2, 0, 0);
-    $self->{grid_sizer_1} = Wx::GridSizer->new(2, 2, 0, 0);
-    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_4} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_20} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_19} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_15} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_17} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_6} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_7} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_5} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_26} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_21} = Wx::GridSizer->new(2, 3, 0, 0);
-    $self->{sizer_12} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_28} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_13} = Wx::FlexGridSizer->new(2, 2, 0, 0);
-    $self->{sizer_13}->Add($self->{bitmap_button_icon1}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_13}->Add($self->{bitmap_button_empty1}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_13}->Add($self->{bitmap_button_icon2}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_13}->Add($self->{bitmap_button_art}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxBitmapButton}->SetSizer($self->{sizer_13});
-    $self->{sizer_13}->AddGrowableRow(0);
-    $self->{sizer_13}->AddGrowableRow(1);
-    $self->{sizer_13}->AddGrowableCol(0);
-    $self->{sizer_13}->AddGrowableCol(1);
-    $self->{sizer_28}->Add($self->{button_3}, 0, wxALL, 5);
-    $self->{notebook_1_wxButton}->SetSizer($self->{sizer_28});
-    $self->{sizer_12}->Add($self->{calendar_ctrl_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxCalendarCtrl}->SetSizer($self->{sizer_12});
-    $self->{sizer_21}->Add($self->{checkbox_1}, 0, wxEXPAND, 0);
-    $self->{sizer_21}->Add($self->{checkbox_2}, 0, wxEXPAND, 0);
-    $self->{sizer_21}->Add($self->{checkbox_3}, 0, wxEXPAND, 0);
-    $self->{sizer_21}->Add($self->{checkbox_4}, 0, wxEXPAND, 0);
-    $self->{sizer_21}->Add($self->{checkbox_5}, 0, wxEXPAND, 0);
-    $self->{sizer_21}->Add($self->{checkbox_6}, 0, wxEXPAND, 0);
-    $self->{notebook_1_wxCheckBox}->SetSizer($self->{sizer_21});
-    $self->{sizer_26}->Add($self->{check_list_box_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxCheckListBox}->SetSizer($self->{sizer_26});
-    $self->{sizer_5}->Add($self->{choice_empty}, 1, wxALL, 5);
-    $self->{sizer_5}->Add($self->{choice_filled}, 1, wxALL, 5);
-    $self->{notebook_1_wxChoice}->SetSizer($self->{sizer_5});
-    $self->{sizer_7}->Add($self->{combo_box_empty}, 1, wxALL, 5);
-    $self->{sizer_7}->Add($self->{combo_box_filled}, 1, wxALL, 5);
-    $self->{sizer_6}->Add($self->{sizer_7}, 1, wxEXPAND, 0);
-    $self->{notebook_1_wxComboBox}->SetSizer($self->{sizer_6});
-    $self->{sizer_17}->Add($self->{datepicker_ctrl_1}, 1, wxALIGN_CENTER|wxALL, 5);
-    $self->{notebook_1_wxDatePickerCtrl}->SetSizer($self->{sizer_17});
-    $self->{sizer_15}->Add($self->{gauge_1}, 1, wxALL, 5);
-    $self->{notebook_1_wxGauge}->SetSizer($self->{sizer_15});
-    $self->{sizer_19}->Add($self->{grid_1}, 1, wxEXPAND, 0);
-    $self->{notebook_1_wxGrid}->SetSizer($self->{sizer_19});
-    $self->{sizer_20}->Add($self->{hyperlink_1}, 0, wxALL, 5);
-    $self->{notebook_1_wxHyperlinkCtrl}->SetSizer($self->{sizer_20});
-    $self->{sizer_4}->Add($self->{list_box_empty}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_4}->Add($self->{list_box_filled}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxListBox}->SetSizer($self->{sizer_4});
-    $self->{sizer_3}->Add($self->{list_ctrl_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxListCtrl}->SetSizer($self->{sizer_3});
-    $self->{grid_sizer_1}->Add($self->{radio_box_empty1}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_1}->Add($self->{radio_box_filled1}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_1}->Add($self->{radio_box_empty2}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_1}->Add($self->{radio_box_filled2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxRadioBox}->SetSizer($self->{grid_sizer_1});
-    $self->{grid_sizer_2}->Add($self->{radio_btn_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{text_ctrl_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{radio_btn_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{radio_btn_3}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{text_ctrl_3}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_8}->Add($self->{grid_sizer_2}, 1, wxEXPAND, 0);
-    $self->{notebook_1_wxRadioButton}->SetSizer($self->{sizer_8});
-    $self->{sizer_22}->Add($self->{slider_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxSlider}->SetSizer($self->{sizer_22});
-    $self->{sizer_16}->Add($self->{tc_spin_button}, 1, wxALL, 5);
-    $self->{sizer_16}->Add($self->{spin_button}, 1, wxALL, 5);
-    $self->{notebook_1_wxSpinButton}->SetSizer($self->{sizer_16});
-    $self->{sizer_14}->Add($self->{spin_ctrl_1}, 1, wxALL, 5);
-    $self->{notebook_1_wxSpinCtrl}->SetSizer($self->{sizer_14});
-    $self->{sizer_30}->Add($self->{label_top_pane}, 1, wxALL|wxEXPAND, 5);
-    $self->{splitter_1_pane_1}->SetSizer($self->{sizer_30});
-    $self->{sizer_31}->Add($self->{label_buttom_pane}, 1, wxALL|wxEXPAND, 5);
-    $self->{splitter_1_pane_2}->SetSizer($self->{sizer_31});
-    $self->{splitter_1}->SplitHorizontally($self->{splitter_1_pane_1}, $self->{splitter_1_pane_2}, );
-    $self->{sizer_29}->Add($self->{splitter_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxSplitterWindow_horizontal}->SetSizer($self->{sizer_29});
-    $self->{sizer_32}->Add($self->{label_left_pane}, 1, wxALL|wxEXPAND, 5);
-    $self->{splitter_2_pane_1}->SetSizer($self->{sizer_32});
-    $self->{sizer_33}->Add($self->{label_right_pane}, 1, wxALL|wxEXPAND, 5);
-    $self->{splitter_2_pane_2}->SetSizer($self->{sizer_33});
-    $self->{splitter_2}->SplitVertically($self->{splitter_2_pane_1}, $self->{splitter_2_pane_2}, );
-    $self->{sizer_25}->Add($self->{splitter_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxSplitterWindow_vertical}->SetSizer($self->{sizer_25});
-    $self->{sizer_11}->Add($self->{bitmap_empty}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_11}->Add($self->{bitmap_file}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_11}->Add($self->{bitmap_nofile}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_11}->Add($self->{bitmap_art}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxStaticBitmap}->SetSizer($self->{sizer_11});
-    $self->{sizer_10}->Add($self->{static_line_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_10}->Add($self->{static_line_3}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_9}->Add($self->{sizer_10}, 1, wxEXPAND, 0);
-    $self->{sizer_9}->Add($self->{static_line_4}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_9}->Add($self->{static_line_5}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxStaticLine}->SetSizer($self->{sizer_9});
-    $self->{grid_sizer_3}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_3}->Add($self->{label_4}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_3}->Add($self->{label_5}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxStaticText}->SetSizer($self->{grid_sizer_3});
-    $self->{grid_sizer_4}->Add($self->{label_3}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_4}->Add(60, 20, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_4}->Add($self->{label_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_Spacer}->SetSizer($self->{grid_sizer_4});
-    $self->{sizer_18}->Add($self->{text_ctrl}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxTextCtrl}->SetSizer($self->{sizer_18});
-    $self->{sizer_23}->Add($self->{button_2}, 1, wxALL, 5);
-    $self->{sizer_23}->Add($self->{button_4}, 1, wxALL, 5);
-    $self->{notebook_1_wxToggleButton}->SetSizer($self->{sizer_23});
-    $self->{sizer_24}->Add($self->{tree_ctrl_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxTreeCtrl}->SetSizer($self->{sizer_24});
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxBitmapButton}, _T("wxBitmapButton"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxButton}, _T("wxButton"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxCalendarCtrl}, _T("wxCalendarCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxCheckBox}, _T("wxCheckBox"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxCheckListBox}, _T("wxCheckListBox"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxChoice}, _T("wxChoice"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxComboBox}, _T("wxComboBox"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxDatePickerCtrl}, _T("wxDatePickerCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxGauge}, _T("wxGauge"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxGrid}, _T("wxGrid"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxHyperlinkCtrl}, _T("wxHyperlinkCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxListBox}, _T("wxListBox"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxListCtrl}, _T("wxListCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxRadioBox}, _T("wxRadioBox"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxRadioButton}, _T("wxRadioButton"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxSlider}, _T("wxSlider"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxSpinButton}, _T("wxSpinButton (with wxTextCtrl)"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxSpinCtrl}, _T("wxSpinCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxSplitterWindow_horizontal}, _T("wxSplitterWindow (horizontally)"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxSplitterWindow_vertical}, _T("wxSplitterWindow (vertically)"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticBitmap}, _T("wxStaticBitmap"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticLine}, _T("wxStaticLine"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticText}, _T("wxStaticText"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_Spacer}, _T("Spacer"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxTextCtrl}, _T("wxTextCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxToggleButton}, _T("wxToggleButton"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxTreeCtrl}, _T("wxTreeCtrl"));
-    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
-    $self->{sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
-    $self->{sizer_2}->Add($self->{button_5}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_2}->Add($self->{button_1}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
-    $self->SetSizer($self->{sizer_1});
-    $self->{sizer_1}->SetSizeHints($self);
-    $self->{sizer_1}->AddGrowableRow(0);
-    $self->{sizer_1}->AddGrowableCol(0);
-    $self->Layout();
-    $self->Centre();
-    # end wxGlade
-}
-
 sub onSelectUnix {
     my ($self, $event) = @_;
     # wxGlade: All_Widgets_Frame::onSelectUnix <event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_28_Saved.wxg wxglade-1.0.1/tests/casefiles/AllWidgets_28_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/AllWidgets_28_Saved.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_28_Saved.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -177,7 +177,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon1" base="EditBitmapButton">
                                     <style>wxBU_AUTODRAW|wxBU_EXACTFIT|wxBU_NOTEXT</style>
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <default>1</default>
                                 </object>
                             </object>
@@ -197,8 +197,8 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon2" base="EditBitmapButton">
                                     <style>wxBU_BOTTOM|wxBORDER_NONE</style>
-                                    <bitmap>icon.xpm</bitmap>
-                                    <disabled_bitmap>empty:20,20</disabled_bitmap>
+                                    <bitmap>icon.png</bitmap>
+                                    <disabled_bitmap>empty:32,32</disabled_bitmap>
                                     <default>1</default>
                                 </object>
                             </object>
@@ -393,7 +393,7 @@
                             <object class="sizeritem">
                                 <option>1</option>
                                 <border>5</border>
-                                <flag>wxALL|wxALIGN_CENTER</flag>
+                                <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxDatePickerCtrl" name="datepicker_ctrl_1" base="EditDatePickerCtrl">
                                     <style>wxDP_SHOWCENTURY</style>
                                 </object>
@@ -797,7 +797,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxStaticBitmap" name="bitmap_file" base="EditStaticBitmap">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <attribute>1</attribute>
                                 </object>
                             </object>
@@ -884,7 +884,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxStaticText" name="label_1" base="EditStaticText">
                                     <foreground>#ff0000</foreground>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                     <label>red text (RGB)</label>
                                     <attribute>1</attribute>
                                 </object>
@@ -896,7 +896,7 @@
                                 <object class="wxStaticText" name="label_4" base="EditStaticText">
                                     <background>#ff0000</background>
                                     <tooltip>Background colour won't show, check documentation for more details</tooltip>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                     <label>black on red (RGB)</label>
                                     <attribute>1</attribute>
                                 </object>
@@ -909,7 +909,7 @@
                                     <background>#ff00ff</background>
                                     <foreground>#00ff00</foreground>
                                     <tooltip>Background colour won't show, check documentation for more details</tooltip>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                     <label>green on pink (RGB)</label>
                                     <attribute>1</attribute>
                                 </object>
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_28.wxg wxglade-1.0.1/tests/casefiles/AllWidgets_28.wxg
--- wxglade-0.9.6/tests/casefiles/AllWidgets_28.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_28.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -176,7 +176,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon1" base="EditBitmapButton">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <default>1</default>
                                 </object>
                             </object>
@@ -195,8 +195,8 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon2" base="EditBitmapButton">
                                     <style>wxBU_BOTTOM|wxNO_BORDER</style>
-                                    <bitmap>icon.xpm</bitmap>
-                                    <disabled_bitmap>empty:20,20</disabled_bitmap>
+                                    <bitmap>icon.png</bitmap>
+                                    <disabled_bitmap>empty:32,32</disabled_bitmap>
                                     <default>1</default>
                                 </object>
                             </object>
@@ -795,7 +795,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxEXPAND|wxALIGN_CENTER</flag>
                                 <object class="wxStaticBitmap" name="bitmap_file" base="EditStaticBitmap">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <attribute>1</attribute>
                                 </object>
                             </object>
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_28.xrc wxglade-1.0.1/tests/casefiles/AllWidgets_28.xrc
--- wxglade-0.9.6/tests/casefiles/AllWidgets_28.xrc	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_28.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -107,7 +107,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <border>5</border>
                                 <object class="wxBitmapButton" name="bitmap_button_icon1">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <default>1</default>
                                 </object>
                             </object>
@@ -124,7 +124,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <border>5</border>
                                 <object class="wxBitmapButton" name="bitmap_button_icon2">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <default>1</default>
                                     <style>wxBORDER_NONE|wxBU_BOTTOM</style>
                                 </object>
@@ -324,7 +324,7 @@
                             <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
                                 <option>1</option>
-                                <flag>wxALIGN_CENTER|wxALL</flag>
+                                <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                                 <border>5</border>
                                 <object class="wxDatePickerCtrl" name="datepicker_ctrl_1">
                                     <style>wxDP_SHOWCENTURY</style>
@@ -738,7 +738,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <border>5</border>
                                 <object class="wxStaticBitmap" name="bitmap_file">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -824,7 +824,7 @@
                                 <object class="wxStaticText" name="label_1">
                                     <fg>#ff0000</fg>
                                     <label>red text (RGB)</label>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -834,7 +834,7 @@
                                 <object class="wxStaticText" name="label_4">
                                     <bg>#ff0000</bg>
                                     <label>black on red (RGB)</label>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                     <tooltip>Background colour won't show, check documentation for more details</tooltip>
                                 </object>
                             </object>
@@ -846,7 +846,7 @@
                                     <bg>#ff00ff</bg>
                                     <fg>#00ff00</fg>
                                     <label>green on pink (RGB)</label>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                     <tooltip>Background colour won't show, check documentation for more details</tooltip>
                                 </object>
                             </object>
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_30_Classic.py wxglade-1.0.1/tests/casefiles/AllWidgets_30_Classic.py
--- wxglade-0.9.6/tests/casefiles/AllWidgets_30_Classic.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_30_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,12 +5,12 @@
 #
 
 import wx
-import wx.calendar
-import wx.grid
-import wx.propgrid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.calendar
+import wx.grid
+import wx.propgrid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -23,7 +23,11 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((800, 417))
-        
+        self.SetTitle(_("All Widgets"))
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
+        self.SetIcon(_icon)
+
         # Menu Bar
         self.All_Widgets_menubar = wx.MenuBar()
         global mn_IDUnix; mn_IDUnix = wx.NewId()
@@ -41,7 +45,7 @@
         self.Bind(wx.EVT_MENU, self.onSelectWindows, id=mn_IDWindows)
         wxglade_tmp_menu.AppendSeparator()
         self.All_Widgets_menubar.mn_RemoveTabs = wxglade_tmp_menu.Append(wx.ID_ANY, _("Remove Tabs"), _("Remove all leading tabs"), wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.onRemoveTabs, id=self.All_Widgets_menubar.mn_RemoveTabs.GetId())
+        self.Bind(wx.EVT_MENU, self.onRemoveTabs, self.All_Widgets_menubar.mn_RemoveTabs)
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Edit"))
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.ID_HELP, _("Manual"), _("Show the application manual"))
@@ -51,362 +55,526 @@
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.All_Widgets_menubar)
         # Menu Bar end
+
         self.All_Widgets_statusbar = self.CreateStatusBar(1, wx.STB_ELLIPSIZE_MIDDLE | wx.STB_SHOW_TIPS | wx.STB_SIZEGRIP)
-        
+        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
+        for i in range(len(All_Widgets_statusbar_fields)):
+            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
+
         # Tool Bar
         self.All_Widgets_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.All_Widgets_toolbar)
         self.All_Widgets_toolbar.AddLabelTool(wx.ID_UP, _("UpDown"), wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, _("Up or Down"), _("Up or Down"))
         self.All_Widgets_toolbar.AddLabelTool(wx.ID_OPEN, _("Open"), wx.EmptyBitmap(32, 32), wx.NullBitmap, wx.ITEM_NORMAL, _("Open a new file"), _("Open a new file"))
+        self.SetToolBar(self.All_Widgets_toolbar)
+        self.All_Widgets_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxBitmapButton = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
+        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
+
+        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
+
+        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
+        self.bitmap_button_icon1.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_empty1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.EmptyBitmap(10, 10))
-        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
+        self.bitmap_button_empty1.SetDefault()
+        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_icon2.SetBitmapDisabled(wx.EmptyBitmap(32, 32))
+        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
+        self.bitmap_button_icon2.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_art = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
+        self.bitmap_button_art.SetDefault()
+        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
+
+        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_3 = wx.Button(self.notebook_1_wxButton, wx.ID_BOLD, "")
+        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_wxCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
+
+        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.calendar_ctrl_1 = wx.calendar.CalendarCtrl(self.notebook_1_wxCalendarCtrl, wx.ID_ANY, style=wx.calendar.CAL_MONDAY_FIRST | wx.calendar.CAL_SEQUENTIAL_MONTH_SELECTION | wx.calendar.CAL_SHOW_SURROUNDING_WEEKS | wx.calendar.CAL_SHOW_WEEK_NUMBERS)
+        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxGenericCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGenericCalendarCtrl, _("wxGenericCalendarCtrl"))
+
+        sizer_27 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.generic_calendar_ctrl_1 = wx.calendar.GenericCalendarCtrl(self.notebook_1_wxGenericCalendarCtrl, wx.ID_ANY, style=wx.calendar.CAL_MONDAY_FIRST)
+        sizer_27.Add(self.generic_calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxCheckBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
+
+        sizer_21 = wx.GridSizer(2, 3, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("one (unchecked)"))
+        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
+
         self.checkbox_2 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("two (checked)"))
+        self.checkbox_2.SetValue(1)
+        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
+
         self.checkbox_3 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("three"), style=wx.CHK_2STATE)
+        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
+
         self.checkbox_4 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("four (unchecked)"), style=wx.CHK_3STATE)
+        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
+        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
+
         self.checkbox_5 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("five (checked)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
+        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
+
         self.checkbox_6 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("six (undetermined)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
+        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
+
         self.notebook_1_wxCheckListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
+
+        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.check_list_box_1 = wx.CheckListBox(self.notebook_1_wxCheckListBox, wx.ID_ANY, choices=[_("one"), _("two"), _("three"), _("four")])
+        self.check_list_box_1.SetSelection(2)
+        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxChoice = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.choice_empty = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[])
+        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
+
         self.choice_filled = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")])
+        self.choice_filled.SetSelection(1)
+        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxComboBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
+
         self.combo_box_empty = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[], style=0)
+        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
+
         self.combo_box_filled = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[_("Item 1 (pre-selected)"), _("Item 2")], style=0)
+        self.combo_box_filled.SetSelection(0)
+        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxDatePickerCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
+
+        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.datepicker_ctrl_1 = wx.DatePickerCtrl(self.notebook_1_wxDatePickerCtrl, wx.ID_ANY, style=wx.DP_SHOWCENTURY)
+        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.notebook_1_wxGauge = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
+
+        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.gauge_1 = wx.Gauge(self.notebook_1_wxGauge, wx.ID_ANY, 20)
+        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxGrid = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
+
+        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.grid_1 = wx.grid.Grid(self.notebook_1_wxGrid, wx.ID_ANY, size=(1, 1))
+        self.grid_1.CreateGrid(10, 3)
+        self.grid_1.SetSelectionMode(wx.grid.Grid.SelectColumns)
+        self.grid_1.SetColLabelValue(1, _("B\nB"))
+        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxHyperlinkCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
+
+        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.hyperlink_1 = wx.HyperlinkCtrl(self.notebook_1_wxHyperlinkCtrl, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"))
+        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
+
         self.notebook_1_wxListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
+
+        sizer_4 = wx.BoxSizer(wx.VERTICAL)
+
         self.list_box_empty = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[], style=0)
+        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
+
         self.list_box_filled = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")], style=wx.LB_MULTIPLE | wx.LB_SORT)
+        self.list_box_filled.SetSelection(1)
+        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxListCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.list_ctrl_1 = wx.ListCtrl(self.notebook_1_wxListCtrl, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_REPORT)
+        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxPropertyGridManager = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxPropertyGridManager, _("wxPropertyGridManager"))
+
+        sizer_34 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.property_grid_2 = wx.propgrid.PropertyGridManager(self.notebook_1_wxPropertyGridManager, wx.ID_ANY, style=wx.propgrid.PG_ALPHABETIC_MODE)
+        sizer_34.Add(self.property_grid_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
+
+        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
+
         self.radio_box_empty1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty1"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
+        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled1"), choices=[_("choice 1"), _("choice 2 (pre-selected)"), _("choice 3")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.radio_box_filled1.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_empty2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty2"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled2"), choices=[_("choice 1"), _("choice 2 (pre-selected)")], majorDimension=0, style=wx.RA_SPECIFY_COLS)
+        self.radio_box_filled2.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
+
+        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
+
+        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
+        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
+
         self.radio_btn_1 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Alice"), style=wx.RB_GROUP)
+        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_2 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Bob"))
+        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_3 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Malroy"))
+        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSlider = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
+
+        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.slider_1 = wx.Slider(self.notebook_1_wxSlider, wx.ID_ANY, 5, 0, 10, style=0)
+        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSpinButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"))
+
+        sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.tc_spin_button = wx.TextCtrl(self.notebook_1_wxSpinButton, wx.ID_ANY, _("1"), style=wx.TE_RIGHT)
+        sizer_16.Add(self.tc_spin_button, 1, wx.ALL, 5)
+
         self.spin_button = wx.SpinButton(self.notebook_1_wxSpinButton, wx.ID_ANY )
+        sizer_16.Add(self.spin_button, 1, wx.ALL, 5)
+
         self.notebook_1_wxSpinCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
+
+        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.spin_ctrl_1 = wx.SpinCtrl(self.notebook_1_wxSpinCtrl, wx.ID_ANY, "4", min=0, max=100, style=wx.ALIGN_RIGHT | wx.SP_ARROW_KEYS)
+        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxSplitterWindow_horizontal = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
+
+        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_1 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_horizontal, wx.ID_ANY, style=0)
+        self.splitter_1.SetBackgroundColour(wx.Colour(255, 0, 0))
+        self.splitter_1.SetMinimumPaneSize(20)
+        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_1 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_top_pane = wx.StaticText(self.splitter_1_pane_1, wx.ID_ANY, _("top pane"))
+        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_2 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_buttom_pane = wx.StaticText(self.splitter_1_pane_2, wx.ID_ANY, _("bottom pane"))
+        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSplitterWindow_vertical = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
+
+        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_2 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_vertical, wx.ID_ANY, style=0)
+        self.splitter_2.SetMinimumPaneSize(20)
+        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_1 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_32 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_left_pane = wx.StaticText(self.splitter_2_pane_1, wx.ID_ANY, _("left pane"))
+        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_2 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_33 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_right_pane = wx.StaticText(self.splitter_2_pane_2, wx.ID_ANY, _("right pane"))
+        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticBitmap = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
+
+        sizer_11 = wx.BoxSizer(wx.VERTICAL)
+
         self.bitmap_empty = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.EmptyBitmap(32, 32))
-        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
-        self.bitmap_nofile = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("non-existing.bmp", wx.BITMAP_TYPE_ANY))
-        self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
-        self.bitmap_null = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.NullBitmap)
+        sizer_11.Add(self.bitmap_empty, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_file, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_nofile = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("non-existing.bmp", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_nofile, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
+        sizer_11.Add(self.bitmap_art, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_null = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.NullBitmap)
+        sizer_11.Add(self.bitmap_null, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_null_sized = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.EmptyBitmap(50, 50))
+        self.bitmap_null_sized.SetMinSize((50, 50))
+        sizer_11.Add(self.bitmap_null_sized, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticLine = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
+
+        sizer_9 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
+
         self.static_line_2 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
+        sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_3 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
+        sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_4 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
+        sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_5 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
+        sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticText = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
+
+        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
+        grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
+        self.label_4.SetToolTip(wx.ToolTip(_("Background colour won't show, check documentation for more details")))
+        grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
+        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
+        self.label_5.SetToolTip(wx.ToolTip(_("Background colour won't show, check documentation for more details")))
+        grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_Spacer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
+
+        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
+
         self.label_3 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("Two labels with a"))
+        grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
+
+        grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
+
         self.label_2 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("spacer between"))
+        grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxTextCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
+
+        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.text_ctrl = wx.TextCtrl(self.notebook_1_wxTextCtrl, wx.ID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), style=wx.TE_CHARWRAP | wx.TE_MULTILINE | wx.TE_WORDWRAP)
+        sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxToggleButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
+
+        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_2 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 1"))
+        sizer_23.Add(self.button_2, 1, wx.ALL, 5)
+
         self.button_4 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 2"), style=wx.BU_BOTTOM | wx.BU_EXACTFIT)
+        sizer_23.Add(self.button_4, 1, wx.ALL, 5)
+
         self.notebook_1_wxTreeCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
+
+        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.tree_ctrl_1 = wx.TreeCtrl(self.notebook_1_wxTreeCtrl, wx.ID_ANY, style=0)
+        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
         self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
+        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
 
-        self.Bind(wx.EVT_NAVIGATION_KEY, self.OnBitmapButtonPanelNavigationKey)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
-        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
-        # end wxGlade
+        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
 
-    def __set_properties(self):
-        # begin wxGlade: All_Widgets_Frame.__set_properties
-        self.SetTitle(_("All Widgets"))
-        _icon = wx.NullIcon
-        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
-        self.SetIcon(_icon)
-        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
 
-        # statusbar fields
-        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
-        for i in range(len(All_Widgets_statusbar_fields)):
-            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
-        self.All_Widgets_toolbar.Realize()
-        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
-        self.bitmap_button_icon1.SetDefault()
-        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
-        self.bitmap_button_empty1.SetDefault()
-        self.bitmap_button_icon2.SetBitmapDisabled(wx.EmptyBitmap(32, 32))
-        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
-        self.bitmap_button_icon2.SetDefault()
-        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
-        self.bitmap_button_art.SetDefault()
-        self.checkbox_2.SetValue(1)
-        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
-        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
-        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
-        self.check_list_box_1.SetSelection(2)
-        self.choice_filled.SetSelection(1)
-        self.combo_box_filled.SetSelection(0)
-        self.grid_1.CreateGrid(10, 3)
-        self.grid_1.SetSelectionMode(wx.grid.Grid.SelectColumns)
-        self.grid_1.SetColLabelValue(1, _("B\nB"))
-        self.list_box_filled.SetSelection(1)
-        self.radio_box_filled1.SetSelection(1)
-        self.radio_box_filled2.SetSelection(1)
-        self.splitter_1.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
-        self.splitter_2.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
-        self.bitmap_null_sized.SetMinSize((50, 50))
-        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetToolTip(wx.ToolTip(_("Background colour won't show, check documentation for more details")))
-        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
-        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
-        self.label_5.SetToolTip(wx.ToolTip(_("Background colour won't show, check documentation for more details")))
-        # end wxGlade
+        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
+
+        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
+
+        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
+
+        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
+
+        self.splitter_2_pane_2.SetSizer(sizer_33)
+
+        self.splitter_2_pane_1.SetSizer(sizer_32)
+
+        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
+
+        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
+
+        self.splitter_1_pane_2.SetSizer(sizer_31)
+
+        self.splitter_1_pane_1.SetSizer(sizer_30)
+
+        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
+
+        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
+
+        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
+
+        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
+
+        self.notebook_1_wxSlider.SetSizer(sizer_22)
+
+        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
+
+        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
+
+        self.notebook_1_wxPropertyGridManager.SetSizer(sizer_34)
+
+        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
+
+        self.notebook_1_wxListBox.SetSizer(sizer_4)
+
+        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
+
+        self.notebook_1_wxGrid.SetSizer(sizer_19)
+
+        self.notebook_1_wxGauge.SetSizer(sizer_15)
+
+        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
+
+        self.notebook_1_wxComboBox.SetSizer(sizer_6)
+
+        self.notebook_1_wxChoice.SetSizer(sizer_5)
+
+        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
+
+        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
+
+        self.notebook_1_wxGenericCalendarCtrl.SetSizer(sizer_27)
+
+        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
+
+        self.notebook_1_wxButton.SetSizer(sizer_28)
 
-    def __do_layout(self):
-        # begin wxGlade: All_Widgets_Frame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
-        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
-        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_9 = wx.BoxSizer(wx.VERTICAL)
-        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_11 = wx.BoxSizer(wx.VERTICAL)
-        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_33 = wx.BoxSizer(wx.VERTICAL)
-        sizer_32 = wx.BoxSizer(wx.VERTICAL)
-        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
-        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
-        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
-        sizer_34 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.VERTICAL)
-        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.VERTICAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_21 = wx.GridSizer(2, 3, 0, 0)
-        sizer_27 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
-        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
         sizer_13.AddGrowableRow(0)
         sizer_13.AddGrowableRow(1)
         sizer_13.AddGrowableCol(0)
         sizer_13.AddGrowableCol(1)
-        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_wxButton.SetSizer(sizer_28)
-        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
-        sizer_27.Add(self.generic_calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxGenericCalendarCtrl.SetSizer(sizer_27)
-        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
-        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
-        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
-        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
-        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
-        self.notebook_1_wxChoice.SetSizer(sizer_5)
-        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
-        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
-        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
-        self.notebook_1_wxComboBox.SetSizer(sizer_6)
-        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER | wx.ALL, 5)
-        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
-        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
-        self.notebook_1_wxGauge.SetSizer(sizer_15)
-        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
-        self.notebook_1_wxGrid.SetSizer(sizer_19)
-        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
-        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
-        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListBox.SetSizer(sizer_4)
-        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
-        sizer_34.Add(self.property_grid_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxPropertyGridManager.SetSizer(sizer_34)
-        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
-        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
-        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
-        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSlider.SetSizer(sizer_22)
-        sizer_16.Add(self.tc_spin_button, 1, wx.ALL, 5)
-        sizer_16.Add(self.spin_button, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
-        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
-        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_1.SetSizer(sizer_30)
-        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_2.SetSizer(sizer_31)
-        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
-        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
-        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_1.SetSizer(sizer_32)
-        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_2.SetSizer(sizer_33)
-        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
-        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
-        sizer_11.Add(self.bitmap_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_file, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_nofile, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_art, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_null, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_null_sized, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
-        sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
-        sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
-        grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
-        grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
-        sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
-        sizer_23.Add(self.button_2, 1, wx.ALL, 5)
-        sizer_23.Add(self.button_4, 1, wx.ALL, 5)
-        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
-        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
-        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGenericCalendarCtrl, _("wxGenericCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
-        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
-        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
-        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxPropertyGridManager, _("wxPropertyGridManager"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
-        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
-        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
+
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
+        self.Bind(wx.EVT_NAVIGATION_KEY, self.OnBitmapButtonPanelNavigationKey)
+        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
         # end wxGlade
 
     def onSelectUnix(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
@@ -425,10 +593,6 @@
         print("Event handler 'onShowManual' not implemented!")
         event.Skip()
 
-    def OnBitmapButtonPanelNavigationKey(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
-        print("Event handler 'OnBitmapButtonPanelNavigationKey' not implemented!")
-        event.Skip()
-
     def OnNotebookPageChanged(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
         print("Event handler 'OnNotebookPageChanged' not implemented!")
         event.Skip()
@@ -437,6 +601,10 @@
         print("Event handler 'OnNotebookPageChanging' not implemented!")
         event.Skip()
 
+    def OnBitmapButtonPanelNavigationKey(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
+        print("Event handler 'OnBitmapButtonPanelNavigationKey' not implemented!")
+        event.Skip()
+
     def onStartConverting(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
         print("Event handler 'onStartConverting' not implemented!")
         event.Skip()
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_30.cpp wxglade-1.0.1/tests/casefiles/AllWidgets_30.cpp
--- wxglade-0.9.6/tests/casefiles/AllWidgets_30.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_30.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,42 +21,10 @@
 {
     // begin wxGlade: All_Widgets_Frame::All_Widgets_Frame
     SetSize(wxSize(800, 417));
-    notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
-    notebook_1_wxTreeCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxToggleButton = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxTextCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_Spacer = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxStaticText = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxStaticLine = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxStaticBitmap = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxSplitterWindow_vertical = new wxScrolledWindow(notebook_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-    splitter_2 = new wxSplitterWindow(notebook_1_wxSplitterWindow_vertical, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
-    splitter_2_pane_2 = new wxPanel(splitter_2, wxID_ANY);
-    splitter_2_pane_1 = new wxPanel(splitter_2, wxID_ANY);
-    notebook_1_wxSplitterWindow_horizontal = new wxScrolledWindow(notebook_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-    splitter_1 = new wxSplitterWindow(notebook_1_wxSplitterWindow_horizontal, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
-    splitter_1_pane_2 = new wxPanel(splitter_1, wxID_ANY);
-    splitter_1_pane_1 = new wxPanel(splitter_1, wxID_ANY);
-    notebook_1_wxSpinCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxSpinButton = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxSlider = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxRadioButton = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxRadioBox = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxPropertyGridManager = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxListCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxListBox = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxHyperlinkCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxGrid = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxGauge = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxDatePickerCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxComboBox = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxChoice = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxCheckListBox = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxCheckBox = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxGenericCalendarCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxCalendarCtrl = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxButton = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_wxBitmapButton = new wxPanel(notebook_1, wxID_ANY);
+    SetTitle(_("All Widgets"));
+    wxIcon _icon;
+    _icon.CopyFromBitmap(wxArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, wxSize(32, 32)));
+    SetIcon(_icon);
     All_Widgets_menubar = new wxMenuBar();
     wxMenu *wxglade_tmp_menu;
     wxglade_tmp_menu = new wxMenu();
@@ -82,24 +50,81 @@
     All_Widgets_menubar->Append(wxglade_tmp_menu, _("&Help"));
     SetMenuBar(All_Widgets_menubar);
     All_Widgets_statusbar = CreateStatusBar(1, wxSTB_ELLIPSIZE_MIDDLE|wxSTB_SHOW_TIPS|wxSTB_SIZEGRIP);
+    int All_Widgets_statusbar_widths[] = { -1 };
+    All_Widgets_statusbar->SetStatusWidths(1, All_Widgets_statusbar_widths);
+    
+    // statusbar fields
+    const wxString All_Widgets_statusbar_fields[] = {
+        _("All Widgets statusbar"),
+    };
+    for(int i = 0; i < All_Widgets_statusbar->GetFieldsCount(); ++i) {
+        All_Widgets_statusbar->SetStatusText(All_Widgets_statusbar_fields[i], i);
+    }
     All_Widgets_toolbar = new wxToolBar(this, -1);
     SetToolBar(All_Widgets_toolbar);
     All_Widgets_toolbar->AddTool(wxID_UP, _("UpDown"), wxArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, wxSize(32, 32)), wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, wxSize(32, 32)), wxITEM_CHECK, _("Up or Down"), _("Up or Down"));
     All_Widgets_toolbar->AddTool(wxID_OPEN, _("Open"), wxBitmap(32, 32), wxNullBitmap, wxITEM_NORMAL, _("Open a new file"), _("Open a new file"));
     All_Widgets_toolbar->Realize();
-    bitmap_button_icon1 = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxBitmap(wxT("icon.xpm"), wxBITMAP_TYPE_ANY));
+    wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
+    notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
+    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
+    notebook_1_wxBitmapButton = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxBitmapButton, _("wxBitmapButton"));
+    wxFlexGridSizer* sizer_13 = new wxFlexGridSizer(2, 2, 0, 0);
+    bitmap_button_icon1 = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxBitmap(wxT("icon.png"), wxBITMAP_TYPE_ANY));
+    bitmap_button_icon1->SetSize(bitmap_button_icon1->GetBestSize());
+    bitmap_button_icon1->SetDefault();
+    sizer_13->Add(bitmap_button_icon1, 1, wxALL|wxEXPAND, 5);
     bitmap_button_empty1 = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxBitmap(10, 10));
-    bitmap_button_icon2 = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxBitmap(wxT("icon.xpm"), wxBITMAP_TYPE_ANY), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    bitmap_button_empty1->SetSize(bitmap_button_empty1->GetBestSize());
+    bitmap_button_empty1->SetDefault();
+    sizer_13->Add(bitmap_button_empty1, 1, wxALL|wxEXPAND, 5);
+    bitmap_button_icon2 = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxBitmap(wxT("icon.png"), wxBITMAP_TYPE_ANY), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    bitmap_button_icon2->SetBitmapDisabled(wxBitmap(32, 32));
+    bitmap_button_icon2->SetSize(bitmap_button_icon2->GetBestSize());
+    bitmap_button_icon2->SetDefault();
+    sizer_13->Add(bitmap_button_icon2, 1, wxALL|wxEXPAND, 5);
     bitmap_button_art = new wxBitmapButton(notebook_1_wxBitmapButton, wxID_ANY, wxArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, wxSize(32, 32)), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    bitmap_button_art->SetSize(bitmap_button_art->GetBestSize());
+    bitmap_button_art->SetDefault();
+    sizer_13->Add(bitmap_button_art, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxButton = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxButton, _("wxButton"));
+    wxBoxSizer* sizer_28 = new wxBoxSizer(wxHORIZONTAL);
     button_3 = new wxButton(notebook_1_wxButton, wxID_BOLD, wxEmptyString);
+    sizer_28->Add(button_3, 0, wxALL, 5);
+    notebook_1_wxCalendarCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"));
+    wxBoxSizer* sizer_12 = new wxBoxSizer(wxHORIZONTAL);
     calendar_ctrl_1 = new wxCalendarCtrl(notebook_1_wxCalendarCtrl, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_MONDAY_FIRST|wxCAL_SEQUENTIAL_MONTH_SELECTION|wxCAL_SHOW_SURROUNDING_WEEKS|wxCAL_SHOW_WEEK_NUMBERS);
+    sizer_12->Add(calendar_ctrl_1, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxGenericCalendarCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxGenericCalendarCtrl, _("wxGenericCalendarCtrl"));
+    wxBoxSizer* sizer_27 = new wxBoxSizer(wxHORIZONTAL);
     generic_calendar_ctrl_1 = new wxGenericCalendarCtrl(notebook_1_wxGenericCalendarCtrl, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_MONDAY_FIRST);
+    sizer_27->Add(generic_calendar_ctrl_1, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxCheckBox = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxCheckBox, _("wxCheckBox"));
+    wxGridSizer* sizer_21 = new wxGridSizer(2, 3, 0, 0);
     checkbox_1 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("one (unchecked)"));
+    sizer_21->Add(checkbox_1, 0, wxEXPAND, 0);
     checkbox_2 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("two (checked)"));
+    checkbox_2->SetValue(1);
+    sizer_21->Add(checkbox_2, 0, wxEXPAND, 0);
     checkbox_3 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("three"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
+    sizer_21->Add(checkbox_3, 0, wxEXPAND, 0);
     checkbox_4 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("four (unchecked)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE);
+    checkbox_4->Set3StateValue(wxCHK_UNCHECKED);
+    sizer_21->Add(checkbox_4, 0, wxEXPAND, 0);
     checkbox_5 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("five (checked)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER);
+    checkbox_5->Set3StateValue(wxCHK_CHECKED);
+    sizer_21->Add(checkbox_5, 0, wxEXPAND, 0);
     checkbox_6 = new wxCheckBox(notebook_1_wxCheckBox, wxID_ANY, _("six (undetermined)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER);
+    checkbox_6->Set3StateValue(wxCHK_UNDETERMINED);
+    sizer_21->Add(checkbox_6, 0, wxEXPAND, 0);
+    notebook_1_wxCheckListBox = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxCheckListBox, _("wxCheckListBox"));
+    wxBoxSizer* sizer_26 = new wxBoxSizer(wxHORIZONTAL);
     const wxString check_list_box_1_choices[] = {
         _("one"),
         _("two"),
@@ -107,332 +132,292 @@
         _("four"),
     };
     check_list_box_1 = new wxCheckListBox(notebook_1_wxCheckListBox, wxID_ANY, wxDefaultPosition, wxDefaultSize, 4, check_list_box_1_choices);
+    check_list_box_1->SetSelection(2);
+    sizer_26->Add(check_list_box_1, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxChoice = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxChoice, _("wxChoice"));
+    wxBoxSizer* sizer_5 = new wxBoxSizer(wxHORIZONTAL);
     const wxString choice_empty_choices[] = {};
     choice_empty = new wxChoice(notebook_1_wxChoice, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_empty_choices);
+    sizer_5->Add(choice_empty, 1, wxALL, 5);
     const wxString choice_filled_choices[] = {
         _("Item 1"),
         _("Item 2 (pre-selected)"),
     };
     choice_filled = new wxChoice(notebook_1_wxChoice, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, choice_filled_choices);
+    choice_filled->SetSelection(1);
+    sizer_5->Add(choice_filled, 1, wxALL, 5);
+    notebook_1_wxComboBox = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxComboBox, _("wxComboBox"));
+    wxBoxSizer* sizer_6 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* sizer_7 = new wxBoxSizer(wxHORIZONTAL);
+    sizer_6->Add(sizer_7, 1, wxEXPAND, 0);
     const wxString combo_box_empty_choices[] = {};
     combo_box_empty = new wxComboBox(notebook_1_wxComboBox, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0, combo_box_empty_choices, 0);
+    sizer_7->Add(combo_box_empty, 1, wxALL, 5);
     const wxString combo_box_filled_choices[] = {
         _("Item 1 (pre-selected)"),
         _("Item 2"),
     };
     combo_box_filled = new wxComboBox(notebook_1_wxComboBox, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 2, combo_box_filled_choices, 0);
+    combo_box_filled->SetSelection(0);
+    sizer_7->Add(combo_box_filled, 1, wxALL, 5);
+    notebook_1_wxDatePickerCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"));
+    wxBoxSizer* sizer_17 = new wxBoxSizer(wxHORIZONTAL);
     datepicker_ctrl_1 = new wxDatePickerCtrl(notebook_1_wxDatePickerCtrl, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_SHOWCENTURY);
+    sizer_17->Add(datepicker_ctrl_1, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    notebook_1_wxGauge = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxGauge, _("wxGauge"));
+    wxBoxSizer* sizer_15 = new wxBoxSizer(wxHORIZONTAL);
     gauge_1 = new wxGauge(notebook_1_wxGauge, wxID_ANY, 20);
+    sizer_15->Add(gauge_1, 1, wxALL, 5);
+    notebook_1_wxGrid = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxGrid, _("wxGrid"));
+    wxBoxSizer* sizer_19 = new wxBoxSizer(wxHORIZONTAL);
     grid_1 = new wxGrid(notebook_1_wxGrid, wxID_ANY);
+    grid_1->CreateGrid(10, 3);
+    grid_1->SetSelectionMode(wxGrid::wxGridSelectColumns);
+    grid_1->SetColLabelValue(1, _("B\nB"));
+    sizer_19->Add(grid_1, 1, wxEXPAND, 0);
+    notebook_1_wxHyperlinkCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"));
+    wxBoxSizer* sizer_20 = new wxBoxSizer(wxHORIZONTAL);
     hyperlink_1 = new wxHyperlinkCtrl(notebook_1_wxHyperlinkCtrl, wxID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"));
+    sizer_20->Add(hyperlink_1, 0, wxALL, 5);
+    notebook_1_wxListBox = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxListBox, _("wxListBox"));
+    wxBoxSizer* sizer_4 = new wxBoxSizer(wxVERTICAL);
     const wxString list_box_empty_choices[] = {};
     list_box_empty = new wxListBox(notebook_1_wxListBox, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_empty_choices, 0);
+    sizer_4->Add(list_box_empty, 1, wxALL|wxEXPAND, 5);
     const wxString list_box_filled_choices[] = {
         _("Item 1"),
         _("Item 2 (pre-selected)"),
     };
     list_box_filled = new wxListBox(notebook_1_wxListBox, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, list_box_filled_choices, wxLB_MULTIPLE|wxLB_SORT);
+    list_box_filled->SetSelection(1);
+    sizer_4->Add(list_box_filled, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxListCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxListCtrl, _("wxListCtrl"));
+    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
     list_ctrl_1 = new wxListCtrl(notebook_1_wxListCtrl, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN|wxLC_REPORT);
+    sizer_3->Add(list_ctrl_1, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxPropertyGridManager = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxPropertyGridManager, _("wxPropertyGridManager"));
+    wxBoxSizer* sizer_34 = new wxBoxSizer(wxHORIZONTAL);
     property_grid_2 = new wxPropertyGridManager(notebook_1_wxPropertyGridManager, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxPG_ALPHABETIC_MODE);
+    sizer_34->Add(property_grid_2, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxRadioBox = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxRadioBox, _("wxRadioBox"));
+    wxGridSizer* grid_sizer_1 = new wxGridSizer(2, 2, 0, 0);
     const wxString radio_box_empty1_choices[] = {};
     radio_box_empty1 = new wxRadioBox(notebook_1_wxRadioBox, wxID_ANY, _("radio_box_empty1"), wxDefaultPosition, wxDefaultSize, 0, radio_box_empty1_choices, 1, wxRA_SPECIFY_ROWS);
+    grid_sizer_1->Add(radio_box_empty1, 1, wxALL|wxEXPAND, 5);
     const wxString radio_box_filled1_choices[] = {
         _("choice 1"),
         _("choice 2 (pre-selected)"),
         _("choice 3"),
     };
     radio_box_filled1 = new wxRadioBox(notebook_1_wxRadioBox, wxID_ANY, _("radio_box_filled1"), wxDefaultPosition, wxDefaultSize, 3, radio_box_filled1_choices, 0, wxRA_SPECIFY_ROWS);
+    radio_box_filled1->SetSelection(1);
+    grid_sizer_1->Add(radio_box_filled1, 1, wxALL|wxEXPAND, 5);
     const wxString radio_box_empty2_choices[] = {};
     radio_box_empty2 = new wxRadioBox(notebook_1_wxRadioBox, wxID_ANY, _("radio_box_empty2"), wxDefaultPosition, wxDefaultSize, 0, radio_box_empty2_choices, 1, wxRA_SPECIFY_COLS);
+    grid_sizer_1->Add(radio_box_empty2, 1, wxALL|wxEXPAND, 5);
     const wxString radio_box_filled2_choices[] = {
         _("choice 1"),
         _("choice 2 (pre-selected)"),
     };
     radio_box_filled2 = new wxRadioBox(notebook_1_wxRadioBox, wxID_ANY, _("radio_box_filled2"), wxDefaultPosition, wxDefaultSize, 2, radio_box_filled2_choices, 0, wxRA_SPECIFY_COLS);
+    radio_box_filled2->SetSelection(1);
+    grid_sizer_1->Add(radio_box_filled2, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxRadioButton = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxRadioButton, _("wxRadioButton"));
+    wxStaticBoxSizer* sizer_8 = new wxStaticBoxSizer(new wxStaticBox(notebook_1_wxRadioButton, wxID_ANY, _("My RadioButton Group")), wxHORIZONTAL);
+    wxFlexGridSizer* grid_sizer_2 = new wxFlexGridSizer(3, 2, 0, 0);
+    sizer_8->Add(grid_sizer_2, 1, wxEXPAND, 0);
     radio_btn_1 = new wxRadioButton(notebook_1_wxRadioButton, wxID_ANY, _("Alice"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+    grid_sizer_2->Add(radio_btn_1, 1, wxALL|wxEXPAND, 5);
     text_ctrl_1 = new wxTextCtrl(notebook_1_wxRadioButton, wxID_ANY, wxEmptyString);
+    grid_sizer_2->Add(text_ctrl_1, 1, wxALL|wxEXPAND, 5);
     radio_btn_2 = new wxRadioButton(notebook_1_wxRadioButton, wxID_ANY, _("Bob"));
+    grid_sizer_2->Add(radio_btn_2, 1, wxALL|wxEXPAND, 5);
     text_ctrl_2 = new wxTextCtrl(notebook_1_wxRadioButton, wxID_ANY, wxEmptyString);
+    grid_sizer_2->Add(text_ctrl_2, 1, wxALL|wxEXPAND, 5);
     radio_btn_3 = new wxRadioButton(notebook_1_wxRadioButton, wxID_ANY, _("Malroy"));
+    grid_sizer_2->Add(radio_btn_3, 1, wxALL|wxEXPAND, 5);
     text_ctrl_3 = new wxTextCtrl(notebook_1_wxRadioButton, wxID_ANY, wxEmptyString);
+    grid_sizer_2->Add(text_ctrl_3, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxSlider = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxSlider, _("wxSlider"));
+    wxBoxSizer* sizer_22 = new wxBoxSizer(wxHORIZONTAL);
     slider_1 = new wxSlider(notebook_1_wxSlider, wxID_ANY, 5, 0, 10, wxDefaultPosition, wxDefaultSize, 0);
+    sizer_22->Add(slider_1, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxSpinButton = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"));
+    wxBoxSizer* sizer_16 = new wxBoxSizer(wxHORIZONTAL);
     tc_spin_button = new wxTextCtrl(notebook_1_wxSpinButton, wxID_ANY, _("1"), wxDefaultPosition, wxDefaultSize, wxTE_RIGHT);
+    sizer_16->Add(tc_spin_button, 1, wxALL, 5);
     spin_button = new wxSpinButton(notebook_1_wxSpinButton, wxID_ANY);
+    sizer_16->Add(spin_button, 1, wxALL, 5);
+    notebook_1_wxSpinCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxSpinCtrl, _("wxSpinCtrl"));
+    wxBoxSizer* sizer_14 = new wxBoxSizer(wxHORIZONTAL);
     spin_ctrl_1 = new wxSpinCtrl(notebook_1_wxSpinCtrl, wxID_ANY, wxT("4"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxSP_ARROW_KEYS, 0, 100);
+    sizer_14->Add(spin_ctrl_1, 1, wxALL, 5);
+    notebook_1_wxSplitterWindow_horizontal = new wxScrolledWindow(notebook_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    notebook_1_wxSplitterWindow_horizontal->SetScrollRate(10, 10);
+    notebook_1->AddPage(notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"));
+    wxBoxSizer* sizer_29 = new wxBoxSizer(wxHORIZONTAL);
+    splitter_1 = new wxSplitterWindow(notebook_1_wxSplitterWindow_horizontal, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    splitter_1->SetBackgroundColour(wxColour(255, 0, 0));
+    splitter_1->SetMinimumPaneSize(20);
+    sizer_29->Add(splitter_1, 1, wxALL|wxEXPAND, 5);
+    splitter_1_pane_1 = new wxPanel(splitter_1, wxID_ANY);
+    wxBoxSizer* sizer_30 = new wxBoxSizer(wxHORIZONTAL);
     label_top_pane = new wxStaticText(splitter_1_pane_1, wxID_ANY, _("top pane"));
+    sizer_30->Add(label_top_pane, 1, wxALL|wxEXPAND, 5);
+    splitter_1_pane_2 = new wxPanel(splitter_1, wxID_ANY);
+    wxBoxSizer* sizer_31 = new wxBoxSizer(wxHORIZONTAL);
     label_buttom_pane = new wxStaticText(splitter_1_pane_2, wxID_ANY, _("bottom pane"));
+    sizer_31->Add(label_buttom_pane, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxSplitterWindow_vertical = new wxScrolledWindow(notebook_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    notebook_1_wxSplitterWindow_vertical->SetScrollRate(10, 10);
+    notebook_1->AddPage(notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"));
+    wxBoxSizer* sizer_25 = new wxBoxSizer(wxHORIZONTAL);
+    splitter_2 = new wxSplitterWindow(notebook_1_wxSplitterWindow_vertical, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    splitter_2->SetMinimumPaneSize(20);
+    sizer_25->Add(splitter_2, 1, wxALL|wxEXPAND, 5);
+    splitter_2_pane_1 = new wxPanel(splitter_2, wxID_ANY);
+    wxBoxSizer* sizer_32 = new wxBoxSizer(wxVERTICAL);
     label_left_pane = new wxStaticText(splitter_2_pane_1, wxID_ANY, _("left pane"));
+    sizer_32->Add(label_left_pane, 1, wxALL|wxEXPAND, 5);
+    splitter_2_pane_2 = new wxPanel(splitter_2, wxID_ANY);
+    wxBoxSizer* sizer_33 = new wxBoxSizer(wxVERTICAL);
     label_right_pane = new wxStaticText(splitter_2_pane_2, wxID_ANY, _("right pane"));
+    sizer_33->Add(label_right_pane, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxStaticBitmap = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxStaticBitmap, _("wxStaticBitmap"));
+    wxBoxSizer* sizer_11 = new wxBoxSizer(wxVERTICAL);
     bitmap_empty = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxBitmap(32, 32));
-    bitmap_file = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxBitmap(wxT("icon.xpm"), wxBITMAP_TYPE_ANY));
+    sizer_11->Add(bitmap_empty, 1, wxALL|wxEXPAND, 5);
+    bitmap_file = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxBitmap(wxT("icon.png"), wxBITMAP_TYPE_ANY));
+    sizer_11->Add(bitmap_file, 1, wxALL|wxEXPAND, 5);
     bitmap_nofile = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxBitmap(wxT("non-existing.bmp"), wxBITMAP_TYPE_ANY));
+    sizer_11->Add(bitmap_nofile, 1, wxALL|wxEXPAND, 5);
     bitmap_art = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxArtProvider::GetBitmap(wxART_PRINT, wxART_OTHER, wxSize(32, 32)));
+    sizer_11->Add(bitmap_art, 1, wxALL|wxEXPAND, 5);
     bitmap_null = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxNullBitmap);
+    sizer_11->Add(bitmap_null, 1, wxALL|wxEXPAND, 5);
     bitmap_null_sized = new wxStaticBitmap(notebook_1_wxStaticBitmap, wxID_ANY, wxNullBitmap);
+    bitmap_null_sized->SetMinSize(wxSize(50, 50));
+    sizer_11->Add(bitmap_null_sized, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxStaticLine = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxStaticLine, _("wxStaticLine"));
+    wxBoxSizer* sizer_9 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* sizer_10 = new wxBoxSizer(wxHORIZONTAL);
+    sizer_9->Add(sizer_10, 1, wxEXPAND, 0);
     static_line_2 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL);
+    sizer_10->Add(static_line_2, 1, wxALL|wxEXPAND, 5);
     static_line_3 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL);
+    sizer_10->Add(static_line_3, 1, wxALL|wxEXPAND, 5);
     static_line_4 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY);
+    sizer_9->Add(static_line_4, 1, wxALL|wxEXPAND, 5);
     static_line_5 = new wxStaticLine(notebook_1_wxStaticLine, wxID_ANY);
-    label_1 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("red text (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-    label_4 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("black on red (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-    label_5 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("green on pink (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
+    sizer_9->Add(static_line_5, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxStaticText = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxStaticText, _("wxStaticText"));
+    wxFlexGridSizer* grid_sizer_3 = new wxFlexGridSizer(1, 3, 0, 0);
+    label_1 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("red text (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    label_1->SetForegroundColour(wxColour(255, 0, 0));
+    grid_sizer_3->Add(label_1, 1, wxALL|wxEXPAND, 5);
+    label_4 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("black on red (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    label_4->SetBackgroundColour(wxColour(255, 0, 0));
+    label_4->SetToolTip(_("Background colour won't show, check documentation for more details"));
+    grid_sizer_3->Add(label_4, 1, wxALL|wxEXPAND, 5);
+    label_5 = new wxStaticText(notebook_1_wxStaticText, wxID_ANY, _("green on pink (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    label_5->SetBackgroundColour(wxColour(255, 0, 255));
+    label_5->SetForegroundColour(wxColour(0, 255, 0));
+    label_5->SetToolTip(_("Background colour won't show, check documentation for more details"));
+    grid_sizer_3->Add(label_5, 1, wxALL|wxEXPAND, 5);
+    notebook_1_Spacer = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_Spacer, _("Spacer"));
+    wxFlexGridSizer* grid_sizer_4 = new wxFlexGridSizer(1, 3, 0, 0);
     label_3 = new wxStaticText(notebook_1_Spacer, wxID_ANY, _("Two labels with a"));
+    grid_sizer_4->Add(label_3, 1, wxALL|wxEXPAND, 5);
+    grid_sizer_4->Add(60, 20, 1, wxALL|wxEXPAND, 5);
     label_2 = new wxStaticText(notebook_1_Spacer, wxID_ANY, _("spacer between"));
+    grid_sizer_4->Add(label_2, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxTextCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxTextCtrl, _("wxTextCtrl"));
+    wxBoxSizer* sizer_18 = new wxBoxSizer(wxHORIZONTAL);
     text_ctrl = new wxTextCtrl(notebook_1_wxTextCtrl, wxID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), wxDefaultPosition, wxDefaultSize, wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_WORDWRAP);
+    sizer_18->Add(text_ctrl, 1, wxALL|wxEXPAND, 5);
+    notebook_1_wxToggleButton = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxToggleButton, _("wxToggleButton"));
+    wxBoxSizer* sizer_23 = new wxBoxSizer(wxHORIZONTAL);
     button_2 = new wxToggleButton(notebook_1_wxToggleButton, wxID_ANY, _("Toggle Button 1"));
+    sizer_23->Add(button_2, 1, wxALL, 5);
     button_4 = new wxToggleButton(notebook_1_wxToggleButton, wxID_ANY, _("Toggle Button 2"), wxDefaultPosition, wxDefaultSize, wxBU_BOTTOM|wxBU_EXACTFIT);
+    sizer_23->Add(button_4, 1, wxALL, 5);
+    notebook_1_wxTreeCtrl = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_wxTreeCtrl, _("wxTreeCtrl"));
+    wxBoxSizer* sizer_24 = new wxBoxSizer(wxHORIZONTAL);
     tree_ctrl_1 = new wxTreeCtrl(notebook_1_wxTreeCtrl, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    sizer_24->Add(tree_ctrl_1, 1, wxALL|wxEXPAND, 5);
     static_line_1 = new wxStaticLine(this, wxID_ANY);
+    sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
+    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 2, 0, 0);
+    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
     button_5 = new wxButton(this, wxID_CLOSE, wxEmptyString);
+    sizer_2->Add(button_5, 0, wxALIGN_RIGHT|wxALL, 5);
     button_1 = new wxButton(this, wxID_OK, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void All_Widgets_Frame::set_properties()
-{
-    // begin wxGlade: All_Widgets_Frame::set_properties
-    SetTitle(_("All Widgets"));
-    wxIcon _icon;
-    _icon.CopyFromBitmap(wxArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, wxSize(32, 32)));
-    SetIcon(_icon);
-    int All_Widgets_statusbar_widths[] = { -1 };
-    All_Widgets_statusbar->SetStatusWidths(1, All_Widgets_statusbar_widths);
-
-    // statusbar fields
-    const wxString All_Widgets_statusbar_fields[] = {
-        _("All Widgets statusbar"),
-    };
-    for(int i = 0; i < All_Widgets_statusbar->GetFieldsCount(); ++i) {
-        All_Widgets_statusbar->SetStatusText(All_Widgets_statusbar_fields[i], i);
-    }
-    bitmap_button_icon1->SetSize(bitmap_button_icon1->GetBestSize());
-    bitmap_button_icon1->SetDefault();
-    bitmap_button_empty1->SetSize(bitmap_button_empty1->GetBestSize());
-    bitmap_button_empty1->SetDefault();
-    bitmap_button_icon2->SetBitmapDisabled(wxBitmap(32, 32));
-    bitmap_button_icon2->SetSize(bitmap_button_icon2->GetBestSize());
-    bitmap_button_icon2->SetDefault();
-    bitmap_button_art->SetSize(bitmap_button_art->GetBestSize());
-    bitmap_button_art->SetDefault();
-    checkbox_2->SetValue(1);
-    checkbox_4->Set3StateValue(wxCHK_UNCHECKED);
-    checkbox_5->Set3StateValue(wxCHK_CHECKED);
-    checkbox_6->Set3StateValue(wxCHK_UNDETERMINED);
-    check_list_box_1->SetSelection(2);
-    choice_filled->SetSelection(1);
-    combo_box_filled->SetSelection(0);
-    grid_1->CreateGrid(10, 3);
-    grid_1->SetSelectionMode(wxGrid::wxGridSelectColumns);
-    grid_1->SetColLabelValue(1, _("B\nB"));
-    list_box_filled->SetSelection(1);
-    radio_box_filled1->SetSelection(1);
-    radio_box_filled2->SetSelection(1);
-    splitter_1->SetMinimumPaneSize(20);
-    notebook_1_wxSplitterWindow_horizontal->SetScrollRate(10, 10);
-    splitter_2->SetMinimumPaneSize(20);
-    notebook_1_wxSplitterWindow_vertical->SetScrollRate(10, 10);
-    bitmap_null_sized->SetMinSize(wxSize(50, 50));
-    label_1->SetForegroundColour(wxColour(255, 0, 0));
-    label_4->SetBackgroundColour(wxColour(255, 0, 0));
-    label_4->SetToolTip(_("Background colour won't show, check documentation for more details"));
-    label_5->SetBackgroundColour(wxColour(255, 0, 255));
-    label_5->SetForegroundColour(wxColour(0, 255, 0));
-    label_5->SetToolTip(_("Background colour won't show, check documentation for more details"));
-    // end wxGlade
-}
-
-
-void All_Widgets_Frame::do_layout()
-{
-    // begin wxGlade: All_Widgets_Frame::do_layout
-    wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
-    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 2, 0, 0);
-    wxBoxSizer* sizer_24 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_23 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_18 = new wxBoxSizer(wxHORIZONTAL);
-    wxFlexGridSizer* grid_sizer_4 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxFlexGridSizer* grid_sizer_3 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxBoxSizer* sizer_9 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_10 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_11 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_25 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_33 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_32 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_29 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_31 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_30 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_14 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_16 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_22 = new wxBoxSizer(wxHORIZONTAL);
-    wxStaticBoxSizer* sizer_8 = new wxStaticBoxSizer(new wxStaticBox(notebook_1_wxRadioButton, wxID_ANY, _("My RadioButton Group")), wxHORIZONTAL);
-    wxFlexGridSizer* grid_sizer_2 = new wxFlexGridSizer(3, 2, 0, 0);
-    wxGridSizer* grid_sizer_1 = new wxGridSizer(2, 2, 0, 0);
-    wxBoxSizer* sizer_34 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_4 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_20 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_19 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_15 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_17 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_6 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_7 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_5 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_26 = new wxBoxSizer(wxHORIZONTAL);
-    wxGridSizer* sizer_21 = new wxGridSizer(2, 3, 0, 0);
-    wxBoxSizer* sizer_27 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_12 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_28 = new wxBoxSizer(wxHORIZONTAL);
-    wxFlexGridSizer* sizer_13 = new wxFlexGridSizer(2, 2, 0, 0);
-    sizer_13->Add(bitmap_button_icon1, 1, wxALL|wxEXPAND, 5);
-    sizer_13->Add(bitmap_button_empty1, 1, wxALL|wxEXPAND, 5);
-    sizer_13->Add(bitmap_button_icon2, 1, wxALL|wxEXPAND, 5);
-    sizer_13->Add(bitmap_button_art, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxBitmapButton->SetSizer(sizer_13);
+    sizer_2->Add(button_1, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    notebook_1_wxTreeCtrl->SetSizer(sizer_24);
+    notebook_1_wxToggleButton->SetSizer(sizer_23);
+    notebook_1_wxTextCtrl->SetSizer(sizer_18);
+    notebook_1_Spacer->SetSizer(grid_sizer_4);
+    notebook_1_wxStaticText->SetSizer(grid_sizer_3);
+    notebook_1_wxStaticLine->SetSizer(sizer_9);
+    notebook_1_wxStaticBitmap->SetSizer(sizer_11);
+    splitter_2_pane_2->SetSizer(sizer_33);
+    splitter_2_pane_1->SetSizer(sizer_32);
+    splitter_2->SplitVertically(splitter_2_pane_1, splitter_2_pane_2);
+    notebook_1_wxSplitterWindow_vertical->SetSizer(sizer_25);
+    splitter_1_pane_2->SetSizer(sizer_31);
+    splitter_1_pane_1->SetSizer(sizer_30);
+    splitter_1->SplitHorizontally(splitter_1_pane_1, splitter_1_pane_2);
+    notebook_1_wxSplitterWindow_horizontal->SetSizer(sizer_29);
+    notebook_1_wxSpinCtrl->SetSizer(sizer_14);
+    notebook_1_wxSpinButton->SetSizer(sizer_16);
+    notebook_1_wxSlider->SetSizer(sizer_22);
+    notebook_1_wxRadioButton->SetSizer(sizer_8);
+    notebook_1_wxRadioBox->SetSizer(grid_sizer_1);
+    notebook_1_wxPropertyGridManager->SetSizer(sizer_34);
+    notebook_1_wxListCtrl->SetSizer(sizer_3);
+    notebook_1_wxListBox->SetSizer(sizer_4);
+    notebook_1_wxHyperlinkCtrl->SetSizer(sizer_20);
+    notebook_1_wxGrid->SetSizer(sizer_19);
+    notebook_1_wxGauge->SetSizer(sizer_15);
+    notebook_1_wxDatePickerCtrl->SetSizer(sizer_17);
+    notebook_1_wxComboBox->SetSizer(sizer_6);
+    notebook_1_wxChoice->SetSizer(sizer_5);
+    notebook_1_wxCheckListBox->SetSizer(sizer_26);
+    notebook_1_wxCheckBox->SetSizer(sizer_21);
+    notebook_1_wxGenericCalendarCtrl->SetSizer(sizer_27);
+    notebook_1_wxCalendarCtrl->SetSizer(sizer_12);
+    notebook_1_wxButton->SetSizer(sizer_28);
     sizer_13->AddGrowableRow(0);
     sizer_13->AddGrowableRow(1);
     sizer_13->AddGrowableCol(0);
     sizer_13->AddGrowableCol(1);
-    sizer_28->Add(button_3, 0, wxALL, 5);
-    notebook_1_wxButton->SetSizer(sizer_28);
-    sizer_12->Add(calendar_ctrl_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxCalendarCtrl->SetSizer(sizer_12);
-    sizer_27->Add(generic_calendar_ctrl_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxGenericCalendarCtrl->SetSizer(sizer_27);
-    sizer_21->Add(checkbox_1, 0, wxEXPAND, 0);
-    sizer_21->Add(checkbox_2, 0, wxEXPAND, 0);
-    sizer_21->Add(checkbox_3, 0, wxEXPAND, 0);
-    sizer_21->Add(checkbox_4, 0, wxEXPAND, 0);
-    sizer_21->Add(checkbox_5, 0, wxEXPAND, 0);
-    sizer_21->Add(checkbox_6, 0, wxEXPAND, 0);
-    notebook_1_wxCheckBox->SetSizer(sizer_21);
-    sizer_26->Add(check_list_box_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxCheckListBox->SetSizer(sizer_26);
-    sizer_5->Add(choice_empty, 1, wxALL, 5);
-    sizer_5->Add(choice_filled, 1, wxALL, 5);
-    notebook_1_wxChoice->SetSizer(sizer_5);
-    sizer_7->Add(combo_box_empty, 1, wxALL, 5);
-    sizer_7->Add(combo_box_filled, 1, wxALL, 5);
-    sizer_6->Add(sizer_7, 1, wxEXPAND, 0);
-    notebook_1_wxComboBox->SetSizer(sizer_6);
-    sizer_17->Add(datepicker_ctrl_1, 1, wxALIGN_CENTER|wxALL, 5);
-    notebook_1_wxDatePickerCtrl->SetSizer(sizer_17);
-    sizer_15->Add(gauge_1, 1, wxALL, 5);
-    notebook_1_wxGauge->SetSizer(sizer_15);
-    sizer_19->Add(grid_1, 1, wxEXPAND, 0);
-    notebook_1_wxGrid->SetSizer(sizer_19);
-    sizer_20->Add(hyperlink_1, 0, wxALL, 5);
-    notebook_1_wxHyperlinkCtrl->SetSizer(sizer_20);
-    sizer_4->Add(list_box_empty, 1, wxALL|wxEXPAND, 5);
-    sizer_4->Add(list_box_filled, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxListBox->SetSizer(sizer_4);
-    sizer_3->Add(list_ctrl_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxListCtrl->SetSizer(sizer_3);
-    sizer_34->Add(property_grid_2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxPropertyGridManager->SetSizer(sizer_34);
-    grid_sizer_1->Add(radio_box_empty1, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_1->Add(radio_box_filled1, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_1->Add(radio_box_empty2, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_1->Add(radio_box_filled2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxRadioBox->SetSizer(grid_sizer_1);
-    grid_sizer_2->Add(radio_btn_1, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(text_ctrl_1, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(radio_btn_2, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(text_ctrl_2, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(radio_btn_3, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(text_ctrl_3, 1, wxALL|wxEXPAND, 5);
-    sizer_8->Add(grid_sizer_2, 1, wxEXPAND, 0);
-    notebook_1_wxRadioButton->SetSizer(sizer_8);
-    sizer_22->Add(slider_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxSlider->SetSizer(sizer_22);
-    sizer_16->Add(tc_spin_button, 1, wxALL, 5);
-    sizer_16->Add(spin_button, 1, wxALL, 5);
-    notebook_1_wxSpinButton->SetSizer(sizer_16);
-    sizer_14->Add(spin_ctrl_1, 1, wxALL, 5);
-    notebook_1_wxSpinCtrl->SetSizer(sizer_14);
-    sizer_30->Add(label_top_pane, 1, wxALL|wxEXPAND, 5);
-    splitter_1_pane_1->SetSizer(sizer_30);
-    sizer_31->Add(label_buttom_pane, 1, wxALL|wxEXPAND, 5);
-    splitter_1_pane_2->SetSizer(sizer_31);
-    splitter_1->SplitHorizontally(splitter_1_pane_1, splitter_1_pane_2);
-    sizer_29->Add(splitter_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxSplitterWindow_horizontal->SetSizer(sizer_29);
-    sizer_32->Add(label_left_pane, 1, wxALL|wxEXPAND, 5);
-    splitter_2_pane_1->SetSizer(sizer_32);
-    sizer_33->Add(label_right_pane, 1, wxALL|wxEXPAND, 5);
-    splitter_2_pane_2->SetSizer(sizer_33);
-    splitter_2->SplitVertically(splitter_2_pane_1, splitter_2_pane_2);
-    sizer_25->Add(splitter_2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxSplitterWindow_vertical->SetSizer(sizer_25);
-    sizer_11->Add(bitmap_empty, 1, wxALL|wxEXPAND, 5);
-    sizer_11->Add(bitmap_file, 1, wxALL|wxEXPAND, 5);
-    sizer_11->Add(bitmap_nofile, 1, wxALL|wxEXPAND, 5);
-    sizer_11->Add(bitmap_art, 1, wxALL|wxEXPAND, 5);
-    sizer_11->Add(bitmap_null, 1, wxALL|wxEXPAND, 5);
-    sizer_11->Add(bitmap_null_sized, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxStaticBitmap->SetSizer(sizer_11);
-    sizer_10->Add(static_line_2, 1, wxALL|wxEXPAND, 5);
-    sizer_10->Add(static_line_3, 1, wxALL|wxEXPAND, 5);
-    sizer_9->Add(sizer_10, 1, wxEXPAND, 0);
-    sizer_9->Add(static_line_4, 1, wxALL|wxEXPAND, 5);
-    sizer_9->Add(static_line_5, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxStaticLine->SetSizer(sizer_9);
-    grid_sizer_3->Add(label_1, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_3->Add(label_4, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_3->Add(label_5, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxStaticText->SetSizer(grid_sizer_3);
-    grid_sizer_4->Add(label_3, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_4->Add(60, 20, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_4->Add(label_2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_Spacer->SetSizer(grid_sizer_4);
-    sizer_18->Add(text_ctrl, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxTextCtrl->SetSizer(sizer_18);
-    sizer_23->Add(button_2, 1, wxALL, 5);
-    sizer_23->Add(button_4, 1, wxALL, 5);
-    notebook_1_wxToggleButton->SetSizer(sizer_23);
-    sizer_24->Add(tree_ctrl_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_wxTreeCtrl->SetSizer(sizer_24);
-    notebook_1->AddPage(notebook_1_wxBitmapButton, _("wxBitmapButton"));
-    notebook_1->AddPage(notebook_1_wxButton, _("wxButton"));
-    notebook_1->AddPage(notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"));
-    notebook_1->AddPage(notebook_1_wxGenericCalendarCtrl, _("wxGenericCalendarCtrl"));
-    notebook_1->AddPage(notebook_1_wxCheckBox, _("wxCheckBox"));
-    notebook_1->AddPage(notebook_1_wxCheckListBox, _("wxCheckListBox"));
-    notebook_1->AddPage(notebook_1_wxChoice, _("wxChoice"));
-    notebook_1->AddPage(notebook_1_wxComboBox, _("wxComboBox"));
-    notebook_1->AddPage(notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"));
-    notebook_1->AddPage(notebook_1_wxGauge, _("wxGauge"));
-    notebook_1->AddPage(notebook_1_wxGrid, _("wxGrid"));
-    notebook_1->AddPage(notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"));
-    notebook_1->AddPage(notebook_1_wxListBox, _("wxListBox"));
-    notebook_1->AddPage(notebook_1_wxListCtrl, _("wxListCtrl"));
-    notebook_1->AddPage(notebook_1_wxPropertyGridManager, _("wxPropertyGridManager"));
-    notebook_1->AddPage(notebook_1_wxRadioBox, _("wxRadioBox"));
-    notebook_1->AddPage(notebook_1_wxRadioButton, _("wxRadioButton"));
-    notebook_1->AddPage(notebook_1_wxSlider, _("wxSlider"));
-    notebook_1->AddPage(notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"));
-    notebook_1->AddPage(notebook_1_wxSpinCtrl, _("wxSpinCtrl"));
-    notebook_1->AddPage(notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"));
-    notebook_1->AddPage(notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"));
-    notebook_1->AddPage(notebook_1_wxStaticBitmap, _("wxStaticBitmap"));
-    notebook_1->AddPage(notebook_1_wxStaticLine, _("wxStaticLine"));
-    notebook_1->AddPage(notebook_1_wxStaticText, _("wxStaticText"));
-    notebook_1->AddPage(notebook_1_Spacer, _("Spacer"));
-    notebook_1->AddPage(notebook_1_wxTextCtrl, _("wxTextCtrl"));
-    notebook_1->AddPage(notebook_1_wxToggleButton, _("wxToggleButton"));
-    notebook_1->AddPage(notebook_1_wxTreeCtrl, _("wxTreeCtrl"));
-    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
-    sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
-    sizer_2->Add(button_5, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_2->Add(button_1, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
-    SetSizer(sizer_1);
-    sizer_1->SetSizeHints(this);
+    notebook_1_wxBitmapButton->SetSizer(sizer_13);
     sizer_1->AddGrowableRow(0);
     sizer_1->AddGrowableCol(0);
+    SetSizer(sizer_1);
+    sizer_1->SetSizeHints(this);
     Layout();
     Centre();
     // end wxGlade
@@ -441,9 +426,9 @@
 
 BEGIN_EVENT_TABLE(All_Widgets_Frame, wxFrame)
     // begin wxGlade: All_Widgets_Frame::event_table
-    EVT_NAVIGATION_KEY(All_Widgets_Frame::OnBitmapButtonPanelNavigationKey)
     EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, All_Widgets_Frame::OnNotebookPageChanged)
     EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, All_Widgets_Frame::OnNotebookPageChanging)
+    EVT_NAVIGATION_KEY(All_Widgets_Frame::OnBitmapButtonPanelNavigationKey)
     EVT_BUTTON(wxID_OK, All_Widgets_Frame::onStartConverting)
     // end wxGlade
 END_EVENT_TABLE();
@@ -477,25 +462,25 @@
     wxLogDebug(wxT("Event handler (All_Widgets_Frame::onShowManual) not implemented yet"));
 }
 
-void All_Widgets_Frame::OnBitmapButtonPanelNavigationKey(wxNavigationKeyEvent &event)  // wxGlade: All_Widgets_Frame.<event_handler>
+void All_Widgets_Frame::OnNotebookPageChanged(wxBookCtrlEvent &event)  // wxGlade: All_Widgets_Frame.<event_handler>
 {
     event.Skip();
     // notify the user that he hasn't implemented the event handler yet
-    wxLogDebug(wxT("Event handler (All_Widgets_Frame::OnBitmapButtonPanelNavigationKey) not implemented yet"));
+    wxLogDebug(wxT("Event handler (All_Widgets_Frame::OnNotebookPageChanged) not implemented yet"));
 }
 
-void All_Widgets_Frame::OnNotebookPageChanged(wxBookCtrlEvent &event)  // wxGlade: All_Widgets_Frame.<event_handler>
+void All_Widgets_Frame::OnNotebookPageChanging(wxBookCtrlEvent &event)  // wxGlade: All_Widgets_Frame.<event_handler>
 {
     event.Skip();
     // notify the user that he hasn't implemented the event handler yet
-    wxLogDebug(wxT("Event handler (All_Widgets_Frame::OnNotebookPageChanged) not implemented yet"));
+    wxLogDebug(wxT("Event handler (All_Widgets_Frame::OnNotebookPageChanging) not implemented yet"));
 }
 
-void All_Widgets_Frame::OnNotebookPageChanging(wxBookCtrlEvent &event)  // wxGlade: All_Widgets_Frame.<event_handler>
+void All_Widgets_Frame::OnBitmapButtonPanelNavigationKey(wxNavigationKeyEvent &event)  // wxGlade: All_Widgets_Frame.<event_handler>
 {
     event.Skip();
     // notify the user that he hasn't implemented the event handler yet
-    wxLogDebug(wxT("Event handler (All_Widgets_Frame::OnNotebookPageChanging) not implemented yet"));
+    wxLogDebug(wxT("Event handler (All_Widgets_Frame::OnBitmapButtonPanelNavigationKey) not implemented yet"));
 }
 
 void All_Widgets_Frame::onStartConverting(wxCommandEvent &event)  // wxGlade: All_Widgets_Frame.<event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_30.h wxglade-1.0.1/tests/casefiles/AllWidgets_30.h
--- wxglade-0.9.6/tests/casefiles/AllWidgets_30.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_30.h	2020-12-31 14:04:48.000000000 +0000
@@ -55,10 +55,6 @@
     All_Widgets_Frame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: All_Widgets_Frame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: All_Widgets_Frame::attributes
@@ -68,105 +64,105 @@
     wxMenuBar* All_Widgets_menubar;
     wxStatusBar* All_Widgets_statusbar;
     wxToolBar* All_Widgets_toolbar;
+    wxNotebook* notebook_1;
+    wxPanel* notebook_1_wxBitmapButton;
     wxBitmapButton* bitmap_button_icon1;
     wxBitmapButton* bitmap_button_empty1;
     wxBitmapButton* bitmap_button_icon2;
     wxBitmapButton* bitmap_button_art;
-    wxPanel* notebook_1_wxBitmapButton;
-    wxButton* button_3;
     wxPanel* notebook_1_wxButton;
-    wxCalendarCtrl* calendar_ctrl_1;
+    wxButton* button_3;
     wxPanel* notebook_1_wxCalendarCtrl;
-    wxGenericCalendarCtrl* generic_calendar_ctrl_1;
+    wxCalendarCtrl* calendar_ctrl_1;
     wxPanel* notebook_1_wxGenericCalendarCtrl;
+    wxGenericCalendarCtrl* generic_calendar_ctrl_1;
+    wxPanel* notebook_1_wxCheckBox;
     wxCheckBox* checkbox_1;
     wxCheckBox* checkbox_2;
     wxCheckBox* checkbox_3;
     wxCheckBox* checkbox_4;
     wxCheckBox* checkbox_5;
     wxCheckBox* checkbox_6;
-    wxPanel* notebook_1_wxCheckBox;
-    wxCheckListBox* check_list_box_1;
     wxPanel* notebook_1_wxCheckListBox;
+    wxCheckListBox* check_list_box_1;
+    wxPanel* notebook_1_wxChoice;
     wxChoice* choice_empty;
     wxChoice* choice_filled;
-    wxPanel* notebook_1_wxChoice;
+    wxPanel* notebook_1_wxComboBox;
     wxComboBox* combo_box_empty;
     wxComboBox* combo_box_filled;
-    wxPanel* notebook_1_wxComboBox;
-    wxDatePickerCtrl* datepicker_ctrl_1;
     wxPanel* notebook_1_wxDatePickerCtrl;
-    wxGauge* gauge_1;
+    wxDatePickerCtrl* datepicker_ctrl_1;
     wxPanel* notebook_1_wxGauge;
-    wxGrid* grid_1;
+    wxGauge* gauge_1;
     wxPanel* notebook_1_wxGrid;
-    wxHyperlinkCtrl* hyperlink_1;
+    wxGrid* grid_1;
     wxPanel* notebook_1_wxHyperlinkCtrl;
+    wxHyperlinkCtrl* hyperlink_1;
+    wxPanel* notebook_1_wxListBox;
     wxListBox* list_box_empty;
     wxListBox* list_box_filled;
-    wxPanel* notebook_1_wxListBox;
-    wxListCtrl* list_ctrl_1;
     wxPanel* notebook_1_wxListCtrl;
-    wxPropertyGridManager* property_grid_2;
+    wxListCtrl* list_ctrl_1;
     wxPanel* notebook_1_wxPropertyGridManager;
+    wxPropertyGridManager* property_grid_2;
+    wxPanel* notebook_1_wxRadioBox;
     wxRadioBox* radio_box_empty1;
     wxRadioBox* radio_box_filled1;
     wxRadioBox* radio_box_empty2;
     wxRadioBox* radio_box_filled2;
-    wxPanel* notebook_1_wxRadioBox;
+    wxPanel* notebook_1_wxRadioButton;
     wxRadioButton* radio_btn_1;
     wxTextCtrl* text_ctrl_1;
     wxRadioButton* radio_btn_2;
     wxTextCtrl* text_ctrl_2;
     wxRadioButton* radio_btn_3;
     wxTextCtrl* text_ctrl_3;
-    wxPanel* notebook_1_wxRadioButton;
-    wxSlider* slider_1;
     wxPanel* notebook_1_wxSlider;
+    wxSlider* slider_1;
+    wxPanel* notebook_1_wxSpinButton;
     wxTextCtrl* tc_spin_button;
     wxSpinButton* spin_button;
-    wxPanel* notebook_1_wxSpinButton;
-    wxSpinCtrl* spin_ctrl_1;
     wxPanel* notebook_1_wxSpinCtrl;
-    wxStaticText* label_top_pane;
+    wxSpinCtrl* spin_ctrl_1;
+    wxScrolledWindow* notebook_1_wxSplitterWindow_horizontal;
+    wxSplitterWindow* splitter_1;
     wxPanel* splitter_1_pane_1;
-    wxStaticText* label_buttom_pane;
+    wxStaticText* label_top_pane;
     wxPanel* splitter_1_pane_2;
-    wxSplitterWindow* splitter_1;
-    wxScrolledWindow* notebook_1_wxSplitterWindow_horizontal;
-    wxStaticText* label_left_pane;
+    wxStaticText* label_buttom_pane;
+    wxScrolledWindow* notebook_1_wxSplitterWindow_vertical;
+    wxSplitterWindow* splitter_2;
     wxPanel* splitter_2_pane_1;
-    wxStaticText* label_right_pane;
+    wxStaticText* label_left_pane;
     wxPanel* splitter_2_pane_2;
-    wxSplitterWindow* splitter_2;
-    wxScrolledWindow* notebook_1_wxSplitterWindow_vertical;
+    wxStaticText* label_right_pane;
+    wxPanel* notebook_1_wxStaticBitmap;
     wxStaticBitmap* bitmap_empty;
     wxStaticBitmap* bitmap_file;
     wxStaticBitmap* bitmap_nofile;
     wxStaticBitmap* bitmap_art;
     wxStaticBitmap* bitmap_null;
     wxStaticBitmap* bitmap_null_sized;
-    wxPanel* notebook_1_wxStaticBitmap;
+    wxPanel* notebook_1_wxStaticLine;
     wxStaticLine* static_line_2;
     wxStaticLine* static_line_3;
     wxStaticLine* static_line_4;
     wxStaticLine* static_line_5;
-    wxPanel* notebook_1_wxStaticLine;
+    wxPanel* notebook_1_wxStaticText;
     wxStaticText* label_1;
     wxStaticText* label_4;
     wxStaticText* label_5;
-    wxPanel* notebook_1_wxStaticText;
+    wxPanel* notebook_1_Spacer;
     wxStaticText* label_3;
     wxStaticText* label_2;
-    wxPanel* notebook_1_Spacer;
-    wxTextCtrl* text_ctrl;
     wxPanel* notebook_1_wxTextCtrl;
+    wxTextCtrl* text_ctrl;
+    wxPanel* notebook_1_wxToggleButton;
     wxToggleButton* button_2;
     wxToggleButton* button_4;
-    wxPanel* notebook_1_wxToggleButton;
-    wxTreeCtrl* tree_ctrl_1;
     wxPanel* notebook_1_wxTreeCtrl;
-    wxNotebook* notebook_1;
+    wxTreeCtrl* tree_ctrl_1;
     wxStaticLine* static_line_1;
     wxButton* button_5;
     wxButton* button_1;
@@ -175,14 +171,14 @@
     DECLARE_EVENT_TABLE();
 
 public:
-    void onSelectUnix(wxCommandEvent &event); // wxGlade: <event_handler>
-    void onSelectWindows(wxCommandEvent &event); // wxGlade: <event_handler>
-    void onRemoveTabs(wxCommandEvent &event); // wxGlade: <event_handler>
-    void onShowManual(wxCommandEvent &event); // wxGlade: <event_handler>
-    void OnBitmapButtonPanelNavigationKey(wxNavigationKeyEvent &event); // wxGlade: <event_handler>
-    void OnNotebookPageChanged(wxBookCtrlEvent &event); // wxGlade: <event_handler>
-    void OnNotebookPageChanging(wxBookCtrlEvent &event); // wxGlade: <event_handler>
-    void onStartConverting(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void onSelectUnix(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void onSelectWindows(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void onRemoveTabs(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void onShowManual(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void OnNotebookPageChanged(wxBookCtrlEvent &event); // wxGlade: <event_handler>
+    virtual void OnNotebookPageChanging(wxBookCtrlEvent &event); // wxGlade: <event_handler>
+    virtual void OnBitmapButtonPanelNavigationKey(wxNavigationKeyEvent &event); // wxGlade: <event_handler>
+    virtual void onStartConverting(wxCommandEvent &event); // wxGlade: <event_handler>
 }; // wxGlade: end class
 
 
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_30_Phoenix.py wxglade-1.0.1/tests/casefiles/AllWidgets_30_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/AllWidgets_30_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_30_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,12 +5,12 @@
 #
 
 import wx
-import wx.adv
-import wx.grid
-import wx.propgrid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.adv
+import wx.grid
+import wx.propgrid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -23,7 +23,11 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((800, 417))
-        
+        self.SetTitle(_("All Widgets"))
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
+        self.SetIcon(_icon)
+
         # Menu Bar
         self.All_Widgets_menubar = wx.MenuBar()
         global mn_IDUnix; mn_IDUnix = wx.NewId()
@@ -41,7 +45,7 @@
         self.Bind(wx.EVT_MENU, self.onSelectWindows, id=mn_IDWindows)
         wxglade_tmp_menu.AppendSeparator()
         self.All_Widgets_menubar.mn_RemoveTabs = wxglade_tmp_menu.Append(wx.ID_ANY, _("Remove Tabs"), _("Remove all leading tabs"), wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.onRemoveTabs, id=self.All_Widgets_menubar.mn_RemoveTabs.GetId())
+        self.Bind(wx.EVT_MENU, self.onRemoveTabs, self.All_Widgets_menubar.mn_RemoveTabs)
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Edit"))
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.ID_HELP, _("Manual"), _("Show the application manual"))
@@ -51,362 +55,526 @@
         self.All_Widgets_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.All_Widgets_menubar)
         # Menu Bar end
+
         self.All_Widgets_statusbar = self.CreateStatusBar(1, wx.STB_ELLIPSIZE_MIDDLE | wx.STB_SHOW_TIPS | wx.STB_SIZEGRIP)
-        
+        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
+        for i in range(len(All_Widgets_statusbar_fields)):
+            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
+
         # Tool Bar
         self.All_Widgets_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.All_Widgets_toolbar)
         self.All_Widgets_toolbar.AddTool(wx.ID_UP, _("UpDown"), wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, _("Up or Down"), _("Up or Down"))
         self.All_Widgets_toolbar.AddTool(wx.ID_OPEN, _("Open"), wx.Bitmap(32, 32), wx.NullBitmap, wx.ITEM_NORMAL, _("Open a new file"), _("Open a new file"))
+        self.SetToolBar(self.All_Widgets_toolbar)
+        self.All_Widgets_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxBitmapButton = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
+        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
+
+        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
+
+        self.bitmap_button_icon1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
+        self.bitmap_button_icon1.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_empty1 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap(10, 10))
-        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
+        self.bitmap_button_empty1.SetDefault()
+        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_button_icon2 = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_icon2.SetBitmapDisabled(wx.Bitmap(32, 32))
+        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
+        self.bitmap_button_icon2.SetDefault()
+        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_button_art = wx.BitmapButton(self.notebook_1_wxBitmapButton, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), style=wx.BORDER_NONE | wx.BU_BOTTOM)
+        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
+        self.bitmap_button_art.SetDefault()
+        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
+
+        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_3 = wx.Button(self.notebook_1_wxButton, wx.ID_BOLD, "")
+        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_wxCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
+
+        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.calendar_ctrl_1 = wx.adv.CalendarCtrl(self.notebook_1_wxCalendarCtrl, wx.ID_ANY, style=wx.adv.CAL_MONDAY_FIRST | wx.adv.CAL_SEQUENTIAL_MONTH_SELECTION | wx.adv.CAL_SHOW_SURROUNDING_WEEKS | wx.adv.CAL_SHOW_WEEK_NUMBERS)
+        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxGenericCalendarCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGenericCalendarCtrl, _("wxGenericCalendarCtrl"))
+
+        sizer_27 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.generic_calendar_ctrl_1 = wx.adv.GenericCalendarCtrl(self.notebook_1_wxGenericCalendarCtrl, wx.ID_ANY, style=wx.adv.CAL_MONDAY_FIRST)
+        sizer_27.Add(self.generic_calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxCheckBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
+
+        sizer_21 = wx.GridSizer(2, 3, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("one (unchecked)"))
+        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
+
         self.checkbox_2 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("two (checked)"))
+        self.checkbox_2.SetValue(1)
+        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
+
         self.checkbox_3 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("three"), style=wx.CHK_2STATE)
+        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
+
         self.checkbox_4 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("four (unchecked)"), style=wx.CHK_3STATE)
+        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
+        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
+
         self.checkbox_5 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("five (checked)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
+        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
+
         self.checkbox_6 = wx.CheckBox(self.notebook_1_wxCheckBox, wx.ID_ANY, _("six (undetermined)"), style=wx.CHK_3STATE | wx.CHK_ALLOW_3RD_STATE_FOR_USER)
+        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
+        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
+
         self.notebook_1_wxCheckListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
+
+        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.check_list_box_1 = wx.CheckListBox(self.notebook_1_wxCheckListBox, wx.ID_ANY, choices=[_("one"), _("two"), _("three"), _("four")])
+        self.check_list_box_1.SetSelection(2)
+        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxChoice = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.choice_empty = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[])
+        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
+
         self.choice_filled = wx.Choice(self.notebook_1_wxChoice, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")])
+        self.choice_filled.SetSelection(1)
+        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxComboBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
+
         self.combo_box_empty = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[], style=0)
+        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
+
         self.combo_box_filled = wx.ComboBox(self.notebook_1_wxComboBox, wx.ID_ANY, choices=[_("Item 1 (pre-selected)"), _("Item 2")], style=0)
+        self.combo_box_filled.SetSelection(0)
+        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
+
         self.notebook_1_wxDatePickerCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
+
+        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.datepicker_ctrl_1 = wx.adv.DatePickerCtrl(self.notebook_1_wxDatePickerCtrl, wx.ID_ANY, style=wx.adv.DP_SHOWCENTURY)
+        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.notebook_1_wxGauge = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
+
+        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.gauge_1 = wx.Gauge(self.notebook_1_wxGauge, wx.ID_ANY, 20)
+        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxGrid = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
+
+        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.grid_1 = wx.grid.Grid(self.notebook_1_wxGrid, wx.ID_ANY, size=(1, 1))
+        self.grid_1.CreateGrid(10, 3)
+        self.grid_1.SetSelectionMode(wx.grid.Grid.SelectColumns)
+        self.grid_1.SetColLabelValue(1, _("B\nB"))
+        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_wxHyperlinkCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
+
+        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.hyperlink_1 = wx.adv.HyperlinkCtrl(self.notebook_1_wxHyperlinkCtrl, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"))
+        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
+
         self.notebook_1_wxListBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
+
+        sizer_4 = wx.BoxSizer(wx.VERTICAL)
+
         self.list_box_empty = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[], style=0)
+        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
+
         self.list_box_filled = wx.ListBox(self.notebook_1_wxListBox, wx.ID_ANY, choices=[_("Item 1"), _("Item 2 (pre-selected)")], style=wx.LB_MULTIPLE | wx.LB_SORT)
+        self.list_box_filled.SetSelection(1)
+        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxListCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.list_ctrl_1 = wx.ListCtrl(self.notebook_1_wxListCtrl, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_REPORT)
+        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxPropertyGridManager = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxPropertyGridManager, _("wxPropertyGridManager"))
+
+        sizer_34 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.property_grid_2 = wx.propgrid.PropertyGridManager(self.notebook_1_wxPropertyGridManager, wx.ID_ANY, style=wx.propgrid.PG_ALPHABETIC_MODE)
+        sizer_34.Add(self.property_grid_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioBox = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
+
+        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
+
         self.radio_box_empty1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty1"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_ROWS)
+        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled1 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled1"), choices=[_("choice 1"), _("choice 2 (pre-selected)"), _("choice 3")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.radio_box_filled1.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_empty2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_empty2"), choices=[""], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_box_filled2 = wx.RadioBox(self.notebook_1_wxRadioBox, wx.ID_ANY, _("radio_box_filled2"), choices=[_("choice 1"), _("choice 2 (pre-selected)")], majorDimension=0, style=wx.RA_SPECIFY_COLS)
+        self.radio_box_filled2.SetSelection(1)
+        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxRadioButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
+
+        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
+
+        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
+        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
+
         self.radio_btn_1 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Alice"), style=wx.RB_GROUP)
+        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_2 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Bob"))
+        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.radio_btn_3 = wx.RadioButton(self.notebook_1_wxRadioButton, wx.ID_ANY, _("Malroy"))
+        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_wxRadioButton, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSlider = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
+
+        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.slider_1 = wx.Slider(self.notebook_1_wxSlider, wx.ID_ANY, 5, 0, 10, style=0)
+        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSpinButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"))
+
+        sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.tc_spin_button = wx.TextCtrl(self.notebook_1_wxSpinButton, wx.ID_ANY, _("1"), style=wx.TE_RIGHT)
+        sizer_16.Add(self.tc_spin_button, 1, wx.ALL, 5)
+
         self.spin_button = wx.SpinButton(self.notebook_1_wxSpinButton, wx.ID_ANY )
+        sizer_16.Add(self.spin_button, 1, wx.ALL, 5)
+
         self.notebook_1_wxSpinCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
+
+        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.spin_ctrl_1 = wx.SpinCtrl(self.notebook_1_wxSpinCtrl, wx.ID_ANY, "4", min=0, max=100, style=wx.ALIGN_RIGHT | wx.SP_ARROW_KEYS)
+        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
+
         self.notebook_1_wxSplitterWindow_horizontal = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
+
+        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_1 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_horizontal, wx.ID_ANY, style=0)
+        self.splitter_1.SetBackgroundColour(wx.Colour(255, 0, 0))
+        self.splitter_1.SetMinimumPaneSize(20)
+        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_1 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_top_pane = wx.StaticText(self.splitter_1_pane_1, wx.ID_ANY, _("top pane"))
+        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_1_pane_2 = wx.Panel(self.splitter_1, wx.ID_ANY)
+
+        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_buttom_pane = wx.StaticText(self.splitter_1_pane_2, wx.ID_ANY, _("bottom pane"))
+        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxSplitterWindow_vertical = wx.ScrolledWindow(self.notebook_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
+        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
+
+        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.splitter_2 = wx.SplitterWindow(self.notebook_1_wxSplitterWindow_vertical, wx.ID_ANY, style=0)
+        self.splitter_2.SetMinimumPaneSize(20)
+        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_1 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_32 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_left_pane = wx.StaticText(self.splitter_2_pane_1, wx.ID_ANY, _("left pane"))
+        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.splitter_2_pane_2 = wx.Panel(self.splitter_2, wx.ID_ANY)
+
+        sizer_33 = wx.BoxSizer(wx.VERTICAL)
+
         self.label_right_pane = wx.StaticText(self.splitter_2_pane_2, wx.ID_ANY, _("right pane"))
+        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticBitmap = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
+
+        sizer_11 = wx.BoxSizer(wx.VERTICAL)
+
         self.bitmap_empty = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap(32, 32))
-        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.xpm", wx.BITMAP_TYPE_ANY))
-        self.bitmap_nofile = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("non-existing.bmp", wx.BITMAP_TYPE_ANY))
-        self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
-        self.bitmap_null = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.NullBitmap)
+        sizer_11.Add(self.bitmap_empty, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_file = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("icon.png", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_file, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_nofile = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap("non-existing.bmp", wx.BITMAP_TYPE_ANY))
+        sizer_11.Add(self.bitmap_nofile, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_art = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_OTHER, (32, 32)))
+        sizer_11.Add(self.bitmap_art, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.bitmap_null = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.NullBitmap)
+        sizer_11.Add(self.bitmap_null, 1, wx.ALL | wx.EXPAND, 5)
+
         self.bitmap_null_sized = wx.StaticBitmap(self.notebook_1_wxStaticBitmap, wx.ID_ANY, wx.Bitmap(50, 50))
+        self.bitmap_null_sized.SetMinSize((50, 50))
+        sizer_11.Add(self.bitmap_null_sized, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticLine = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
+
+        sizer_9 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
+
         self.static_line_2 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
+        sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_3 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY, style=wx.LI_VERTICAL)
+        sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_4 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
+        sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_5 = wx.StaticLine(self.notebook_1_wxStaticLine, wx.ID_ANY)
+        sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxStaticText = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER)
-        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER)
+        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
+
+        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        self.label_1 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("red text (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
+        grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_4 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("black on red (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
+        self.label_4.SetToolTip(_("Background colour won't show, check documentation for more details"))
+        grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_5 = wx.StaticText(self.notebook_1_wxStaticText, wx.ID_ANY, _("green on pink (RGB)"), style=wx.ALIGN_CENTER_HORIZONTAL)
+        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
+        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
+        self.label_5.SetToolTip(_("Background colour won't show, check documentation for more details"))
+        grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_Spacer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
+
+        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
+
         self.label_3 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("Two labels with a"))
+        grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
+
+        grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
+
         self.label_2 = wx.StaticText(self.notebook_1_Spacer, wx.ID_ANY, _("spacer between"))
+        grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxTextCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
+
+        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.text_ctrl = wx.TextCtrl(self.notebook_1_wxTextCtrl, wx.ID_ANY, _("This\nis\na\nmultiline\nwxTextCtrl"), style=wx.TE_CHARWRAP | wx.TE_MULTILINE | wx.TE_WORDWRAP)
+        sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_wxToggleButton = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
+
+        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.button_2 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 1"))
+        sizer_23.Add(self.button_2, 1, wx.ALL, 5)
+
         self.button_4 = wx.ToggleButton(self.notebook_1_wxToggleButton, wx.ID_ANY, _("Toggle Button 2"), style=wx.BU_BOTTOM | wx.BU_EXACTFIT)
+        sizer_23.Add(self.button_4, 1, wx.ALL, 5)
+
         self.notebook_1_wxTreeCtrl = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
+
+        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.tree_ctrl_1 = wx.TreeCtrl(self.notebook_1_wxTreeCtrl, wx.ID_ANY, style=0)
+        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
         self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
+        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
 
-        self.Bind(wx.EVT_NAVIGATION_KEY, self.OnBitmapButtonPanelNavigationKey)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
-        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
-        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
-        # end wxGlade
+        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
 
-    def __set_properties(self):
-        # begin wxGlade: All_Widgets_Frame.__set_properties
-        self.SetTitle(_("All Widgets"))
-        _icon = wx.NullIcon
-        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
-        self.SetIcon(_icon)
-        self.All_Widgets_statusbar.SetStatusWidths([-1])
+        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
 
-        # statusbar fields
-        All_Widgets_statusbar_fields = [_("All Widgets statusbar")]
-        for i in range(len(All_Widgets_statusbar_fields)):
-            self.All_Widgets_statusbar.SetStatusText(All_Widgets_statusbar_fields[i], i)
-        self.All_Widgets_toolbar.Realize()
-        self.bitmap_button_icon1.SetSize(self.bitmap_button_icon1.GetBestSize())
-        self.bitmap_button_icon1.SetDefault()
-        self.bitmap_button_empty1.SetSize(self.bitmap_button_empty1.GetBestSize())
-        self.bitmap_button_empty1.SetDefault()
-        self.bitmap_button_icon2.SetBitmapDisabled(wx.Bitmap(32, 32))
-        self.bitmap_button_icon2.SetSize(self.bitmap_button_icon2.GetBestSize())
-        self.bitmap_button_icon2.SetDefault()
-        self.bitmap_button_art.SetSize(self.bitmap_button_art.GetBestSize())
-        self.bitmap_button_art.SetDefault()
-        self.checkbox_2.SetValue(1)
-        self.checkbox_4.Set3StateValue(wx.CHK_UNCHECKED)
-        self.checkbox_5.Set3StateValue(wx.CHK_CHECKED)
-        self.checkbox_6.Set3StateValue(wx.CHK_UNDETERMINED)
-        self.check_list_box_1.SetSelection(2)
-        self.choice_filled.SetSelection(1)
-        self.combo_box_filled.SetSelection(0)
-        self.grid_1.CreateGrid(10, 3)
-        self.grid_1.SetSelectionMode(wx.grid.Grid.SelectColumns)
-        self.grid_1.SetColLabelValue(1, _("B\nB"))
-        self.list_box_filled.SetSelection(1)
-        self.radio_box_filled1.SetSelection(1)
-        self.radio_box_filled2.SetSelection(1)
-        self.splitter_1.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_horizontal.SetScrollRate(10, 10)
-        self.splitter_2.SetMinimumPaneSize(20)
-        self.notebook_1_wxSplitterWindow_vertical.SetScrollRate(10, 10)
-        self.bitmap_null_sized.SetMinSize((50, 50))
-        self.label_1.SetForegroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetBackgroundColour(wx.Colour(255, 0, 0))
-        self.label_4.SetToolTip(_("Background colour won't show, check documentation for more details"))
-        self.label_5.SetBackgroundColour(wx.Colour(255, 0, 255))
-        self.label_5.SetForegroundColour(wx.Colour(0, 255, 0))
-        self.label_5.SetToolTip(_("Background colour won't show, check documentation for more details"))
-        # end wxGlade
+        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
+
+        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
+
+        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
+
+        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
+
+        self.splitter_2_pane_2.SetSizer(sizer_33)
+
+        self.splitter_2_pane_1.SetSizer(sizer_32)
+
+        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
+
+        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
+
+        self.splitter_1_pane_2.SetSizer(sizer_31)
+
+        self.splitter_1_pane_1.SetSizer(sizer_30)
+
+        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
+
+        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
+
+        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
+
+        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
+
+        self.notebook_1_wxSlider.SetSizer(sizer_22)
+
+        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
+
+        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
+
+        self.notebook_1_wxPropertyGridManager.SetSizer(sizer_34)
+
+        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
+
+        self.notebook_1_wxListBox.SetSizer(sizer_4)
+
+        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
+
+        self.notebook_1_wxGrid.SetSizer(sizer_19)
+
+        self.notebook_1_wxGauge.SetSizer(sizer_15)
+
+        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
+
+        self.notebook_1_wxComboBox.SetSizer(sizer_6)
+
+        self.notebook_1_wxChoice.SetSizer(sizer_5)
+
+        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
+
+        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
+
+        self.notebook_1_wxGenericCalendarCtrl.SetSizer(sizer_27)
+
+        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
+
+        self.notebook_1_wxButton.SetSizer(sizer_28)
 
-    def __do_layout(self):
-        # begin wxGlade: All_Widgets_Frame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 2, 0, 0)
-        sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_23 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_18 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_4 = wx.FlexGridSizer(1, 3, 0, 0)
-        grid_sizer_3 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_9 = wx.BoxSizer(wx.VERTICAL)
-        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_11 = wx.BoxSizer(wx.VERTICAL)
-        sizer_25 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_33 = wx.BoxSizer(wx.VERTICAL)
-        sizer_32 = wx.BoxSizer(wx.VERTICAL)
-        sizer_29 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_31 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_30 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_22 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_wxRadioButton, wx.ID_ANY, _("My RadioButton Group")), wx.HORIZONTAL)
-        grid_sizer_2 = wx.FlexGridSizer(3, 2, 0, 0)
-        grid_sizer_1 = wx.GridSizer(2, 2, 0, 0)
-        sizer_34 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.VERTICAL)
-        sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_17 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.VERTICAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_26 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_21 = wx.GridSizer(2, 3, 0, 0)
-        sizer_27 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_28 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_13 = wx.FlexGridSizer(2, 2, 0, 0)
-        sizer_13.Add(self.bitmap_button_icon1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_icon2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_13.Add(self.bitmap_button_art, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
         sizer_13.AddGrowableRow(0)
         sizer_13.AddGrowableRow(1)
         sizer_13.AddGrowableCol(0)
         sizer_13.AddGrowableCol(1)
-        sizer_28.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_wxButton.SetSizer(sizer_28)
-        sizer_12.Add(self.calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCalendarCtrl.SetSizer(sizer_12)
-        sizer_27.Add(self.generic_calendar_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxGenericCalendarCtrl.SetSizer(sizer_27)
-        sizer_21.Add(self.checkbox_1, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_2, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_3, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_4, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_5, 0, wx.EXPAND, 0)
-        sizer_21.Add(self.checkbox_6, 0, wx.EXPAND, 0)
-        self.notebook_1_wxCheckBox.SetSizer(sizer_21)
-        sizer_26.Add(self.check_list_box_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxCheckListBox.SetSizer(sizer_26)
-        sizer_5.Add(self.choice_empty, 1, wx.ALL, 5)
-        sizer_5.Add(self.choice_filled, 1, wx.ALL, 5)
-        self.notebook_1_wxChoice.SetSizer(sizer_5)
-        sizer_7.Add(self.combo_box_empty, 1, wx.ALL, 5)
-        sizer_7.Add(self.combo_box_filled, 1, wx.ALL, 5)
-        sizer_6.Add(sizer_7, 1, wx.EXPAND, 0)
-        self.notebook_1_wxComboBox.SetSizer(sizer_6)
-        sizer_17.Add(self.datepicker_ctrl_1, 1, wx.ALIGN_CENTER | wx.ALL, 5)
-        self.notebook_1_wxDatePickerCtrl.SetSizer(sizer_17)
-        sizer_15.Add(self.gauge_1, 1, wx.ALL, 5)
-        self.notebook_1_wxGauge.SetSizer(sizer_15)
-        sizer_19.Add(self.grid_1, 1, wx.EXPAND, 0)
-        self.notebook_1_wxGrid.SetSizer(sizer_19)
-        sizer_20.Add(self.hyperlink_1, 0, wx.ALL, 5)
-        self.notebook_1_wxHyperlinkCtrl.SetSizer(sizer_20)
-        sizer_4.Add(self.list_box_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_4.Add(self.list_box_filled, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListBox.SetSizer(sizer_4)
-        sizer_3.Add(self.list_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxListCtrl.SetSizer(sizer_3)
-        sizer_34.Add(self.property_grid_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxPropertyGridManager.SetSizer(sizer_34)
-        grid_sizer_1.Add(self.radio_box_empty1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_empty2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.radio_box_filled2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxRadioBox.SetSizer(grid_sizer_1)
-        grid_sizer_2.Add(self.radio_btn_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.radio_btn_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_8.Add(grid_sizer_2, 1, wx.EXPAND, 0)
-        self.notebook_1_wxRadioButton.SetSizer(sizer_8)
-        sizer_22.Add(self.slider_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSlider.SetSizer(sizer_22)
-        sizer_16.Add(self.tc_spin_button, 1, wx.ALL, 5)
-        sizer_16.Add(self.spin_button, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinButton.SetSizer(sizer_16)
-        sizer_14.Add(self.spin_ctrl_1, 1, wx.ALL, 5)
-        self.notebook_1_wxSpinCtrl.SetSizer(sizer_14)
-        sizer_30.Add(self.label_top_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_1.SetSizer(sizer_30)
-        sizer_31.Add(self.label_buttom_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_1_pane_2.SetSizer(sizer_31)
-        self.splitter_1.SplitHorizontally(self.splitter_1_pane_1, self.splitter_1_pane_2)
-        sizer_29.Add(self.splitter_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_horizontal.SetSizer(sizer_29)
-        sizer_32.Add(self.label_left_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_1.SetSizer(sizer_32)
-        sizer_33.Add(self.label_right_pane, 1, wx.ALL | wx.EXPAND, 5)
-        self.splitter_2_pane_2.SetSizer(sizer_33)
-        self.splitter_2.SplitVertically(self.splitter_2_pane_1, self.splitter_2_pane_2)
-        sizer_25.Add(self.splitter_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxSplitterWindow_vertical.SetSizer(sizer_25)
-        sizer_11.Add(self.bitmap_empty, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_file, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_nofile, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_art, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_null, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_11.Add(self.bitmap_null_sized, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticBitmap.SetSizer(sizer_11)
-        sizer_10.Add(self.static_line_2, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_10.Add(self.static_line_3, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
-        sizer_9.Add(self.static_line_4, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_9.Add(self.static_line_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticLine.SetSizer(sizer_9)
-        grid_sizer_3.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_3.Add(self.label_4, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_3.Add(self.label_5, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxStaticText.SetSizer(grid_sizer_3)
-        grid_sizer_4.Add(self.label_3, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_4.Add((60, 20), 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_4.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_Spacer.SetSizer(grid_sizer_4)
-        sizer_18.Add(self.text_ctrl, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTextCtrl.SetSizer(sizer_18)
-        sizer_23.Add(self.button_2, 1, wx.ALL, 5)
-        sizer_23.Add(self.button_4, 1, wx.ALL, 5)
-        self.notebook_1_wxToggleButton.SetSizer(sizer_23)
-        sizer_24.Add(self.tree_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_wxTreeCtrl.SetSizer(sizer_24)
-        self.notebook_1.AddPage(self.notebook_1_wxBitmapButton, _("wxBitmapButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxButton, _("wxButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxCalendarCtrl, _("wxCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGenericCalendarCtrl, _("wxGenericCalendarCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckBox, _("wxCheckBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxCheckListBox, _("wxCheckListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxChoice, _("wxChoice"))
-        self.notebook_1.AddPage(self.notebook_1_wxComboBox, _("wxComboBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxDatePickerCtrl, _("wxDatePickerCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxGauge, _("wxGauge"))
-        self.notebook_1.AddPage(self.notebook_1_wxGrid, _("wxGrid"))
-        self.notebook_1.AddPage(self.notebook_1_wxHyperlinkCtrl, _("wxHyperlinkCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxListBox, _("wxListBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxListCtrl, _("wxListCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxPropertyGridManager, _("wxPropertyGridManager"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioBox, _("wxRadioBox"))
-        self.notebook_1.AddPage(self.notebook_1_wxRadioButton, _("wxRadioButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxSlider, _("wxSlider"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinButton, _("wxSpinButton (with wxTextCtrl)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSpinCtrl, _("wxSpinCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_horizontal, _("wxSplitterWindow (horizontally)"))
-        self.notebook_1.AddPage(self.notebook_1_wxSplitterWindow_vertical, _("wxSplitterWindow (vertically)"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticBitmap, _("wxStaticBitmap"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticLine, _("wxStaticLine"))
-        self.notebook_1.AddPage(self.notebook_1_wxStaticText, _("wxStaticText"))
-        self.notebook_1.AddPage(self.notebook_1_Spacer, _("Spacer"))
-        self.notebook_1.AddPage(self.notebook_1_wxTextCtrl, _("wxTextCtrl"))
-        self.notebook_1.AddPage(self.notebook_1_wxToggleButton, _("wxToggleButton"))
-        self.notebook_1.AddPage(self.notebook_1_wxTreeCtrl, _("wxTreeCtrl"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+        self.notebook_1_wxBitmapButton.SetSizer(sizer_13)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
+
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnNotebookPageChanged, self.notebook_1)
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnNotebookPageChanging, self.notebook_1)
+        self.Bind(wx.EVT_NAVIGATION_KEY, self.OnBitmapButtonPanelNavigationKey)
+        self.Bind(wx.EVT_BUTTON, self.onStartConverting, self.button_1)
         # end wxGlade
 
     def onSelectUnix(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
@@ -425,10 +593,6 @@
         print("Event handler 'onShowManual' not implemented!")
         event.Skip()
 
-    def OnBitmapButtonPanelNavigationKey(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
-        print("Event handler 'OnBitmapButtonPanelNavigationKey' not implemented!")
-        event.Skip()
-
     def OnNotebookPageChanged(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
         print("Event handler 'OnNotebookPageChanged' not implemented!")
         event.Skip()
@@ -437,6 +601,10 @@
         print("Event handler 'OnNotebookPageChanging' not implemented!")
         event.Skip()
 
+    def OnBitmapButtonPanelNavigationKey(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
+        print("Event handler 'OnBitmapButtonPanelNavigationKey' not implemented!")
+        event.Skip()
+
     def onStartConverting(self, event):  # wxGlade: All_Widgets_Frame.<event_handler>
         print("Event handler 'onStartConverting' not implemented!")
         event.Skip()
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_30.pl wxglade-1.0.1/tests/casefiles/AllWidgets_30.pl
--- wxglade-0.9.6/tests/casefiles/AllWidgets_30.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_30.pl	2020-12-31 14:04:48.000000000 +0000
@@ -7,10 +7,10 @@
 
 use Wx qw[:allclasses];
 use strict;
-use Wx::ArtProvider qw/:artid :clientid/;
-use Wx::PropertyGridManager;
 
 # begin wxGlade: dependencies
+use Wx::ArtProvider qw/:artid :clientid/;
+use Wx::PropertyGridManager;
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -43,6 +43,11 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(800, 417));
+    $self->SetTitle(_T("All Widgets"));
+    my $icon = &Wx::wxNullIcon;
+    $icon->CopyFromBitmap(Wx::ArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, Wx::Size->new(32, 32)));
+    $self->SetIcon($icon);
+    
     
 
     # Menu Bar
@@ -72,127 +77,535 @@
     
     # Menu Bar end
 
+    
     $self->{All_Widgets_statusbar} = $self->CreateStatusBar(1, wxSTB_ELLIPSIZE_MIDDLE|wxSTB_SHOW_TIPS|wxSTB_SIZEGRIP);
+    $self->{All_Widgets_statusbar}->SetStatusWidths(-1);
+    
+    # statusbar fields
+    my( @All_Widgets_statusbar_fields ) = (
+        _T("All Widgets statusbar"),
+    );
+    
+    if( @All_Widgets_statusbar_fields ) {
+        $self->{All_Widgets_statusbar}->SetStatusText($All_Widgets_statusbar_fields[$_], $_)
+        for 0 .. $#All_Widgets_statusbar_fields ;
+    }
+    
     
     # Tool Bar
     $self->{All_Widgets_toolbar} = Wx::ToolBar->new($self, -1);
-    $self->SetToolBar($self->{All_Widgets_toolbar});
     $self->{All_Widgets_toolbar}->AddTool(wxID_UP, _T("UpDown"), Wx::ArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, Wx::Size->new(32, 32)), Wx::ArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, Wx::Size->new(32, 32)), wxITEM_CHECK, _T("Up or Down"), _T("Up or Down"));
     $self->{All_Widgets_toolbar}->AddTool(wxID_OPEN, _T("Open"), Wx::Bitmap->new(32, 32), wxNullBitmap, wxITEM_NORMAL, _T("Open a new file"), _T("Open a new file"));
+    $self->SetToolBar($self->{All_Widgets_toolbar});
+    $self->{All_Widgets_toolbar}->Realize();
     # Tool Bar end
+    
+    $self->{sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
+    
     $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
+    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
     $self->{notebook_1_wxBitmapButton} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{bitmap_button_icon1} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::Bitmap->new("icon.xpm", wxBITMAP_TYPE_ANY));
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxBitmapButton}, _T("wxBitmapButton"));
+    
+    $self->{sizer_13} = Wx::FlexGridSizer->new(2, 2, 0, 0);
+    
+    $self->{bitmap_button_icon1} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::Bitmap->new("icon.png", wxBITMAP_TYPE_ANY));
+    $self->{bitmap_button_icon1}->SetSize($self->{bitmap_button_icon1}->GetBestSize());
+    $self->{bitmap_button_icon1}->SetDefault();
+    $self->{sizer_13}->Add($self->{bitmap_button_icon1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{bitmap_button_empty1} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::Bitmap->new(10, 10));
-    $self->{bitmap_button_icon2} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::Bitmap->new("icon.xpm", wxBITMAP_TYPE_ANY), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    $self->{bitmap_button_empty1}->SetSize($self->{bitmap_button_empty1}->GetBestSize());
+    $self->{bitmap_button_empty1}->SetDefault();
+    $self->{sizer_13}->Add($self->{bitmap_button_empty1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{bitmap_button_icon2} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::Bitmap->new("icon.png", wxBITMAP_TYPE_ANY), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    $self->{bitmap_button_icon2}->SetBitmapDisabled(Wx::Bitmap->new(32, 32));
+    $self->{bitmap_button_icon2}->SetSize($self->{bitmap_button_icon2}->GetBestSize());
+    $self->{bitmap_button_icon2}->SetDefault();
+    $self->{sizer_13}->Add($self->{bitmap_button_icon2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{bitmap_button_art} = Wx::BitmapButton->new($self->{notebook_1_wxBitmapButton}, wxID_ANY, Wx::ArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, Wx::Size->new(32, 32)), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxBU_BOTTOM);
+    $self->{bitmap_button_art}->SetSize($self->{bitmap_button_art}->GetBestSize());
+    $self->{bitmap_button_art}->SetDefault();
+    $self->{sizer_13}->Add($self->{bitmap_button_art}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxButton} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxButton}, _T("wxButton"));
+    
+    $self->{sizer_28} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{button_3} = Wx::Button->new($self->{notebook_1_wxButton}, wxID_BOLD, "");
+    $self->{sizer_28}->Add($self->{button_3}, 0, wxALL, 5);
+    
     $self->{notebook_1_wxCalendarCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxCalendarCtrl}, _T("wxCalendarCtrl"));
+    
+    $self->{sizer_12} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{calendar_ctrl_1} = Wx::CalendarCtrl->new($self->{notebook_1_wxCalendarCtrl}, wxID_ANY, Wx::DateTime->new, wxDefaultPosition, wxDefaultSize, wxCAL_MONDAY_FIRST|wxCAL_SEQUENTIAL_MONTH_SELECTION|wxCAL_SHOW_SURROUNDING_WEEKS|wxCAL_SHOW_WEEK_NUMBERS);
+    $self->{sizer_12}->Add($self->{calendar_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxGenericCalendarCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxGenericCalendarCtrl}, _T("wxGenericCalendarCtrl"));
+    
+    $self->{sizer_27} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{generic_calendar_ctrl_1} = Wx::GenericCalendarCtrl->new($self->{notebook_1_wxGenericCalendarCtrl}, wxID_ANY, Wx::DateTime->new, wxDefaultPosition, wxDefaultSize, wxCAL_MONDAY_FIRST);
+    $self->{sizer_27}->Add($self->{generic_calendar_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxCheckBox} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxCheckBox}, _T("wxCheckBox"));
+    
+    $self->{sizer_21} = Wx::GridSizer->new(2, 3, 0, 0);
+    
     $self->{checkbox_1} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("one (unchecked)"));
+    $self->{sizer_21}->Add($self->{checkbox_1}, 0, wxEXPAND, 0);
+    
     $self->{checkbox_2} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("two (checked)"));
+    $self->{checkbox_2}->SetValue(1);
+    $self->{sizer_21}->Add($self->{checkbox_2}, 0, wxEXPAND, 0);
+    
     $self->{checkbox_3} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("three"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
+    $self->{sizer_21}->Add($self->{checkbox_3}, 0, wxEXPAND, 0);
+    
     $self->{checkbox_4} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("four (unchecked)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE);
+    $self->{checkbox_4}->Set3StateValue(wxCHK_UNCHECKED);
+    $self->{sizer_21}->Add($self->{checkbox_4}, 0, wxEXPAND, 0);
+    
     $self->{checkbox_5} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("five (checked)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER);
+    $self->{checkbox_5}->Set3StateValue(wxCHK_CHECKED);
+    $self->{sizer_21}->Add($self->{checkbox_5}, 0, wxEXPAND, 0);
+    
     $self->{checkbox_6} = Wx::CheckBox->new($self->{notebook_1_wxCheckBox}, wxID_ANY, _T("six (undetermined)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER);
+    $self->{checkbox_6}->Set3StateValue(wxCHK_UNDETERMINED);
+    $self->{sizer_21}->Add($self->{checkbox_6}, 0, wxEXPAND, 0);
+    
     $self->{notebook_1_wxCheckListBox} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxCheckListBox}, _T("wxCheckListBox"));
+    
+    $self->{sizer_26} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{check_list_box_1} = Wx::CheckListBox->new($self->{notebook_1_wxCheckListBox}, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("one"), _T("two"), _T("three"), _T("four")], );
+    $self->{check_list_box_1}->SetSelection(2);
+    $self->{sizer_26}->Add($self->{check_list_box_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxChoice} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxChoice}, _T("wxChoice"));
+    
+    $self->{sizer_5} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{choice_empty} = Wx::Choice->new($self->{notebook_1_wxChoice}, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], );
+    $self->{sizer_5}->Add($self->{choice_empty}, 1, wxALL, 5);
+    
     $self->{choice_filled} = Wx::Choice->new($self->{notebook_1_wxChoice}, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("Item 1"), _T("Item 2 (pre-selected)")], );
+    $self->{choice_filled}->SetSelection(1);
+    $self->{sizer_5}->Add($self->{choice_filled}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxComboBox} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxComboBox}, _T("wxComboBox"));
+    
+    $self->{sizer_6} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_7} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_6}->Add($self->{sizer_7}, 1, wxEXPAND, 0);
+    
     $self->{combo_box_empty} = Wx::ComboBox->new($self->{notebook_1_wxComboBox}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, [], 0);
+    $self->{sizer_7}->Add($self->{combo_box_empty}, 1, wxALL, 5);
+    
     $self->{combo_box_filled} = Wx::ComboBox->new($self->{notebook_1_wxComboBox}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, [_T("Item 1 (pre-selected)"), _T("Item 2")], 0);
+    $self->{combo_box_filled}->SetSelection(0);
+    $self->{sizer_7}->Add($self->{combo_box_filled}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxDatePickerCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxDatePickerCtrl}, _T("wxDatePickerCtrl"));
+    
+    $self->{sizer_17} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{datepicker_ctrl_1} = Wx::DatePickerCtrl->new($self->{notebook_1_wxDatePickerCtrl}, wxID_ANY, Wx::DateTime->new(), wxDefaultPosition, wxDefaultSize, wxDP_SHOWCENTURY);
+    $self->{sizer_17}->Add($self->{datepicker_ctrl_1}, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
     $self->{notebook_1_wxGauge} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxGauge}, _T("wxGauge"));
+    
+    $self->{sizer_15} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{gauge_1} = Wx::Gauge->new($self->{notebook_1_wxGauge}, wxID_ANY, 20);
+    $self->{sizer_15}->Add($self->{gauge_1}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxGrid} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxGrid}, _T("wxGrid"));
+    
+    $self->{sizer_19} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{grid_1} = Wx::Grid->new($self->{notebook_1_wxGrid}, wxID_ANY);
+    $self->{grid_1}->CreateGrid(10, 3);
+    $self->{grid_1}->SetSelectionMode(wxGridSelectColumns);
+    $self->{grid_1}->SetColLabelValue(1, _T("B\nB"));
+    $self->{sizer_19}->Add($self->{grid_1}, 1, wxEXPAND, 0);
+    
     $self->{notebook_1_wxHyperlinkCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxHyperlinkCtrl}, _T("wxHyperlinkCtrl"));
+    
+    $self->{sizer_20} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{hyperlink_1} = Wx::HyperlinkCtrl->new($self->{notebook_1_wxHyperlinkCtrl}, wxID_ANY, _T("Homepage wxGlade"), _T("http://wxglade.sf.net"));
+    $self->{sizer_20}->Add($self->{hyperlink_1}, 0, wxALL, 5);
+    
     $self->{notebook_1_wxListBox} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxListBox}, _T("wxListBox"));
+    
+    $self->{sizer_4} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{list_box_empty} = Wx::ListBox->new($self->{notebook_1_wxListBox}, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], 0);
+    $self->{sizer_4}->Add($self->{list_box_empty}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{list_box_filled} = Wx::ListBox->new($self->{notebook_1_wxListBox}, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("Item 1"), _T("Item 2 (pre-selected)")], wxLB_MULTIPLE|wxLB_SORT);
+    $self->{list_box_filled}->SetSelection(1);
+    $self->{sizer_4}->Add($self->{list_box_filled}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxListCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxListCtrl}, _T("wxListCtrl"));
+    
+    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{list_ctrl_1} = Wx::ListCtrl->new($self->{notebook_1_wxListCtrl}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN|wxLC_REPORT);
+    $self->{sizer_3}->Add($self->{list_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxPropertyGridManager} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxPropertyGridManager}, _T("wxPropertyGridManager"));
+    
+    $self->{sizer_34} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{property_grid_2} = Wx::PropertyGridManager->new($self->{notebook_1_wxPropertyGridManager}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxPG_ALPHABETIC_MODE);
+    $self->{sizer_34}->Add($self->{property_grid_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxRadioBox} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxRadioBox}, _T("wxRadioBox"));
+    
+    $self->{grid_sizer_1} = Wx::GridSizer->new(2, 2, 0, 0);
+    
     $self->{radio_box_empty1} = Wx::RadioBox->new($self->{notebook_1_wxRadioBox}, wxID_ANY, _T("radio_box_empty1"), wxDefaultPosition, wxDefaultSize, [], 1, wxRA_SPECIFY_ROWS);
+    $self->{grid_sizer_1}->Add($self->{radio_box_empty1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{radio_box_filled1} = Wx::RadioBox->new($self->{notebook_1_wxRadioBox}, wxID_ANY, _T("radio_box_filled1"), wxDefaultPosition, wxDefaultSize, [_T("choice 1"), _T("choice 2 (pre-selected)"), _T("choice 3")], 0, wxRA_SPECIFY_ROWS);
+    $self->{radio_box_filled1}->SetSelection(1);
+    $self->{grid_sizer_1}->Add($self->{radio_box_filled1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{radio_box_empty2} = Wx::RadioBox->new($self->{notebook_1_wxRadioBox}, wxID_ANY, _T("radio_box_empty2"), wxDefaultPosition, wxDefaultSize, [], 1, wxRA_SPECIFY_COLS);
+    $self->{grid_sizer_1}->Add($self->{radio_box_empty2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{radio_box_filled2} = Wx::RadioBox->new($self->{notebook_1_wxRadioBox}, wxID_ANY, _T("radio_box_filled2"), wxDefaultPosition, wxDefaultSize, [_T("choice 1"), _T("choice 2 (pre-selected)")], 0, wxRA_SPECIFY_COLS);
+    $self->{radio_box_filled2}->SetSelection(1);
+    $self->{grid_sizer_1}->Add($self->{radio_box_filled2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxRadioButton} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxRadioButton}, _T("wxRadioButton"));
+    
+    $self->{sizer_8} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_wxRadioButton}, wxID_ANY, _T("My RadioButton Group")), wxHORIZONTAL);
+    
+    $self->{grid_sizer_2} = Wx::FlexGridSizer->new(3, 2, 0, 0);
+    $self->{sizer_8}->Add($self->{grid_sizer_2}, 1, wxEXPAND, 0);
+    
     $self->{radio_btn_1} = Wx::RadioButton->new($self->{notebook_1_wxRadioButton}, wxID_ANY, _T("Alice"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+    $self->{grid_sizer_2}->Add($self->{radio_btn_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{text_ctrl_1} = Wx::TextCtrl->new($self->{notebook_1_wxRadioButton}, wxID_ANY, "");
+    $self->{grid_sizer_2}->Add($self->{text_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{radio_btn_2} = Wx::RadioButton->new($self->{notebook_1_wxRadioButton}, wxID_ANY, _T("Bob"));
+    $self->{grid_sizer_2}->Add($self->{radio_btn_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{text_ctrl_2} = Wx::TextCtrl->new($self->{notebook_1_wxRadioButton}, wxID_ANY, "");
+    $self->{grid_sizer_2}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{radio_btn_3} = Wx::RadioButton->new($self->{notebook_1_wxRadioButton}, wxID_ANY, _T("Malroy"));
+    $self->{grid_sizer_2}->Add($self->{radio_btn_3}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{text_ctrl_3} = Wx::TextCtrl->new($self->{notebook_1_wxRadioButton}, wxID_ANY, "");
+    $self->{grid_sizer_2}->Add($self->{text_ctrl_3}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxSlider} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxSlider}, _T("wxSlider"));
+    
+    $self->{sizer_22} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{slider_1} = Wx::Slider->new($self->{notebook_1_wxSlider}, wxID_ANY, 5, 0, 10, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{sizer_22}->Add($self->{slider_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxSpinButton} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxSpinButton}, _T("wxSpinButton (with wxTextCtrl)"));
+    
+    $self->{sizer_16} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{tc_spin_button} = Wx::TextCtrl->new($self->{notebook_1_wxSpinButton}, wxID_ANY, _T("1"), wxDefaultPosition, wxDefaultSize, wxTE_RIGHT);
+    $self->{sizer_16}->Add($self->{tc_spin_button}, 1, wxALL, 5);
+    
     $self->{spin_button} = Wx::SpinButton->new($self->{notebook_1_wxSpinButton}, wxID_ANY,);
+    $self->{sizer_16}->Add($self->{spin_button}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxSpinCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxSpinCtrl}, _T("wxSpinCtrl"));
+    
+    $self->{sizer_14} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{spin_ctrl_1} = Wx::SpinCtrl->new($self->{notebook_1_wxSpinCtrl}, wxID_ANY, "4", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxSP_ARROW_KEYS, 0, 100, 4);
+    $self->{sizer_14}->Add($self->{spin_ctrl_1}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxSplitterWindow_horizontal} = Wx::ScrolledWindow->new($self->{notebook_1}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    $self->{notebook_1_wxSplitterWindow_horizontal}->SetScrollRate(10, 10);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxSplitterWindow_horizontal}, _T("wxSplitterWindow (horizontally)"));
+    
+    $self->{sizer_29} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{splitter_1} = Wx::SplitterWindow->new($self->{notebook_1_wxSplitterWindow_horizontal}, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{splitter_1}->SetBackgroundColour(Wx::Colour->new(255, 0, 0));
+    $self->{splitter_1}->SetMinimumPaneSize(20);
+    $self->{sizer_29}->Add($self->{splitter_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{splitter_1_pane_1} = Wx::Panel->new($self->{splitter_1}, wxID_ANY);
+    
+    $self->{sizer_30} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{label_top_pane} = Wx::StaticText->new($self->{splitter_1_pane_1}, wxID_ANY, _T("top pane"));
+    $self->{sizer_30}->Add($self->{label_top_pane}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{splitter_1_pane_2} = Wx::Panel->new($self->{splitter_1}, wxID_ANY);
+    
+    $self->{sizer_31} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{label_buttom_pane} = Wx::StaticText->new($self->{splitter_1_pane_2}, wxID_ANY, _T("bottom pane"));
+    $self->{sizer_31}->Add($self->{label_buttom_pane}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxSplitterWindow_vertical} = Wx::ScrolledWindow->new($self->{notebook_1}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    $self->{notebook_1_wxSplitterWindow_vertical}->SetScrollRate(10, 10);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxSplitterWindow_vertical}, _T("wxSplitterWindow (vertically)"));
+    
+    $self->{sizer_25} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{splitter_2} = Wx::SplitterWindow->new($self->{notebook_1_wxSplitterWindow_vertical}, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{splitter_2}->SetMinimumPaneSize(20);
+    $self->{sizer_25}->Add($self->{splitter_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{splitter_2_pane_1} = Wx::Panel->new($self->{splitter_2}, wxID_ANY);
+    
+    $self->{sizer_32} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{label_left_pane} = Wx::StaticText->new($self->{splitter_2_pane_1}, wxID_ANY, _T("left pane"));
+    $self->{sizer_32}->Add($self->{label_left_pane}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{splitter_2_pane_2} = Wx::Panel->new($self->{splitter_2}, wxID_ANY);
+    
+    $self->{sizer_33} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{label_right_pane} = Wx::StaticText->new($self->{splitter_2_pane_2}, wxID_ANY, _T("right pane"));
+    $self->{sizer_33}->Add($self->{label_right_pane}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxStaticBitmap} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{bitmap_empty} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::Bitmap->new(32, 32));
-    $self->{bitmap_file} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::Bitmap->new("icon.xpm", wxBITMAP_TYPE_ANY));
-    $self->{bitmap_nofile} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::Bitmap->new("non-existing.bmp", wxBITMAP_TYPE_ANY));
-    $self->{bitmap_art} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::ArtProvider::GetBitmap(wxART_PRINT, wxART_OTHER, Wx::Size->new(32, 32)));
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticBitmap}, _T("wxStaticBitmap"));
+    
+    $self->{sizer_11} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{bitmap_empty} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::Bitmap->new(32, 32));
+    $self->{sizer_11}->Add($self->{bitmap_empty}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{bitmap_file} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::Bitmap->new("icon.png", wxBITMAP_TYPE_ANY));
+    $self->{sizer_11}->Add($self->{bitmap_file}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{bitmap_nofile} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::Bitmap->new("non-existing.bmp", wxBITMAP_TYPE_ANY));
+    $self->{sizer_11}->Add($self->{bitmap_nofile}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{bitmap_art} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, Wx::ArtProvider::GetBitmap(wxART_PRINT, wxART_OTHER, Wx::Size->new(32, 32)));
+    $self->{sizer_11}->Add($self->{bitmap_art}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{bitmap_null} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, wxNullBitmap);
+    $self->{sizer_11}->Add($self->{bitmap_null}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{bitmap_null_sized} = Wx::StaticBitmap->new($self->{notebook_1_wxStaticBitmap}, wxID_ANY, wxNullBitmap);
+    $self->{bitmap_null_sized}->SetMinSize(Wx::Size->new(50, 50));
+    $self->{sizer_11}->Add($self->{bitmap_null_sized}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxStaticLine} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticLine}, _T("wxStaticLine"));
+    
+    $self->{sizer_9} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_10} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_9}->Add($self->{sizer_10}, 1, wxEXPAND, 0);
+    
     $self->{static_line_2} = Wx::StaticLine->new($self->{notebook_1_wxStaticLine}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL);
+    $self->{sizer_10}->Add($self->{static_line_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{static_line_3} = Wx::StaticLine->new($self->{notebook_1_wxStaticLine}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL);
+    $self->{sizer_10}->Add($self->{static_line_3}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{static_line_4} = Wx::StaticLine->new($self->{notebook_1_wxStaticLine}, wxID_ANY);
+    $self->{sizer_9}->Add($self->{static_line_4}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{static_line_5} = Wx::StaticLine->new($self->{notebook_1_wxStaticLine}, wxID_ANY);
+    $self->{sizer_9}->Add($self->{static_line_5}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxStaticText} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{label_1} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("red text (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-    $self->{label_4} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("black on red (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-    $self->{label_5} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("green on pink (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticText}, _T("wxStaticText"));
+    
+    $self->{grid_sizer_3} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    
+    $self->{label_1} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("red text (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    $self->{label_1}->SetForegroundColour(Wx::Colour->new(255, 0, 0));
+    $self->{grid_sizer_3}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{label_4} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("black on red (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    $self->{label_4}->SetBackgroundColour(Wx::Colour->new(255, 0, 0));
+    $self->{label_4}->SetToolTip(_T("Background colour won't show, check documentation for more details"));
+    $self->{grid_sizer_3}->Add($self->{label_4}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{label_5} = Wx::StaticText->new($self->{notebook_1_wxStaticText}, wxID_ANY, _T("green on pink (RGB)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+    $self->{label_5}->SetBackgroundColour(Wx::Colour->new(255, 0, 255));
+    $self->{label_5}->SetForegroundColour(Wx::Colour->new(0, 255, 0));
+    $self->{label_5}->SetToolTip(_T("Background colour won't show, check documentation for more details"));
+    $self->{grid_sizer_3}->Add($self->{label_5}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_Spacer} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_Spacer}, _T("Spacer"));
+    
+    $self->{grid_sizer_4} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    
     $self->{label_3} = Wx::StaticText->new($self->{notebook_1_Spacer}, wxID_ANY, _T("Two labels with a"));
+    $self->{grid_sizer_4}->Add($self->{label_3}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{grid_sizer_4}->Add(60, 20, 1, wxALL|wxEXPAND, 5);
+    
     $self->{label_2} = Wx::StaticText->new($self->{notebook_1_Spacer}, wxID_ANY, _T("spacer between"));
+    $self->{grid_sizer_4}->Add($self->{label_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxTextCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxTextCtrl}, _T("wxTextCtrl"));
+    
+    $self->{sizer_18} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{text_ctrl} = Wx::TextCtrl->new($self->{notebook_1_wxTextCtrl}, wxID_ANY, _T("This\nis\na\nmultiline\nwxTextCtrl"), wxDefaultPosition, wxDefaultSize, wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_WORDWRAP);
+    $self->{sizer_18}->Add($self->{text_ctrl}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_wxToggleButton} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxToggleButton}, _T("wxToggleButton"));
+    
+    $self->{sizer_23} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{button_2} = Wx::ToggleButton->new($self->{notebook_1_wxToggleButton}, wxID_ANY, _T("Toggle Button 1"));
+    $self->{sizer_23}->Add($self->{button_2}, 1, wxALL, 5);
+    
     $self->{button_4} = Wx::ToggleButton->new($self->{notebook_1_wxToggleButton}, wxID_ANY, _T("Toggle Button 2"), wxDefaultPosition, wxDefaultSize, wxBU_BOTTOM|wxBU_EXACTFIT);
+    $self->{sizer_23}->Add($self->{button_4}, 1, wxALL, 5);
+    
     $self->{notebook_1_wxTreeCtrl} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_wxTreeCtrl}, _T("wxTreeCtrl"));
+    
+    $self->{sizer_24} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{tree_ctrl_1} = Wx::TreeCtrl->new($self->{notebook_1_wxTreeCtrl}, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{sizer_24}->Add($self->{tree_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 2, 0, 0);
+    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
+    
     $self->{button_5} = Wx::Button->new($self, wxID_CLOSE, "");
+    $self->{sizer_2}->Add($self->{button_5}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
     $self->{button_1} = Wx::Button->new($self, wxID_OK, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->{sizer_2}->Add($self->{button_1}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    $self->{notebook_1_wxTreeCtrl}->SetSizer($self->{sizer_24});
+    
+    $self->{notebook_1_wxToggleButton}->SetSizer($self->{sizer_23});
+    
+    $self->{notebook_1_wxTextCtrl}->SetSizer($self->{sizer_18});
+    
+    $self->{notebook_1_Spacer}->SetSizer($self->{grid_sizer_4});
+    
+    $self->{notebook_1_wxStaticText}->SetSizer($self->{grid_sizer_3});
+    
+    $self->{notebook_1_wxStaticLine}->SetSizer($self->{sizer_9});
+    
+    $self->{notebook_1_wxStaticBitmap}->SetSizer($self->{sizer_11});
+    
+    $self->{splitter_2_pane_2}->SetSizer($self->{sizer_33});
+    
+    $self->{splitter_2_pane_1}->SetSizer($self->{sizer_32});
+    
+    $self->{splitter_2}->SplitVertically($self->{splitter_2_pane_1}, $self->{splitter_2_pane_2}, );
+    
+    $self->{notebook_1_wxSplitterWindow_vertical}->SetSizer($self->{sizer_25});
+    
+    $self->{splitter_1_pane_2}->SetSizer($self->{sizer_31});
+    
+    $self->{splitter_1_pane_1}->SetSizer($self->{sizer_30});
+    
+    $self->{splitter_1}->SplitHorizontally($self->{splitter_1_pane_1}, $self->{splitter_1_pane_2}, );
+    
+    $self->{notebook_1_wxSplitterWindow_horizontal}->SetSizer($self->{sizer_29});
+    
+    $self->{notebook_1_wxSpinCtrl}->SetSizer($self->{sizer_14});
+    
+    $self->{notebook_1_wxSpinButton}->SetSizer($self->{sizer_16});
+    
+    $self->{notebook_1_wxSlider}->SetSizer($self->{sizer_22});
+    
+    $self->{notebook_1_wxRadioButton}->SetSizer($self->{sizer_8});
+    
+    $self->{notebook_1_wxRadioBox}->SetSizer($self->{grid_sizer_1});
+    
+    $self->{notebook_1_wxPropertyGridManager}->SetSizer($self->{sizer_34});
+    
+    $self->{notebook_1_wxListCtrl}->SetSizer($self->{sizer_3});
+    
+    $self->{notebook_1_wxListBox}->SetSizer($self->{sizer_4});
+    
+    $self->{notebook_1_wxHyperlinkCtrl}->SetSizer($self->{sizer_20});
+    
+    $self->{notebook_1_wxGrid}->SetSizer($self->{sizer_19});
+    
+    $self->{notebook_1_wxGauge}->SetSizer($self->{sizer_15});
+    
+    $self->{notebook_1_wxDatePickerCtrl}->SetSizer($self->{sizer_17});
+    
+    $self->{notebook_1_wxComboBox}->SetSizer($self->{sizer_6});
+    
+    $self->{notebook_1_wxChoice}->SetSizer($self->{sizer_5});
+    
+    $self->{notebook_1_wxCheckListBox}->SetSizer($self->{sizer_26});
+    
+    $self->{notebook_1_wxCheckBox}->SetSizer($self->{sizer_21});
+    
+    $self->{notebook_1_wxGenericCalendarCtrl}->SetSizer($self->{sizer_27});
+    
+    $self->{notebook_1_wxCalendarCtrl}->SetSizer($self->{sizer_12});
+    
+    $self->{notebook_1_wxButton}->SetSizer($self->{sizer_28});
+    
+    $self->{sizer_13}->AddGrowableRow(0);
+    $self->{sizer_13}->AddGrowableRow(1);
+    $self->{sizer_13}->AddGrowableCol(0);
+    $self->{sizer_13}->AddGrowableCol(1);
+    $self->{notebook_1_wxBitmapButton}->SetSizer($self->{sizer_13});
+    
+    $self->{sizer_1}->AddGrowableRow(0);
+    $self->{sizer_1}->AddGrowableCol(0);
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->SetSizeHints($self);
+    
+    $self->Layout();
+    $self->Centre();
     Wx::Event::EVT_MENU($self, $self->{mn_Unix}->GetId, $self->can('onSelectUnix'));
     Wx::Event::EVT_MENU($self, $self->{mn_Windows}->GetId, $self->can('onSelectWindows'));
     Wx::Event::EVT_MENU($self, $self->{mn_RemoveTabs}->GetId, $self->can('onRemoveTabs'));
     Wx::Event::EVT_MENU($self, wxID_HELP, $self->can('onShowManual'));
-    Wx::Event::EVT_NAVIGATION_KEY($self, $self->can('OnBitmapButtonPanelNavigationKey'));
     Wx::Event::EVT_NOTEBOOK_PAGE_CHANGED($self, $self->{notebook_1}->GetId, $self->can('OnNotebookPageChanged'));
     Wx::Event::EVT_NOTEBOOK_PAGE_CHANGING($self, $self->{notebook_1}->GetId, $self->can('OnNotebookPageChanging'));
+    Wx::Event::EVT_NAVIGATION_KEY($self, $self->can('OnBitmapButtonPanelNavigationKey'));
     Wx::Event::EVT_BUTTON($self, $self->{button_1}->GetId, $self->can('onStartConverting'));
 
     # end wxGlade
@@ -201,253 +614,6 @@
 }
 
 
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: All_Widgets_Frame::__set_properties
-    $self->SetTitle(_T("All Widgets"));
-    my $icon = &Wx::wxNullIcon;
-    $icon->CopyFromBitmap(Wx::ArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, Wx::Size->new(32, 32)));
-    $self->SetIcon($icon);
-    $self->{All_Widgets_statusbar}->SetStatusWidths(-1);
-
-    # statusbar fields
-    my( @All_Widgets_statusbar_fields ) = (
-        _T("All Widgets statusbar"),
-    );
-
-    if( @All_Widgets_statusbar_fields ) {
-        $self->{All_Widgets_statusbar}->SetStatusText($All_Widgets_statusbar_fields[$_], $_)
-        for 0 .. $#All_Widgets_statusbar_fields ;
-    }
-    $self->{All_Widgets_toolbar}->Realize();
-    $self->{bitmap_button_icon1}->SetSize($self->{bitmap_button_icon1}->GetBestSize());
-    $self->{bitmap_button_icon1}->SetDefault();
-    $self->{bitmap_button_empty1}->SetSize($self->{bitmap_button_empty1}->GetBestSize());
-    $self->{bitmap_button_empty1}->SetDefault();
-    $self->{bitmap_button_icon2}->SetBitmapDisabled(Wx::Bitmap->new(32, 32));
-    $self->{bitmap_button_icon2}->SetSize($self->{bitmap_button_icon2}->GetBestSize());
-    $self->{bitmap_button_icon2}->SetDefault();
-    $self->{bitmap_button_art}->SetSize($self->{bitmap_button_art}->GetBestSize());
-    $self->{bitmap_button_art}->SetDefault();
-    $self->{checkbox_2}->SetValue(1);
-    $self->{checkbox_4}->Set3StateValue(wxCHK_UNCHECKED);
-    $self->{checkbox_5}->Set3StateValue(wxCHK_CHECKED);
-    $self->{checkbox_6}->Set3StateValue(wxCHK_UNDETERMINED);
-    $self->{check_list_box_1}->SetSelection(2);
-    $self->{choice_filled}->SetSelection(1);
-    $self->{combo_box_filled}->SetSelection(0);
-    $self->{grid_1}->CreateGrid(10, 3);
-    $self->{grid_1}->SetSelectionMode(wxGridSelectColumns);
-    $self->{grid_1}->SetColLabelValue(1, _T("B\nB"));
-    $self->{list_box_filled}->SetSelection(1);
-    $self->{radio_box_filled1}->SetSelection(1);
-    $self->{radio_box_filled2}->SetSelection(1);
-    $self->{splitter_1}->SetMinimumPaneSize(20);
-    $self->{notebook_1_wxSplitterWindow_horizontal}->SetScrollRate(10, 10);
-    $self->{splitter_2}->SetMinimumPaneSize(20);
-    $self->{notebook_1_wxSplitterWindow_vertical}->SetScrollRate(10, 10);
-    $self->{bitmap_null_sized}->SetMinSize(Wx::Size->new(50, 50));
-    $self->{label_1}->SetForegroundColour(Wx::Colour->new(255, 0, 0));
-    $self->{label_4}->SetBackgroundColour(Wx::Colour->new(255, 0, 0));
-    $self->{label_4}->SetToolTip(_T("Background colour won't show, check documentation for more details"));
-    $self->{label_5}->SetBackgroundColour(Wx::Colour->new(255, 0, 255));
-    $self->{label_5}->SetForegroundColour(Wx::Colour->new(0, 255, 0));
-    $self->{label_5}->SetToolTip(_T("Background colour won't show, check documentation for more details"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: All_Widgets_Frame::__do_layout
-    $self->{sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
-    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 2, 0, 0);
-    $self->{sizer_24} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_23} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_18} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{grid_sizer_4} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    $self->{grid_sizer_3} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    $self->{sizer_9} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_10} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_11} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_25} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_33} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_32} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_29} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_31} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_30} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_14} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_16} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_22} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_8} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_wxRadioButton}, wxID_ANY, _T("My RadioButton Group")), wxHORIZONTAL);
-    $self->{grid_sizer_2} = Wx::FlexGridSizer->new(3, 2, 0, 0);
-    $self->{grid_sizer_1} = Wx::GridSizer->new(2, 2, 0, 0);
-    $self->{sizer_34} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_4} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_20} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_19} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_15} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_17} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_6} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_7} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_5} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_26} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_21} = Wx::GridSizer->new(2, 3, 0, 0);
-    $self->{sizer_27} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_12} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_28} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_13} = Wx::FlexGridSizer->new(2, 2, 0, 0);
-    $self->{sizer_13}->Add($self->{bitmap_button_icon1}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_13}->Add($self->{bitmap_button_empty1}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_13}->Add($self->{bitmap_button_icon2}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_13}->Add($self->{bitmap_button_art}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxBitmapButton}->SetSizer($self->{sizer_13});
-    $self->{sizer_13}->AddGrowableRow(0);
-    $self->{sizer_13}->AddGrowableRow(1);
-    $self->{sizer_13}->AddGrowableCol(0);
-    $self->{sizer_13}->AddGrowableCol(1);
-    $self->{sizer_28}->Add($self->{button_3}, 0, wxALL, 5);
-    $self->{notebook_1_wxButton}->SetSizer($self->{sizer_28});
-    $self->{sizer_12}->Add($self->{calendar_ctrl_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxCalendarCtrl}->SetSizer($self->{sizer_12});
-    $self->{sizer_27}->Add($self->{generic_calendar_ctrl_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxGenericCalendarCtrl}->SetSizer($self->{sizer_27});
-    $self->{sizer_21}->Add($self->{checkbox_1}, 0, wxEXPAND, 0);
-    $self->{sizer_21}->Add($self->{checkbox_2}, 0, wxEXPAND, 0);
-    $self->{sizer_21}->Add($self->{checkbox_3}, 0, wxEXPAND, 0);
-    $self->{sizer_21}->Add($self->{checkbox_4}, 0, wxEXPAND, 0);
-    $self->{sizer_21}->Add($self->{checkbox_5}, 0, wxEXPAND, 0);
-    $self->{sizer_21}->Add($self->{checkbox_6}, 0, wxEXPAND, 0);
-    $self->{notebook_1_wxCheckBox}->SetSizer($self->{sizer_21});
-    $self->{sizer_26}->Add($self->{check_list_box_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxCheckListBox}->SetSizer($self->{sizer_26});
-    $self->{sizer_5}->Add($self->{choice_empty}, 1, wxALL, 5);
-    $self->{sizer_5}->Add($self->{choice_filled}, 1, wxALL, 5);
-    $self->{notebook_1_wxChoice}->SetSizer($self->{sizer_5});
-    $self->{sizer_7}->Add($self->{combo_box_empty}, 1, wxALL, 5);
-    $self->{sizer_7}->Add($self->{combo_box_filled}, 1, wxALL, 5);
-    $self->{sizer_6}->Add($self->{sizer_7}, 1, wxEXPAND, 0);
-    $self->{notebook_1_wxComboBox}->SetSizer($self->{sizer_6});
-    $self->{sizer_17}->Add($self->{datepicker_ctrl_1}, 1, wxALIGN_CENTER|wxALL, 5);
-    $self->{notebook_1_wxDatePickerCtrl}->SetSizer($self->{sizer_17});
-    $self->{sizer_15}->Add($self->{gauge_1}, 1, wxALL, 5);
-    $self->{notebook_1_wxGauge}->SetSizer($self->{sizer_15});
-    $self->{sizer_19}->Add($self->{grid_1}, 1, wxEXPAND, 0);
-    $self->{notebook_1_wxGrid}->SetSizer($self->{sizer_19});
-    $self->{sizer_20}->Add($self->{hyperlink_1}, 0, wxALL, 5);
-    $self->{notebook_1_wxHyperlinkCtrl}->SetSizer($self->{sizer_20});
-    $self->{sizer_4}->Add($self->{list_box_empty}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_4}->Add($self->{list_box_filled}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxListBox}->SetSizer($self->{sizer_4});
-    $self->{sizer_3}->Add($self->{list_ctrl_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxListCtrl}->SetSizer($self->{sizer_3});
-    $self->{sizer_34}->Add($self->{property_grid_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxPropertyGridManager}->SetSizer($self->{sizer_34});
-    $self->{grid_sizer_1}->Add($self->{radio_box_empty1}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_1}->Add($self->{radio_box_filled1}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_1}->Add($self->{radio_box_empty2}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_1}->Add($self->{radio_box_filled2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxRadioBox}->SetSizer($self->{grid_sizer_1});
-    $self->{grid_sizer_2}->Add($self->{radio_btn_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{text_ctrl_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{radio_btn_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{radio_btn_3}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{text_ctrl_3}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_8}->Add($self->{grid_sizer_2}, 1, wxEXPAND, 0);
-    $self->{notebook_1_wxRadioButton}->SetSizer($self->{sizer_8});
-    $self->{sizer_22}->Add($self->{slider_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxSlider}->SetSizer($self->{sizer_22});
-    $self->{sizer_16}->Add($self->{tc_spin_button}, 1, wxALL, 5);
-    $self->{sizer_16}->Add($self->{spin_button}, 1, wxALL, 5);
-    $self->{notebook_1_wxSpinButton}->SetSizer($self->{sizer_16});
-    $self->{sizer_14}->Add($self->{spin_ctrl_1}, 1, wxALL, 5);
-    $self->{notebook_1_wxSpinCtrl}->SetSizer($self->{sizer_14});
-    $self->{sizer_30}->Add($self->{label_top_pane}, 1, wxALL|wxEXPAND, 5);
-    $self->{splitter_1_pane_1}->SetSizer($self->{sizer_30});
-    $self->{sizer_31}->Add($self->{label_buttom_pane}, 1, wxALL|wxEXPAND, 5);
-    $self->{splitter_1_pane_2}->SetSizer($self->{sizer_31});
-    $self->{splitter_1}->SplitHorizontally($self->{splitter_1_pane_1}, $self->{splitter_1_pane_2}, );
-    $self->{sizer_29}->Add($self->{splitter_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxSplitterWindow_horizontal}->SetSizer($self->{sizer_29});
-    $self->{sizer_32}->Add($self->{label_left_pane}, 1, wxALL|wxEXPAND, 5);
-    $self->{splitter_2_pane_1}->SetSizer($self->{sizer_32});
-    $self->{sizer_33}->Add($self->{label_right_pane}, 1, wxALL|wxEXPAND, 5);
-    $self->{splitter_2_pane_2}->SetSizer($self->{sizer_33});
-    $self->{splitter_2}->SplitVertically($self->{splitter_2_pane_1}, $self->{splitter_2_pane_2}, );
-    $self->{sizer_25}->Add($self->{splitter_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxSplitterWindow_vertical}->SetSizer($self->{sizer_25});
-    $self->{sizer_11}->Add($self->{bitmap_empty}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_11}->Add($self->{bitmap_file}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_11}->Add($self->{bitmap_nofile}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_11}->Add($self->{bitmap_art}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_11}->Add($self->{bitmap_null}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_11}->Add($self->{bitmap_null_sized}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxStaticBitmap}->SetSizer($self->{sizer_11});
-    $self->{sizer_10}->Add($self->{static_line_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_10}->Add($self->{static_line_3}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_9}->Add($self->{sizer_10}, 1, wxEXPAND, 0);
-    $self->{sizer_9}->Add($self->{static_line_4}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_9}->Add($self->{static_line_5}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxStaticLine}->SetSizer($self->{sizer_9});
-    $self->{grid_sizer_3}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_3}->Add($self->{label_4}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_3}->Add($self->{label_5}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxStaticText}->SetSizer($self->{grid_sizer_3});
-    $self->{grid_sizer_4}->Add($self->{label_3}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_4}->Add(60, 20, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_4}->Add($self->{label_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_Spacer}->SetSizer($self->{grid_sizer_4});
-    $self->{sizer_18}->Add($self->{text_ctrl}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxTextCtrl}->SetSizer($self->{sizer_18});
-    $self->{sizer_23}->Add($self->{button_2}, 1, wxALL, 5);
-    $self->{sizer_23}->Add($self->{button_4}, 1, wxALL, 5);
-    $self->{notebook_1_wxToggleButton}->SetSizer($self->{sizer_23});
-    $self->{sizer_24}->Add($self->{tree_ctrl_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_wxTreeCtrl}->SetSizer($self->{sizer_24});
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxBitmapButton}, _T("wxBitmapButton"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxButton}, _T("wxButton"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxCalendarCtrl}, _T("wxCalendarCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxGenericCalendarCtrl}, _T("wxGenericCalendarCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxCheckBox}, _T("wxCheckBox"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxCheckListBox}, _T("wxCheckListBox"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxChoice}, _T("wxChoice"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxComboBox}, _T("wxComboBox"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxDatePickerCtrl}, _T("wxDatePickerCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxGauge}, _T("wxGauge"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxGrid}, _T("wxGrid"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxHyperlinkCtrl}, _T("wxHyperlinkCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxListBox}, _T("wxListBox"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxListCtrl}, _T("wxListCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxPropertyGridManager}, _T("wxPropertyGridManager"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxRadioBox}, _T("wxRadioBox"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxRadioButton}, _T("wxRadioButton"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxSlider}, _T("wxSlider"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxSpinButton}, _T("wxSpinButton (with wxTextCtrl)"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxSpinCtrl}, _T("wxSpinCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxSplitterWindow_horizontal}, _T("wxSplitterWindow (horizontally)"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxSplitterWindow_vertical}, _T("wxSplitterWindow (vertically)"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticBitmap}, _T("wxStaticBitmap"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticLine}, _T("wxStaticLine"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxStaticText}, _T("wxStaticText"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_Spacer}, _T("Spacer"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxTextCtrl}, _T("wxTextCtrl"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxToggleButton}, _T("wxToggleButton"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_wxTreeCtrl}, _T("wxTreeCtrl"));
-    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
-    $self->{sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
-    $self->{sizer_2}->Add($self->{button_5}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_2}->Add($self->{button_1}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
-    $self->SetSizer($self->{sizer_1});
-    $self->{sizer_1}->SetSizeHints($self);
-    $self->{sizer_1}->AddGrowableRow(0);
-    $self->{sizer_1}->AddGrowableCol(0);
-    $self->Layout();
-    $self->Centre();
-    # end wxGlade
-}
-
 sub onSelectUnix {
     my ($self, $event) = @_;
     # wxGlade: All_Widgets_Frame::onSelectUnix <event_handler>
@@ -484,15 +650,6 @@
 }
 
 
-sub OnBitmapButtonPanelNavigationKey {
-    my ($self, $event) = @_;
-    # wxGlade: All_Widgets_Frame::OnBitmapButtonPanelNavigationKey <event_handler>
-    warn "Event handler (OnBitmapButtonPanelNavigationKey) not implemented";
-    $event->Skip;
-    # end wxGlade
-}
-
-
 sub OnNotebookPageChanged {
     my ($self, $event) = @_;
     # wxGlade: All_Widgets_Frame::OnNotebookPageChanged <event_handler>
@@ -509,6 +666,15 @@
     $event->Skip;
     # end wxGlade
 }
+
+
+sub OnBitmapButtonPanelNavigationKey {
+    my ($self, $event) = @_;
+    # wxGlade: All_Widgets_Frame::OnBitmapButtonPanelNavigationKey <event_handler>
+    warn "Event handler (OnBitmapButtonPanelNavigationKey) not implemented";
+    $event->Skip;
+    # end wxGlade
+}
 
 
 sub onStartConverting {
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_30_Saved.wxg wxglade-1.0.1/tests/casefiles/AllWidgets_30_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/AllWidgets_30_Saved.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_30_Saved.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -179,7 +179,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon1" base="EditBitmapButton">
                                     <style>wxBU_AUTODRAW|wxBU_EXACTFIT|wxBU_NOTEXT</style>
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <default>1</default>
                                 </object>
                             </object>
@@ -199,7 +199,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon2" base="EditBitmapButton">
                                     <style>wxBU_BOTTOM|wxBORDER_NONE</style>
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <disabled_bitmap>empty:32,32</disabled_bitmap>
                                     <default>1</default>
                                 </object>
@@ -408,7 +408,7 @@
                             <object class="sizeritem">
                                 <option>1</option>
                                 <border>5</border>
-                                <flag>wxALL|wxALIGN_CENTER</flag>
+                                <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>
                                 <object class="wxDatePickerCtrl" name="datepicker_ctrl_1" base="EditDatePickerCtrl">
                                     <style>wxDP_SHOWCENTURY</style>
                                 </object>
@@ -721,6 +721,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxSplitterWindow" name="splitter_1" base="EditSplitterWindow">
+                                    <background>#ff0000</background>
                                     <min_pane_size>20</min_pane_size>
                                     <orientation>wxSPLIT_HORIZONTAL</orientation>
                                     <window_1>splitter_1_pane_1</window_1>
@@ -825,7 +826,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxStaticBitmap" name="bitmap_file" base="EditStaticBitmap">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <attribute>1</attribute>
                                 </object>
                             </object>
@@ -929,7 +930,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxStaticText" name="label_1" base="EditStaticText">
                                     <foreground>#ff0000</foreground>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                     <label>red text (RGB)</label>
                                     <attribute>1</attribute>
                                 </object>
@@ -941,7 +942,7 @@
                                 <object class="wxStaticText" name="label_4" base="EditStaticText">
                                     <background>#ff0000</background>
                                     <tooltip>Background colour won't show, check documentation for more details</tooltip>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                     <label>black on red (RGB)</label>
                                     <attribute>1</attribute>
                                 </object>
@@ -954,7 +955,7 @@
                                     <background>#ff00ff</background>
                                     <foreground>#00ff00</foreground>
                                     <tooltip>Background colour won't show, check documentation for more details</tooltip>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                     <label>green on pink (RGB)</label>
                                     <attribute>1</attribute>
                                 </object>
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_30.wxg wxglade-1.0.1/tests/casefiles/AllWidgets_30.wxg
--- wxglade-0.9.6/tests/casefiles/AllWidgets_30.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_30.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -178,7 +178,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon1" base="EditBitmapButton">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <default>1</default>
                                 </object>
                             </object>
@@ -197,7 +197,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxBitmapButton" name="bitmap_button_icon2" base="EditBitmapButton">
                                     <style>wxBU_BOTTOM|wxNO_BORDER</style>
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <disabled_bitmap>empty:32,32</disabled_bitmap>
                                     <default>1</default>
                                 </object>
@@ -719,6 +719,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxEXPAND</flag>
                                 <object class="wxSplitterWindow" name="splitter_1" base="EditSplitterWindow">
+                                    <background>#ff0000</background>
                                     <min_pane_size>20</min_pane_size>
                                     <orientation>wxSPLIT_HORIZONTAL</orientation>
                                     <window_1>splitter_1_pane_1</window_1>
@@ -823,7 +824,7 @@
                                 <border>5</border>
                                 <flag>wxALL|wxEXPAND|wxALIGN_CENTER</flag>
                                 <object class="wxStaticBitmap" name="bitmap_file" base="EditStaticBitmap">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <attribute>1</attribute>
                                 </object>
                             </object>
diff -Nru wxglade-0.9.6/tests/casefiles/AllWidgets_30.xrc wxglade-1.0.1/tests/casefiles/AllWidgets_30.xrc
--- wxglade-0.9.6/tests/casefiles/AllWidgets_30.xrc	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/AllWidgets_30.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -108,7 +108,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <border>5</border>
                                 <object class="wxBitmapButton" name="bitmap_button_icon1">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <default>1</default>
                                 </object>
                             </object>
@@ -125,7 +125,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <border>5</border>
                                 <object class="wxBitmapButton" name="bitmap_button_icon2">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                     <default>1</default>
                                     <style>wxBORDER_NONE|wxBU_BOTTOM</style>
                                 </object>
@@ -341,7 +341,7 @@
                             <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
                                 <option>1</option>
-                                <flag>wxALIGN_CENTER|wxALL</flag>
+                                <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                                 <border>5</border>
                                 <object class="wxDatePickerCtrl" name="datepicker_ctrl_1">
                                     <style>wxDP_SHOWCENTURY</style>
@@ -673,6 +673,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <border>5</border>
                                 <object class="wxSplitterWindow" name="splitter_1">
+                                    <bg>#ff0000</bg>
                                     <min_pane_size>20</min_pane_size>
                                     <orientation>horizontal</orientation>
                                     <object class="wxPanel" name="splitter_1_pane_1">
@@ -771,7 +772,7 @@
                                 <flag>wxALL|wxEXPAND</flag>
                                 <border>5</border>
                                 <object class="wxStaticBitmap" name="bitmap_file">
-                                    <bitmap>icon.xpm</bitmap>
+                                    <bitmap>icon.png</bitmap>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -872,7 +873,7 @@
                                 <object class="wxStaticText" name="label_1">
                                     <fg>#ff0000</fg>
                                     <label>red text (RGB)</label>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -882,7 +883,7 @@
                                 <object class="wxStaticText" name="label_4">
                                     <bg>#ff0000</bg>
                                     <label>black on red (RGB)</label>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                     <tooltip>Background colour won't show, check documentation for more details</tooltip>
                                 </object>
                             </object>
@@ -894,7 +895,7 @@
                                     <bg>#ff00ff</bg>
                                     <fg>#00ff00</fg>
                                     <label>green on pink (RGB)</label>
-                                    <style>wxALIGN_CENTER</style>
+                                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                                     <tooltip>Background colour won't show, check documentation for more details</tooltip>
                                 </object>
                             </object>
diff -Nru wxglade-0.9.6/tests/casefiles/bars_wo_parent.cpp wxglade-1.0.1/tests/casefiles/bars_wo_parent.cpp
--- wxglade-0.9.6/tests/casefiles/bars_wo_parent.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bars_wo_parent.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,16 +20,6 @@
     wxMenuBar()
 {
     // begin wxGlade: MyMenuBar::MyMenuBar
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyMenuBar::set_properties()
-{
-    // begin wxGlade: MyMenuBar::set_properties
     wxMenu *wxglade_tmp_menu;
     wxglade_tmp_menu = new wxMenu();
     Append(wxglade_tmp_menu, wxT("File"));
@@ -37,65 +27,25 @@
 }
 
 
-void MyMenuBar::do_layout()
-{
-    // begin wxGlade: MyMenuBar::do_layout
-    // end wxGlade
-}
-
-
 MyToolBar::MyToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
     wxToolBar(parent, id, pos, size, style)
 {
     // begin wxGlade: MyToolBar::MyToolBar
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyToolBar::set_properties()
-{
-    // begin wxGlade: MyToolBar::set_properties
     Realize();
     // end wxGlade
 }
 
 
-void MyToolBar::do_layout()
-{
-    // begin wxGlade: MyToolBar::do_layout
-    // end wxGlade
-}
-
-
 MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: MyFrame::MyFrame
     SetSize(wxSize(200, 200));
-    label_1 = new wxStaticText(this, wxID_ANY, wxT("placeholder - every design\nneeds a toplevel window"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(wxT("frame_1"));
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    label_1 = new wxStaticText(this, wxID_ANY, wxT("placeholder - every design\nneeds a toplevel window"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
     sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 0);
+    
     SetSizer(sizer_1);
     Layout();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/bars_wo_parent.h wxglade-1.0.1/tests/casefiles/bars_wo_parent.h
--- wxglade-0.9.6/tests/casefiles/bars_wo_parent.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bars_wo_parent.h	2020-12-31 14:04:48.000000000 +0000
@@ -30,10 +30,6 @@
     MyMenuBar();
 
 private:
-    // begin wxGlade: MyMenuBar::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyMenuBar::attributes
@@ -49,10 +45,6 @@
     MyToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxTB_HORIZONTAL|wxNO_BORDER);
 
 private:
-    // begin wxGlade: MyToolBar::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyToolBar::attributes
@@ -68,10 +60,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bars_wo_parent.lisp wxglade-1.0.1/tests/casefiles/bars_wo_parent.lisp
--- wxglade-0.9.6/tests/casefiles/bars_wo_parent.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bars_wo_parent.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -43,18 +43,6 @@
         ;;; end wxGlade
         )
 
-(defmethod set-properties ((obj MyMenuBar))
-        ;;; begin wxGlade: MyMenuBar.__set_properties
-        pass
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyMenuBar))
-        ;;; begin wxGlade: MyMenuBar.__do_layout
-        pass
-        ;;; end wxGlade
-        )
-
 ;;; end of class MyMenuBar
 
 
@@ -72,29 +60,18 @@
 (defmethod init ((obj MyToolBar))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyToolBar.__init__
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyToolBar))
-        ;;; begin wxGlade: MyToolBar.__set_properties
         (wxToolBar_Realize (slot-toolbar-1 obj))
         ;;; end wxGlade
         )
 
-(defmethod do-layout ((obj MyToolBar))
-        ;;; begin wxGlade: MyToolBar.__do_layout
-        pass
-        ;;; end wxGlade
-        )
-
 ;;; end of class MyToolBar
 
 
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (label-1 :initform nil :accessor slot-label-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (label-1 :initform nil :accessor slot-label-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -107,21 +84,15 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
         (slot-top-window obj).wxWindow_SetSize((200, 200))
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "placeholder - every design\nneeds a toplevel window" -1 -1 -1 -1 wxALIGN_CENTER))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) "frame_1")
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "placeholder - every design\nneeds a toplevel window" -1 -1 -1 -1 wxALIGN_CENTER_HORIZONTAL))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/bars_wo_parent.pl wxglade-1.0.1/tests/casefiles/bars_wo_parent.pl
--- wxglade-0.9.6/tests/casefiles/bars_wo_parent.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bars_wo_parent.pl	2020-12-31 14:04:48.000000000 +0000
@@ -27,30 +27,12 @@
     my $wxglade_tmp_menu;
     $wxglade_tmp_menu = Wx::Menu->new();
     $self->Append($wxglade_tmp_menu, "File");
-
-    $self->__set_properties();
-    $self->__do_layout();
-
     # end wxGlade
     return $self;
 
 }
 
 
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyMenuBar::__set_properties
-    return;
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyMenuBar::__do_layout
-    return;
-    # end wxGlade
-}
-
 # end of class MyMenuBar
 
 1;
@@ -65,30 +47,13 @@
     my( $self,  ) = @_;
     # begin wxGlade: MyToolBar::new
     $self = $self->SUPER::new( @_[1 .. $#_] );
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->Realize();
     # end wxGlade
     return $self;
 
 }
 
 
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyToolBar::__set_properties
-    $self->Realize();
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyToolBar::__do_layout
-    return;
-    # end wxGlade
-}
-
 # end of class MyToolBar
 
 1;
@@ -111,34 +76,22 @@
     # begin wxGlade: MyFrame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(200, 200));
-    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, "placeholder - every design\nneeds a toplevel window", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle("frame_1");
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, "placeholder - every design\nneeds a toplevel window", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
     $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 0);
+    
     $self->SetSizer($self->{sizer_1});
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/bars_wo_parent.py wxglade-1.0.1/tests/casefiles/bars_wo_parent.py
--- wxglade-0.9.6/tests/casefiles/bars_wo_parent.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bars_wo_parent.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,19 +19,6 @@
         wx.MenuBar.__init__(self, *args, **kwds)
         wxglade_tmp_menu = wx.Menu()
         self.Append(wxglade_tmp_menu, "File")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyMenuBar.__set_properties
-        pass
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyMenuBar.__do_layout
-        pass
         # end wxGlade
 
 # end of class MyMenuBar
@@ -41,21 +28,9 @@
         # begin wxGlade: MyToolBar.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.ToolBar.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyToolBar.__set_properties
         self.Realize()
         # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyToolBar.__do_layout
-        pass
-        # end wxGlade
-
 # end of class MyToolBar
 
 class MyFrame(wx.Frame):
@@ -64,22 +39,15 @@
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((200, 200))
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, "placeholder - every design\nneeds a toplevel window", style=wx.ALIGN_CENTER)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle("frame_1")
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, "placeholder - every design\nneeds a toplevel window", style=wx.ALIGN_CENTER_HORIZONTAL)
         sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bars_wo_parent_Saved.wxg wxglade-1.0.1/tests/casefiles/bars_wo_parent_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/bars_wo_parent_Saved.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bars_wo_parent_Saved.wxg	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
-
-<application class="MyApp" encoding="UTF-8" for_version="2.8" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="bars_wo_parent.py" source_extension=".cpp" top_window="frame_1" use_gettext="0" use_new_namespace="1">
-    <object class="MyMenuBar" name="menubar_1" base="EditMenuBar">
-        <menus>
-            <menu label="File" name="">
-            </menu>
-        </menus>
-    </object>
-    <object class="MyToolBar" name="toolbar_1" base="EditToolBar">
-        <tools>
-        </tools>
-    </object>
-    <object class="MyFrame" name="frame_1" base="EditFrame">
-        <size>200, 200</size>
-        <title>frame_1</title>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <option>1</option>
-                <border>0</border>
-                <flag>wxALL|wxEXPAND</flag>
-                <object class="wxStaticText" name="label_1" base="EditStaticText">
-                    <style>wxALIGN_CENTER</style>
-                    <label>placeholder - every design\nneeds a toplevel window</label>
-                    <attribute>1</attribute>
-                </object>
-            </object>
-        </object>
-    </object>
-</application>
diff -Nru wxglade-0.9.6/tests/casefiles/bars_wo_parent.wxg wxglade-1.0.1/tests/casefiles/bars_wo_parent.wxg
--- wxglade-0.9.6/tests/casefiles/bars_wo_parent.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bars_wo_parent.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -20,9 +20,9 @@
             <object class="sizeritem">
                 <option>1</option>
                 <border>0</border>
-                <flag>wxALL|wxEXPAND|wxALIGN_CENTER</flag>
+                <flag>wxALL|wxEXPAND</flag>
                 <object class="wxStaticText" name="label_1" base="EditStaticText">
-                    <style>wxALIGN_CENTER</style>
+                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                     <label>placeholder - every design\nneeds a toplevel window</label>
                     <attribute>1</attribute>
                 </object>
diff -Nru wxglade-0.9.6/tests/casefiles/bars_wo_parent.xrc wxglade-1.0.1/tests/casefiles/bars_wo_parent.xrc
--- wxglade-0.9.6/tests/casefiles/bars_wo_parent.xrc	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bars_wo_parent.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -19,7 +19,7 @@
                 <flag>wxALL|wxEXPAND</flag>
                 <object class="wxStaticText" name="label_1">
                     <label>placeholder - every design\nneeds a toplevel window</label>
-                    <style>wxALIGN_CENTER</style>
+                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                 </object>
             </object>
         </object>
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc_Classic.py wxglade-1.0.1/tests/casefiles/BasesEtc_Classic.py
--- wxglade-0.9.6/tests/casefiles/BasesEtc_Classic.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,321 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import wx.html
+import mynotebook
+import mysplitter
+import mypanel
+import mytoolbar
+import mystatusbar
+import mymenubar
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_menubar = wx.MenuBar()
+        self.SetMenuBar(self.frame_menubar)
+        # Menu Bar end
+
+        self.frame_statusbar = self.CreateStatusBar(1)
+        self.frame_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        frame_statusbar_fields = ["frame_statusbar"]
+        for i in range(len(frame_statusbar_fields)):
+            self.frame_statusbar.SetStatusText(frame_statusbar_fields[i], i)
+
+        # Tool Bar
+        self.frame_toolbar = wx.ToolBar(self, -1)
+        self.SetToolBar(self.frame_toolbar)
+        self.frame_toolbar.Realize()
+        # Tool Bar end
+
+        self.panel_x = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = wx.Notebook(self.panel_x, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
+
+        sizer_1.Add((20, 20), 0, 0, 0)
+
+        self.window_1 = wx.SplitterWindow(self.panel_x, wx.ID_ANY)
+        self.window_1.SetMinimumPaneSize(20)
+        sizer_1.Add(self.window_1, 1, wx.EXPAND, 0)
+
+        self.window_1_pane_1 = wx.Panel(self.window_1, wx.ID_ANY)
+
+        self.window_1_pane_2_scrolled = wx.ScrolledWindow(self.window_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.window_1_pane_2_scrolled.SetScrollRate(10, 10)
+
+        self.html = wx.html.HtmlWindow(self.panel_x, wx.ID_ANY)
+        sizer_1.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+
+        self.window_1.SplitVertically(self.window_1_pane_1, self.window_1_pane_2_scrolled)
+
+        self.panel_x.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrame
+
+class NotebookPageWithBases(NotebookPage, notebookpage.NotebookPage):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: NotebookPageWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        NotebookPage.__init__(self, *args, **kwds)
+        notebookpage.NotebookPage.__init__(self)
+        self.Layout()
+        # end wxGlade
+
+# end of class NotebookPageWithBases
+
+class TestNotebookWithBasesInFrame(TestNotebook, testnotebook.TestNotebook):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestNotebookWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.NB_TOP
+        TestNotebook.__init__(self, *args, **kwds)
+        testnotebook.TestNotebook.__init__(self)
+
+        self.notebook_1_pane_1 = NotebookPageWithBases(self, wx.ID_ANY)
+        self.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
+        # end wxGlade
+
+# end of class TestNotebookWithBasesInFrame
+
+class SplitterWindowWithBasesInFrame(TestSplitterWindow):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: SplitterWindowWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.SP_3D
+        TestSplitterWindow.__init__(self, *args, **kwds)
+
+        self.window_1_pane_1 = wx.Panel(self, wx.ID_ANY)
+
+        self.window_1_pane_2 = wx.Panel(self, wx.ID_ANY)
+        self.SplitVertically(self.window_1_pane_1, self.window_1_pane_2)
+        # end wxGlade
+
+# end of class SplitterWindowWithBasesInFrame
+
+class TestPanelWithBasesInFrame(TestPanel, testpanel.TestPanel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestPanelWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0)
+        TestPanel.__init__(self, *args, **kwds)
+        testpanel.TestPanel.__init__(self)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = mynotebook.MyNoteBook(self, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.window_1 = mysplitter.MySplitterWindow(self, wx.ID_ANY)
+        sizer_1.Add(self.window_1, 1, wx.EXPAND, 0)
+
+        self.html = wx.html.HtmlWindow(self, wx.ID_ANY)
+        sizer_1.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class TestPanelWithBasesInFrame
+
+class MyFrameWithBases(TestFrame, testframe.TestFrame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrameWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        TestFrame.__init__(self, *args, **kwds)
+        testframe.TestFrame.__init__(self)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_copy_menubar = mymenubar.MyMenuBar()
+        self.SetMenuBar(self.frame_copy_menubar)
+        # Menu Bar end
+
+        self.frame_copy_statusbar = self.CreateStatusBar(1)
+        self.frame_copy_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        frame_copy_statusbar_fields = ["frame_copy_statusbar"]
+        for i in range(len(frame_copy_statusbar_fields)):
+            self.frame_copy_statusbar.SetStatusText(frame_copy_statusbar_fields[i], i)
+
+        # Tool Bar
+        self.frame_copy_toolbar = mytoolbar.MyToolBar(self, -1)
+        self.SetToolBar(self.frame_copy_toolbar)
+        self.frame_copy_toolbar.Realize()
+        # Tool Bar end
+
+        self.panel_1 = mypanel.MyPanel(self, wx.ID_ANY)
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrameWithBases
+
+class MyDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialog
+
+class MyPanel(wx.Panel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanel.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanel
+
+class MyMDIChildFrame(wx.MDIChildFrame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMDIChildFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.MDIChildFrame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame_1")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyMDIChildFrame
+
+class MyMenuBar(wx.MenuBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMenuBar.__init__
+        wx.MenuBar.__init__(self, *args, **kwds)
+        # end wxGlade
+
+# end of class MyMenuBar
+
+class wxToolBar(wx.ToolBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: wxToolBar.__init__
+        kwds["style"] = kwds.get("style", 0)
+        wx.ToolBar.__init__(self, *args, **kwds)
+        self.Realize()
+        # end wxGlade
+
+# end of class wxToolBar
+
+class MyDialogWithBases(MyDialogBase, mydialogbases.MyDialogBase):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialogWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        MyDialogBase.__init__(self, *args, **kwds)
+        mydialogbases.MyDialogBase.__init__(self)
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialogWithBases
+
+class MyPanelWithBases(MyPanelBase, mypanelbases.MyPanelBase):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanelWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        MyPanelBase.__init__(self, *args, **kwds)
+        mypanelbases.MyPanelBase.__init__(self)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanelWithBases
+
+class MyPanelScrolled(wx.ScrolledWindow):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanelScrolled.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.ScrolledWindow.__init__(self, *args, **kwds)
+        self.SetScrollRate(10, 10)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanelScrolled
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc.cpp wxglade-1.0.1/tests/casefiles/BasesEtc.cpp
--- wxglade-0.9.6/tests/casefiles/BasesEtc.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,254 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "BasesEtc.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: MyFrame::MyFrame
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("frame"));
+    frame_menubar = new wxMenuBar();
+    SetMenuBar(frame_menubar);
+    frame_statusbar = CreateStatusBar(1);
+    int frame_statusbar_widths[] = { -1 };
+    frame_statusbar->SetStatusWidths(1, frame_statusbar_widths);
+    
+    // statusbar fields
+    const wxString frame_statusbar_fields[] = {
+        wxT("frame_statusbar"),
+    };
+    for(int i = 0; i < frame_statusbar->GetFieldsCount(); ++i) {
+        frame_statusbar->SetStatusText(frame_statusbar_fields[i], i);
+    }
+    frame_toolbar = new wxToolBar(this, -1);
+    SetToolBar(frame_toolbar);
+    frame_toolbar->Realize();
+    panel_x = new wxPanel(this, wxID_ANY);
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    notebook_1 = new wxNotebook(panel_x, wxID_ANY);
+    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
+    notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_1, wxT("notebook_1_pane_1"));
+    sizer_1->Add(20, 20, 0, 0, 0);
+    window_1 = new wxSplitterWindow(panel_x, wxID_ANY);
+    window_1->SetMinimumPaneSize(20);
+    sizer_1->Add(window_1, 1, wxEXPAND, 0);
+    window_1_pane_1 = new wxPanel(window_1, wxID_ANY);
+    window_1_pane_2_scrolled = new wxScrolledWindow(window_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    window_1_pane_2_scrolled->SetScrollRate(10, 10);
+    html = new wx.html.HtmlWindow(panel_x, wxID_ANY);
+    sizer_1->Add(html, 1, wxALL|wxEXPAND, 3);
+    
+    window_1->SplitVertically(window_1_pane_1, window_1_pane_2_scrolled);
+    panel_x->SetSizer(sizer_1);
+    Layout();
+    // end wxGlade
+}
+
+
+NotebookPageWithBases::NotebookPageWithBases(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    NotebookPage(parent, id, pos, size, wxTAB_TRAVERSAL), notebookpage.NotebookPage()
+{
+    // begin wxGlade: NotebookPageWithBases::NotebookPageWithBases
+    // end wxGlade
+}
+
+
+TestNotebookWithBasesInFrame::TestNotebookWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    TestNotebook(parent, id, pos, size, style), testnotebook.TestNotebook()
+{
+    // begin wxGlade: TestNotebookWithBasesInFrame::TestNotebookWithBasesInFrame
+    notebook_1_pane_1 = new NotebookPageWithBases(this, wxID_ANY);
+    AddPage(notebook_1_pane_1, wxT("notebook_1_pane_1"));
+    // end wxGlade
+}
+
+
+SplitterWindowWithBasesInFrame::SplitterWindowWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    TestSplitterWindow(parent, id, pos, size, style)
+{
+    // begin wxGlade: SplitterWindowWithBasesInFrame::SplitterWindowWithBasesInFrame
+    window_1_pane_1 = new wxPanel(this, wxID_ANY);
+    window_1_pane_2 = new wxPanel(this, wxID_ANY);
+    SplitVertically(window_1_pane_1, window_1_pane_2);
+    // end wxGlade
+}
+
+
+TestPanelWithBasesInFrame::TestPanelWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    TestPanel(parent, id, pos, size, style), testpanel.TestPanel()
+{
+    // begin wxGlade: TestPanelWithBasesInFrame::TestPanelWithBasesInFrame
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    notebook_1 = new mynotebook.MyNoteBook(this, wxID_ANY);
+    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
+    window_1 = new mysplitter.MySplitterWindow(this, wxID_ANY);
+    sizer_1->Add(window_1, 1, wxEXPAND, 0);
+    html = new wx.html.HtmlWindow(this, wxID_ANY);
+    sizer_1->Add(html, 1, wxALL|wxEXPAND, 3);
+    
+    SetSizer(sizer_1);
+    // end wxGlade
+}
+
+
+MyFrameWithBases::MyFrameWithBases(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    TestFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE), testframe.TestFrame()
+{
+    // begin wxGlade: MyFrameWithBases::MyFrameWithBases
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("frame"));
+    frame_copy_menubar = new mymenubar.MyMenuBar();
+    SetMenuBar(frame_copy_menubar);
+    frame_copy_statusbar = CreateStatusBar(1);
+    int frame_copy_statusbar_widths[] = { -1 };
+    frame_copy_statusbar->SetStatusWidths(1, frame_copy_statusbar_widths);
+    
+    // statusbar fields
+    const wxString frame_copy_statusbar_fields[] = {
+        wxT("frame_copy_statusbar"),
+    };
+    for(int i = 0; i < frame_copy_statusbar->GetFieldsCount(); ++i) {
+        frame_copy_statusbar->SetStatusText(frame_copy_statusbar_fields[i], i);
+    }
+    frame_copy_toolbar = new mytoolbar.MyToolBar(this, -1);
+    SetToolBar(frame_copy_toolbar);
+    frame_copy_toolbar->Realize();
+    panel_1 = new TestPanelWithBasesInFrame(this, wxID_ANY);
+    Layout();
+    // end wxGlade
+}
+
+
+MyDialog::MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
+{
+    // begin wxGlade: MyDialog::MyDialog
+    SetTitle(wxT("dialog"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    sizer_1->Fit(this);
+    Layout();
+    // end wxGlade
+}
+
+
+MyPanel::MyPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL)
+{
+    // begin wxGlade: MyPanel::MyPanel
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    sizer_1->Fit(this);
+    // end wxGlade
+}
+
+
+MyMDIChildFrame::MyMDIChildFrame(wxMDIParentFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxMDIChildFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: MyMDIChildFrame::MyMDIChildFrame
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("frame_1"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    Layout();
+    // end wxGlade
+}
+
+
+MyMenuBar::MyMenuBar():
+    wxMenuBar()
+{
+    // begin wxGlade: MyMenuBar::MyMenuBar
+    // end wxGlade
+}
+
+
+wxToolBar::wxToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxToolBar(parent, id, pos, size, style)
+{
+    // begin wxGlade: wxToolBar::wxToolBar
+    Realize();
+    // end wxGlade
+}
+
+
+MyDialogWithBases::MyDialogWithBases(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    MyDialogBase(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE), mydialogbases.MyDialogBase()
+{
+    // begin wxGlade: MyDialogWithBases::MyDialogWithBases
+    SetTitle(wxT("dialog"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    sizer_1->Fit(this);
+    Layout();
+    // end wxGlade
+}
+
+
+MyPanelWithBases::MyPanelWithBases(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    MyPanelBase(parent, id, pos, size, wxTAB_TRAVERSAL), mypanelbases.MyPanelBase()
+{
+    // begin wxGlade: MyPanelWithBases::MyPanelWithBases
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    sizer_1->Fit(this);
+    // end wxGlade
+}
+
+
+MyPanelScrolled::MyPanelScrolled(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxScrolledWindow(parent, id, pos, size, wxTAB_TRAVERSAL)
+{
+    // begin wxGlade: MyPanelScrolled::MyPanelScrolled
+    SetScrollRate(10, 10);
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    sizer_1->Fit(this);
+    // end wxGlade
+}
+
+
+class MyApp: public wxApp {
+public:
+    bool OnInit();
+};
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    wxInitAllImageHandlers();
+    MyFrame* frame = new MyFrame(NULL, wxID_ANY, wxEmptyString);
+    SetTopWindow(frame);
+    frame->Show();
+    return true;
+}
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc.h wxglade-1.0.1/tests/casefiles/BasesEtc.h
--- wxglade-0.9.6/tests/casefiles/BasesEtc.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,268 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef BASESETC_H
+#define BASESETC_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+// begin wxGlade: ::dependencies
+#include <wx/notebook.h>
+#include <wx/splitter.h>
+// end wxGlade
+
+// begin wxGlade: ::extracode
+import wx.html
+import mynotebook
+import mysplitter
+import mypanel
+import wx.html
+import mysplitter
+import mynotebook
+import mypanel
+import mytoolbar
+import mystatusbar
+import mymenubar
+// end wxGlade
+
+
+class MyFrame: public wxFrame {
+public:
+    // begin wxGlade: MyFrame::ids
+    // end wxGlade
+
+    MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrame::attributes
+    wxMenuBar* frame_menubar;
+    wxStatusBar* frame_statusbar;
+    wxToolBar* frame_toolbar;
+    wxPanel* panel_x;
+    wxNotebook* notebook_1;
+    wxPanel* notebook_1_pane_1;
+    wxSplitterWindow* window_1;
+    wxPanel* window_1_pane_1;
+    wxScrolledWindow* window_1_pane_2_scrolled;
+    wx.html.HtmlWindow* html;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class NotebookPageWithBases: public NotebookPage, public notebookpage.NotebookPage {
+public:
+    // begin wxGlade: NotebookPageWithBases::ids
+    // end wxGlade
+
+    NotebookPageWithBases(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: NotebookPageWithBases::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class TestNotebookWithBasesInFrame: public TestNotebook, public testnotebook.TestNotebook {
+public:
+    // begin wxGlade: TestNotebookWithBasesInFrame::ids
+    // end wxGlade
+
+    TestNotebookWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: TestNotebookWithBasesInFrame::attributes
+    NotebookPageWithBases* notebook_1_pane_1;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class SplitterWindowWithBasesInFrame: public TestSplitterWindow {
+public:
+    // begin wxGlade: SplitterWindowWithBasesInFrame::ids
+    // end wxGlade
+
+    SplitterWindowWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxSP_3D);
+
+private:
+
+protected:
+    // begin wxGlade: SplitterWindowWithBasesInFrame::attributes
+    wxPanel* window_1_pane_1;
+    wxPanel* window_1_pane_2;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class TestPanelWithBasesInFrame: public TestPanel, public testpanel.TestPanel {
+public:
+    // begin wxGlade: TestPanelWithBasesInFrame::ids
+    // end wxGlade
+
+    TestPanelWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: TestPanelWithBasesInFrame::attributes
+    mynotebook.MyNoteBook* notebook_1;
+    mysplitter.MySplitterWindow* window_1;
+    wx.html.HtmlWindow* html;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyFrameWithBases: public TestFrame, public testframe.TestFrame {
+public:
+    // begin wxGlade: MyFrameWithBases::ids
+    // end wxGlade
+
+    MyFrameWithBases(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrameWithBases::attributes
+    mymenubar.MyMenuBar* frame_copy_menubar;
+    mystatusbar.MyStatusBar* frame_copy_statusbar;
+    mytoolbar.MyToolBar* frame_copy_toolbar;
+    mypanel.MyPanel* panel_1;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyDialog: public wxDialog {
+public:
+    // begin wxGlade: MyDialog::ids
+    // end wxGlade
+
+    MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyDialog::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyPanel: public wxPanel {
+public:
+    // begin wxGlade: MyPanel::ids
+    // end wxGlade
+
+    MyPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: MyPanel::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyMDIChildFrame: public wxMDIChildFrame {
+public:
+    // begin wxGlade: MyMDIChildFrame::ids
+    // end wxGlade
+
+    MyMDIChildFrame(wxMDIParentFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyMDIChildFrame::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyMenuBar: public wxMenuBar {
+public:
+    // begin wxGlade: MyMenuBar::ids
+    // end wxGlade
+
+    MyMenuBar();
+
+private:
+
+protected:
+    // begin wxGlade: MyMenuBar::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class wxToolBar: public wxToolBar {
+public:
+    // begin wxGlade: wxToolBar::ids
+    // end wxGlade
+
+    wxToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxTB_HORIZONTAL|wxNO_BORDER);
+
+private:
+
+protected:
+    // begin wxGlade: wxToolBar::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyDialogWithBases: public MyDialogBase, public mydialogbases.MyDialogBase {
+public:
+    // begin wxGlade: MyDialogWithBases::ids
+    // end wxGlade
+
+    MyDialogWithBases(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyDialogWithBases::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyPanelWithBases: public MyPanelBase, public mypanelbases.MyPanelBase {
+public:
+    // begin wxGlade: MyPanelWithBases::ids
+    // end wxGlade
+
+    MyPanelWithBases(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: MyPanelWithBases::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyPanelScrolled: public wxScrolledWindow {
+public:
+    // begin wxGlade: MyPanelScrolled::ids
+    // end wxGlade
+
+    MyPanelScrolled(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: MyPanelScrolled::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+#endif // BASESETC_H
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc.lisp wxglade-1.0.1/tests/casefiles/BasesEtc.lisp
--- wxglade-0.9.6/tests/casefiles/BasesEtc.lisp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,808 @@
+#!/usr/bin/env lisp
+;;;
+;;; generated by wxGlade
+;;;
+
+(asdf:operate 'asdf:load-op 'wxcl)
+(use-package "FFI")
+(ffi:default-foreign-language :stdc)
+
+
+;;; begin wxGlade: dependencies
+(use-package :NotebookPageWithBases)
+(use-package :mymenubar.MyMenuBar)
+(use-package :mynotebook.MyNoteBook)
+(use-package :mypanel.MyPanel)
+(use-package :mysplitter.MySplitterWindow)
+(use-package :mystatusbar.MyStatusBar)
+(use-package :mytoolbar.MyToolBar)
+(use-package :wx.html.HtmlWindow)
+(use-package :wxButton)
+(use-package :wxCL)
+(use-package :wxColour)
+(use-package :wxEvent)
+(use-package :wxEvtHandler)
+(use-package :wxFrame)
+(use-package :wxMenu)
+(use-package :wxMenuBar)
+(use-package :wxNotebook)
+(use-package :wxPanel)
+(use-package :wxScrolledWindow)
+(use-package :wxSizer)
+(use-package :wxSplitterWindow)
+(use-package :wxStatusBar)
+(use-package :wxToolBar)
+(use-package :wxWindow)
+(use-package :wx_main)
+(use-package :wx_wrapper)
+;;; end wxGlade
+
+;;; begin wxGlade: extracode
+import wx.html
+import mynotebook
+import mysplitter
+import mypanel
+import mytoolbar
+import mystatusbar
+import mymenubar
+;;; end wxGlade
+
+
+(defclass MyFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)))
+
+(defun make-MyFrame ()
+        (let ((obj (make-instance 'MyFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyFrame.__init__
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxFrame_SetTitle (slot-top-window obj) "frame")
+        
+        ;;; Menu Bar
+        (setf (slot-frame-menubar obj) (wxMenuBar_Create 0))
+        (wxFrame_SetMenuBar (slot-top-window obj) (slot-frame-menubar obj))
+        ;;; Menu Bar end
+        
+        (setf (slot-frame-statusbar obj) (wxFrame_CreateStatusBar (slot-top-window obj) 1 0))
+        (wxStatusBar_SetStatusWidths (slot-frame-statusbar obj) 1 (vector -1))
+        (wxStatusBar_SetStatusText (slot-frame-statusbar obj) "frame_statusbar" 0)
+        
+        ;;; Tool Bar
+        (setf (slot-frame-toolbar obj) (wxToolBar_Create (slot-top-window obj) -1 -1 -1 -1 -1 wxTB_HORIZONTAL))
+        (wxFrame_SetToolBar (slot-top-window obj) (slot-frame-toolbar obj))
+        (wxToolBar_Realize (slot-frame-toolbar obj))
+        ;;; Tool Bar end
+        
+        (setf (slot-panel-x obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-panel-x obj) wxID_ANY -1 -1 -1 -1 wxNB_TOP))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-notebook-1-pane-1 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-1 obj) "notebook_1_pane_1" 1 -1)
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((20, 20) obj) 0 0 0 nil)
+        
+        (setf (slot-window-1 obj) (wxSplitterWindow_Create (slot-panel-x obj) wxID_ANY -1 -1 -1 -1 wxSP_3D))
+        wxSplitterWindow_SetMinimumPaneSize (slot-window-1 obj) 20)
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-window-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-window-1-pane-1 obj) (wxPanel_Create (slot-window-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        
+        (setf (slot-window-1-pane-2-scrolled obj) (wxPanel_Create (slot-window-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-window-1-pane-2-scrolled obj) 10  10)
+        
+        (setf html (wx.html.HtmlWindow_Create (object-panel-x self) wxID_ANY))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-html obj) 1 (logior wxALL wxEXPAND) 3 nil)
+        
+        (SplitVertically window-1 window_1_pane_1 window_1_pane_2_scrolled )
+        
+        (wxWindow_SetSizer (slot-panel-x obj) (slot-sizer-1 obj))
+        
+        (wxFrame_layout (slot-frame self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyFrame
+
+
+
+(defclass NotebookPageWithBases()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)))
+
+(defun make-NotebookPageWithBases ()
+        (let ((obj (make-instance 'NotebookPageWithBases)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj NotebookPageWithBases))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: NotebookPageWithBases.__init__
+        (wxPanel_layout (slot-notebook-1-pane-1 self))
+        ;;; end wxGlade
+        )
+
+;;; end of class NotebookPageWithBases
+
+
+
+(defclass TestNotebookWithBasesInFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)))
+
+(defun make-TestNotebookWithBasesInFrame ()
+        (let ((obj (make-instance 'TestNotebookWithBasesInFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj TestNotebookWithBasesInFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: TestNotebookWithBasesInFrame.__init__
+        
+        (setf (slot-notebook_1_pane_1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1))
+        (wxNotebook_AddPage (slot-notebook_1_pane_1 obj) page "notebook_1_pane_1" 1 -1);
+        ;;; end wxGlade
+        )
+
+;;; end of class TestNotebookWithBasesInFrame
+
+
+
+(defclass SplitterWindowWithBasesInFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)))
+
+(defun make-SplitterWindowWithBasesInFrame ()
+        (let ((obj (make-instance 'SplitterWindowWithBasesInFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj SplitterWindowWithBasesInFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: SplitterWindowWithBasesInFrame.__init__
+        
+        (setf (slot-window-1-pane-1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        
+        (setf (slot-window-1-pane-2 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        $self->SplitVertically($self->{window_1_pane_1}, $self->{window_1_pane_2}, );
+        ;;; end wxGlade
+        )
+
+;;; end of class SplitterWindowWithBasesInFrame
+
+
+
+(defclass TestPanelWithBasesInFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)))
+
+(defun make-TestPanelWithBasesInFrame ()
+        (let ((obj (make-instance 'TestPanelWithBasesInFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj TestPanelWithBasesInFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: TestPanelWithBasesInFrame.__init__
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxNB_TOP))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-window-1 obj) (wxSplitterWindow_Create (slot-top-window obj) wxID_ANY))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-window-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf html (wx.html.HtmlWindow_Create nil wxID_ANY))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-html obj) 1 (logior wxALL wxEXPAND) 3 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxPanel_layout (slot-panel-1 self))
+        ;;; end wxGlade
+        )
+
+;;; end of class TestPanelWithBasesInFrame
+
+
+
+(defclass MyFrameWithBases()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)))
+
+(defun make-MyFrameWithBases ()
+        (let ((obj (make-instance 'MyFrameWithBases)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrameWithBases))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyFrameWithBases.__init__
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxFrame_SetTitle (slot-top-window obj) "frame")
+        
+        ;;; Menu Bar
+        (setf (slot-frame-copy-menubar obj) (wxMenuBar_Create 0))
+        (wxFrame_SetMenuBar (slot-top-window obj) (slot-frame-copy-menubar obj))
+        ;;; Menu Bar end
+        
+        (setf (slot-frame-copy-statusbar obj) (wxFrame_CreateStatusBar (slot-top-window obj) 1 0))
+        (wxStatusBar_SetStatusWidths (slot-frame-copy-statusbar obj) 1 (vector -1))
+        (wxStatusBar_SetStatusText (slot-frame-copy-statusbar obj) "frame_copy_statusbar" 0)
+        
+        ;;; Tool Bar
+        (setf (slot-frame-copy-toolbar obj) (wxToolBar_Create (slot-top-window obj) -1 -1 -1 -1 -1 wxTB_HORIZONTAL))
+        (wxFrame_SetToolBar (slot-top-window obj) (slot-frame-copy-toolbar obj))
+        (wxToolBar_Realize (slot-frame-copy-toolbar obj))
+        ;;; Tool Bar end
+        
+        (setf (slot-panel_1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1))
+        (wxFrame_layout (slot-frame-copy self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyFrameWithBases
+
+
+
+(defclass MyDialog()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyDialog ()
+        (let ((obj (make-instance 'MyDialog)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyDialog))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyDialog.__init__
+        (setf (slot-top-window obj) (wxDialog_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_DIALOG_STYLE))
+        (wxWindow_SetTitle (slot-dialog self) "dialog")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
+        (wxWindow_layout (slot-dialog self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyDialog
+
+
+
+(defclass MyPanel()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyPanel ()
+        (let ((obj (make-instance 'MyPanel)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyPanel))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyPanel.__init__
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
+        (wxPanel_layout (slot-panel self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyPanel
+
+
+
+(defclass MyMDIChildFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyMDIChildFrame ()
+        (let ((obj (make-instance 'MyMDIChildFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyMDIChildFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyMDIChildFrame.__init__
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxFrame_SetTitle (slot-top-window obj) "frame_1")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxFrame_layout (slot-frame-1 self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyMDIChildFrame
+
+
+
+(defclass MyMenuBar()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyMenuBar ()
+        (let ((obj (make-instance 'MyMenuBar)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyMenuBar))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyMenuBar.__init__
+        ;;; end wxGlade
+        )
+
+;;; end of class MyMenuBar
+
+
+
+(defclass wxToolBar()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-wxToolBar ()
+        (let ((obj (make-instance 'wxToolBar)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj wxToolBar))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: wxToolBar.__init__
+        (wxToolBar_Realize (slot-toolbar obj))
+        ;;; end wxGlade
+        )
+
+;;; end of class wxToolBar
+
+
+
+(defclass MyDialogWithBases()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyDialogWithBases ()
+        (let ((obj (make-instance 'MyDialogWithBases)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyDialogWithBases))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyDialogWithBases.__init__
+        (setf (slot-top-window obj) (wxDialog_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_DIALOG_STYLE))
+        (wxWindow_SetTitle (slot-dialog-copy self) "dialog")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
+        (wxWindow_layout (slot-dialog-copy self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyDialogWithBases
+
+
+
+(defclass MyPanelWithBases()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyPanelWithBases ()
+        (let ((obj (make-instance 'MyPanelWithBases)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyPanelWithBases))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyPanelWithBases.__init__
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
+        (wxPanel_layout (slot-panel-copy self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyPanelWithBases
+
+
+
+(defclass MyPanelScrolled()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyPanelScrolled ()
+        (let ((obj (make-instance 'MyPanelScrolled)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyPanelScrolled))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyPanelScrolled.__init__
+        (wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-10  10 obj))
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
+        (wxPanel_layout (slot-panel-copy-scrolled self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyPanelScrolled
+
+
+(defun init-func (fun data evt)
+        (let ((frame (make-MyFrame)))
+        (ELJApp_SetTopWindow (slot-top-window frame))
+        (wxWindow_Show (slot-top-window frame))))
+;;; end of class MyApp
+
+
+(unwind-protect
+    (Eljapp_initializeC (wxclosure_Create #'init-func nil) 0 nil)
+    (ffi:close-foreign-library "../miscellaneous/wxc-msw2.6.2.dll"))
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc_Phoenix.py wxglade-1.0.1/tests/casefiles/BasesEtc_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/BasesEtc_Phoenix.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,321 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import wx.html
+import mynotebook
+import mysplitter
+import mypanel
+import mytoolbar
+import mystatusbar
+import mymenubar
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_menubar = wx.MenuBar()
+        self.SetMenuBar(self.frame_menubar)
+        # Menu Bar end
+
+        self.frame_statusbar = self.CreateStatusBar(1)
+        self.frame_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        frame_statusbar_fields = ["frame_statusbar"]
+        for i in range(len(frame_statusbar_fields)):
+            self.frame_statusbar.SetStatusText(frame_statusbar_fields[i], i)
+
+        # Tool Bar
+        self.frame_toolbar = wx.ToolBar(self, -1)
+        self.SetToolBar(self.frame_toolbar)
+        self.frame_toolbar.Realize()
+        # Tool Bar end
+
+        self.panel_x = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = wx.Notebook(self.panel_x, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
+
+        sizer_1.Add((20, 20), 0, 0, 0)
+
+        self.window_1 = wx.SplitterWindow(self.panel_x, wx.ID_ANY)
+        self.window_1.SetMinimumPaneSize(20)
+        sizer_1.Add(self.window_1, 1, wx.EXPAND, 0)
+
+        self.window_1_pane_1 = wx.Panel(self.window_1, wx.ID_ANY)
+
+        self.window_1_pane_2_scrolled = wx.ScrolledWindow(self.window_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.window_1_pane_2_scrolled.SetScrollRate(10, 10)
+
+        self.html = wx.html.HtmlWindow(self.panel_x, wx.ID_ANY)
+        sizer_1.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+
+        self.window_1.SplitVertically(self.window_1_pane_1, self.window_1_pane_2_scrolled)
+
+        self.panel_x.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrame
+
+class NotebookPageWithBases(NotebookPage, notebookpage.NotebookPage):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: NotebookPageWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        NotebookPage.__init__(self, *args, **kwds)
+        notebookpage.NotebookPage.__init__(self)
+        self.Layout()
+        # end wxGlade
+
+# end of class NotebookPageWithBases
+
+class TestNotebookWithBasesInFrame(TestNotebook, testnotebook.TestNotebook):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestNotebookWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.NB_TOP
+        TestNotebook.__init__(self, *args, **kwds)
+        testnotebook.TestNotebook.__init__(self)
+
+        self.notebook_1_pane_1 = NotebookPageWithBases(self, wx.ID_ANY)
+        self.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
+        # end wxGlade
+
+# end of class TestNotebookWithBasesInFrame
+
+class SplitterWindowWithBasesInFrame(TestSplitterWindow):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: SplitterWindowWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.SP_3D
+        TestSplitterWindow.__init__(self, *args, **kwds)
+
+        self.window_1_pane_1 = wx.Panel(self, wx.ID_ANY)
+
+        self.window_1_pane_2 = wx.Panel(self, wx.ID_ANY)
+        self.SplitVertically(self.window_1_pane_1, self.window_1_pane_2)
+        # end wxGlade
+
+# end of class SplitterWindowWithBasesInFrame
+
+class TestPanelWithBasesInFrame(TestPanel, testpanel.TestPanel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestPanelWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0)
+        TestPanel.__init__(self, *args, **kwds)
+        testpanel.TestPanel.__init__(self)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = mynotebook.MyNoteBook(self, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.window_1 = mysplitter.MySplitterWindow(self, wx.ID_ANY)
+        sizer_1.Add(self.window_1, 1, wx.EXPAND, 0)
+
+        self.html = wx.html.HtmlWindow(self, wx.ID_ANY)
+        sizer_1.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class TestPanelWithBasesInFrame
+
+class MyFrameWithBases(TestFrame, testframe.TestFrame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrameWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        TestFrame.__init__(self, *args, **kwds)
+        testframe.TestFrame.__init__(self)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_copy_menubar = mymenubar.MyMenuBar()
+        self.SetMenuBar(self.frame_copy_menubar)
+        # Menu Bar end
+
+        self.frame_copy_statusbar = self.CreateStatusBar(1)
+        self.frame_copy_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        frame_copy_statusbar_fields = ["frame_copy_statusbar"]
+        for i in range(len(frame_copy_statusbar_fields)):
+            self.frame_copy_statusbar.SetStatusText(frame_copy_statusbar_fields[i], i)
+
+        # Tool Bar
+        self.frame_copy_toolbar = mytoolbar.MyToolBar(self, -1)
+        self.SetToolBar(self.frame_copy_toolbar)
+        self.frame_copy_toolbar.Realize()
+        # Tool Bar end
+
+        self.panel_1 = mypanel.MyPanel(self, wx.ID_ANY)
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrameWithBases
+
+class MyDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialog
+
+class MyPanel(wx.Panel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanel.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanel
+
+class MyMDIChildFrame(wx.MDIChildFrame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMDIChildFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.MDIChildFrame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame_1")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyMDIChildFrame
+
+class MyMenuBar(wx.MenuBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMenuBar.__init__
+        wx.MenuBar.__init__(self, *args, **kwds)
+        # end wxGlade
+
+# end of class MyMenuBar
+
+class wxToolBar(wx.ToolBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: wxToolBar.__init__
+        kwds["style"] = kwds.get("style", 0)
+        wx.ToolBar.__init__(self, *args, **kwds)
+        self.Realize()
+        # end wxGlade
+
+# end of class wxToolBar
+
+class MyDialogWithBases(MyDialogBase, mydialogbases.MyDialogBase):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialogWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        MyDialogBase.__init__(self, *args, **kwds)
+        mydialogbases.MyDialogBase.__init__(self)
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialogWithBases
+
+class MyPanelWithBases(MyPanelBase, mypanelbases.MyPanelBase):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanelWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        MyPanelBase.__init__(self, *args, **kwds)
+        mypanelbases.MyPanelBase.__init__(self)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanelWithBases
+
+class MyPanelScrolled(wx.ScrolledWindow):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanelScrolled.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.ScrolledWindow.__init__(self, *args, **kwds)
+        self.SetScrollRate(10, 10)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanelScrolled
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc.pl wxglade-1.0.1/tests/casefiles/BasesEtc.pl
--- wxglade-0.9.6/tests/casefiles/BasesEtc.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,615 @@
+#!/usr/bin/perl -w -- 
+#
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import wx.html
+import mynotebook
+import mysplitter
+import mypanel
+import mytoolbar
+import mystatusbar
+import mymenubar
+# end wxGlade
+
+package MyFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyFrame::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("frame");
+    
+    
+
+    # Menu Bar
+
+    $self->{frame_menubar} = Wx::MenuBar->new();
+    my $wxglade_tmp_menu;
+    $self->SetMenuBar($self->{frame_menubar});
+    
+    # Menu Bar end
+
+    
+    $self->{frame_statusbar} = $self->CreateStatusBar(1);
+    $self->{frame_statusbar}->SetStatusWidths(-1);
+    
+    # statusbar fields
+    my( @frame_statusbar_fields ) = (
+        "frame_statusbar",
+    );
+    
+    if( @frame_statusbar_fields ) {
+        $self->{frame_statusbar}->SetStatusText($frame_statusbar_fields[$_], $_)
+        for 0 .. $#frame_statusbar_fields ;
+    }
+    
+    
+    # Tool Bar
+    $self->{frame_toolbar} = Wx::ToolBar->new($self, -1);
+    $self->SetToolBar($self->{frame_toolbar});
+    $self->{frame_toolbar}->Realize();
+    # Tool Bar end
+    
+    $self->{panel_x} = Wx::Panel->new($self, wxID_ANY);
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{notebook_1} = Wx::Notebook->new($self->{panel_x}, wxID_ANY);
+    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
+    $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, "notebook_1_pane_1");
+    
+    $self->{sizer_1}->Add(20, 20, 0, 0, 0);
+    
+    $self->{window_1} = Wx::SplitterWindow->new($self->{panel_x}, wxID_ANY);
+    $self->{window_1}->SetMinimumPaneSize(20);
+    $self->{sizer_1}->Add($self->{window_1}, 1, wxEXPAND, 0);
+    
+    $self->{window_1_pane_1} = Wx::Panel->new($self->{window_1}, wxID_ANY);
+    
+    $self->{window_1_pane_2_scrolled} = Wx::ScrolledWindow->new($self->{window_1}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    $self->{window_1_pane_2_scrolled}->SetScrollRate(10, 10);
+    
+    $self->{html} = wx.html.HtmlWindow->new($self->{panel_x}, wxID_ANY);
+    $self->{sizer_1}->Add($self->{html}, 1, wxALL|wxEXPAND, 3);
+    
+    $self->{window_1}->SplitVertically($self->{window_1_pane_1}, $self->{window_1_pane_2_scrolled}, );
+    
+    $self->{panel_x}->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyFrame
+
+1;
+
+package NotebookPageWithBases;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: NotebookPageWithBases::new
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class NotebookPageWithBases
+
+1;
+
+package TestNotebookWithBasesInFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Notebook);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: TestNotebookWithBasesInFrame::new
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
+    $self->{notebook_1_pane_1} = NotebookPageWithBases->new($self, wxID_ANY);
+    $self->AddPage($self->{notebook_1_pane_1}, "notebook_1_pane_1");
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class TestNotebookWithBasesInFrame
+
+1;
+
+package SplitterWindowWithBasesInFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::SplitterWindow);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: SplitterWindowWithBasesInFrame::new
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
+    $self->{window_1_pane_1} = Wx::Panel->new($self, wxID_ANY);
+    
+    $self->{window_1_pane_2} = Wx::Panel->new($self, wxID_ANY);
+    $self->SplitVertically($self->{window_1_pane_1}, $self->{window_1_pane_2}, );
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class SplitterWindowWithBasesInFrame
+
+1;
+
+package TestPanelWithBasesInFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: TestPanelWithBasesInFrame::new
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{notebook_1} = mynotebook.MyNoteBook->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
+    $self->{window_1} = mysplitter.MySplitterWindow->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{window_1}, 1, wxEXPAND, 0);
+    
+    $self->{html} = wx.html.HtmlWindow->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{html}, 1, wxALL|wxEXPAND, 3);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class TestPanelWithBasesInFrame
+
+1;
+
+package MyFrameWithBases;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyFrameWithBases::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("frame");
+    
+    
+
+    # Menu Bar
+
+    $self->{frame_copy_menubar} = mymenubar.MyMenuBar->new();
+    my $wxglade_tmp_menu;
+    $self->SetMenuBar($self->{frame_copy_menubar});
+    
+    # Menu Bar end
+
+    
+    $self->{frame_copy_statusbar} = $self->CreateStatusBar(1);
+    $self->{frame_copy_statusbar}->SetStatusWidths(-1);
+    
+    # statusbar fields
+    my( @frame_copy_statusbar_fields ) = (
+        "frame_copy_statusbar",
+    );
+    
+    if( @frame_copy_statusbar_fields ) {
+        $self->{frame_copy_statusbar}->SetStatusText($frame_copy_statusbar_fields[$_], $_)
+        for 0 .. $#frame_copy_statusbar_fields ;
+    }
+    
+    
+    # Tool Bar
+    $self->{frame_copy_toolbar} = mytoolbar.MyToolBar->new($self, -1);
+    $self->SetToolBar($self->{frame_copy_toolbar});
+    $self->{frame_copy_toolbar}->Realize();
+    # Tool Bar end
+    
+    $self->{panel_1} = mypanel.MyPanel->new($self, wxID_ANY);
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyFrameWithBases
+
+1;
+
+package MyDialog;
+
+use Wx qw[:everything];
+use base qw(Wx::Dialog);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyDialog::new
+    $style = wxDEFAULT_DIALOG_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetTitle("dialog");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->Fit($self);
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyDialog
+
+1;
+
+package MyPanel;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyPanel::new
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->Fit($self);
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyPanel
+
+1;
+
+package MyMDIChildFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::MDIChildFrame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyMDIChildFrame::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("frame_1");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyMDIChildFrame
+
+1;
+
+package MyMenuBar;
+
+use Wx qw[:everything];
+use base qw(Wx::MenuBar);
+use strict;
+
+sub new {
+    my( $self,  ) = @_;
+    # begin wxGlade: MyMenuBar::new
+    $self = $self->SUPER::new( @_[1 .. $#_] );
+    my $wxglade_tmp_menu;
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyMenuBar
+
+1;
+
+package wxToolBar;
+
+use Wx qw[:everything];
+use base qw(Wx::ToolBar);
+use strict;
+
+sub new {
+    my( $self,  ) = @_;
+    # begin wxGlade: wxToolBar::new
+    $self = $self->SUPER::new( @_[1 .. $#_] );
+    $self->Realize();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class wxToolBar
+
+1;
+
+package MyDialogWithBases;
+
+use Wx qw[:everything];
+use base qw(Wx::Dialog);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyDialogWithBases::new
+    $style = wxDEFAULT_DIALOG_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetTitle("dialog");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->Fit($self);
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyDialogWithBases
+
+1;
+
+package MyPanelWithBases;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyPanelWithBases::new
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->Fit($self);
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyPanelWithBases
+
+1;
+
+package MyPanelScrolled;
+
+use Wx qw[:everything];
+use base qw(Wx::ScrolledWindow);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyPanelScrolled::new
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    $self->SetScrollRate(10, 10);
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->Fit($self);
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyPanelScrolled
+
+1;
+
+package MyApp;
+
+use base qw(Wx::App);
+use strict;
+
+sub OnInit {
+    my( $self ) = shift;
+
+    Wx::InitAllImageHandlers();
+
+    my $frame = MyFrame->new();
+
+    $self->SetTopWindow($frame);
+    $frame->Show(1);
+
+    return 1;
+}
+# end of class MyApp
+
+package main;
+
+unless(caller){
+    my $app = MyApp->new();
+    $app->MainLoop();
+}
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc.py wxglade-1.0.1/tests/casefiles/BasesEtc.py
--- wxglade-0.9.6/tests/casefiles/BasesEtc.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,321 @@
+#!/usr/bin/env python3
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 0.9.9pre on Fri Aug 21 15:04:27 2020
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import wx.html
+import mynotebook
+import mysplitter
+import mypanel
+import mytoolbar
+import mystatusbar
+import mymenubar
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_menubar = wx.MenuBar()
+        self.SetMenuBar(self.frame_menubar)
+        # Menu Bar end
+
+        self.frame_statusbar = self.CreateStatusBar(1)
+        self.frame_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        frame_statusbar_fields = ["frame_statusbar"]
+        for i in range(len(frame_statusbar_fields)):
+            self.frame_statusbar.SetStatusText(frame_statusbar_fields[i], i)
+
+        # Tool Bar
+        self.frame_toolbar = wx.ToolBar(self, -1)
+        self.SetToolBar(self.frame_toolbar)
+        self.frame_toolbar.Realize()
+        # Tool Bar end
+
+        self.panel_x = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = wx.Notebook(self.panel_x, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
+
+        sizer_1.Add((20, 20), 0, 0, 0)
+
+        self.window_1 = wx.SplitterWindow(self.panel_x, wx.ID_ANY)
+        self.window_1.SetMinimumPaneSize(20)
+        sizer_1.Add(self.window_1, 1, wx.EXPAND, 0)
+
+        self.window_1_pane_1 = wx.Panel(self.window_1, wx.ID_ANY)
+
+        self.window_1_pane_2_scrolled = wx.ScrolledWindow(self.window_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.window_1_pane_2_scrolled.SetScrollRate(10, 10)
+
+        self.html = wx.html.HtmlWindow(self.panel_x, wx.ID_ANY)
+        sizer_1.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+
+        self.window_1.SplitVertically(self.window_1_pane_1, self.window_1_pane_2_scrolled)
+
+        self.panel_x.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrame
+
+class NotebookPageWithBases(NotebookPage, notebookpage.NotebookPage):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: NotebookPageWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        NotebookPage.__init__(self, *args, **kwds)
+        notebookpage.NotebookPage.__init__(self)
+        self.Layout()
+        # end wxGlade
+
+# end of class NotebookPageWithBases
+
+class TestNotebookWithBasesInFrame(TestNotebook, testnotebook.TestNotebook):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestNotebookWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.NB_TOP
+        TestNotebook.__init__(self, *args, **kwds)
+        testnotebook.TestNotebook.__init__(self)
+
+        self.notebook_1_pane_1 = NotebookPageWithBases(self, wx.ID_ANY)
+        self.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
+        # end wxGlade
+
+# end of class TestNotebookWithBasesInFrame
+
+class SplitterWindowWithBasesInFrame(TestSplitterWindow):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: SplitterWindowWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.SP_3D
+        TestSplitterWindow.__init__(self, *args, **kwds)
+
+        self.window_1_pane_1 = wx.Panel(self, wx.ID_ANY)
+
+        self.window_1_pane_2 = wx.Panel(self, wx.ID_ANY)
+        self.SplitVertically(self.window_1_pane_1, self.window_1_pane_2)
+        # end wxGlade
+
+# end of class SplitterWindowWithBasesInFrame
+
+class TestPanelWithBasesInFrame(TestPanel, testpanel.TestPanel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestPanelWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0)
+        TestPanel.__init__(self, *args, **kwds)
+        testpanel.TestPanel.__init__(self)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = mynotebook.MyNoteBook(self, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.window_1 = mysplitter.MySplitterWindow(self, wx.ID_ANY)
+        sizer_1.Add(self.window_1, 1, wx.EXPAND, 0)
+
+        self.html = wx.html.HtmlWindow(self, wx.ID_ANY)
+        sizer_1.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class TestPanelWithBasesInFrame
+
+class MyFrameWithBases(TestFrame, testframe.TestFrame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrameWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        TestFrame.__init__(self, *args, **kwds)
+        testframe.TestFrame.__init__(self)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_copy_menubar = mymenubar.MyMenuBar()
+        self.SetMenuBar(self.frame_copy_menubar)
+        # Menu Bar end
+
+        self.frame_copy_statusbar = self.CreateStatusBar(1)
+        self.frame_copy_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        frame_copy_statusbar_fields = ["frame_copy_statusbar"]
+        for i in range(len(frame_copy_statusbar_fields)):
+            self.frame_copy_statusbar.SetStatusText(frame_copy_statusbar_fields[i], i)
+
+        # Tool Bar
+        self.frame_copy_toolbar = mytoolbar.MyToolBar(self, -1)
+        self.SetToolBar(self.frame_copy_toolbar)
+        self.frame_copy_toolbar.Realize()
+        # Tool Bar end
+
+        self.panel_1 = mypanel.MyPanel(self, wx.ID_ANY)
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrameWithBases
+
+class MyDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialog
+
+class MyPanel(wx.Panel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanel.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanel
+
+class MyMDIChildFrame(wx.MDIChildFrame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMDIChildFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.MDIChildFrame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame_1")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyMDIChildFrame
+
+class MyMenuBar(wx.MenuBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMenuBar.__init__
+        wx.MenuBar.__init__(self, *args, **kwds)
+        # end wxGlade
+
+# end of class MyMenuBar
+
+class wxToolBar(wx.ToolBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: wxToolBar.__init__
+        kwds["style"] = kwds.get("style", 0)
+        wx.ToolBar.__init__(self, *args, **kwds)
+        self.Realize()
+        # end wxGlade
+
+# end of class wxToolBar
+
+class MyDialogWithBases(MyDialogBase, mydialogbases.MyDialogBase):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialogWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        MyDialogBase.__init__(self, *args, **kwds)
+        mydialogbases.MyDialogBase.__init__(self)
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialogWithBases
+
+class MyPanelWithBases(MyPanelBase, mypanelbases.MyPanelBase):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanelWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        MyPanelBase.__init__(self, *args, **kwds)
+        mypanelbases.MyPanelBase.__init__(self)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanelWithBases
+
+class MyPanelScrolled(wx.ScrolledWindow):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanelScrolled.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.ScrolledWindow.__init__(self, *args, **kwds)
+        self.SetScrollRate(10, 10)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanelScrolled
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers_Classic.py wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers_Classic.py
--- wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers_Classic.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,330 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import wx.html
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_menubar = wx.MenuBar()
+        self.SetMenuBar(self.frame_menubar)
+        # Menu Bar end
+
+        self.frame_statusbar = self.CreateStatusBar(1)
+        self.frame_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        frame_statusbar_fields = ["frame_statusbar"]
+        for i in range(len(frame_statusbar_fields)):
+            self.frame_statusbar.SetStatusText(frame_statusbar_fields[i], i)
+
+        # Tool Bar
+        self.frame_toolbar = wx.ToolBar(self, -1)
+        self.SetToolBar(self.frame_toolbar)
+        self.frame_toolbar.Realize()
+        # Tool Bar end
+
+        sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.panel_x = wx.Panel(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_x, 1, wx.EXPAND, 0)
+
+        sizer_2 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = wx.Notebook(self.panel_x, wx.ID_ANY)
+        sizer_2.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
+
+        sizer_2.Add((20, 20), 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+
+        self.window_1 = wx.SplitterWindow(self.panel_x, wx.ID_ANY)
+        self.window_1.SetMinimumPaneSize(20)
+        sizer_2.Add(self.window_1, 1, wx.EXPAND, 0)
+
+        self.window_1_pane_1 = wx.Panel(self.window_1, wx.ID_ANY)
+        self.window_1_pane_1.SetBackgroundColour(wx.Colour(112, 219, 147))
+
+        self.window_1_pane_2_scrolled = wx.ScrolledWindow(self.window_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.window_1_pane_2_scrolled.SetBackgroundColour(wx.Colour(35, 142, 35))
+        self.window_1_pane_2_scrolled.SetScrollRate(10, 10)
+
+        self.html = wx.html.HtmlWindow(self.panel_x, wx.ID_ANY)
+        sizer_2.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+
+        self.window_1.SplitVertically(self.window_1_pane_1, self.window_1_pane_2_scrolled)
+
+        self.panel_x.SetSizer(sizer_2)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrame
+
+class NotebookPageWithBases(NotebookPage, notebookpage.NotebookPage):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: NotebookPageWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        NotebookPage.__init__(self, *args, **kwds)
+        notebookpage.NotebookPage.__init__(self)
+        self.Layout()
+        # end wxGlade
+
+# end of class NotebookPageWithBases
+
+class TestNotebookWithBasesInFrame(TestNotebook, testnotebook.TestNotebook):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestNotebookWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.NB_TOP
+        TestNotebook.__init__(self, *args, **kwds)
+        testnotebook.TestNotebook.__init__(self)
+
+        self.notebook_1_pane_1 = NotebookPageWithBases(self, wx.ID_ANY)
+        self.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
+        # end wxGlade
+
+# end of class TestNotebookWithBasesInFrame
+
+class SplitterWindowWithBasesInFrame(TestSplitterWindow):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: SplitterWindowWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.SP_3D
+        TestSplitterWindow.__init__(self, *args, **kwds)
+
+        self.window_1_pane_1 = wx.Panel(self, wx.ID_ANY)
+        self.window_1_pane_1.SetBackgroundColour(wx.Colour(112, 219, 147))
+
+        self.window_1_pane_2 = wx.Panel(self, wx.ID_ANY)
+        self.window_1_pane_2.SetBackgroundColour(wx.Colour(35, 142, 35))
+        self.SplitVertically(self.window_1_pane_1, self.window_1_pane_2)
+        # end wxGlade
+
+# end of class SplitterWindowWithBasesInFrame
+
+class TestPanelWithBasesInFrame(TestPanel, testpanel.TestPanel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestPanelWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0)
+        TestPanel.__init__(self, *args, **kwds)
+        testpanel.TestPanel.__init__(self)
+
+        sizer_2 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = TestNotebookWithBasesInFrame(self, wx.ID_ANY)
+        sizer_2.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.window_1 = SplitterWindowWithBasesInFrame(self, wx.ID_ANY)
+        sizer_2.Add(self.window_1, 1, wx.EXPAND, 0)
+
+        self.html = wx.html.HtmlWindow(self, wx.ID_ANY)
+        sizer_2.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+
+        self.SetSizer(sizer_2)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class TestPanelWithBasesInFrame
+
+class MyFrameWithBases(TestFrame, testframe.TestFrame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrameWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        TestFrame.__init__(self, *args, **kwds)
+        testframe.TestFrame.__init__(self)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_copy_menubar = wx.MenuBar()
+        self.SetMenuBar(self.frame_copy_menubar)
+        # Menu Bar end
+
+        self.frame_copy_statusbar = self.CreateStatusBar(1)
+        self.frame_copy_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        frame_copy_statusbar_fields = ["frame_copy_statusbar"]
+        for i in range(len(frame_copy_statusbar_fields)):
+            self.frame_copy_statusbar.SetStatusText(frame_copy_statusbar_fields[i], i)
+
+        # Tool Bar
+        self.frame_copy_toolbar = wx.ToolBar(self, -1)
+        self.SetToolBar(self.frame_copy_toolbar)
+        self.frame_copy_toolbar.Realize()
+        # Tool Bar end
+
+        sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.panel_1 = TestPanelWithBasesInFrame(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrameWithBases
+
+class MyDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialog
+
+class MyPanel(wx.Panel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanel.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanel
+
+class MyMDIChildFrame(wx.MDIChildFrame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMDIChildFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.MDIChildFrame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame_1")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyMDIChildFrame
+
+class MyMenuBar(wx.MenuBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMenuBar.__init__
+        wx.MenuBar.__init__(self, *args, **kwds)
+        # end wxGlade
+
+# end of class MyMenuBar
+
+class wxToolBar(wx.ToolBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: wxToolBar.__init__
+        kwds["style"] = kwds.get("style", 0)
+        wx.ToolBar.__init__(self, *args, **kwds)
+        self.Realize()
+        # end wxGlade
+
+# end of class wxToolBar
+
+class MyDialogWithBases(MyDialogBase, mydialogbases.MyDialogBase):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialogWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        MyDialogBase.__init__(self, *args, **kwds)
+        mydialogbases.MyDialogBase.__init__(self)
+        self.SetSize((400, 300))
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialogWithBases
+
+class MyPanelWithBases(MyPanelBase, mypanelbases.MyPanelBase):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanelWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        MyPanelBase.__init__(self, *args, **kwds)
+        mypanelbases.MyPanelBase.__init__(self)
+        self.SetSize((400, 300))
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanelWithBases
+
+class MyPanelScrolled(wx.ScrolledWindow):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanelScrolled.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.ScrolledWindow.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetScrollRate(10, 10)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanelScrolled
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.cpp wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.cpp
--- wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,265 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "BasesEtc_w_sizers.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: MyFrame::MyFrame
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("frame"));
+    frame_menubar = new wxMenuBar();
+    SetMenuBar(frame_menubar);
+    frame_statusbar = CreateStatusBar(1);
+    int frame_statusbar_widths[] = { -1 };
+    frame_statusbar->SetStatusWidths(1, frame_statusbar_widths);
+    
+    // statusbar fields
+    const wxString frame_statusbar_fields[] = {
+        wxT("frame_statusbar"),
+    };
+    for(int i = 0; i < frame_statusbar->GetFieldsCount(); ++i) {
+        frame_statusbar->SetStatusText(frame_statusbar_fields[i], i);
+    }
+    frame_toolbar = new wxToolBar(this, -1);
+    SetToolBar(frame_toolbar);
+    frame_toolbar->Realize();
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxHORIZONTAL);
+    panel_x = new wxPanel(this, wxID_ANY);
+    sizer_1->Add(panel_x, 1, wxEXPAND, 0);
+    wxBoxSizer* sizer_2 = new wxBoxSizer(wxVERTICAL);
+    notebook_1 = new wxNotebook(panel_x, wxID_ANY);
+    sizer_2->Add(notebook_1, 1, wxEXPAND, 0);
+    notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_1, wxT("notebook_1_pane_1"));
+    sizer_2->Add(20, 20, 0, wxALIGN_CENTER_HORIZONTAL, 0);
+    window_1 = new wxSplitterWindow(panel_x, wxID_ANY);
+    window_1->SetMinimumPaneSize(20);
+    sizer_2->Add(window_1, 1, wxEXPAND, 0);
+    window_1_pane_1 = new wxPanel(window_1, wxID_ANY);
+    window_1_pane_1->SetBackgroundColour(wxColour(112, 219, 147));
+    window_1_pane_2_scrolled = new wxScrolledWindow(window_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    window_1_pane_2_scrolled->SetBackgroundColour(wxColour(35, 142, 35));
+    window_1_pane_2_scrolled->SetScrollRate(10, 10);
+    html = new wx.html.HtmlWindow(panel_x, wxID_ANY);
+    sizer_2->Add(html, 1, wxALL|wxEXPAND, 3);
+    
+    window_1->SplitVertically(window_1_pane_1, window_1_pane_2_scrolled);
+    panel_x->SetSizer(sizer_2);
+    SetSizer(sizer_1);
+    Layout();
+    // end wxGlade
+}
+
+
+NotebookPageWithBases::NotebookPageWithBases(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    NotebookPage(parent, id, pos, size, wxTAB_TRAVERSAL), notebookpage.NotebookPage()
+{
+    // begin wxGlade: NotebookPageWithBases::NotebookPageWithBases
+    // end wxGlade
+}
+
+
+TestNotebookWithBasesInFrame::TestNotebookWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    TestNotebook(parent, id, pos, size, style), testnotebook.TestNotebook()
+{
+    // begin wxGlade: TestNotebookWithBasesInFrame::TestNotebookWithBasesInFrame
+    notebook_1_pane_1 = new NotebookPageWithBases(this, wxID_ANY);
+    AddPage(notebook_1_pane_1, wxT("notebook_1_pane_1"));
+    // end wxGlade
+}
+
+
+SplitterWindowWithBasesInFrame::SplitterWindowWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    TestSplitterWindow(parent, id, pos, size, style)
+{
+    // begin wxGlade: SplitterWindowWithBasesInFrame::SplitterWindowWithBasesInFrame
+    window_1_pane_1 = new wxPanel(this, wxID_ANY);
+    window_1_pane_1->SetBackgroundColour(wxColour(112, 219, 147));
+    window_1_pane_2 = new wxPanel(this, wxID_ANY);
+    window_1_pane_2->SetBackgroundColour(wxColour(35, 142, 35));
+    SplitVertically(window_1_pane_1, window_1_pane_2);
+    // end wxGlade
+}
+
+
+TestPanelWithBasesInFrame::TestPanelWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    TestPanel(parent, id, pos, size, style), testpanel.TestPanel()
+{
+    // begin wxGlade: TestPanelWithBasesInFrame::TestPanelWithBasesInFrame
+    wxBoxSizer* sizer_2 = new wxBoxSizer(wxVERTICAL);
+    notebook_1 = new TestNotebookWithBasesInFrame(this, wxID_ANY);
+    sizer_2->Add(notebook_1, 1, wxEXPAND, 0);
+    window_1 = new SplitterWindowWithBasesInFrame(this, wxID_ANY);
+    sizer_2->Add(window_1, 1, wxEXPAND, 0);
+    html = new wx.html.HtmlWindow(this, wxID_ANY);
+    sizer_2->Add(html, 1, wxALL|wxEXPAND, 3);
+    
+    SetSizer(sizer_2);
+    // end wxGlade
+}
+
+
+MyFrameWithBases::MyFrameWithBases(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    TestFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE), testframe.TestFrame()
+{
+    // begin wxGlade: MyFrameWithBases::MyFrameWithBases
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("frame"));
+    frame_copy_menubar = new wxMenuBar();
+    SetMenuBar(frame_copy_menubar);
+    frame_copy_statusbar = CreateStatusBar(1);
+    int frame_copy_statusbar_widths[] = { -1 };
+    frame_copy_statusbar->SetStatusWidths(1, frame_copy_statusbar_widths);
+    
+    // statusbar fields
+    const wxString frame_copy_statusbar_fields[] = {
+        wxT("frame_copy_statusbar"),
+    };
+    for(int i = 0; i < frame_copy_statusbar->GetFieldsCount(); ++i) {
+        frame_copy_statusbar->SetStatusText(frame_copy_statusbar_fields[i], i);
+    }
+    frame_copy_toolbar = new wxToolBar(this, -1);
+    SetToolBar(frame_copy_toolbar);
+    frame_copy_toolbar->Realize();
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxHORIZONTAL);
+    panel_1 = new TestPanelWithBasesInFrame(this, wxID_ANY);
+    sizer_1->Add(panel_1, 1, wxEXPAND, 0);
+    
+    SetSizer(sizer_1);
+    Layout();
+    // end wxGlade
+}
+
+
+MyDialog::MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
+{
+    // begin wxGlade: MyDialog::MyDialog
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("dialog"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    Layout();
+    // end wxGlade
+}
+
+
+MyPanel::MyPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL)
+{
+    // begin wxGlade: MyPanel::MyPanel
+    SetSize(wxSize(400, 300));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    // end wxGlade
+}
+
+
+MyMDIChildFrame::MyMDIChildFrame(wxMDIParentFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxMDIChildFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: MyMDIChildFrame::MyMDIChildFrame
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("frame_1"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    Layout();
+    // end wxGlade
+}
+
+
+MyMenuBar::MyMenuBar():
+    wxMenuBar()
+{
+    // begin wxGlade: MyMenuBar::MyMenuBar
+    // end wxGlade
+}
+
+
+wxToolBar::wxToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxToolBar(parent, id, pos, size, style)
+{
+    // begin wxGlade: wxToolBar::wxToolBar
+    Realize();
+    // end wxGlade
+}
+
+
+MyDialogWithBases::MyDialogWithBases(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    MyDialogBase(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE), mydialogbases.MyDialogBase()
+{
+    // begin wxGlade: MyDialogWithBases::MyDialogWithBases
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("dialog"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    Layout();
+    // end wxGlade
+}
+
+
+MyPanelWithBases::MyPanelWithBases(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    MyPanelBase(parent, id, pos, size, wxTAB_TRAVERSAL), mypanelbases.MyPanelBase()
+{
+    // begin wxGlade: MyPanelWithBases::MyPanelWithBases
+    SetSize(wxSize(400, 300));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    // end wxGlade
+}
+
+
+MyPanelScrolled::MyPanelScrolled(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxScrolledWindow(parent, id, pos, size, wxTAB_TRAVERSAL)
+{
+    // begin wxGlade: MyPanelScrolled::MyPanelScrolled
+    SetSize(wxSize(400, 300));
+    SetScrollRate(10, 10);
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    // end wxGlade
+}
+
+
+class MyApp: public wxApp {
+public:
+    bool OnInit();
+};
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    wxInitAllImageHandlers();
+    MyFrame* frame = new MyFrame(NULL, wxID_ANY, wxEmptyString);
+    SetTopWindow(frame);
+    frame->Show();
+    return true;
+}
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.h wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.h
--- wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,259 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef BASESETC_W_SIZERS_H
+#define BASESETC_W_SIZERS_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+// begin wxGlade: ::dependencies
+#include <wx/notebook.h>
+#include <wx/splitter.h>
+// end wxGlade
+
+// begin wxGlade: ::extracode
+import wx.html
+import wx.html
+// end wxGlade
+
+
+class MyFrame: public wxFrame {
+public:
+    // begin wxGlade: MyFrame::ids
+    // end wxGlade
+
+    MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrame::attributes
+    wxMenuBar* frame_menubar;
+    wxStatusBar* frame_statusbar;
+    wxToolBar* frame_toolbar;
+    wxPanel* panel_x;
+    wxNotebook* notebook_1;
+    wxPanel* notebook_1_pane_1;
+    wxSplitterWindow* window_1;
+    wxPanel* window_1_pane_1;
+    wxScrolledWindow* window_1_pane_2_scrolled;
+    wx.html.HtmlWindow* html;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class NotebookPageWithBases: public NotebookPage, public notebookpage.NotebookPage {
+public:
+    // begin wxGlade: NotebookPageWithBases::ids
+    // end wxGlade
+
+    NotebookPageWithBases(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: NotebookPageWithBases::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class TestNotebookWithBasesInFrame: public TestNotebook, public testnotebook.TestNotebook {
+public:
+    // begin wxGlade: TestNotebookWithBasesInFrame::ids
+    // end wxGlade
+
+    TestNotebookWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: TestNotebookWithBasesInFrame::attributes
+    NotebookPageWithBases* notebook_1_pane_1;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class SplitterWindowWithBasesInFrame: public TestSplitterWindow {
+public:
+    // begin wxGlade: SplitterWindowWithBasesInFrame::ids
+    // end wxGlade
+
+    SplitterWindowWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxSP_3D);
+
+private:
+
+protected:
+    // begin wxGlade: SplitterWindowWithBasesInFrame::attributes
+    wxPanel* window_1_pane_1;
+    wxPanel* window_1_pane_2;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class TestPanelWithBasesInFrame: public TestPanel, public testpanel.TestPanel {
+public:
+    // begin wxGlade: TestPanelWithBasesInFrame::ids
+    // end wxGlade
+
+    TestPanelWithBasesInFrame(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: TestPanelWithBasesInFrame::attributes
+    TestNotebookWithBasesInFrame* notebook_1;
+    SplitterWindowWithBasesInFrame* window_1;
+    wx.html.HtmlWindow* html;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyFrameWithBases: public TestFrame, public testframe.TestFrame {
+public:
+    // begin wxGlade: MyFrameWithBases::ids
+    // end wxGlade
+
+    MyFrameWithBases(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrameWithBases::attributes
+    wxMenuBar* frame_copy_menubar;
+    wxStatusBar* frame_copy_statusbar;
+    wxToolBar* frame_copy_toolbar;
+    TestPanelWithBasesInFrame* panel_1;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyDialog: public wxDialog {
+public:
+    // begin wxGlade: MyDialog::ids
+    // end wxGlade
+
+    MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyDialog::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyPanel: public wxPanel {
+public:
+    // begin wxGlade: MyPanel::ids
+    // end wxGlade
+
+    MyPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: MyPanel::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyMDIChildFrame: public wxMDIChildFrame {
+public:
+    // begin wxGlade: MyMDIChildFrame::ids
+    // end wxGlade
+
+    MyMDIChildFrame(wxMDIParentFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyMDIChildFrame::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyMenuBar: public wxMenuBar {
+public:
+    // begin wxGlade: MyMenuBar::ids
+    // end wxGlade
+
+    MyMenuBar();
+
+private:
+
+protected:
+    // begin wxGlade: MyMenuBar::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class wxToolBar: public wxToolBar {
+public:
+    // begin wxGlade: wxToolBar::ids
+    // end wxGlade
+
+    wxToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxTB_HORIZONTAL|wxNO_BORDER);
+
+private:
+
+protected:
+    // begin wxGlade: wxToolBar::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyDialogWithBases: public MyDialogBase, public mydialogbases.MyDialogBase {
+public:
+    // begin wxGlade: MyDialogWithBases::ids
+    // end wxGlade
+
+    MyDialogWithBases(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyDialogWithBases::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyPanelWithBases: public MyPanelBase, public mypanelbases.MyPanelBase {
+public:
+    // begin wxGlade: MyPanelWithBases::ids
+    // end wxGlade
+
+    MyPanelWithBases(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: MyPanelWithBases::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyPanelScrolled: public wxScrolledWindow {
+public:
+    // begin wxGlade: MyPanelScrolled::ids
+    // end wxGlade
+
+    MyPanelScrolled(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: MyPanelScrolled::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+#endif // BASESETC_W_SIZERS_H
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.lisp wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.lisp
--- wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.lisp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,841 @@
+#!/usr/bin/env lisp
+;;;
+;;; generated by wxGlade
+;;;
+
+(asdf:operate 'asdf:load-op 'wxcl)
+(use-package "FFI")
+(ffi:default-foreign-language :stdc)
+
+
+;;; begin wxGlade: dependencies
+(use-package :NotebookPageWithBases)
+(use-package :SplitterWindowWithBasesInFrame)
+(use-package :TestNotebookWithBasesInFrame)
+(use-package :TestPanelWithBasesInFrame)
+(use-package :wx.html.HtmlWindow)
+(use-package :wxButton)
+(use-package :wxCL)
+(use-package :wxColour)
+(use-package :wxEvent)
+(use-package :wxEvtHandler)
+(use-package :wxFrame)
+(use-package :wxMenu)
+(use-package :wxMenuBar)
+(use-package :wxNotebook)
+(use-package :wxPanel)
+(use-package :wxScrolledWindow)
+(use-package :wxSizer)
+(use-package :wxSplitterWindow)
+(use-package :wxStatusBar)
+(use-package :wxToolBar)
+(use-package :wxWindow)
+(use-package :wx_main)
+(use-package :wx_wrapper)
+;;; end wxGlade
+
+;;; begin wxGlade: extracode
+import wx.html
+;;; end wxGlade
+
+
+(defclass MyFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)))
+
+(defun make-MyFrame ()
+        (let ((obj (make-instance 'MyFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyFrame.__init__
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxFrame_SetTitle (slot-top-window obj) "frame")
+        
+        ;;; Menu Bar
+        (setf (slot-frame-menubar obj) (wxMenuBar_Create 0))
+        (wxFrame_SetMenuBar (slot-top-window obj) (slot-frame-menubar obj))
+        ;;; Menu Bar end
+        
+        (setf (slot-frame-statusbar obj) (wxFrame_CreateStatusBar (slot-top-window obj) 1 0))
+        (wxStatusBar_SetStatusWidths (slot-frame-statusbar obj) 1 (vector -1))
+        (wxStatusBar_SetStatusText (slot-frame-statusbar obj) "frame_statusbar" 0)
+        
+        ;;; Tool Bar
+        (setf (slot-frame-toolbar obj) (wxToolBar_Create (slot-top-window obj) -1 -1 -1 -1 -1 wxTB_HORIZONTAL))
+        (wxFrame_SetToolBar (slot-top-window obj) (slot-frame-toolbar obj))
+        (wxToolBar_Realize (slot-frame-toolbar obj))
+        ;;; Tool Bar end
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
+        (setf (slot-panel-x obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-panel-x obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-sizer-2 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-panel-x obj) wxID_ANY -1 -1 -1 -1 wxNB_TOP))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-notebook-1-pane-1 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-1 obj) "notebook_1_pane_1" 1 -1)
+        
+        (wxSizer_AddWindow (slot-sizer-2 obj) ((20, 20) obj) 0 wxALIGN_CENTER_HORIZONTAL 0 nil)
+        
+        (setf (slot-window-1 obj) (wxSplitterWindow_Create (slot-panel-x obj) wxID_ANY -1 -1 -1 -1 wxSP_3D))
+        wxSplitterWindow_SetMinimumPaneSize (slot-window-1 obj) 20)
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-window-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-window-1-pane-1 obj) (wxPanel_Create (slot-window-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxWindow_SetBackgroundColour (slot-window-1-pane-1 obj) (wxColour_CreateRGB 112, 219, 147))
+        
+        (setf (slot-window-1-pane-2-scrolled obj) (wxPanel_Create (slot-window-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxWindow_SetBackgroundColour (slot-window-1-pane-2-scrolled obj) (wxColour_CreateRGB 35, 142, 35))
+        (wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-window-1-pane-2-scrolled obj) 10  10)
+        
+        (setf html (wx.html.HtmlWindow_Create (object-panel-x self) wxID_ANY))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-html obj) 1 (logior wxALL wxEXPAND) 3 nil)
+        
+        (SplitVertically window-1 window_1_pane_1 window_1_pane_2_scrolled )
+        
+        (wxWindow_SetSizer (slot-panel-x obj) (slot-sizer-2 obj))
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxFrame_layout (slot-frame self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyFrame
+
+
+
+(defclass NotebookPageWithBases()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)))
+
+(defun make-NotebookPageWithBases ()
+        (let ((obj (make-instance 'NotebookPageWithBases)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj NotebookPageWithBases))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: NotebookPageWithBases.__init__
+        (wxPanel_layout (slot-notebook-1-pane-1 self))
+        ;;; end wxGlade
+        )
+
+;;; end of class NotebookPageWithBases
+
+
+
+(defclass TestNotebookWithBasesInFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)))
+
+(defun make-TestNotebookWithBasesInFrame ()
+        (let ((obj (make-instance 'TestNotebookWithBasesInFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj TestNotebookWithBasesInFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: TestNotebookWithBasesInFrame.__init__
+        
+        (setf (slot-notebook_1_pane_1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1))
+        (wxNotebook_AddPage (slot-notebook_1_pane_1 obj) page "notebook_1_pane_1" 1 -1);
+        ;;; end wxGlade
+        )
+
+;;; end of class TestNotebookWithBasesInFrame
+
+
+
+(defclass SplitterWindowWithBasesInFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)))
+
+(defun make-SplitterWindowWithBasesInFrame ()
+        (let ((obj (make-instance 'SplitterWindowWithBasesInFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj SplitterWindowWithBasesInFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: SplitterWindowWithBasesInFrame.__init__
+        
+        (setf (slot-window-1-pane-1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxWindow_SetBackgroundColour (slot-window-1-pane-1 obj) (wxColour_CreateRGB 112, 219, 147))
+        
+        (setf (slot-window-1-pane-2 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxWindow_SetBackgroundColour (slot-window-1-pane-2 obj) (wxColour_CreateRGB 35, 142, 35))
+        $self->SplitVertically($self->{window_1_pane_1}, $self->{window_1_pane_2}, );
+        ;;; end wxGlade
+        )
+
+;;; end of class SplitterWindowWithBasesInFrame
+
+
+
+(defclass TestPanelWithBasesInFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)))
+
+(defun make-TestPanelWithBasesInFrame ()
+        (let ((obj (make-instance 'TestPanelWithBasesInFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj TestPanelWithBasesInFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: TestPanelWithBasesInFrame.__init__
+        
+        (setf (slot-sizer-2 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxNB_TOP))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-window-1 obj) (wxSplitterWindow_Create (slot-top-window obj) wxID_ANY))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-window-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf html (wx.html.HtmlWindow_Create nil wxID_ANY))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-html obj) 1 (logior wxALL wxEXPAND) 3 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-2 obj))
+        
+        (wxPanel_layout (slot-panel-1 self))
+        ;;; end wxGlade
+        )
+
+;;; end of class TestPanelWithBasesInFrame
+
+
+
+(defclass MyFrameWithBases()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)))
+
+(defun make-MyFrameWithBases ()
+        (let ((obj (make-instance 'MyFrameWithBases)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrameWithBases))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyFrameWithBases.__init__
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxFrame_SetTitle (slot-top-window obj) "frame")
+        
+        ;;; Menu Bar
+        (setf (slot-frame-copy-menubar obj) (wxMenuBar_Create 0))
+        (wxFrame_SetMenuBar (slot-top-window obj) (slot-frame-copy-menubar obj))
+        ;;; Menu Bar end
+        
+        (setf (slot-frame-copy-statusbar obj) (wxFrame_CreateStatusBar (slot-top-window obj) 1 0))
+        (wxStatusBar_SetStatusWidths (slot-frame-copy-statusbar obj) 1 (vector -1))
+        (wxStatusBar_SetStatusText (slot-frame-copy-statusbar obj) "frame_copy_statusbar" 0)
+        
+        ;;; Tool Bar
+        (setf (slot-frame-copy-toolbar obj) (wxToolBar_Create (slot-top-window obj) -1 -1 -1 -1 -1 wxTB_HORIZONTAL))
+        (wxFrame_SetToolBar (slot-top-window obj) (slot-frame-copy-toolbar obj))
+        (wxToolBar_Realize (slot-frame-copy-toolbar obj))
+        ;;; Tool Bar end
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
+        (setf (slot-panel_1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-panel-1 obj) 1 wxEXPAND 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxFrame_layout (slot-frame-copy self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyFrameWithBases
+
+
+
+(defclass MyDialog()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyDialog ()
+        (let ((obj (make-instance 'MyDialog)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyDialog))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyDialog.__init__
+        (setf (slot-top-window obj) (wxDialog_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_DIALOG_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxWindow_SetTitle (slot-dialog self) "dialog")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxWindow_layout (slot-dialog self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyDialog
+
+
+
+(defclass MyPanel()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyPanel ()
+        (let ((obj (make-instance 'MyPanel)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyPanel))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyPanel.__init__
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxPanel_layout (slot-panel self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyPanel
+
+
+
+(defclass MyMDIChildFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyMDIChildFrame ()
+        (let ((obj (make-instance 'MyMDIChildFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyMDIChildFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyMDIChildFrame.__init__
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxFrame_SetTitle (slot-top-window obj) "frame_1")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxFrame_layout (slot-frame-1 self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyMDIChildFrame
+
+
+
+(defclass MyMenuBar()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyMenuBar ()
+        (let ((obj (make-instance 'MyMenuBar)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyMenuBar))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyMenuBar.__init__
+        ;;; end wxGlade
+        )
+
+;;; end of class MyMenuBar
+
+
+
+(defclass wxToolBar()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-wxToolBar ()
+        (let ((obj (make-instance 'wxToolBar)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj wxToolBar))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: wxToolBar.__init__
+        (wxToolBar_Realize (slot-toolbar obj))
+        ;;; end wxGlade
+        )
+
+;;; end of class wxToolBar
+
+
+
+(defclass MyDialogWithBases()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyDialogWithBases ()
+        (let ((obj (make-instance 'MyDialogWithBases)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyDialogWithBases))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyDialogWithBases.__init__
+        (setf (slot-top-window obj) (wxDialog_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_DIALOG_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxWindow_SetTitle (slot-dialog-copy self) "dialog")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxWindow_layout (slot-dialog-copy self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyDialogWithBases
+
+
+
+(defclass MyPanelWithBases()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyPanelWithBases ()
+        (let ((obj (make-instance 'MyPanelWithBases)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyPanelWithBases))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyPanelWithBases.__init__
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxPanel_layout (slot-panel-copy self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyPanelWithBases
+
+
+
+(defclass MyPanelScrolled()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-statusbar :initform nil :accessor slot-frame-statusbar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-x :initform nil :accessor slot-panel-x)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2-scrolled :initform nil :accessor slot-window-1-pane-2-scrolled)
+        (html :initform nil :accessor slot-html)
+        (frame-copy-menubar :initform nil :accessor slot-frame-copy-menubar)
+        (frame-copy-statusbar :initform nil :accessor slot-frame-copy-statusbar)
+        (frame-copy-toolbar :initform nil :accessor slot-frame-copy-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (window-1 :initform nil :accessor slot-window-1)
+        (window-1-pane-1 :initform nil :accessor slot-window-1-pane-1)
+        (window-1-pane-2 :initform nil :accessor slot-window-1-pane-2)
+        (html :initform nil :accessor slot-html)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyPanelScrolled ()
+        (let ((obj (make-instance 'MyPanelScrolled)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyPanelScrolled))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyPanelScrolled.__init__
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-10  10 obj))
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxPanel_layout (slot-panel-copy-scrolled self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyPanelScrolled
+
+
+(defun init-func (fun data evt)
+        (let ((frame (make-MyFrame)))
+        (ELJApp_SetTopWindow (slot-top-window frame))
+        (wxWindow_Show (slot-top-window frame))))
+;;; end of class MyApp
+
+
+(unwind-protect
+    (Eljapp_initializeC (wxclosure_Create #'init-func nil) 0 nil)
+    (ffi:close-foreign-library "../miscellaneous/wxc-msw2.6.2.dll"))
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers_Phoenix.py wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers_Phoenix.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,330 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import wx.html
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_menubar = wx.MenuBar()
+        self.SetMenuBar(self.frame_menubar)
+        # Menu Bar end
+
+        self.frame_statusbar = self.CreateStatusBar(1)
+        self.frame_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        frame_statusbar_fields = ["frame_statusbar"]
+        for i in range(len(frame_statusbar_fields)):
+            self.frame_statusbar.SetStatusText(frame_statusbar_fields[i], i)
+
+        # Tool Bar
+        self.frame_toolbar = wx.ToolBar(self, -1)
+        self.SetToolBar(self.frame_toolbar)
+        self.frame_toolbar.Realize()
+        # Tool Bar end
+
+        sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.panel_x = wx.Panel(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_x, 1, wx.EXPAND, 0)
+
+        sizer_2 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = wx.Notebook(self.panel_x, wx.ID_ANY)
+        sizer_2.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
+
+        sizer_2.Add((20, 20), 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+
+        self.window_1 = wx.SplitterWindow(self.panel_x, wx.ID_ANY)
+        self.window_1.SetMinimumPaneSize(20)
+        sizer_2.Add(self.window_1, 1, wx.EXPAND, 0)
+
+        self.window_1_pane_1 = wx.Panel(self.window_1, wx.ID_ANY)
+        self.window_1_pane_1.SetBackgroundColour(wx.Colour(112, 219, 147))
+
+        self.window_1_pane_2_scrolled = wx.ScrolledWindow(self.window_1, wx.ID_ANY, style=wx.TAB_TRAVERSAL)
+        self.window_1_pane_2_scrolled.SetBackgroundColour(wx.Colour(35, 142, 35))
+        self.window_1_pane_2_scrolled.SetScrollRate(10, 10)
+
+        self.html = wx.html.HtmlWindow(self.panel_x, wx.ID_ANY)
+        sizer_2.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+
+        self.window_1.SplitVertically(self.window_1_pane_1, self.window_1_pane_2_scrolled)
+
+        self.panel_x.SetSizer(sizer_2)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrame
+
+class NotebookPageWithBases(NotebookPage, notebookpage.NotebookPage):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: NotebookPageWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        NotebookPage.__init__(self, *args, **kwds)
+        notebookpage.NotebookPage.__init__(self)
+        self.Layout()
+        # end wxGlade
+
+# end of class NotebookPageWithBases
+
+class TestNotebookWithBasesInFrame(TestNotebook, testnotebook.TestNotebook):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestNotebookWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.NB_TOP
+        TestNotebook.__init__(self, *args, **kwds)
+        testnotebook.TestNotebook.__init__(self)
+
+        self.notebook_1_pane_1 = NotebookPageWithBases(self, wx.ID_ANY)
+        self.AddPage(self.notebook_1_pane_1, "notebook_1_pane_1")
+        # end wxGlade
+
+# end of class TestNotebookWithBasesInFrame
+
+class SplitterWindowWithBasesInFrame(TestSplitterWindow):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: SplitterWindowWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.SP_3D
+        TestSplitterWindow.__init__(self, *args, **kwds)
+
+        self.window_1_pane_1 = wx.Panel(self, wx.ID_ANY)
+        self.window_1_pane_1.SetBackgroundColour(wx.Colour(112, 219, 147))
+
+        self.window_1_pane_2 = wx.Panel(self, wx.ID_ANY)
+        self.window_1_pane_2.SetBackgroundColour(wx.Colour(35, 142, 35))
+        self.SplitVertically(self.window_1_pane_1, self.window_1_pane_2)
+        # end wxGlade
+
+# end of class SplitterWindowWithBasesInFrame
+
+class TestPanelWithBasesInFrame(TestPanel, testpanel.TestPanel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestPanelWithBasesInFrame.__init__
+        kwds["style"] = kwds.get("style", 0)
+        TestPanel.__init__(self, *args, **kwds)
+        testpanel.TestPanel.__init__(self)
+
+        sizer_2 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = TestNotebookWithBasesInFrame(self, wx.ID_ANY)
+        sizer_2.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.window_1 = SplitterWindowWithBasesInFrame(self, wx.ID_ANY)
+        sizer_2.Add(self.window_1, 1, wx.EXPAND, 0)
+
+        self.html = wx.html.HtmlWindow(self, wx.ID_ANY)
+        sizer_2.Add(self.html, 1, wx.ALL | wx.EXPAND, 3)
+
+        self.SetSizer(sizer_2)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class TestPanelWithBasesInFrame
+
+class MyFrameWithBases(TestFrame, testframe.TestFrame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrameWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        TestFrame.__init__(self, *args, **kwds)
+        testframe.TestFrame.__init__(self)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_copy_menubar = wx.MenuBar()
+        self.SetMenuBar(self.frame_copy_menubar)
+        # Menu Bar end
+
+        self.frame_copy_statusbar = self.CreateStatusBar(1)
+        self.frame_copy_statusbar.SetStatusWidths([-1])
+        # statusbar fields
+        frame_copy_statusbar_fields = ["frame_copy_statusbar"]
+        for i in range(len(frame_copy_statusbar_fields)):
+            self.frame_copy_statusbar.SetStatusText(frame_copy_statusbar_fields[i], i)
+
+        # Tool Bar
+        self.frame_copy_toolbar = wx.ToolBar(self, -1)
+        self.SetToolBar(self.frame_copy_toolbar)
+        self.frame_copy_toolbar.Realize()
+        # Tool Bar end
+
+        sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.panel_1 = TestPanelWithBasesInFrame(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrameWithBases
+
+class MyDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialog
+
+class MyPanel(wx.Panel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanel.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanel
+
+class MyMDIChildFrame(wx.MDIChildFrame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMDIChildFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.MDIChildFrame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame_1")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyMDIChildFrame
+
+class MyMenuBar(wx.MenuBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMenuBar.__init__
+        wx.MenuBar.__init__(self, *args, **kwds)
+        # end wxGlade
+
+# end of class MyMenuBar
+
+class wxToolBar(wx.ToolBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: wxToolBar.__init__
+        kwds["style"] = kwds.get("style", 0)
+        wx.ToolBar.__init__(self, *args, **kwds)
+        self.Realize()
+        # end wxGlade
+
+# end of class wxToolBar
+
+class MyDialogWithBases(MyDialogBase, mydialogbases.MyDialogBase):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialogWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        MyDialogBase.__init__(self, *args, **kwds)
+        mydialogbases.MyDialogBase.__init__(self)
+        self.SetSize((400, 300))
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialogWithBases
+
+class MyPanelWithBases(MyPanelBase, mypanelbases.MyPanelBase):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanelWithBases.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        MyPanelBase.__init__(self, *args, **kwds)
+        mypanelbases.MyPanelBase.__init__(self)
+        self.SetSize((400, 300))
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanelWithBases
+
+class MyPanelScrolled(wx.ScrolledWindow):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyPanelScrolled.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.ScrolledWindow.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetScrollRate(10, 10)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyPanelScrolled
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.pl wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.pl
--- wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,624 @@
+#!/usr/bin/perl -w -- 
+#
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import wx.html
+# end wxGlade
+
+package MyFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyFrame::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("frame");
+    
+    
+
+    # Menu Bar
+
+    $self->{frame_menubar} = Wx::MenuBar->new();
+    my $wxglade_tmp_menu;
+    $self->SetMenuBar($self->{frame_menubar});
+    
+    # Menu Bar end
+
+    
+    $self->{frame_statusbar} = $self->CreateStatusBar(1);
+    $self->{frame_statusbar}->SetStatusWidths(-1);
+    
+    # statusbar fields
+    my( @frame_statusbar_fields ) = (
+        "frame_statusbar",
+    );
+    
+    if( @frame_statusbar_fields ) {
+        $self->{frame_statusbar}->SetStatusText($frame_statusbar_fields[$_], $_)
+        for 0 .. $#frame_statusbar_fields ;
+    }
+    
+    
+    # Tool Bar
+    $self->{frame_toolbar} = Wx::ToolBar->new($self, -1);
+    $self->SetToolBar($self->{frame_toolbar});
+    $self->{frame_toolbar}->Realize();
+    # Tool Bar end
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{panel_x} = Wx::Panel->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{panel_x}, 1, wxEXPAND, 0);
+    
+    $self->{sizer_2} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{notebook_1} = Wx::Notebook->new($self->{panel_x}, wxID_ANY);
+    $self->{sizer_2}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
+    $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, "notebook_1_pane_1");
+    
+    $self->{sizer_2}->Add(20, 20, 0, wxALIGN_CENTER_HORIZONTAL, 0);
+    
+    $self->{window_1} = Wx::SplitterWindow->new($self->{panel_x}, wxID_ANY);
+    $self->{window_1}->SetMinimumPaneSize(20);
+    $self->{sizer_2}->Add($self->{window_1}, 1, wxEXPAND, 0);
+    
+    $self->{window_1_pane_1} = Wx::Panel->new($self->{window_1}, wxID_ANY);
+    $self->{window_1_pane_1}->SetBackgroundColour(Wx::Colour->new(112, 219, 147));
+    
+    $self->{window_1_pane_2_scrolled} = Wx::ScrolledWindow->new($self->{window_1}, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    $self->{window_1_pane_2_scrolled}->SetBackgroundColour(Wx::Colour->new(35, 142, 35));
+    $self->{window_1_pane_2_scrolled}->SetScrollRate(10, 10);
+    
+    $self->{html} = wx.html.HtmlWindow->new($self->{panel_x}, wxID_ANY);
+    $self->{sizer_2}->Add($self->{html}, 1, wxALL|wxEXPAND, 3);
+    
+    $self->{window_1}->SplitVertically($self->{window_1_pane_1}, $self->{window_1_pane_2_scrolled}, );
+    
+    $self->{panel_x}->SetSizer($self->{sizer_2});
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyFrame
+
+1;
+
+package NotebookPageWithBases;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: NotebookPageWithBases::new
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class NotebookPageWithBases
+
+1;
+
+package TestNotebookWithBasesInFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Notebook);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: TestNotebookWithBasesInFrame::new
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
+    $self->{notebook_1_pane_1} = NotebookPageWithBases->new($self, wxID_ANY);
+    $self->AddPage($self->{notebook_1_pane_1}, "notebook_1_pane_1");
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class TestNotebookWithBasesInFrame
+
+1;
+
+package SplitterWindowWithBasesInFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::SplitterWindow);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: SplitterWindowWithBasesInFrame::new
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
+    $self->{window_1_pane_1} = Wx::Panel->new($self, wxID_ANY);
+    $self->{window_1_pane_1}->SetBackgroundColour(Wx::Colour->new(112, 219, 147));
+    
+    $self->{window_1_pane_2} = Wx::Panel->new($self, wxID_ANY);
+    $self->{window_1_pane_2}->SetBackgroundColour(Wx::Colour->new(35, 142, 35));
+    $self->SplitVertically($self->{window_1_pane_1}, $self->{window_1_pane_2}, );
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class SplitterWindowWithBasesInFrame
+
+1;
+
+package TestPanelWithBasesInFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: TestPanelWithBasesInFrame::new
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
+    $self->{sizer_2} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{notebook_1} = TestNotebookWithBasesInFrame->new($self, wxID_ANY);
+    $self->{sizer_2}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
+    $self->{window_1} = SplitterWindowWithBasesInFrame->new($self, wxID_ANY);
+    $self->{sizer_2}->Add($self->{window_1}, 1, wxEXPAND, 0);
+    
+    $self->{html} = wx.html.HtmlWindow->new($self, wxID_ANY);
+    $self->{sizer_2}->Add($self->{html}, 1, wxALL|wxEXPAND, 3);
+    
+    $self->SetSizer($self->{sizer_2});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class TestPanelWithBasesInFrame
+
+1;
+
+package MyFrameWithBases;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyFrameWithBases::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("frame");
+    
+    
+
+    # Menu Bar
+
+    $self->{frame_copy_menubar} = Wx::MenuBar->new();
+    my $wxglade_tmp_menu;
+    $self->SetMenuBar($self->{frame_copy_menubar});
+    
+    # Menu Bar end
+
+    
+    $self->{frame_copy_statusbar} = $self->CreateStatusBar(1);
+    $self->{frame_copy_statusbar}->SetStatusWidths(-1);
+    
+    # statusbar fields
+    my( @frame_copy_statusbar_fields ) = (
+        "frame_copy_statusbar",
+    );
+    
+    if( @frame_copy_statusbar_fields ) {
+        $self->{frame_copy_statusbar}->SetStatusText($frame_copy_statusbar_fields[$_], $_)
+        for 0 .. $#frame_copy_statusbar_fields ;
+    }
+    
+    
+    # Tool Bar
+    $self->{frame_copy_toolbar} = Wx::ToolBar->new($self, -1);
+    $self->SetToolBar($self->{frame_copy_toolbar});
+    $self->{frame_copy_toolbar}->Realize();
+    # Tool Bar end
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{panel_1} = TestPanelWithBasesInFrame->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{panel_1}, 1, wxEXPAND, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyFrameWithBases
+
+1;
+
+package MyDialog;
+
+use Wx qw[:everything];
+use base qw(Wx::Dialog);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyDialog::new
+    $style = wxDEFAULT_DIALOG_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("dialog");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyDialog
+
+1;
+
+package MyPanel;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyPanel::new
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyPanel
+
+1;
+
+package MyMDIChildFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::MDIChildFrame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyMDIChildFrame::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("frame_1");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyMDIChildFrame
+
+1;
+
+package MyMenuBar;
+
+use Wx qw[:everything];
+use base qw(Wx::MenuBar);
+use strict;
+
+sub new {
+    my( $self,  ) = @_;
+    # begin wxGlade: MyMenuBar::new
+    $self = $self->SUPER::new( @_[1 .. $#_] );
+    my $wxglade_tmp_menu;
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyMenuBar
+
+1;
+
+package wxToolBar;
+
+use Wx qw[:everything];
+use base qw(Wx::ToolBar);
+use strict;
+
+sub new {
+    my( $self,  ) = @_;
+    # begin wxGlade: wxToolBar::new
+    $self = $self->SUPER::new( @_[1 .. $#_] );
+    $self->Realize();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class wxToolBar
+
+1;
+
+package MyDialogWithBases;
+
+use Wx qw[:everything];
+use base qw(Wx::Dialog);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyDialogWithBases::new
+    $style = wxDEFAULT_DIALOG_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("dialog");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyDialogWithBases
+
+1;
+
+package MyPanelWithBases;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyPanelWithBases::new
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyPanelWithBases
+
+1;
+
+package MyPanelScrolled;
+
+use Wx qw[:everything];
+use base qw(Wx::ScrolledWindow);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyPanelScrolled::new
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetScrollRate(10, 10);
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyPanelScrolled
+
+1;
+
+package MyApp;
+
+use base qw(Wx::App);
+use strict;
+
+sub OnInit {
+    my( $self ) = shift;
+
+    Wx::InitAllImageHandlers();
+
+    my $frame = MyFrame->new();
+
+    $self->SetTopWindow($frame);
+    $frame->Show(1);
+
+    return 1;
+}
+# end of class MyApp
+
+package main;
+
+unless(caller){
+    my $app = MyApp->new();
+    $app->MainLoop();
+}
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.wxg wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.wxg
--- wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="BasesEtc_w_sizers.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>400, 300</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <menubar>1</menubar>
+        <toolbar>1</toolbar>
+        <statusbar>1</statusbar>
+        <object class="wxMenuBar" name="frame_menubar" base="EditMenuBar">
+            <menus>
+            </menus>
+        </object>
+        <object class="wxStatusBar" name="frame_statusbar" base="EditStatusBar">
+            <fields>
+                <field width="-1">frame_statusbar</field>
+            </fields>
+        </object>
+        <object class="wxToolBar" name="frame_toolbar" base="EditToolBar">
+            <tools>
+            </tools>
+        </object>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="wxPanel" name="panel_x" base="EditPanel">
+                    <custom_base>mypanel.Panel</custom_base>
+                    <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
+                        <orient>wxVERTICAL</orient>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>0</border>
+                            <flag>wxEXPAND</flag>
+                            <object class="wxNotebook" name="notebook_1" base="EditNotebook">
+                                <style>wxNB_TOP</style>
+                                <tabs>
+                                    <tab window="notebook_1_pane_1">notebook_1_pane_1</tab>
+                                </tabs>
+                                <object class="wxPanel" name="notebook_1_pane_1" base="EditPanel">
+                                    <style>wxTAB_TRAVERSAL</style>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>0</border>
+                            <flag>wxALIGN_CENTER_HORIZONTAL</flag>
+                            <object class="spacer" name="spacer" base="EditSpacer">
+                                <width>20</width>
+                                <height>20</height>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>0</border>
+                            <flag>wxEXPAND</flag>
+                            <object class="wxSplitterWindow" name="window_1" base="EditSplitterWindow">
+                                <style>wxSP_3D</style>
+                                <min_pane_size>20</min_pane_size>
+                                <orientation>wxSPLIT_VERTICAL</orientation>
+                                <window_1>window_1_pane_1</window_1>
+                                <window_2>window_1_pane_2_scrolled</window_2>
+                                <object class="wxPanel" name="window_1_pane_1" base="EditPanel">
+                                    <background>#70db93</background>
+                                    <style>wxTAB_TRAVERSAL</style>
+                                </object>
+                                <object class="wxScrolledWindow" name="window_1_pane_2_scrolled" base="EditScrolledWindow">
+                                    <background>#238e23</background>
+                                    <style>wxTAB_TRAVERSAL</style>
+                                    <scrollable>1</scrollable>
+                                    <scroll_rate>10, 10</scroll_rate>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>3</border>
+                            <flag>wxALL|wxEXPAND</flag>
+                            <object class="wx.html.HtmlWindow" name="html" base="CustomWidget">
+                                <extracode>import wx.html</extracode>
+                                <arguments>
+                                    <argument>$parent</argument>
+                                    <argument>$id</argument>
+                                </arguments>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="MyFrameWithBases" name="frame_copy" base="EditFrame">
+        <custom_base>TestFrame,testframe.TestFrame</custom_base>
+        <size>400, 300</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <menubar>1</menubar>
+        <toolbar>1</toolbar>
+        <statusbar>1</statusbar>
+        <object class="wxMenuBar" name="frame_copy_menubar" base="EditMenuBar">
+            <menus>
+            </menus>
+        </object>
+        <object class="wxStatusBar" name="frame_copy_statusbar" base="EditStatusBar">
+            <fields>
+                <field width="-1">frame_copy_statusbar</field>
+            </fields>
+        </object>
+        <object class="wxToolBar" name="frame_copy_toolbar" base="EditToolBar">
+            <tools>
+            </tools>
+        </object>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="TestPanelWithBasesInFrame" name="panel_1" base="EditPanel">
+                    <custom_base>TestPanel,testpanel.TestPanel</custom_base>
+                    <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
+                        <orient>wxVERTICAL</orient>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>0</border>
+                            <flag>wxEXPAND</flag>
+                            <object class="TestNotebookWithBasesInFrame" name="notebook_1" base="EditNotebook">
+                                <custom_base>TestNotebook,testnotebook.TestNotebook</custom_base>
+                                <style>wxNB_TOP</style>
+                                <tabs>
+                                    <tab window="notebook_1_pane_1">notebook_1_pane_1</tab>
+                                </tabs>
+                                <object class="NotebookPageWithBases" name="notebook_1_pane_1" base="EditPanel">
+                                    <custom_base>NotebookPage,notebookpage.NotebookPage</custom_base>
+                                    <style>wxTAB_TRAVERSAL</style>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>0</border>
+                            <flag>wxEXPAND</flag>
+                            <object class="SplitterWindowWithBasesInFrame" name="window_1" base="EditSplitterWindow">
+                                <custom_base>TestSplitterWindow</custom_base>
+                                <style>wxSP_3D</style>
+                                <min_pane_size>20</min_pane_size>
+                                <orientation>wxSPLIT_VERTICAL</orientation>
+                                <window_1>window_1_pane_1</window_1>
+                                <window_2>window_1_pane_2</window_2>
+                                <object class="wxPanel" name="window_1_pane_1" base="EditPanel">
+                                    <background>#70db93</background>
+                                    <style>wxTAB_TRAVERSAL</style>
+                                </object>
+                                <object class="wxPanel" name="window_1_pane_2" base="EditPanel">
+                                    <background>#238e23</background>
+                                    <style>wxTAB_TRAVERSAL</style>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>3</border>
+                            <flag>wxALL|wxEXPAND</flag>
+                            <object class="wx.html.HtmlWindow" name="html" base="CustomWidget">
+                                <extracode>import wx.html</extracode>
+                                <arguments>
+                                    <argument>$parent</argument>
+                                    <argument>$id</argument>
+                                </arguments>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="MyDialog" name="dialog" base="EditDialog">
+        <size>400, 300</size>
+        <title>dialog</title>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyPanel" name="panel" base="EditTopLevelPanel">
+        <size>400, 300</size>
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyMDIChildFrame" name="frame_1" base="EditMDIChildFrame">
+        <size>400, 300</size>
+        <title>frame_1</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyMenuBar" name="menubar" base="EditMenuBar">
+        <menus>
+        </menus>
+    </object>
+    <object class="wxToolBar" name="toolbar" base="EditToolBar">
+        <tools>
+        </tools>
+    </object>
+    <object class="MyDialogWithBases" name="dialog_copy" base="EditDialog">
+        <custom_base>MyDialogBase,mydialogbases.MyDialogBase</custom_base>
+        <size>400, 300</size>
+        <title>dialog</title>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyPanelWithBases" name="panel_copy" base="EditTopLevelPanel">
+        <custom_base>MyPanelBase,mypanelbases.MyPanelBase</custom_base>
+        <size>400, 300</size>
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyPanelScrolled" name="panel_copy_scrolled" base="EditTopLevelScrolledWindow">
+        <size>400, 300</size>
+        <style>wxTAB_TRAVERSAL</style>
+        <scrollable>1</scrollable>
+        <scroll_rate>10, 10</scroll_rate>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.xrc wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.xrc
--- wxglade-0.9.6/tests/casefiles/BasesEtc_w_sizers.xrc	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc_w_sizers.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- generated by wxGlade -->
+
+<resource version="2.3.0.1">
+    <object class="wxFrame" name="frame" subclass="MyFrame">
+        <size>400, 300</size>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <title>frame</title>
+        <object class="wxMenuBar" name="frame_menubar">
+        </object>
+        <object class="wxStatusBar" name="frame_statusbar">
+            <fields>1</fields>
+            <widths>-1</widths>
+        </object>
+        <object class="wxToolBar" name="frame_toolbar">
+        </object>
+        <object class="wxBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <flag>wxEXPAND</flag>
+                <object class="wxPanel" name="panel_x">
+                    <custom_base>mypanel.Panel</custom_base>
+                    <object class="wxBoxSizer">
+                        <orient>wxVERTICAL</orient>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <flag>wxEXPAND</flag>
+                            <object class="wxNotebook" name="notebook_1">
+                                <usenotebooksizer>1</usenotebooksizer>
+                                <object class="notebookpage">
+                                <label>notebook_1_pane_1</label>
+                                <object class="wxPanel" name="notebook_1_pane_1">
+                                    <style>wxTAB_TRAVERSAL</style>
+                                </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="spacer">
+                            <size>20, 20</size>
+                            <flag>wxALIGN_CENTER_HORIZONTAL</flag>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <flag>wxEXPAND</flag>
+                            <object class="wxSplitterWindow" name="window_1">
+                                <min_pane_size>20</min_pane_size>
+                                <orientation>vertical</orientation>
+                                <object class="wxPanel" name="window_1_pane_1">
+                                    <bg>#70db93</bg>
+                                    <style>wxTAB_TRAVERSAL</style>
+                                </object>
+                                <object class="wxScrolledWindow" name="window_1_pane_2_scrolled">
+                                    <bg>#238e23</bg>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <flag>wxALL|wxEXPAND</flag>
+                            <border>3</border>
+                            <object class="wx.html.HtmlWindow" name="html">
+                                <extracode>import wx.html</extracode>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="wxFrame" name="frame_copy" subclass="MyFrameWithBases">
+        <custom_base>TestFrame,testframe.TestFrame</custom_base>
+        <size>400, 300</size>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <title>frame</title>
+        <object class="wxMenuBar" name="frame_copy_menubar">
+        </object>
+        <object class="wxStatusBar" name="frame_copy_statusbar">
+            <fields>1</fields>
+            <widths>-1</widths>
+        </object>
+        <object class="wxToolBar" name="frame_copy_toolbar">
+        </object>
+        <object class="wxBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <flag>wxEXPAND</flag>
+                <object class="wxPanel" name="panel_1" subclass="TestPanelWithBasesInFrame">
+                    <custom_base>TestPanel,testpanel.TestPanel</custom_base>
+                    <object class="wxBoxSizer">
+                        <orient>wxVERTICAL</orient>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <flag>wxEXPAND</flag>
+                            <object class="wxNotebook" name="notebook_1" subclass="TestNotebookWithBasesInFrame">
+                                <custom_base>TestNotebook,testnotebook.TestNotebook</custom_base>
+                                <usenotebooksizer>1</usenotebooksizer>
+                                <object class="notebookpage">
+                                <label>notebook_1_pane_1</label>
+                                <object class="wxPanel" name="notebook_1_pane_1" subclass="NotebookPageWithBases">
+                                    <custom_base>NotebookPage,notebookpage.NotebookPage</custom_base>
+                                    <style>wxTAB_TRAVERSAL</style>
+                                </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <flag>wxEXPAND</flag>
+                            <object class="wxSplitterWindow" name="window_1" subclass="SplitterWindowWithBasesInFrame">
+                                <custom_base>TestSplitterWindow</custom_base>
+                                <min_pane_size>20</min_pane_size>
+                                <orientation>vertical</orientation>
+                                <object class="wxPanel" name="window_1_pane_1">
+                                    <bg>#70db93</bg>
+                                    <style>wxTAB_TRAVERSAL</style>
+                                </object>
+                                <object class="wxPanel" name="window_1_pane_2">
+                                    <bg>#238e23</bg>
+                                    <style>wxTAB_TRAVERSAL</style>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <flag>wxALL|wxEXPAND</flag>
+                            <border>3</border>
+                            <object class="wx.html.HtmlWindow" name="html">
+                                <extracode>import wx.html</extracode>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="wxDialog" name="dialog" subclass="MyDialog">
+        <size>400, 300</size>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <title>dialog</title>
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="spacer">
+                <size>0, 0</size>
+            </object>
+        </object>
+    </object>
+    <object class="wxPanel" name="panel" subclass="MyPanel">
+        <size>400, 300</size>
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="spacer">
+                <size>0, 0</size>
+            </object>
+        </object>
+    </object>
+    <!-- code generator for wxMDIChildFrame objects not available -->
+    <object class="wxMenuBar" name="menubar">
+    </object>
+    <object class="wxToolBar" name="toolbar">
+    </object>
+    <object class="wxDialog" name="dialog_copy" subclass="MyDialogWithBases">
+        <custom_base>MyDialogBase,mydialogbases.MyDialogBase</custom_base>
+        <size>400, 300</size>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <title>dialog</title>
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="spacer">
+                <size>0, 0</size>
+            </object>
+        </object>
+    </object>
+    <object class="wxPanel" name="panel_copy" subclass="MyPanelWithBases">
+        <custom_base>MyPanelBase,mypanelbases.MyPanelBase</custom_base>
+        <size>400, 300</size>
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="spacer">
+                <size>0, 0</size>
+            </object>
+        </object>
+    </object>
+    <object class="wxScrolledWindow" name="panel_copy_scrolled" subclass="MyPanelScrolled">
+        <size>400, 300</size>
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="spacer">
+                <size>0, 0</size>
+            </object>
+        </object>
+    </object>
+</resource>
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc.wxg wxglade-1.0.1/tests/casefiles/BasesEtc.wxg
--- wxglade-0.9.6/tests/casefiles/BasesEtc.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,225 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.9.9pre on Fri Aug 21 14:15:51 2020 -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="BasesEtc.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>400, 300</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <menubar>1</menubar>
+        <toolbar>1</toolbar>
+        <statusbar>1</statusbar>
+        <object class="wxMenuBar" name="frame_menubar" base="EditMenuBar">
+            <menus>
+            </menus>
+        </object>
+        <object class="wxStatusBar" name="frame_statusbar" base="EditStatusBar">
+            <fields>
+                <field width="-1">frame_statusbar</field>
+            </fields>
+        </object>
+        <object class="wxToolBar" name="frame_toolbar" base="EditToolBar">
+            <tools>
+            </tools>
+        </object>
+        <object class="wxPanel" name="panel_x" base="EditPanel">
+            <custom_base>mypanel.Panel</custom_base>
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxNotebook" name="notebook_1" base="EditNotebook">
+                        <style>wxNB_TOP</style>
+                        <tabs>
+                            <tab window="notebook_1_pane_1">notebook_1_pane_1</tab>
+                        </tabs>
+                        <object class="wxPanel" name="notebook_1_pane_1" base="EditPanel">
+                            <style>wxTAB_TRAVERSAL</style>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <object class="spacer" name="spacer" base="EditSpacer">
+                        <width>20</width>
+                        <height>20</height>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxSplitterWindow" name="window_1" base="EditSplitterWindow">
+                        <style>wxSP_3D</style>
+                        <min_pane_size>20</min_pane_size>
+                        <orientation>wxSPLIT_VERTICAL</orientation>
+                        <window_1>window_1_pane_1</window_1>
+                        <window_2>window_1_pane_2_scrolled</window_2>
+                        <object class="wxPanel" name="window_1_pane_1" base="EditPanel">
+                            <style>wxTAB_TRAVERSAL</style>
+                        </object>
+                        <object class="wxScrolledWindow" name="window_1_pane_2_scrolled" base="EditScrolledWindow">
+                            <style>wxTAB_TRAVERSAL</style>
+                            <scrollable>1</scrollable>
+                            <scroll_rate>10, 10</scroll_rate>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>3</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wx.html.HtmlWindow" name="html" base="CustomWidget">
+                        <extracode>import wx.html</extracode>
+                        <arguments>
+                            <argument>$parent</argument>
+                            <argument>$id</argument>
+                        </arguments>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="MyFrameWithBases" name="frame_copy" base="EditFrame">
+        <custom_base>TestFrame,testframe.TestFrame</custom_base>
+        <size>400, 300</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <menubar>1</menubar>
+        <toolbar>1</toolbar>
+        <statusbar>1</statusbar>
+        <object class="mymenubar.MyMenuBar" name="frame_copy_menubar" base="EditMenuBar">
+            <extracode>import mymenubar\n</extracode>
+            <menus>
+            </menus>
+        </object>
+        <object class="mystatusbar.MyStatusBar" name="frame_copy_statusbar" base="EditStatusBar">
+            <extracode>import mystatusbar\n</extracode>
+            <fields>
+                <field width="-1">frame_copy_statusbar</field>
+            </fields>
+        </object>
+        <object class="mytoolbar.MyToolBar" name="frame_copy_toolbar" base="EditToolBar">
+            <extracode>import mytoolbar\n</extracode>
+            <tools>
+            </tools>
+        </object>
+        <object class="TestPanelWithBasesInFrame" name="panel_1" base="EditPanel" instance_class="mypanel.MyPanel">
+            <custom_base>TestPanel,testpanel.TestPanel</custom_base>
+            <extracode>import mypanel\n</extracode>
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="TestNotebookWithBasesInFrame" name="notebook_1" base="EditNotebook" instance_class="mynotebook.MyNoteBook">
+                        <custom_base>TestNotebook,testnotebook.TestNotebook</custom_base>
+                        <extracode>import mynotebook\n</extracode>
+                        <style>wxNB_TOP</style>
+                        <tabs>
+                            <tab window="notebook_1_pane_1">notebook_1_pane_1</tab>
+                        </tabs>
+                        <object class="NotebookPageWithBases" name="notebook_1_pane_1" base="EditPanel">
+                            <custom_base>NotebookPage,notebookpage.NotebookPage</custom_base>
+                            <style>wxTAB_TRAVERSAL</style>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="SplitterWindowWithBasesInFrame" name="window_1" base="EditSplitterWindow" instance_class="mysplitter.MySplitterWindow">
+                        <custom_base>TestSplitterWindow</custom_base>
+                        <extracode>import mysplitter\n</extracode>
+                        <style>wxSP_3D</style>
+                        <min_pane_size>20</min_pane_size>
+                        <orientation>wxSPLIT_VERTICAL</orientation>
+                        <window_1>window_1_pane_1</window_1>
+                        <window_2>window_1_pane_2</window_2>
+                        <object class="wxPanel" name="window_1_pane_1" base="EditPanel">
+                            <style>wxTAB_TRAVERSAL</style>
+                        </object>
+                        <object class="wxPanel" name="window_1_pane_2" base="EditPanel">
+                            <style>wxTAB_TRAVERSAL</style>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <border>3</border>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <object class="wx.html.HtmlWindow" name="html" base="CustomWidget">
+                        <extracode>import wx.html\n</extracode>
+                        <arguments>
+                            <argument>$parent</argument>
+                            <argument>$id</argument>
+                        </arguments>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="MyDialog" name="dialog" base="EditDialog">
+        <title>dialog</title>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyPanel" name="panel" base="EditTopLevelPanel">
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyMDIChildFrame" name="frame_1" base="EditMDIChildFrame">
+        <size>400, 300</size>
+        <title>frame_1</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyMenuBar" name="menubar" base="EditMenuBar">
+        <menus>
+        </menus>
+    </object>
+    <object class="wxToolBar" name="toolbar" base="EditToolBar">
+        <tools>
+        </tools>
+    </object>
+    <object class="MyDialogWithBases" name="dialog_copy" base="EditDialog">
+        <custom_base>MyDialogBase,mydialogbases.MyDialogBase</custom_base>
+        <title>dialog</title>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyPanelWithBases" name="panel_copy" base="EditTopLevelPanel">
+        <custom_base>MyPanelBase,mypanelbases.MyPanelBase</custom_base>
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyPanelScrolled" name="panel_copy_scrolled" base="EditTopLevelScrolledWindow">
+        <style>wxTAB_TRAVERSAL</style>
+        <scrollable>1</scrollable>
+        <scroll_rate>10, 10</scroll_rate>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/BasesEtc.xrc wxglade-1.0.1/tests/casefiles/BasesEtc.xrc
--- wxglade-0.9.6/tests/casefiles/BasesEtc.xrc	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/BasesEtc.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- generated by wxGlade -->
+
+<resource version="2.3.0.1">
+    <object class="wxFrame" name="frame" subclass="MyFrame">
+        <size>400, 300</size>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <title>frame</title>
+        <object class="wxMenuBar" name="frame_menubar">
+        </object>
+        <object class="wxStatusBar" name="frame_statusbar">
+            <fields>1</fields>
+            <widths>-1</widths>
+        </object>
+        <object class="wxToolBar" name="frame_toolbar">
+        </object>
+        <object class="wxPanel" name="panel_x">
+            <custom_base>mypanel.Panel</custom_base>
+            <object class="wxBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxNotebook" name="notebook_1">
+                        <usenotebooksizer>1</usenotebooksizer>
+                        <object class="notebookpage">
+                        <label>notebook_1_pane_1</label>
+                        <object class="wxPanel" name="notebook_1_pane_1">
+                            <style>wxTAB_TRAVERSAL</style>
+                        </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="spacer">
+                    <size>20, 20</size>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxSplitterWindow" name="window_1">
+                        <min_pane_size>20</min_pane_size>
+                        <orientation>vertical</orientation>
+                        <object class="wxPanel" name="window_1_pane_1">
+                            <style>wxTAB_TRAVERSAL</style>
+                        </object>
+                        <object class="wxScrolledWindow" name="window_1_pane_2_scrolled">
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>3</border>
+                    <object class="wx.html.HtmlWindow" name="html">
+                        <extracode>import wx.html</extracode>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="wxFrame" name="frame_copy" subclass="MyFrameWithBases">
+        <custom_base>TestFrame,testframe.TestFrame</custom_base>
+        <size>400, 300</size>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <title>frame</title>
+        <object class="wxMenuBar" name="frame_copy_menubar">
+        </object>
+        <object class="wxStatusBar" name="frame_copy_statusbar" subclass="mystatusbar.MyStatusBar">
+            <extracode>import mystatusbar\n</extracode>
+            <fields>1</fields>
+            <widths>-1</widths>
+        </object>
+        <object class="wxToolBar" name="frame_copy_toolbar">
+        </object>
+        <object class="wxPanel" name="panel_1" subclass="mypanel.MyPanel">
+            <custom_base>TestPanel,testpanel.TestPanel</custom_base>
+            <extracode>import mypanel\n</extracode>
+            <object class="wxBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxNotebook" name="notebook_1" subclass="mynotebook.MyNoteBook">
+                        <custom_base>TestNotebook,testnotebook.TestNotebook</custom_base>
+                        <extracode>import mynotebook\n</extracode>
+                        <usenotebooksizer>1</usenotebooksizer>
+                        <object class="notebookpage">
+                        <label>notebook_1_pane_1</label>
+                        <object class="wxPanel" name="notebook_1_pane_1" subclass="NotebookPageWithBases">
+                            <custom_base>NotebookPage,notebookpage.NotebookPage</custom_base>
+                            <style>wxTAB_TRAVERSAL</style>
+                        </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxSplitterWindow" name="window_1" subclass="mysplitter.MySplitterWindow">
+                        <custom_base>TestSplitterWindow</custom_base>
+                        <extracode>import mysplitter\n</extracode>
+                        <min_pane_size>20</min_pane_size>
+                        <orientation>vertical</orientation>
+                        <object class="wxPanel" name="window_1_pane_1">
+                            <style>wxTAB_TRAVERSAL</style>
+                        </object>
+                        <object class="wxPanel" name="window_1_pane_2">
+                            <style>wxTAB_TRAVERSAL</style>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>1</option>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>3</border>
+                    <object class="wx.html.HtmlWindow" name="html">
+                        <extracode>import wx.html\n</extracode>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="wxDialog" name="dialog" subclass="MyDialog">
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <title>dialog</title>
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="spacer">
+                <size>0, 0</size>
+            </object>
+        </object>
+    </object>
+    <object class="wxPanel" name="panel" subclass="MyPanel">
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="spacer">
+                <size>0, 0</size>
+            </object>
+        </object>
+    </object>
+    <!-- code generator for wxMDIChildFrame objects not available -->
+    <object class="wxMenuBar" name="menubar">
+    </object>
+    <object class="wxToolBar" name="toolbar">
+    </object>
+    <object class="wxDialog" name="dialog_copy" subclass="MyDialogWithBases">
+        <custom_base>MyDialogBase,mydialogbases.MyDialogBase</custom_base>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <title>dialog</title>
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="spacer">
+                <size>0, 0</size>
+            </object>
+        </object>
+    </object>
+    <object class="wxPanel" name="panel_copy" subclass="MyPanelWithBases">
+        <custom_base>MyPanelBase,mypanelbases.MyPanelBase</custom_base>
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="spacer">
+                <size>0, 0</size>
+            </object>
+        </object>
+    </object>
+    <object class="wxScrolledWindow" name="panel_copy_scrolled" subclass="MyPanelScrolled">
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="spacer">
+                <size>0, 0</size>
+            </object>
+        </object>
+    </object>
+</resource>
diff -Nru wxglade-0.9.6/tests/casefiles/bug163.cpp wxglade-1.0.1/tests/casefiles/bug163.cpp
--- wxglade-0.9.6/tests/casefiles/bug163.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug163.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,29 +20,13 @@
     wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
 {
     // begin wxGlade: MyFrame::MyFrame
-    label_1 = new wxStaticText(this, wxID_ANY, _("Extraproperty example"));
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(_("MyFrame"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    label_1 = new wxStaticText(this, wxID_ANY, _("Extraproperty example"));
     label_1->SetFont(wxFont(40, wxDEFAULT, wxNORMAL, wxNORMAL, 0, wxT("")));
     label_1->SetFoobar(1);
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
     sizer_1->Add(label_1, 1, wxALL, 5);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/bug163.h wxglade-1.0.1/tests/casefiles/bug163.h
--- wxglade-0.9.6/tests/casefiles/bug163.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug163.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug163.lisp wxglade-1.0.1/tests/casefiles/bug163.lisp
--- wxglade-0.9.6/tests/casefiles/bug163.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug163.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -26,8 +26,8 @@
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (label-1 :initform nil :accessor slot-label-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (label-1 :initform nil :accessor slot-label-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -40,24 +40,18 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Extraproperty example") -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"MyFrame"))
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Extraproperty example") -1 -1 -1 -1 0))
         (wxWindow_SetFont (slot-label-1 obj) (wxFont_Create 40 wxDEFAULT wxNORMAL wxNORMAL 0 "" wxFONTENCODING_DEFAULT))
         (wxStaticText_SetFoobar (slot-(slot-label-1 obj) obj) 1)
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
-        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 1 wxALL 5 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-MyFrame self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/bug163.pl wxglade-1.0.1/tests/casefiles/bug163.pl
--- wxglade-0.9.6/tests/casefiles/bug163.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug163.pl	2020-12-31 14:04:48.000000000 +0000
@@ -33,37 +33,25 @@
         unless defined $style;
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, _T("Extraproperty example"));
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle(_T("MyFrame"));
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, _T("Extraproperty example"));
     $self->{label_1}->SetFont(Wx::Font->new(40, wxDEFAULT, wxNORMAL, wxNORMAL, 0, ""));
     $self->{label_1}->SetFoobar(1);
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
-    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
     $self->{sizer_1}->Add($self->{label_1}, 1, wxALL, 5);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/bug163.py wxglade-1.0.1/tests/casefiles/bug163.py
--- wxglade-0.9.6/tests/casefiles/bug163.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug163.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,25 +18,18 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Extraproperty example"))
+        self.SetTitle(_("MyFrame"))
 
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
 
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle(_("MyFrame"))
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Extraproperty example"))
         self.label_1.SetFont(wx.Font(40, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ""))
         self.label_1.SetFoobar(1)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_1.Add(self.label_1, 1, wx.ALL, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug165.cpp wxglade-1.0.1/tests/casefiles/bug165.cpp
--- wxglade-0.9.6/tests/casefiles/bug165.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug165.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,53 +21,20 @@
 {
     // begin wxGlade: awxNotebook::awxNotebook
     notebook_1_pane_1 = new wxPanel(this, wxID_ANY);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void awxNotebook::set_properties()
-{
-    // begin wxGlade: awxNotebook::set_properties
     AddPage(notebook_1_pane_1, _("tab1"));
     // end wxGlade
 }
 
 
-void awxNotebook::do_layout()
-{
-    // begin wxGlade: awxNotebook::do_layout
-    // end wxGlade
-}
-
-
 MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: MyFrame::MyFrame
-    notebook_1 = new awxNotebook(this, wxID_ANY);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(_("frame_1"));
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    notebook_1 = new awxNotebook(this, wxID_ANY);
     sizer_1->Add(notebook_1, 1, 0, 0);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/bug165.h wxglade-1.0.1/tests/casefiles/bug165.h
--- wxglade-0.9.6/tests/casefiles/bug165.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug165.h	2020-12-31 14:04:48.000000000 +0000
@@ -37,10 +37,6 @@
     awxNotebook(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
 
 private:
-    // begin wxGlade: awxNotebook::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: awxNotebook::attributes
@@ -57,10 +53,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug165.lisp wxglade-1.0.1/tests/casefiles/bug165.lisp
--- wxglade-0.9.6/tests/casefiles/bug165.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug165.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -26,6 +26,8 @@
 
 (defclass awxNotebook()
         ((top-window :initform nil :accessor slot-top-window)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
         (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)))
 
 (defun make-awxNotebook ()
@@ -38,31 +40,21 @@
 (defmethod init ((obj awxNotebook))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: awxNotebook.__init__
+        
         (setf (slot-notebook-1-pane-1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj awxNotebook))
-        ;;; begin wxGlade: awxNotebook.__set_properties
         (wxNotebook_AddPage (slot-notebook_1_pane_1 obj) page (_"tab1") 1 -1);
         ;;; end wxGlade
         )
 
-(defmethod do-layout ((obj awxNotebook))
-        ;;; begin wxGlade: awxNotebook.__do_layout
-        pass
-        ;;; end wxGlade
-        )
-
 ;;; end of class awxNotebook
 
 
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
         (notebook-1 :initform nil :accessor slot-notebook-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -74,22 +66,16 @@
 (defmethod init ((obj MyFrame))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
-        (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxNB_TOP))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxNB_TOP))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 0 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/bug165.pl wxglade-1.0.1/tests/casefiles/bug165.pl
--- wxglade-0.9.6/tests/casefiles/bug165.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug165.pl	2020-12-31 14:04:48.000000000 +0000
@@ -29,31 +29,15 @@
 
     # begin wxGlade: awxNotebook::new
     $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
     $self->{notebook_1_pane_1} = Wx::Panel->new($self, wxID_ANY);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->AddPage($self->{notebook_1_pane_1}, _T("tab1"));
     # end wxGlade
     return $self;
 
 }
 
 
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: awxNotebook::__set_properties
-    $self->AddPage($self->{notebook_1_pane_1}, _T("tab1"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: awxNotebook::__do_layout
-    return;
-    # end wxGlade
-}
-
 # end of class awxNotebook
 
 1;
@@ -76,35 +60,23 @@
 
     # begin wxGlade: MyFrame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{notebook_1} = awxNotebook->new($self, wxID_ANY);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle(_T("frame_1"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{notebook_1} = awxNotebook->new($self, wxID_ANY);
     $self->{sizer_1}->Add($self->{notebook_1}, 1, 0, 0);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/bug165.py wxglade-1.0.1/tests/casefiles/bug165.py
--- wxglade-0.9.6/tests/casefiles/bug165.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug165.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,22 +18,11 @@
         # begin wxGlade: awxNotebook.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Notebook.__init__(self, *args, **kwds)
-        self.notebook_1_pane_1 = wx.Panel(self, wx.ID_ANY)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
 
-    def __set_properties(self):
-        # begin wxGlade: awxNotebook.__set_properties
+        self.notebook_1_pane_1 = wx.Panel(self, wx.ID_ANY)
         self.AddPage(self.notebook_1_pane_1, _("tab1"))
         # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: awxNotebook.__do_layout
-        pass
-        # end wxGlade
-
 # end of class awxNotebook
 
 class MyFrame(wx.Frame):
@@ -41,23 +30,16 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
-        self.notebook_1 = awxNotebook(self, wx.ID_ANY)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle(_("frame_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = awxNotebook(self, wx.ID_ANY)
         sizer_1.Add(self.notebook_1, 1, 0, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug166.cpp wxglade-1.0.1/tests/casefiles/bug166.cpp
--- wxglade-0.9.6/tests/casefiles/bug166.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug166.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,36 +20,20 @@
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: MyFrame::MyFrame
+    SetTitle(wxT("frame_1"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* sizer_2 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(sizer_2, 1, 0, 0);
     const wxString choice_1_choices[] = {
         wxT("Pure ASCII"),
         wxT("German Umlauts äöüÄÖÜß"),
     };
     choice_1 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, choice_1_choices);
-    label_1 = new wxStaticText(this, wxID_ANY, wxT("German Umlauts äöüÄÖÜß"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
-    SetTitle(wxT("frame_1"));
     choice_1->SetSelection(1);
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_2 = new wxBoxSizer(wxVERTICAL);
     sizer_2->Add(choice_1, 1, wxALL|wxEXPAND, 5);
+    label_1 = new wxStaticText(this, wxID_ANY, wxT("German Umlauts äöüÄÖÜß"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
     sizer_2->Add(label_1, 1, wxALL|wxEXPAND, 5);
-    sizer_1->Add(sizer_2, 1, 0, 0);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/bug166.h wxglade-1.0.1/tests/casefiles/bug166.h
--- wxglade-0.9.6/tests/casefiles/bug166.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug166.h	2020-12-31 14:04:48.000000000 +0000
@@ -30,10 +30,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug166.lisp wxglade-1.0.1/tests/casefiles/bug166.lisp
--- wxglade-0.9.6/tests/casefiles/bug166.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug166.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -28,10 +28,10 @@
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (choice-1 :initform nil :accessor slot-choice-1)
-        (label-1 :initform nil :accessor slot-label-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
         (sizer-2 :initform nil :accessor slot-sizer-2)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (choice-1 :initform nil :accessor slot-choice-1)
+        (label-1 :initform nil :accessor slot-label-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -43,27 +43,23 @@
 (defmethod init ((obj MyFrame))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
-        (setf (slot-choice-1 obj) (wxChoice_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 2 (vector "Pure ASCII" "German Umlauts äöüÄÖÜß")  0))
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "German Umlauts äöüÄÖÜß" -1 -1 -1 -1 wxALIGN_CENTER))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) "frame_1")
-        (wxChoice_SetSelection (slot-choice-1 obj) 1)
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
         (setf (slot-sizer-2 obj) (wxBoxSizer_Create wxVERTICAL))
+        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 1 0 0 nil)
+        
+        (setf (slot-choice-1 obj) (wxChoice_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 2 (vector "Pure ASCII" "German Umlauts äöüÄÖÜß")  0))
+        (wxChoice_SetSelection (slot-choice-1 obj) 1)
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-choice-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "German Umlauts äöüÄÖÜß" -1 -1 -1 -1 wxALIGN_CENTER_HORIZONTAL))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 1 0 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/bug166.pl wxglade-1.0.1/tests/casefiles/bug166.pl
--- wxglade-0.9.6/tests/casefiles/bug166.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug166.pl	2020-12-31 14:04:48.000000000 +0000
@@ -31,40 +31,30 @@
 
     # begin wxGlade: MyFrame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{choice_1} = Wx::Choice->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, ["Pure ASCII", "German Umlauts \N{U+00e4}\N{U+00f6}\N{U+00fc}\N{U+00c4}\N{U+00d6}\N{U+00dc}\N{U+00df}"], );
-    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, "German Umlauts \N{U+00e4}\N{U+00f6}\N{U+00fc}\N{U+00c4}\N{U+00d6}\N{U+00dc}\N{U+00df}", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle("frame_1");
-    $self->{choice_1}->SetSelection(1);
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{sizer_2} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_1}->Add($self->{sizer_2}, 1, 0, 0);
+    
+    $self->{choice_1} = Wx::Choice->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, ["Pure ASCII", "German Umlauts \N{U+00e4}\N{U+00f6}\N{U+00fc}\N{U+00c4}\N{U+00d6}\N{U+00dc}\N{U+00df}"], );
+    $self->{choice_1}->SetSelection(1);
     $self->{sizer_2}->Add($self->{choice_1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, "German Umlauts \N{U+00e4}\N{U+00f6}\N{U+00fc}\N{U+00c4}\N{U+00d6}\N{U+00dc}\N{U+00df}", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
     $self->{sizer_2}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_1}->Add($self->{sizer_2}, 1, 0, 0);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/bug166.py wxglade-1.0.1/tests/casefiles/bug166.py
--- wxglade-0.9.6/tests/casefiles/bug166.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug166.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,28 +18,23 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
-        self.choice_1 = wx.Choice(self, wx.ID_ANY, choices=["Pure ASCII", u"German Umlauts äöüÄÖÜß"])
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, u"German Umlauts äöüÄÖÜß", style=wx.ALIGN_CENTER)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle("frame_1")
-        self.choice_1.SetSelection(1)
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
+        sizer_1.Add(sizer_2, 1, 0, 0)
+
+        self.choice_1 = wx.Choice(self, wx.ID_ANY, choices=["Pure ASCII", u"German Umlauts äöüÄÖÜß"])
+        self.choice_1.SetSelection(1)
         sizer_2.Add(self.choice_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, u"German Umlauts äöüÄÖÜß", style=wx.ALIGN_CENTER_HORIZONTAL)
         sizer_2.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_1.Add(sizer_2, 1, 0, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug166.wxg wxglade-1.0.1/tests/casefiles/bug166.wxg
--- wxglade-0.9.6/tests/casefiles/bug166.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug166.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -28,7 +28,7 @@
                         <border>5</border>
                         <flag>wxALL|wxEXPAND</flag>
                         <object class="wxStaticText" name="label_1" base="EditStaticText">
-                            <style>wxALIGN_CENTER</style>
+                            <style>wxALIGN_CENTER_HORIZONTAL</style>
                             <label>German Umlauts äöüÄÖÜß</label>
                             <attribute>1</attribute>
                         </object>
diff -Nru wxglade-0.9.6/tests/casefiles/bug166.xrc wxglade-1.0.1/tests/casefiles/bug166.xrc
--- wxglade-0.9.6/tests/casefiles/bug166.xrc	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug166.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -28,7 +28,7 @@
                         <border>5</border>
                         <object class="wxStaticText" name="label_1">
                             <label>German Umlauts äöüÄÖÜß</label>
-                            <style>wxALIGN_CENTER</style>
+                            <style>wxALIGN_CENTER_HORIZONTAL</style>
                         </object>
                     </object>
                 </object>
diff -Nru wxglade-0.9.6/tests/casefiles/bug167.cpp wxglade-1.0.1/tests/casefiles/bug167.cpp
--- wxglade-0.9.6/tests/casefiles/bug167.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug167.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,31 +20,25 @@
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: MyFrame::MyFrame
-
-    set_properties();
-    do_layout();
+    SetTitle(_("frame_1"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    wxStaticText* label_1 = new wxStaticText(this, wxID_ANY, _("Just a text"));
+    sizer_1->Add(label_1, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    sizer_1->Fit(this);
+    Layout();
     // end wxGlade
 }
 
 
 void MyFrame::set_properties()
 {
-    // begin wxGlade: MyFrame::set_properties
-    SetTitle(_("frame_1"));
-    // end wxGlade
 }
 
 
 void MyFrame::do_layout()
 {
-    // begin wxGlade: MyFrame::do_layout
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
-    wxStaticText* label_1 = new wxStaticText(this, wxID_ANY, _("Just a text"));
-    sizer_1->Add(label_1, 0, 0, 0);
-    SetSizer(sizer_1);
-    sizer_1->Fit(this);
-    Layout();
-    // end wxGlade
 }
 
 // just an Unicode comment to raise an UnicodeDecodeError
diff -Nru wxglade-0.9.6/tests/casefiles/bug167.h wxglade-1.0.1/tests/casefiles/bug167.h
--- wxglade-0.9.6/tests/casefiles/bug167.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug167.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,8 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
     void set_properties();
     void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug167.lisp wxglade-1.0.1/tests/casefiles/bug167.lisp
--- wxglade-0.9.6/tests/casefiles/bug167.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug167.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -40,26 +40,26 @@
 (defmethod init ((obj MyFrame))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
         (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Just a text") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 0 0 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
 
+(defmethod set-properties ((obj MyFrame))
+        )
+
+(defmethod do-layout ((obj MyFrame))
+        )
+
 ;;; end of class MyFrame
 
 ;;; just an Unicode comment to raise an UnicodeDecodeError
diff -Nru wxglade-0.9.6/tests/casefiles/bug167.pl wxglade-1.0.1/tests/casefiles/bug167.pl
--- wxglade-0.9.6/tests/casefiles/bug167.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug167.pl	2020-12-31 14:04:48.000000000 +0000
@@ -32,10 +32,17 @@
 
     # begin wxGlade: MyFrame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->SetTitle(_T("frame_1"));
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    my $label_1 = Wx::StaticText->new($self, wxID_ANY, _T("Just a text"));
+    $self->{sizer_1}->Add($label_1, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->Fit($self);
+    
+    $self->Layout();
     # end wxGlade
     return $self;
 
@@ -44,21 +51,10 @@
 
 sub __set_properties {
     my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
-    $self->SetTitle(_T("frame_1"));
-    # end wxGlade
 }
 
 sub __do_layout {
     my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
-    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
-    my $label_1 = Wx::StaticText->new($self, wxID_ANY, _T("Just a text"));
-    $self->{sizer_1}->Add($label_1, 0, 0, 0);
-    $self->SetSizer($self->{sizer_1});
-    $self->{sizer_1}->Fit($self);
-    $self->Layout();
-    # end wxGlade
 }
 
 # end of class MyFrame
diff -Nru wxglade-0.9.6/tests/casefiles/bug167.py wxglade-1.0.1/tests/casefiles/bug167.py
--- wxglade-0.9.6/tests/casefiles/bug167.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug167.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,23 +19,16 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle(_("frame_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         label_1 = wx.StaticText(self, wx.ID_ANY, _("Just a text"))
         sizer_1.Add(label_1, 0, 0, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug167_utf8.cpp wxglade-1.0.1/tests/casefiles/bug167_utf8.cpp
--- wxglade-0.9.6/tests/casefiles/bug167_utf8.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug167_utf8.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,31 +20,25 @@
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: MyFrame::MyFrame
-
-    set_properties();
-    do_layout();
+    SetTitle(_("frame_1"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    wxStaticText* label_1 = new wxStaticText(this, wxID_ANY, _("Just a text"));
+    sizer_1->Add(label_1, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    sizer_1->Fit(this);
+    Layout();
     // end wxGlade
 }
 
 
 void MyFrame::set_properties()
 {
-    // begin wxGlade: MyFrame::set_properties
-    SetTitle(_("frame_1"));
-    // end wxGlade
 }
 
 
 void MyFrame::do_layout()
 {
-    // begin wxGlade: MyFrame::do_layout
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
-    wxStaticText* label_1 = new wxStaticText(this, wxID_ANY, _("Just a text"));
-    sizer_1->Add(label_1, 0, 0, 0);
-    SetSizer(sizer_1);
-    sizer_1->Fit(this);
-    Layout();
-    // end wxGlade
 }
 
 // just an Unicode comment to raise an UnicodeDecodeError
diff -Nru wxglade-0.9.6/tests/casefiles/bug167_utf8.h wxglade-1.0.1/tests/casefiles/bug167_utf8.h
--- wxglade-0.9.6/tests/casefiles/bug167_utf8.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug167_utf8.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,8 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
     void set_properties();
     void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug167_utf8.lisp wxglade-1.0.1/tests/casefiles/bug167_utf8.lisp
--- wxglade-0.9.6/tests/casefiles/bug167_utf8.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug167_utf8.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -40,26 +40,26 @@
 (defmethod init ((obj MyFrame))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
         (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Just a text") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 0 0 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
 
+(defmethod set-properties ((obj MyFrame))
+        )
+
+(defmethod do-layout ((obj MyFrame))
+        )
+
 ;;; end of class MyFrame
 
 ;;; just an Unicode comment to raise an UnicodeDecodeError
diff -Nru wxglade-0.9.6/tests/casefiles/bug167_utf8.pl wxglade-1.0.1/tests/casefiles/bug167_utf8.pl
--- wxglade-0.9.6/tests/casefiles/bug167_utf8.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug167_utf8.pl	2020-12-31 14:04:48.000000000 +0000
@@ -32,10 +32,17 @@
 
     # begin wxGlade: MyFrame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->SetTitle(_T("frame_1"));
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    my $label_1 = Wx::StaticText->new($self, wxID_ANY, _T("Just a text"));
+    $self->{sizer_1}->Add($label_1, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->Fit($self);
+    
+    $self->Layout();
     # end wxGlade
     return $self;
 
@@ -44,21 +51,10 @@
 
 sub __set_properties {
     my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
-    $self->SetTitle(_T("frame_1"));
-    # end wxGlade
 }
 
 sub __do_layout {
     my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
-    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
-    my $label_1 = Wx::StaticText->new($self, wxID_ANY, _T("Just a text"));
-    $self->{sizer_1}->Add($label_1, 0, 0, 0);
-    $self->SetSizer($self->{sizer_1});
-    $self->{sizer_1}->Fit($self);
-    $self->Layout();
-    # end wxGlade
 }
 
 # end of class MyFrame
diff -Nru wxglade-0.9.6/tests/casefiles/bug167_utf8.py wxglade-1.0.1/tests/casefiles/bug167_utf8.py
--- wxglade-0.9.6/tests/casefiles/bug167_utf8.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug167_utf8.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,26 +19,23 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle(_("frame_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         label_1 = wx.StaticText(self, wx.ID_ANY, _("Just a text"))
         sizer_1.Add(label_1, 0, 0, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
+    def __set_properties(self):
+
+    def __do_layout(self):
+
     # just an Unicode comment to raise an UnicodeDecodeError
     # We ♥ it!
 
diff -Nru wxglade-0.9.6/tests/casefiles/Bug179_Frame.c++ wxglade-1.0.1/tests/casefiles/Bug179_Frame.c++
--- wxglade-0.9.6/tests/casefiles/Bug179_Frame.c++	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Bug179_Frame.c++	2020-12-31 14:04:48.000000000 +0000
@@ -20,27 +20,11 @@
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: Bug179_Frame::Bug179_Frame
-    label_1 = new wxStaticText(this, wxID_ANY, _("Just a label"));
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void Bug179_Frame::set_properties()
-{
-    // begin wxGlade: Bug179_Frame::set_properties
     SetTitle(_("frame_1"));
-    // end wxGlade
-}
-
-
-void Bug179_Frame::do_layout()
-{
-    // begin wxGlade: Bug179_Frame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    label_1 = new wxStaticText(this, wxID_ANY, _("Just a label"));
     sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 5);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/Bug179_Frame.hpp wxglade-1.0.1/tests/casefiles/Bug179_Frame.hpp
--- wxglade-0.9.6/tests/casefiles/Bug179_Frame.hpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Bug179_Frame.hpp	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,6 @@
     Bug179_Frame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: Bug179_Frame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: Bug179_Frame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug183.cpp wxglade-1.0.1/tests/casefiles/bug183.cpp
--- wxglade-0.9.6/tests/casefiles/bug183.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug183.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,27 +20,11 @@
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: Bug183_UI_Frame::Bug183_UI_Frame
-    label_1 = new wxStaticText(this, wxID_ANY, _("Just a label"));
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void Bug183_UI_Frame::set_properties()
-{
-    // begin wxGlade: Bug183_UI_Frame::set_properties
     SetTitle(_("frame_1"));
-    // end wxGlade
-}
-
-
-void Bug183_UI_Frame::do_layout()
-{
-    // begin wxGlade: Bug183_UI_Frame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    label_1 = new wxStaticText(this, wxID_ANY, _("Just a label"));
     sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 5);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
@@ -52,27 +36,11 @@
     wxDialog(parent, id, title, pos, size, style)
 {
     // begin wxGlade: Bug173_UI_SomeDialog::Bug173_UI_SomeDialog
-    label_2 = new wxStaticText(this, wxID_ANY, _("Just another label"));
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void Bug173_UI_SomeDialog::set_properties()
-{
-    // begin wxGlade: Bug173_UI_SomeDialog::set_properties
     SetTitle(_("dialog_1"));
-    // end wxGlade
-}
-
-
-void Bug173_UI_SomeDialog::do_layout()
-{
-    // begin wxGlade: Bug173_UI_SomeDialog::do_layout
     wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL);
+    label_2 = new wxStaticText(this, wxID_ANY, _("Just another label"));
     sizer_2->Add(label_2, 1, wxALL|wxEXPAND, 5);
+    
     SetSizer(sizer_2);
     sizer_2->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/bug183.h wxglade-1.0.1/tests/casefiles/bug183.h
--- wxglade-0.9.6/tests/casefiles/bug183.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug183.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,6 @@
     Bug183_UI_Frame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: Bug183_UI_Frame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: Bug183_UI_Frame::attributes
@@ -56,10 +52,6 @@
     Bug173_UI_SomeDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
 
 private:
-    // begin wxGlade: Bug173_UI_SomeDialog::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: Bug173_UI_SomeDialog::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug183.lisp wxglade-1.0.1/tests/casefiles/bug183.lisp
--- wxglade-0.9.6/tests/casefiles/bug183.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug183.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -27,8 +27,8 @@
 
 (defclass Bug183::UI::Frame()
         ((top-window :initform nil :accessor slot-top-window)
-        (label-1 :initform nil :accessor slot-label-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (label-1 :initform nil :accessor slot-label-1)))
 
 (defun make-Bug183::UI::Frame ()
         (let ((obj (make-instance 'Bug183::UI::Frame)))
@@ -40,22 +40,16 @@
 (defmethod init ((obj Bug183::UI::Frame))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: Bug183::UI::Frame.__init__
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Just a label") -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj Bug183::UI::Frame))
-        ;;; begin wxGlade: Bug183::UI::Frame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj Bug183::UI::Frame))
-        ;;; begin wxGlade: Bug183::UI::Frame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Just a label") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-Frame183 self))
         ;;; end wxGlade
         )
@@ -66,10 +60,10 @@
 
 (defclass Bug173::UI::SomeDialog()
         ((top-window :initform nil :accessor slot-top-window)
-        (label-1 :initform nil :accessor slot-label-1)
         (sizer-1 :initform nil :accessor slot-sizer-1)
-        (label-2 :initform nil :accessor slot-label-2)
-        (sizer-2 :initform nil :accessor slot-sizer-2)))
+        (label-1 :initform nil :accessor slot-label-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (label-2 :initform nil :accessor slot-label-2)))
 
 (defun make-Bug173::UI::SomeDialog ()
         (let ((obj (make-instance 'Bug173::UI::SomeDialog)))
@@ -81,22 +75,16 @@
 (defmethod init ((obj Bug173::UI::SomeDialog))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: Bug173::UI::SomeDialog.__init__
-        (setf (slot-label-2 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Just another label") -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj Bug173::UI::SomeDialog))
-        ;;; begin wxGlade: Bug173::UI::SomeDialog.__set_properties
         (wxWindow_SetTitle (slot-dialog-1 self) (_"dialog_1"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj Bug173::UI::SomeDialog))
-        ;;; begin wxGlade: Bug173::UI::SomeDialog.__do_layout
+        
         (setf (slot-sizer-2 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
+        (setf (slot-label-2 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Just another label") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-label-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-2 obj))
         (wxSizer_Fit (slot-sizer-2 obj) (slot-top-window obj))
+        
         (wxWindow_layout (slot-dialog-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/bug183.pl wxglade-1.0.1/tests/casefiles/bug183.pl
--- wxglade-0.9.6/tests/casefiles/bug183.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug183.pl	2020-12-31 14:04:48.000000000 +0000
@@ -32,35 +32,23 @@
 
     # begin wxGlade: Bug183::UI::Frame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, _T("Just a label"));
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: Bug183::UI::Frame::__set_properties
     $self->SetTitle(_T("frame_1"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: Bug183::UI::Frame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, _T("Just a label"));
     $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class Bug183::UI::Frame
 
 1;
@@ -83,35 +71,23 @@
 
     # begin wxGlade: Bug173::UI::SomeDialog::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{label_2} = Wx::StaticText->new($self, wxID_ANY, _T("Just another label"));
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: Bug173::UI::SomeDialog::__set_properties
     $self->SetTitle(_T("dialog_1"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: Bug173::UI::SomeDialog::__do_layout
+    
     $self->{sizer_2} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{label_2} = Wx::StaticText->new($self, wxID_ANY, _T("Just another label"));
     $self->{sizer_2}->Add($self->{label_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->SetSizer($self->{sizer_2});
     $self->{sizer_2}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class Bug173::UI::SomeDialog
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/bug183.py wxglade-1.0.1/tests/casefiles/bug183.py
--- wxglade-0.9.6/tests/casefiles/bug183.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug183.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,23 +19,16 @@
         # begin wxGlade: Bug183_UI_Frame.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Just a label"))
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: Bug183_UI_Frame.__set_properties
         self.SetTitle(_("frame_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: Bug183_UI_Frame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Just a label"))
         sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
@@ -46,23 +39,16 @@
         # begin wxGlade: Bug173_UI_SomeDialog.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Dialog.__init__(self, *args, **kwds)
-        self.label_2 = wx.StaticText(self, wx.ID_ANY, _("Just another label"))
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: Bug173_UI_SomeDialog.__set_properties
         self.SetTitle(_("dialog_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: Bug173_UI_SomeDialog.__do_layout
         sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.label_2 = wx.StaticText(self, wx.ID_ANY, _("Just another label"))
         sizer_2.Add(self.label_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.SetSizer(sizer_2)
         sizer_2.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug183_Saved.wxg wxglade-1.0.1/tests/casefiles/bug183_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/bug183_Saved.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug183_Saved.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
+
+<application class="MyApp" encoding="UTF-8" for_version="2.8" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="perl" mark_blocks="1" name="app" option="0" overwrite="1" path="bug183.pl" source_extension=".cpp" top_window="Frame183" use_gettext="1" use_new_namespace="1">
+    <object class="Bug183::UI::Frame" name="Frame183" base="EditFrame">
+        <title>frame_1</title>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>5</border>
+                <flag>wxALL|wxEXPAND</flag>
+                <object class="wxStaticText" name="label_1" base="EditStaticText">
+                    <label>Just a label</label>
+                    <attribute>1</attribute>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="Bug173::UI::SomeDialog" name="dialog_1" base="EditDialog">
+        <title>dialog_1</title>
+        <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>5</border>
+                <flag>wxALL|wxEXPAND</flag>
+                <object class="wxStaticText" name="label_2" base="EditStaticText">
+                    <label>Just another label</label>
+                    <attribute>1</attribute>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/bug183.wxg wxglade-1.0.1/tests/casefiles/bug183.wxg
--- wxglade-0.9.6/tests/casefiles/bug183.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug183.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -9,7 +9,7 @@
             <object class="sizeritem">
                 <option>1</option>
                 <border>5</border>
-                <flag>wxALL|wxEXPAND</flag>
+                <flag>wxALL|wxEXPAND|wxALIGN_CENTER</flag>
                 <object class="wxStaticText" name="label_1" base="EditStaticText">
                     <label>Just a label</label>
                     <attribute>1</attribute>
diff -Nru wxglade-0.9.6/tests/casefiles/bug184.cpp wxglade-1.0.1/tests/casefiles/bug184.cpp
--- wxglade-0.9.6/tests/casefiles/bug184.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug184.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,28 +20,12 @@
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: Bug184_Frame::Bug184_Frame
-    label_1 = new wxStaticText(this, wxID_ANY, _("Just a label"));
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void Bug184_Frame::set_properties()
-{
-    // begin wxGlade: Bug184_Frame::set_properties
     SetTitle(_("frame_1"));
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BACKGROUND));
-    // end wxGlade
-}
-
-
-void Bug184_Frame::do_layout()
-{
-    // begin wxGlade: Bug184_Frame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    label_1 = new wxStaticText(this, wxID_ANY, _("Just a label"));
     sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 5);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/bug184.h wxglade-1.0.1/tests/casefiles/bug184.h
--- wxglade-0.9.6/tests/casefiles/bug184.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug184.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,6 @@
     Bug184_Frame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: Bug184_Frame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: Bug184_Frame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug184.lisp wxglade-1.0.1/tests/casefiles/bug184.lisp
--- wxglade-0.9.6/tests/casefiles/bug184.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug184.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -27,8 +27,8 @@
 
 (defclass Bug184_Frame()
         ((top-window :initform nil :accessor slot-top-window)
-        (label-1 :initform nil :accessor slot-label-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (label-1 :initform nil :accessor slot-label-1)))
 
 (defun make-Bug184_Frame ()
         (let ((obj (make-instance 'Bug184_Frame)))
@@ -40,23 +40,17 @@
 (defmethod init ((obj Bug184_Frame))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: Bug184_Frame.__init__
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Just a label") -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj Bug184_Frame))
-        ;;; begin wxGlade: Bug184_Frame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
         (wxWindow_SetBackgroundColour (slot-top-window obj) (wxSystemSettings_GetColour wxSYS_COLOUR_BACKGROUND))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj Bug184_Frame))
-        ;;; begin wxGlade: Bug184_Frame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Just a label") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-Frame184 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/bug184_Phoenix.py wxglade-1.0.1/tests/casefiles/bug184_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/bug184_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug184_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,24 +19,17 @@
         # begin wxGlade: Bug184_Frame.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Just a label"))
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: Bug184_Frame.__set_properties
         self.SetTitle(_("frame_1"))
         self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BACKGROUND))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: Bug184_Frame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Just a label"))
         sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug184.pl wxglade-1.0.1/tests/casefiles/bug184.pl
--- wxglade-0.9.6/tests/casefiles/bug184.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug184.pl	2020-12-31 14:04:48.000000000 +0000
@@ -32,36 +32,24 @@
 
     # begin wxGlade: Bug184_Frame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, _T("Just a label"));
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: Bug184_Frame::__set_properties
     $self->SetTitle(_T("frame_1"));
     $self->SetBackgroundColour(Wx::SystemSettings::GetColour(wxSYS_COLOUR_BACKGROUND));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: Bug184_Frame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, _T("Just a label"));
     $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class Bug184_Frame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/bug184.py wxglade-1.0.1/tests/casefiles/bug184.py
--- wxglade-0.9.6/tests/casefiles/bug184.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug184.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,24 +19,17 @@
         # begin wxGlade: Bug184_Frame.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Just a label"))
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: Bug184_Frame.__set_properties
         self.SetTitle(_("frame_1"))
         self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_BACKGROUND))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: Bug184_Frame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Just a label"))
         sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug184_Saved.wxg wxglade-1.0.1/tests/casefiles/bug184_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/bug184_Saved.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug184_Saved.wxg	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
-
-<application class="MyApp" encoding="UTF-8" for_version="2.8" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="perl" mark_blocks="1" name="app" option="0" overwrite="1" path="bug184.pl" source_extension=".cpp" top_window="Frame184" use_gettext="1" use_new_namespace="1">
-    <object class="Bug184_Frame" name="Frame184" base="EditFrame">
-        <background>wxSYS_COLOUR_BACKGROUND</background>
-        <title>frame_1</title>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <option>1</option>
-                <border>5</border>
-                <flag>wxALL|wxEXPAND</flag>
-                <object class="wxStaticText" name="label_1" base="EditStaticText">
-                    <label>Just a label</label>
-                    <attribute>1</attribute>
-                </object>
-            </object>
-        </object>
-    </object>
-</application>
diff -Nru wxglade-0.9.6/tests/casefiles/bug184.wxg wxglade-1.0.1/tests/casefiles/bug184.wxg
--- wxglade-0.9.6/tests/casefiles/bug184.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug184.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -10,7 +10,7 @@
             <object class="sizeritem">
                 <option>1</option>
                 <border>5</border>
-                <flag>wxALL|wxEXPAND|wxALIGN_CENTER</flag>
+                <flag>wxALL|wxEXPAND</flag>
                 <object class="wxStaticText" name="label_1" base="EditStaticText">
                     <label>Just a label</label>
                     <attribute>1</attribute>
diff -Nru wxglade-0.9.6/tests/casefiles/bug186.cpp wxglade-1.0.1/tests/casefiles/bug186.cpp
--- wxglade-0.9.6/tests/casefiles/bug186.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug186.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,6 +21,7 @@
 {
     // begin wxGlade: Frame186::Frame186
     SetSize(wxSize(300, 300));
+    SetTitle(_("frame_1"));
     Bug186_Frame_menubar = new wxMenuBar();
     File = new wxMenu();
     File->Append(myMagicMenu, _("Magic"), wxEmptyString);
@@ -30,35 +31,18 @@
     SetToolBar(Bug186_Frame_toolbar);
     Bug186_Frame_toolbar->AddTool(myMagicTool, _("Magic"), wxBitmap(32, 32), wxNullBitmap, wxITEM_NORMAL, _("Do a MAGIC action"), _("It's really MAGIC"));
     Bug186_Frame_toolbar->Realize();
-    text_ctrl_1 = new wxTextCtrl(this, wxID_ANY, _("Id: automatic (default behaviour)"));
-    text_ctrl_2 = new wxTextCtrl(this, 12123, _("Id: numeric value \"12123\""));
-    text_ctrl_3 = new wxTextCtrl(this, wxID_ANY, _("Id: predefined identify: \"wxID_ANY\""));
-    text_ctrl_4 = new wxTextCtrl(this, myButtonId, _("Id: variable assignment \"myButtonId=?\""));
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void Frame186::set_properties()
-{
-    // begin wxGlade: Frame186::set_properties
-    SetTitle(_("frame_1"));
-    // end wxGlade
-}
-
-
-void Frame186::do_layout()
-{
-    // begin wxGlade: Frame186::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer* sizer_2 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(sizer_2, 1, wxEXPAND, 0);
+    text_ctrl_1 = new wxTextCtrl(this, wxID_ANY, _("Id: automatic (default behaviour)"));
     sizer_2->Add(text_ctrl_1, 1, wxALL|wxEXPAND, 5);
+    text_ctrl_2 = new wxTextCtrl(this, 12123, _("Id: numeric value \"12123\""));
     sizer_2->Add(text_ctrl_2, 1, wxALL|wxEXPAND, 5);
+    text_ctrl_3 = new wxTextCtrl(this, wxID_ANY, _("Id: predefined identify: \"wxID_ANY\""));
     sizer_2->Add(text_ctrl_3, 1, wxALL|wxEXPAND, 5);
+    text_ctrl_4 = new wxTextCtrl(this, myButtonId, _("Id: variable assignment \"myButtonId=?\""));
     sizer_2->Add(text_ctrl_4, 1, wxALL|wxEXPAND, 5);
-    sizer_1->Add(sizer_2, 1, wxEXPAND, 0);
+    
     SetSizer(sizer_1);
     Layout();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/bug186.h wxglade-1.0.1/tests/casefiles/bug186.h
--- wxglade-0.9.6/tests/casefiles/bug186.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug186.h	2020-12-31 14:04:48.000000000 +0000
@@ -41,10 +41,6 @@
     Frame186(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: Frame186::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: Frame186::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug186.lisp wxglade-1.0.1/tests/casefiles/bug186.lisp
--- wxglade-0.9.6/tests/casefiles/bug186.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug186.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -32,12 +32,12 @@
         ((top-window :initform nil :accessor slot-top-window)
         (Bug186-Frame-menubar :initform nil :accessor slot-Bug186-Frame-menubar)
         (Bug186-Frame-toolbar :initform nil :accessor slot-Bug186-Frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
         (text-ctrl-1 :initform nil :accessor slot-text-ctrl-1)
         (text-ctrl-2 :initform nil :accessor slot-text-ctrl-2)
         (text-ctrl-3 :initform nil :accessor slot-text-ctrl-3)
-        (text-ctrl-4 :initform nil :accessor slot-text-ctrl-4)
-        (sizer-2 :initform nil :accessor slot-sizer-2)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (text-ctrl-4 :initform nil :accessor slot-text-ctrl-4)))
 
 (defun make-Frame186 ()
         (let ((obj (make-instance 'Frame186)))
@@ -50,6 +50,7 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: Frame186.__init__
         (slot-top-window obj).wxWindow_SetSize((300, 300))
+        (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
         
         ;;; Menu Bar
         (setf (slot-Bug186-Frame-menubar obj) (wxMenuBar_Create 0))
@@ -59,39 +60,35 @@
         		(wxMenuBar_Append (slot-Bug186-Frame-menubar obj) File (_"File")))
         (wxFrame_SetMenuBar (slot-top-window obj) (slot-Bug186-Frame-menubar obj))
         ;;; Menu Bar end
-
         
-	;;; Tool Bar
+        ;;; Tool Bar
         (setf (slot-Bug186-Frame-toolbar obj) (wxToolBar_Create (slot-top-window obj) -1 -1 -1 -1 -1 wxTB_HORIZONTAL))
-        (wxFrame_SetToolBar (slot-top-window obj) (slot-Bug186-Frame-toolbar obj))
         global myMagicTool; myMagicTool = wxNewId()
         (wxToolBar_AddTool (slot-Bug186-Frame-toolbar obj) myMagicTool (_"Magic") wxBitmap_Create(32 32) wxNullBitmap wxITEM_NORMAL (_"Do a MAGIC action") (_"It's really MAGIC"))
-        ;;; Tool Bar end
-        (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-top-window obj) wxID_ANY (_"Id: automatic (default behaviour)") -1 -1 -1 -1 0))
-        (setf (slot-text-ctrl-2 obj) (wxTextCtrl_Create (slot-top-window obj) 12123 (_"Id: numeric value \"12123\"") -1 -1 -1 -1 0))
-        (setf (slot-text-ctrl-3 obj) (wxTextCtrl_Create (slot-top-window obj) wxID_ANY (_"Id: predefined identify: \"wxID_ANY\"") -1 -1 -1 -1 0))
-        global myButtonId; myButtonId = wxNewId()
-        (setf (slot-text-ctrl-4 obj) (wxTextCtrl_Create (slot-top-window obj) myButtonId (_"Id: variable assignment \"myButtonId=?\"") -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj Frame186))
-        ;;; begin wxGlade: Frame186.__set_properties
-        (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
+        (wxFrame_SetToolBar (slot-top-window obj) (slot-Bug186-Frame-toolbar obj))
         (wxToolBar_Realize (slot-Bug186-Frame-toolbar obj))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj Frame186))
-        ;;; begin wxGlade: Frame186.__do_layout
+        ;;; Tool Bar end
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
         (setf (slot-sizer-2 obj) (wxBoxSizer_Create wxVERTICAL))
+        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-top-window obj) wxID_ANY (_"Id: automatic (default behaviour)") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-text-ctrl-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-text-ctrl-2 obj) (wxTextCtrl_Create (slot-top-window obj) 12123 (_"Id: numeric value \"12123\"") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-text-ctrl-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-text-ctrl-3 obj) (wxTextCtrl_Create (slot-top-window obj) wxID_ANY (_"Id: predefined identify: \"wxID_ANY\"") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-text-ctrl-3 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        global myButtonId; myButtonId = wxNewId()
+        (setf (slot-text-ctrl-4 obj) (wxTextCtrl_Create (slot-top-window obj) myButtonId (_"Id: variable assignment \"myButtonId=?\"") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-text-ctrl-4 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 1 wxEXPAND 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
         (wxFrame_layout (slot-Bug186-Frame self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/bug186_Phoenix.py wxglade-1.0.1/tests/casefiles/bug186_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/bug186_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug186_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -20,7 +20,8 @@
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((300, 300))
-        
+        self.SetTitle(_("frame_1"))
+
         # Menu Bar
         self.Bug186_Frame_menubar = wx.MenuBar()
         global myMagicMenu; myMagicMenu = wx.NewId()
@@ -29,39 +30,35 @@
         self.Bug186_Frame_menubar.Append(self.File, _("File"))
         self.SetMenuBar(self.Bug186_Frame_menubar)
         # Menu Bar end
-        
+
         # Tool Bar
         self.Bug186_Frame_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.Bug186_Frame_toolbar)
         global myMagicTool; myMagicTool = wx.NewId()
         self.Bug186_Frame_toolbar.AddTool(myMagicTool, _("Magic"), wx.Bitmap(32, 32), wx.NullBitmap, wx.ITEM_NORMAL, _("Do a MAGIC action"), _("It's really MAGIC"))
-        # Tool Bar end
-        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, _("Id: automatic (default behaviour)"))
-        self.text_ctrl_2 = wx.TextCtrl(self, 12123, _("Id: numeric value \"12123\""))
-        self.text_ctrl_3 = wx.TextCtrl(self, wx.ID_ANY, _("Id: predefined identify: \"wxID_ANY\""))
-        global myButtonId; myButtonId = wx.NewId()
-        self.text_ctrl_4 = wx.TextCtrl(self, myButtonId, _("Id: variable assignment \"myButtonId=?\""))
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: Frame186.__set_properties
-        self.SetTitle(_("frame_1"))
+        self.SetToolBar(self.Bug186_Frame_toolbar)
         self.Bug186_Frame_toolbar.Realize()
-        # end wxGlade
+        # Tool Bar end
 
-    def __do_layout(self):
-        # begin wxGlade: Frame186.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
+        sizer_1.Add(sizer_2, 1, wx.EXPAND, 0)
+
+        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, _("Id: automatic (default behaviour)"))
         sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.text_ctrl_2 = wx.TextCtrl(self, 12123, _("Id: numeric value \"12123\""))
         sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.text_ctrl_3 = wx.TextCtrl(self, wx.ID_ANY, _("Id: predefined identify: \"wxID_ANY\""))
         sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
+
+        global myButtonId; myButtonId = wx.NewId()
+        self.text_ctrl_4 = wx.TextCtrl(self, myButtonId, _("Id: variable assignment \"myButtonId=?\""))
         sizer_2.Add(self.text_ctrl_4, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_1.Add(sizer_2, 1, wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug186.pl wxglade-1.0.1/tests/casefiles/bug186.pl
--- wxglade-0.9.6/tests/casefiles/bug186.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug186.pl	2020-12-31 14:04:48.000000000 +0000
@@ -33,6 +33,8 @@
     # begin wxGlade: Frame186::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(300, 300));
+    $self->SetTitle(_T("frame_1"));
+    
     
 
     # Menu Bar
@@ -48,50 +50,42 @@
     # Menu Bar end
 
     
+    
     # Tool Bar
     $self->{Bug186_Frame_toolbar} = Wx::ToolBar->new($self, -1);
-    $self->SetToolBar($self->{Bug186_Frame_toolbar});
     use constant myMagicTool => Wx::NewId();
     $self->{Bug186_Frame_toolbar}->AddTool(myMagicTool, _T("Magic"), Wx::Bitmap->new(32, 32), wxNullBitmap, wxITEM_NORMAL, _T("Do a MAGIC action"), _T("It's really MAGIC"));
-    # Tool Bar end
-    $self->{text_ctrl_1} = Wx::TextCtrl->new($self, wxID_ANY, _T("Id: automatic (default behaviour)"));
-    $self->{text_ctrl_2} = Wx::TextCtrl->new($self, 12123, _T("Id: numeric value \"12123\""));
-    $self->{text_ctrl_3} = Wx::TextCtrl->new($self, wxID_ANY, _T("Id: predefined identify: \"wxID_ANY\""));
-    use constant myButtonId => Wx::NewId();
-    $self->{text_ctrl_4} = Wx::TextCtrl->new($self, myButtonId, _T("Id: variable assignment \"myButtonId=?\""));
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: Frame186::__set_properties
-    $self->SetTitle(_T("frame_1"));
+    $self->SetToolBar($self->{Bug186_Frame_toolbar});
     $self->{Bug186_Frame_toolbar}->Realize();
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: Frame186::__do_layout
+    # Tool Bar end
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{sizer_2} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_1}->Add($self->{sizer_2}, 1, wxEXPAND, 0);
+    
+    $self->{text_ctrl_1} = Wx::TextCtrl->new($self, wxID_ANY, _T("Id: automatic (default behaviour)"));
     $self->{sizer_2}->Add($self->{text_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{text_ctrl_2} = Wx::TextCtrl->new($self, 12123, _T("Id: numeric value \"12123\""));
     $self->{sizer_2}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{text_ctrl_3} = Wx::TextCtrl->new($self, wxID_ANY, _T("Id: predefined identify: \"wxID_ANY\""));
     $self->{sizer_2}->Add($self->{text_ctrl_3}, 1, wxALL|wxEXPAND, 5);
+    
+    use constant myButtonId => Wx::NewId();
+    $self->{text_ctrl_4} = Wx::TextCtrl->new($self, myButtonId, _T("Id: variable assignment \"myButtonId=?\""));
     $self->{sizer_2}->Add($self->{text_ctrl_4}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_1}->Add($self->{sizer_2}, 1, wxEXPAND, 0);
+    
     $self->SetSizer($self->{sizer_1});
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class Frame186
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/bug186.py wxglade-1.0.1/tests/casefiles/bug186.py
--- wxglade-0.9.6/tests/casefiles/bug186.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug186.py	2020-12-31 14:04:48.000000000 +0000
@@ -20,7 +20,8 @@
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((300, 300))
-        
+        self.SetTitle(_("frame_1"))
+
         # Menu Bar
         self.Bug186_Frame_menubar = wx.MenuBar()
         global myMagicMenu; myMagicMenu = wx.NewId()
@@ -29,39 +30,35 @@
         self.Bug186_Frame_menubar.Append(self.File, _("File"))
         self.SetMenuBar(self.Bug186_Frame_menubar)
         # Menu Bar end
-        
+
         # Tool Bar
         self.Bug186_Frame_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.Bug186_Frame_toolbar)
         global myMagicTool; myMagicTool = wx.NewId()
         self.Bug186_Frame_toolbar.AddLabelTool(myMagicTool, _("Magic"), wx.EmptyBitmap(32, 32), wx.NullBitmap, wx.ITEM_NORMAL, _("Do a MAGIC action"), _("It's really MAGIC"))
-        # Tool Bar end
-        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, _("Id: automatic (default behaviour)"))
-        self.text_ctrl_2 = wx.TextCtrl(self, 12123, _("Id: numeric value \"12123\""))
-        self.text_ctrl_3 = wx.TextCtrl(self, wx.ID_ANY, _("Id: predefined identify: \"wxID_ANY\""))
-        global myButtonId; myButtonId = wx.NewId()
-        self.text_ctrl_4 = wx.TextCtrl(self, myButtonId, _("Id: variable assignment \"myButtonId=?\""))
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: Frame186.__set_properties
-        self.SetTitle(_("frame_1"))
+        self.SetToolBar(self.Bug186_Frame_toolbar)
         self.Bug186_Frame_toolbar.Realize()
-        # end wxGlade
+        # Tool Bar end
 
-    def __do_layout(self):
-        # begin wxGlade: Frame186.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
+        sizer_1.Add(sizer_2, 1, wx.EXPAND, 0)
+
+        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, _("Id: automatic (default behaviour)"))
         sizer_2.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.text_ctrl_2 = wx.TextCtrl(self, 12123, _("Id: numeric value \"12123\""))
         sizer_2.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.text_ctrl_3 = wx.TextCtrl(self, wx.ID_ANY, _("Id: predefined identify: \"wxID_ANY\""))
         sizer_2.Add(self.text_ctrl_3, 1, wx.ALL | wx.EXPAND, 5)
+
+        global myButtonId; myButtonId = wx.NewId()
+        self.text_ctrl_4 = wx.TextCtrl(self, myButtonId, _("Id: variable assignment \"myButtonId=?\""))
         sizer_2.Add(self.text_ctrl_4, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_1.Add(sizer_2, 1, wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.cpp wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.cpp
--- wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,31 +21,15 @@
 {
     // begin wxGlade: MyFrame::MyFrame
     SetSize(wxSize(200, 200));
+    SetTitle(wxT("frame_1"));
     frame_1_toolbar = new wxToolBar(this, -1);
     SetToolBar(frame_1_toolbar);
     frame_1_toolbar->AddTool(wxID_UP, wxT("UpDown"), wxArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, wxSize(32, 32)), wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, wxSize(32, 32)), wxITEM_CHECK, wxT("Up or Down"), wxT("Up or Down"));
     frame_1_toolbar->Realize();
-    label_1 = new wxStaticText(this, wxID_ANY, wxT("placeholder - every design\nneeds a toplevel window"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
-    SetTitle(wxT("frame_1"));
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    label_1 = new wxStaticText(this, wxID_ANY, wxT("placeholder - every design\nneeds a toplevel window"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
     sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 0);
+    
     SetSizer(sizer_1);
     Layout();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.h wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.h
--- wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.h	2020-12-31 14:04:48.000000000 +0000
@@ -30,10 +30,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.lisp wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.lisp
--- wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -29,8 +29,8 @@
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
         (frame-1-toolbar :initform nil :accessor slot-frame-1-toolbar)
-        (label-1 :initform nil :accessor slot-label-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (label-1 :initform nil :accessor slot-label-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -43,28 +43,22 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
         (slot-top-window obj).wxWindow_SetSize((200, 200))
+        (wxFrame_SetTitle (slot-top-window obj) "frame_1")
         
-	;;; Tool Bar
+        ;;; Tool Bar
         (setf (slot-frame-1-toolbar obj) (wxToolBar_Create (slot-top-window obj) -1 -1 -1 -1 -1 wxTB_HORIZONTAL))
-        (wxFrame_SetToolBar (slot-top-window obj) (slot-frame-1-toolbar obj))
         (wxToolBar_AddTool (slot-frame-1-toolbar obj) wxID_UP "UpDown" wxArtProvider_GetBitmap(wxART_GO_UP wxART_OTHER wxSize_Create(32 32)) wxArtProvider_GetBitmap(wxART_GO_DOWN wxART_OTHER wxSize_Create(32 32)) wxITEM_CHECK "Up or Down" "Up or Down")
-        ;;; Tool Bar end
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "placeholder - every design\nneeds a toplevel window" -1 -1 -1 -1 wxALIGN_CENTER))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
-        (wxFrame_SetTitle (slot-top-window obj) "frame_1")
+        (wxFrame_SetToolBar (slot-top-window obj) (slot-frame-1-toolbar obj))
         (wxToolBar_Realize (slot-frame-1-toolbar obj))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        ;;; Tool Bar end
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "placeholder - every design\nneeds a toplevel window" -1 -1 -1 -1 wxALIGN_CENTER_HORIZONTAL))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_included_toolbar_Phoenix.py wxglade-1.0.1/tests/casefiles/bug188_included_toolbar_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/bug188_included_toolbar_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_included_toolbar_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,29 +19,22 @@
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((200, 200))
-        
+        self.SetTitle("frame_1")
+
         # Tool Bar
         self.frame_1_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.frame_1_toolbar)
         self.frame_1_toolbar.AddTool(wx.ID_UP, "UpDown", wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, "Up or Down", "Up or Down")
-        # Tool Bar end
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, "placeholder - every design\nneeds a toplevel window", style=wx.ALIGN_CENTER)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame_1")
+        self.SetToolBar(self.frame_1_toolbar)
         self.frame_1_toolbar.Realize()
-        # end wxGlade
+        # Tool Bar end
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, "placeholder - every design\nneeds a toplevel window", style=wx.ALIGN_CENTER_HORIZONTAL)
         sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.pl wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.pl
--- wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.pl	2020-12-31 14:04:48.000000000 +0000
@@ -32,41 +32,30 @@
     # begin wxGlade: MyFrame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(200, 200));
+    $self->SetTitle("frame_1");
+    
     
     # Tool Bar
     $self->{frame_1_toolbar} = Wx::ToolBar->new($self, -1);
-    $self->SetToolBar($self->{frame_1_toolbar});
     $self->{frame_1_toolbar}->AddTool(wxID_UP, "UpDown", Wx::ArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, Wx::Size->new(32, 32)), Wx::ArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, Wx::Size->new(32, 32)), wxITEM_CHECK, "Up or Down", "Up or Down");
-    # Tool Bar end
-    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, "placeholder - every design\nneeds a toplevel window", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
-    $self->SetTitle("frame_1");
+    $self->SetToolBar($self->{frame_1_toolbar});
     $self->{frame_1_toolbar}->Realize();
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
+    # Tool Bar end
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, "placeholder - every design\nneeds a toplevel window", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
     $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 0);
+    
     $self->SetSizer($self->{sizer_1});
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.py wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.py
--- wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,29 +19,22 @@
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((200, 200))
-        
+        self.SetTitle("frame_1")
+
         # Tool Bar
         self.frame_1_toolbar = wx.ToolBar(self, -1)
-        self.SetToolBar(self.frame_1_toolbar)
         self.frame_1_toolbar.AddLabelTool(wx.ID_UP, "UpDown", wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, "Up or Down", "Up or Down")
-        # Tool Bar end
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, "placeholder - every design\nneeds a toplevel window", style=wx.ALIGN_CENTER)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame_1")
+        self.SetToolBar(self.frame_1_toolbar)
         self.frame_1_toolbar.Realize()
-        # end wxGlade
+        # Tool Bar end
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, "placeholder - every design\nneeds a toplevel window", style=wx.ALIGN_CENTER_HORIZONTAL)
         sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_included_toolbar_Saved.wxg wxglade-1.0.1/tests/casefiles/bug188_included_toolbar_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/bug188_included_toolbar_Saved.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_included_toolbar_Saved.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -26,7 +26,7 @@
                 <border>0</border>
                 <flag>wxALL|wxEXPAND</flag>
                 <object class="wxStaticText" name="label_1" base="EditStaticText">
-                    <style>wxALIGN_CENTER</style>
+                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                     <label>placeholder - every design\nneeds a toplevel window</label>
                     <attribute>1</attribute>
                 </object>
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.xrc wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.xrc
--- wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.xrc	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_included_toolbar.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -22,7 +22,7 @@
                 <flag>wxALL|wxEXPAND</flag>
                 <object class="wxStaticText" name="label_1">
                     <label>placeholder - every design\nneeds a toplevel window</label>
-                    <style>wxALIGN_CENTER</style>
+                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                 </object>
             </object>
         </object>
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.cpp wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.cpp
--- wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,55 +20,22 @@
     wxToolBar(parent, id, pos, size, style)
 {
     // begin wxGlade: MyToolBar::MyToolBar
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyToolBar::set_properties()
-{
-    // begin wxGlade: MyToolBar::set_properties
     AddTool(wxID_UP, wxT("UpDown"), wxArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, wxSize(32, 32)), wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, wxSize(32, 32)), wxITEM_CHECK, wxT("Up or Down"), wxT("Up or Down"));
     Realize();
     // end wxGlade
 }
 
 
-void MyToolBar::do_layout()
-{
-    // begin wxGlade: MyToolBar::do_layout
-    // end wxGlade
-}
-
-
 MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: MyFrame::MyFrame
     SetSize(wxSize(200, 200));
-    label_1 = new wxStaticText(this, wxID_ANY, wxT("placeholder - every design\nneeds a toplevel window"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(wxT("frame_1"));
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    label_1 = new wxStaticText(this, wxID_ANY, wxT("placeholder - every design\nneeds a toplevel window"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
     sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 0);
+    
     SetSizer(sizer_1);
     Layout();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.h wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.h
--- wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.h	2020-12-31 14:04:48.000000000 +0000
@@ -30,10 +30,6 @@
     MyToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxTB_HORIZONTAL|wxNO_BORDER);
 
 private:
-    // begin wxGlade: MyToolBar::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyToolBar::attributes
@@ -49,10 +45,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.lisp wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.lisp
--- wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -39,29 +39,18 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyToolBar.__init__
         (wxToolBar_AddTool (slot-top-window obj) wxID_UP "UpDown" wxArtProvider_GetBitmap(wxART_GO_UP wxART_OTHER wxSize_Create(32 32)) wxArtProvider_GetBitmap(wxART_GO_DOWN wxART_OTHER wxSize_Create(32 32)) wxITEM_CHECK "Up or Down" "Up or Down")
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyToolBar))
-        ;;; begin wxGlade: MyToolBar.__set_properties
         (wxToolBar_Realize (slot-toolbar-1 obj))
         ;;; end wxGlade
         )
 
-(defmethod do-layout ((obj MyToolBar))
-        ;;; begin wxGlade: MyToolBar.__do_layout
-        pass
-        ;;; end wxGlade
-        )
-
 ;;; end of class MyToolBar
 
 
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (label-1 :initform nil :accessor slot-label-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (label-1 :initform nil :accessor slot-label-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -74,21 +63,15 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
         (slot-top-window obj).wxWindow_SetSize((200, 200))
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "placeholder - every design\nneeds a toplevel window" -1 -1 -1 -1 wxALIGN_CENTER))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) "frame_1")
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "placeholder - every design\nneeds a toplevel window" -1 -1 -1 -1 wxALIGN_CENTER_HORIZONTAL))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar_Phoenix.py wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,21 +19,9 @@
         kwds["style"] = kwds.get("style", 0)
         wx.ToolBar.__init__(self, *args, **kwds)
         self.AddTool(wx.ID_UP, "UpDown", wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, "Up or Down", "Up or Down")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyToolBar.__set_properties
         self.Realize()
         # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyToolBar.__do_layout
-        pass
-        # end wxGlade
-
 # end of class MyToolBar
 
 class MyFrame(wx.Frame):
@@ -42,22 +30,15 @@
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((200, 200))
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, "placeholder - every design\nneeds a toplevel window", style=wx.ALIGN_CENTER)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle("frame_1")
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, "placeholder - every design\nneeds a toplevel window", style=wx.ALIGN_CENTER_HORIZONTAL)
         sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.pl wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.pl
--- wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.pl	2020-12-31 14:04:48.000000000 +0000
@@ -25,30 +25,13 @@
     # begin wxGlade: MyToolBar::new
     $self = $self->SUPER::new( @_[1 .. $#_] );
     $self->AddTool(wxID_UP, "UpDown", Wx::ArtProvider::GetBitmap(wxART_GO_UP, wxART_OTHER, Wx::Size->new(32, 32)), Wx::ArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, Wx::Size->new(32, 32)), wxITEM_CHECK, "Up or Down", "Up or Down");
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->Realize();
     # end wxGlade
     return $self;
 
 }
 
 
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyToolBar::__set_properties
-    $self->Realize();
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyToolBar::__do_layout
-    return;
-    # end wxGlade
-}
-
 # end of class MyToolBar
 
 1;
@@ -71,34 +54,22 @@
     # begin wxGlade: MyFrame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(200, 200));
-    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, "placeholder - every design\nneeds a toplevel window", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle("frame_1");
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, "placeholder - every design\nneeds a toplevel window", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
     $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 0);
+    
     $self->SetSizer($self->{sizer_1});
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.py wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.py
--- wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,21 +19,9 @@
         kwds["style"] = kwds.get("style", 0)
         wx.ToolBar.__init__(self, *args, **kwds)
         self.AddLabelTool(wx.ID_UP, "UpDown", wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (32, 32)), wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (32, 32)), wx.ITEM_CHECK, "Up or Down", "Up or Down")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyToolBar.__set_properties
         self.Realize()
         # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyToolBar.__do_layout
-        pass
-        # end wxGlade
-
 # end of class MyToolBar
 
 class MyFrame(wx.Frame):
@@ -42,22 +30,15 @@
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((200, 200))
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, "placeholder - every design\nneeds a toplevel window", style=wx.ALIGN_CENTER)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle("frame_1")
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, "placeholder - every design\nneeds a toplevel window", style=wx.ALIGN_CENTER_HORIZONTAL)
         sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar_Saved.wxg wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar_Saved.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar_Saved.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -25,7 +25,7 @@
                 <border>0</border>
                 <flag>wxALL|wxEXPAND</flag>
                 <object class="wxStaticText" name="label_1" base="EditStaticText">
-                    <style>wxALIGN_CENTER</style>
+                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                     <label>placeholder - every design\nneeds a toplevel window</label>
                     <attribute>1</attribute>
                 </object>
diff -Nru wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.xrc wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.xrc
--- wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.xrc	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug188_standalone_toolbar.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -22,7 +22,7 @@
                 <flag>wxALL|wxEXPAND</flag>
                 <object class="wxStaticText" name="label_1">
                     <label>placeholder - every design\nneeds a toplevel window</label>
-                    <style>wxALIGN_CENTER</style>
+                    <style>wxALIGN_CENTER_HORIZONTAL</style>
                 </object>
             </object>
         </object>
diff -Nru wxglade-0.9.6/tests/casefiles/bug194.cpp wxglade-1.0.1/tests/casefiles/bug194.cpp
--- wxglade-0.9.6/tests/casefiles/bug194.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug194.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,61 +21,45 @@
 {
     // begin wxGlade: Frame194::Frame194
     SetSize(wxSize(800, 600));
+    SetTitle(_("frame_1"));
+    wxGridSizer* sizer_1 = new wxGridSizer(2, 3, 0, 0);
     const wxString list_box_single_choices[] = {
         _("Listbox wxLB_SINGLE"),
     };
     list_box_single = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 1, list_box_single_choices, wxLB_SINGLE);
+    list_box_single->SetSelection(0);
+    sizer_1->Add(list_box_single, 1, wxALL|wxEXPAND, 5);
     const wxString list_box_multiple_choices[] = {
         _("Listbox wxLB_MULTIPLE"),
     };
     list_box_multiple = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 1, list_box_multiple_choices, wxLB_MULTIPLE);
+    list_box_multiple->SetSelection(0);
+    sizer_1->Add(list_box_multiple, 1, wxALL|wxEXPAND, 5);
     const wxString list_box_extended_choices[] = {
         _("Listbox wxLB_EXTENDED"),
     };
     list_box_extended = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 1, list_box_extended_choices, wxLB_EXTENDED);
+    list_box_extended->SetSelection(0);
+    sizer_1->Add(list_box_extended, 1, wxALL|wxEXPAND, 5);
     const wxString check_list_box_single_choices[] = {
         _("CheckListBox wxLB_SINGLE"),
     };
     check_list_box_single = new wxCheckListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 1, check_list_box_single_choices, wxLB_SINGLE);
+    check_list_box_single->SetSelection(0);
+    sizer_1->Add(check_list_box_single, 1, wxALL|wxEXPAND, 5);
     const wxString check_list_box_multiple_choices[] = {
         _("CheckListBox wxLB_MULTIPLE"),
     };
     check_list_box_multiple = new wxCheckListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 1, check_list_box_multiple_choices, wxLB_MULTIPLE);
+    check_list_box_multiple->SetSelection(0);
+    sizer_1->Add(check_list_box_multiple, 1, wxALL|wxEXPAND, 5);
     const wxString check_list_box_extended_choices[] = {
         _("CheckListBox wxLB_EXTENDED"),
     };
     check_list_box_extended = new wxCheckListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 1, check_list_box_extended_choices, wxLB_EXTENDED);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void Frame194::set_properties()
-{
-    // begin wxGlade: Frame194::set_properties
-    SetTitle(_("frame_1"));
-    list_box_single->SetSelection(0);
-    list_box_multiple->SetSelection(0);
-    list_box_extended->SetSelection(0);
-    check_list_box_single->SetSelection(0);
-    check_list_box_multiple->SetSelection(0);
     check_list_box_extended->SetSelection(0);
-    // end wxGlade
-}
-
-
-void Frame194::do_layout()
-{
-    // begin wxGlade: Frame194::do_layout
-    wxGridSizer* sizer_1 = new wxGridSizer(2, 3, 0, 0);
-    sizer_1->Add(list_box_single, 1, wxALL|wxEXPAND, 5);
-    sizer_1->Add(list_box_multiple, 1, wxALL|wxEXPAND, 5);
-    sizer_1->Add(list_box_extended, 1, wxALL|wxEXPAND, 5);
-    sizer_1->Add(check_list_box_single, 1, wxALL|wxEXPAND, 5);
-    sizer_1->Add(check_list_box_multiple, 1, wxALL|wxEXPAND, 5);
     sizer_1->Add(check_list_box_extended, 1, wxALL|wxEXPAND, 5);
+    
     SetSizer(sizer_1);
     Layout();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/bug194.h wxglade-1.0.1/tests/casefiles/bug194.h
--- wxglade-0.9.6/tests/casefiles/bug194.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug194.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,6 @@
     Frame194(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: Frame194::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: Frame194::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/bug194.lisp wxglade-1.0.1/tests/casefiles/bug194.lisp
--- wxglade-0.9.6/tests/casefiles/bug194.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug194.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -28,13 +28,13 @@
 
 (defclass Frame194()
         ((top-window :initform nil :accessor slot-top-window)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
         (list-box-single :initform nil :accessor slot-list-box-single)
         (list-box-multiple :initform nil :accessor slot-list-box-multiple)
         (list-box-extended :initform nil :accessor slot-list-box-extended)
         (check-list-box-single :initform nil :accessor slot-check-list-box-single)
         (check-list-box-multiple :initform nil :accessor slot-check-list-box-multiple)
-        (check-list-box-extended :initform nil :accessor slot-check-list-box-extended)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (check-list-box-extended :initform nil :accessor slot-check-list-box-extended)))
 
 (defun make-Frame194 ()
         (let ((obj (make-instance 'Frame194)))
@@ -47,37 +47,36 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: Frame194.__init__
         (slot-top-window obj).wxWindow_SetSize((800, 600))
-        (setf (slot-list-box-single obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"Listbox wxLB_SINGLE")) wxLB_SINGLE))
-        (setf (slot-list-box-multiple obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"Listbox wxLB_MULTIPLE")) wxLB_MULTIPLE))
-        (setf (slot-list-box-extended obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"Listbox wxLB_EXTENDED")) wxLB_EXTENDED))
-        (setf (slot-check-list-box-single obj) (wxCheckListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"CheckListBox wxLB_SINGLE")) wxLB_SINGLE))
-        (setf (slot-check-list-box-multiple obj) (wxCheckListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"CheckListBox wxLB_MULTIPLE")) wxLB_MULTIPLE))
-        (setf (slot-check-list-box-extended obj) (wxCheckListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"CheckListBox wxLB_EXTENDED")) wxLB_EXTENDED))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj Frame194))
-        ;;; begin wxGlade: Frame194.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
-        (wxListBox_SetSelection (slot-list-box-single obj) 0)
-        (wxListBox_SetSelection (slot-list-box-multiple obj) 0)
-        (wxListBox_SetSelection (slot-list-box-extended obj) 0)
-        (wxCheckListBox_SetSelection (slot-check-list-box-single obj) 0)
-        (wxCheckListBox_SetSelection (slot-check-list-box-multiple obj) 0)
-        (wxCheckListBox_SetSelection (slot-check-list-box-extended obj) 0)
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj Frame194))
-        ;;; begin wxGlade: Frame194.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxGridSizer_Create 2 3 0 0))
+        
+        (setf (slot-list-box-single obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"Listbox wxLB_SINGLE")) wxLB_SINGLE))
+        (wxListBox_SetSelection (slot-list-box-single obj) 0)
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-list-box-single obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-list-box-multiple obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"Listbox wxLB_MULTIPLE")) wxLB_MULTIPLE))
+        (wxListBox_SetSelection (slot-list-box-multiple obj) 0)
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-list-box-multiple obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-list-box-extended obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"Listbox wxLB_EXTENDED")) wxLB_EXTENDED))
+        (wxListBox_SetSelection (slot-list-box-extended obj) 0)
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-list-box-extended obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-check-list-box-single obj) (wxCheckListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"CheckListBox wxLB_SINGLE")) wxLB_SINGLE))
+        (wxCheckListBox_SetSelection (slot-check-list-box-single obj) 0)
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-check-list-box-single obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-check-list-box-multiple obj) (wxCheckListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"CheckListBox wxLB_MULTIPLE")) wxLB_MULTIPLE))
+        (wxCheckListBox_SetSelection (slot-check-list-box-multiple obj) 0)
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-check-list-box-multiple obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-check-list-box-extended obj) (wxCheckListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 1 (vector (_"CheckListBox wxLB_EXTENDED")) wxLB_EXTENDED))
+        (wxCheckListBox_SetSelection (slot-check-list-box-extended obj) 0)
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-check-list-box-extended obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (wxWindow_SetSizer (slot-frame obj) (slot-sizer-1 obj))
+        
         (wxFrame_layout (slot-Bug194-Frame self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/bug194.pl wxglade-1.0.1/tests/casefiles/bug194.pl
--- wxglade-0.9.6/tests/casefiles/bug194.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug194.pl	2020-12-31 14:04:48.000000000 +0000
@@ -33,50 +33,43 @@
     # begin wxGlade: Frame194::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(800, 600));
-    $self->{list_box_single} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("Listbox wxLB_SINGLE")], wxLB_SINGLE);
-    $self->{list_box_multiple} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("Listbox wxLB_MULTIPLE")], wxLB_MULTIPLE);
-    $self->{list_box_extended} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("Listbox wxLB_EXTENDED")], wxLB_EXTENDED);
-    $self->{check_list_box_single} = Wx::CheckListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("CheckListBox wxLB_SINGLE")], wxLB_SINGLE);
-    $self->{check_list_box_multiple} = Wx::CheckListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("CheckListBox wxLB_MULTIPLE")], wxLB_MULTIPLE);
-    $self->{check_list_box_extended} = Wx::CheckListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("CheckListBox wxLB_EXTENDED")], wxLB_EXTENDED);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: Frame194::__set_properties
     $self->SetTitle(_T("frame_1"));
-    $self->{list_box_single}->SetSelection(0);
-    $self->{list_box_multiple}->SetSelection(0);
-    $self->{list_box_extended}->SetSelection(0);
-    $self->{check_list_box_single}->SetSelection(0);
-    $self->{check_list_box_multiple}->SetSelection(0);
-    $self->{check_list_box_extended}->SetSelection(0);
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: Frame194::__do_layout
+    
     $self->{sizer_1} = Wx::GridSizer->new(2, 3, 0, 0);
+    
+    $self->{list_box_single} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("Listbox wxLB_SINGLE")], wxLB_SINGLE);
+    $self->{list_box_single}->SetSelection(0);
     $self->{sizer_1}->Add($self->{list_box_single}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{list_box_multiple} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("Listbox wxLB_MULTIPLE")], wxLB_MULTIPLE);
+    $self->{list_box_multiple}->SetSelection(0);
     $self->{sizer_1}->Add($self->{list_box_multiple}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{list_box_extended} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("Listbox wxLB_EXTENDED")], wxLB_EXTENDED);
+    $self->{list_box_extended}->SetSelection(0);
     $self->{sizer_1}->Add($self->{list_box_extended}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{check_list_box_single} = Wx::CheckListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("CheckListBox wxLB_SINGLE")], wxLB_SINGLE);
+    $self->{check_list_box_single}->SetSelection(0);
     $self->{sizer_1}->Add($self->{check_list_box_single}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{check_list_box_multiple} = Wx::CheckListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("CheckListBox wxLB_MULTIPLE")], wxLB_MULTIPLE);
+    $self->{check_list_box_multiple}->SetSelection(0);
     $self->{sizer_1}->Add($self->{check_list_box_multiple}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{check_list_box_extended} = Wx::CheckListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [_T("CheckListBox wxLB_EXTENDED")], wxLB_EXTENDED);
+    $self->{check_list_box_extended}->SetSelection(0);
     $self->{sizer_1}->Add($self->{check_list_box_extended}, 1, wxALL|wxEXPAND, 5);
+    
     $self->SetSizer($self->{sizer_1});
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class Frame194
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/bug194.py wxglade-1.0.1/tests/casefiles/bug194.py
--- wxglade-0.9.6/tests/casefiles/bug194.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/bug194.py	2020-12-31 14:04:48.000000000 +0000
@@ -20,38 +20,36 @@
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((800, 600))
-        self.list_box_single = wx.ListBox(self, wx.ID_ANY, choices=[_("Listbox wxLB_SINGLE")])
-        self.list_box_multiple = wx.ListBox(self, wx.ID_ANY, choices=[_("Listbox wxLB_MULTIPLE")], style=wx.LB_MULTIPLE)
-        self.list_box_extended = wx.ListBox(self, wx.ID_ANY, choices=[_("Listbox wxLB_EXTENDED")], style=wx.LB_EXTENDED)
-        self.check_list_box_single = wx.CheckListBox(self, wx.ID_ANY, choices=[_("CheckListBox wxLB_SINGLE")], style=wx.LB_SINGLE)
-        self.check_list_box_multiple = wx.CheckListBox(self, wx.ID_ANY, choices=[_("CheckListBox wxLB_MULTIPLE")], style=wx.LB_MULTIPLE)
-        self.check_list_box_extended = wx.CheckListBox(self, wx.ID_ANY, choices=[_("CheckListBox wxLB_EXTENDED")], style=wx.LB_EXTENDED)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: Frame194.__set_properties
         self.SetTitle(_("frame_1"))
-        self.list_box_single.SetSelection(0)
-        self.list_box_multiple.SetSelection(0)
-        self.list_box_extended.SetSelection(0)
-        self.check_list_box_single.SetSelection(0)
-        self.check_list_box_multiple.SetSelection(0)
-        self.check_list_box_extended.SetSelection(0)
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: Frame194.__do_layout
         sizer_1 = wx.GridSizer(2, 3, 0, 0)
+
+        self.list_box_single = wx.ListBox(self, wx.ID_ANY, choices=[_("Listbox wxLB_SINGLE")])
+        self.list_box_single.SetSelection(0)
         sizer_1.Add(self.list_box_single, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.list_box_multiple = wx.ListBox(self, wx.ID_ANY, choices=[_("Listbox wxLB_MULTIPLE")], style=wx.LB_MULTIPLE)
+        self.list_box_multiple.SetSelection(0)
         sizer_1.Add(self.list_box_multiple, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.list_box_extended = wx.ListBox(self, wx.ID_ANY, choices=[_("Listbox wxLB_EXTENDED")], style=wx.LB_EXTENDED)
+        self.list_box_extended.SetSelection(0)
         sizer_1.Add(self.list_box_extended, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.check_list_box_single = wx.CheckListBox(self, wx.ID_ANY, choices=[_("CheckListBox wxLB_SINGLE")], style=wx.LB_SINGLE)
+        self.check_list_box_single.SetSelection(0)
         sizer_1.Add(self.check_list_box_single, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.check_list_box_multiple = wx.CheckListBox(self, wx.ID_ANY, choices=[_("CheckListBox wxLB_MULTIPLE")], style=wx.LB_MULTIPLE)
+        self.check_list_box_multiple.SetSelection(0)
         sizer_1.Add(self.check_list_box_multiple, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.check_list_box_extended = wx.CheckListBox(self, wx.ID_ANY, choices=[_("CheckListBox wxLB_EXTENDED")], style=wx.LB_EXTENDED)
+        self.check_list_box_extended.SetSelection(0)
         sizer_1.Add(self.check_list_box_extended, 1, wx.ALL | wx.EXPAND, 5)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/Bugs_2018-01-16_Classic.py wxglade-1.0.1/tests/casefiles/Bugs_2018-01-16_Classic.py
--- wxglade-0.9.6/tests/casefiles/Bugs_2018-01-16_Classic.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Bugs_2018-01-16_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,18 +17,6 @@
         # begin wxGlade: YPanel.__init__
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
         wx.Panel.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: YPanel.__set_properties
-        pass
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: YPanel.__do_layout
         self.Layout()
         # end wxGlade
 
@@ -39,18 +27,6 @@
         # begin wxGlade: XPanel.__init__
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
         wx.Panel.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: XPanel.__set_properties
-        pass
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: XPanel.__do_layout
         self.Layout()
         # end wxGlade
 
@@ -62,26 +38,33 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.panel_1 = YPanel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.panel_1, "Panel 1")
+
         self.panel_2 = XPanel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.panel_2, "Panel 2")
 
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
+        self.SetSizer(sizer_1)
 
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame")
+        self.Layout()
         # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        self.notebook_1.AddPage(self.panel_1, "Panel 1")
-        self.notebook_1.AddPage(self.panel_2, "Panel 2")
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        self.SetSizer(sizer_1)
+# end of class MyFrame
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/Bugs_2018-01-16_Phoenix.py wxglade-1.0.1/tests/casefiles/Bugs_2018-01-16_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/Bugs_2018-01-16_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Bugs_2018-01-16_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,18 +17,6 @@
         # begin wxGlade: YPanel.__init__
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
         wx.Panel.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: YPanel.__set_properties
-        pass
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: YPanel.__do_layout
         self.Layout()
         # end wxGlade
 
@@ -39,18 +27,6 @@
         # begin wxGlade: XPanel.__init__
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
         wx.Panel.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: XPanel.__set_properties
-        pass
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: XPanel.__do_layout
         self.Layout()
         # end wxGlade
 
@@ -62,26 +38,33 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.panel_1 = YPanel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.panel_1, "Panel 1")
+
         self.panel_2 = XPanel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.panel_2, "Panel 2")
 
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
+        self.SetSizer(sizer_1)
 
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame")
+        self.Layout()
         # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        self.notebook_1.AddPage(self.panel_1, "Panel 1")
-        self.notebook_1.AddPage(self.panel_2, "Panel 2")
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        self.SetSizer(sizer_1)
+# end of class MyFrame
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/CalendarCtrl.cpp wxglade-1.0.1/tests/casefiles/CalendarCtrl.cpp
--- wxglade-0.9.6/tests/casefiles/CalendarCtrl.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CalendarCtrl.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,27 +20,11 @@
     wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
 {
     // begin wxGlade: MyDialog::MyDialog
-    calendar_ctrl_1 = new wxCalendarCtrl(this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, 0);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyDialog::set_properties()
-{
-    // begin wxGlade: MyDialog::set_properties
     SetTitle(wxT("dialog_1"));
-    // end wxGlade
-}
-
-
-void MyDialog::do_layout()
-{
-    // begin wxGlade: MyDialog::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxHORIZONTAL);
+    calendar_ctrl_1 = new wxCalendarCtrl(this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, 0);
     sizer_1->Add(calendar_ctrl_1, 0, 0, 0);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/CalendarCtrl.h wxglade-1.0.1/tests/casefiles/CalendarCtrl.h
--- wxglade-0.9.6/tests/casefiles/CalendarCtrl.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CalendarCtrl.h	2020-12-31 14:04:48.000000000 +0000
@@ -31,10 +31,6 @@
     MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
 
 private:
-    // begin wxGlade: MyDialog::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyDialog::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/CalendarCtrl_Phoenix.py wxglade-1.0.1/tests/casefiles/CalendarCtrl_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/CalendarCtrl_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CalendarCtrl_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -4,9 +4,9 @@
 #
 
 import wx
-import wx.adv
 
 # begin wxGlade: dependencies
+import wx.adv
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -18,23 +18,16 @@
         # begin wxGlade: MyDialog.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
         wx.Dialog.__init__(self, *args, **kwds)
-        self.calendar_ctrl_1 = wx.adv.CalendarCtrl(self, wx.ID_ANY, style=0)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyDialog.__set_properties
         self.SetTitle("dialog_1")
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyDialog.__do_layout
         sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.calendar_ctrl_1 = wx.adv.CalendarCtrl(self, wx.ID_ANY, style=0)
         sizer_1.Add(self.calendar_ctrl_1, 0, 0, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/CalendarCtrl.pl wxglade-1.0.1/tests/casefiles/CalendarCtrl.pl
--- wxglade-0.9.6/tests/casefiles/CalendarCtrl.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CalendarCtrl.pl	2020-12-31 14:04:48.000000000 +0000
@@ -32,35 +32,23 @@
         unless defined $style;
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{calendar_ctrl_1} = Wx::CalendarCtrl->new($self, wxID_ANY, Wx::DateTime->new, wxDefaultPosition, wxDefaultSize, 0);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyDialog::__set_properties
     $self->SetTitle("dialog_1");
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyDialog::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{calendar_ctrl_1} = Wx::CalendarCtrl->new($self, wxID_ANY, Wx::DateTime->new, wxDefaultPosition, wxDefaultSize, 0);
     $self->{sizer_1}->Add($self->{calendar_ctrl_1}, 0, 0, 0);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyDialog
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/CalendarCtrl.py wxglade-1.0.1/tests/casefiles/CalendarCtrl.py
--- wxglade-0.9.6/tests/casefiles/CalendarCtrl.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CalendarCtrl.py	2020-12-31 14:04:48.000000000 +0000
@@ -4,9 +4,9 @@
 #
 
 import wx
-import wx.calendar
 
 # begin wxGlade: dependencies
+import wx.calendar
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -18,23 +18,16 @@
         # begin wxGlade: MyDialog.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
         wx.Dialog.__init__(self, *args, **kwds)
-        self.calendar_ctrl_1 = wx.calendar.CalendarCtrl(self, wx.ID_ANY, style=0)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyDialog.__set_properties
         self.SetTitle("dialog_1")
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyDialog.__do_layout
         sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.calendar_ctrl_1 = wx.calendar.CalendarCtrl(self, wx.ID_ANY, style=0)
         sizer_1.Add(self.calendar_ctrl_1, 0, 0, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample_30_Classic.py wxglade-1.0.1/tests/casefiles/ComplexExample_30_Classic.py
--- wxglade-0.9.6/tests/casefiles/ComplexExample_30_Classic.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample_30_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,10 +5,10 @@
 #
 
 import wx
-import wx.grid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.grid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -21,7 +21,8 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((600, 500))
-        
+        self.SetTitle(_("mp3 2 ogg"))
+
         # Menu Bar
         self.Mp3_To_Ogg_menubar = wx.MenuBar()
         wxglade_tmp_menu = wx.Menu()
@@ -36,108 +37,134 @@
         self.Mp3_To_Ogg_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.Mp3_To_Ogg_menubar)
         # Menu Bar end
+
         self.Mp3_To_Ogg_statusbar = self.CreateStatusBar(2)
-        
+        self.Mp3_To_Ogg_statusbar.SetStatusWidths([-2, -1])
+        # statusbar fields
+        Mp3_To_Ogg_statusbar_fields = [_("Mp3_To_Ogg_statusbar"), ""]
+        for i in range(len(Mp3_To_Ogg_statusbar_fields)):
+            self.Mp3_To_Ogg_statusbar.SetStatusText(Mp3_To_Ogg_statusbar_fields[i], i)
+
         # Tool Bar
-        self.Mp3_To_Ogg_toolbar = wx.ToolBar(self, -1, style=wx.TB_HORIZONTAL | wx.TB_TEXT)
-        self.SetToolBar(self.Mp3_To_Ogg_toolbar)
+        self.Mp3_To_Ogg_toolbar = wx.ToolBar(self, -1, style=wx.TB_TEXT)
         self.Mp3_To_Ogg_toolbar.AddLabelTool(wx.ID_OPEN, _("&Open"), wx.NullBitmap, wx.NullBitmap, wx.ITEM_NORMAL, _("Open a file"), _("Open a MP3 file to convert into OGG format"))
+        self.Bind(wx.EVT_TOOL, self.OnOpen, id=wx.ID_OPEN)
+        self.SetToolBar(self.Mp3_To_Ogg_toolbar)
+        self.Mp3_To_Ogg_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
+
+        _gszr_pane1 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        _lbl_input_filename = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
+        _gszr_pane1.Add(_lbl_input_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        _gszr_pane1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
+
         self.button_3 = wx.Button(self.notebook_1_pane_1, wx.ID_OPEN, "")
+        _gszr_pane1.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
+
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.rbx_sampling_rate = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Sampling Rate"), choices=[_("44 kbit"), _("128 kbit")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.rbx_sampling_rate.SetSelection(0)
+        sizer_4.Add(self.rbx_sampling_rate, 1, wx.ALL | wx.EXPAND, 5)
+
+        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Misc")), wx.HORIZONTAL)
+        sizer_4.Add(sizer_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.cbx_love = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _(u"♥ Love this song"))
+        self.cbx_love.SetToolTip(wx.ToolTip(_(u"Yes!\nWe ♥ it!")))
+        self.cbx_love.SetValue(1)
+        sizer_3.Add(self.cbx_love, 0, wx.ALL | wx.SHAPED, 5)
+
         self.notebook_1_pane_3 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
+
+        _szr_pane3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_pane_3, wx.ID_ANY, "", style=wx.TE_MULTILINE)
+        _szr_pane3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_pane_4 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
+
+        _gszr_pane4 = wx.FlexGridSizer(2, 3, 0, 0)
+
         self._lbl_output_filename = wx.StaticText(self.notebook_1_pane_4, wx.ID_ANY, _("File name:"))
+        _gszr_pane4.Add(self._lbl_output_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_pane_4, wx.ID_ANY, "")
+        self.text_ctrl_3.SetToolTip(wx.ToolTip(_("File name of the output file\nAn existing file will be overwritten without futher information!")))
+        _gszr_pane4.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
+
         self.button_4 = wx.Button(self.notebook_1_pane_4, wx.ID_OPEN, "")
+        _gszr_pane4.Add(self.button_4, 0, wx.ALL, 5)
+
+        _gszr_pane4.Add((20, 20), 0, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_pane_4, wx.ID_ANY, _("Overwrite existing file"))
+        self.checkbox_1.SetToolTip(wx.ToolTip(_("Overwrite an existing file")))
+        self.checkbox_1.SetValue(1)
+        _gszr_pane4.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        _gszr_pane4.Add((20, 20), 0, 0, 0)
+
         self.notebook_1_pane_5 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_5, _("Some Text"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_1 = wx.StaticText(self.notebook_1_pane_5, wx.ID_ANY, _("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\na backslash and a t \\t\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"))
+        sizer_5.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
         self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
+        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_2 = wx.Button(self, wx.ID_CANCEL, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.notebook_1_pane_5.SetSizer(sizer_5)
 
-        self.Bind(wx.EVT_TOOL, self.OnOpen, id=wx.ID_OPEN)
-        self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
-        # end wxGlade
+        _gszr_pane4.AddGrowableCol(1)
+        self.notebook_1_pane_4.SetSizer(_gszr_pane4)
 
-    def __set_properties(self):
-        # begin wxGlade: PyOgg2_MyFrame.__set_properties
-        self.SetTitle(_("mp3 2 ogg"))
-        self.Mp3_To_Ogg_statusbar.SetStatusWidths([-2, -1])
+        self.notebook_1_pane_3.SetSizer(_szr_pane3)
 
-        # statusbar fields
-        Mp3_To_Ogg_statusbar_fields = [_("Mp3_To_Ogg_statusbar"), ""]
-        for i in range(len(Mp3_To_Ogg_statusbar_fields)):
-            self.Mp3_To_Ogg_statusbar.SetStatusText(Mp3_To_Ogg_statusbar_fields[i], i)
-        self.Mp3_To_Ogg_toolbar.Realize()
-        self.rbx_sampling_rate.SetSelection(0)
-        self.cbx_love.SetToolTip(wx.ToolTip(_(u"Yes!\nWe ♥ it!")))
-        self.cbx_love.SetValue(1)
-        self.text_ctrl_3.SetToolTip(wx.ToolTip(_("File name of the output file\nAn existing file will be overwritten without futher information!")))
-        self.checkbox_1.SetToolTip(wx.ToolTip(_("Overwrite an existing file")))
-        self.checkbox_1.SetValue(1)
-        # end wxGlade
+        self.notebook_1_pane_2.SetSizer(sizer_4)
 
-    def __do_layout(self):
-        # begin wxGlade: PyOgg2_MyFrame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        _gszr_pane4 = wx.FlexGridSizer(2, 3, 0, 0)
-        _szr_pane3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Misc")), wx.HORIZONTAL)
-        _gszr_pane1 = wx.FlexGridSizer(1, 3, 0, 0)
-        _lbl_input_filename = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
-        _gszr_pane1.Add(_lbl_input_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        _gszr_pane1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
-        _gszr_pane1.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_pane_1.SetSizer(_gszr_pane1)
         _gszr_pane1.AddGrowableCol(1)
-        sizer_4.Add(self.rbx_sampling_rate, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_3.Add(self.cbx_love, 0, wx.ALL | wx.SHAPED, 5)
-        sizer_4.Add(sizer_3, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_2.SetSizer(sizer_4)
-        _szr_pane3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_3.SetSizer(_szr_pane3)
-        _gszr_pane4.Add(self._lbl_output_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        _gszr_pane4.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
-        _gszr_pane4.Add(self.button_4, 0, wx.ALL, 5)
-        _gszr_pane4.Add((20, 20), 0, 0, 0)
-        _gszr_pane4.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
-        _gszr_pane4.Add((20, 20), 0, 0, 0)
-        self.notebook_1_pane_4.SetSizer(_gszr_pane4)
-        _gszr_pane4.AddGrowableCol(1)
-        sizer_5.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_5.SetSizer(sizer_5)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
-        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
-        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
-        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
-        self.notebook_1.AddPage(self.notebook_1_pane_5, _("Some Text"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+        self.notebook_1_pane_1.SetSizer(_gszr_pane1)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
+
+        self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
         # end wxGlade
 
     def OnOpen(self, event):  # wxGlade: PyOgg2_MyFrame.<event_handler>
@@ -164,34 +191,31 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((492, 300))
-        self.grid = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
-        self.static_line = wx.StaticLine(self, wx.ID_ANY)
-        self.button = wx.Button(self, wx.ID_CLOSE, "")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrameGrid.__set_properties
         self.SetTitle(_("FrameOggCompressionDetails"))
-        self.grid.CreateGrid(8, 3)
-        self.button.SetFocus()
-        self.button.SetDefault()
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrameGrid.__do_layout
         self._szr_frame = wx.BoxSizer(wx.VERTICAL)
+
         self.grid_sizer = wx.FlexGridSizer(3, 1, 0, 0)
+        self._szr_frame.Add(self.grid_sizer, 1, wx.EXPAND, 0)
+
+        self.grid = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
+        self.grid.CreateGrid(8, 3)
         self.grid_sizer.Add(self.grid, 1, wx.EXPAND, 0)
+
+        self.static_line = wx.StaticLine(self, wx.ID_ANY)
         self.grid_sizer.Add(self.static_line, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.button = wx.Button(self, wx.ID_CLOSE, "")
+        self.button.SetFocus()
+        self.button.SetDefault()
         self.grid_sizer.Add(self.button, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.grid_sizer.AddGrowableRow(0)
         self.grid_sizer.AddGrowableCol(0)
-        self._szr_frame.Add(self.grid_sizer, 1, wx.EXPAND, 0)
+
         self.SetSizer(self._szr_frame)
         self._szr_frame.SetSizeHints(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample_30.cpp wxglade-1.0.1/tests/casefiles/ComplexExample_30.cpp
--- wxglade-0.9.6/tests/casefiles/ComplexExample_30.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample_30.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,12 +21,7 @@
 {
     // begin wxGlade: PyOgg2_MyFrame::PyOgg2_MyFrame
     SetSize(wxSize(600, 500));
-    notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
-    notebook_1_pane_5 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_4 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_3 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_2 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
+    SetTitle(_("mp3 2 ogg"));
     Mp3_To_Ogg_menubar = new wxMenuBar();
     wxMenu *wxglade_tmp_menu;
     wxglade_tmp_menu = new wxMenu();
@@ -41,42 +36,9 @@
     Mp3_To_Ogg_menubar->Append(wxglade_tmp_menu, _("&Help"));
     SetMenuBar(Mp3_To_Ogg_menubar);
     Mp3_To_Ogg_statusbar = CreateStatusBar(2);
-    Mp3_To_Ogg_toolbar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxTB_TEXT);
-    SetToolBar(Mp3_To_Ogg_toolbar);
-    Mp3_To_Ogg_toolbar->AddTool(wxID_OPEN, _("&Open"), wxNullBitmap, wxNullBitmap, wxITEM_NORMAL, _("Open a file"), _("Open a MP3 file to convert into OGG format"));
-    Mp3_To_Ogg_toolbar->Realize();
-    text_ctrl_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
-    button_3 = new wxButton(notebook_1_pane_1, wxID_OPEN, wxEmptyString);
-    const wxString rbx_sampling_rate_choices[] = {
-        _("44 kbit"),
-        _("128 kbit"),
-    };
-    rbx_sampling_rate = new wxRadioBox(notebook_1_pane_2, wxID_ANY, _("Sampling Rate"), wxDefaultPosition, wxDefaultSize, 2, rbx_sampling_rate_choices, 0, wxRA_SPECIFY_ROWS);
-    cbx_love = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("♥ Love this song"));
-    text_ctrl_2 = new wxTextCtrl(notebook_1_pane_3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
-    _lbl_output_filename = new wxStaticText(notebook_1_pane_4, wxID_ANY, _("File name:"));
-    text_ctrl_3 = new wxTextCtrl(notebook_1_pane_4, wxID_ANY, wxEmptyString);
-    button_4 = new wxButton(notebook_1_pane_4, wxID_OPEN, wxEmptyString);
-    checkbox_1 = new wxCheckBox(notebook_1_pane_4, wxID_ANY, _("Overwrite existing file"));
-    label_1 = new wxStaticText(notebook_1_pane_5, wxID_ANY, _("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\na backslash and a t \\t\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"));
-    static_line_1 = new wxStaticLine(this, wxID_ANY);
-    button_5 = new wxButton(this, wxID_CLOSE, wxEmptyString);
-    button_2 = new wxButton(this, wxID_CANCEL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-    button_1 = new wxButton(this, wxID_OK, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void PyOgg2_MyFrame::set_properties()
-{
-    // begin wxGlade: PyOgg2_MyFrame::set_properties
-    SetTitle(_("mp3 2 ogg"));
     int Mp3_To_Ogg_statusbar_widths[] = { -2, -1 };
     Mp3_To_Ogg_statusbar->SetStatusWidths(2, Mp3_To_Ogg_statusbar_widths);
-
+    
     // statusbar fields
     const wxString Mp3_To_Ogg_statusbar_fields[] = {
         _("Mp3_To_Ogg_statusbar"),
@@ -85,64 +47,87 @@
     for(int i = 0; i < Mp3_To_Ogg_statusbar->GetFieldsCount(); ++i) {
         Mp3_To_Ogg_statusbar->SetStatusText(Mp3_To_Ogg_statusbar_fields[i], i);
     }
-    rbx_sampling_rate->SetSelection(0);
-    cbx_love->SetToolTip(_("Yes!\nWe ♥ it!"));
-    cbx_love->SetValue(1);
-    text_ctrl_3->SetToolTip(_("File name of the output file\nAn existing file will be overwritten without futher information!"));
-    checkbox_1->SetToolTip(_("Overwrite an existing file"));
-    checkbox_1->SetValue(1);
-    // end wxGlade
-}
-
-
-void PyOgg2_MyFrame::do_layout()
-{
-    // begin wxGlade: PyOgg2_MyFrame::do_layout
+    Mp3_To_Ogg_toolbar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxTB_TEXT);
+    SetToolBar(Mp3_To_Ogg_toolbar);
+    Mp3_To_Ogg_toolbar->AddTool(wxID_OPEN, _("&Open"), wxNullBitmap, wxNullBitmap, wxITEM_NORMAL, _("Open a file"), _("Open a MP3 file to convert into OGG format"));
+    Bind(wxEVT_MENU, &PyOgg2_MyFrame::OnOpen, this, wxID_OPEN);
+    Mp3_To_Ogg_toolbar->Realize();
     wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
-    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxBoxSizer* sizer_5 = new wxBoxSizer(wxHORIZONTAL);
-    wxFlexGridSizer* _gszr_pane4 = new wxFlexGridSizer(2, 3, 0, 0);
-    wxBoxSizer* _szr_pane3 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
-    wxStaticBoxSizer* sizer_3 = new wxStaticBoxSizer(new wxStaticBox(notebook_1_pane_2, wxID_ANY, _("Misc")), wxHORIZONTAL);
+    notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
+    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
+    notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_1, _("Input File"));
     wxFlexGridSizer* _gszr_pane1 = new wxFlexGridSizer(1, 3, 0, 0);
     wxStaticText* _lbl_input_filename = new wxStaticText(notebook_1_pane_1, wxID_ANY, _("File name:"));
     _gszr_pane1->Add(_lbl_input_filename, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    text_ctrl_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
     _gszr_pane1->Add(text_ctrl_1, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
+    button_3 = new wxButton(notebook_1_pane_1, wxID_OPEN, wxEmptyString);
     _gszr_pane1->Add(button_3, 0, wxALL, 5);
-    notebook_1_pane_1->SetSizer(_gszr_pane1);
-    _gszr_pane1->AddGrowableCol(1);
+    notebook_1_pane_2 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_2, _("Converting Options"));
+    wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
+    const wxString rbx_sampling_rate_choices[] = {
+        _("44 kbit"),
+        _("128 kbit"),
+    };
+    rbx_sampling_rate = new wxRadioBox(notebook_1_pane_2, wxID_ANY, _("Sampling Rate"), wxDefaultPosition, wxDefaultSize, 2, rbx_sampling_rate_choices, 0, wxRA_SPECIFY_ROWS);
+    rbx_sampling_rate->SetSelection(0);
     sizer_4->Add(rbx_sampling_rate, 1, wxALL|wxEXPAND, 5);
-    sizer_3->Add(cbx_love, 0, wxALL|wxSHAPED, 5);
+    wxStaticBoxSizer* sizer_3 = new wxStaticBoxSizer(new wxStaticBox(notebook_1_pane_2, wxID_ANY, _("Misc")), wxHORIZONTAL);
     sizer_4->Add(sizer_3, 1, wxALL|wxEXPAND, 5);
-    notebook_1_pane_2->SetSizer(sizer_4);
+    cbx_love = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("♥ Love this song"));
+    cbx_love->SetToolTip(_("Yes!\nWe ♥ it!"));
+    cbx_love->SetValue(1);
+    sizer_3->Add(cbx_love, 0, wxALL|wxSHAPED, 5);
+    notebook_1_pane_3 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_3, _("Converting Progress"));
+    wxBoxSizer* _szr_pane3 = new wxBoxSizer(wxHORIZONTAL);
+    text_ctrl_2 = new wxTextCtrl(notebook_1_pane_3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
     _szr_pane3->Add(text_ctrl_2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_pane_3->SetSizer(_szr_pane3);
+    notebook_1_pane_4 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_4, _("Output File"));
+    wxFlexGridSizer* _gszr_pane4 = new wxFlexGridSizer(2, 3, 0, 0);
+    _lbl_output_filename = new wxStaticText(notebook_1_pane_4, wxID_ANY, _("File name:"));
     _gszr_pane4->Add(_lbl_output_filename, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    text_ctrl_3 = new wxTextCtrl(notebook_1_pane_4, wxID_ANY, wxEmptyString);
+    text_ctrl_3->SetToolTip(_("File name of the output file\nAn existing file will be overwritten without futher information!"));
     _gszr_pane4->Add(text_ctrl_3, 0, wxALL|wxEXPAND, 5);
+    button_4 = new wxButton(notebook_1_pane_4, wxID_OPEN, wxEmptyString);
     _gszr_pane4->Add(button_4, 0, wxALL, 5);
     _gszr_pane4->Add(20, 20, 0, 0, 0);
+    checkbox_1 = new wxCheckBox(notebook_1_pane_4, wxID_ANY, _("Overwrite existing file"));
+    checkbox_1->SetToolTip(_("Overwrite an existing file"));
+    checkbox_1->SetValue(1);
     _gszr_pane4->Add(checkbox_1, 0, wxALL|wxEXPAND, 5);
     _gszr_pane4->Add(20, 20, 0, 0, 0);
-    notebook_1_pane_4->SetSizer(_gszr_pane4);
-    _gszr_pane4->AddGrowableCol(1);
-    sizer_5->Add(label_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_pane_5->SetSizer(sizer_5);
-    notebook_1->AddPage(notebook_1_pane_1, _("Input File"));
-    notebook_1->AddPage(notebook_1_pane_2, _("Converting Options"));
-    notebook_1->AddPage(notebook_1_pane_3, _("Converting Progress"));
-    notebook_1->AddPage(notebook_1_pane_4, _("Output File"));
+    notebook_1_pane_5 = new wxPanel(notebook_1, wxID_ANY);
     notebook_1->AddPage(notebook_1_pane_5, _("Some Text"));
-    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
+    wxBoxSizer* sizer_5 = new wxBoxSizer(wxHORIZONTAL);
+    label_1 = new wxStaticText(notebook_1_pane_5, wxID_ANY, _("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\na backslash and a t \\t\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"));
+    sizer_5->Add(label_1, 1, wxALL|wxEXPAND, 5);
+    static_line_1 = new wxStaticLine(this, wxID_ANY);
     sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
+    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
+    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
+    button_5 = new wxButton(this, wxID_CLOSE, wxEmptyString);
     sizer_2->Add(button_5, 0, wxALIGN_RIGHT|wxALL, 5);
+    button_2 = new wxButton(this, wxID_CANCEL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
     sizer_2->Add(button_2, 0, wxALIGN_RIGHT|wxALL, 5);
+    button_1 = new wxButton(this, wxID_OK, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
     sizer_2->Add(button_1, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
-    SetSizer(sizer_1);
-    sizer_1->SetSizeHints(this);
+    
+    notebook_1_pane_5->SetSizer(sizer_5);
+    _gszr_pane4->AddGrowableCol(1);
+    notebook_1_pane_4->SetSizer(_gszr_pane4);
+    notebook_1_pane_3->SetSizer(_szr_pane3);
+    notebook_1_pane_2->SetSizer(sizer_4);
+    _gszr_pane1->AddGrowableCol(1);
+    notebook_1_pane_1->SetSizer(_gszr_pane1);
     sizer_1->AddGrowableRow(0);
     sizer_1->AddGrowableCol(0);
+    SetSizer(sizer_1);
+    sizer_1->SetSizeHints(this);
     Layout();
     Centre();
     // end wxGlade
@@ -151,7 +136,6 @@
 
 BEGIN_EVENT_TABLE(PyOgg2_MyFrame, wxFrame)
     // begin wxGlade: PyOgg2_MyFrame::event_table
-    EVT_TOOL(wxID_OPEN, PyOgg2_MyFrame::OnOpen)
     EVT_BUTTON(wxID_OK, PyOgg2_MyFrame::startConverting)
     // end wxGlade
 END_EVENT_TABLE();
@@ -194,38 +178,22 @@
 {
     // begin wxGlade: MyFrameGrid::MyFrameGrid
     SetSize(wxSize(492, 300));
-    grid = new wxGrid(this, wxID_ANY);
-    static_line = new wxStaticLine(this, wxID_ANY);
-    button = new wxButton(this, wxID_CLOSE, wxEmptyString);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrameGrid::set_properties()
-{
-    // begin wxGlade: MyFrameGrid::set_properties
     SetTitle(_("FrameOggCompressionDetails"));
-    grid->CreateGrid(8, 3);
-    button->SetFocus();
-    button->SetDefault();
-    // end wxGlade
-}
-
-
-void MyFrameGrid::do_layout()
-{
-    // begin wxGlade: MyFrameGrid::do_layout
     _szr_frame = new wxBoxSizer(wxVERTICAL);
     grid_sizer = new wxFlexGridSizer(3, 1, 0, 0);
+    _szr_frame->Add(grid_sizer, 1, wxEXPAND, 0);
+    grid = new wxGrid(this, wxID_ANY);
+    grid->CreateGrid(8, 3);
     grid_sizer->Add(grid, 1, wxEXPAND, 0);
+    static_line = new wxStaticLine(this, wxID_ANY);
     grid_sizer->Add(static_line, 0, wxALL|wxEXPAND, 5);
+    button = new wxButton(this, wxID_CLOSE, wxEmptyString);
+    button->SetFocus();
+    button->SetDefault();
     grid_sizer->Add(button, 0, wxALIGN_RIGHT|wxALL, 5);
+    
     grid_sizer->AddGrowableRow(0);
     grid_sizer->AddGrowableCol(0);
-    _szr_frame->Add(grid_sizer, 1, wxEXPAND, 0);
     SetSizer(_szr_frame);
     _szr_frame->SetSizeHints(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample_30.h wxglade-1.0.1/tests/casefiles/ComplexExample_30.h
--- wxglade-0.9.6/tests/casefiles/ComplexExample_30.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample_30.h	2020-12-31 14:04:48.000000000 +0000
@@ -39,32 +39,28 @@
     PyOgg2_MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: PyOgg2_MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: PyOgg2_MyFrame::attributes
     wxMenuBar* Mp3_To_Ogg_menubar;
     wxStatusBar* Mp3_To_Ogg_statusbar;
     wxToolBar* Mp3_To_Ogg_toolbar;
+    wxNotebook* notebook_1;
+    wxPanel* notebook_1_pane_1;
     wxTextCtrl* text_ctrl_1;
     wxButton* button_3;
-    wxPanel* notebook_1_pane_1;
+    wxPanel* notebook_1_pane_2;
     wxRadioBox* rbx_sampling_rate;
     wxCheckBox* cbx_love;
-    wxPanel* notebook_1_pane_2;
-    wxTextCtrl* text_ctrl_2;
     wxPanel* notebook_1_pane_3;
+    wxTextCtrl* text_ctrl_2;
+    wxPanel* notebook_1_pane_4;
     wxStaticText* _lbl_output_filename;
     wxTextCtrl* text_ctrl_3;
     wxButton* button_4;
     wxCheckBox* checkbox_1;
-    wxPanel* notebook_1_pane_4;
-    wxStaticText* label_1;
     wxPanel* notebook_1_pane_5;
-    wxNotebook* notebook_1;
+    wxStaticText* label_1;
     wxStaticLine* static_line_1;
     wxButton* button_5;
     wxButton* button_2;
@@ -74,10 +70,10 @@
     DECLARE_EVENT_TABLE();
 
 public:
-    void OnOpen(wxCommandEvent &event); // wxGlade: <event_handler>
-    void OnClose(wxCommandEvent &event); // wxGlade: <event_handler>
-    void OnAboutDialog(wxCommandEvent &event); // wxGlade: <event_handler>
-    void startConverting(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void OnOpen(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void OnClose(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void OnAboutDialog(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void startConverting(wxCommandEvent &event); // wxGlade: <event_handler>
 }; // wxGlade: end class
 
 
@@ -89,18 +85,14 @@
     MyFrameGrid(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrameGrid::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrameGrid::attributes
+    wxBoxSizer* _szr_frame;
+    wxFlexGridSizer* grid_sizer;
     wxGrid* grid;
     wxStaticLine* static_line;
     wxButton* button;
-    wxFlexGridSizer* grid_sizer;
-    wxBoxSizer* _szr_frame;
     // end wxGlade
 }; // wxGlade: end class
 
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample_30_Phoenix.py wxglade-1.0.1/tests/casefiles/ComplexExample_30_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/ComplexExample_30_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample_30_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,10 +5,10 @@
 #
 
 import wx
-import wx.grid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.grid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -21,7 +21,8 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((600, 500))
-        
+        self.SetTitle(_("mp3 2 ogg"))
+
         # Menu Bar
         self.Mp3_To_Ogg_menubar = wx.MenuBar()
         wxglade_tmp_menu = wx.Menu()
@@ -36,108 +37,134 @@
         self.Mp3_To_Ogg_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.Mp3_To_Ogg_menubar)
         # Menu Bar end
+
         self.Mp3_To_Ogg_statusbar = self.CreateStatusBar(2)
-        
+        self.Mp3_To_Ogg_statusbar.SetStatusWidths([-2, -1])
+        # statusbar fields
+        Mp3_To_Ogg_statusbar_fields = [_("Mp3_To_Ogg_statusbar"), ""]
+        for i in range(len(Mp3_To_Ogg_statusbar_fields)):
+            self.Mp3_To_Ogg_statusbar.SetStatusText(Mp3_To_Ogg_statusbar_fields[i], i)
+
         # Tool Bar
-        self.Mp3_To_Ogg_toolbar = wx.ToolBar(self, -1, style=wx.TB_HORIZONTAL | wx.TB_TEXT)
-        self.SetToolBar(self.Mp3_To_Ogg_toolbar)
+        self.Mp3_To_Ogg_toolbar = wx.ToolBar(self, -1, style=wx.TB_TEXT)
         self.Mp3_To_Ogg_toolbar.AddTool(wx.ID_OPEN, _("&Open"), wx.NullBitmap, wx.NullBitmap, wx.ITEM_NORMAL, _("Open a file"), _("Open a MP3 file to convert into OGG format"))
+        self.Bind(wx.EVT_TOOL, self.OnOpen, id=wx.ID_OPEN)
+        self.SetToolBar(self.Mp3_To_Ogg_toolbar)
+        self.Mp3_To_Ogg_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
+
+        _gszr_pane1 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        _lbl_input_filename = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
+        _gszr_pane1.Add(_lbl_input_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        _gszr_pane1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
+
         self.button_3 = wx.Button(self.notebook_1_pane_1, wx.ID_OPEN, "")
+        _gszr_pane1.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
+
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.rbx_sampling_rate = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Sampling Rate"), choices=[_("44 kbit"), _("128 kbit")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.rbx_sampling_rate.SetSelection(0)
+        sizer_4.Add(self.rbx_sampling_rate, 1, wx.ALL | wx.EXPAND, 5)
+
+        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Misc")), wx.HORIZONTAL)
+        sizer_4.Add(sizer_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.cbx_love = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _(u"♥ Love this song"))
+        self.cbx_love.SetToolTip(_(u"Yes!\nWe ♥ it!"))
+        self.cbx_love.SetValue(1)
+        sizer_3.Add(self.cbx_love, 0, wx.ALL | wx.SHAPED, 5)
+
         self.notebook_1_pane_3 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
+
+        _szr_pane3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_pane_3, wx.ID_ANY, "", style=wx.TE_MULTILINE)
+        _szr_pane3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_pane_4 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
+
+        _gszr_pane4 = wx.FlexGridSizer(2, 3, 0, 0)
+
         self._lbl_output_filename = wx.StaticText(self.notebook_1_pane_4, wx.ID_ANY, _("File name:"))
+        _gszr_pane4.Add(self._lbl_output_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_pane_4, wx.ID_ANY, "")
+        self.text_ctrl_3.SetToolTip(_("File name of the output file\nAn existing file will be overwritten without futher information!"))
+        _gszr_pane4.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
+
         self.button_4 = wx.Button(self.notebook_1_pane_4, wx.ID_OPEN, "")
+        _gszr_pane4.Add(self.button_4, 0, wx.ALL, 5)
+
+        _gszr_pane4.Add((20, 20), 0, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_pane_4, wx.ID_ANY, _("Overwrite existing file"))
+        self.checkbox_1.SetToolTip(_("Overwrite an existing file"))
+        self.checkbox_1.SetValue(1)
+        _gszr_pane4.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        _gszr_pane4.Add((20, 20), 0, 0, 0)
+
         self.notebook_1_pane_5 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_5, _("Some Text"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_1 = wx.StaticText(self.notebook_1_pane_5, wx.ID_ANY, _("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\na backslash and a t \\t\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"))
+        sizer_5.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
         self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
+        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_2 = wx.Button(self, wx.ID_CANCEL, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.notebook_1_pane_5.SetSizer(sizer_5)
 
-        self.Bind(wx.EVT_TOOL, self.OnOpen, id=wx.ID_OPEN)
-        self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
-        # end wxGlade
+        _gszr_pane4.AddGrowableCol(1)
+        self.notebook_1_pane_4.SetSizer(_gszr_pane4)
 
-    def __set_properties(self):
-        # begin wxGlade: PyOgg2_MyFrame.__set_properties
-        self.SetTitle(_("mp3 2 ogg"))
-        self.Mp3_To_Ogg_statusbar.SetStatusWidths([-2, -1])
+        self.notebook_1_pane_3.SetSizer(_szr_pane3)
 
-        # statusbar fields
-        Mp3_To_Ogg_statusbar_fields = [_("Mp3_To_Ogg_statusbar"), ""]
-        for i in range(len(Mp3_To_Ogg_statusbar_fields)):
-            self.Mp3_To_Ogg_statusbar.SetStatusText(Mp3_To_Ogg_statusbar_fields[i], i)
-        self.Mp3_To_Ogg_toolbar.Realize()
-        self.rbx_sampling_rate.SetSelection(0)
-        self.cbx_love.SetToolTip(_(u"Yes!\nWe ♥ it!"))
-        self.cbx_love.SetValue(1)
-        self.text_ctrl_3.SetToolTip(_("File name of the output file\nAn existing file will be overwritten without futher information!"))
-        self.checkbox_1.SetToolTip(_("Overwrite an existing file"))
-        self.checkbox_1.SetValue(1)
-        # end wxGlade
+        self.notebook_1_pane_2.SetSizer(sizer_4)
 
-    def __do_layout(self):
-        # begin wxGlade: PyOgg2_MyFrame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        _gszr_pane4 = wx.FlexGridSizer(2, 3, 0, 0)
-        _szr_pane3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Misc")), wx.HORIZONTAL)
-        _gszr_pane1 = wx.FlexGridSizer(1, 3, 0, 0)
-        _lbl_input_filename = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
-        _gszr_pane1.Add(_lbl_input_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        _gszr_pane1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
-        _gszr_pane1.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_pane_1.SetSizer(_gszr_pane1)
         _gszr_pane1.AddGrowableCol(1)
-        sizer_4.Add(self.rbx_sampling_rate, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_3.Add(self.cbx_love, 0, wx.ALL | wx.SHAPED, 5)
-        sizer_4.Add(sizer_3, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_2.SetSizer(sizer_4)
-        _szr_pane3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_3.SetSizer(_szr_pane3)
-        _gszr_pane4.Add(self._lbl_output_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        _gszr_pane4.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
-        _gszr_pane4.Add(self.button_4, 0, wx.ALL, 5)
-        _gszr_pane4.Add((20, 20), 0, 0, 0)
-        _gszr_pane4.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
-        _gszr_pane4.Add((20, 20), 0, 0, 0)
-        self.notebook_1_pane_4.SetSizer(_gszr_pane4)
-        _gszr_pane4.AddGrowableCol(1)
-        sizer_5.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_5.SetSizer(sizer_5)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
-        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
-        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
-        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
-        self.notebook_1.AddPage(self.notebook_1_pane_5, _("Some Text"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+        self.notebook_1_pane_1.SetSizer(_gszr_pane1)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
+
+        self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
         # end wxGlade
 
     def OnOpen(self, event):  # wxGlade: PyOgg2_MyFrame.<event_handler>
@@ -164,34 +191,31 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((492, 300))
-        self.grid = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
-        self.static_line = wx.StaticLine(self, wx.ID_ANY)
-        self.button = wx.Button(self, wx.ID_CLOSE, "")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrameGrid.__set_properties
         self.SetTitle(_("FrameOggCompressionDetails"))
-        self.grid.CreateGrid(8, 3)
-        self.button.SetFocus()
-        self.button.SetDefault()
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrameGrid.__do_layout
         self._szr_frame = wx.BoxSizer(wx.VERTICAL)
+
         self.grid_sizer = wx.FlexGridSizer(3, 1, 0, 0)
+        self._szr_frame.Add(self.grid_sizer, 1, wx.EXPAND, 0)
+
+        self.grid = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
+        self.grid.CreateGrid(8, 3)
         self.grid_sizer.Add(self.grid, 1, wx.EXPAND, 0)
+
+        self.static_line = wx.StaticLine(self, wx.ID_ANY)
         self.grid_sizer.Add(self.static_line, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.button = wx.Button(self, wx.ID_CLOSE, "")
+        self.button.SetFocus()
+        self.button.SetDefault()
         self.grid_sizer.Add(self.button, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.grid_sizer.AddGrowableRow(0)
         self.grid_sizer.AddGrowableCol(0)
-        self._szr_frame.Add(self.grid_sizer, 1, wx.EXPAND, 0)
+
         self.SetSizer(self._szr_frame)
         self._szr_frame.SetSizeHints(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample_30.pl wxglade-1.0.1/tests/casefiles/ComplexExample_30.pl
--- wxglade-0.9.6/tests/casefiles/ComplexExample_30.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample_30.pl	2020-12-31 14:04:48.000000000 +0000
@@ -36,6 +36,8 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(600, 500));
+    $self->SetTitle(_T("mp3 2 ogg"));
+    
     
 
     # Menu Bar
@@ -53,127 +55,150 @@
     
     # Menu Bar end
 
-    $self->{Mp3_To_Ogg_statusbar} = $self->CreateStatusBar(2);
     
-    # Tool Bar
-    $self->{Mp3_To_Ogg_toolbar} = Wx::ToolBar->new($self, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxTB_TEXT);
-    $self->SetToolBar($self->{Mp3_To_Ogg_toolbar});
-    $self->{Mp3_To_Ogg_toolbar}->AddTool(wxID_OPEN, _T("&Open"), wxNullBitmap, wxNullBitmap, wxITEM_NORMAL, _T("Open a file"), _T("Open a MP3 file to convert into OGG format"));
-    # Tool Bar end
-    $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
-    $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{text_ctrl_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
-    $self->{button_3} = Wx::Button->new($self->{notebook_1_pane_1}, wxID_OPEN, "");
-    $self->{notebook_1_pane_2} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{rbx_sampling_rate} = Wx::RadioBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Sampling Rate"), wxDefaultPosition, wxDefaultSize, [_T("44 kbit"), _T("128 kbit")], 0, wxRA_SPECIFY_ROWS);
-    $self->{cbx_love} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("\N{U+2665} Love this song"));
-    $self->{notebook_1_pane_3} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{text_ctrl_2} = Wx::TextCtrl->new($self->{notebook_1_pane_3}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
-    $self->{notebook_1_pane_4} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{_lbl_output_filename} = Wx::StaticText->new($self->{notebook_1_pane_4}, wxID_ANY, _T("File name:"));
-    $self->{text_ctrl_3} = Wx::TextCtrl->new($self->{notebook_1_pane_4}, wxID_ANY, "");
-    $self->{button_4} = Wx::Button->new($self->{notebook_1_pane_4}, wxID_OPEN, "");
-    $self->{checkbox_1} = Wx::CheckBox->new($self->{notebook_1_pane_4}, wxID_ANY, _T("Overwrite existing file"));
-    $self->{notebook_1_pane_5} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{label_1} = Wx::StaticText->new($self->{notebook_1_pane_5}, wxID_ANY, _T("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\na backslash and a t \\t\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"));
-    $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
-    $self->{button_5} = Wx::Button->new($self, wxID_CLOSE, "");
-    $self->{button_2} = Wx::Button->new($self, wxID_CANCEL, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-    $self->{button_1} = Wx::Button->new($self, wxID_OK, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    Wx::Event::EVT_MENU($self, wxID_OPEN, $self->can('OnOpen'));
-    Wx::Event::EVT_MENU($self, wxID_EXIT, $self->can('OnClose'));
-    Wx::Event::EVT_MENU($self, wxID_ABOUT, $self->can('OnAboutDialog'));
-    Wx::Event::EVT_BUTTON($self, $self->{button_1}->GetId, $self->can('startConverting'));
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: PyOgg2_MyFrame::__set_properties
-    $self->SetTitle(_T("mp3 2 ogg"));
+    $self->{Mp3_To_Ogg_statusbar} = $self->CreateStatusBar(2);
     $self->{Mp3_To_Ogg_statusbar}->SetStatusWidths(-2, -1);
-
+    
     # statusbar fields
     my( @Mp3_To_Ogg_statusbar_fields ) = (
         _T("Mp3_To_Ogg_statusbar"),
         "",
     );
-
+    
     if( @Mp3_To_Ogg_statusbar_fields ) {
         $self->{Mp3_To_Ogg_statusbar}->SetStatusText($Mp3_To_Ogg_statusbar_fields[$_], $_)
         for 0 .. $#Mp3_To_Ogg_statusbar_fields ;
     }
+    
+    
+    # Tool Bar
+    $self->{Mp3_To_Ogg_toolbar} = Wx::ToolBar->new($self, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxTB_TEXT);
+    $self->{Mp3_To_Ogg_toolbar}->AddTool(wxID_OPEN, _T("&Open"), wxNullBitmap, wxNullBitmap, wxITEM_NORMAL, _T("Open a file"), _T("Open a MP3 file to convert into OGG format"));
+    $self->SetToolBar($self->{Mp3_To_Ogg_toolbar});
     $self->{Mp3_To_Ogg_toolbar}->Realize();
-    $self->{rbx_sampling_rate}->SetSelection(0);
-    $self->{cbx_love}->SetToolTip(_T("Yes!\nWe \N{U+2665} it!"));
-    $self->{cbx_love}->SetValue(1);
-    $self->{text_ctrl_3}->SetToolTip(_T("File name of the output file\nAn existing file will be overwritten without futher information!"));
-    $self->{checkbox_1}->SetToolTip(_T("Overwrite an existing file"));
-    $self->{checkbox_1}->SetValue(1);
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: PyOgg2_MyFrame::__do_layout
+    # Tool Bar end
+    
     $self->{sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
-    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    $self->{sizer_5} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{_gszr_pane4} = Wx::FlexGridSizer->new(2, 3, 0, 0);
-    $self->{_szr_pane3} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_4} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_3} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Misc")), wxHORIZONTAL);
+    
+    $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
+    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
+    $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("Input File"));
+    
     $self->{_gszr_pane1} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    
     my $_lbl_input_filename = Wx::StaticText->new($self->{notebook_1_pane_1}, wxID_ANY, _T("File name:"));
     $self->{_gszr_pane1}->Add($_lbl_input_filename, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
+    $self->{text_ctrl_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
     $self->{_gszr_pane1}->Add($self->{text_ctrl_1}, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
+    
+    $self->{button_3} = Wx::Button->new($self->{notebook_1_pane_1}, wxID_OPEN, "");
     $self->{_gszr_pane1}->Add($self->{button_3}, 0, wxALL, 5);
-    $self->{notebook_1_pane_1}->SetSizer($self->{_gszr_pane1});
-    $self->{_gszr_pane1}->AddGrowableCol(1);
+    
+    $self->{notebook_1_pane_2} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_2}, _T("Converting Options"));
+    
+    $self->{sizer_4} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{rbx_sampling_rate} = Wx::RadioBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Sampling Rate"), wxDefaultPosition, wxDefaultSize, [_T("44 kbit"), _T("128 kbit")], 0, wxRA_SPECIFY_ROWS);
+    $self->{rbx_sampling_rate}->SetSelection(0);
     $self->{sizer_4}->Add($self->{rbx_sampling_rate}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_3}->Add($self->{cbx_love}, 0, wxALL|wxSHAPED, 5);
+    
+    $self->{sizer_3} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Misc")), wxHORIZONTAL);
     $self->{sizer_4}->Add($self->{sizer_3}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_pane_2}->SetSizer($self->{sizer_4});
+    
+    $self->{cbx_love} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("\N{U+2665} Love this song"));
+    $self->{cbx_love}->SetToolTip(_T("Yes!\nWe \N{U+2665} it!"));
+    $self->{cbx_love}->SetValue(1);
+    $self->{sizer_3}->Add($self->{cbx_love}, 0, wxALL|wxSHAPED, 5);
+    
+    $self->{notebook_1_pane_3} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_3}, _T("Converting Progress"));
+    
+    $self->{_szr_pane3} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{text_ctrl_2} = Wx::TextCtrl->new($self->{notebook_1_pane_3}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
     $self->{_szr_pane3}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_pane_3}->SetSizer($self->{_szr_pane3});
+    
+    $self->{notebook_1_pane_4} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_4}, _T("Output File"));
+    
+    $self->{_gszr_pane4} = Wx::FlexGridSizer->new(2, 3, 0, 0);
+    
+    $self->{_lbl_output_filename} = Wx::StaticText->new($self->{notebook_1_pane_4}, wxID_ANY, _T("File name:"));
     $self->{_gszr_pane4}->Add($self->{_lbl_output_filename}, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
+    $self->{text_ctrl_3} = Wx::TextCtrl->new($self->{notebook_1_pane_4}, wxID_ANY, "");
+    $self->{text_ctrl_3}->SetToolTip(_T("File name of the output file\nAn existing file will be overwritten without futher information!"));
     $self->{_gszr_pane4}->Add($self->{text_ctrl_3}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{button_4} = Wx::Button->new($self->{notebook_1_pane_4}, wxID_OPEN, "");
     $self->{_gszr_pane4}->Add($self->{button_4}, 0, wxALL, 5);
+    
     $self->{_gszr_pane4}->Add(20, 20, 0, 0, 0);
+    
+    $self->{checkbox_1} = Wx::CheckBox->new($self->{notebook_1_pane_4}, wxID_ANY, _T("Overwrite existing file"));
+    $self->{checkbox_1}->SetToolTip(_T("Overwrite an existing file"));
+    $self->{checkbox_1}->SetValue(1);
     $self->{_gszr_pane4}->Add($self->{checkbox_1}, 0, wxALL|wxEXPAND, 5);
+    
     $self->{_gszr_pane4}->Add(20, 20, 0, 0, 0);
-    $self->{notebook_1_pane_4}->SetSizer($self->{_gszr_pane4});
-    $self->{_gszr_pane4}->AddGrowableCol(1);
-    $self->{sizer_5}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_pane_5}->SetSizer($self->{sizer_5});
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("Input File"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_2}, _T("Converting Options"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_3}, _T("Converting Progress"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_4}, _T("Output File"));
+    
+    $self->{notebook_1_pane_5} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
     $self->{notebook_1}->AddPage($self->{notebook_1_pane_5}, _T("Some Text"));
-    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
+    $self->{sizer_5} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{label_1} = Wx::StaticText->new($self->{notebook_1_pane_5}, wxID_ANY, _T("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\na backslash and a t \\t\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"));
+    $self->{sizer_5}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
     $self->{sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
+    
+    $self->{button_5} = Wx::Button->new($self, wxID_CLOSE, "");
     $self->{sizer_2}->Add($self->{button_5}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    $self->{button_2} = Wx::Button->new($self, wxID_CANCEL, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
     $self->{sizer_2}->Add($self->{button_2}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    $self->{button_1} = Wx::Button->new($self, wxID_OK, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
     $self->{sizer_2}->Add($self->{button_1}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
-    $self->SetSizer($self->{sizer_1});
-    $self->{sizer_1}->SetSizeHints($self);
+    
+    $self->{notebook_1_pane_5}->SetSizer($self->{sizer_5});
+    
+    $self->{_gszr_pane4}->AddGrowableCol(1);
+    $self->{notebook_1_pane_4}->SetSizer($self->{_gszr_pane4});
+    
+    $self->{notebook_1_pane_3}->SetSizer($self->{_szr_pane3});
+    
+    $self->{notebook_1_pane_2}->SetSizer($self->{sizer_4});
+    
+    $self->{_gszr_pane1}->AddGrowableCol(1);
+    $self->{notebook_1_pane_1}->SetSizer($self->{_gszr_pane1});
+    
     $self->{sizer_1}->AddGrowableRow(0);
     $self->{sizer_1}->AddGrowableCol(0);
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->SetSizeHints($self);
+    
     $self->Layout();
     $self->Centre();
+    Wx::Event::EVT_MENU($self, wxID_OPEN, $self->can('OnOpen'));
+    Wx::Event::EVT_MENU($self, wxID_EXIT, $self->can('OnClose'));
+    Wx::Event::EVT_MENU($self, wxID_ABOUT, $self->can('OnAboutDialog'));
+    Wx::Event::EVT_BUTTON($self, $self->{button_1}->GetId, $self->can('startConverting'));
+
     # end wxGlade
+    return $self;
+
 }
 
+
 sub OnOpen {
     my ($self, $event) = @_;
     # wxGlade: PyOgg2_MyFrame::OnOpen <event_handler>
@@ -236,46 +261,38 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(492, 300));
-    $self->{grid} = Wx::Grid->new($self, wxID_ANY);
-    $self->{static_line} = Wx::StaticLine->new($self, wxID_ANY);
-    $self->{button} = Wx::Button->new($self, wxID_CLOSE, "");
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrameGrid::__set_properties
     $self->SetTitle(_T("FrameOggCompressionDetails"));
-    $self->{grid}->CreateGrid(8, 3);
-    $self->{button}->SetFocus();
-    $self->{button}->SetDefault();
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrameGrid::__do_layout
+    
     $self->{_szr_frame} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{grid_sizer} = Wx::FlexGridSizer->new(3, 1, 0, 0);
+    $self->{_szr_frame}->Add($self->{grid_sizer}, 1, wxEXPAND, 0);
+    
+    $self->{grid} = Wx::Grid->new($self, wxID_ANY);
+    $self->{grid}->CreateGrid(8, 3);
     $self->{grid_sizer}->Add($self->{grid}, 1, wxEXPAND, 0);
+    
+    $self->{static_line} = Wx::StaticLine->new($self, wxID_ANY);
     $self->{grid_sizer}->Add($self->{static_line}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{button} = Wx::Button->new($self, wxID_CLOSE, "");
+    $self->{button}->SetFocus();
+    $self->{button}->SetDefault();
     $self->{grid_sizer}->Add($self->{button}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
     $self->{grid_sizer}->AddGrowableRow(0);
     $self->{grid_sizer}->AddGrowableCol(0);
-    $self->{_szr_frame}->Add($self->{grid_sizer}, 1, wxEXPAND, 0);
+    
     $self->SetSizer($self->{_szr_frame});
     $self->{_szr_frame}->SetSizeHints($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrameGrid
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample.cpp wxglade-1.0.1/tests/casefiles/ComplexExample.cpp
--- wxglade-0.9.6/tests/casefiles/ComplexExample.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,12 +21,7 @@
 {
     // begin wxGlade: PyOgg2_MyFrame::PyOgg2_MyFrame
     SetSize(wxSize(600, 500));
-    notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
-    notebook_1_pane_5 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_4 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_3 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_2 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
+    SetTitle(_("mp3 2 ogg"));
     Mp3_To_Ogg_menubar = new wxMenuBar();
     wxMenu *wxglade_tmp_menu;
     wxglade_tmp_menu = new wxMenu();
@@ -41,42 +36,9 @@
     Mp3_To_Ogg_menubar->Append(wxglade_tmp_menu, _("&Help"));
     SetMenuBar(Mp3_To_Ogg_menubar);
     Mp3_To_Ogg_statusbar = CreateStatusBar(2);
-    Mp3_To_Ogg_toolbar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxTB_TEXT);
-    SetToolBar(Mp3_To_Ogg_toolbar);
-    Mp3_To_Ogg_toolbar->AddTool(wxID_OPEN, _("&Open"), wxNullBitmap, wxNullBitmap, wxITEM_NORMAL, _("Open a file"), _("Open a MP3 file to convert into OGG format"));
-    Mp3_To_Ogg_toolbar->Realize();
-    text_ctrl_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
-    button_3 = new wxButton(notebook_1_pane_1, wxID_OPEN, wxEmptyString);
-    const wxString rbx_sampling_rate_choices[] = {
-        _("44 kbit"),
-        _("128 kbit"),
-    };
-    rbx_sampling_rate = new wxRadioBox(notebook_1_pane_2, wxID_ANY, _("Sampling Rate"), wxDefaultPosition, wxDefaultSize, 2, rbx_sampling_rate_choices, 0, wxRA_SPECIFY_ROWS);
-    cbx_love = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("♥ Love this song"));
-    text_ctrl_2 = new wxTextCtrl(notebook_1_pane_3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
-    _lbl_output_filename = new wxStaticText(notebook_1_pane_4, wxID_ANY, _("File name:"));
-    text_ctrl_3 = new wxTextCtrl(notebook_1_pane_4, wxID_ANY, wxEmptyString);
-    button_4 = new wxButton(notebook_1_pane_4, wxID_OPEN, wxEmptyString);
-    checkbox_1 = new wxCheckBox(notebook_1_pane_4, wxID_ANY, _("Overwrite existing file"));
-    label_1 = new wxStaticText(notebook_1_pane_5, wxID_ANY, _("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"));
-    static_line_1 = new wxStaticLine(this, wxID_ANY);
-    button_5 = new wxButton(this, wxID_CLOSE, wxEmptyString);
-    button_2 = new wxButton(this, wxID_CANCEL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-    button_1 = new wxButton(this, wxID_OK, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void PyOgg2_MyFrame::set_properties()
-{
-    // begin wxGlade: PyOgg2_MyFrame::set_properties
-    SetTitle(_("mp3 2 ogg"));
     int Mp3_To_Ogg_statusbar_widths[] = { -2, -1 };
     Mp3_To_Ogg_statusbar->SetStatusWidths(2, Mp3_To_Ogg_statusbar_widths);
-
+    
     // statusbar fields
     const wxString Mp3_To_Ogg_statusbar_fields[] = {
         _("Mp3_To_Ogg_statusbar"),
@@ -85,65 +47,88 @@
     for(int i = 0; i < Mp3_To_Ogg_statusbar->GetFieldsCount(); ++i) {
         Mp3_To_Ogg_statusbar->SetStatusText(Mp3_To_Ogg_statusbar_fields[i], i);
     }
-    text_ctrl_1->SetBackgroundColour(wxNullColour);
-    rbx_sampling_rate->SetSelection(0);
-    cbx_love->SetToolTip(_("Yes!\nWe ♥ it!"));
-    cbx_love->SetValue(1);
-    text_ctrl_3->SetToolTip(_("File name of the output file\nAn existing file will be overwritten without futher information!"));
-    checkbox_1->SetToolTip(_("Overwrite an existing file"));
-    checkbox_1->SetValue(1);
-    // end wxGlade
-}
-
-
-void PyOgg2_MyFrame::do_layout()
-{
-    // begin wxGlade: PyOgg2_MyFrame::do_layout
+    Mp3_To_Ogg_toolbar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxTB_TEXT);
+    SetToolBar(Mp3_To_Ogg_toolbar);
+    Mp3_To_Ogg_toolbar->AddTool(wxID_OPEN, _("&Open"), wxNullBitmap, wxNullBitmap, wxITEM_NORMAL, _("Open a file"), _("Open a MP3 file to convert into OGG format"));
+    Connect(wxID_OPEN, wxEVT_TOOL, PyOgg2_MyFrame::OnOpen);
+    Mp3_To_Ogg_toolbar->Realize();
     wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
-    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxBoxSizer* sizer_5 = new wxBoxSizer(wxHORIZONTAL);
-    wxFlexGridSizer* _gszr_pane4 = new wxFlexGridSizer(2, 3, 0, 0);
-    wxBoxSizer* _szr_pane3 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
-    wxStaticBoxSizer* sizer_3 = new wxStaticBoxSizer(new wxStaticBox(notebook_1_pane_2, wxID_ANY, _("Misc")), wxHORIZONTAL);
+    notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
+    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
+    notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_1, _("Input File"));
     wxFlexGridSizer* _gszr_pane1 = new wxFlexGridSizer(1, 3, 0, 0);
     wxStaticText* _lbl_input_filename = new wxStaticText(notebook_1_pane_1, wxID_ANY, _("File name:"));
     _gszr_pane1->Add(_lbl_input_filename, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    text_ctrl_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    text_ctrl_1->SetBackgroundColour(wxNullColour);
     _gszr_pane1->Add(text_ctrl_1, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
+    button_3 = new wxButton(notebook_1_pane_1, wxID_OPEN, wxEmptyString);
     _gszr_pane1->Add(button_3, 0, wxALL, 5);
-    notebook_1_pane_1->SetSizer(_gszr_pane1);
-    _gszr_pane1->AddGrowableCol(1);
+    notebook_1_pane_2 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_2, _("Converting Options"));
+    wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
+    const wxString rbx_sampling_rate_choices[] = {
+        _("44 kbit"),
+        _("128 kbit"),
+    };
+    rbx_sampling_rate = new wxRadioBox(notebook_1_pane_2, wxID_ANY, _("Sampling Rate"), wxDefaultPosition, wxDefaultSize, 2, rbx_sampling_rate_choices, 0, wxRA_SPECIFY_ROWS);
+    rbx_sampling_rate->SetSelection(0);
     sizer_4->Add(rbx_sampling_rate, 1, wxALL|wxEXPAND, 5);
-    sizer_3->Add(cbx_love, 0, wxALL|wxSHAPED, 5);
+    wxStaticBoxSizer* sizer_3 = new wxStaticBoxSizer(new wxStaticBox(notebook_1_pane_2, wxID_ANY, _("Misc")), wxHORIZONTAL);
     sizer_4->Add(sizer_3, 1, wxALL|wxEXPAND, 5);
-    notebook_1_pane_2->SetSizer(sizer_4);
+    cbx_love = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("♥ Love this song"));
+    cbx_love->SetToolTip(_("Yes!\nWe ♥ it!"));
+    cbx_love->SetValue(1);
+    sizer_3->Add(cbx_love, 0, wxALL|wxSHAPED, 5);
+    notebook_1_pane_3 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_3, _("Converting Progress"));
+    wxBoxSizer* _szr_pane3 = new wxBoxSizer(wxHORIZONTAL);
+    text_ctrl_2 = new wxTextCtrl(notebook_1_pane_3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
     _szr_pane3->Add(text_ctrl_2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_pane_3->SetSizer(_szr_pane3);
+    notebook_1_pane_4 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_4, _("Output File"));
+    wxFlexGridSizer* _gszr_pane4 = new wxFlexGridSizer(2, 3, 0, 0);
+    _lbl_output_filename = new wxStaticText(notebook_1_pane_4, wxID_ANY, _("File name:"));
     _gszr_pane4->Add(_lbl_output_filename, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    text_ctrl_3 = new wxTextCtrl(notebook_1_pane_4, wxID_ANY, wxEmptyString);
+    text_ctrl_3->SetToolTip(_("File name of the output file\nAn existing file will be overwritten without futher information!"));
     _gszr_pane4->Add(text_ctrl_3, 0, wxALL|wxEXPAND, 5);
+    button_4 = new wxButton(notebook_1_pane_4, wxID_OPEN, wxEmptyString);
     _gszr_pane4->Add(button_4, 0, wxALL, 5);
     _gszr_pane4->Add(20, 20, 0, 0, 0);
+    checkbox_1 = new wxCheckBox(notebook_1_pane_4, wxID_ANY, _("Overwrite existing file"));
+    checkbox_1->SetToolTip(_("Overwrite an existing file"));
+    checkbox_1->SetValue(1);
     _gszr_pane4->Add(checkbox_1, 0, wxALL|wxEXPAND, 5);
     _gszr_pane4->Add(20, 20, 0, 0, 0);
-    notebook_1_pane_4->SetSizer(_gszr_pane4);
-    _gszr_pane4->AddGrowableCol(1);
-    sizer_5->Add(label_1, 1, wxALL|wxEXPAND, 5);
-    notebook_1_pane_5->SetSizer(sizer_5);
-    notebook_1->AddPage(notebook_1_pane_1, _("Input File"));
-    notebook_1->AddPage(notebook_1_pane_2, _("Converting Options"));
-    notebook_1->AddPage(notebook_1_pane_3, _("Converting Progress"));
-    notebook_1->AddPage(notebook_1_pane_4, _("Output File"));
+    notebook_1_pane_5 = new wxPanel(notebook_1, wxID_ANY);
     notebook_1->AddPage(notebook_1_pane_5, _("Some Text"));
-    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
+    wxBoxSizer* sizer_5 = new wxBoxSizer(wxHORIZONTAL);
+    label_1 = new wxStaticText(notebook_1_pane_5, wxID_ANY, _("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"));
+    sizer_5->Add(label_1, 1, wxALL|wxEXPAND, 5);
+    static_line_1 = new wxStaticLine(this, wxID_ANY);
     sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
+    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
+    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
+    button_5 = new wxButton(this, wxID_CLOSE, wxEmptyString);
     sizer_2->Add(button_5, 0, wxALIGN_RIGHT|wxALL, 5);
+    button_2 = new wxButton(this, wxID_CANCEL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
     sizer_2->Add(button_2, 0, wxALIGN_RIGHT|wxALL, 5);
+    button_1 = new wxButton(this, wxID_OK, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
     sizer_2->Add(button_1, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
-    SetSizer(sizer_1);
-    sizer_1->SetSizeHints(this);
+    
+    notebook_1_pane_5->SetSizer(sizer_5);
+    _gszr_pane4->AddGrowableCol(1);
+    notebook_1_pane_4->SetSizer(_gszr_pane4);
+    notebook_1_pane_3->SetSizer(_szr_pane3);
+    notebook_1_pane_2->SetSizer(sizer_4);
+    _gszr_pane1->AddGrowableCol(1);
+    notebook_1_pane_1->SetSizer(_gszr_pane1);
     sizer_1->AddGrowableRow(0);
     sizer_1->AddGrowableCol(0);
+    SetSizer(sizer_1);
+    sizer_1->SetSizeHints(this);
     Layout();
     Centre();
     // end wxGlade
@@ -152,7 +137,6 @@
 
 BEGIN_EVENT_TABLE(PyOgg2_MyFrame, wxFrame)
     // begin wxGlade: PyOgg2_MyFrame::event_table
-    EVT_TOOL(wxID_OPEN, PyOgg2_MyFrame::OnOpen)
     EVT_BUTTON(wxID_OK, PyOgg2_MyFrame::startConverting)
     // end wxGlade
 END_EVENT_TABLE();
@@ -195,38 +179,22 @@
 {
     // begin wxGlade: MyFrameGrid::MyFrameGrid
     SetSize(wxSize(492, 300));
-    grid = new wxGrid(this, wxID_ANY);
-    static_line = new wxStaticLine(this, wxID_ANY);
-    button = new wxButton(this, wxID_CLOSE, wxEmptyString);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrameGrid::set_properties()
-{
-    // begin wxGlade: MyFrameGrid::set_properties
     SetTitle(_("FrameOggCompressionDetails"));
-    grid->CreateGrid(8, 3);
-    button->SetFocus();
-    button->SetDefault();
-    // end wxGlade
-}
-
-
-void MyFrameGrid::do_layout()
-{
-    // begin wxGlade: MyFrameGrid::do_layout
     _szr_frame = new wxBoxSizer(wxVERTICAL);
     grid_sizer = new wxFlexGridSizer(3, 1, 0, 0);
+    _szr_frame->Add(grid_sizer, 1, wxEXPAND, 0);
+    grid = new wxGrid(this, wxID_ANY);
+    grid->CreateGrid(8, 3);
     grid_sizer->Add(grid, 1, wxEXPAND, 0);
+    static_line = new wxStaticLine(this, wxID_ANY);
     grid_sizer->Add(static_line, 0, wxALL|wxEXPAND, 5);
+    button = new wxButton(this, wxID_CLOSE, wxEmptyString);
+    button->SetFocus();
+    button->SetDefault();
     grid_sizer->Add(button, 0, wxALIGN_RIGHT|wxALL, 5);
+    
     grid_sizer->AddGrowableRow(0);
     grid_sizer->AddGrowableCol(0);
-    _szr_frame->Add(grid_sizer, 1, wxEXPAND, 0);
     SetSizer(_szr_frame);
     _szr_frame->SetSizeHints(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample.h wxglade-1.0.1/tests/casefiles/ComplexExample.h
--- wxglade-0.9.6/tests/casefiles/ComplexExample.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample.h	2020-12-31 14:04:48.000000000 +0000
@@ -39,32 +39,28 @@
     PyOgg2_MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: PyOgg2_MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: PyOgg2_MyFrame::attributes
     wxMenuBar* Mp3_To_Ogg_menubar;
     wxStatusBar* Mp3_To_Ogg_statusbar;
     wxToolBar* Mp3_To_Ogg_toolbar;
+    wxNotebook* notebook_1;
+    wxPanel* notebook_1_pane_1;
     wxTextCtrl* text_ctrl_1;
     wxButton* button_3;
-    wxPanel* notebook_1_pane_1;
+    wxPanel* notebook_1_pane_2;
     wxRadioBox* rbx_sampling_rate;
     wxCheckBox* cbx_love;
-    wxPanel* notebook_1_pane_2;
-    wxTextCtrl* text_ctrl_2;
     wxPanel* notebook_1_pane_3;
+    wxTextCtrl* text_ctrl_2;
+    wxPanel* notebook_1_pane_4;
     wxStaticText* _lbl_output_filename;
     wxTextCtrl* text_ctrl_3;
     wxButton* button_4;
     wxCheckBox* checkbox_1;
-    wxPanel* notebook_1_pane_4;
-    wxStaticText* label_1;
     wxPanel* notebook_1_pane_5;
-    wxNotebook* notebook_1;
+    wxStaticText* label_1;
     wxStaticLine* static_line_1;
     wxButton* button_5;
     wxButton* button_2;
@@ -74,10 +70,10 @@
     DECLARE_EVENT_TABLE();
 
 public:
-    void OnOpen(wxCommandEvent &event); // wxGlade: <event_handler>
-    void OnClose(wxCommandEvent &event); // wxGlade: <event_handler>
-    void OnAboutDialog(wxCommandEvent &event); // wxGlade: <event_handler>
-    void startConverting(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void OnOpen(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void OnClose(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void OnAboutDialog(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void startConverting(wxCommandEvent &event); // wxGlade: <event_handler>
 }; // wxGlade: end class
 
 
@@ -89,18 +85,14 @@
     MyFrameGrid(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrameGrid::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrameGrid::attributes
+    wxBoxSizer* _szr_frame;
+    wxFlexGridSizer* grid_sizer;
     wxGrid* grid;
     wxStaticLine* static_line;
     wxButton* button;
-    wxFlexGridSizer* grid_sizer;
-    wxBoxSizer* _szr_frame;
     // end wxGlade
 }; // wxGlade: end class
 
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample.lisp wxglade-1.0.1/tests/casefiles/ComplexExample.lisp
--- wxglade-0.9.6/tests/casefiles/ComplexExample.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -42,35 +42,35 @@
         (Mp3-To-Ogg-menubar :initform nil :accessor slot-Mp3-To-Ogg-menubar)
         (Mp3-To-Ogg-statusbar :initform nil :accessor slot-Mp3-To-Ogg-statusbar)
         (Mp3-To-Ogg-toolbar :initform nil :accessor slot-Mp3-To-Ogg-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (-gszr-pane1 :initform nil :accessor slot--gszr-pane1)
         (-lbl-input-filename :initform nil :accessor slot--lbl-input-filename)
         (text-ctrl-1 :initform nil :accessor slot-text-ctrl-1)
         (button-3 :initform nil :accessor slot-button-3)
-        (-gszr-pane1 :initform nil :accessor slot--gszr-pane1)
-        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (notebook-1-pane-2 :initform nil :accessor slot-notebook-1-pane-2)
+        (sizer-4 :initform nil :accessor slot-sizer-4)
         (rbx-sampling-rate :initform nil :accessor slot-rbx-sampling-rate)
-        (cbx-love :initform nil :accessor slot-cbx-love)
         (sizer-3 :initform nil :accessor slot-sizer-3)
-        (sizer-4 :initform nil :accessor slot-sizer-4)
-        (notebook-1-pane-2 :initform nil :accessor slot-notebook-1-pane-2)
-        (text-ctrl-2 :initform nil :accessor slot-text-ctrl-2)
-        (-szr-pane3 :initform nil :accessor slot--szr-pane3)
+        (cbx-love :initform nil :accessor slot-cbx-love)
         (notebook-1-pane-3 :initform nil :accessor slot-notebook-1-pane-3)
+        (-szr-pane3 :initform nil :accessor slot--szr-pane3)
+        (text-ctrl-2 :initform nil :accessor slot-text-ctrl-2)
+        (notebook-1-pane-4 :initform nil :accessor slot-notebook-1-pane-4)
+        (-gszr-pane4 :initform nil :accessor slot--gszr-pane4)
         (-lbl-output-filename :initform nil :accessor slot--lbl-output-filename)
         (text-ctrl-3 :initform nil :accessor slot-text-ctrl-3)
         (button-4 :initform nil :accessor slot-button-4)
         (checkbox-1 :initform nil :accessor slot-checkbox-1)
-        (-gszr-pane4 :initform nil :accessor slot--gszr-pane4)
-        (notebook-1-pane-4 :initform nil :accessor slot-notebook-1-pane-4)
-        (label-1 :initform nil :accessor slot-label-1)
-        (sizer-5 :initform nil :accessor slot-sizer-5)
         (notebook-1-pane-5 :initform nil :accessor slot-notebook-1-pane-5)
-        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (sizer-5 :initform nil :accessor slot-sizer-5)
+        (label-1 :initform nil :accessor slot-label-1)
         (static-line-1 :initform nil :accessor slot-static-line-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
         (button-5 :initform nil :accessor slot-button-5)
         (button-2 :initform nil :accessor slot-button-2)
-        (button-1 :initform nil :accessor slot-button-1)
-        (sizer-2 :initform nil :accessor slot-sizer-2)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (button-1 :initform nil :accessor slot-button-1)))
 
 (defun make-PyOgg2_MyFrame ()
         (let ((obj (make-instance 'PyOgg2_MyFrame)))
@@ -84,6 +84,7 @@
         ;;; begin wxGlade: PyOgg2_MyFrame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
         (slot-top-window obj).wxWindow_SetSize((600, 500))
+        (wxFrame_SetTitle (slot-top-window obj) (_"mp3 2 ogg"))
         
         ;;; Menu Bar
         (setf (slot-Mp3-To-Ogg-menubar obj) (wxMenuBar_Create 0))
@@ -96,106 +97,133 @@
         		(wxMenuBar_Append (slot-Mp3-To-Ogg-menubar obj) wxglade_tmp_menu (_"&Help")))
         (wxFrame_SetMenuBar (slot-top-window obj) (slot-Mp3-To-Ogg-menubar obj))
         ;;; Menu Bar end
-
+        
         (setf (slot-Mp3-To-Ogg-statusbar obj) (wxFrame_CreateStatusBar (slot-top-window obj) 2 0))
+        (wxStatusBar_SetStatusWidths (slot-Mp3-To-Ogg-statusbar obj) 2 (vector -2 -1))
+        (wxStatusBar_SetStatusText (slot-Mp3-To-Ogg-statusbar obj) (_"Mp3_To_Ogg_statusbar") 0)
+        (wxStatusBar_SetStatusText (slot-Mp3-To-Ogg-statusbar obj) "" 1)
         
-	;;; Tool Bar
-        (setf (slot-Mp3-To-Ogg-toolbar obj) (wxToolBar_Create (slot-top-window obj) -1 -1 -1 -1 -1 (logior wxTB_HORIZONTAL wxTB_TEXT)))
-        (wxFrame_SetToolBar (slot-top-window obj) (slot-Mp3-To-Ogg-toolbar obj))
+        ;;; Tool Bar
+        (setf (slot-Mp3-To-Ogg-toolbar obj) (wxToolBar_Create (slot-top-window obj) -1 -1 -1 -1 -1 (logior wxTB_DEFAULT_STYLE wxTB_TEXT)))
         (wxToolBar_AddTool (slot-Mp3-To-Ogg-toolbar obj) wxID_OPEN (_"&Open") wxNullBitmap wxNullBitmap wxITEM_NORMAL (_"Open a file") (_"Open a MP3 file to convert into OGG format"))
+        (wxFrame_SetToolBar (slot-top-window obj) (slot-Mp3-To-Ogg-toolbar obj))
+        (wxToolBar_Realize (slot-Mp3-To-Ogg-toolbar obj))
         ;;; Tool Bar end
+        
+        (setf (slot-sizer-1 obj) (wxGridSizer_Create 3 1 0 0))
+        
         (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxNB_BOTTOM))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
+        
         (setf (slot-notebook-1-pane-1 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-1 obj) (_"Input File") 1 -1)
+        
+        (setf (slot--gszr-pane1 obj) (wxGridSizer_Create 1 3 0 0))
+        
+        (setf (slot--lbl-input-filename obj) (wxStaticText_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"File name:") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot--gszr-pane1 obj) (slot--lbl-input-filename obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
         (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (wxWindow_SetBackgroundColour (slot-text-ctrl-1 obj) wxNullColour)
+        (wxSizer_AddWindow (slot--gszr-pane1 obj) (slot-text-ctrl-1 obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-button-3 obj) (wxButton_Create (slot-notebook-1-pane-1 obj) wxID_OPEN "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot--gszr-pane1 obj) (slot-button-3 obj) 0 wxALL 5 nil)
+        
         (setf (slot-notebook-1-pane-2 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-2 obj) (_"Converting Options") 1 -1)
+        
+        (setf (slot-sizer-4 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-rbx-sampling-rate obj) (wxRadioBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Sampling Rate") -1 -1 -1 -1 2 (vector (_"44 kbit") (_"128 kbit")) 0 wxRA_SPECIFY_ROWS))
+        (wxRadioBox_SetSelection (slot-rbx-sampling-rate obj) 0)
+        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-rbx-sampling-rate obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-3 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-notebook-1-pane-2 obj) (_"Misc")) wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-sizer-4 obj) (slot-sizer-3 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-cbx-love obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"♥ Love this song") -1 -1 -1 -1 0))
+        (wxWindow_SetToolTip (slot-cbx-love obj)(_"Yes!\nWe ♥ it!"))
+        (wxCheckBox_SetValue (slot-cbx-love obj) 1)
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-cbx-love obj) 0 (logior wxALL wxSHAPED) 5 nil)
+        
         (setf (slot-notebook-1-pane-3 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-3 obj) (_"Converting Progress") 1 -1)
+        
+        (setf (slot--szr-pane3 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-text-ctrl-2 obj) (wxTextCtrl_Create (slot-notebook-1-pane-3 obj) wxID_ANY "" -1 -1 -1 -1 wxTE_MULTILINE))
+        (wxSizer_AddWindow (slot--szr-pane3 obj) (slot-text-ctrl-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-pane-4 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-4 obj) (_"Output File") 1 -1)
+        
+        (setf (slot--gszr-pane4 obj) (wxGridSizer_Create 2 3 0 0))
+        
         (setf (slot--lbl-output-filename obj) (wxStaticText_Create (slot-notebook-1-pane-4 obj) wxID_ANY (_"File name:") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot--gszr-pane4 obj) (slot--lbl-output-filename obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
         (setf (slot-text-ctrl-3 obj) (wxTextCtrl_Create (slot-notebook-1-pane-4 obj) wxID_ANY "" -1 -1 -1 -1 0))
-        (setf (slot-button-4 obj) (wxButton_Create (slot-notebook-1-pane-4 obj) wxID_OPEN "" -1 -1 -1 -1 0))
-        (setf (slot-checkbox-1 obj) (wxCheckBox_Create (slot-notebook-1-pane-4 obj) wxID_ANY (_"Overwrite existing file") -1 -1 -1 -1 0))
-        (setf (slot-notebook-1-pane-5 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-notebook-1-pane-5 obj) wxID_ANY (_"Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n") -1 -1 -1 -1 0))
-        (setf (slot-static-line-1 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
-        (setf (slot-button-5 obj) (wxButton_Create (slot-top-window obj) wxID_CLOSE "" -1 -1 -1 -1 0))
-        (setf (slot-button-2 obj) (wxButton_Create (slot-top-window obj) wxID_CANCEL "" -1 -1 -1 -1 wxBU_TOP))
-        (setf (slot-button-1 obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 wxBU_TOP))
-
-        (wxEvtHandler_Connect (slot-top-window obj) obj.button-1 (expwxEVT_BUTTON)
-        (wxClosure_Create #'startConverting obj))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj PyOgg2_MyFrame))
-        ;;; begin wxGlade: PyOgg2_MyFrame.__set_properties
-        (wxFrame_SetTitle (slot-top-window obj) (_"mp3 2 ogg"))
-        (wxStatusBar_SetStatusWidths (slot-Mp3-To-Ogg-statusbar obj) 2 (vector -2 -1))
-        (wxStatusBar_SetStatusText (slot-Mp3-To-Ogg-statusbar obj) (_"Mp3_To_Ogg_statusbar") 0)
-        (wxStatusBar_SetStatusText (slot-Mp3-To-Ogg-statusbar obj) "" 1)
-        (wxToolBar_Realize (slot-Mp3-To-Ogg-toolbar obj))
-        (wxWindow_SetBackgroundColour (slot-text-ctrl-1 obj) wxNullColour)
-        (wxRadioBox_SetSelection (slot-rbx-sampling-rate obj) 0)
-        (wxWindow_SetToolTip (slot-cbx-love obj)(_"Yes!\nWe ♥ it!"))
-        (wxCheckBox_SetValue (slot-cbx-love obj) 1)
         (wxWindow_SetToolTip (slot-text-ctrl-3 obj)(_"File name of the output file\nAn existing file will be overwritten without futher information!"))
-        (wxWindow_SetToolTip (slot-checkbox-1 obj)(_"Overwrite an existing file"))
-        (wxCheckBox_SetValue (slot-checkbox-1 obj) 1)
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj PyOgg2_MyFrame))
-        ;;; begin wxGlade: PyOgg2_MyFrame.__do_layout
-        (setf (slot-sizer-1 obj) (wxGridSizer_Create 3 1 0 0))
-        (setf (slot-sizer-2 obj) (wxGridSizer_Create 1 3 0 0))
-        (setf (slot-sizer-5 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot--gszr-pane4 obj) (wxGridSizer_Create 2 3 0 0))
-        (setf (slot--szr-pane3 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-4 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-3 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-notebook-1-pane-2 obj) (_"Misc")) wxHORIZONTAL))
-        (setf (slot--gszr-pane1 obj) (wxGridSizer_Create 1 3 0 0))
-        (setf (slot--lbl-input-filename obj) (wxStaticText_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"File name:") -1 -1 -1 -1 0))
-        (wxSizer_AddWindow (slot--gszr-pane1 obj) (slot--lbl-input-filename obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
-        (wxSizer_AddWindow (slot--gszr-pane1 obj) (slot-text-ctrl-1 obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot--gszr-pane1 obj) (slot-button-3 obj) 0 wxALL 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-1 obj) (slot--gszr-pane1 obj))
-        (wxFlexGridSizer_AddGrowableCol (slot--gszr-pane1 obj) 1)
-        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-rbx-sampling-rate obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-cbx-love obj) 0 (logior wxALL wxSHAPED) 5 nil)
-        (wxSizer_AddSizer (slot-sizer-4 obj) (slot-sizer-3 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-2 obj) (slot-sizer-4 obj))
-        (wxSizer_AddWindow (slot--szr-pane3 obj) (slot-text-ctrl-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-3 obj) (slot--szr-pane3 obj))
-        (wxSizer_AddWindow (slot--gszr-pane4 obj) (slot--lbl-output-filename obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
         (wxSizer_AddWindow (slot--gszr-pane4 obj) (slot-text-ctrl-3 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-button-4 obj) (wxButton_Create (slot-notebook-1-pane-4 obj) wxID_OPEN "" -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot--gszr-pane4 obj) (slot-button-4 obj) 0 wxALL 5 nil)
+        
         (wxSizer_AddWindow (slot--gszr-pane4 obj) ((20, 20) obj) 0 0 0 nil)
+        
+        (setf (slot-checkbox-1 obj) (wxCheckBox_Create (slot-notebook-1-pane-4 obj) wxID_ANY (_"Overwrite existing file") -1 -1 -1 -1 0))
+        (wxWindow_SetToolTip (slot-checkbox-1 obj)(_"Overwrite an existing file"))
+        (wxCheckBox_SetValue (slot-checkbox-1 obj) 1)
         (wxSizer_AddWindow (slot--gszr-pane4 obj) (slot-checkbox-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
         (wxSizer_AddWindow (slot--gszr-pane4 obj) ((20, 20) obj) 0 0 0 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-4 obj) (slot--gszr-pane4 obj))
-        (wxFlexGridSizer_AddGrowableCol (slot--gszr-pane4 obj) 1)
-        (wxSizer_AddWindow (slot-sizer-5 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-5 obj) (slot-sizer-5 obj))
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-1 obj) (_"Input File") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-2 obj) (_"Converting Options") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-3 obj) (_"Converting Progress") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-4 obj) (_"Output File") 1 -1)
+        
+        (setf (slot-notebook-1-pane-5 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
         (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-5 obj) (_"Some Text") 1 -1)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-sizer-5 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-notebook-1-pane-5 obj) wxID_ANY (_"Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-5 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-static-line-1 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-static-line-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-2 obj) (wxGridSizer_Create 1 3 0 0))
+        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 0 wxALIGN_RIGHT 0 nil)
+        
+        (setf (slot-button-5 obj) (wxButton_Create (slot-top-window obj) wxID_CLOSE "" -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-5 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
+        (setf (slot-button-2 obj) (wxButton_Create (slot-top-window obj) wxID_CANCEL "" -1 -1 -1 -1 wxBU_TOP))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-2 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
+        (setf (slot-button-1 obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 wxBU_TOP))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-1 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
-        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 0 wxALIGN_RIGHT 0 nil)
-        (wxWindow_SetSizer (slot-frame obj) (slot-sizer-1 obj))
-        (wxSizer_SetSizeHints (slot-slot-sizer-1 obj) (slot-frame obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-pane-5 obj) (slot-sizer-5 obj))
+        
+        (wxFlexGridSizer_AddGrowableCol (slot--gszr-pane4 obj) 1)
+        (wxWindow_SetSizer (slot-notebook-1-pane-4 obj) (slot--gszr-pane4 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-pane-3 obj) (slot--szr-pane3 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-pane-2 obj) (slot-sizer-4 obj))
+        
+        (wxFlexGridSizer_AddGrowableCol (slot--gszr-pane1 obj) 1)
+        (wxWindow_SetSizer (slot-notebook-1-pane-1 obj) (slot--gszr-pane1 obj))
+        
         (wxFlexGridSizer_AddGrowableRow (slot-sizer-1 obj) 0)
         (wxFlexGridSizer_AddGrowableCol (slot-sizer-1 obj) 0)
+        (wxWindow_SetSizer (slot-frame obj) (slot-sizer-1 obj))
+        (wxSizer_SetSizeHints (slot-slot-sizer-1 obj) (slot-frame obj))
+        
         (wxFrame_layout (slot-Mp3-To-Ogg self))
         (wxFrame_Centre (slot-top-window obj) wxBOTH)
+
+        (wxEvtHandler_Connect (slot-top-window obj) obj.button-1 (expwxEVT_BUTTON)
+        (wxClosure_Create #'startConverting obj))
         ;;; end wxGlade
         )
 
@@ -213,40 +241,40 @@
         (Mp3-To-Ogg-menubar :initform nil :accessor slot-Mp3-To-Ogg-menubar)
         (Mp3-To-Ogg-statusbar :initform nil :accessor slot-Mp3-To-Ogg-statusbar)
         (Mp3-To-Ogg-toolbar :initform nil :accessor slot-Mp3-To-Ogg-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (-gszr-pane1 :initform nil :accessor slot--gszr-pane1)
         (-lbl-input-filename :initform nil :accessor slot--lbl-input-filename)
         (text-ctrl-1 :initform nil :accessor slot-text-ctrl-1)
         (button-3 :initform nil :accessor slot-button-3)
-        (-gszr-pane1 :initform nil :accessor slot--gszr-pane1)
-        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (notebook-1-pane-2 :initform nil :accessor slot-notebook-1-pane-2)
+        (sizer-4 :initform nil :accessor slot-sizer-4)
         (rbx-sampling-rate :initform nil :accessor slot-rbx-sampling-rate)
-        (cbx-love :initform nil :accessor slot-cbx-love)
         (sizer-3 :initform nil :accessor slot-sizer-3)
-        (sizer-4 :initform nil :accessor slot-sizer-4)
-        (notebook-1-pane-2 :initform nil :accessor slot-notebook-1-pane-2)
-        (text-ctrl-2 :initform nil :accessor slot-text-ctrl-2)
-        (-szr-pane3 :initform nil :accessor slot--szr-pane3)
+        (cbx-love :initform nil :accessor slot-cbx-love)
         (notebook-1-pane-3 :initform nil :accessor slot-notebook-1-pane-3)
+        (-szr-pane3 :initform nil :accessor slot--szr-pane3)
+        (text-ctrl-2 :initform nil :accessor slot-text-ctrl-2)
+        (notebook-1-pane-4 :initform nil :accessor slot-notebook-1-pane-4)
+        (-gszr-pane4 :initform nil :accessor slot--gszr-pane4)
         (-lbl-output-filename :initform nil :accessor slot--lbl-output-filename)
         (text-ctrl-3 :initform nil :accessor slot-text-ctrl-3)
         (button-4 :initform nil :accessor slot-button-4)
         (checkbox-1 :initform nil :accessor slot-checkbox-1)
-        (-gszr-pane4 :initform nil :accessor slot--gszr-pane4)
-        (notebook-1-pane-4 :initform nil :accessor slot-notebook-1-pane-4)
-        (label-1 :initform nil :accessor slot-label-1)
-        (sizer-5 :initform nil :accessor slot-sizer-5)
         (notebook-1-pane-5 :initform nil :accessor slot-notebook-1-pane-5)
-        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (sizer-5 :initform nil :accessor slot-sizer-5)
+        (label-1 :initform nil :accessor slot-label-1)
         (static-line-1 :initform nil :accessor slot-static-line-1)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
         (button-5 :initform nil :accessor slot-button-5)
         (button-2 :initform nil :accessor slot-button-2)
         (button-1 :initform nil :accessor slot-button-1)
-        (sizer-2 :initform nil :accessor slot-sizer-2)
-        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (-szr-frame :initform nil :accessor slot--szr-frame)
+        (grid-sizer :initform nil :accessor slot-grid-sizer)
         (grid :initform nil :accessor slot-grid)
         (static-line :initform nil :accessor slot-static-line)
-        (button :initform nil :accessor slot-button)
-        (grid-sizer :initform nil :accessor slot-grid-sizer)
-        (-szr-frame :initform nil :accessor slot--szr-frame)))
+        (button :initform nil :accessor slot-button)))
 
 (defun make-MyFrameGrid ()
         (let ((obj (make-instance 'MyFrameGrid)))
@@ -260,33 +288,31 @@
         ;;; begin wxGlade: MyFrameGrid.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
         (slot-top-window obj).wxWindow_SetSize((492, 300))
-        (setf (slot-grid obj) (wxGrid_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxWANTS_CHARS))
-        (setf (slot-static-line obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
-        (setf (slot-button obj) (wxButton_Create (slot-top-window obj) wxID_CLOSE "" -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrameGrid))
-        ;;; begin wxGlade: MyFrameGrid.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"FrameOggCompressionDetails"))
-        (wxGrid_CreateGrid (slot-grid obj) 8 3 0)
-        (wxWindow_SetFocus (slot-button obj))
-        (wxButton_SetDefault (slot-button obj))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrameGrid))
-        ;;; begin wxGlade: MyFrameGrid.__do_layout
+        
         (setf (slot--szr-frame obj) (wxBoxSizer_Create wxVERTICAL))
+        
         (setf (slot-grid-sizer obj) (wxGridSizer_Create 3 1 0 0))
+        (wxSizer_AddSizer (slot--szr-frame obj) (slot-grid-sizer obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-grid obj) (wxGrid_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxWANTS_CHARS))
+        (wxGrid_CreateGrid (slot-grid obj) 8 3 0)
         (wxSizer_AddWindow (slot-grid-sizer obj) (slot-grid obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-static-line obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
         (wxSizer_AddWindow (slot-grid-sizer obj) (slot-static-line obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-button obj) (wxButton_Create (slot-top-window obj) wxID_CLOSE "" -1 -1 -1 -1 0))
+        (wxWindow_SetFocus (slot-button obj))
+        (wxButton_SetDefault (slot-button obj))
         (wxSizer_AddWindow (slot-grid-sizer obj) (slot-button obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
         (wxFlexGridSizer_AddGrowableRow (slot-grid-sizer obj) 0)
         (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer obj) 0)
-        (wxSizer_AddSizer (slot--szr-frame obj) (slot-grid-sizer obj) 1 wxEXPAND 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot--szr-frame obj))
         (wxSizer_SetSizeHints (slot-slot--szr-frame obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-FrameGrid self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample_Phoenix.py wxglade-1.0.1/tests/casefiles/ComplexExample_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/ComplexExample_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,10 +5,10 @@
 #
 
 import wx
-import wx.grid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.grid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -21,7 +21,8 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((600, 500))
-        
+        self.SetTitle(_("mp3 2 ogg"))
+
         # Menu Bar
         self.Mp3_To_Ogg_menubar = wx.MenuBar()
         wxglade_tmp_menu = wx.Menu()
@@ -36,109 +37,135 @@
         self.Mp3_To_Ogg_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.Mp3_To_Ogg_menubar)
         # Menu Bar end
+
         self.Mp3_To_Ogg_statusbar = self.CreateStatusBar(2)
-        
+        self.Mp3_To_Ogg_statusbar.SetStatusWidths([-2, -1])
+        # statusbar fields
+        Mp3_To_Ogg_statusbar_fields = [_("Mp3_To_Ogg_statusbar"), ""]
+        for i in range(len(Mp3_To_Ogg_statusbar_fields)):
+            self.Mp3_To_Ogg_statusbar.SetStatusText(Mp3_To_Ogg_statusbar_fields[i], i)
+
         # Tool Bar
-        self.Mp3_To_Ogg_toolbar = wx.ToolBar(self, -1, style=wx.TB_HORIZONTAL | wx.TB_TEXT)
-        self.SetToolBar(self.Mp3_To_Ogg_toolbar)
+        self.Mp3_To_Ogg_toolbar = wx.ToolBar(self, -1, style=wx.TB_TEXT)
         self.Mp3_To_Ogg_toolbar.AddTool(wx.ID_OPEN, _("&Open"), wx.NullBitmap, wx.NullBitmap, wx.ITEM_NORMAL, _("Open a file"), _("Open a MP3 file to convert into OGG format"))
+        self.Bind(wx.EVT_TOOL, self.OnOpen, id=wx.ID_OPEN)
+        self.SetToolBar(self.Mp3_To_Ogg_toolbar)
+        self.Mp3_To_Ogg_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
+
+        _gszr_pane1 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        _lbl_input_filename = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
+        _gszr_pane1.Add(_lbl_input_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self.text_ctrl_1.SetBackgroundColour(wx.NullColour)
+        _gszr_pane1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
+
         self.button_3 = wx.Button(self.notebook_1_pane_1, wx.ID_OPEN, "")
+        _gszr_pane1.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
+
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.rbx_sampling_rate = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Sampling Rate"), choices=[_("44 kbit"), _("128 kbit")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.rbx_sampling_rate.SetSelection(0)
+        sizer_4.Add(self.rbx_sampling_rate, 1, wx.ALL | wx.EXPAND, 5)
+
+        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Misc")), wx.HORIZONTAL)
+        sizer_4.Add(sizer_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.cbx_love = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _(u"♥ Love this song"))
+        self.cbx_love.SetToolTipString(_(u"Yes!\nWe ♥ it!"))
+        self.cbx_love.SetValue(1)
+        sizer_3.Add(self.cbx_love, 0, wx.ALL | wx.SHAPED, 5)
+
         self.notebook_1_pane_3 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
+
+        _szr_pane3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_pane_3, wx.ID_ANY, "", style=wx.TE_MULTILINE)
+        _szr_pane3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_pane_4 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
+
+        _gszr_pane4 = wx.FlexGridSizer(2, 3, 0, 0)
+
         self._lbl_output_filename = wx.StaticText(self.notebook_1_pane_4, wx.ID_ANY, _("File name:"))
+        _gszr_pane4.Add(self._lbl_output_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_pane_4, wx.ID_ANY, "")
+        self.text_ctrl_3.SetToolTipString(_("File name of the output file\nAn existing file will be overwritten without futher information!"))
+        _gszr_pane4.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
+
         self.button_4 = wx.Button(self.notebook_1_pane_4, wx.ID_OPEN, "")
+        _gszr_pane4.Add(self.button_4, 0, wx.ALL, 5)
+
+        _gszr_pane4.Add((20, 20), 0, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_pane_4, wx.ID_ANY, _("Overwrite existing file"))
+        self.checkbox_1.SetToolTipString(_("Overwrite an existing file"))
+        self.checkbox_1.SetValue(1)
+        _gszr_pane4.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        _gszr_pane4.Add((20, 20), 0, 0, 0)
+
         self.notebook_1_pane_5 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_5, _("Some Text"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_1 = wx.StaticText(self.notebook_1_pane_5, wx.ID_ANY, _("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"))
+        sizer_5.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
         self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
+        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_2 = wx.Button(self, wx.ID_CANCEL, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.notebook_1_pane_5.SetSizer(sizer_5)
 
-        self.Bind(wx.EVT_TOOL, self.OnOpen, id=wx.ID_OPEN)
-        self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
-        # end wxGlade
+        _gszr_pane4.AddGrowableCol(1)
+        self.notebook_1_pane_4.SetSizer(_gszr_pane4)
 
-    def __set_properties(self):
-        # begin wxGlade: PyOgg2_MyFrame.__set_properties
-        self.SetTitle(_("mp3 2 ogg"))
-        self.Mp3_To_Ogg_statusbar.SetStatusWidths([-2, -1])
+        self.notebook_1_pane_3.SetSizer(_szr_pane3)
 
-        # statusbar fields
-        Mp3_To_Ogg_statusbar_fields = [_("Mp3_To_Ogg_statusbar"), ""]
-        for i in range(len(Mp3_To_Ogg_statusbar_fields)):
-            self.Mp3_To_Ogg_statusbar.SetStatusText(Mp3_To_Ogg_statusbar_fields[i], i)
-        self.Mp3_To_Ogg_toolbar.Realize()
-        self.text_ctrl_1.SetBackgroundColour(wx.NullColour)
-        self.rbx_sampling_rate.SetSelection(0)
-        self.cbx_love.SetToolTipString(_(u"Yes!\nWe ♥ it!"))
-        self.cbx_love.SetValue(1)
-        self.text_ctrl_3.SetToolTipString(_("File name of the output file\nAn existing file will be overwritten without futher information!"))
-        self.checkbox_1.SetToolTipString(_("Overwrite an existing file"))
-        self.checkbox_1.SetValue(1)
-        # end wxGlade
+        self.notebook_1_pane_2.SetSizer(sizer_4)
 
-    def __do_layout(self):
-        # begin wxGlade: PyOgg2_MyFrame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        _gszr_pane4 = wx.FlexGridSizer(2, 3, 0, 0)
-        _szr_pane3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Misc")), wx.HORIZONTAL)
-        _gszr_pane1 = wx.FlexGridSizer(1, 3, 0, 0)
-        _lbl_input_filename = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
-        _gszr_pane1.Add(_lbl_input_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        _gszr_pane1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
-        _gszr_pane1.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_pane_1.SetSizer(_gszr_pane1)
         _gszr_pane1.AddGrowableCol(1)
-        sizer_4.Add(self.rbx_sampling_rate, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_3.Add(self.cbx_love, 0, wx.ALL | wx.SHAPED, 5)
-        sizer_4.Add(sizer_3, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_2.SetSizer(sizer_4)
-        _szr_pane3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_3.SetSizer(_szr_pane3)
-        _gszr_pane4.Add(self._lbl_output_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        _gszr_pane4.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
-        _gszr_pane4.Add(self.button_4, 0, wx.ALL, 5)
-        _gszr_pane4.Add((20, 20), 0, 0, 0)
-        _gszr_pane4.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
-        _gszr_pane4.Add((20, 20), 0, 0, 0)
-        self.notebook_1_pane_4.SetSizer(_gszr_pane4)
-        _gszr_pane4.AddGrowableCol(1)
-        sizer_5.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_5.SetSizer(sizer_5)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
-        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
-        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
-        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
-        self.notebook_1.AddPage(self.notebook_1_pane_5, _("Some Text"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+        self.notebook_1_pane_1.SetSizer(_gszr_pane1)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
+
+        self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
         # end wxGlade
 
     def OnOpen(self, event):  # wxGlade: PyOgg2_MyFrame.<event_handler>
@@ -165,34 +192,31 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((492, 300))
-        self.grid = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
-        self.static_line = wx.StaticLine(self, wx.ID_ANY)
-        self.button = wx.Button(self, wx.ID_CLOSE, "")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrameGrid.__set_properties
         self.SetTitle(_("FrameOggCompressionDetails"))
-        self.grid.CreateGrid(8, 3)
-        self.button.SetFocus()
-        self.button.SetDefault()
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrameGrid.__do_layout
         self._szr_frame = wx.BoxSizer(wx.VERTICAL)
+
         self.grid_sizer = wx.FlexGridSizer(3, 1, 0, 0)
+        self._szr_frame.Add(self.grid_sizer, 1, wx.EXPAND, 0)
+
+        self.grid = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
+        self.grid.CreateGrid(8, 3)
         self.grid_sizer.Add(self.grid, 1, wx.EXPAND, 0)
+
+        self.static_line = wx.StaticLine(self, wx.ID_ANY)
         self.grid_sizer.Add(self.static_line, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.button = wx.Button(self, wx.ID_CLOSE, "")
+        self.button.SetFocus()
+        self.button.SetDefault()
         self.grid_sizer.Add(self.button, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.grid_sizer.AddGrowableRow(0)
         self.grid_sizer.AddGrowableCol(0)
-        self._szr_frame.Add(self.grid_sizer, 1, wx.EXPAND, 0)
+
         self.SetSizer(self._szr_frame)
         self._szr_frame.SetSizeHints(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample.pl wxglade-1.0.1/tests/casefiles/ComplexExample.pl
--- wxglade-0.9.6/tests/casefiles/ComplexExample.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample.pl	2020-12-31 14:04:48.000000000 +0000
@@ -36,6 +36,8 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(600, 500));
+    $self->SetTitle(_T("mp3 2 ogg"));
+    
     
 
     # Menu Bar
@@ -53,128 +55,151 @@
     
     # Menu Bar end
 
-    $self->{Mp3_To_Ogg_statusbar} = $self->CreateStatusBar(2);
     
-    # Tool Bar
-    $self->{Mp3_To_Ogg_toolbar} = Wx::ToolBar->new($self, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxTB_TEXT);
-    $self->SetToolBar($self->{Mp3_To_Ogg_toolbar});
-    $self->{Mp3_To_Ogg_toolbar}->AddTool(wxID_OPEN, _T("&Open"), wxNullBitmap, wxNullBitmap, wxITEM_NORMAL, _T("Open a file"), _T("Open a MP3 file to convert into OGG format"));
-    # Tool Bar end
-    $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
-    $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{text_ctrl_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
-    $self->{button_3} = Wx::Button->new($self->{notebook_1_pane_1}, wxID_OPEN, "");
-    $self->{notebook_1_pane_2} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{rbx_sampling_rate} = Wx::RadioBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Sampling Rate"), wxDefaultPosition, wxDefaultSize, [_T("44 kbit"), _T("128 kbit")], 0, wxRA_SPECIFY_ROWS);
-    $self->{cbx_love} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("\N{U+2665} Love this song"));
-    $self->{notebook_1_pane_3} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{text_ctrl_2} = Wx::TextCtrl->new($self->{notebook_1_pane_3}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
-    $self->{notebook_1_pane_4} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{_lbl_output_filename} = Wx::StaticText->new($self->{notebook_1_pane_4}, wxID_ANY, _T("File name:"));
-    $self->{text_ctrl_3} = Wx::TextCtrl->new($self->{notebook_1_pane_4}, wxID_ANY, "");
-    $self->{button_4} = Wx::Button->new($self->{notebook_1_pane_4}, wxID_OPEN, "");
-    $self->{checkbox_1} = Wx::CheckBox->new($self->{notebook_1_pane_4}, wxID_ANY, _T("Overwrite existing file"));
-    $self->{notebook_1_pane_5} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{label_1} = Wx::StaticText->new($self->{notebook_1_pane_5}, wxID_ANY, _T("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"));
-    $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
-    $self->{button_5} = Wx::Button->new($self, wxID_CLOSE, "");
-    $self->{button_2} = Wx::Button->new($self, wxID_CANCEL, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-    $self->{button_1} = Wx::Button->new($self, wxID_OK, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    Wx::Event::EVT_MENU($self, wxID_OPEN, $self->can('OnOpen'));
-    Wx::Event::EVT_MENU($self, wxID_EXIT, $self->can('OnClose'));
-    Wx::Event::EVT_MENU($self, wxID_ABOUT, $self->can('OnAboutDialog'));
-    Wx::Event::EVT_BUTTON($self, $self->{button_1}->GetId, $self->can('startConverting'));
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: PyOgg2_MyFrame::__set_properties
-    $self->SetTitle(_T("mp3 2 ogg"));
+    $self->{Mp3_To_Ogg_statusbar} = $self->CreateStatusBar(2);
     $self->{Mp3_To_Ogg_statusbar}->SetStatusWidths(-2, -1);
-
+    
     # statusbar fields
     my( @Mp3_To_Ogg_statusbar_fields ) = (
         _T("Mp3_To_Ogg_statusbar"),
         "",
     );
-
+    
     if( @Mp3_To_Ogg_statusbar_fields ) {
         $self->{Mp3_To_Ogg_statusbar}->SetStatusText($Mp3_To_Ogg_statusbar_fields[$_], $_)
         for 0 .. $#Mp3_To_Ogg_statusbar_fields ;
     }
+    
+    
+    # Tool Bar
+    $self->{Mp3_To_Ogg_toolbar} = Wx::ToolBar->new($self, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxTB_TEXT);
+    $self->{Mp3_To_Ogg_toolbar}->AddTool(wxID_OPEN, _T("&Open"), wxNullBitmap, wxNullBitmap, wxITEM_NORMAL, _T("Open a file"), _T("Open a MP3 file to convert into OGG format"));
+    $self->SetToolBar($self->{Mp3_To_Ogg_toolbar});
     $self->{Mp3_To_Ogg_toolbar}->Realize();
-    $self->{text_ctrl_1}->SetBackgroundColour(Wx::NullColour);
-    $self->{rbx_sampling_rate}->SetSelection(0);
-    $self->{cbx_love}->SetToolTipString(_T("Yes!\nWe \N{U+2665} it!"));
-    $self->{cbx_love}->SetValue(1);
-    $self->{text_ctrl_3}->SetToolTipString(_T("File name of the output file\nAn existing file will be overwritten without futher information!"));
-    $self->{checkbox_1}->SetToolTipString(_T("Overwrite an existing file"));
-    $self->{checkbox_1}->SetValue(1);
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: PyOgg2_MyFrame::__do_layout
+    # Tool Bar end
+    
     $self->{sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
-    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    $self->{sizer_5} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{_gszr_pane4} = Wx::FlexGridSizer->new(2, 3, 0, 0);
-    $self->{_szr_pane3} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_4} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_3} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Misc")), wxHORIZONTAL);
+    
+    $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM);
+    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
+    $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("Input File"));
+    
     $self->{_gszr_pane1} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    
     my $_lbl_input_filename = Wx::StaticText->new($self->{notebook_1_pane_1}, wxID_ANY, _T("File name:"));
     $self->{_gszr_pane1}->Add($_lbl_input_filename, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
+    $self->{text_ctrl_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{text_ctrl_1}->SetBackgroundColour(Wx::NullColour);
     $self->{_gszr_pane1}->Add($self->{text_ctrl_1}, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
+    
+    $self->{button_3} = Wx::Button->new($self->{notebook_1_pane_1}, wxID_OPEN, "");
     $self->{_gszr_pane1}->Add($self->{button_3}, 0, wxALL, 5);
-    $self->{notebook_1_pane_1}->SetSizer($self->{_gszr_pane1});
-    $self->{_gszr_pane1}->AddGrowableCol(1);
+    
+    $self->{notebook_1_pane_2} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_2}, _T("Converting Options"));
+    
+    $self->{sizer_4} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{rbx_sampling_rate} = Wx::RadioBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Sampling Rate"), wxDefaultPosition, wxDefaultSize, [_T("44 kbit"), _T("128 kbit")], 0, wxRA_SPECIFY_ROWS);
+    $self->{rbx_sampling_rate}->SetSelection(0);
     $self->{sizer_4}->Add($self->{rbx_sampling_rate}, 1, wxALL|wxEXPAND, 5);
-    $self->{sizer_3}->Add($self->{cbx_love}, 0, wxALL|wxSHAPED, 5);
+    
+    $self->{sizer_3} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Misc")), wxHORIZONTAL);
     $self->{sizer_4}->Add($self->{sizer_3}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_pane_2}->SetSizer($self->{sizer_4});
+    
+    $self->{cbx_love} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("\N{U+2665} Love this song"));
+    $self->{cbx_love}->SetToolTipString(_T("Yes!\nWe \N{U+2665} it!"));
+    $self->{cbx_love}->SetValue(1);
+    $self->{sizer_3}->Add($self->{cbx_love}, 0, wxALL|wxSHAPED, 5);
+    
+    $self->{notebook_1_pane_3} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_3}, _T("Converting Progress"));
+    
+    $self->{_szr_pane3} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{text_ctrl_2} = Wx::TextCtrl->new($self->{notebook_1_pane_3}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
     $self->{_szr_pane3}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_pane_3}->SetSizer($self->{_szr_pane3});
+    
+    $self->{notebook_1_pane_4} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_4}, _T("Output File"));
+    
+    $self->{_gszr_pane4} = Wx::FlexGridSizer->new(2, 3, 0, 0);
+    
+    $self->{_lbl_output_filename} = Wx::StaticText->new($self->{notebook_1_pane_4}, wxID_ANY, _T("File name:"));
     $self->{_gszr_pane4}->Add($self->{_lbl_output_filename}, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
+    $self->{text_ctrl_3} = Wx::TextCtrl->new($self->{notebook_1_pane_4}, wxID_ANY, "");
+    $self->{text_ctrl_3}->SetToolTipString(_T("File name of the output file\nAn existing file will be overwritten without futher information!"));
     $self->{_gszr_pane4}->Add($self->{text_ctrl_3}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{button_4} = Wx::Button->new($self->{notebook_1_pane_4}, wxID_OPEN, "");
     $self->{_gszr_pane4}->Add($self->{button_4}, 0, wxALL, 5);
+    
     $self->{_gszr_pane4}->Add(20, 20, 0, 0, 0);
+    
+    $self->{checkbox_1} = Wx::CheckBox->new($self->{notebook_1_pane_4}, wxID_ANY, _T("Overwrite existing file"));
+    $self->{checkbox_1}->SetToolTipString(_T("Overwrite an existing file"));
+    $self->{checkbox_1}->SetValue(1);
     $self->{_gszr_pane4}->Add($self->{checkbox_1}, 0, wxALL|wxEXPAND, 5);
+    
     $self->{_gszr_pane4}->Add(20, 20, 0, 0, 0);
-    $self->{notebook_1_pane_4}->SetSizer($self->{_gszr_pane4});
-    $self->{_gszr_pane4}->AddGrowableCol(1);
-    $self->{sizer_5}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_pane_5}->SetSizer($self->{sizer_5});
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("Input File"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_2}, _T("Converting Options"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_3}, _T("Converting Progress"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_4}, _T("Output File"));
+    
+    $self->{notebook_1_pane_5} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
     $self->{notebook_1}->AddPage($self->{notebook_1_pane_5}, _T("Some Text"));
-    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
+    $self->{sizer_5} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{label_1} = Wx::StaticText->new($self->{notebook_1_pane_5}, wxID_ANY, _T("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"));
+    $self->{sizer_5}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
     $self->{sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
+    
+    $self->{button_5} = Wx::Button->new($self, wxID_CLOSE, "");
     $self->{sizer_2}->Add($self->{button_5}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    $self->{button_2} = Wx::Button->new($self, wxID_CANCEL, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
     $self->{sizer_2}->Add($self->{button_2}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    $self->{button_1} = Wx::Button->new($self, wxID_OK, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
     $self->{sizer_2}->Add($self->{button_1}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
-    $self->SetSizer($self->{sizer_1});
-    $self->{sizer_1}->SetSizeHints($self);
+    
+    $self->{notebook_1_pane_5}->SetSizer($self->{sizer_5});
+    
+    $self->{_gszr_pane4}->AddGrowableCol(1);
+    $self->{notebook_1_pane_4}->SetSizer($self->{_gszr_pane4});
+    
+    $self->{notebook_1_pane_3}->SetSizer($self->{_szr_pane3});
+    
+    $self->{notebook_1_pane_2}->SetSizer($self->{sizer_4});
+    
+    $self->{_gszr_pane1}->AddGrowableCol(1);
+    $self->{notebook_1_pane_1}->SetSizer($self->{_gszr_pane1});
+    
     $self->{sizer_1}->AddGrowableRow(0);
     $self->{sizer_1}->AddGrowableCol(0);
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->SetSizeHints($self);
+    
     $self->Layout();
     $self->Centre();
+    Wx::Event::EVT_MENU($self, wxID_OPEN, $self->can('OnOpen'));
+    Wx::Event::EVT_MENU($self, wxID_EXIT, $self->can('OnClose'));
+    Wx::Event::EVT_MENU($self, wxID_ABOUT, $self->can('OnAboutDialog'));
+    Wx::Event::EVT_BUTTON($self, $self->{button_1}->GetId, $self->can('startConverting'));
+
     # end wxGlade
+    return $self;
+
 }
 
+
 sub OnOpen {
     my ($self, $event) = @_;
     # wxGlade: PyOgg2_MyFrame::OnOpen <event_handler>
@@ -237,46 +262,38 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(492, 300));
-    $self->{grid} = Wx::Grid->new($self, wxID_ANY);
-    $self->{static_line} = Wx::StaticLine->new($self, wxID_ANY);
-    $self->{button} = Wx::Button->new($self, wxID_CLOSE, "");
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrameGrid::__set_properties
     $self->SetTitle(_T("FrameOggCompressionDetails"));
-    $self->{grid}->CreateGrid(8, 3);
-    $self->{button}->SetFocus();
-    $self->{button}->SetDefault();
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrameGrid::__do_layout
+    
     $self->{_szr_frame} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{grid_sizer} = Wx::FlexGridSizer->new(3, 1, 0, 0);
+    $self->{_szr_frame}->Add($self->{grid_sizer}, 1, wxEXPAND, 0);
+    
+    $self->{grid} = Wx::Grid->new($self, wxID_ANY);
+    $self->{grid}->CreateGrid(8, 3);
     $self->{grid_sizer}->Add($self->{grid}, 1, wxEXPAND, 0);
+    
+    $self->{static_line} = Wx::StaticLine->new($self, wxID_ANY);
     $self->{grid_sizer}->Add($self->{static_line}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{button} = Wx::Button->new($self, wxID_CLOSE, "");
+    $self->{button}->SetFocus();
+    $self->{button}->SetDefault();
     $self->{grid_sizer}->Add($self->{button}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
     $self->{grid_sizer}->AddGrowableRow(0);
     $self->{grid_sizer}->AddGrowableCol(0);
-    $self->{_szr_frame}->Add($self->{grid_sizer}, 1, wxEXPAND, 0);
+    
     $self->SetSizer($self->{_szr_frame});
     $self->{_szr_frame}->SetSizeHints($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrameGrid
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample.py wxglade-1.0.1/tests/casefiles/ComplexExample.py
--- wxglade-0.9.6/tests/casefiles/ComplexExample.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,10 +5,10 @@
 #
 
 import wx
-import wx.grid
 
 # begin wxGlade: dependencies
 import gettext
+import wx.grid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -21,7 +21,8 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((600, 500))
-        
+        self.SetTitle(_("mp3 2 ogg"))
+
         # Menu Bar
         self.Mp3_To_Ogg_menubar = wx.MenuBar()
         wxglade_tmp_menu = wx.Menu()
@@ -36,109 +37,135 @@
         self.Mp3_To_Ogg_menubar.Append(wxglade_tmp_menu, _("&Help"))
         self.SetMenuBar(self.Mp3_To_Ogg_menubar)
         # Menu Bar end
+
         self.Mp3_To_Ogg_statusbar = self.CreateStatusBar(2)
-        
+        self.Mp3_To_Ogg_statusbar.SetStatusWidths([-2, -1])
+        # statusbar fields
+        Mp3_To_Ogg_statusbar_fields = [_("Mp3_To_Ogg_statusbar"), ""]
+        for i in range(len(Mp3_To_Ogg_statusbar_fields)):
+            self.Mp3_To_Ogg_statusbar.SetStatusText(Mp3_To_Ogg_statusbar_fields[i], i)
+
         # Tool Bar
-        self.Mp3_To_Ogg_toolbar = wx.ToolBar(self, -1, style=wx.TB_HORIZONTAL | wx.TB_TEXT)
-        self.SetToolBar(self.Mp3_To_Ogg_toolbar)
+        self.Mp3_To_Ogg_toolbar = wx.ToolBar(self, -1, style=wx.TB_TEXT)
         self.Mp3_To_Ogg_toolbar.AddLabelTool(wx.ID_OPEN, _("&Open"), wx.NullBitmap, wx.NullBitmap, wx.ITEM_NORMAL, _("Open a file"), _("Open a MP3 file to convert into OGG format"))
+        self.Bind(wx.EVT_TOOL, self.OnOpen, id=wx.ID_OPEN)
+        self.SetToolBar(self.Mp3_To_Ogg_toolbar)
+        self.Mp3_To_Ogg_toolbar.Realize()
         # Tool Bar end
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=wx.NB_BOTTOM)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
+
+        _gszr_pane1 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        _lbl_input_filename = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
+        _gszr_pane1.Add(_lbl_input_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self.text_ctrl_1.SetBackgroundColour(wx.NullColour)
+        _gszr_pane1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
+
         self.button_3 = wx.Button(self.notebook_1_pane_1, wx.ID_OPEN, "")
+        _gszr_pane1.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
+
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.rbx_sampling_rate = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Sampling Rate"), choices=[_("44 kbit"), _("128 kbit")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.rbx_sampling_rate.SetSelection(0)
+        sizer_4.Add(self.rbx_sampling_rate, 1, wx.ALL | wx.EXPAND, 5)
+
+        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Misc")), wx.HORIZONTAL)
+        sizer_4.Add(sizer_3, 1, wx.ALL | wx.EXPAND, 5)
+
         self.cbx_love = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _(u"♥ Love this song"))
+        self.cbx_love.SetToolTipString(_(u"Yes!\nWe ♥ it!"))
+        self.cbx_love.SetValue(1)
+        sizer_3.Add(self.cbx_love, 0, wx.ALL | wx.SHAPED, 5)
+
         self.notebook_1_pane_3 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
+
+        _szr_pane3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_pane_3, wx.ID_ANY, "", style=wx.TE_MULTILINE)
+        _szr_pane3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_pane_4 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
+
+        _gszr_pane4 = wx.FlexGridSizer(2, 3, 0, 0)
+
         self._lbl_output_filename = wx.StaticText(self.notebook_1_pane_4, wx.ID_ANY, _("File name:"))
+        _gszr_pane4.Add(self._lbl_output_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_pane_4, wx.ID_ANY, "")
+        self.text_ctrl_3.SetToolTipString(_("File name of the output file\nAn existing file will be overwritten without futher information!"))
+        _gszr_pane4.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
+
         self.button_4 = wx.Button(self.notebook_1_pane_4, wx.ID_OPEN, "")
+        _gszr_pane4.Add(self.button_4, 0, wx.ALL, 5)
+
+        _gszr_pane4.Add((20, 20), 0, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_pane_4, wx.ID_ANY, _("Overwrite existing file"))
+        self.checkbox_1.SetToolTipString(_("Overwrite an existing file"))
+        self.checkbox_1.SetValue(1)
+        _gszr_pane4.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        _gszr_pane4.Add((20, 20), 0, 0, 0)
+
         self.notebook_1_pane_5 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_5, _("Some Text"))
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.label_1 = wx.StaticText(self.notebook_1_pane_5, wx.ID_ANY, _("Please check the format of those lines manually:\n\nSingle line without any special characters.\n\na line break between new and line: new\nline\na tab character between new and line: new\tline\ntwo backslash characters: \\\\ \nthree backslash characters: \\\\\\ \na double quote: \"\nan escaped new line sequence: \\n"))
+        sizer_5.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
         self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
+        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_2 = wx.Button(self, wx.ID_CANCEL, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.notebook_1_pane_5.SetSizer(sizer_5)
 
-        self.Bind(wx.EVT_TOOL, self.OnOpen, id=wx.ID_OPEN)
-        self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
-        # end wxGlade
+        _gszr_pane4.AddGrowableCol(1)
+        self.notebook_1_pane_4.SetSizer(_gszr_pane4)
 
-    def __set_properties(self):
-        # begin wxGlade: PyOgg2_MyFrame.__set_properties
-        self.SetTitle(_("mp3 2 ogg"))
-        self.Mp3_To_Ogg_statusbar.SetStatusWidths([-2, -1])
+        self.notebook_1_pane_3.SetSizer(_szr_pane3)
 
-        # statusbar fields
-        Mp3_To_Ogg_statusbar_fields = [_("Mp3_To_Ogg_statusbar"), ""]
-        for i in range(len(Mp3_To_Ogg_statusbar_fields)):
-            self.Mp3_To_Ogg_statusbar.SetStatusText(Mp3_To_Ogg_statusbar_fields[i], i)
-        self.Mp3_To_Ogg_toolbar.Realize()
-        self.text_ctrl_1.SetBackgroundColour(wx.NullColour)
-        self.rbx_sampling_rate.SetSelection(0)
-        self.cbx_love.SetToolTipString(_(u"Yes!\nWe ♥ it!"))
-        self.cbx_love.SetValue(1)
-        self.text_ctrl_3.SetToolTipString(_("File name of the output file\nAn existing file will be overwritten without futher information!"))
-        self.checkbox_1.SetToolTipString(_("Overwrite an existing file"))
-        self.checkbox_1.SetValue(1)
-        # end wxGlade
+        self.notebook_1_pane_2.SetSizer(sizer_4)
 
-    def __do_layout(self):
-        # begin wxGlade: PyOgg2_MyFrame.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        _gszr_pane4 = wx.FlexGridSizer(2, 3, 0, 0)
-        _szr_pane3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Misc")), wx.HORIZONTAL)
-        _gszr_pane1 = wx.FlexGridSizer(1, 3, 0, 0)
-        _lbl_input_filename = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
-        _gszr_pane1.Add(_lbl_input_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        _gszr_pane1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
-        _gszr_pane1.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_pane_1.SetSizer(_gszr_pane1)
         _gszr_pane1.AddGrowableCol(1)
-        sizer_4.Add(self.rbx_sampling_rate, 1, wx.ALL | wx.EXPAND, 5)
-        sizer_3.Add(self.cbx_love, 0, wx.ALL | wx.SHAPED, 5)
-        sizer_4.Add(sizer_3, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_2.SetSizer(sizer_4)
-        _szr_pane3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_3.SetSizer(_szr_pane3)
-        _gszr_pane4.Add(self._lbl_output_filename, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        _gszr_pane4.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
-        _gszr_pane4.Add(self.button_4, 0, wx.ALL, 5)
-        _gszr_pane4.Add((20, 20), 0, 0, 0)
-        _gszr_pane4.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
-        _gszr_pane4.Add((20, 20), 0, 0, 0)
-        self.notebook_1_pane_4.SetSizer(_gszr_pane4)
-        _gszr_pane4.AddGrowableCol(1)
-        sizer_5.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_5.SetSizer(sizer_5)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
-        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
-        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
-        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
-        self.notebook_1.AddPage(self.notebook_1_pane_5, _("Some Text"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.SetSizeHints(self)
+        self.notebook_1_pane_1.SetSizer(_gszr_pane1)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+        sizer_1.SetSizeHints(self)
+
         self.Layout()
         self.Centre()
+
+        self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
         # end wxGlade
 
     def OnOpen(self, event):  # wxGlade: PyOgg2_MyFrame.<event_handler>
@@ -165,34 +192,31 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((492, 300))
-        self.grid = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
-        self.static_line = wx.StaticLine(self, wx.ID_ANY)
-        self.button = wx.Button(self, wx.ID_CLOSE, "")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrameGrid.__set_properties
         self.SetTitle(_("FrameOggCompressionDetails"))
-        self.grid.CreateGrid(8, 3)
-        self.button.SetFocus()
-        self.button.SetDefault()
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrameGrid.__do_layout
         self._szr_frame = wx.BoxSizer(wx.VERTICAL)
+
         self.grid_sizer = wx.FlexGridSizer(3, 1, 0, 0)
+        self._szr_frame.Add(self.grid_sizer, 1, wx.EXPAND, 0)
+
+        self.grid = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
+        self.grid.CreateGrid(8, 3)
         self.grid_sizer.Add(self.grid, 1, wx.EXPAND, 0)
+
+        self.static_line = wx.StaticLine(self, wx.ID_ANY)
         self.grid_sizer.Add(self.static_line, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.button = wx.Button(self, wx.ID_CLOSE, "")
+        self.button.SetFocus()
+        self.button.SetDefault()
         self.grid_sizer.Add(self.button, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.grid_sizer.AddGrowableRow(0)
         self.grid_sizer.AddGrowableCol(0)
-        self._szr_frame.Add(self.grid_sizer, 1, wx.EXPAND, 0)
+
         self.SetSizer(self._szr_frame)
         self._szr_frame.SetSizeHints(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/ComplexExample.wxg wxglade-1.0.1/tests/casefiles/ComplexExample.wxg
--- wxglade-0.9.6/tests/casefiles/ComplexExample.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ComplexExample.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.9.0pre on Tue May 29 21:47:18 2018 -->
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
 
 <application encoding="UTF-8" for_version="2.8" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="ComplexExampleApp" option="0" overwrite="1" path="./ComplexExample.py" source_extension=".cpp" top_window="FrameGrid" use_gettext="1" use_new_namespace="1">
     <object class="PyOgg2_MyFrame" name="Mp3_To_Ogg" base="EditFrame">
diff -Nru wxglade-0.9.6/tests/casefiles/CPPOgg1.cpp wxglade-1.0.1/tests/casefiles/CPPOgg1.cpp
--- wxglade-0.9.6/tests/casefiles/CPPOgg1.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CPPOgg1.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,44 +21,78 @@
 {
     // begin wxGlade: CPPOgg1_MyDialog::CPPOgg1_MyDialog
     SetSize(wxSize(500, 300));
+    SetTitle(_("mp3 2 ogg"));
+    SetFocus();
+    wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
     notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
-    notebook_1_pane_4 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_3 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_2 = new wxPanel(notebook_1, wxID_ANY);
+    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
     notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_1, _("Input File"));
+    wxFlexGridSizer* grid_sizer_1 = new wxFlexGridSizer(1, 3, 0, 0);
+    wxStaticText* label_1 = new wxStaticText(notebook_1_pane_1, wxID_ANY, _("File name:"));
+    grid_sizer_1->Add(label_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
     text_ctrl_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    grid_sizer_1->Add(text_ctrl_1, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
     button_3 = new wxButton(notebook_1_pane_1, wxID_OPEN, wxEmptyString);
+    grid_sizer_1->Add(button_3, 0, wxALL, 5);
+    notebook_1_pane_2 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_2, _("Converting Options"));
+    wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
     const wxString radio_box_1_choices[] = {
         _("44 kbit"),
         _("128 kbit"),
     };
     radio_box_1 = new wxRadioBox(notebook_1_pane_2, wxID_ANY, _("Sampling Rate"), wxDefaultPosition, wxDefaultSize, 2, radio_box_1_choices, 0, wxRA_SPECIFY_ROWS);
+    radio_box_1->SetSelection(0);
+    sizer_4->Add(radio_box_1, 0, wxALL|wxEXPAND|wxSHAPED, 5);
+    notebook_1_pane_3 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_3, _("Converting Progress"));
+    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
     text_ctrl_2 = new wxTextCtrl(notebook_1_pane_3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
+    sizer_3->Add(text_ctrl_2, 1, wxALL|wxEXPAND, 5);
+    notebook_1_pane_4 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_4, _("Output File"));
+    wxFlexGridSizer* grid_sizer_2 = new wxFlexGridSizer(2, 3, 0, 0);
     label_2 = new wxStaticText(notebook_1_pane_4, wxID_ANY, _("File name:"));
+    grid_sizer_2->Add(label_2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
     text_ctrl_3 = new wxTextCtrl(notebook_1_pane_4, wxID_ANY, wxEmptyString);
+    grid_sizer_2->Add(text_ctrl_3, 0, wxALL|wxEXPAND, 5);
     button_4 = new wxButton(notebook_1_pane_4, wxID_OPEN, wxEmptyString);
+    grid_sizer_2->Add(button_4, 0, wxALL, 5);
+    grid_sizer_2->Add(20, 20, 0, 0, 0);
     checkbox_1 = new wxCheckBox(notebook_1_pane_4, wxID_ANY, _("Overwrite existing file"));
+    checkbox_1->SetToolTip(_("Overwrite an existing file"));
+    checkbox_1->SetValue(1);
+    grid_sizer_2->Add(checkbox_1, 0, wxALL|wxEXPAND, 5);
+    grid_sizer_2->Add(20, 20, 0, 0, 0);
     static_line_1 = new wxStaticLine(this, wxID_ANY);
+    sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
+    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
+    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
     button_5 = new wxButton(this, wxID_CLOSE, wxEmptyString);
+    sizer_2->Add(button_5, 0, wxALIGN_RIGHT|wxALL, 5);
     button_2 = new wxButton(this, wxID_CANCEL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
+    sizer_2->Add(button_2, 0, wxALIGN_RIGHT|wxALL, 5);
     button_1 = new wxButton(this, wxID_OK, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    set_properties();
-    do_layout();
+    sizer_2->Add(button_1, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    grid_sizer_2->AddGrowableCol(1);
+    notebook_1_pane_4->SetSizer(grid_sizer_2);
+    notebook_1_pane_3->SetSizer(sizer_3);
+    notebook_1_pane_2->SetSizer(sizer_4);
+    grid_sizer_1->AddGrowableCol(1);
+    notebook_1_pane_1->SetSizer(grid_sizer_1);
+    sizer_1->AddGrowableRow(0);
+    sizer_1->AddGrowableCol(0);
+    SetSizer(sizer_1);
+    Layout();
+    Centre();
     // end wxGlade
 }
 
 
 void CPPOgg1_MyDialog::set_properties()
 {
-    // begin wxGlade: CPPOgg1_MyDialog::set_properties
-    SetTitle(_("mp3 2 ogg"));
-    SetSize(wxSize(500, 300));
-    SetFocus();
-    radio_box_1->SetSelection(0);
-    checkbox_1->SetToolTip(_("Overwrite an existing file"));
-    checkbox_1->SetValue(1);
-    // end wxGlade
 
     // manually added
     wxString str(wxT("Current local time and date: "));
@@ -69,47 +103,6 @@
 
 void CPPOgg1_MyDialog::do_layout()
 {
-    // begin wxGlade: CPPOgg1_MyDialog::do_layout
-    wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
-    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxFlexGridSizer* grid_sizer_2 = new wxFlexGridSizer(2, 3, 0, 0);
-    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
-    wxFlexGridSizer* grid_sizer_1 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxStaticText* label_1 = new wxStaticText(notebook_1_pane_1, wxID_ANY, _("File name:"));
-    grid_sizer_1->Add(label_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    grid_sizer_1->Add(text_ctrl_1, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
-    grid_sizer_1->Add(button_3, 0, wxALL, 5);
-    notebook_1_pane_1->SetSizer(grid_sizer_1);
-    grid_sizer_1->AddGrowableCol(1);
-    sizer_4->Add(radio_box_1, 0, wxALL|wxEXPAND|wxSHAPED, 5);
-    notebook_1_pane_2->SetSizer(sizer_4);
-    sizer_3->Add(text_ctrl_2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_pane_3->SetSizer(sizer_3);
-    grid_sizer_2->Add(label_2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    grid_sizer_2->Add(text_ctrl_3, 0, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(button_4, 0, wxALL, 5);
-    grid_sizer_2->Add(20, 20, 0, 0, 0);
-    grid_sizer_2->Add(checkbox_1, 0, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(20, 20, 0, 0, 0);
-    notebook_1_pane_4->SetSizer(grid_sizer_2);
-    grid_sizer_2->AddGrowableCol(1);
-    notebook_1->AddPage(notebook_1_pane_1, _("Input File"));
-    notebook_1->AddPage(notebook_1_pane_2, _("Converting Options"));
-    notebook_1->AddPage(notebook_1_pane_3, _("Converting Progress"));
-    notebook_1->AddPage(notebook_1_pane_4, _("Output File"));
-    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
-    sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
-    sizer_2->Add(button_5, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_2->Add(button_2, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_2->Add(button_1, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
-    SetSizer(sizer_1);
-    sizer_1->AddGrowableRow(0);
-    sizer_1->AddGrowableCol(0);
-    Layout();
-    Centre();
-    // end wxGlade
 }
 
 
diff -Nru wxglade-0.9.6/tests/casefiles/CPPOgg1.h wxglade-1.0.1/tests/casefiles/CPPOgg1.h
--- wxglade-0.9.6/tests/casefiles/CPPOgg1.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CPPOgg1.h	2020-12-31 14:04:48.000000000 +0000
@@ -40,26 +40,22 @@
     CPPOgg1_MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
 
 private:
-    // begin wxGlade: CPPOgg1_MyDialog::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: CPPOgg1_MyDialog::attributes
+    wxNotebook* notebook_1;
+    wxPanel* notebook_1_pane_1;
     wxTextCtrl* text_ctrl_1;
     wxButton* button_3;
-    wxPanel* notebook_1_pane_1;
-    wxRadioBox* radio_box_1;
     wxPanel* notebook_1_pane_2;
-    wxTextCtrl* text_ctrl_2;
+    wxRadioBox* radio_box_1;
     wxPanel* notebook_1_pane_3;
+    wxTextCtrl* text_ctrl_2;
+    wxPanel* notebook_1_pane_4;
     wxStaticText* label_2;
     wxTextCtrl* text_ctrl_3;
     wxButton* button_4;
     wxCheckBox* checkbox_1;
-    wxPanel* notebook_1_pane_4;
-    wxNotebook* notebook_1;
     wxStaticLine* static_line_1;
     wxButton* button_5;
     wxButton* button_2;
diff -Nru wxglade-0.9.6/tests/casefiles/CPPOgg2_MyDialog.cpp wxglade-1.0.1/tests/casefiles/CPPOgg2_MyDialog.cpp
--- wxglade-0.9.6/tests/casefiles/CPPOgg2_MyDialog.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CPPOgg2_MyDialog.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,89 +21,82 @@
 {
     // begin wxGlade: CPPOgg2_MyDialog::CPPOgg2_MyDialog
     SetSize(wxSize(500, 300));
+    SetTitle(_("mp3 2 ogg"));
+    wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
     notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
-    notebook_1_pane_4 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_3 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_2 = new wxPanel(notebook_1, wxID_ANY);
+    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
     notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_1, _("Input File"));
+    wxFlexGridSizer* grid_sizer_1 = new wxFlexGridSizer(1, 3, 0, 0);
+    wxStaticText* label_1 = new wxStaticText(notebook_1_pane_1, wxID_ANY, _("File name:"));
+    grid_sizer_1->Add(label_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
     text_ctrl_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    grid_sizer_1->Add(text_ctrl_1, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
     button_3 = new wxButton(notebook_1_pane_1, wxID_OPEN, wxEmptyString);
+    grid_sizer_1->Add(button_3, 0, wxALL, 5);
+    notebook_1_pane_2 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_2, _("Converting Options"));
+    wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
     const wxString radio_box_1_choices[] = {
         _("44 kbit"),
         _("128 kbit"),
     };
     radio_box_1 = new wxRadioBox(notebook_1_pane_2, wxID_ANY, _("Sampling Rate"), wxDefaultPosition, wxDefaultSize, 2, radio_box_1_choices, 0, wxRA_SPECIFY_ROWS);
+    radio_box_1->SetSelection(0);
+    sizer_4->Add(radio_box_1, 0, wxALL|wxEXPAND|wxSHAPED, 5);
+    notebook_1_pane_3 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_3, _("Converting Progress"));
+    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
     text_ctrl_2 = new wxTextCtrl(notebook_1_pane_3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
+    sizer_3->Add(text_ctrl_2, 1, wxALL|wxEXPAND, 5);
+    notebook_1_pane_4 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_4, _("Output File"));
+    wxFlexGridSizer* grid_sizer_2 = new wxFlexGridSizer(2, 3, 0, 0);
     label_2 = new wxStaticText(notebook_1_pane_4, wxID_ANY, _("File name:"));
+    grid_sizer_2->Add(label_2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
     text_ctrl_3 = new wxTextCtrl(notebook_1_pane_4, wxID_ANY, wxEmptyString);
+    grid_sizer_2->Add(text_ctrl_3, 0, wxALL|wxEXPAND, 5);
     button_4 = new wxButton(notebook_1_pane_4, wxID_OPEN, wxEmptyString);
+    grid_sizer_2->Add(button_4, 0, wxALL, 5);
+    grid_sizer_2->Add(20, 20, 0, 0, 0);
     checkbox_1 = new wxCheckBox(notebook_1_pane_4, wxID_ANY, _("Overwrite existing file"));
+    checkbox_1->SetToolTip(_("Overwrite an existing file"));
+    checkbox_1->SetValue(1);
+    grid_sizer_2->Add(checkbox_1, 0, wxALL|wxEXPAND, 5);
+    grid_sizer_2->Add(20, 20, 0, 0, 0);
     static_line_1 = new wxStaticLine(this, wxID_ANY);
+    sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
+    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
+    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
     button_5 = new wxButton(this, wxID_CLOSE, wxEmptyString);
+    sizer_2->Add(button_5, 0, wxALIGN_RIGHT|wxALL, 5);
     button_2 = new wxButton(this, wxID_CANCEL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
+    sizer_2->Add(button_2, 0, wxALIGN_RIGHT|wxALL, 5);
     button_1 = new wxButton(this, wxID_OK, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    set_properties();
-    do_layout();
+    sizer_2->Add(button_1, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    grid_sizer_2->AddGrowableCol(1);
+    notebook_1_pane_4->SetSizer(grid_sizer_2);
+    notebook_1_pane_3->SetSizer(sizer_3);
+    notebook_1_pane_2->SetSizer(sizer_4);
+    grid_sizer_1->AddGrowableCol(1);
+    notebook_1_pane_1->SetSizer(grid_sizer_1);
+    sizer_1->AddGrowableRow(0);
+    sizer_1->AddGrowableCol(0);
+    SetSizer(sizer_1);
+    Layout();
+    Centre();
     // end wxGlade
 }
 
 
 void CPPOgg2_MyDialog::set_properties()
 {
-    // begin wxGlade: CPPOgg2_MyDialog::set_properties
-    SetTitle(_("mp3 2 ogg"));
-    SetSize(wxSize(500, 300));
-    radio_box_1->SetSelection(0);
-    checkbox_1->SetToolTip(_("Overwrite an existing file"));
-    checkbox_1->SetValue(1);
-    // end wxGlade
 }
 
 
 void CPPOgg2_MyDialog::do_layout()
 {
-    // begin wxGlade: CPPOgg2_MyDialog::do_layout
-    wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
-    wxFlexGridSizer* sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxFlexGridSizer* grid_sizer_2 = new wxFlexGridSizer(2, 3, 0, 0);
-    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
-    wxFlexGridSizer* grid_sizer_1 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxStaticText* label_1 = new wxStaticText(notebook_1_pane_1, wxID_ANY, _("File name:"));
-    grid_sizer_1->Add(label_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    grid_sizer_1->Add(text_ctrl_1, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
-    grid_sizer_1->Add(button_3, 0, wxALL, 5);
-    notebook_1_pane_1->SetSizer(grid_sizer_1);
-    grid_sizer_1->AddGrowableCol(1);
-    sizer_4->Add(radio_box_1, 0, wxALL|wxEXPAND|wxSHAPED, 5);
-    notebook_1_pane_2->SetSizer(sizer_4);
-    sizer_3->Add(text_ctrl_2, 1, wxALL|wxEXPAND, 5);
-    notebook_1_pane_3->SetSizer(sizer_3);
-    grid_sizer_2->Add(label_2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    grid_sizer_2->Add(text_ctrl_3, 0, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(button_4, 0, wxALL, 5);
-    grid_sizer_2->Add(20, 20, 0, 0, 0);
-    grid_sizer_2->Add(checkbox_1, 0, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(20, 20, 0, 0, 0);
-    notebook_1_pane_4->SetSizer(grid_sizer_2);
-    grid_sizer_2->AddGrowableCol(1);
-    notebook_1->AddPage(notebook_1_pane_1, _("Input File"));
-    notebook_1->AddPage(notebook_1_pane_2, _("Converting Options"));
-    notebook_1->AddPage(notebook_1_pane_3, _("Converting Progress"));
-    notebook_1->AddPage(notebook_1_pane_4, _("Output File"));
-    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
-    sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
-    sizer_2->Add(button_5, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_2->Add(button_2, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_2->Add(button_1, 0, wxALIGN_RIGHT|wxALL, 5);
-    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT, 0);
-    SetSizer(sizer_1);
-    sizer_1->AddGrowableRow(0);
-    sizer_1->AddGrowableCol(0);
-    Layout();
-    Centre();
-    // end wxGlade
 }
 
 
diff -Nru wxglade-0.9.6/tests/casefiles/CPPOgg2_MyDialog.h wxglade-1.0.1/tests/casefiles/CPPOgg2_MyDialog.h
--- wxglade-0.9.6/tests/casefiles/CPPOgg2_MyDialog.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CPPOgg2_MyDialog.h	2020-12-31 14:04:48.000000000 +0000
@@ -40,26 +40,22 @@
     CPPOgg2_MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
 
 private:
-    // begin wxGlade: CPPOgg2_MyDialog::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: CPPOgg2_MyDialog::attributes
+    wxNotebook* notebook_1;
+    wxPanel* notebook_1_pane_1;
     wxTextCtrl* text_ctrl_1;
     wxButton* button_3;
-    wxPanel* notebook_1_pane_1;
-    wxRadioBox* radio_box_1;
     wxPanel* notebook_1_pane_2;
-    wxTextCtrl* text_ctrl_2;
+    wxRadioBox* radio_box_1;
     wxPanel* notebook_1_pane_3;
+    wxTextCtrl* text_ctrl_2;
+    wxPanel* notebook_1_pane_4;
     wxStaticText* label_2;
     wxTextCtrl* text_ctrl_3;
     wxButton* button_4;
     wxCheckBox* checkbox_1;
-    wxPanel* notebook_1_pane_4;
-    wxNotebook* notebook_1;
     wxStaticLine* static_line_1;
     wxButton* button_5;
     wxButton* button_2;
diff -Nru wxglade-0.9.6/tests/casefiles/CPPOgg2_MyFrame.cpp wxglade-1.0.1/tests/casefiles/CPPOgg2_MyFrame.cpp
--- wxglade-0.9.6/tests/casefiles/CPPOgg2_MyFrame.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CPPOgg2_MyFrame.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,40 +21,34 @@
 {
     // begin wxGlade: CPPOgg2_MyFrame::CPPOgg2_MyFrame
     SetSize(wxSize(400, 300));
+    SetTitle(_("FrameOggCompressionDetails"));
+    wxBoxSizer* sizer_5 = new wxBoxSizer(wxVERTICAL);
+    wxFlexGridSizer* grid_sizer_3 = new wxFlexGridSizer(3, 1, 0, 0);
+    sizer_5->Add(grid_sizer_3, 1, wxEXPAND, 0);
     grid_1 = new wxGrid(this, wxID_ANY);
+    grid_1->CreateGrid(8, 3);
+    grid_sizer_3->Add(grid_1, 1, wxEXPAND, 0);
     static_line_2 = new wxStaticLine(this, wxID_ANY);
+    grid_sizer_3->Add(static_line_2, 0, wxALL|wxEXPAND, 5);
     button_6 = new wxButton(this, wxID_CLOSE, wxEmptyString);
-
-    set_properties();
-    do_layout();
+    button_6->SetFocus();
+    button_6->SetDefault();
+    grid_sizer_3->Add(button_6, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    grid_sizer_3->AddGrowableRow(0);
+    grid_sizer_3->AddGrowableCol(0);
+    SetSizer(sizer_5);
+    Layout();
     // end wxGlade
 }
 
 
 void CPPOgg2_MyFrame::set_properties()
 {
-    // begin wxGlade: CPPOgg2_MyFrame::set_properties
-    SetTitle(_("FrameOggCompressionDetails"));
-    grid_1->CreateGrid(8, 3);
-    button_6->SetFocus();
-    button_6->SetDefault();
-    // end wxGlade
 }
 
 
 void CPPOgg2_MyFrame::do_layout()
 {
-    // begin wxGlade: CPPOgg2_MyFrame::do_layout
-    wxBoxSizer* sizer_5 = new wxBoxSizer(wxVERTICAL);
-    wxFlexGridSizer* grid_sizer_3 = new wxFlexGridSizer(3, 1, 0, 0);
-    grid_sizer_3->Add(grid_1, 1, wxEXPAND, 0);
-    grid_sizer_3->Add(static_line_2, 0, wxALL|wxEXPAND, 5);
-    grid_sizer_3->Add(button_6, 0, wxALIGN_RIGHT|wxALL, 5);
-    grid_sizer_3->AddGrowableRow(0);
-    grid_sizer_3->AddGrowableCol(0);
-    sizer_5->Add(grid_sizer_3, 1, wxEXPAND, 0);
-    SetSizer(sizer_5);
-    Layout();
-    // end wxGlade
 }
 
diff -Nru wxglade-0.9.6/tests/casefiles/CPPOgg2_MyFrame.h wxglade-1.0.1/tests/casefiles/CPPOgg2_MyFrame.h
--- wxglade-0.9.6/tests/casefiles/CPPOgg2_MyFrame.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CPPOgg2_MyFrame.h	2020-12-31 14:04:48.000000000 +0000
@@ -40,10 +40,6 @@
     CPPOgg2_MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: CPPOgg2_MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: CPPOgg2_MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/CPP_Preferences.cpp wxglade-1.0.1/tests/casefiles/CPP_Preferences.cpp
--- wxglade-0.9.6/tests/casefiles/CPP_Preferences.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CPP_Preferences.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,133 +20,120 @@
     wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
 {
     // begin wxGlade: wxGladePreferencesUI::wxGladePreferencesUI
-    notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
-    notebook_1_pane_2 = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
-    use_menu_icons = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Use icons in menu items"));
-    frame_tool_win = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Show properties and tree windows as small frames"));
-    show_progress = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Show progress dialog when loading wxg files"));
-    remember_geometry = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Remember position and size of wxGlade windows"));
-    show_sizer_handle = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Show \"handles\" of sizers"));
-    use_kde_dialogs = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Use native file dialogs on KDE"));
-    open_save_path = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
-    codegen_path = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
-    number_history = new wxSpinCtrl(notebook_1_pane_1, wxID_ANY, wxT("4"), wxDefaultPosition, wxDefaultSize, 0, 0, 100);
-    buttons_per_row = new wxSpinCtrl(notebook_1_pane_1, wxID_ANY, wxT("5"), wxDefaultPosition, wxDefaultSize, 0, 1, 100);
-    use_dialog_units = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Use dialog units by default for size properties"));
-    wxg_backup = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Create backup wxg files"));
-    codegen_backup = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Create backup files for generated source"));
-    allow_duplicate_names = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Allow duplicate widget names"));
-    default_border = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Default border width for widgets"));
-    default_border_size = new wxSpinCtrl(notebook_1_pane_2, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0, 0, 20);
-    autosave = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Auto save wxg files every "));
-    autosave_delay = new wxSpinCtrl(notebook_1_pane_2, wxID_ANY, wxT("120"), wxDefaultPosition, wxDefaultSize, 0, 30, 300);
-    write_timestamp = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Insert timestamp on generated source files"));
-    write_generated_from = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Insert .wxg file name on generated source files"));
-    const wxString backup_suffix_choices[] = {
-        _("append ~ to filename"),
-        _("append .bak to filename"),
-    };
-    backup_suffix = new wxRadioBox(notebook_1_pane_2, wxID_ANY, _("Backup options"), wxDefaultPosition, wxDefaultSize, 2, backup_suffix_choices, 2, wxRA_SPECIFY_COLS);
-    local_widget_path = new wxTextCtrl(notebook_1_pane_2, wxID_ANY, wxEmptyString);
-    choose_widget_path = new wxButton(notebook_1_pane_2, wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
-    ok = new wxButton(this, wxID_OK, wxEmptyString);
-    cancel = new wxButton(this, wxID_CANCEL, wxEmptyString);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void wxGladePreferencesUI::set_properties()
-{
-    // begin wxGlade: wxGladePreferencesUI::set_properties
     SetTitle(_("wxGlade: preferences"));
     wxIcon _icon;
     _icon.CopyFromBitmap(wxBitmap(_icon_path, wxBITMAP_TYPE_ANY));
     SetIcon(_icon);
-    use_menu_icons->SetValue(1);
-    frame_tool_win->SetValue(1);
-    show_progress->SetValue(1);
-    remember_geometry->SetValue(1);
-    show_sizer_handle->SetValue(1);
-    use_kde_dialogs->SetValue(1);
-    open_save_path->SetMinSize(wxSize(196, -1));
-    codegen_path->SetMinSize(wxSize(196, -1));
-    number_history->SetMinSize(wxSize(196, -1));
-    buttons_per_row->SetMinSize(wxSize(196, -1));
-    wxg_backup->SetValue(1);
-    codegen_backup->SetValue(1);
-    allow_duplicate_names->Hide();
-    default_border_size->SetMinSize(wxSize(45, 22));
-    autosave_delay->SetMinSize(wxSize(45, 22));
-    write_timestamp->SetValue(1);
-    backup_suffix->SetSelection(0);
-    ok->SetDefault();
-    // end wxGlade
-}
-
-
-void wxGladePreferencesUI::do_layout()
-{
-    // begin wxGlade: wxGladePreferencesUI::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_5 = new wxBoxSizer(wxVERTICAL);
-    wxStaticBoxSizer* sizer_6 = new wxStaticBoxSizer(new wxStaticBox(notebook_1_pane_2, wxID_ANY, _("Local widget path")), wxHORIZONTAL);
-    wxBoxSizer* sizer_7_copy = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_7 = new wxBoxSizer(wxHORIZONTAL);
+    notebook_1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    sizer_1->Add(notebook_1, 1, wxALL|wxEXPAND, 5);
+    notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_1, _("Interface"));
     wxBoxSizer* sizer_3 = new wxBoxSizer(wxVERTICAL);
-    wxFlexGridSizer* sizer_4 = new wxFlexGridSizer(4, 2, 0, 0);
+    use_menu_icons = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Use icons in menu items"));
+    use_menu_icons->SetValue(1);
     sizer_3->Add(use_menu_icons, 0, wxALL|wxEXPAND, 5);
+    frame_tool_win = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Show properties and tree windows as small frames"));
+    frame_tool_win->SetValue(1);
     sizer_3->Add(frame_tool_win, 0, wxALL|wxEXPAND, 5);
+    show_progress = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Show progress dialog when loading wxg files"));
+    show_progress->SetValue(1);
     sizer_3->Add(show_progress, 0, wxALL|wxEXPAND, 5);
+    remember_geometry = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Remember position and size of wxGlade windows"));
+    remember_geometry->SetValue(1);
     sizer_3->Add(remember_geometry, 0, wxALL|wxEXPAND, 5);
+    show_sizer_handle = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Show \"handles\" of sizers"));
+    show_sizer_handle->SetValue(1);
     sizer_3->Add(show_sizer_handle, 0, wxALL|wxEXPAND, 5);
+    use_kde_dialogs = new wxCheckBox(notebook_1_pane_1, wxID_ANY, _("Use native file dialogs on KDE"));
+    use_kde_dialogs->SetValue(1);
     sizer_3->Add(use_kde_dialogs, 0, wxALL|wxEXPAND, 5);
+    wxFlexGridSizer* sizer_4 = new wxFlexGridSizer(4, 2, 0, 0);
+    sizer_3->Add(sizer_4, 0, wxEXPAND, 3);
     wxStaticText* label_1 = new wxStaticText(notebook_1_pane_1, wxID_ANY, _("Initial path for \nfile opening/saving dialogs:"));
     sizer_4->Add(label_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    open_save_path = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    open_save_path->SetMinSize(wxSize(196, -1));
     sizer_4->Add(open_save_path, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
     wxStaticText* label_2_copy = new wxStaticText(notebook_1_pane_1, wxID_ANY, _("Initial path for \ncode generation file dialogs:"));
     sizer_4->Add(label_2_copy, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    codegen_path = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    codegen_path->SetMinSize(wxSize(196, -1));
     sizer_4->Add(codegen_path, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
     wxStaticText* label_2 = new wxStaticText(notebook_1_pane_1, wxID_ANY, _("Number of items in file history"));
     sizer_4->Add(label_2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    number_history = new wxSpinCtrl(notebook_1_pane_1, wxID_ANY, wxT("4"), wxDefaultPosition, wxDefaultSize, 0, 0, 100);
+    number_history->SetMinSize(wxSize(196, -1));
     sizer_4->Add(number_history, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
     wxStaticText* label_2_copy_1 = new wxStaticText(notebook_1_pane_1, wxID_ANY, _("Number of buttons per row\nin the main palette"));
     sizer_4->Add(label_2_copy_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    buttons_per_row = new wxSpinCtrl(notebook_1_pane_1, wxID_ANY, wxT("5"), wxDefaultPosition, wxDefaultSize, 0, 1, 100);
+    buttons_per_row->SetMinSize(wxSize(196, -1));
     sizer_4->Add(buttons_per_row, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    sizer_4->AddGrowableCol(1);
-    sizer_3->Add(sizer_4, 0, wxEXPAND, 3);
-    notebook_1_pane_1->SetSizer(sizer_3);
+    notebook_1_pane_2 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_2, _("Other"));
+    wxBoxSizer* sizer_5 = new wxBoxSizer(wxVERTICAL);
+    use_dialog_units = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Use dialog units by default for size properties"));
     sizer_5->Add(use_dialog_units, 0, wxALL|wxEXPAND, 5);
+    wxg_backup = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Create backup wxg files"));
+    wxg_backup->SetValue(1);
     sizer_5->Add(wxg_backup, 0, wxALL|wxEXPAND, 5);
+    codegen_backup = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Create backup files for generated source"));
+    codegen_backup->SetValue(1);
     sizer_5->Add(codegen_backup, 0, wxALL|wxEXPAND, 5);
+    allow_duplicate_names = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Allow duplicate widget names"));
+    allow_duplicate_names->Hide();
     sizer_5->Add(allow_duplicate_names, 0, wxALL|wxEXPAND, 5);
+    wxBoxSizer* sizer_7 = new wxBoxSizer(wxHORIZONTAL);
+    sizer_5->Add(sizer_7, 0, wxEXPAND, 0);
+    default_border = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Default border width for widgets"));
     sizer_7->Add(default_border, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    default_border_size = new wxSpinCtrl(notebook_1_pane_2, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0, 0, 20);
+    default_border_size->SetMinSize(wxSize(45, 22));
     sizer_7->Add(default_border_size, 0, wxALL, 5);
-    sizer_5->Add(sizer_7, 0, wxEXPAND, 0);
+    wxBoxSizer* sizer_7_copy = new wxBoxSizer(wxHORIZONTAL);
+    sizer_5->Add(sizer_7_copy, 0, wxEXPAND, 0);
+    autosave = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Auto save wxg files every "));
     sizer_7_copy->Add(autosave, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5);
+    autosave_delay = new wxSpinCtrl(notebook_1_pane_2, wxID_ANY, wxT("120"), wxDefaultPosition, wxDefaultSize, 0, 30, 300);
+    autosave_delay->SetMinSize(wxSize(45, 22));
     sizer_7_copy->Add(autosave_delay, 0, wxBOTTOM|wxTOP, 5);
     wxStaticText* label_3 = new wxStaticText(notebook_1_pane_2, wxID_ANY, _(" seconds"));
     sizer_7_copy->Add(label_3, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxFIXED_MINSIZE|wxTOP, 5);
-    sizer_5->Add(sizer_7_copy, 0, wxEXPAND, 0);
+    write_timestamp = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Insert timestamp on generated source files"));
+    write_timestamp->SetValue(1);
     sizer_5->Add(write_timestamp, 0, wxALL|wxEXPAND, 5);
+    write_generated_from = new wxCheckBox(notebook_1_pane_2, wxID_ANY, _("Insert .wxg file name on generated source files"));
     sizer_5->Add(write_generated_from, 0, wxALL|wxEXPAND, 5);
+    const wxString backup_suffix_choices[] = {
+        _("append ~ to filename"),
+        _("append .bak to filename"),
+    };
+    backup_suffix = new wxRadioBox(notebook_1_pane_2, wxID_ANY, _("Backup options"), wxDefaultPosition, wxDefaultSize, 2, backup_suffix_choices, 2, wxRA_SPECIFY_COLS);
+    backup_suffix->SetSelection(0);
     sizer_5->Add(backup_suffix, 0, wxALL|wxEXPAND, 5);
+    wxStaticBoxSizer* sizer_6 = new wxStaticBoxSizer(new wxStaticBox(notebook_1_pane_2, wxID_ANY, _("Local widget path")), wxHORIZONTAL);
+    sizer_5->Add(sizer_6, 0, wxALL|wxEXPAND, 5);
+    local_widget_path = new wxTextCtrl(notebook_1_pane_2, wxID_ANY, wxEmptyString);
     sizer_6->Add(local_widget_path, 1, wxALL, 3);
+    choose_widget_path = new wxButton(notebook_1_pane_2, wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
     sizer_6->Add(choose_widget_path, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3);
-    sizer_5->Add(sizer_6, 0, wxALL|wxEXPAND, 5);
-    notebook_1_pane_2->SetSizer(sizer_5);
-    notebook_1->AddPage(notebook_1_pane_1, _("Interface"));
-    notebook_1->AddPage(notebook_1_pane_2, _("Other"));
-    sizer_1->Add(notebook_1, 1, wxALL|wxEXPAND, 5);
+    wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL);
+    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT|wxALL, 10);
+    ok = new wxButton(this, wxID_OK, wxEmptyString);
+    ok->SetDefault();
     sizer_2->Add(ok, 0, 0, 0);
+    cancel = new wxButton(this, wxID_CANCEL, wxEmptyString);
     sizer_2->Add(cancel, 0, wxLEFT, 10);
-    sizer_1->Add(sizer_2, 0, wxALIGN_RIGHT|wxALL, 10);
+    
+    notebook_1_pane_2->SetSizer(sizer_5);
+    sizer_4->AddGrowableCol(1);
+    notebook_1_pane_1->SetSizer(sizer_3);
     SetSizer(sizer_1);
     sizer_1->Fit(this);
+    SetAffirmativeId(ok->GetId())
+    SetEscapeId(cancel->GetId())
+    
     Layout();
     Centre();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/CPP_Preferences.h wxglade-1.0.1/tests/casefiles/CPP_Preferences.h
--- wxglade-0.9.6/tests/casefiles/CPP_Preferences.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CPP_Preferences.h	2020-12-31 14:04:48.000000000 +0000
@@ -27,7 +27,7 @@
 // end wxGlade
 
 // begin wxGlade: ::extracode
-#define _icon_path wxT("icons/icon.xpm")
+#define _icon_path wxT("icons/icon.png")
 // end wxGlade
 
 
@@ -39,13 +39,11 @@
     wxGladePreferencesUI(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
 
 private:
-    // begin wxGlade: wxGladePreferencesUI::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: wxGladePreferencesUI::attributes
+    wxNotebook* notebook_1;
+    wxPanel* notebook_1_pane_1;
     wxCheckBox* use_menu_icons;
     wxCheckBox* frame_tool_win;
     wxCheckBox* show_progress;
@@ -56,7 +54,7 @@
     wxTextCtrl* codegen_path;
     wxSpinCtrl* number_history;
     wxSpinCtrl* buttons_per_row;
-    wxPanel* notebook_1_pane_1;
+    wxPanel* notebook_1_pane_2;
     wxCheckBox* use_dialog_units;
     wxCheckBox* wxg_backup;
     wxCheckBox* codegen_backup;
@@ -70,8 +68,6 @@
     wxRadioBox* backup_suffix;
     wxTextCtrl* local_widget_path;
     wxButton* choose_widget_path;
-    wxPanel* notebook_1_pane_2;
-    wxNotebook* notebook_1;
     wxButton* ok;
     wxButton* cancel;
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/CPP_Preferences.wxg wxglade-1.0.1/tests/casefiles/CPP_Preferences.wxg
--- wxglade-0.9.6/tests/casefiles/CPP_Preferences.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CPP_Preferences.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -3,10 +3,12 @@
 
 <application path="CPP_Preferences." name="" class="" option="0" language="C++" top_window="dialog_1" encoding="ISO-8859-15" use_gettext="1" overwrite="1" use_new_namespace="1" for_version="2.6" is_template="0" indent_amount="4" indent_symbol="space" source_extension=".cpp" header_extension=".h">
     <object class="wxGladePreferencesUI" name="dialog_1" base="EditDialog">
-        <extracode>#define _icon_path wxT("icons/icon.xpm")</extracode>
+        <extracode>#define _icon_path wxT("icons/icon.png")</extracode>
         <style>wxDEFAULT_DIALOG_STYLE</style>
         <icon>var:_icon_path</icon>
         <title>wxGlade: preferences</title>
+        <affirmative>ok</affirmative>
+        <escape>cancel</escape>
         <centered>1</centered>
         <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
             <orient>wxVERTICAL</orient>
diff -Nru wxglade-0.9.6/tests/casefiles/crash_on_cut_paste.py wxglade-1.0.1/tests/casefiles/crash_on_cut_paste.py
--- wxglade-0.9.6/tests/casefiles/crash_on_cut_paste.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/crash_on_cut_paste.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MeasurementFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MeasurementFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 340))
+        self.SetTitle("ATV Tester")
+
+        sizer_limit = wx.BoxSizer(wx.VERTICAL)
+
+        self.panel_3 = wx.Panel(self, wx.ID_ANY)
+        sizer_limit.Add(self.panel_3, 1, wx.EXPAND, 0)
+
+        sizer_8 = wx.StaticBoxSizer(wx.StaticBox(self.panel_3, wx.ID_ANY, "History"), wx.VERTICAL)
+
+        self.panel_3.SetSizer(sizer_8)
+
+        self.SetSizer(sizer_limit)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MeasurementFrame
+
+class App(wx.App):
+    def OnInit(self):
+        self.frame = MeasurementFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class App
+
+if __name__ == "__main__":
+    App = App(0)
+    App.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/crash_on_cut_paste.wxg wxglade-1.0.1/tests/casefiles/crash_on_cut_paste.wxg
--- wxglade-0.9.6/tests/casefiles/crash_on_cut_paste.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/crash_on_cut_paste.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.9.0 on Sat Mar  9 15:11:05 2019 -->
+
+<application class="App" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="App" option="0" overwrite="1" path="crash_on_cut_paste.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MeasurementFrame" name="frame" base="EditFrame">
+        <size>400, 340</size>
+        <title>ATV Tester</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_limit" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="wxPanel" name="panel_3" base="EditPanel">
+                    <object class="wxStaticBoxSizer" name="sizer_8" base="EditStaticBoxSizer">
+                        <orient>wxVERTICAL</orient>
+                        <label>History</label>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/CustomWidget.cpp wxglade-1.0.1/tests/casefiles/CustomWidget.cpp
--- wxglade-0.9.6/tests/casefiles/CustomWidget.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CustomWidget.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,27 +20,11 @@
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: MyFrame::MyFrame
-    window_1 = new CustomWidget(this, wxID_ANY);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(_("frame_1"));
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    window_1 = new CustomWidget(this, wxID_ANY);
     sizer_1->Add(window_1, 1, wxALL|wxEXPAND, 5);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/CustomWidget.h wxglade-1.0.1/tests/casefiles/CustomWidget.h
--- wxglade-0.9.6/tests/casefiles/CustomWidget.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CustomWidget.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/CustomWidget.lisp wxglade-1.0.1/tests/casefiles/CustomWidget.lisp
--- wxglade-0.9.6/tests/casefiles/CustomWidget.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CustomWidget.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -25,8 +25,8 @@
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (window-1 :initform nil :accessor slot-window-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (window-1 :initform nil :accessor slot-window-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -38,22 +38,16 @@
 (defmethod init ((obj MyFrame))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
-        (setf window-1 (CustomWidget_Create nil wxID_ANY))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf window-1 (CustomWidget_Create nil wxID_ANY))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-window-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/CustomWidget.pl wxglade-1.0.1/tests/casefiles/CustomWidget.pl
--- wxglade-0.9.6/tests/casefiles/CustomWidget.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CustomWidget.pl	2020-12-31 14:04:48.000000000 +0000
@@ -30,35 +30,23 @@
 
     # begin wxGlade: MyFrame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{window_1} = CustomWidget->new($self, wxID_ANY);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle(_T("frame_1"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{window_1} = CustomWidget->new($self, wxID_ANY);
     $self->{sizer_1}->Add($self->{window_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/CustomWidget.py wxglade-1.0.1/tests/casefiles/CustomWidget.py
--- wxglade-0.9.6/tests/casefiles/CustomWidget.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/CustomWidget.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,23 +18,16 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
-        self.window_1 = CustomWidget(self, wx.ID_ANY)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle(_("frame_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.window_1 = CustomWidget(self, wx.ID_ANY)
         sizer_1.Add(self.window_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/FontColour.cpp wxglade-1.0.1/tests/casefiles/FontColour.cpp
--- wxglade-0.9.6/tests/casefiles/FontColour.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontColour.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,31 +20,15 @@
     wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
 {
     // begin wxGlade: MyFrame::MyFrame
-    text_ctrl_1 = new wxTextCtrl(this, wxID_ANY, _("Some Input"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(_("frame_1"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    text_ctrl_1 = new wxTextCtrl(this, wxID_ANY, _("Some Input"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
     text_ctrl_1->SetBackgroundColour(wxColour(0, 255, 127));
     text_ctrl_1->SetForegroundColour(wxColour(255, 0, 0));
     text_ctrl_1->SetFont(wxFont(16, wxDEFAULT, wxNORMAL, wxBOLD, 0, wxT("")));
     text_ctrl_1->SetFocus();
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
     sizer_1->Add(text_ctrl_1, 1, wxALL|wxEXPAND, 5);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/FontColour.h wxglade-1.0.1/tests/casefiles/FontColour.h
--- wxglade-0.9.6/tests/casefiles/FontColour.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontColour.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/FontColour.lisp wxglade-1.0.1/tests/casefiles/FontColour.lisp
--- wxglade-0.9.6/tests/casefiles/FontColour.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontColour.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -28,8 +28,8 @@
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (text-ctrl-1 :initform nil :accessor slot-text-ctrl-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (text-ctrl-1 :initform nil :accessor slot-text-ctrl-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -42,26 +42,20 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
-        (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-top-window obj) wxID_ANY (_"Some Input") -1 -1 -1 -1 wxTE_READONLY))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-top-window obj) wxID_ANY (_"Some Input") -1 -1 -1 -1 wxTE_READONLY))
         (wxWindow_SetBackgroundColour (slot-text-ctrl-1 obj) (wxColour_CreateRGB 0, 255, 127))
         (wxWindow_SetForegroundColour (slot-text-ctrl-1 obj) (wxColour_CreateRGB 255, 0, 0))
         (wxWindow_SetFont (slot-text-ctrl-1 obj) (wxFont_Create 16 wxDEFAULT wxNORMAL wxBOLD 0 "" wxFONTENCODING_DEFAULT))
         (wxWindow_SetFocus (slot-text-ctrl-1 obj))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
-        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-text-ctrl-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/FontColour.pl wxglade-1.0.1/tests/casefiles/FontColour.pl
--- wxglade-0.9.6/tests/casefiles/FontColour.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontColour.pl	2020-12-31 14:04:48.000000000 +0000
@@ -35,39 +35,27 @@
         unless defined $style;
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{text_ctrl_1} = Wx::TextCtrl->new($self, wxID_ANY, _T("Some Input"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle(_T("frame_1"));
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{text_ctrl_1} = Wx::TextCtrl->new($self, wxID_ANY, _T("Some Input"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
     $self->{text_ctrl_1}->SetBackgroundColour(Wx::Colour->new(0, 255, 127));
     $self->{text_ctrl_1}->SetForegroundColour(Wx::Colour->new(255, 0, 0));
     $self->{text_ctrl_1}->SetFont(Wx::Font->new(16, wxDEFAULT, wxNORMAL, wxBOLD, 0, ""));
     $self->{text_ctrl_1}->SetFocus();
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
-    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
     $self->{sizer_1}->Add($self->{text_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/FontColour.py wxglade-1.0.1/tests/casefiles/FontColour.py
--- wxglade-0.9.6/tests/casefiles/FontColour.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontColour.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,27 +19,20 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, _("Some Input"), style=wx.TE_READONLY)
+        self.SetTitle(_("frame_1"))
 
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
 
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle(_("frame_1"))
+        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, _("Some Input"), style=wx.TE_READONLY)
         self.text_ctrl_1.SetBackgroundColour(wx.Colour(0, 255, 127))
         self.text_ctrl_1.SetForegroundColour(wx.Colour(255, 0, 0))
         self.text_ctrl_1.SetFont(wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
         self.text_ctrl_1.SetFocus()
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_1.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest28.cpp wxglade-1.0.1/tests/casefiles/FontTest28.cpp
--- wxglade-0.9.6/tests/casefiles/FontTest28.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest28.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// generated by wxGlade 0.9.0pre on Tue Jul 10 20:55:26 2018
+// generated by wxGlade
 //
 // Example for compiling a single file project under Linux using g++:
 //  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
@@ -21,30 +21,13 @@
 {
     // begin wxGlade: MyFrame::MyFrame
     SetSize(wxSize(400, 300));
-    text_ctrl_1 = new wxTextCtrl(this, wxID_ANY, wxT("Some Input"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(wxT("frame"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    text_ctrl_1 = new wxTextCtrl(this, wxID_ANY, wxT("Some Input"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
     text_ctrl_1->SetBackgroundColour(wxColour(0, 255, 127));
     text_ctrl_1->SetForegroundColour(wxColour(255, 0, 0));
     text_ctrl_1->SetFont(wxFont(16, wxDEFAULT, wxNORMAL, wxBOLD, 0, wxT("")));
     text_ctrl_1->SetFocus();
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
     sizer_1->Add(text_ctrl_1, 1, wxALL|wxEXPAND, 5);
     wxStaticText* label_1 = new wxStaticText(this, wxID_ANY, wxT("label_1"));
     sizer_1->Add(label_1, 0, 0, 0);
@@ -63,6 +46,7 @@
     wxStaticText* label_6 = new wxStaticText(this, wxID_ANY, wxT("label_6"));
     label_6->SetFont(wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, 1, wxT("")));
     sizer_1->Add(label_6, 0, 0, 0);
+    
     SetSizer(sizer_1);
     Layout();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest28.h wxglade-1.0.1/tests/casefiles/FontTest28.h
--- wxglade-0.9.6/tests/casefiles/FontTest28.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest28.h	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// generated by wxGlade 0.9.0pre on Tue Jul 10 20:55:26 2018
+// generated by wxGlade
 //
 // Example for compiling a single file project under Linux using g++:
 //  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
@@ -30,10 +30,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest28.lisp wxglade-1.0.1/tests/casefiles/FontTest28.lisp
--- wxglade-0.9.6/tests/casefiles/FontTest28.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest28.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env lisp
 ;;;
-;;; generated by wxGlade 0.9.0pre on Tue Jul 10 20:55:25 2018
+;;; generated by wxGlade
 ;;;
 
 (asdf:operate 'asdf:load-op 'wxcl)
@@ -29,14 +29,14 @@
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
         (text-ctrl-1 :initform nil :accessor slot-text-ctrl-1)
         (label-1 :initform nil :accessor slot-label-1)
         (label-2 :initform nil :accessor slot-label-2)
         (label-3 :initform nil :accessor slot-label-3)
         (label-4 :initform nil :accessor slot-label-4)
         (label-5 :initform nil :accessor slot-label-5)
-        (label-6 :initform nil :accessor slot-label-6)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (label-6 :initform nil :accessor slot-label-6)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -50,42 +50,42 @@
         ;;; begin wxGlade: MyFrame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
         (slot-top-window obj).wxWindow_SetSize((400, 300))
-        (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-top-window obj) wxID_ANY "Some Input" -1 -1 -1 -1 wxTE_READONLY))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) "frame")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-top-window obj) wxID_ANY "Some Input" -1 -1 -1 -1 wxTE_READONLY))
         (wxWindow_SetBackgroundColour (slot-text-ctrl-1 obj) (wxColour_CreateRGB 0, 255, 127))
         (wxWindow_SetForegroundColour (slot-text-ctrl-1 obj) (wxColour_CreateRGB 255, 0, 0))
         (wxWindow_SetFont (slot-text-ctrl-1 obj) (wxFont_Create 16 wxDEFAULT wxNORMAL wxBOLD 0 "" wxFONTENCODING_DEFAULT))
         (wxWindow_SetFocus (slot-text-ctrl-1 obj))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
-        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-text-ctrl-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "label_1" -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 0 0 0 nil)
+        
         (setf (slot-label-2 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "label_2" -1 -1 -1 -1 0))
         (wxWindow_SetFont label-2 (wxFont_Create 8 wxDECORATIVE wxSLANT wxLIGHT 0 "" wxFONTENCODING_DEFAULT))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-2 obj) 0 0 0 nil)
+        
         (setf (slot-label-3 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "label_3" -1 -1 -1 -1 0))
         (wxWindow_SetFont label-3 (wxFont_Create 8 wxROMAN wxITALIC wxBOLD 0 "" wxFONTENCODING_DEFAULT))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-3 obj) 0 0 0 nil)
+        
         (setf (slot-label-4 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "label_4" -1 -1 -1 -1 0))
         (wxWindow_SetFont label-4 (wxFont_Create 8 wxSCRIPT wxNORMAL wxNORMAL 0 "" wxFONTENCODING_DEFAULT))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-4 obj) 0 0 0 nil)
+        
         (setf (slot-label-5 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "label_5" -1 -1 -1 -1 0))
         (wxWindow_SetFont label-5 (wxFont_Create 10 wxSWISS wxNORMAL wxNORMAL 0 "" wxFONTENCODING_DEFAULT))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-5 obj) 0 0 0 nil)
+        
         (setf (slot-label-6 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY "label_6" -1 -1 -1 -1 0))
         (wxWindow_SetFont label-6 (wxFont_Create 12 wxMODERN wxNORMAL wxNORMAL 1 "" wxFONTENCODING_DEFAULT))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-6 obj) 0 0 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
         (wxFrame_layout (slot-frame self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest28.pl wxglade-1.0.1/tests/casefiles/FontTest28.pl
--- wxglade-0.9.6/tests/casefiles/FontTest28.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest28.pl	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w -- 
 #
-# generated by wxGlade 0.9.0pre on Tue Jul 10 20:55:23 2018
+# generated by wxGlade
 #
 # To get wxPerl visit http://www.wxperl.it
 #
@@ -35,55 +35,49 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(400, 300));
-    $self->{text_ctrl_1} = Wx::TextCtrl->new($self, wxID_ANY, "Some Input", wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle("frame");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{text_ctrl_1} = Wx::TextCtrl->new($self, wxID_ANY, "Some Input", wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
     $self->{text_ctrl_1}->SetBackgroundColour(Wx::Colour->new(0, 255, 127));
     $self->{text_ctrl_1}->SetForegroundColour(Wx::Colour->new(255, 0, 0));
     $self->{text_ctrl_1}->SetFont(Wx::Font->new(16, wxDEFAULT, wxNORMAL, wxBOLD, 0, ""));
     $self->{text_ctrl_1}->SetFocus();
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
-    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
     $self->{sizer_1}->Add($self->{text_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     my $label_1 = Wx::StaticText->new($self, wxID_ANY, "label_1");
     $self->{sizer_1}->Add($label_1, 0, 0, 0);
+    
     my $label_2 = Wx::StaticText->new($self, wxID_ANY, "label_2");
     $label_2->SetFont(Wx::Font->new(8, wxDECORATIVE, wxSLANT, wxLIGHT, 0, ""));
     $self->{sizer_1}->Add($label_2, 0, 0, 0);
+    
     my $label_3 = Wx::StaticText->new($self, wxID_ANY, "label_3");
     $label_3->SetFont(Wx::Font->new(8, wxROMAN, wxITALIC, wxBOLD, 0, ""));
     $self->{sizer_1}->Add($label_3, 0, 0, 0);
+    
     my $label_4 = Wx::StaticText->new($self, wxID_ANY, "label_4");
     $label_4->SetFont(Wx::Font->new(8, wxSCRIPT, wxNORMAL, wxNORMAL, 0, ""));
     $self->{sizer_1}->Add($label_4, 0, 0, 0);
+    
     my $label_5 = Wx::StaticText->new($self, wxID_ANY, "label_5");
     $label_5->SetFont(Wx::Font->new(10, wxSWISS, wxNORMAL, wxNORMAL, 0, ""));
     $self->{sizer_1}->Add($label_5, 0, 0, 0);
+    
     my $label_6 = Wx::StaticText->new($self, wxID_ANY, "label_6");
     $label_6->SetFont(Wx::Font->new(12, wxMODERN, wxNORMAL, wxNORMAL, 1, ""));
     $self->{sizer_1}->Add($label_6, 0, 0, 0);
+    
     $self->SetSizer($self->{sizer_1});
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest28.py wxglade-1.0.1/tests/casefiles/FontTest28.py
--- wxglade-0.9.6/tests/casefiles/FontTest28.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest28.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
-# generated by wxGlade 0.9.0pre on Tue Jul 10 20:55:21 2018
+# generated by wxGlade
 #
 
 import wx
@@ -19,43 +19,42 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((400, 300))
-        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, "Some Input", style=wx.TE_READONLY)
+        self.SetTitle("frame")
 
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
 
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame")
+        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, "Some Input", style=wx.TE_READONLY)
         self.text_ctrl_1.SetBackgroundColour(wx.Colour(0, 255, 127))
         self.text_ctrl_1.SetForegroundColour(wx.Colour(255, 0, 0))
         self.text_ctrl_1.SetFont(wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
         self.text_ctrl_1.SetFocus()
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_1.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         label_1 = wx.StaticText(self, wx.ID_ANY, "label_1")
         sizer_1.Add(label_1, 0, 0, 0)
+
         label_2 = wx.StaticText(self, wx.ID_ANY, "label_2")
         label_2.SetFont(wx.Font(8, wx.DECORATIVE, wx.SLANT, wx.LIGHT, 0, ""))
         sizer_1.Add(label_2, 0, 0, 0)
+
         label_3 = wx.StaticText(self, wx.ID_ANY, "label_3")
         label_3.SetFont(wx.Font(8, wx.ROMAN, wx.ITALIC, wx.BOLD, 0, ""))
         sizer_1.Add(label_3, 0, 0, 0)
+
         label_4 = wx.StaticText(self, wx.ID_ANY, "label_4")
         label_4.SetFont(wx.Font(8, wx.SCRIPT, wx.NORMAL, wx.NORMAL, 0, ""))
         sizer_1.Add(label_4, 0, 0, 0)
+
         label_5 = wx.StaticText(self, wx.ID_ANY, "label_5")
         label_5.SetFont(wx.Font(10, wx.SWISS, wx.NORMAL, wx.NORMAL, 0, ""))
         sizer_1.Add(label_5, 0, 0, 0)
+
         label_6 = wx.StaticText(self, wx.ID_ANY, "label_6")
         label_6.SetFont(wx.Font(12, wx.MODERN, wx.NORMAL, wx.NORMAL, 1, ""))
         sizer_1.Add(label_6, 0, 0, 0)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest28.wxg wxglade-1.0.1/tests/casefiles/FontTest28.wxg
--- wxglade-0.9.6/tests/casefiles/FontTest28.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest28.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.9.0pre on Tue Jul 10 20:51:06 2018 -->
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
 
 <application class="MyApp" encoding="UTF-8" for_version="2.8" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="./FontTest28.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="MyFrame" name="frame" base="EditFrame">
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest.cpp wxglade-1.0.1/tests/casefiles/FontTest.cpp
--- wxglade-0.9.6/tests/casefiles/FontTest.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// generated by wxGlade 0.9.0pre on Tue Jul 10 20:55:06 2018
+// generated by wxGlade
 //
 // Example for compiling a single file project under Linux using g++:
 //  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
@@ -21,30 +21,13 @@
 {
     // begin wxGlade: MyFrame::MyFrame
     SetSize(wxSize(400, 300));
-    text_ctrl_1 = new wxTextCtrl(this, wxID_ANY, wxT("Some Input"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(wxT("frame"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    text_ctrl_1 = new wxTextCtrl(this, wxID_ANY, wxT("Some Input"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
     text_ctrl_1->SetBackgroundColour(wxColour(0, 255, 127));
     text_ctrl_1->SetForegroundColour(wxColour(255, 0, 0));
     text_ctrl_1->SetFont(wxFont(16, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, 0, wxT("")));
     text_ctrl_1->SetFocus();
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
     sizer_1->Add(text_ctrl_1, 1, wxALL|wxEXPAND, 5);
     wxStaticText* label_1 = new wxStaticText(this, wxID_ANY, wxT("label_1"));
     sizer_1->Add(label_1, 0, 0, 0);
@@ -63,6 +46,7 @@
     wxStaticText* label_6 = new wxStaticText(this, wxID_ANY, wxT("label_6"));
     label_6->SetFont(wxFont(12, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, 1, wxT("")));
     sizer_1->Add(label_6, 0, 0, 0);
+    
     SetSizer(sizer_1);
     Layout();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest.h wxglade-1.0.1/tests/casefiles/FontTest.h
--- wxglade-0.9.6/tests/casefiles/FontTest.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest.h	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// generated by wxGlade 0.9.0pre on Tue Jul 10 20:55:06 2018
+// generated by wxGlade
 //
 // Example for compiling a single file project under Linux using g++:
 //  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
@@ -30,10 +30,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest.pl wxglade-1.0.1/tests/casefiles/FontTest.pl
--- wxglade-0.9.6/tests/casefiles/FontTest.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest.pl	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w -- 
 #
-# generated by wxGlade 0.9.0pre on Tue Jul 10 20:54:59 2018
+# generated by wxGlade
 #
 # To get wxPerl visit http://www.wxperl.it
 #
@@ -35,55 +35,49 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(400, 300));
-    $self->{text_ctrl_1} = Wx::TextCtrl->new($self, wxID_ANY, "Some Input", wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle("frame");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{text_ctrl_1} = Wx::TextCtrl->new($self, wxID_ANY, "Some Input", wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
     $self->{text_ctrl_1}->SetBackgroundColour(Wx::Colour->new(0, 255, 127));
     $self->{text_ctrl_1}->SetForegroundColour(Wx::Colour->new(255, 0, 0));
     $self->{text_ctrl_1}->SetFont(Wx::Font->new(16, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, 0, ""));
     $self->{text_ctrl_1}->SetFocus();
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
-    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
     $self->{sizer_1}->Add($self->{text_ctrl_1}, 1, wxALL|wxEXPAND, 5);
+    
     my $label_1 = Wx::StaticText->new($self, wxID_ANY, "label_1");
     $self->{sizer_1}->Add($label_1, 0, 0, 0);
+    
     my $label_2 = Wx::StaticText->new($self, wxID_ANY, "label_2");
     $label_2->SetFont(Wx::Font->new(8, wxFONTFAMILY_DECORATIVE, wxFONTSTYLE_SLANT, wxFONTWEIGHT_LIGHT, 0, ""));
     $self->{sizer_1}->Add($label_2, 0, 0, 0);
+    
     my $label_3 = Wx::StaticText->new($self, wxID_ANY, "label_3");
     $label_3->SetFont(Wx::Font->new(8, wxFONTFAMILY_ROMAN, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, 0, ""));
     $self->{sizer_1}->Add($label_3, 0, 0, 0);
+    
     my $label_4 = Wx::StaticText->new($self, wxID_ANY, "label_4");
     $label_4->SetFont(Wx::Font->new(8, wxFONTFAMILY_SCRIPT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, 0, ""));
     $self->{sizer_1}->Add($label_4, 0, 0, 0);
+    
     my $label_5 = Wx::StaticText->new($self, wxID_ANY, "label_5");
     $label_5->SetFont(Wx::Font->new(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, 0, ""));
     $self->{sizer_1}->Add($label_5, 0, 0, 0);
+    
     my $label_6 = Wx::StaticText->new($self, wxID_ANY, "label_6");
     $label_6->SetFont(Wx::Font->new(12, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, 1, ""));
     $self->{sizer_1}->Add($label_6, 0, 0, 0);
+    
     $self->SetSizer($self->{sizer_1});
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest.py wxglade-1.0.1/tests/casefiles/FontTest.py
--- wxglade-0.9.6/tests/casefiles/FontTest.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
-# generated by wxGlade 0.9.0pre on Tue Jul 10 20:54:56 2018
+# generated by wxGlade
 #
 
 import wx
@@ -19,43 +19,42 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((400, 300))
-        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, "Some Input", style=wx.TE_READONLY)
+        self.SetTitle("frame")
 
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
 
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame")
+        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, "Some Input", style=wx.TE_READONLY)
         self.text_ctrl_1.SetBackgroundColour(wx.Colour(0, 255, 127))
         self.text_ctrl_1.SetForegroundColour(wx.Colour(255, 0, 0))
         self.text_ctrl_1.SetFont(wx.Font(16, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, 0, ""))
         self.text_ctrl_1.SetFocus()
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_1.Add(self.text_ctrl_1, 1, wx.ALL | wx.EXPAND, 5)
+
         label_1 = wx.StaticText(self, wx.ID_ANY, "label_1")
         sizer_1.Add(label_1, 0, 0, 0)
+
         label_2 = wx.StaticText(self, wx.ID_ANY, "label_2")
         label_2.SetFont(wx.Font(8, wx.FONTFAMILY_DECORATIVE, wx.FONTSTYLE_SLANT, wx.FONTWEIGHT_LIGHT, 0, ""))
         sizer_1.Add(label_2, 0, 0, 0)
+
         label_3 = wx.StaticText(self, wx.ID_ANY, "label_3")
         label_3.SetFont(wx.Font(8, wx.FONTFAMILY_ROMAN, wx.FONTSTYLE_ITALIC, wx.FONTWEIGHT_BOLD, 0, ""))
         sizer_1.Add(label_3, 0, 0, 0)
+
         label_4 = wx.StaticText(self, wx.ID_ANY, "label_4")
         label_4.SetFont(wx.Font(8, wx.FONTFAMILY_SCRIPT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         sizer_1.Add(label_4, 0, 0, 0)
+
         label_5 = wx.StaticText(self, wx.ID_ANY, "label_5")
         label_5.SetFont(wx.Font(10, wx.FONTFAMILY_SWISS, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         sizer_1.Add(label_5, 0, 0, 0)
+
         label_6 = wx.StaticText(self, wx.ID_ANY, "label_6")
         label_6.SetFont(wx.Font(12, wx.FONTFAMILY_MODERN, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 1, ""))
         sizer_1.Add(label_6, 0, 0, 0)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/FontTest.wxg wxglade-1.0.1/tests/casefiles/FontTest.wxg
--- wxglade-0.9.6/tests/casefiles/FontTest.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/FontTest.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.9.0pre on Tue Jul 10 20:51:13 2018 -->
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
 
 <application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="./FontTest.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
     <object class="MyFrame" name="frame" base="EditFrame">
diff -Nru wxglade-0.9.6/tests/casefiles/Frame_Size_Classic.py wxglade-1.0.1/tests/casefiles/Frame_Size_Classic.py
--- wxglade-0.9.6/tests/casefiles/Frame_Size_Classic.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Frame_Size_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 1.0.0b1 on Sat Nov 28 23:19:46 2020
+#
+
+import wx
+
+
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.text_ctrl_1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
+        sizer_1.Add(self.text_ctrl_1, 0, 0, 0)
+
+        self.button_1 = wx.Button(self.panel_1, wx.ID_ANY, "button_1")
+        sizer_1.Add(self.button_1, 0, 0, 0)
+
+        self.panel_1.SetSizer(sizer_1)
+
+        self.Layout()
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetTitle("frame")
+
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.text_ctrl_1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
+        sizer_1.Add(self.text_ctrl_1, 0, 0, 0)
+
+        self.button_1 = wx.Button(self.panel_1, wx.ID_ANY, "button_1")
+        sizer_1.Add(self.button_1, 0, 0, 0)
+
+        self.panel_1.SetSizer(sizer_1)
+
+        sizer_1.Fit(self)
+        self.Layout()
+
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/Frame_Size.cpp wxglade-1.0.1/tests/casefiles/Frame_Size.cpp
--- wxglade-0.9.6/tests/casefiles/Frame_Size.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Frame_Size.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,65 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "Frame_Size.h"
+
+
+
+
+MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("frame"));
+    panel_1 = new wxPanel(this, wxID_ANY);
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    text_ctrl_1 = new wxTextCtrl(panel_1, wxID_ANY, wxEmptyString);
+    sizer_1->Add(text_ctrl_1, 0, 0, 0);
+    button_1 = new wxButton(panel_1, wxID_ANY, wxT("button_1"));
+    sizer_1->Add(button_1, 0, 0, 0);
+    
+    panel_1->SetSizer(sizer_1);
+    Layout();
+}
+
+
+MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    SetTitle(wxT("frame"));
+    panel_1 = new wxPanel(this, wxID_ANY);
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    text_ctrl_1 = new wxTextCtrl(panel_1, wxID_ANY, wxEmptyString);
+    sizer_1->Add(text_ctrl_1, 0, 0, 0);
+    button_1 = new wxButton(panel_1, wxID_ANY, wxT("button_1"));
+    sizer_1->Add(button_1, 0, 0, 0);
+    
+    panel_1->SetSizer(sizer_1);
+    sizer_1->->Fit();
+    Layout();
+}
+
+
+class MyApp: public wxApp {
+public:
+    bool OnInit();
+};
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    wxInitAllImageHandlers();
+    MyFrame* frame = new MyFrame(NULL, wxID_ANY, wxEmptyString);
+    SetTopWindow(frame);
+    frame->Show();
+    return true;
+}
diff -Nru wxglade-0.9.6/tests/casefiles/Frame_Size.h wxglade-1.0.1/tests/casefiles/Frame_Size.h
--- wxglade-0.9.6/tests/casefiles/Frame_Size.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Frame_Size.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef FRAME_SIZE_H
+#define FRAME_SIZE_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+
+
+
+class MyFrame: public wxFrame {
+public:
+    MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrame::attributes
+    wxPanel* panel_1;
+    wxTextCtrl* text_ctrl_1;
+    wxButton* button_1;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyFrame: public wxFrame {
+public:
+    MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrame::attributes
+    wxPanel* panel_1;
+    wxTextCtrl* text_ctrl_1;
+    wxButton* button_1;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+#endif // FRAME_SIZE_H
diff -Nru wxglade-0.9.6/tests/casefiles/Frame_Size.lisp wxglade-1.0.1/tests/casefiles/Frame_Size.lisp
--- wxglade-0.9.6/tests/casefiles/Frame_Size.lisp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Frame_Size.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,113 @@
+#!/usr/bin/env lisp
+;;;
+;;; generated by wxGlade
+;;;
+
+(asdf:operate 'asdf:load-op 'wxcl)
+(use-package "FFI")
+(ffi:default-foreign-language :stdc)
+
+
+(use-package :wxButton)
+(use-package :wxCL)
+(use-package :wxColour)
+(use-package :wxEvent)
+(use-package :wxEvtHandler)
+(use-package :wxFrame)
+(use-package :wxPanel)
+(use-package :wxSizer)
+(use-package :wxTextCtrl)
+(use-package :wxWindow)
+(use-package :wx_main)
+(use-package :wx_wrapper)
+
+
+
+(defclass MyFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (text-ctrl-1 :initform nil :accessor slot-text-ctrl-1)
+        (button-1 :initform nil :accessor slot-button-1)))
+
+(defun make-MyFrame ()
+        (let ((obj (make-instance 'MyFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrame))
+"Method creates the objects contained in the class."
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxFrame_SetTitle (slot-top-window obj) "frame")
+        
+        (setf (slot-panel-1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-panel-1 obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-text-ctrl-1 obj) 0 0 0 nil)
+        
+        (setf (slot-button-1 obj) (wxButton_Create (slot-panel-1 obj) wxID_ANY "button_1" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-button-1 obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-panel-1 obj) (slot-sizer-1 obj))
+        
+        (wxFrame_layout (slot-frame self))
+        )
+
+
+
+
+(defclass MyFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (text-ctrl-1 :initform nil :accessor slot-text-ctrl-1)
+        (button-1 :initform nil :accessor slot-button-1)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (text-ctrl-1 :initform nil :accessor slot-text-ctrl-1)
+        (button-1 :initform nil :accessor slot-button-1)))
+
+(defun make-MyFrame ()
+        (let ((obj (make-instance 'MyFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrame))
+"Method creates the objects contained in the class."
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (wxFrame_SetTitle (slot-top-window obj) "frame")
+        
+        (setf (slot-panel-1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-panel-1 obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-text-ctrl-1 obj) 0 0 0 nil)
+        
+        (setf (slot-button-1 obj) (wxButton_Create (slot-panel-1 obj) wxID_ANY "button_1" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-button-1 obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-panel-1 obj) (slot-sizer-1 obj))
+        
+        (wxSizer_Fit ((slot-sizer-1 obj) obj) (slot-top-window obj))
+        (wxFrame_layout (slot-frame-no-size self))
+        )
+
+
+
+(defun init-func (fun data evt)
+        (let ((frame (make-MyFrame)))
+        (ELJApp_SetTopWindow (slot-top-window frame))
+        (wxWindow_Show (slot-top-window frame))))
+
+
+(unwind-protect
+    (Eljapp_initializeC (wxclosure_Create #'init-func nil) 0 nil)
+    (ffi:close-foreign-library "../miscellaneous/wxc-msw2.6.2.dll"))
diff -Nru wxglade-0.9.6/tests/casefiles/Frame_Size.pl wxglade-1.0.1/tests/casefiles/Frame_Size.pl
--- wxglade-0.9.6/tests/casefiles/Frame_Size.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Frame_Size.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,122 @@
+#!/usr/bin/perl -w -- 
+#
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+
+
+package MyFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("frame");
+    
+    $self->{panel_1} = Wx::Panel->new($self, wxID_ANY);
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{text_ctrl_1} = Wx::TextCtrl->new($self->{panel_1}, wxID_ANY, "");
+    $self->{sizer_1}->Add($self->{text_ctrl_1}, 0, 0, 0);
+    
+    $self->{button_1} = Wx::Button->new($self->{panel_1}, wxID_ANY, "button_1");
+    $self->{sizer_1}->Add($self->{button_1}, 0, 0, 0);
+    
+    $self->{panel_1}->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    return $self;
+
+}
+
+
+
+1;
+
+package MyFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetTitle("frame");
+    
+    $self->{panel_1} = Wx::Panel->new($self, wxID_ANY);
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{text_ctrl_1} = Wx::TextCtrl->new($self->{panel_1}, wxID_ANY, "");
+    $self->{sizer_1}->Add($self->{text_ctrl_1}, 0, 0, 0);
+    
+    $self->{button_1} = Wx::Button->new($self->{panel_1}, wxID_ANY, "button_1");
+    $self->{sizer_1}->Add($self->{button_1}, 0, 0, 0);
+    
+    $self->{panel_1}->SetSizer($self->{sizer_1});
+    
+    $self->{sizer_1}->Fit($self);
+    $self->Layout();
+    return $self;
+
+}
+
+
+
+1;
+
+package MyApp;
+
+use base qw(Wx::App);
+use strict;
+
+sub OnInit {
+    my( $self ) = shift;
+
+    Wx::InitAllImageHandlers();
+
+    my $frame = MyFrame->new();
+
+    $self->SetTopWindow($frame);
+    $frame->Show(1);
+
+    return 1;
+}
+
+package main;
+
+unless(caller){
+    my $app = MyApp->new();
+    $app->MainLoop();
+}
diff -Nru wxglade-0.9.6/tests/casefiles/Frame_Size.py wxglade-1.0.1/tests/casefiles/Frame_Size.py
--- wxglade-0.9.6/tests/casefiles/Frame_Size.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Frame_Size.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.text_ctrl_1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
+        sizer_1.Add(self.text_ctrl_1, 0, 0, 0)
+
+        self.button_1 = wx.Button(self.panel_1, wx.ID_ANY, "button_1")
+        sizer_1.Add(self.button_1, 0, 0, 0)
+
+        self.panel_1.SetSizer(sizer_1)
+
+        self.Layout()
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetTitle("frame")
+
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.text_ctrl_1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "")
+        sizer_1.Add(self.text_ctrl_1, 0, 0, 0)
+
+        self.button_1 = wx.Button(self.panel_1, wx.ID_ANY, "button_1")
+        sizer_1.Add(self.button_1, 0, 0, 0)
+
+        self.panel_1.SetSizer(sizer_1)
+
+        sizer_1.Fit(self)
+        self.Layout()
+
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/Frame_Size.wxg wxglade-1.0.1/tests/casefiles/Frame_Size.wxg
--- wxglade-0.9.6/tests/casefiles/Frame_Size.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Frame_Size.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 1.0.0b1 on Sat Nov 28 17:53:27 2020 -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="0" name="app" option="0" overwrite="1" path="Frame_Size.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>400, 300</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxPanel" name="panel_1" base="EditPanel">
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <object class="wxButton" name="button_1" base="EditButton">
+                        <label>button_1</label>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="MyFrame" name="frame_no_size" base="EditFrame">
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxPanel" name="panel_1" base="EditPanel">
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <object class="wxButton" name="button_1" base="EditButton">
+                        <label>button_1</label>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/Frame_Size.xrc wxglade-1.0.1/tests/casefiles/Frame_Size.xrc
--- wxglade-0.9.6/tests/casefiles/Frame_Size.xrc	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Frame_Size.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- generated by wxGlade 1.0.0b1 on Sat Nov 28 16:15:32 2020 -->
+
+<resource version="2.3.0.1">
+    <object class="wxFrame" name="frame" subclass="MyFrame">
+        <size>400, 300</size>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <title>frame</title>
+        <object class="wxPanel" name="panel_1">
+            <object class="wxBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <object class="wxTextCtrl" name="text_ctrl_1">
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <object class="wxButton" name="button_1">
+                        <label>button_1</label>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="wxFrame" name="frame_no_size" subclass="MyFrame">
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <title>frame</title>
+        <object class="wxPanel" name="panel_1">
+            <object class="wxBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <object class="wxTextCtrl" name="text_ctrl_1">
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <object class="wxButton" name="button_1">
+                        <label>button_1</label>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</resource>
diff -Nru wxglade-0.9.6/tests/casefiles/Gauge.cpp wxglade-1.0.1/tests/casefiles/Gauge.cpp
--- wxglade-0.9.6/tests/casefiles/Gauge.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Gauge.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,27 +20,11 @@
     wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
 {
     // begin wxGlade: MyFrame::MyFrame
-    gauge_1 = new wxGauge(this, wxID_ANY, 10);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(wxT("frame_1"));
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    gauge_1 = new wxGauge(this, wxID_ANY, 10);
     sizer_1->Add(gauge_1, 0, 0, 0);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/Gauge.h wxglade-1.0.1/tests/casefiles/Gauge.h
--- wxglade-0.9.6/tests/casefiles/Gauge.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Gauge.h	2020-12-31 14:04:48.000000000 +0000
@@ -30,10 +30,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/Gauge.lisp wxglade-1.0.1/tests/casefiles/Gauge.lisp
--- wxglade-0.9.6/tests/casefiles/Gauge.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Gauge.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -25,8 +25,8 @@
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (gauge-1 :initform nil :accessor slot-gauge-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (gauge-1 :initform nil :accessor slot-gauge-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -39,22 +39,16 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
-        (setf (slot-gauge-1 obj) (wxGauge_Create (slot-top-window obj) wxID_ANY 10 -1 -1 -1 -1 wxGA_HORIZONTAL))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) "frame_1")
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-gauge-1 obj) (wxGauge_Create (slot-top-window obj) wxID_ANY 10 -1 -1 -1 -1 wxGA_HORIZONTAL))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-gauge-1 obj) 0 0 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/Gauge.pl wxglade-1.0.1/tests/casefiles/Gauge.pl
--- wxglade-0.9.6/tests/casefiles/Gauge.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Gauge.pl	2020-12-31 14:04:48.000000000 +0000
@@ -32,35 +32,23 @@
         unless defined $style;
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{gauge_1} = Wx::Gauge->new($self, wxID_ANY, 10);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle("frame_1");
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{gauge_1} = Wx::Gauge->new($self, wxID_ANY, 10);
     $self->{sizer_1}->Add($self->{gauge_1}, 0, 0, 0);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/Gauge.py wxglade-1.0.1/tests/casefiles/Gauge.py
--- wxglade-0.9.6/tests/casefiles/Gauge.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Gauge.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,23 +17,16 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.gauge_1 = wx.Gauge(self, wx.ID_ANY, 10)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle("frame_1")
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.gauge_1 = wx.Gauge(self, wx.ID_ANY, 10)
         sizer_1.Add(self.gauge_1, 0, 0, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/Grid.cpp wxglade-1.0.1/tests/casefiles/Grid.cpp
--- wxglade-0.9.6/tests/casefiles/Grid.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Grid.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,35 +20,19 @@
     wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
 {
     // begin wxGlade: MyFrame::MyFrame
-    grid_1 = new wxGrid(this, wxID_ANY);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(wxT("frame_1"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    grid_1 = new wxGrid(this, wxID_ANY);
     grid_1->CreateGrid(2, 2);
     grid_1->SetGridLineColour(wxColour(255, 0, 0));
     grid_1->SetLabelBackgroundColour(wxColour(216, 191, 216));
     grid_1->SetColLabelValue(0, wxT("Column A"));
     grid_1->SetColLabelValue(1, wxT("Column B"));
     grid_1->SetBackgroundColour(wxColour(0, 255, 255));
-    grid_1->SetCellValue(0, 0, "1");
     grid_1->SetRowLabelValue(0, "Row 1");
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    grid_1->SetCellValue(0, 0, "1");
     sizer_1->Add(grid_1, 1, wxEXPAND, 0);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/Grid.h wxglade-1.0.1/tests/casefiles/Grid.h
--- wxglade-0.9.6/tests/casefiles/Grid.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Grid.h	2020-12-31 14:04:48.000000000 +0000
@@ -31,10 +31,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
@@ -44,7 +40,7 @@
     DECLARE_EVENT_TABLE();
 
 public:
-    void myEVT_GRID_CELL_LEFT_CLICK(wxGridEvent &event); // wxGlade: <event_handler>
+    virtual void myEVT_GRID_CELL_LEFT_CLICK(wxGridEvent &event); // wxGlade: <event_handler>
 }; // wxGlade: end class
 
 
diff -Nru wxglade-0.9.6/tests/casefiles/Grid.lisp wxglade-1.0.1/tests/casefiles/Grid.lisp
--- wxglade-0.9.6/tests/casefiles/Grid.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Grid.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -25,8 +25,8 @@
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (grid-1 :initform nil :accessor slot-grid-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (grid-1 :initform nil :accessor slot-grid-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -39,34 +39,28 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
-        (setf (slot-grid-1 obj) (wxGrid_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxWANTS_CHARS))
-
-        (wxEvtHandler_Connect (slot-top-window obj) obj.grid-1 (expwxEVT_GRID_CMD_CELL_LEFT_CLICK)
-        (wxClosure_Create #'myEVT_GRID_CELL_LEFT_CLICK obj))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) "frame_1")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-grid-1 obj) (wxGrid_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxWANTS_CHARS))
         (wxGrid_CreateGrid (slot-grid-1 obj) 2 2 0)
         (wxGrid_SetGridLineColour (slot-grid-1 obj) (wxColour:wxColour_CreateFromStock 255, 0, 0))
         (wxGrid_SetLabelBackgroundColour (slot-grid-1 obj) (wxColour:wxColour_CreateFromStock 216, 191, 216))
         (wxGrid_SetColLabelValue (slot-grid-1 obj) 0 "Column A")
         (wxGrid_SetColLabelValue (slot-grid-1 obj) 1 "Column B")
         (wxWindow_SetBackgroundColour (slot-grid-1 obj) (wxColour_CreateRGB 0, 255, 255))
-        (wxGrid_SetCellValue (slot-(slot-grid-1 obj) obj) 0, 0, "1")
         (wxGrid_SetRowLabelValue (slot-(slot-grid-1 obj) obj) 0, "Row 1")
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
-        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        (wxGrid_SetCellValue (slot-(slot-grid-1 obj) obj) 0, 0, "1")
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-grid-1 obj) 1 wxEXPAND 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
+
+        (wxEvtHandler_Connect (slot-top-window obj) obj.grid-1 (expwxEVT_GRID_CMD_CELL_LEFT_CLICK)
+        (wxClosure_Create #'myEVT_GRID_CELL_LEFT_CLICK obj))
         ;;; end wxGlade
         )
 
diff -Nru wxglade-0.9.6/tests/casefiles/Grid.pl wxglade-1.0.1/tests/casefiles/Grid.pl
--- wxglade-0.9.6/tests/casefiles/Grid.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Grid.pl	2020-12-31 14:04:48.000000000 +0000
@@ -32,45 +32,33 @@
         unless defined $style;
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{grid_1} = Wx::Grid->new($self, wxID_ANY);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    Wx::Event::EVT_GRID_CMD_CELL_LEFT_CLICK($self, $self->{grid_1}->GetId, $self->can('myEVT_GRID_CELL_LEFT_CLICK'));
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle("frame_1");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{grid_1} = Wx::Grid->new($self, wxID_ANY);
     $self->{grid_1}->CreateGrid(2, 2);
     $self->{grid_1}->SetGridLineColour(Wx::Colour->new(255, 0, 0));
     $self->{grid_1}->SetLabelBackgroundColour(Wx::Colour->new(216, 191, 216));
     $self->{grid_1}->SetColLabelValue(0, "Column A");
     $self->{grid_1}->SetColLabelValue(1, "Column B");
     $self->{grid_1}->SetBackgroundColour(Wx::Colour->new(0, 255, 255));
-    $self->{grid_1}->SetCellValue(0, 0, "1");
     $self->{grid_1}->SetRowLabelValue(0, "Row 1");
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
-    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{grid_1}->SetCellValue(0, 0, "1");
     $self->{sizer_1}->Add($self->{grid_1}, 1, wxEXPAND, 0);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
+    Wx::Event::EVT_GRID_CMD_CELL_LEFT_CLICK($self, $self->{grid_1}->GetId, $self->can('myEVT_GRID_CELL_LEFT_CLICK'));
+
     # end wxGlade
+    return $self;
+
 }
 
+
 sub myEVT_GRID_CELL_LEFT_CLICK {
     my ($self, $event) = @_;
     # wxGlade: MyFrame::myEVT_GRID_CELL_LEFT_CLICK <event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/Grid.py wxglade-1.0.1/tests/casefiles/Grid.py
--- wxglade-0.9.6/tests/casefiles/Grid.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Grid.py	2020-12-31 14:04:48.000000000 +0000
@@ -4,9 +4,9 @@
 #
 
 import wx
-import wx.grid
 
 # begin wxGlade: dependencies
+import wx.grid
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -18,34 +18,27 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.grid_1 = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
-
-        self.__set_properties()
-        self.__do_layout()
+        self.SetTitle("frame_1")
 
-        self.Bind(wx.grid.EVT_GRID_CMD_CELL_LEFT_CLICK, self.myEVT_GRID_CELL_LEFT_CLICK, self.grid_1)
-        # end wxGlade
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
 
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame_1")
+        self.grid_1 = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
         self.grid_1.CreateGrid(2, 2)
         self.grid_1.SetGridLineColour(wx.Colour(255, 0, 0))
         self.grid_1.SetLabelBackgroundColour(wx.Colour(216, 191, 216))
         self.grid_1.SetColLabelValue(0, "Column A")
         self.grid_1.SetColLabelValue(1, "Column B")
         self.grid_1.SetBackgroundColour(wx.Colour(0, 255, 255))
-        self.grid_1.SetCellValue(0, 0, "1")
         self.grid_1.SetRowLabelValue(0, "Row 1")
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        self.grid_1.SetCellValue(0, 0, "1")
         sizer_1.Add(self.grid_1, 1, wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
+
+        self.Bind(wx.grid.EVT_GRID_CMD_CELL_LEFT_CLICK, self.myEVT_GRID_CELL_LEFT_CLICK, self.grid_1)
         # end wxGlade
 
     def myEVT_GRID_CELL_LEFT_CLICK(self, event):  # wxGlade: MyFrame.<event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28.cpp wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28.cpp
--- wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,27 +20,11 @@
     wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
 {
     // begin wxGlade: MyFrame::MyFrame
-    hyperlink_1 = new wxHyperlinkCtrl(this, wxID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"), wxDefaultPosition, wxDefaultSize, wxHL_ALIGN_RIGHT);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(_("frame_1"));
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    hyperlink_1 = new wxHyperlinkCtrl(this, wxID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"), wxDefaultPosition, wxDefaultSize, wxHL_ALIGN_RIGHT);
     sizer_1->Add(hyperlink_1, 0, wxALL, 5);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28.h wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28.h
--- wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28.h	2020-12-31 14:04:48.000000000 +0000
@@ -37,10 +37,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28.lisp wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28.lisp
--- wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -27,8 +27,8 @@
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (hyperlink-1 :initform nil :accessor slot-hyperlink-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (hyperlink-1 :initform nil :accessor slot-hyperlink-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -41,22 +41,16 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
-        (setf (slot-hyperlink-1 obj) (wxHyperlinkCtrl_Create (slot-top-window obj) wxID_ANY (_"Homepage wxGlade") (_"http://wxglade.sf.net") -1 -1 -1 -1 wxHL_ALIGN_RIGHT))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-hyperlink-1 obj) (wxHyperlinkCtrl_Create (slot-top-window obj) wxID_ANY (_"Homepage wxGlade") (_"http://wxglade.sf.net") -1 -1 -1 -1 wxHL_ALIGN_RIGHT))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-hyperlink-1 obj) 0 wxALL 5 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28_Phoenix.py wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,10 +5,10 @@
 #
 
 import wx
-import wx.adv
 
 # begin wxGlade: dependencies
 import gettext
+import wx.adv
 # end wxGlade
 
 # begin wxGlade: extracode
@@ -20,23 +20,16 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.hyperlink_1 = wx.adv.HyperlinkCtrl(self, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"), style=wx.adv.HL_ALIGN_RIGHT)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle(_("frame_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.hyperlink_1 = wx.adv.HyperlinkCtrl(self, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"), style=wx.adv.HL_ALIGN_RIGHT)
         sizer_1.Add(self.hyperlink_1, 0, wx.ALL, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28.pl wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28.pl
--- wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28.pl	2020-12-31 14:04:48.000000000 +0000
@@ -35,35 +35,23 @@
         unless defined $style;
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{hyperlink_1} = Wx::HyperlinkCtrl->new($self, wxID_ANY, _T("Homepage wxGlade"), _T("http://wxglade.sf.net"), wxDefaultPosition, wxDefaultSize, wxHL_ALIGN_RIGHT);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle(_T("frame_1"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{hyperlink_1} = Wx::HyperlinkCtrl->new($self, wxID_ANY, _T("Homepage wxGlade"), _T("http://wxglade.sf.net"), wxDefaultPosition, wxDefaultSize, wxHL_ALIGN_RIGHT);
     $self->{sizer_1}->Add($self->{hyperlink_1}, 0, wxALL, 5);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28.py wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28.py
--- wxglade-0.9.6/tests/casefiles/HyperlinkCtrl_28.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/HyperlinkCtrl_28.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,23 +19,16 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.hyperlink_1 = wx.HyperlinkCtrl(self, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"), style=wx.HL_ALIGN_RIGHT)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle(_("frame_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.hyperlink_1 = wx.HyperlinkCtrl(self, wx.ID_ANY, _("Homepage wxGlade"), _("http://wxglade.sf.net"), style=wx.HL_ALIGN_RIGHT)
         sizer_1.Add(self.hyperlink_1, 0, wx.ALL, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
Binary files /tmp/tmpMhs54i/irjejI_ekK/wxglade-0.9.6/tests/casefiles/icon.png and /tmp/tmpMhs54i/PZ7B9Vl70P/wxglade-1.0.1/tests/casefiles/icon.png differ
diff -Nru wxglade-0.9.6/tests/casefiles/icon.xpm wxglade-1.0.1/tests/casefiles/icon.xpm
--- wxglade-0.9.6/tests/casefiles/icon.xpm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/icon.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* XPM */
-static char *mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-"  c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-"                                ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-"                                ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++      ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++                    ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-"                                "
-};
diff -Nru wxglade-0.9.6/tests/casefiles/import_test_Saved.wxg wxglade-1.0.1/tests/casefiles/import_test_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/import_test_Saved.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/import_test_Saved.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -38,6 +38,14 @@
                 </menu>
             </menus>
         </object>
+        <object class="wxStatusBar" name="MyStatusBar" base="EditStatusBar">
+            <style>wxST_SIZEGRIP</style>
+            <fields>
+                <field width="-2" />
+                <field width="-1" />
+                <field width="-1" />
+            </fields>
+        </object>
         <object class="wxToolBar" name="MyToolBar" base="EditToolBar">
             <style>wxTB_TEXT</style>
             <tools>
@@ -70,14 +78,6 @@
                 </tool>
             </tools>
         </object>
-        <object class="wxStatusBar" name="MyStatusBar" base="EditStatusBar">
-            <style>wxST_SIZEGRIP</style>
-            <fields>
-                <field width="-2" />
-                <field width="-1" />
-                <field width="-1" />
-            </fields>
-        </object>
         <object class="wxFlexGridSizer" name="object_1" base="EditFlexGridSizer">
             <rows>3</rows>
             <cols>1</cols>
diff -Nru wxglade-0.9.6/tests/casefiles/import_test.xrc wxglade-1.0.1/tests/casefiles/import_test.xrc
--- wxglade-0.9.6/tests/casefiles/import_test.xrc	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/import_test.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -51,7 +51,7 @@
     <size>200,200</size>
     <title>XRC Import test</title>
     <centered>1</centered>
-    <style>wxDEFAULT_FRAME_STYLE|wxCAPTION|wxSYSTEM_MENU|wxRESIZE_BORDER</style>
+    <style>wxDEFAULT_FRAME_STYLE|wxCAPTION|wxSYSTEM_MENU|wxRESIZE_BORDER|wxDOES_NOT_EXIST</style>
     <object class="wxFlexGridSizer">
       <object class="sizeritem">
         <object class="wxStaticLine"/>
diff -Nru wxglade-0.9.6/tests/casefiles/Issue_371.cpp wxglade-1.0.1/tests/casefiles/Issue_371.cpp
--- wxglade-0.9.6/tests/casefiles/Issue_371.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue_371.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,36 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "Issue_371.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+FrameMain::FrameMain(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: FrameMain::FrameMain
+    SetSize(wxSize(985, 852));
+    SetTitle(_("Frame"));
+    wxIcon _icon;
+    _icon.CopyFromBitmap(wxICON(icon));
+    SetIcon(_icon);
+    wxBoxSizer* sizer_top = new wxBoxSizer(wxHORIZONTAL);
+    panel_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC|wxTAB_TRAVERSAL);
+    sizer_top->Add(panel_top, 1, wxEXPAND, 0);
+    
+    SetSizer(sizer_top);
+    Layout();
+    // end wxGlade
+}
+
diff -Nru wxglade-0.9.6/tests/casefiles/Issue_371.h wxglade-1.0.1/tests/casefiles/Issue_371.h
--- wxglade-0.9.6/tests/casefiles/Issue_371.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue_371.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,52 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef ISSUE_371_H
+#define ISSUE_371_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+#include <wx/intl.h>
+
+#ifndef APP_CATALOG
+#define APP_CATALOG "app"  // replace with the appropriate catalog name
+#endif
+
+
+// begin wxGlade: ::dependencies
+// end wxGlade
+
+// begin wxGlade: ::extracode
+#include "bitmapFromMem.h"
+#ifndef ICON_XPM
+#define ICON_XPM
+#include "res/multivnc.xpm"
+#endif
+// end wxGlade
+
+
+class FrameMain: public wxFrame {
+public:
+    // begin wxGlade: FrameMain::ids
+    // end wxGlade
+
+    FrameMain(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: FrameMain::attributes
+    wxPanel* panel_top;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+#endif // ISSUE_371_H
diff -Nru wxglade-0.9.6/tests/casefiles/Issue_371.pl wxglade-1.0.1/tests/casefiles/Issue_371.pl
--- wxglade-0.9.6/tests/casefiles/Issue_371.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue_371.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,64 @@
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+#include "bitmapFromMem.h"
+#ifndef ICON_XPM
+#define ICON_XPM
+#include "res/multivnc.xpm"
+#endif
+# end wxGlade
+
+package FrameMain;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+use Wx::Locale gettext => '_T';
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: FrameMain::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(985, 852));
+    $self->SetTitle(_T("Frame"));
+    my $icon = &Wx::wxNullIcon;
+    $icon->CopyFromBitmap(Wx::ICON(icon));
+    $self->SetIcon($icon);
+    
+    $self->{sizer_top} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{panel_top} = Wx::Panel->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC|wxTAB_TRAVERSAL);
+    $self->{sizer_top}->Add($self->{panel_top}, 1, wxEXPAND, 0);
+    
+    $self->SetSizer($self->{sizer_top});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class FrameMain
+
+1;
+
diff -Nru wxglade-0.9.6/tests/casefiles/Issue_371.py wxglade-1.0.1/tests/casefiles/Issue_371.py
--- wxglade-0.9.6/tests/casefiles/Issue_371.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue_371.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,42 @@
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+import gettext
+# end wxGlade
+
+# begin wxGlade: extracode
+#include "bitmapFromMem.h"
+#ifndef ICON_XPM
+#define ICON_XPM
+#include "res/multivnc.xpm"
+#endif
+# end wxGlade
+
+
+class FrameMain(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: FrameMain.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((985, 852))
+        self.SetTitle(_("Frame"))
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.ICON(icon))
+        self.SetIcon(_icon)
+
+        sizer_top = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.panel_top = wx.Panel(self, wx.ID_ANY, style=wx.BORDER_STATIC | wx.TAB_TRAVERSAL)
+        sizer_top.Add(self.panel_top, 1, wx.EXPAND, 0)
+
+        self.SetSizer(sizer_top)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class FrameMain
diff -Nru wxglade-0.9.6/tests/casefiles/Issue_371.wxg wxglade-1.0.1/tests/casefiles/Issue_371.wxg
--- wxglade-0.9.6/tests/casefiles/Issue_371.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue_371.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
+
+<application encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" option="0" overwrite="1" path="Issue_371.py" source_extension=".cpp" top_window="frame_main" use_gettext="1" use_new_namespace="1">
+    <object class="FrameMain" name="frame_main" base="EditFrame">
+        <extracode>#include "bitmapFromMem.h"\n#ifndef ICON_XPM\n#define ICON_XPM\n#include "res/multivnc.xpm"\n#endif\n</extracode>
+        <size>985, 852</size>
+        <title>Frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <icon>code:wxICON(icon)</icon>
+        <object class="wxBoxSizer" name="sizer_top" base="EditBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="wxPanel" name="panel_top" base="EditPanel">
+                    <style>wxBORDER_STATIC|wxTAB_TRAVERSAL</style>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/Issue_371.xrc wxglade-1.0.1/tests/casefiles/Issue_371.xrc
--- wxglade-0.9.6/tests/casefiles/Issue_371.xrc	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue_371.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- generated by wxGlade -->
+
+<resource version="2.3.0.1">
+    <object class="wxFrame" name="frame_main" subclass="FrameMain">
+        <extracode>#include "bitmapFromMem.h"\n#ifndef ICON_XPM\n#define ICON_XPM\n#include "res/multivnc.xpm"\n#endif\n</extracode>
+        <size>985, 852</size>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <title>Frame</title>
+        <object class="wxBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <flag>wxEXPAND</flag>
+                <object class="wxPanel" name="panel_top">
+                    <style>wxBORDER_STATIC|wxTAB_TRAVERSAL</style>
+                </object>
+            </object>
+        </object>
+    </object>
+</resource>
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_1_Classic.py wxglade-1.0.1/tests/casefiles/Issue385_step_1_Classic.py
--- wxglade-0.9.6/tests/casefiles/Issue385_step_1_Classic.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_1_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 682))
+        self.SetTitle("frame")
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrame
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_1.cpp wxglade-1.0.1/tests/casefiles/Issue385_step_1.cpp
--- wxglade-0.9.6/tests/casefiles/Issue385_step_1.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_1.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,44 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "Issue385_step_1.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: MyFrame::MyFrame
+    SetSize(wxSize(400, 682));
+    SetTitle(wxT("frame"));
+    Layout();
+    // end wxGlade
+}
+
+
+class MyApp: public wxApp {
+public:
+    bool OnInit();
+};
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    wxInitAllImageHandlers();
+    MyFrame* frame = new MyFrame(NULL, wxID_ANY, wxEmptyString);
+    SetTopWindow(frame);
+    frame->Show();
+    return true;
+}
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_1.h wxglade-1.0.1/tests/casefiles/Issue385_step_1.h
--- wxglade-0.9.6/tests/casefiles/Issue385_step_1.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_1.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,40 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef ISSUE385_STEP_1_H
+#define ISSUE385_STEP_1_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+// begin wxGlade: ::dependencies
+// end wxGlade
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+class MyFrame: public wxFrame {
+public:
+    // begin wxGlade: MyFrame::ids
+    // end wxGlade
+
+    MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrame::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+#endif // ISSUE385_STEP_1_H
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_1.lisp wxglade-1.0.1/tests/casefiles/Issue385_step_1.lisp
--- wxglade-0.9.6/tests/casefiles/Issue385_step_1.lisp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_1.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,58 @@
+#!/usr/bin/env lisp
+;;;
+;;; generated by wxGlade
+;;;
+
+(asdf:operate 'asdf:load-op 'wxcl)
+(use-package "FFI")
+(ffi:default-foreign-language :stdc)
+
+
+;;; begin wxGlade: dependencies
+(use-package :wxCL)
+(use-package :wxColour)
+(use-package :wxEvent)
+(use-package :wxEvtHandler)
+(use-package :wxFrame)
+(use-package :wxWindow)
+(use-package :wx_main)
+(use-package :wx_wrapper)
+;;; end wxGlade
+
+;;; begin wxGlade: extracode
+;;; end wxGlade
+
+
+(defclass MyFrame()
+        ((top-window :initform nil :accessor slot-top-window)))
+
+(defun make-MyFrame ()
+        (let ((obj (make-instance 'MyFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyFrame.__init__
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 682))
+        (wxFrame_SetTitle (slot-top-window obj) "frame")
+        (wxFrame_layout (slot-frame self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyFrame
+
+
+(defun init-func (fun data evt)
+        (let ((frame (make-MyFrame)))
+        (ELJApp_SetTopWindow (slot-top-window frame))
+        (wxWindow_Show (slot-top-window frame))))
+;;; end of class MyApp
+
+
+(unwind-protect
+    (Eljapp_initializeC (wxclosure_Create #'init-func nil) 0 nil)
+    (ffi:close-foreign-library "../miscellaneous/wxc-msw2.6.2.dll"))
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_1_Phoenix.py wxglade-1.0.1/tests/casefiles/Issue385_step_1_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/Issue385_step_1_Phoenix.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_1_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 682))
+        self.SetTitle("frame")
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrame
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_1.pl wxglade-1.0.1/tests/casefiles/Issue385_step_1.pl
--- wxglade-0.9.6/tests/casefiles/Issue385_step_1.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_1.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,74 @@
+#!/usr/bin/perl -w -- 
+#
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+package MyFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyFrame::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 682));
+    $self->SetTitle("frame");
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyFrame
+
+1;
+
+package MyApp;
+
+use base qw(Wx::App);
+use strict;
+
+sub OnInit {
+    my( $self ) = shift;
+
+    Wx::InitAllImageHandlers();
+
+    my $frame = MyFrame->new();
+
+    $self->SetTopWindow($frame);
+    $frame->Show(1);
+
+    return 1;
+}
+# end of class MyApp
+
+package main;
+
+unless(caller){
+    my $app = MyApp->new();
+    $app->MainLoop();
+}
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_1.wxg wxglade-1.0.1/tests/casefiles/Issue385_step_1.wxg
--- wxglade-0.9.6/tests/casefiles/Issue385_step_1.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_1.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="Issue385.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>400, 682</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_2_Classic.py wxglade-1.0.1/tests/casefiles/Issue385_step_2_Classic.py
--- wxglade-0.9.6/tests/casefiles/Issue385_step_2_Classic.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_2_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+import wx.grid
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 682))
+        self.SetTitle("frame")
+
+        self.grid_1 = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
+        self.grid_1.CreateGrid(10, 0)
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrame
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_2.cpp wxglade-1.0.1/tests/casefiles/Issue385_step_2.cpp
--- wxglade-0.9.6/tests/casefiles/Issue385_step_2.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_2.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,46 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "Issue385_step_1.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: MyFrame::MyFrame
+    SetSize(wxSize(400, 682));
+    SetTitle(wxT("frame"));
+    grid_1 = new wxGrid(this, wxID_ANY);
+    grid_1->CreateGrid(10, 0);
+    Layout();
+    // end wxGlade
+}
+
+
+class MyApp: public wxApp {
+public:
+    bool OnInit();
+};
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    wxInitAllImageHandlers();
+    MyFrame* frame = new MyFrame(NULL, wxID_ANY, wxEmptyString);
+    SetTopWindow(frame);
+    frame->Show();
+    return true;
+}
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_2.h wxglade-1.0.1/tests/casefiles/Issue385_step_2.h
--- wxglade-0.9.6/tests/casefiles/Issue385_step_2.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_2.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,42 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef ISSUE385_STEP_1_H
+#define ISSUE385_STEP_1_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+// begin wxGlade: ::dependencies
+#include <wx/grid.h>
+// end wxGlade
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+class MyFrame: public wxFrame {
+public:
+    // begin wxGlade: MyFrame::ids
+    // end wxGlade
+
+    MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrame::attributes
+    wxGrid* grid_1;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+#endif // ISSUE385_STEP_1_H
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_2.lisp wxglade-1.0.1/tests/casefiles/Issue385_step_2.lisp
--- wxglade-0.9.6/tests/casefiles/Issue385_step_2.lisp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_2.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,62 @@
+#!/usr/bin/env lisp
+;;;
+;;; generated by wxGlade
+;;;
+
+(asdf:operate 'asdf:load-op 'wxcl)
+(use-package "FFI")
+(ffi:default-foreign-language :stdc)
+
+
+;;; begin wxGlade: dependencies
+(use-package :wxCL)
+(use-package :wxColour)
+(use-package :wxEvent)
+(use-package :wxEvtHandler)
+(use-package :wxFrame)
+(use-package :wxGrid)
+(use-package :wxWindow)
+(use-package :wx_main)
+(use-package :wx_wrapper)
+;;; end wxGlade
+
+;;; begin wxGlade: extracode
+;;; end wxGlade
+
+
+(defclass MyFrame()
+        ((top-window :initform nil :accessor slot-top-window)))
+
+(defun make-MyFrame ()
+        (let ((obj (make-instance 'MyFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyFrame.__init__
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 682))
+        (wxFrame_SetTitle (slot-top-window obj) "frame")
+        
+        (setf (slot-grid-1 obj) (wxGrid_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxWANTS_CHARS))
+        (wxGrid_CreateGrid (slot-grid-1 obj) 10 0 0)
+        (wxFrame_layout (slot-frame self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyFrame
+
+
+(defun init-func (fun data evt)
+        (let ((frame (make-MyFrame)))
+        (ELJApp_SetTopWindow (slot-top-window frame))
+        (wxWindow_Show (slot-top-window frame))))
+;;; end of class MyApp
+
+
+(unwind-protect
+    (Eljapp_initializeC (wxclosure_Create #'init-func nil) 0 nil)
+    (ffi:close-foreign-library "../miscellaneous/wxc-msw2.6.2.dll"))
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_2_Phoenix.py wxglade-1.0.1/tests/casefiles/Issue385_step_2_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/Issue385_step_2_Phoenix.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_2_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+import wx.grid
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 682))
+        self.SetTitle("frame")
+
+        self.grid_1 = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
+        self.grid_1.CreateGrid(10, 0)
+        self.Layout()
+        # end wxGlade
+
+# end of class MyFrame
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_2.pl wxglade-1.0.1/tests/casefiles/Issue385_step_2.pl
--- wxglade-0.9.6/tests/casefiles/Issue385_step_2.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_2.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,77 @@
+#!/usr/bin/perl -w -- 
+#
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+package MyFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyFrame::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 682));
+    $self->SetTitle("frame");
+    
+    $self->{grid_1} = Wx::Grid->new($self, wxID_ANY);
+    $self->{grid_1}->CreateGrid(10, 0);
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyFrame
+
+1;
+
+package MyApp;
+
+use base qw(Wx::App);
+use strict;
+
+sub OnInit {
+    my( $self ) = shift;
+
+    Wx::InitAllImageHandlers();
+
+    my $frame = MyFrame->new();
+
+    $self->SetTopWindow($frame);
+    $frame->Show(1);
+
+    return 1;
+}
+# end of class MyApp
+
+package main;
+
+unless(caller){
+    my $app = MyApp->new();
+    $app->MainLoop();
+}
diff -Nru wxglade-0.9.6/tests/casefiles/Issue385_step_2.wxg wxglade-1.0.1/tests/casefiles/Issue385_step_2.wxg
--- wxglade-0.9.6/tests/casefiles/Issue385_step_2.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Issue385_step_2.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="0" path="Issue385.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>400, 682</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxGrid" name="grid_1" base="EditGrid">
+            <create_grid>1</create_grid>
+            <rows_number>10</rows_number>
+            <enable_editing>1</enable_editing>
+            <enable_grid_lines>1</enable_grid_lines>
+            <enable_col_resize>1</enable_col_resize>
+            <enable_row_resize>1</enable_row_resize>
+            <enable_grid_resize>1</enable_grid_resize>
+            <selection_mode>wxGrid.wxGridSelectCells</selection_mode>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/LispOgg1.lisp wxglade-1.0.1/tests/casefiles/LispOgg1.lisp
--- wxglade-0.9.6/tests/casefiles/LispOgg1.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/LispOgg1.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -69,23 +69,99 @@
         ;;; begin wxGlade: LispOgg1_MyDialog.__init__
         (setf (slot-top-window obj) (wxDialog_create nil wxID_ANY "" -1 -1 -1 -1 (logior wxDEFAULT_DIALOG_STYLE wxRESIZE_BORDER)))
         (slot-top-window obj).wxWindow_SetSize((500, 300))
+        (wxWindow_SetTitle (slot-Mp3-To-Ogg self) (_"mp3 2 ogg"))
+        (wxWindow_SetFocus (slot-top-window obj))
+        
+        (setf (slot-sizer-1 obj) (wxGridSizer_Create 3 1 0 0))
+        
         (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
+        
         (setf (slot-notebook-1-pane-1 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-1 obj) (_"Input File") 1 -1)
+        
+        (setf (slot-grid-sizer-1 obj) (wxGridSizer_Create 1 3 0 0))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"File name:") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-label-1 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
         (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-text-ctrl-1 obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-button-3 obj) (wxButton_Create (slot-notebook-1-pane-1 obj) wxID_OPEN "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-button-3 obj) 0 wxALL 5 nil)
+        
         (setf (slot-notebook-1-pane-2 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-2 obj) (_"Converting Options") 1 -1)
+        
+        (setf (slot-sizer-4 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-radio-box-1 obj) (wxRadioBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Sampling Rate") -1 -1 -1 -1 2 (vector (_"44 kbit") (_"128 kbit")) 0 wxRA_SPECIFY_ROWS))
+        (wxRadioBox_SetSelection (slot-radio-box-1 obj) 0)
+        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-radio-box-1 obj) 0 (logior wxALL wxEXPAND wxSHAPED) 5 nil)
+        
         (setf (slot-notebook-1-pane-3 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-3 obj) (_"Converting Progress") 1 -1)
+        
+        (setf (slot-sizer-3 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-text-ctrl-2 obj) (wxTextCtrl_Create (slot-notebook-1-pane-3 obj) wxID_ANY "" -1 -1 -1 -1 wxTE_MULTILINE))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-text-ctrl-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-pane-4 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-4 obj) (_"Output File") 1 -1)
+        
+        (setf (slot-grid-sizer-2 obj) (wxGridSizer_Create 2 3 0 0))
+        
         (setf (slot-label-2 obj) (wxStaticText_Create (slot-notebook-1-pane-4 obj) wxID_ANY (_"File name:") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-label-2 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
         (setf (slot-text-ctrl-3 obj) (wxTextCtrl_Create (slot-notebook-1-pane-4 obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-text-ctrl-3 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-button-4 obj) (wxButton_Create (slot-notebook-1-pane-4 obj) wxID_OPEN "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-button-4 obj) 0 wxALL 5 nil)
+        
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) ((20, 20) obj) 0 0 0 nil)
+        
         (setf (slot-checkbox-1 obj) (wxCheckBox_Create (slot-notebook-1-pane-4 obj) wxID_ANY (_"Overwrite existing file") -1 -1 -1 -1 0))
+        (wxWindow_SetToolTip (slot-checkbox-1 obj)(_"Overwrite an existing file"))
+        (wxCheckBox_SetValue (slot-checkbox-1 obj) 1)
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-checkbox-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) ((20, 20) obj) 0 0 0 nil)
+        
         (setf (slot-static-line-1 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-static-line-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-2 obj) (wxGridSizer_Create 1 3 0 0))
+        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 0 wxALIGN_RIGHT 0 nil)
+        
         (setf (slot-button-5 obj) (wxButton_Create (slot-top-window obj) wxID_CLOSE "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-5 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
         (setf (slot-button-2 obj) (wxButton_Create (slot-top-window obj) wxID_CANCEL "" -1 -1 -1 -1 wxBU_TOP))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-2 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
         (setf (slot-button-1 obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 wxBU_TOP))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-1 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
+        (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-2 obj) 1)
+        (wxWindow_SetSizer (slot-notebook-1-pane-4 obj) (slot-grid-sizer-2 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-pane-3 obj) (slot-sizer-3 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-pane-2 obj) (slot-sizer-4 obj))
+        
+        (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-1 obj) 1)
+        (wxWindow_SetSizer (slot-notebook-1-pane-1 obj) (slot-grid-sizer-1 obj))
+        
+        (wxFlexGridSizer_AddGrowableRow (slot-sizer-1 obj) 0)
+        (wxFlexGridSizer_AddGrowableCol (slot-sizer-1 obj) 0)
+        (wxWindow_SetSizer (slot-frame obj) (slot-sizer-1 obj))
+        
+        (wxWindow_layout (slot-Mp3-To-Ogg self))
+        (wxWindow_Centre (slot-Mp3-To-Ogg self) wxBOTH)
 
         (wxEvtHandler_Connect (slot-top-window obj) obj.button-1 (expwxEVT_BUTTON)
         (wxClosure_Create #'startConverting obj))
@@ -93,58 +169,9 @@
         )
 
 (defmethod set-properties ((obj LispOgg1_MyDialog))
-        ;;; begin wxGlade: LispOgg1_MyDialog.__set_properties
-        (wxWindow_SetTitle (slot-Mp3-To-Ogg self) (_"mp3 2 ogg"))
-        (slot-top-window obj).wxWindow_SetSize((500, 300))
-        (wxWindow_SetFocus (slot-top-window obj))
-        (wxRadioBox_SetSelection (slot-radio-box-1 obj) 0)
-        (wxWindow_SetToolTip (slot-checkbox-1 obj)(_"Overwrite an existing file"))
-        (wxCheckBox_SetValue (slot-checkbox-1 obj) 1)
-        ;;; end wxGlade
         )
 
 (defmethod do-layout ((obj LispOgg1_MyDialog))
-        ;;; begin wxGlade: LispOgg1_MyDialog.__do_layout
-        (setf (slot-sizer-1 obj) (wxGridSizer_Create 3 1 0 0))
-        (setf (slot-sizer-2 obj) (wxGridSizer_Create 1 3 0 0))
-        (setf (slot-grid-sizer-2 obj) (wxGridSizer_Create 2 3 0 0))
-        (setf (slot-sizer-3 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-4 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-grid-sizer-1 obj) (wxGridSizer_Create 1 3 0 0))
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"File name:") -1 -1 -1 -1 0))
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-label-1 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-text-ctrl-1 obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-button-3 obj) 0 wxALL 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-1 obj) (slot-grid-sizer-1 obj))
-        (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-1 obj) 1)
-        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-radio-box-1 obj) 0 (logior wxALL wxEXPAND wxSHAPED) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-2 obj) (slot-sizer-4 obj))
-        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-text-ctrl-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-3 obj) (slot-sizer-3 obj))
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-label-2 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-text-ctrl-3 obj) 0 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-button-4 obj) 0 wxALL 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) ((20, 20) obj) 0 0 0 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-checkbox-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) ((20, 20) obj) 0 0 0 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-4 obj) (slot-grid-sizer-2 obj))
-        (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-2 obj) 1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-1 obj) (_"Input File") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-2 obj) (_"Converting Options") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-3 obj) (_"Converting Progress") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-4 obj) (_"Output File") 1 -1)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-static-line-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-5 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-2 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-1 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
-        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 0 wxALIGN_RIGHT 0 nil)
-        (wxWindow_SetSizer (slot-frame obj) (slot-sizer-1 obj))
-        (wxFlexGridSizer_AddGrowableRow (slot-sizer-1 obj) 0)
-        (wxFlexGridSizer_AddGrowableCol (slot-sizer-1 obj) 0)
-        (wxWindow_layout (slot-Mp3-To-Ogg self))
-        (wxWindow_Centre (slot-Mp3-To-Ogg self) wxBOTH)
-        ;;; end wxGlade
         )
 
 (defun startConverting (function data event) ;;;wxGlade: LispOgg1_MyDialog.<event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/LispOgg2_MyDialog.lisp wxglade-1.0.1/tests/casefiles/LispOgg2_MyDialog.lisp
--- wxglade-0.9.6/tests/casefiles/LispOgg2_MyDialog.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/LispOgg2_MyDialog.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -70,23 +70,98 @@
         ;;; begin wxGlade: LispOgg2_MyDialog.__init__
         (setf (slot-top-window obj) (wxDialog_create nil wxID_ANY "" -1 -1 -1 -1 (logior wxDEFAULT_DIALOG_STYLE wxRESIZE_BORDER)))
         (slot-top-window obj).wxWindow_SetSize((500, 300))
+        (wxWindow_SetTitle (slot-Mp3-To-Ogg self) (_"mp3 2 ogg"))
+        
+        (setf (slot-sizer-1 obj) (wxGridSizer_Create 3 1 0 0))
+        
         (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
+        
         (setf (slot-notebook-1-pane-1 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-1 obj) (_"Input File") 1 -1)
+        
+        (setf (slot-grid-sizer-1 obj) (wxGridSizer_Create 1 3 0 0))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"File name:") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-label-1 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
         (setf (slot-text-ctrl-1 obj) (wxTextCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-text-ctrl-1 obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-button-3 obj) (wxButton_Create (slot-notebook-1-pane-1 obj) wxID_OPEN "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-button-3 obj) 0 wxALL 5 nil)
+        
         (setf (slot-notebook-1-pane-2 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-2 obj) (_"Converting Options") 1 -1)
+        
+        (setf (slot-sizer-4 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-radio-box-1 obj) (wxRadioBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Sampling Rate") -1 -1 -1 -1 2 (vector (_"44 kbit") (_"128 kbit")) 0 wxRA_SPECIFY_ROWS))
+        (wxRadioBox_SetSelection (slot-radio-box-1 obj) 0)
+        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-radio-box-1 obj) 0 (logior wxALL wxEXPAND wxSHAPED) 5 nil)
+        
         (setf (slot-notebook-1-pane-3 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-3 obj) (_"Converting Progress") 1 -1)
+        
+        (setf (slot-sizer-3 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-text-ctrl-2 obj) (wxTextCtrl_Create (slot-notebook-1-pane-3 obj) wxID_ANY "" -1 -1 -1 -1 wxTE_MULTILINE))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-text-ctrl-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-notebook-1-pane-4 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-4 obj) (_"Output File") 1 -1)
+        
+        (setf (slot-grid-sizer-2 obj) (wxGridSizer_Create 2 3 0 0))
+        
         (setf (slot-label-2 obj) (wxStaticText_Create (slot-notebook-1-pane-4 obj) wxID_ANY (_"File name:") -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-label-2 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
         (setf (slot-text-ctrl-3 obj) (wxTextCtrl_Create (slot-notebook-1-pane-4 obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-text-ctrl-3 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
         (setf (slot-button-4 obj) (wxButton_Create (slot-notebook-1-pane-4 obj) wxID_OPEN "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-button-4 obj) 0 wxALL 5 nil)
+        
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) ((20, 20) obj) 0 0 0 nil)
+        
         (setf (slot-checkbox-1 obj) (wxCheckBox_Create (slot-notebook-1-pane-4 obj) wxID_ANY (_"Overwrite existing file") -1 -1 -1 -1 0))
+        (wxWindow_SetToolTip (slot-checkbox-1 obj)(_"Overwrite an existing file"))
+        (wxCheckBox_SetValue (slot-checkbox-1 obj) 1)
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-checkbox-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (wxSizer_AddWindow (slot-grid-sizer-2 obj) ((20, 20) obj) 0 0 0 nil)
+        
         (setf (slot-static-line-1 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-static-line-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-2 obj) (wxGridSizer_Create 1 3 0 0))
+        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 0 wxALIGN_RIGHT 0 nil)
+        
         (setf (slot-button-5 obj) (wxButton_Create (slot-top-window obj) wxID_CLOSE "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-5 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
         (setf (slot-button-2 obj) (wxButton_Create (slot-top-window obj) wxID_CANCEL "" -1 -1 -1 -1 wxBU_TOP))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-2 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
         (setf (slot-button-1 obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 wxBU_TOP))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-1 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
+        (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-2 obj) 1)
+        (wxWindow_SetSizer (slot-notebook-1-pane-4 obj) (slot-grid-sizer-2 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-pane-3 obj) (slot-sizer-3 obj))
+        
+        (wxWindow_SetSizer (slot-notebook-1-pane-2 obj) (slot-sizer-4 obj))
+        
+        (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-1 obj) 1)
+        (wxWindow_SetSizer (slot-notebook-1-pane-1 obj) (slot-grid-sizer-1 obj))
+        
+        (wxFlexGridSizer_AddGrowableRow (slot-sizer-1 obj) 0)
+        (wxFlexGridSizer_AddGrowableCol (slot-sizer-1 obj) 0)
+        (wxWindow_SetSizer (slot-frame obj) (slot-sizer-1 obj))
+        
+        (wxWindow_layout (slot-Mp3-To-Ogg self))
+        (wxWindow_Centre (slot-Mp3-To-Ogg self) wxBOTH)
 
         (wxEvtHandler_Connect (slot-top-window obj) obj.button-1 (expwxEVT_BUTTON)
         (wxClosure_Create #'startConverting obj))
@@ -94,57 +169,9 @@
         )
 
 (defmethod set-properties ((obj LispOgg2_MyDialog))
-        ;;; begin wxGlade: LispOgg2_MyDialog.__set_properties
-        (wxWindow_SetTitle (slot-Mp3-To-Ogg self) (_"mp3 2 ogg"))
-        (slot-top-window obj).wxWindow_SetSize((500, 300))
-        (wxRadioBox_SetSelection (slot-radio-box-1 obj) 0)
-        (wxWindow_SetToolTip (slot-checkbox-1 obj)(_"Overwrite an existing file"))
-        (wxCheckBox_SetValue (slot-checkbox-1 obj) 1)
-        ;;; end wxGlade
         )
 
 (defmethod do-layout ((obj LispOgg2_MyDialog))
-        ;;; begin wxGlade: LispOgg2_MyDialog.__do_layout
-        (setf (slot-sizer-1 obj) (wxGridSizer_Create 3 1 0 0))
-        (setf (slot-sizer-2 obj) (wxGridSizer_Create 1 3 0 0))
-        (setf (slot-grid-sizer-2 obj) (wxGridSizer_Create 2 3 0 0))
-        (setf (slot-sizer-3 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-4 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-grid-sizer-1 obj) (wxGridSizer_Create 1 3 0 0))
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"File name:") -1 -1 -1 -1 0))
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-label-1 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-text-ctrl-1 obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-button-3 obj) 0 wxALL 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-1 obj) (slot-grid-sizer-1 obj))
-        (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-1 obj) 1)
-        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-radio-box-1 obj) 0 (logior wxALL wxEXPAND wxSHAPED) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-2 obj) (slot-sizer-4 obj))
-        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-text-ctrl-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-3 obj) (slot-sizer-3 obj))
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-label-2 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-text-ctrl-3 obj) 0 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-button-4 obj) 0 wxALL 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) ((20, 20) obj) 0 0 0 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) (slot-checkbox-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-2 obj) ((20, 20) obj) 0 0 0 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-4 obj) (slot-grid-sizer-2 obj))
-        (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-2 obj) 1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-1 obj) (_"Input File") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-2 obj) (_"Converting Options") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-3 obj) (_"Converting Progress") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-4 obj) (_"Output File") 1 -1)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-static-line-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-5 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-2 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-button-1 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
-        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 0 wxALIGN_RIGHT 0 nil)
-        (wxWindow_SetSizer (slot-frame obj) (slot-sizer-1 obj))
-        (wxFlexGridSizer_AddGrowableRow (slot-sizer-1 obj) 0)
-        (wxFlexGridSizer_AddGrowableCol (slot-sizer-1 obj) 0)
-        (wxWindow_layout (slot-Mp3-To-Ogg self))
-        (wxWindow_Centre (slot-Mp3-To-Ogg self) wxBOTH)
-        ;;; end wxGlade
         )
 
 (defun startConverting (function data event) ;;; wxGlade: LispOgg2_MyDialog.<event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/LispOgg2_MyFrame.lisp wxglade-1.0.1/tests/casefiles/LispOgg2_MyFrame.lisp
--- wxglade-0.9.6/tests/casefiles/LispOgg2_MyFrame.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/LispOgg2_MyFrame.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -76,36 +76,40 @@
         ;;; begin wxGlade: LispOgg2_MyFrame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
         (slot-top-window obj).wxWindow_SetSize((400, 300))
-        (setf (slot-grid-1 obj) (wxGrid_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxWANTS_CHARS))
-        (setf (slot-static-line-2 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
-        (setf (slot-button-6 obj) (wxButton_Create (slot-top-window obj) wxID_CLOSE "" -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj LispOgg2_MyFrame))
-        ;;; begin wxGlade: LispOgg2_MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"FrameOggCompressionDetails"))
-        (wxGrid_CreateGrid (slot-grid-1 obj) 8 3 0)
-        (wxWindow_SetFocus (slot-button-6 obj))
-        (wxButton_SetDefault (slot-button-6 obj))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj LispOgg2_MyFrame))
-        ;;; begin wxGlade: LispOgg2_MyFrame.__do_layout
+        
         (setf (slot-sizer-5 obj) (wxBoxSizer_Create wxVERTICAL))
+        
         (setf (slot-grid-sizer-3 obj) (wxGridSizer_Create 3 1 0 0))
+        (wxSizer_AddSizer (slot-sizer-5 obj) (slot-grid-sizer-3 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-grid-1 obj) (wxGrid_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxWANTS_CHARS))
+        (wxGrid_CreateGrid (slot-grid-1 obj) 8 3 0)
         (wxSizer_AddWindow (slot-grid-sizer-3 obj) (slot-grid-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-static-line-2 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
         (wxSizer_AddWindow (slot-grid-sizer-3 obj) (slot-static-line-2 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-button-6 obj) (wxButton_Create (slot-top-window obj) wxID_CLOSE "" -1 -1 -1 -1 0))
+        (wxWindow_SetFocus (slot-button-6 obj))
+        (wxButton_SetDefault (slot-button-6 obj))
         (wxSizer_AddWindow (slot-grid-sizer-3 obj) (slot-button-6 obj) 0 (logior wxALIGN_RIGHT wxALL) 5 nil)
+        
         (wxFlexGridSizer_AddGrowableRow (slot-grid-sizer-3 obj) 0)
         (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-3 obj) 0)
-        (wxSizer_AddSizer (slot-sizer-5 obj) (slot-grid-sizer-3 obj) 1 wxEXPAND 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-5 obj))
+        
         (wxFrame_layout (slot-FrameOggCompressionDetails self))
         ;;; end wxGlade
         )
 
+(defmethod set-properties ((obj LispOgg2_MyFrame))
+        )
+
+(defmethod do-layout ((obj LispOgg2_MyFrame))
+        )
+
 ;;; end of class LispOgg2_MyFrame
 
 
diff -Nru wxglade-0.9.6/tests/casefiles/Lisp_Preferences.lisp wxglade-1.0.1/tests/casefiles/Lisp_Preferences.lisp
--- wxglade-0.9.6/tests/casefiles/Lisp_Preferences.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Lisp_Preferences.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,4 @@
-#!/usr/bin/env lisp
-;;;
-;;; generated by wxGlade "faked test version"
+;;; generated by wxGlade 0.9.9pre on Sun Feb 23 18:31:05 2020
 ;;;
 
 (asdf:operate 'asdf:load-op 'wxcl)
@@ -35,12 +33,17 @@
 
 (defclass wxGladePreferencesUI()
         ((top-window :initform nil :accessor slot-top-window)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (notebook-1 :initform nil :accessor slot-notebook-1)
+        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (sizer-3 :initform nil :accessor slot-sizer-3)
         (use-menu-icons :initform nil :accessor slot-use-menu-icons)
         (frame-tool-win :initform nil :accessor slot-frame-tool-win)
         (show-progress :initform nil :accessor slot-show-progress)
         (remember-geometry :initform nil :accessor slot-remember-geometry)
         (show-sizer-handle :initform nil :accessor slot-show-sizer-handle)
         (use-kde-dialogs :initform nil :accessor slot-use-kde-dialogs)
+        (sizer-4 :initform nil :accessor slot-sizer-4)
         (label-1 :initform nil :accessor slot-label-1)
         (open-save-path :initform nil :accessor slot-open-save-path)
         (label-2-copy :initform nil :accessor slot-label-2-copy)
@@ -49,33 +52,28 @@
         (number-history :initform nil :accessor slot-number-history)
         (label-2-copy-1 :initform nil :accessor slot-label-2-copy-1)
         (buttons-per-row :initform nil :accessor slot-buttons-per-row)
-        (sizer-4 :initform nil :accessor slot-sizer-4)
-        (sizer-3 :initform nil :accessor slot-sizer-3)
-        (notebook-1-pane-1 :initform nil :accessor slot-notebook-1-pane-1)
+        (notebook-1-pane-2 :initform nil :accessor slot-notebook-1-pane-2)
+        (sizer-5 :initform nil :accessor slot-sizer-5)
         (use-dialog-units :initform nil :accessor slot-use-dialog-units)
         (wxg-backup :initform nil :accessor slot-wxg-backup)
         (codegen-backup :initform nil :accessor slot-codegen-backup)
         (allow-duplicate-names :initform nil :accessor slot-allow-duplicate-names)
+        (sizer-7 :initform nil :accessor slot-sizer-7)
         (default-border :initform nil :accessor slot-default-border)
         (default-border-size :initform nil :accessor slot-default-border-size)
-        (sizer-7 :initform nil :accessor slot-sizer-7)
+        (sizer-7-copy :initform nil :accessor slot-sizer-7-copy)
         (autosave :initform nil :accessor slot-autosave)
         (autosave-delay :initform nil :accessor slot-autosave-delay)
         (label-3 :initform nil :accessor slot-label-3)
-        (sizer-7-copy :initform nil :accessor slot-sizer-7-copy)
         (write-timestamp :initform nil :accessor slot-write-timestamp)
         (write-generated-from :initform nil :accessor slot-write-generated-from)
         (backup-suffix :initform nil :accessor slot-backup-suffix)
+        (sizer-6 :initform nil :accessor slot-sizer-6)
         (local-widget-path :initform nil :accessor slot-local-widget-path)
         (choose-widget-path :initform nil :accessor slot-choose-widget-path)
-        (sizer-6 :initform nil :accessor slot-sizer-6)
-        (sizer-5 :initform nil :accessor slot-sizer-5)
-        (notebook-1-pane-2 :initform nil :accessor slot-notebook-1-pane-2)
-        (notebook-1 :initform nil :accessor slot-notebook-1)
-        (ok :initform nil :accessor slot-ok)
-        (cancel :initform nil :accessor slot-cancel)
         (sizer-2 :initform nil :accessor slot-sizer-2)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (ok :initform nil :accessor slot-ok)
+        (cancel :initform nil :accessor slot-cancel)))
 
 (defun make-wxGladePreferencesUI ()
         (let ((obj (make-instance 'wxGladePreferencesUI)))
@@ -88,120 +86,156 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: wxGladePreferencesUI.__init__
         (setf (slot-top-window obj) (wxDialog_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_DIALOG_STYLE))
-        (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxNB_TOP))
-        (setf (slot-notebook-1-pane-1 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        (setf (slot-use-menu-icons obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Use icons in menu items") -1 -1 -1 -1 0))
-        (setf (slot-frame-tool-win obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Show properties and tree windows as small frames") -1 -1 -1 -1 0))
-        (setf (slot-show-progress obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Show progress dialog when loading wxg files") -1 -1 -1 -1 0))
-        (setf (slot-remember-geometry obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Remember position and size of wxGlade windows") -1 -1 -1 -1 0))
-        (setf (slot-show-sizer-handle obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Show \"handles\" of sizers") -1 -1 -1 -1 0))
-        (setf (slot-use-kde-dialogs obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Use native file dialogs on KDE") -1 -1 -1 -1 0))
-        (setf (slot-open-save-path obj) (wxTextCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY "" -1 -1 -1 -1 0))
-        (setf (slot-codegen-path obj) (wxTextCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY "" -1 -1 -1 -1 0))
-        (setf (slot-number-history obj) (wxSpinCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY 4 -1 -1 -1 -1 wxSP_ARROW_KEYS 0 100 4))
-        (setf (slot-buttons-per-row obj) (wxSpinCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY 5 -1 -1 -1 -1 wxSP_ARROW_KEYS 1 100 5))
-        (setf (slot-notebook-1-pane-2 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
-        (setf (slot-use-dialog-units obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Use dialog units by default for size properties") -1 -1 -1 -1 0))
-        (setf (slot-wxg-backup obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Create backup wxg files") -1 -1 -1 -1 0))
-        (setf (slot-codegen-backup obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Create backup files for generated source") -1 -1 -1 -1 0))
-        (setf (slot-allow-duplicate-names obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Allow duplicate widget names") -1 -1 -1 -1 0))
-        (setf (slot-default-border obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Default border width for widgets") -1 -1 -1 -1 0))
-        (setf (slot-default-border-size obj) (wxSpinCtrl_Create (slot-notebook-1-pane-2 obj) wxID_ANY  -1 -1 -1 -1 wxSP_ARROW_KEYS 0 20 ))
-        (setf (slot-autosave obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Auto save wxg files every ") -1 -1 -1 -1 0))
-        (setf (slot-autosave-delay obj) (wxSpinCtrl_Create (slot-notebook-1-pane-2 obj) wxID_ANY 120 -1 -1 -1 -1 wxSP_ARROW_KEYS 30 300 120))
-        (setf (slot-write-timestamp obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Insert timestamp on generated source files") -1 -1 -1 -1 0))
-        (setf (slot-write-generated-from obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Insert .wxg file name on generated source files") -1 -1 -1 -1 0))
-        (setf (slot-backup-suffix obj) (wxRadioBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Backup options") -1 -1 -1 -1 2 (vector (_"append ~ to filename") (_"append .bak to filename")) 2 wxRA_SPECIFY_COLS))
-        (setf (slot-local-widget-path obj) (wxTextCtrl_Create (slot-notebook-1-pane-2 obj) wxID_ANY "" -1 -1 -1 -1 0))
-        (setf (slot-choose-widget-path obj) (wxButton_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"...") -1 -1 -1 -1 wxBU_EXACTFIT))
-        (setf (slot-ok obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 0))
-        (setf (slot-cancel obj) (wxButton_Create (slot-top-window obj) wxID_CANCEL "" -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj wxGladePreferencesUI))
-        ;;; begin wxGlade: wxGladePreferencesUI.__set_properties
         (wxWindow_SetTitle (slot-dialog-1 self) (_"wxGlade: preferences"))
         ;;; generating code for setting icons is not implemented
-        (wxCheckBox_SetValue (slot-use-menu-icons obj) 1)
-        (wxCheckBox_SetValue (slot-frame-tool-win obj) 1)
-        (wxCheckBox_SetValue (slot-show-progress obj) 1)
-        (wxCheckBox_SetValue (slot-remember-geometry obj) 1)
-        (wxCheckBox_SetValue (slot-show-sizer-handle obj) 1)
-        (wxCheckBox_SetValue (slot-use-kde-dialogs obj) 1)
-        (slot-open-save-path obj).SetMinSize((196, -1))
-        (slot-codegen-path obj).SetMinSize((196, -1))
-        (slot-number-history obj).SetMinSize((196, -1))
-        (slot-buttons-per-row obj).SetMinSize((196, -1))
-        (wxCheckBox_SetValue (slot-wxg-backup obj) 1)
-        (wxCheckBox_SetValue (slot-codegen-backup obj) 1)
-        (wxWindow_Hide (slot-allow-duplicate-names obj))
-        (slot-default-border-size obj).SetMinSize((45, 22))
-        (slot-autosave-delay obj).SetMinSize((45, 22))
-        (wxCheckBox_SetValue (slot-write-timestamp obj) 1)
-        (wxRadioBox_SetSelection (slot-backup-suffix obj) 0)
-        (wxButton_SetDefault (slot-ok obj))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj wxGladePreferencesUI))
-        ;;; begin wxGlade: wxGladePreferencesUI.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
-        (setf (slot-sizer-2 obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-5 obj) (wxBoxSizer_Create wxVERTICAL))
-        (setf (slot-sizer-6 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-notebook-1-pane-2 obj) (_"Local widget path")) wxHORIZONTAL))
-        (setf (slot-sizer-7-copy obj) (wxBoxSizer_Create wxHORIZONTAL))
-        (setf (slot-sizer-7 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
+        (setf (slot-notebook-1 obj) (wxNotebook_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-notebook-1-pane-1 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-1 obj) (_"Interface") 1 -1)
+        
         (setf (slot-sizer-3 obj) (wxBoxSizer_Create wxVERTICAL))
-        (setf (slot-sizer-4 obj) (wxGridSizer_Create 4 2 0 0))
+        
+        (setf (slot-use-menu-icons obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Use icons in menu items") -1 -1 -1 -1 0))
+        (wxCheckBox_SetValue (slot-use-menu-icons obj) 1)
         (wxSizer_AddWindow (slot-sizer-3 obj) (slot-use-menu-icons obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-frame-tool-win obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Show properties and tree windows as small frames") -1 -1 -1 -1 0))
+        (wxCheckBox_SetValue (slot-frame-tool-win obj) 1)
         (wxSizer_AddWindow (slot-sizer-3 obj) (slot-frame-tool-win obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-show-progress obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Show progress dialog when loading wxg files") -1 -1 -1 -1 0))
+        (wxCheckBox_SetValue (slot-show-progress obj) 1)
         (wxSizer_AddWindow (slot-sizer-3 obj) (slot-show-progress obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-remember-geometry obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Remember position and size of wxGlade windows") -1 -1 -1 -1 0))
+        (wxCheckBox_SetValue (slot-remember-geometry obj) 1)
         (wxSizer_AddWindow (slot-sizer-3 obj) (slot-remember-geometry obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-show-sizer-handle obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Show \"handles\" of sizers") -1 -1 -1 -1 0))
+        (wxCheckBox_SetValue (slot-show-sizer-handle obj) 1)
         (wxSizer_AddWindow (slot-sizer-3 obj) (slot-show-sizer-handle obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-use-kde-dialogs obj) (wxCheckBox_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Use native file dialogs on KDE") -1 -1 -1 -1 0))
+        (wxCheckBox_SetValue (slot-use-kde-dialogs obj) 1)
         (wxSizer_AddWindow (slot-sizer-3 obj) (slot-use-kde-dialogs obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-4 obj) (wxGridSizer_Create 4 2 0 0))
+        (wxSizer_AddSizer (slot-sizer-3 obj) (slot-sizer-4 obj) 0 wxEXPAND 3 nil)
+        
         (setf (slot-label-1 obj) (wxStaticText_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Initial path for \nfile opening/saving dialogs:") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-label-1 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
+        (setf (slot-open-save-path obj) (wxTextCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (slot-open-save-path obj).SetMinSize((196, -1))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-open-save-path obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
         (setf (slot-label-2-copy obj) (wxStaticText_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Initial path for \ncode generation file dialogs:") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-label-2-copy obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
+        (setf (slot-codegen-path obj) (wxTextCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY "" -1 -1 -1 -1 0))
+        (slot-codegen-path obj).SetMinSize((196, -1))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-codegen-path obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
         (setf (slot-label-2 obj) (wxStaticText_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Number of items in file history") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-label-2 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
+        (setf (slot-number-history obj) (wxSpinCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY 4 -1 -1 -1 -1 0 0 100 4))
+        (slot-number-history obj).SetMinSize((196, -1))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-number-history obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
         (setf (slot-label-2-copy-1 obj) (wxStaticText_Create (slot-notebook-1-pane-1 obj) wxID_ANY (_"Number of buttons per row\nin the main palette") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-label-2-copy-1 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
+        (setf (slot-buttons-per-row obj) (wxSpinCtrl_Create (slot-notebook-1-pane-1 obj) wxID_ANY 5 -1 -1 -1 -1 0 1 100 5))
+        (slot-buttons-per-row obj).SetMinSize((196, -1))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-buttons-per-row obj) 1 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
-        (wxFlexGridSizer_AddGrowableCol (slot-sizer-4 obj) 1)
-        (wxSizer_AddSizer (slot-sizer-3 obj) (slot-sizer-4 obj) 0 wxEXPAND 3 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-1 obj) (slot-sizer-3 obj))
+        
+        (setf (slot-notebook-1-pane-2 obj) (wxPanel_Create (slot-notebook-1 obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-2 obj) (_"Other") 1 -1)
+        
+        (setf (slot-sizer-5 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-use-dialog-units obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Use dialog units by default for size properties") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-5 obj) (slot-use-dialog-units obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-wxg-backup obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Create backup wxg files") -1 -1 -1 -1 0))
+        (wxCheckBox_SetValue (slot-wxg-backup obj) 1)
         (wxSizer_AddWindow (slot-sizer-5 obj) (slot-wxg-backup obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-codegen-backup obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Create backup files for generated source") -1 -1 -1 -1 0))
+        (wxCheckBox_SetValue (slot-codegen-backup obj) 1)
         (wxSizer_AddWindow (slot-sizer-5 obj) (slot-codegen-backup obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-allow-duplicate-names obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Allow duplicate widget names") -1 -1 -1 -1 0))
+        (wxWindow_Hide (slot-allow-duplicate-names obj))
         (wxSizer_AddWindow (slot-sizer-5 obj) (slot-allow-duplicate-names obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-7 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-sizer-5 obj) (slot-sizer-7 obj) 0 wxEXPAND 0 nil)
+        
+        (setf (slot-default-border obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Default border width for widgets") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-7 obj) (slot-default-border obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
+        (setf (slot-default-border-size obj) (wxSpinCtrl_Create (slot-notebook-1-pane-2 obj) wxID_ANY  -1 -1 -1 -1 0 0 20 ))
+        (slot-default-border-size obj).SetMinSize((45, 22))
         (wxSizer_AddWindow (slot-sizer-7 obj) (slot-default-border-size obj) 0 wxALL 5 nil)
-        (wxSizer_AddSizer (slot-sizer-5 obj) (slot-sizer-7 obj) 0 wxEXPAND 0 nil)
+        
+        (setf (slot-sizer-7-copy obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-sizer-5 obj) (slot-sizer-7-copy obj) 0 wxEXPAND 0 nil)
+        
+        (setf (slot-autosave obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Auto save wxg files every ") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-7-copy obj) (slot-autosave obj) 0 (logior wxALIGN_CENTER_VERTICAL wxBOTTOM wxLEFT wxTOP) 5 nil)
+        
+        (setf (slot-autosave-delay obj) (wxSpinCtrl_Create (slot-notebook-1-pane-2 obj) wxID_ANY 120 -1 -1 -1 -1 0 30 300 120))
+        (slot-autosave-delay obj).SetMinSize((45, 22))
         (wxSizer_AddWindow (slot-sizer-7-copy obj) (slot-autosave-delay obj) 0 (logior wxBOTTOM wxTOP) 5 nil)
+        
         (setf (slot-label-3 obj) (wxStaticText_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_" seconds") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-7-copy obj) (slot-label-3 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxBOTTOM wxFIXED_MINSIZE wxTOP) 5 nil)
-        (wxSizer_AddSizer (slot-sizer-5 obj) (slot-sizer-7-copy obj) 0 wxEXPAND 0 nil)
+        
+        (setf (slot-write-timestamp obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Insert timestamp on generated source files") -1 -1 -1 -1 0))
+        (wxCheckBox_SetValue (slot-write-timestamp obj) 1)
         (wxSizer_AddWindow (slot-sizer-5 obj) (slot-write-timestamp obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-write-generated-from obj) (wxCheckBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Insert .wxg file name on generated source files") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-5 obj) (slot-write-generated-from obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-backup-suffix obj) (wxRadioBox_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"Backup options") -1 -1 -1 -1 2 (vector (_"append ~ to filename") (_"append .bak to filename")) 2 wxRA_SPECIFY_COLS))
+        (wxRadioBox_SetSelection (slot-backup-suffix obj) 0)
         (wxSizer_AddWindow (slot-sizer-5 obj) (slot-backup-suffix obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-6 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-notebook-1-pane-2 obj) (_"Local widget path")) wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-sizer-5 obj) (slot-sizer-6 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-local-widget-path obj) (wxTextCtrl_Create (slot-notebook-1-pane-2 obj) wxID_ANY "" -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-6 obj) (slot-local-widget-path obj) 1 wxALL 3 nil)
+        
+        (setf (slot-choose-widget-path obj) (wxButton_Create (slot-notebook-1-pane-2 obj) wxID_ANY (_"...") -1 -1 -1 -1 wxBU_EXACTFIT))
         (wxSizer_AddWindow (slot-sizer-6 obj) (slot-choose-widget-path obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 3 nil)
-        (wxSizer_AddSizer (slot-sizer-5 obj) (slot-sizer-6 obj) 0 (logior wxALL wxEXPAND) 5 nil)
-        (wxWindow_SetSizer (slot-notebook-1-pane-2 obj) (slot-sizer-5 obj))
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-1 obj) (_"Interface") 1 -1)
-        (wxNotebook_AddPage (slot-notebook-1 obj) (slot-notebook-1-pane-2 obj) (_"Other") 1 -1)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-notebook-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-2 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 0 (logior wxALIGN_RIGHT wxALL) 10 nil)
+        
+        (setf (slot-ok obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 0))
+        (wxButton_SetDefault (slot-ok obj))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-ok obj) 0 0 0 nil)
+        
+        (setf (slot-cancel obj) (wxButton_Create (slot-top-window obj) wxID_CANCEL "" -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-2 obj) (slot-cancel obj) 0 wxLEFT 10 nil)
-        (wxSizer_AddSizer (slot-sizer-1 obj) (slot-sizer-2 obj) 0 (logior wxALIGN_RIGHT wxALL) 10 nil)
+        
+        (wxWindow_SetSizer (slot-notebook-1-pane-2 obj) (slot-sizer-5 obj))
+        
+        (wxFlexGridSizer_AddGrowableCol (slot-sizer-4 obj) 1)
+        
+        (wxWindow_SetSizer (slot-notebook-1-pane-1 obj) (slot-sizer-3 obj))
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxWindow_layout (slot-dialog-1 self))
         (wxWindow_Centre (slot-dialog-1 self) wxBOTH)
         ;;; end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/Lisp_Preferences.wxg wxglade-1.0.1/tests/casefiles/Lisp_Preferences.wxg
--- wxglade-0.9.6/tests/casefiles/Lisp_Preferences.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Lisp_Preferences.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -7,6 +7,8 @@
         <style>wxDEFAULT_DIALOG_STYLE</style>
         <icon>var:_icon_path</icon>
         <title>wxGlade: preferences</title>
+        <affirmative>ok</affirmative>
+        <escape>cancel</escape>
         <centered>1</centered>
         <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
             <orient>wxVERTICAL</orient>
diff -Nru wxglade-0.9.6/tests/casefiles/Lisp_wxBitmapButton.lisp wxglade-1.0.1/tests/casefiles/Lisp_wxBitmapButton.lisp
--- wxglade-0.9.6/tests/casefiles/Lisp_wxBitmapButton.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Lisp_wxBitmapButton.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -25,8 +25,8 @@
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (bitmap-button-1 :initform nil :accessor slot-bitmap-button-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (bitmap-button-1 :initform nil :accessor slot-bitmap-button-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -39,23 +39,17 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
-        (setf (slot-bitmap-button-1 obj) (wxBitmapButton_Create (slot-top-window obj) wxID_ANY (wxBitmap_CreateLoad "icons/wxglade_small.png" wxBITMAP_TYPE_ANY) -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) "frame_1")
-        (slot-bitmap-button-1 obj).wxWindow_SetSize((slot-bitmap-button-1 obj).wxWindow_GetBestSize())
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-bitmap-button-1 obj) (wxBitmapButton_Create (slot-top-window obj) wxID_ANY (wxBitmap_CreateLoad "icons/wxglade_small.png" wxBITMAP_TYPE_ANY) -1 -1 -1 -1 0))
+        (slot-bitmap-button-1 obj).wxWindow_SetSize((slot-bitmap-button-1 obj).wxWindow_GetBestSize())
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-bitmap-button-1 obj) 0 0 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/ListCtrl_Report_Classic.py wxglade-1.0.1/tests/casefiles/ListCtrl_Report_Classic.py
--- wxglade-0.9.6/tests/casefiles/ListCtrl_Report_Classic.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ListCtrl_Report_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,27 +18,20 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.list_ctrl_1 = wx.ListCtrl(self, wx.ID_ANY, style=wx.LC_HRULES | wx.LC_REPORT | wx.LC_VRULES)
+        self.SetTitle("frame")
 
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
 
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("frame")
+        self.list_ctrl_1 = wx.ListCtrl(self, wx.ID_ANY, style=wx.LC_HRULES | wx.LC_REPORT | wx.LC_VRULES)
         self.list_ctrl_1.InsertColumn(0, "A", format=wx.LIST_FORMAT_LEFT, width=-1)
         self.list_ctrl_1.InsertColumn(1, "B", format=wx.LIST_FORMAT_LEFT, width=-1)
         self.list_ctrl_1.InsertColumn(2, "C", format=wx.LIST_FORMAT_LEFT, width=-1)
         self.list_ctrl_1.InsertColumn(3, "D", format=wx.LIST_FORMAT_LEFT, width=-1)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_1.Add(self.list_ctrl_1, 1, wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/ListCtrl_Report.cpp wxglade-1.0.1/tests/casefiles/ListCtrl_Report.cpp
--- wxglade-0.9.6/tests/casefiles/ListCtrl_Report.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ListCtrl_Report.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,31 +20,15 @@
     wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
 {
     // begin wxGlade: MyFrame::MyFrame
-    list_ctrl_1 = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(wxT("frame"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    list_ctrl_1 = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES);
     list_ctrl_1->AppendColumn(wxT("A"), wxLIST_FORMAT_LEFT, -1);
     list_ctrl_1->AppendColumn(wxT("B"), wxLIST_FORMAT_LEFT, -1);
     list_ctrl_1->AppendColumn(wxT("C"), wxLIST_FORMAT_LEFT, -1);
     list_ctrl_1->AppendColumn(wxT("D"), wxLIST_FORMAT_LEFT, -1);
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
     sizer_1->Add(list_ctrl_1, 1, wxEXPAND, 0);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/ListCtrl_Report.h wxglade-1.0.1/tests/casefiles/ListCtrl_Report.h
--- wxglade-0.9.6/tests/casefiles/ListCtrl_Report.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ListCtrl_Report.h	2020-12-31 14:04:48.000000000 +0000
@@ -31,10 +31,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/ListCtrl_Report_Phoenix.py wxglade-1.0.1/tests/casefiles/ListCtrl_Report_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/ListCtrl_Report_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/ListCtrl_Report_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,27 +18,20 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.list_ctrl_1 = wx.ListCtrl(self, wx.ID_ANY, style=wx.LC_HRULES | wx.LC_REPORT | wx.LC_VRULES)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle("frame")
-        self.list_ctrl_1.AppendColumn("A", format=wx.LIST_FORMAT_LEFT, width=-1)
-        self.list_ctrl_1.AppendColumn("B", format=wx.LIST_FORMAT_LEFT, width=-1)
-        self.list_ctrl_1.AppendColumn("C", format=wx.LIST_FORMAT_LEFT, width=-1)
-        self.list_ctrl_1.AppendColumn("D", format=wx.LIST_FORMAT_LEFT, width=-1)
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.list_ctrl_1 = wx.ListCtrl(self, wx.ID_ANY, style=wx.LC_HRULES | wx.LC_REPORT | wx.LC_VRULES)
+        self.list_ctrl_1.InsertColumn(0, "A", format=wx.LIST_FORMAT_LEFT, width=-1)
+        self.list_ctrl_1.InsertColumn(1, "B", format=wx.LIST_FORMAT_LEFT, width=-1)
+        self.list_ctrl_1.InsertColumn(2, "C", format=wx.LIST_FORMAT_LEFT, width=-1)
+        self.list_ctrl_1.InsertColumn(3, "D", format=wx.LIST_FORMAT_LEFT, width=-1)
         sizer_1.Add(self.list_ctrl_1, 1, wx.EXPAND, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example.cpp wxglade-1.0.1/tests/casefiles/matplotlib_example.cpp
--- wxglade-0.9.6/tests/casefiles/matplotlib_example.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,109 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+// Note that this code file is not valid as it contains Python specific parts! It's just for testing.
+
+
+#include "matplotlib_example.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: MyFrame::MyFrame
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("matplotlib canvas example"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    panel_1 = new wxPanel(this, wxID_ANY);
+    sizer_1->Add(panel_1, 1, wxEXPAND, 0);
+    wxBoxSizer* sizer_2 = new wxBoxSizer(wxVERTICAL);
+    figure = self.matplotlib_figure = Figure()
+    # 1x1 grid, first subplot
+    self.matplotlib_axes = figure.add_subplot(111)
+    matplotlib_canvas = new FigureCanvas(panel_1, wxID_ANY, figure);
+    sizer_2->Add(matplotlib_canvas, 1, wxALL|wxEXPAND, 3);
+    wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
+    sizer_2->Add(sizer_4, 0, wxALL|wxEXPAND, 5);
+    wxStaticText* label_4 = new wxStaticText(panel_1, wxID_ANY, wxT("f(x) = "));
+    sizer_4->Add(label_4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    text_function = new wxTextCtrl(panel_1, wxID_ANY, wxT("sin(x)"));
+    sizer_4->Add(text_function, 1, 0, 0);
+    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
+    sizer_2->Add(sizer_3, 0, wxALL|wxEXPAND, 5);
+    wxStaticText* label_1 = new wxStaticText(panel_1, wxID_ANY, wxT("xmin"));
+    sizer_3->Add(label_1, 0, wxALIGN_CENTER_VERTICAL, 0);
+    text_xmin = new wxTextCtrl(panel_1, wxID_ANY, wxT("0"));
+    text_xmin->SetMinSize(wxSize(40, -1));
+    sizer_3->Add(text_xmin, 0, 0, 0);
+    wxStaticText* label_2 = new wxStaticText(panel_1, wxID_ANY, wxT("xmax"));
+    sizer_3->Add(label_2, 0, wxALIGN_CENTER_VERTICAL, 0);
+    text_max = new wxTextCtrl(panel_1, wxID_ANY, wxT("10"));
+    text_max->SetMinSize(wxSize(40, -1));
+    sizer_3->Add(text_max, 0, 0, 0);
+    wxStaticText* label_3 = new wxStaticText(panel_1, wxID_ANY, wxT("step"));
+    sizer_3->Add(label_3, 0, wxALIGN_CENTER_VERTICAL, 0);
+    text_xstep = new wxTextCtrl(panel_1, wxID_ANY, wxT("0.1"));
+    text_xstep->SetMinSize(wxSize(40, -1));
+    sizer_3->Add(text_xstep, 0, 0, 0);
+    sizer_3->Add(20, 20, 1, 0, 0);
+    button_plot = new wxButton(panel_1, wxID_ANY, wxT("Plot"));
+    button_plot->SetDefault();
+    sizer_3->Add(button_plot, 0, 0, 0);
+    button_clear = new wxButton(panel_1, wxID_ANY, wxT("Clear"));
+    sizer_3->Add(button_clear, 0, wxLEFT, 8);
+    
+    panel_1->SetSizer(sizer_2);
+    SetSizer(sizer_1);
+    Layout();
+    // end wxGlade
+    // some extra code at end of MyFrame new
+}
+
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    // begin wxGlade: MyFrame::event_table
+    EVT_BUTTON(wxID_ANY, MyFrame::on_button_plot)
+    // end wxGlade
+END_EVENT_TABLE();
+
+
+void MyFrame::on_button_plot(wxCommandEvent &event)  // wxGlade: MyFrame.<event_handler>
+{
+    event.Skip();
+    // notify the user that he hasn't implemented the event handler yet
+    wxLogDebug(wxT("Event handler (MyFrame::on_button_plot) not implemented yet"));
+}
+
+// wxGlade: add MyFrame event handlers
+
+
+class MyApp: public wxApp {
+public:
+    bool OnInit();
+};
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    wxInitAllImageHandlers();
+    MyFrame* frame = new MyFrame(NULL, wxID_ANY, wxEmptyString);
+    SetTopWindow(frame);
+    frame->Show();
+    return true;
+}
+
+
+// some extra code after MyApp
\ No newline at end of file
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example.h wxglade-1.0.1/tests/casefiles/matplotlib_example.h
--- wxglade-0.9.6/tests/casefiles/matplotlib_example.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef MATPLOTLIB_EXAMPLE_H
+#define MATPLOTLIB_EXAMPLE_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+// begin wxGlade: ::dependencies
+// end wxGlade
+
+// begin wxGlade: ::extracode
+import matplotlib
+from matplotlib.figure import Figure
+from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
+// end wxGlade
+
+
+class MyFrame: public wxFrame {
+public:
+    // begin wxGlade: MyFrame::ids
+    // end wxGlade
+
+    MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrame::attributes
+    wxPanel* panel_1;
+    FigureCanvas* matplotlib_canvas;
+    wxTextCtrl* text_function;
+    wxTextCtrl* text_xmin;
+    wxTextCtrl* text_max;
+    wxTextCtrl* text_xstep;
+    wxButton* button_plot;
+    wxButton* button_clear;
+    // end wxGlade
+
+    DECLARE_EVENT_TABLE();
+
+public:
+    void on_button_plot(wxCommandEvent &event); // wxGlade: <event_handler>
+}; // wxGlade: end class
+
+
+#endif // MATPLOTLIB_EXAMPLE_H
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example.lisp wxglade-1.0.1/tests/casefiles/matplotlib_example.lisp
--- wxglade-0.9.6/tests/casefiles/matplotlib_example.lisp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,156 @@
+#!/usr/bin/env lisp
+;;;
+;;; generated by wxGlade 0.9.5 on Sun Feb  2 13:54:55 2020
+;;;
+
+;;; Note that this code file is not valid as it contains Python specific parts! It's just for testing.
+
+
+(asdf:operate 'asdf:load-op 'wxcl)
+(use-package "FFI")
+(ffi:default-foreign-language :stdc)
+
+
+;;; begin wxGlade: dependencies
+(use-package :FigureCanvas)
+(use-package :wxButton)
+(use-package :wxCL)
+(use-package :wxColour)
+(use-package :wxEvent)
+(use-package :wxEvtHandler)
+(use-package :wxFrame)
+(use-package :wxPanel)
+(use-package :wxSizer)
+(use-package :wxStaticText)
+(use-package :wxTextCtrl)
+(use-package :wxWindow)
+(use-package :wx_main)
+(use-package :wx_wrapper)
+;;; end wxGlade
+
+;;; begin wxGlade: extracode
+import matplotlib
+from matplotlib.figure import Figure
+from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
+;;; end wxGlade
+
+
+(defclass MyFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (matplotlib-canvas :initform nil :accessor slot-matplotlib-canvas)
+        (label-4 :initform nil :accessor slot-label-4)
+        (text-function :initform nil :accessor slot-text-function)
+        (sizer-4 :initform nil :accessor slot-sizer-4)
+        (label-1 :initform nil :accessor slot-label-1)
+        (text-xmin :initform nil :accessor slot-text-xmin)
+        (label-2 :initform nil :accessor slot-label-2)
+        (text-max :initform nil :accessor slot-text-max)
+        (label-3 :initform nil :accessor slot-label-3)
+        (text-xstep :initform nil :accessor slot-text-xstep)
+        (button-plot :initform nil :accessor slot-button-plot)
+        (button-clear :initform nil :accessor slot-button-clear)
+        (sizer-3 :initform nil :accessor slot-sizer-3)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyFrame ()
+        (let ((obj (make-instance 'MyFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyFrame.__init__
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxFrame_SetTitle (slot-top-window obj) "matplotlib canvas example")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-panel-1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-panel-1 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-sizer-2 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        figure = self.matplotlib_figure = Figure()
+        # 1x1 grid, first subplot
+        self.matplotlib_axes = figure.add_subplot(111)
+        (setf matplotlib-canvas (FigureCanvas_Create (object-panel-1 self) wxID_ANY figure))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-matplotlib-canvas obj) 1 (logior wxALL wxEXPAND) 3 nil)
+        
+        (setf (slot-sizer-4 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-sizer-2 obj) (slot-sizer-4 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-label-4 obj) (wxStaticText_Create (slot-panel-1 obj) wxID_ANY "f(x) = " -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-label-4 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        
+        (setf (slot-text-function obj) (wxTextCtrl_Create (slot-panel-1 obj) wxID_ANY "sin(x)" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-text-function obj) 1 0 0 nil)
+        
+        (setf (slot-sizer-3 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-sizer-2 obj) (slot-sizer-3 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-panel-1 obj) wxID_ANY "xmin" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-label-1 obj) 0 wxALIGN_CENTER_VERTICAL 0 nil)
+        
+        (setf (slot-text-xmin obj) (wxTextCtrl_Create (slot-panel-1 obj) wxID_ANY "0" -1 -1 -1 -1 0))
+        (slot-text-xmin obj).SetMinSize((40, -1))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-text-xmin obj) 0 0 0 nil)
+        
+        (setf (slot-label-2 obj) (wxStaticText_Create (slot-panel-1 obj) wxID_ANY "xmax" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-label-2 obj) 0 wxALIGN_CENTER_VERTICAL 0 nil)
+        
+        (setf (slot-text-max obj) (wxTextCtrl_Create (slot-panel-1 obj) wxID_ANY "10" -1 -1 -1 -1 0))
+        (slot-text-max obj).SetMinSize((40, -1))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-text-max obj) 0 0 0 nil)
+        
+        (setf (slot-label-3 obj) (wxStaticText_Create (slot-panel-1 obj) wxID_ANY "step" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-label-3 obj) 0 wxALIGN_CENTER_VERTICAL 0 nil)
+        
+        (setf (slot-text-xstep obj) (wxTextCtrl_Create (slot-panel-1 obj) wxID_ANY "0.1" -1 -1 -1 -1 0))
+        (slot-text-xstep obj).SetMinSize((40, -1))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-text-xstep obj) 0 0 0 nil)
+        
+        (wxSizer_AddWindow (slot-sizer-3 obj) ((20, 20) obj) 1 0 0 nil)
+        
+        (setf (slot-button-plot obj) (wxButton_Create (slot-panel-1 obj) wxID_ANY "Plot" -1 -1 -1 -1 0))
+        (wxButton_SetDefault (slot-button-plot obj))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-button-plot obj) 0 0 0 nil)
+        
+        (setf (slot-button-clear obj) (wxButton_Create (slot-panel-1 obj) wxID_ANY "Clear" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-button-clear obj) 0 wxLEFT 8 nil)
+        
+        (wxWindow_SetSizer (slot-panel-1 obj) (slot-sizer-2 obj))
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxFrame_layout (slot-frame self))
+
+        (wxEvtHandler_Connect (slot-top-window obj) obj.button-plot (expwxEVT_BUTTON)
+        (wxClosure_Create #'on_button_plot obj))
+        ;;; end wxGlade
+        ;;; some extra code at end of MyFrame init
+        )
+
+(defun on_button_plot (function data event) ;;; wxGlade: MyFrame.<event_handler>
+        (print "Event handler 'on_button_plot' not implemented!")
+        (when event
+                (wxEvent:wxEvent_Skip event)))
+
+;;; end of class MyFrame
+
+
+(defun init-func (fun data evt)
+        (let ((frame (make-MyFrame)))
+        (ELJApp_SetTopWindow (slot-top-window frame))
+        (wxWindow_Show (slot-top-window frame))))
+;;; end of class MyApp
+
+;;; some extra code after MyApp
+
+(unwind-protect
+    (Eljapp_initializeC (wxclosure_Create #'init-func nil) 0 nil)
+    (ffi:close-foreign-library "../miscellaneous/wxc-msw2.6.2.dll"))
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example_old.cpp wxglade-1.0.1/tests/casefiles/matplotlib_example_old.cpp
--- wxglade-0.9.6/tests/casefiles/matplotlib_example_old.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example_old.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,125 @@
+// -*- C++ -*-
+//
+// generated by wxGlade 0.9.5 on Sun Feb  2 13:54:43 2020
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+// Note that this code file is not valid as it contains Python specific parts! It's just for testing.
+
+
+#include "matplotlib_example.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: MyFrame::MyFrame
+    SetSize(wxSize(400, 300));
+    panel_1 = new wxPanel(this, wxID_ANY);
+    figure = self.matplotlib_figure = Figure()
+    # 1x1 grid, first subplot
+    self.matplotlib_axes = figure.add_subplot(111)
+    matplotlib_canvas = new FigureCanvas(panel_1, wxID_ANY, figure);
+    text_function = new wxTextCtrl(panel_1, wxID_ANY, wxT("sin(x)"));
+    text_xmin = new wxTextCtrl(panel_1, wxID_ANY, wxT("0"));
+    text_max = new wxTextCtrl(panel_1, wxID_ANY, wxT("10"));
+    text_xstep = new wxTextCtrl(panel_1, wxID_ANY, wxT("0.1"));
+    button_plot = new wxButton(panel_1, wxID_ANY, wxT("Plot"));
+    button_clear = new wxButton(panel_1, wxID_ANY, wxT("Clear"));
+
+    set_properties();
+    do_layout();
+    // end wxGlade
+    // some extra code at end of MyFrame new
+}
+
+
+void MyFrame::set_properties()
+{
+    // begin wxGlade: MyFrame::set_properties
+    SetTitle(wxT("matplotlib canvas example"));
+    text_xmin->SetMinSize(wxSize(40, -1));
+    text_max->SetMinSize(wxSize(40, -1));
+    text_xstep->SetMinSize(wxSize(40, -1));
+    button_plot->SetDefault();
+    // end wxGlade
+}
+
+
+void MyFrame::do_layout()
+{
+    // begin wxGlade: MyFrame::do_layout
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* sizer_2 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
+    wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
+    sizer_2->Add(matplotlib_canvas, 1, wxALL|wxEXPAND, 3);
+    wxStaticText* label_4 = new wxStaticText(panel_1, wxID_ANY, wxT("f(x) = "));
+    sizer_4->Add(label_4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    sizer_4->Add(text_function, 1, 0, 0);
+    sizer_2->Add(sizer_4, 0, wxALL|wxEXPAND, 5);
+    wxStaticText* label_1 = new wxStaticText(panel_1, wxID_ANY, wxT("xmin"));
+    sizer_3->Add(label_1, 0, wxALIGN_CENTER_VERTICAL, 0);
+    sizer_3->Add(text_xmin, 0, 0, 0);
+    wxStaticText* label_2 = new wxStaticText(panel_1, wxID_ANY, wxT("xmax"));
+    sizer_3->Add(label_2, 0, wxALIGN_CENTER_VERTICAL, 0);
+    sizer_3->Add(text_max, 0, 0, 0);
+    wxStaticText* label_3 = new wxStaticText(panel_1, wxID_ANY, wxT("step"));
+    sizer_3->Add(label_3, 0, wxALIGN_CENTER_VERTICAL, 0);
+    sizer_3->Add(text_xstep, 0, 0, 0);
+    sizer_3->Add(20, 20, 1, 0, 0);
+    sizer_3->Add(button_plot, 0, 0, 0);
+    sizer_3->Add(button_clear, 0, wxLEFT, 8);
+    sizer_2->Add(sizer_3, 0, wxALL|wxEXPAND, 5);
+    panel_1->SetSizer(sizer_2);
+    sizer_1->Add(panel_1, 1, wxEXPAND, 0);
+    SetSizer(sizer_1);
+    Layout();
+    // end wxGlade
+}
+
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    // begin wxGlade: MyFrame::event_table
+    EVT_BUTTON(wxID_ANY, MyFrame::on_button_plot)
+    // end wxGlade
+END_EVENT_TABLE();
+
+
+void MyFrame::on_button_plot(wxCommandEvent &event)  // wxGlade: MyFrame.<event_handler>
+{
+    event.Skip();
+    // notify the user that he hasn't implemented the event handler yet
+    wxLogDebug(wxT("Event handler (MyFrame::on_button_plot) not implemented yet"));
+}
+
+// wxGlade: add MyFrame event handlers
+
+
+class MyApp: public wxApp {
+public:
+    bool OnInit();
+};
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    wxInitAllImageHandlers();
+    MyFrame* frame = new MyFrame(NULL, wxID_ANY, wxEmptyString);
+    SetTopWindow(frame);
+    frame->Show();
+    return true;
+}
+
+
+// some extra code after MyApp
\ No newline at end of file
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example_old.h wxglade-1.0.1/tests/casefiles/matplotlib_example_old.h
--- wxglade-0.9.6/tests/casefiles/matplotlib_example_old.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example_old.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+//
+// generated by wxGlade 0.9.5 on Sun Feb  2 13:54:43 2020
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef MATPLOTLIB_EXAMPLE_H
+#define MATPLOTLIB_EXAMPLE_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+// begin wxGlade: ::dependencies
+// end wxGlade
+
+// begin wxGlade: ::extracode
+import matplotlib
+from matplotlib.figure import Figure
+from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
+// end wxGlade
+
+
+class MyFrame: public wxFrame {
+public:
+    // begin wxGlade: MyFrame::ids
+    // end wxGlade
+
+    MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+    // begin wxGlade: MyFrame::methods
+    void set_properties();
+    void do_layout();
+    // end wxGlade
+
+protected:
+    // begin wxGlade: MyFrame::attributes
+    FigureCanvas* matplotlib_canvas;
+    wxTextCtrl* text_function;
+    wxTextCtrl* text_xmin;
+    wxTextCtrl* text_max;
+    wxTextCtrl* text_xstep;
+    wxButton* button_plot;
+    wxButton* button_clear;
+    wxPanel* panel_1;
+    // end wxGlade
+
+    DECLARE_EVENT_TABLE();
+
+public:
+    void on_button_plot(wxCommandEvent &event); // wxGlade: <event_handler>
+}; // wxGlade: end class
+
+
+#endif // MATPLOTLIB_EXAMPLE_H
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example_old.lisp wxglade-1.0.1/tests/casefiles/matplotlib_example_old.lisp
--- wxglade-0.9.6/tests/casefiles/matplotlib_example_old.lisp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example_old.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,146 @@
+#!/usr/bin/env lisp
+;;;
+;;; generated by wxGlade 0.9.5 on Sun Feb  2 13:54:55 2020
+;;;
+
+;;; Note that this code file is not valid as it contains Python specific parts! It's just for testing.
+
+
+(asdf:operate 'asdf:load-op 'wxcl)
+(use-package "FFI")
+(ffi:default-foreign-language :stdc)
+
+
+;;; begin wxGlade: dependencies
+(use-package :FigureCanvas)
+(use-package :wxButton)
+(use-package :wxCL)
+(use-package :wxColour)
+(use-package :wxEvent)
+(use-package :wxEvtHandler)
+(use-package :wxFrame)
+(use-package :wxPanel)
+(use-package :wxSizer)
+(use-package :wxStaticText)
+(use-package :wxTextCtrl)
+(use-package :wxWindow)
+(use-package :wx_main)
+(use-package :wx_wrapper)
+;;; end wxGlade
+
+;;; begin wxGlade: extracode
+import matplotlib
+from matplotlib.figure import Figure
+from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
+;;; end wxGlade
+
+
+(defclass MyFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (matplotlib-canvas :initform nil :accessor slot-matplotlib-canvas)
+        (label-4 :initform nil :accessor slot-label-4)
+        (text-function :initform nil :accessor slot-text-function)
+        (sizer-4 :initform nil :accessor slot-sizer-4)
+        (label-1 :initform nil :accessor slot-label-1)
+        (text-xmin :initform nil :accessor slot-text-xmin)
+        (label-2 :initform nil :accessor slot-label-2)
+        (text-max :initform nil :accessor slot-text-max)
+        (label-3 :initform nil :accessor slot-label-3)
+        (text-xstep :initform nil :accessor slot-text-xstep)
+        (button-plot :initform nil :accessor slot-button-plot)
+        (button-clear :initform nil :accessor slot-button-clear)
+        (sizer-3 :initform nil :accessor slot-sizer-3)
+        (sizer-2 :initform nil :accessor slot-sizer-2)
+        (panel-1 :initform nil :accessor slot-panel-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyFrame ()
+        (let ((obj (make-instance 'MyFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyFrame.__init__
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (setf (slot-panel-1 obj) (wxPanel_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxTAB_TRAVERSAL))
+        figure = self.matplotlib_figure = Figure()
+        # 1x1 grid, first subplot
+        self.matplotlib_axes = figure.add_subplot(111)
+        (setf matplotlib-canvas (FigureCanvas_Create (object-panel-1 self) wxID_ANY figure))
+        (setf (slot-text-function obj) (wxTextCtrl_Create (slot-panel-1 obj) wxID_ANY "sin(x)" -1 -1 -1 -1 0))
+        (setf (slot-text-xmin obj) (wxTextCtrl_Create (slot-panel-1 obj) wxID_ANY "0" -1 -1 -1 -1 0))
+        (setf (slot-text-max obj) (wxTextCtrl_Create (slot-panel-1 obj) wxID_ANY "10" -1 -1 -1 -1 0))
+        (setf (slot-text-xstep obj) (wxTextCtrl_Create (slot-panel-1 obj) wxID_ANY "0.1" -1 -1 -1 -1 0))
+        (setf (slot-button-plot obj) (wxButton_Create (slot-panel-1 obj) wxID_ANY "Plot" -1 -1 -1 -1 0))
+        (setf (slot-button-clear obj) (wxButton_Create (slot-panel-1 obj) wxID_ANY "Clear" -1 -1 -1 -1 0))
+
+        (wxEvtHandler_Connect (slot-top-window obj) obj.button-plot (expwxEVT_BUTTON)
+        (wxClosure_Create #'on_button_plot obj))
+        ;;; end wxGlade
+        ;;; some extra code at end of MyFrame init
+        )
+
+(defmethod set-properties ((obj MyFrame))
+        ;;; begin wxGlade: MyFrame.__set_properties
+        (wxFrame_SetTitle (slot-top-window obj) "matplotlib canvas example")
+        (slot-text-xmin obj).SetMinSize((40, -1))
+        (slot-text-max obj).SetMinSize((40, -1))
+        (slot-text-xstep obj).SetMinSize((40, -1))
+        (wxButton_SetDefault (slot-button-plot obj))
+        ;;; end wxGlade
+        )
+
+(defmethod do-layout ((obj MyFrame))
+        ;;; begin wxGlade: MyFrame.__do_layout
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        (setf (slot-sizer-2 obj) (wxBoxSizer_Create wxVERTICAL))
+        (setf (slot-sizer-3 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (setf (slot-sizer-4 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-matplotlib-canvas obj) 1 (logior wxALL wxEXPAND) 3 nil)
+        (setf (slot-label-4 obj) (wxStaticText_Create (slot-panel-1 obj) wxID_ANY "f(x) = " -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-label-4 obj) 0 (logior wxALIGN_CENTER_VERTICAL wxALL) 5 nil)
+        (wxSizer_AddWindow (slot-sizer-4 obj) (slot-text-function obj) 1 0 0 nil)
+        (wxSizer_AddSizer (slot-sizer-2 obj) (slot-sizer-4 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-panel-1 obj) wxID_ANY "xmin" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-label-1 obj) 0 wxALIGN_CENTER_VERTICAL 0 nil)
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-text-xmin obj) 0 0 0 nil)
+        (setf (slot-label-2 obj) (wxStaticText_Create (slot-panel-1 obj) wxID_ANY "xmax" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-label-2 obj) 0 wxALIGN_CENTER_VERTICAL 0 nil)
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-text-max obj) 0 0 0 nil)
+        (setf (slot-label-3 obj) (wxStaticText_Create (slot-panel-1 obj) wxID_ANY "step" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-label-3 obj) 0 wxALIGN_CENTER_VERTICAL 0 nil)
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-text-xstep obj) 0 0 0 nil)
+        (wxSizer_AddWindow (slot-sizer-3 obj) ((20, 20) obj) 1 0 0 nil)
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-button-plot obj) 0 0 0 nil)
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-button-clear obj) 0 wxLEFT 8 nil)
+        (wxSizer_AddSizer (slot-sizer-2 obj) (slot-sizer-3 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        (wxWindow_SetSizer (slot-panel-1 obj) (slot-sizer-2 obj))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-panel-1 obj) 1 wxEXPAND 0 nil)
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        (wxFrame_layout (slot-frame self))
+        ;;; end wxGlade
+        )
+
+(defun on_button_plot (function data event) ;;; wxGlade: MyFrame.<event_handler>
+        (print "Event handler 'on_button_plot' not implemented!")
+        (when event
+                (wxEvent:wxEvent_Skip event)))
+
+;;; end of class MyFrame
+
+
+(defun init-func (fun data evt)
+        (let ((frame (make-MyFrame)))
+        (ELJApp_SetTopWindow (slot-top-window frame))
+        (wxWindow_Show (slot-top-window frame))))
+;;; end of class MyApp
+
+;;; some extra code after MyApp
+
+(unwind-protect
+    (Eljapp_initializeC (wxclosure_Create #'init-func nil) 0 nil)
+    (ffi:close-foreign-library "../miscellaneous/wxc-msw2.6.2.dll"))
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example_old.pl wxglade-1.0.1/tests/casefiles/matplotlib_example_old.pl
--- wxglade-0.9.6/tests/casefiles/matplotlib_example_old.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example_old.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,149 @@
+#!/usr/bin/perl -w -- 
+#
+# generated by wxGlade 0.9.5 on Sun Feb  2 13:54:50 2020
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+# Note that this code file is not valid as it contains Python specific parts! It's just for testing.
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import matplotlib
+from matplotlib.figure import Figure
+from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
+# end wxGlade
+
+package MyFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyFrame::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->{panel_1} = Wx::Panel->new($self, wxID_ANY);
+    figure = self.matplotlib_figure = Figure()
+    # 1x1 grid, first subplot
+    self.matplotlib_axes = figure.add_subplot(111)
+    $self->{matplotlib_canvas} = FigureCanvas->new($self->{panel_1}, wxID_ANY, figure);
+    $self->{text_function} = Wx::TextCtrl->new($self->{panel_1}, wxID_ANY, "sin(x)");
+    $self->{text_xmin} = Wx::TextCtrl->new($self->{panel_1}, wxID_ANY, "0");
+    $self->{text_max} = Wx::TextCtrl->new($self->{panel_1}, wxID_ANY, "10");
+    $self->{text_xstep} = Wx::TextCtrl->new($self->{panel_1}, wxID_ANY, "0.1");
+    $self->{button_plot} = Wx::Button->new($self->{panel_1}, wxID_ANY, "Plot");
+    $self->{button_clear} = Wx::Button->new($self->{panel_1}, wxID_ANY, "Clear");
+
+    $self->__set_properties();
+    $self->__do_layout();
+
+    Wx::Event::EVT_BUTTON($self, $self->{button_plot}->GetId, $self->can('on_button_plot'));
+
+    # end wxGlade
+    # some extra code at end of MyFrame new
+    return $self;
+
+}
+
+
+sub __set_properties {
+    my $self = shift;
+    # begin wxGlade: MyFrame::__set_properties
+    $self->SetTitle("matplotlib canvas example");
+    $self->{text_xmin}->SetMinSize(Wx::Size->new(40, -1));
+    $self->{text_max}->SetMinSize(Wx::Size->new(40, -1));
+    $self->{text_xstep}->SetMinSize(Wx::Size->new(40, -1));
+    $self->{button_plot}->SetDefault();
+    # end wxGlade
+}
+
+sub __do_layout {
+    my $self = shift;
+    # begin wxGlade: MyFrame::__do_layout
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_2} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_4} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_2}->Add($self->{matplotlib_canvas}, 1, wxALL|wxEXPAND, 3);
+    my $label_4 = Wx::StaticText->new($self->{panel_1}, wxID_ANY, "f(x) = ");
+    $self->{sizer_4}->Add($label_4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    $self->{sizer_4}->Add($self->{text_function}, 1, 0, 0);
+    $self->{sizer_2}->Add($self->{sizer_4}, 0, wxALL|wxEXPAND, 5);
+    my $label_1 = Wx::StaticText->new($self->{panel_1}, wxID_ANY, "xmin");
+    $self->{sizer_3}->Add($label_1, 0, wxALIGN_CENTER_VERTICAL, 0);
+    $self->{sizer_3}->Add($self->{text_xmin}, 0, 0, 0);
+    my $label_2 = Wx::StaticText->new($self->{panel_1}, wxID_ANY, "xmax");
+    $self->{sizer_3}->Add($label_2, 0, wxALIGN_CENTER_VERTICAL, 0);
+    $self->{sizer_3}->Add($self->{text_max}, 0, 0, 0);
+    my $label_3 = Wx::StaticText->new($self->{panel_1}, wxID_ANY, "step");
+    $self->{sizer_3}->Add($label_3, 0, wxALIGN_CENTER_VERTICAL, 0);
+    $self->{sizer_3}->Add($self->{text_xstep}, 0, 0, 0);
+    $self->{sizer_3}->Add(20, 20, 1, 0, 0);
+    $self->{sizer_3}->Add($self->{button_plot}, 0, 0, 0);
+    $self->{sizer_3}->Add($self->{button_clear}, 0, wxLEFT, 8);
+    $self->{sizer_2}->Add($self->{sizer_3}, 0, wxALL|wxEXPAND, 5);
+    $self->{panel_1}->SetSizer($self->{sizer_2});
+    $self->{sizer_1}->Add($self->{panel_1}, 1, wxEXPAND, 0);
+    $self->SetSizer($self->{sizer_1});
+    $self->Layout();
+    # end wxGlade
+}
+
+sub on_button_plot {
+    my ($self, $event) = @_;
+    # wxGlade: MyFrame::on_button_plot <event_handler>
+    warn "Event handler (on_button_plot) not implemented";
+    $event->Skip;
+    # end wxGlade
+}
+
+
+# end of class MyFrame
+
+1;
+
+package MyApp;
+
+use base qw(Wx::App);
+use strict;
+
+sub OnInit {
+    my( $self ) = shift;
+
+    Wx::InitAllImageHandlers();
+
+    my $frame = MyFrame->new();
+
+    $self->SetTopWindow($frame);
+    $frame->Show(1);
+
+    return 1;
+}
+# end of class MyApp
+
+# some extra code after MyApp
+
+package main;
+
+unless(caller){
+    my $app = MyApp->new();
+    $app->MainLoop();
+}
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example_old.py wxglade-1.0.1/tests/casefiles/matplotlib_example_old.py
--- wxglade-0.9.6/tests/casefiles/matplotlib_example_old.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example_old.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,128 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 0.8.0a7 on Mon Nov  6 20:03:46 2017
+#
+
+# extra code at start
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import matplotlib
+from matplotlib.figure import Figure
+from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+        figure = self.matplotlib_figure = Figure()
+        # 1x1 grid, first subplot
+        self.matplotlib_axes = figure.add_subplot(111)
+        self.matplotlib_canvas = FigureCanvas(self.panel_1, wx.ID_ANY, figure)
+        self.text_function = wx.TextCtrl(self.panel_1, wx.ID_ANY, "sin(x)")
+        self.text_xmin = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0")
+        self.text_max = wx.TextCtrl(self.panel_1, wx.ID_ANY, "10")
+        self.text_xstep = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0.1")
+        self.button_plot = wx.Button(self.panel_1, wx.ID_ANY, "Plot")
+        self.button_clear = wx.Button(self.panel_1, wx.ID_ANY, "Clear")
+
+        self.__set_properties()
+        self.__do_layout()
+
+        self.Bind(wx.EVT_BUTTON, self.on_button_plot, self.button_plot)
+        # end wxGlade
+        # some extra code at end of MyFrame
+
+    def __set_properties(self):
+        # begin wxGlade: MyFrame.__set_properties
+        self.SetTitle("matplotlib canvas example")
+        self.text_xmin.SetMinSize((40, -1))
+        self.text_max.SetMinSize((40, -1))
+        self.text_xstep.SetMinSize((40, -1))
+        self.button_plot.SetDefault()
+        # end wxGlade
+    def __do_layout(self):
+        # begin wxGlade: MyFrame.__do_layout
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        sizer_2 = wx.BoxSizer(wx.VERTICAL)
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(self.matplotlib_canvas, 1, wx.ALL | wx.EXPAND, 3)
+        label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, "f(x) = ")
+        sizer_4.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+        sizer_4.Add(self.text_function, 1, 0, 0)
+        sizer_2.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 5)
+        label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "xmin")
+        sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_3.Add(self.text_xmin, 0, 0, 0)
+        label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, "xmax")
+        sizer_3.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_3.Add(self.text_max, 0, 0, 0)
+        label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, "step")
+        sizer_3.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_3.Add(self.text_xstep, 0, 0, 0)
+        sizer_3.Add((20, 20), 1, 0, 0)
+        sizer_3.Add(self.button_plot, 0, 0, 0)
+        sizer_3.Add(self.button_clear, 0, wx.LEFT, 8)
+        sizer_2.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 5)
+        self.panel_1.SetSizer(sizer_2)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+        self.SetSizer(sizer_1)
+        self.Layout()
+        self.SetSize((400, 300))
+        # end wxGlade
+
+    def on_button_plot(self, event):  # wxGlade: MyFrame.<event_handler>
+        import numpy
+        xmin = xmax = step = None
+        try:
+            xmin = float( self.text_xmin.GetValue() )
+            self.text_xmin.SetBackgroundColour(wx.WHITE)
+        except:
+            self.text_xmin.SetBackgroundColour(wx.RED)
+        try:
+            xmax = float( self.text_max.GetValue() )
+            self.text_max.SetBackgroundColour(wx.WHITE)
+        except:
+            self.text_max.SetBackgroundColour(wx.RED)
+        try:
+            step = float( self.text_xstep.GetValue() )
+            self.text_xstep.SetBackgroundColour(wx.WHITE)
+        except:
+            self.text_xstep.SetBackgroundColour(wx.RED)
+            
+        x = numpy.arange(xmin, xmax, step)
+        # build globals with some functions
+        g = {}
+        for name in ["sin","cos","tan","ufunc","square"]:
+            g[name] = getattr(numpy, name)
+        y = eval(self.text_function.GetValue(), g, {"numpy":numpy, "x":x})
+        self.matplotlib_axes.plot(x,y)
+        self.matplotlib_canvas.draw()
+        event.Skip()
+
+# end of class MyFrame
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+# extra code after MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example.pl wxglade-1.0.1/tests/casefiles/matplotlib_example.pl
--- wxglade-0.9.6/tests/casefiles/matplotlib_example.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,153 @@
+#!/usr/bin/perl -w -- 
+#
+# generated by wxGlade 0.9.5 on Sun Feb  2 13:54:50 2020
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+# Note that this code file is not valid as it contains Python specific parts! It's just for testing.
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import matplotlib
+from matplotlib.figure import Figure
+from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
+# end wxGlade
+
+package MyFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyFrame::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("matplotlib canvas example");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{panel_1} = Wx::Panel->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{panel_1}, 1, wxEXPAND, 0);
+    
+    $self->{sizer_2} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    figure = self.matplotlib_figure = Figure()
+    # 1x1 grid, first subplot
+    self.matplotlib_axes = figure.add_subplot(111)
+    $self->{matplotlib_canvas} = FigureCanvas->new($self->{panel_1}, wxID_ANY, figure);
+    $self->{sizer_2}->Add($self->{matplotlib_canvas}, 1, wxALL|wxEXPAND, 3);
+    
+    $self->{sizer_4} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_2}->Add($self->{sizer_4}, 0, wxALL|wxEXPAND, 5);
+    
+    my $label_4 = Wx::StaticText->new($self->{panel_1}, wxID_ANY, "f(x) = ");
+    $self->{sizer_4}->Add($label_4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
+    $self->{text_function} = Wx::TextCtrl->new($self->{panel_1}, wxID_ANY, "sin(x)");
+    $self->{sizer_4}->Add($self->{text_function}, 1, 0, 0);
+    
+    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_2}->Add($self->{sizer_3}, 0, wxALL|wxEXPAND, 5);
+    
+    my $label_1 = Wx::StaticText->new($self->{panel_1}, wxID_ANY, "xmin");
+    $self->{sizer_3}->Add($label_1, 0, wxALIGN_CENTER_VERTICAL, 0);
+    
+    $self->{text_xmin} = Wx::TextCtrl->new($self->{panel_1}, wxID_ANY, "0");
+    $self->{text_xmin}->SetMinSize(Wx::Size->new(40, -1));
+    $self->{sizer_3}->Add($self->{text_xmin}, 0, 0, 0);
+    
+    my $label_2 = Wx::StaticText->new($self->{panel_1}, wxID_ANY, "xmax");
+    $self->{sizer_3}->Add($label_2, 0, wxALIGN_CENTER_VERTICAL, 0);
+    
+    $self->{text_max} = Wx::TextCtrl->new($self->{panel_1}, wxID_ANY, "10");
+    $self->{text_max}->SetMinSize(Wx::Size->new(40, -1));
+    $self->{sizer_3}->Add($self->{text_max}, 0, 0, 0);
+    
+    my $label_3 = Wx::StaticText->new($self->{panel_1}, wxID_ANY, "step");
+    $self->{sizer_3}->Add($label_3, 0, wxALIGN_CENTER_VERTICAL, 0);
+    
+    $self->{text_xstep} = Wx::TextCtrl->new($self->{panel_1}, wxID_ANY, "0.1");
+    $self->{text_xstep}->SetMinSize(Wx::Size->new(40, -1));
+    $self->{sizer_3}->Add($self->{text_xstep}, 0, 0, 0);
+    
+    $self->{sizer_3}->Add(20, 20, 1, 0, 0);
+    
+    $self->{button_plot} = Wx::Button->new($self->{panel_1}, wxID_ANY, "Plot");
+    $self->{button_plot}->SetDefault();
+    $self->{sizer_3}->Add($self->{button_plot}, 0, 0, 0);
+    
+    $self->{button_clear} = Wx::Button->new($self->{panel_1}, wxID_ANY, "Clear");
+    $self->{sizer_3}->Add($self->{button_clear}, 0, wxLEFT, 8);
+    
+    $self->{panel_1}->SetSizer($self->{sizer_2});
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    Wx::Event::EVT_BUTTON($self, $self->{button_plot}->GetId, $self->can('on_button_plot'));
+
+    # end wxGlade
+    # some extra code at end of MyFrame new
+    return $self;
+
+}
+
+
+sub on_button_plot {
+    my ($self, $event) = @_;
+    # wxGlade: MyFrame::on_button_plot <event_handler>
+    warn "Event handler (on_button_plot) not implemented";
+    $event->Skip;
+    # end wxGlade
+}
+
+
+# end of class MyFrame
+
+1;
+
+package MyApp;
+
+use base qw(Wx::App);
+use strict;
+
+sub OnInit {
+    my( $self ) = shift;
+
+    Wx::InitAllImageHandlers();
+
+    my $frame = MyFrame->new();
+
+    $self->SetTopWindow($frame);
+    $frame->Show(1);
+
+    return 1;
+}
+# end of class MyApp
+
+# some extra code after MyApp
+
+package main;
+
+unless(caller){
+    my $app = MyApp->new();
+    $app->MainLoop();
+}
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example.py wxglade-1.0.1/tests/casefiles/matplotlib_example.py
--- wxglade-0.9.6/tests/casefiles/matplotlib_example.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,138 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 0.8.0a7 on Mon Nov  6 20:03:46 2017
+#
+
+# extra code at start
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import matplotlib
+from matplotlib.figure import Figure
+from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("matplotlib canvas example")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+        sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0)
+
+        sizer_2 = wx.BoxSizer(wx.VERTICAL)
+
+        figure = self.matplotlib_figure = Figure()
+        # 1x1 grid, first subplot
+        self.matplotlib_axes = figure.add_subplot(111)
+        self.matplotlib_canvas = FigureCanvas(self.panel_1, wx.ID_ANY, figure)
+        sizer_2.Add(self.matplotlib_canvas, 1, wx.ALL | wx.EXPAND, 3)
+
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_4, 0, wx.ALL | wx.EXPAND, 5)
+
+        label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, "f(x) = ")
+        sizer_4.Add(label_4, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.text_function = wx.TextCtrl(self.panel_1, wx.ID_ANY, "sin(x)")
+        sizer_4.Add(self.text_function, 1, 0, 0)
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_2.Add(sizer_3, 0, wx.ALL | wx.EXPAND, 5)
+
+        label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "xmin")
+        sizer_3.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.text_xmin = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0")
+        self.text_xmin.SetMinSize((40, -1))
+        sizer_3.Add(self.text_xmin, 0, 0, 0)
+
+        label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, "xmax")
+        sizer_3.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.text_max = wx.TextCtrl(self.panel_1, wx.ID_ANY, "10")
+        self.text_max.SetMinSize((40, -1))
+        sizer_3.Add(self.text_max, 0, 0, 0)
+
+        label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, "step")
+        sizer_3.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.text_xstep = wx.TextCtrl(self.panel_1, wx.ID_ANY, "0.1")
+        self.text_xstep.SetMinSize((40, -1))
+        sizer_3.Add(self.text_xstep, 0, 0, 0)
+
+        sizer_3.Add((20, 20), 1, 0, 0)
+
+        self.button_plot = wx.Button(self.panel_1, wx.ID_ANY, "Plot")
+        self.button_plot.SetDefault()
+        sizer_3.Add(self.button_plot, 0, 0, 0)
+
+        self.button_clear = wx.Button(self.panel_1, wx.ID_ANY, "Clear")
+        sizer_3.Add(self.button_clear, 0, wx.LEFT, 8)
+
+        self.panel_1.SetSizer(sizer_2)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+
+        self.Bind(wx.EVT_BUTTON, self.on_button_plot, self.button_plot)
+        # end wxGlade
+        # some extra code at end of MyFrame
+
+    def on_button_plot(self, event):  # wxGlade: MyFrame.<event_handler>
+        import numpy
+        xmin = xmax = step = None
+        try:
+            xmin = float( self.text_xmin.GetValue() )
+            self.text_xmin.SetBackgroundColour(wx.WHITE)
+        except:
+            self.text_xmin.SetBackgroundColour(wx.RED)
+        try:
+            xmax = float( self.text_max.GetValue() )
+            self.text_max.SetBackgroundColour(wx.WHITE)
+        except:
+            self.text_max.SetBackgroundColour(wx.RED)
+        try:
+            step = float( self.text_xstep.GetValue() )
+            self.text_xstep.SetBackgroundColour(wx.WHITE)
+        except:
+            self.text_xstep.SetBackgroundColour(wx.RED)
+            
+        x = numpy.arange(xmin, xmax, step)
+        # build globals with some functions
+        g = {}
+        for name in ["sin","cos","tan","ufunc","square"]:
+            g[name] = getattr(numpy, name)
+        y = eval(self.text_function.GetValue(), g, {"numpy":numpy, "x":x})
+        self.matplotlib_axes.plot(x,y)
+        self.matplotlib_canvas.draw()
+        event.Skip()
+
+# end of class MyFrame
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+# extra code after MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/matplotlib_example.wxg wxglade-1.0.1/tests/casefiles/matplotlib_example.wxg
--- wxglade-0.9.6/tests/casefiles/matplotlib_example.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/matplotlib_example.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="0" path="matplotlib_example_expected.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>400, 300</size>
+        <title>matplotlib canvas example</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="wxPanel" name="panel_1" base="EditPanel">
+                    <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
+                        <orient>wxVERTICAL</orient>
+                        <object class="sizeritem">
+                            <option>1</option>
+                            <border>3</border>
+                            <flag>wxALL|wxEXPAND</flag>
+                            <object class="FigureCanvas" name="matplotlib_canvas" base="CustomWidget">
+                                <extracode>import matplotlib\nfrom matplotlib.figure import Figure\nfrom matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas\n</extracode>
+                                <extracode_pre>figure = self.matplotlib_figure = Figure()\n# 1x1 grid, first subplot\nself.matplotlib_axes = figure.add_subplot(111)\n</extracode_pre>
+                                <arguments>
+                                    <argument>$parent</argument>
+                                    <argument>$id</argument>
+                                    <argument>figure</argument>
+                                </arguments>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>5</border>
+                            <flag>wxALL|wxEXPAND</flag>
+                            <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer">
+                                <orient>wxHORIZONTAL</orient>
+                                <object class="sizeritem">
+                                    <option>0</option>
+                                    <border>5</border>
+                                    <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>
+                                    <object class="wxStaticText" name="label_4" base="EditStaticText">
+                                        <label>f(x) = </label>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <option>1</option>
+                                    <border>0</border>
+                                    <object class="wxTextCtrl" name="text_function" base="EditTextCtrl">
+                                        <value>sin(x)</value>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem">
+                            <option>0</option>
+                            <border>5</border>
+                            <flag>wxALL|wxEXPAND</flag>
+                            <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
+                                <orient>wxHORIZONTAL</orient>
+                                <object class="sizeritem">
+                                    <option>0</option>
+                                    <border>0</border>
+                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                    <object class="wxStaticText" name="label_1" base="EditStaticText">
+                                        <label>xmin</label>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <option>0</option>
+                                    <border>0</border>
+                                    <object class="wxTextCtrl" name="text_xmin" base="EditTextCtrl">
+                                        <size>40, -1</size>
+                                        <value>0</value>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <option>0</option>
+                                    <border>0</border>
+                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                    <object class="wxStaticText" name="label_2" base="EditStaticText">
+                                        <label>xmax</label>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <option>0</option>
+                                    <border>0</border>
+                                    <object class="wxTextCtrl" name="text_max" base="EditTextCtrl">
+                                        <size>40, -1</size>
+                                        <value>10</value>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <option>0</option>
+                                    <border>0</border>
+                                    <flag>wxALIGN_CENTER_VERTICAL</flag>
+                                    <object class="wxStaticText" name="label_3" base="EditStaticText">
+                                        <label>step</label>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <option>0</option>
+                                    <border>0</border>
+                                    <object class="wxTextCtrl" name="text_xstep" base="EditTextCtrl">
+                                        <size>40, -1</size>
+                                        <value>0.1</value>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <option>1</option>
+                                    <border>0</border>
+                                    <object class="spacer" name="spacer" base="EditSpacer">
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <option>0</option>
+                                    <border>0</border>
+                                    <object class="wxButton" name="button_plot" base="EditButton">
+                                        <events>
+                                            <handler event="EVT_BUTTON">on_button_plot</handler>
+                                        </events>
+                                        <label>Plot</label>
+                                        <default>1</default>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <option>0</option>
+                                    <border>8</border>
+                                    <flag>wxLEFT</flag>
+                                    <object class="wxButton" name="button_clear" base="EditButton">
+                                        <label>Clear</label>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/MenuHandlers_Lambda.py wxglade-1.0.1/tests/casefiles/MenuHandlers_Lambda.py
--- wxglade-0.9.6/tests/casefiles/MenuHandlers_Lambda.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/MenuHandlers_Lambda.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 0.9.9pre on Thu Jul  9 19:57:28 2020
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_menubar = wx.MenuBar()
+        wxglade_tmp_menu = wx.Menu()
+        item = wxglade_tmp_menu.Append(wx.ID_ANY, "item1", "")
+        self.Bind(wx.EVT_MENU, self.on_menu_item1, item)
+        item = wxglade_tmp_menu.Append(wx.ID_ANY, "item2", "")
+        self.Bind(wx.EVT_MENU, lambda evt: self.on_menu_item2(), item)
+        wxglade_tmp_menu.AppendSeparator()
+        item = wxglade_tmp_menu.Append(wx.ID_ANY, "item3", "")
+        self.Bind(wx.EVT_MENU, lambda evt: self.on_menu_item345("item3"), item)
+        item = wxglade_tmp_menu.Append(wx.ID_ANY, "item4", "")
+        self.Bind(wx.EVT_MENU, lambda evt: self.on_menu_item345("item4"), item)
+        item = wxglade_tmp_menu.Append(wx.ID_ANY, "item5", "")
+        self.Bind(wx.EVT_MENU, lambda evt: self.on_menu_item345("item5"), item)
+        self.frame_menubar.Append(wxglade_tmp_menu, "Menu")
+        self.SetMenuBar(self.frame_menubar)
+        # Menu Bar end
+
+        self.panel_1 = wx.Panel(self, wx.ID_ANY)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        static_text_1 = wx.StaticText(self.panel_1, wx.ID_ANY, "This file is for testing menus")
+        sizer_1.Add(static_text_1, 0, 0, 0)
+
+        self.text_ctrl_1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "", style=wx.TE_READONLY)
+        sizer_1.Add(self.text_ctrl_1, 0, wx.EXPAND, 0)
+
+        self.panel_1.SetSizer(sizer_1)
+
+        self.Layout()
+
+        # end wxGlade
+
+    def on_menu_item1(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("Event handler 'on_menu_item1'")
+        self.text_ctrl_1.SetValue("on_menu_item1 called as handler, with event as argument")
+
+    def on_menu_item2(self):
+        print("Event handler 'on_menu_item2'")
+        self.text_ctrl_1.SetValue("on_menu_item2 called via lambda function")
+
+    def on_menu_items345(self, name):
+        print("Event handler 'on_menu_item345'")
+        self.text_ctrl_1.SetValue("on_menu_item345 called via lambda function with argument '%s'"%name)
+
+
+# end of class MyFrame
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/MenuHandlers_Lambda.wxg wxglade-1.0.1/tests/casefiles/MenuHandlers_Lambda.wxg
--- wxglade-0.9.6/tests/casefiles/MenuHandlers_Lambda.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/MenuHandlers_Lambda.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.9.9pre on Thu Jul  9 20:13:33 2020 -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="0" path="MenuHandlers_Lambda.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>400, 300</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <menubar>1</menubar>
+        <object class="wxMenuBar" name="frame_menubar" base="EditMenuBar">
+            <menus>
+                <menu label="Menu" name="">
+                    <item>
+                        <label>item1</label>
+                        <handler>on_menu_item1</handler>
+                    </item>
+                    <item>
+                        <label>item2</label>
+                        <handler>lambda evt: self.on_menu_item2()</handler>
+                    </item>
+                    <item>
+                        <label>---</label>
+                        <id>---</id>
+                        <name>---</name>
+                        <help_str>---</help_str>
+                        <handler>---</handler>
+                    </item>
+                    <item>
+                        <label>item3</label>
+                        <handler>lambda evt: self.on_menu_item345("item3")</handler>
+                    </item>
+                    <item>
+                        <label>item4</label>
+                        <handler>lambda evt: self.on_menu_item345("item4")</handler>
+                    </item>
+                    <item>
+                        <label>item5</label>
+                        <handler>lambda evt: self.on_menu_item345("item5")</handler>
+                    </item>
+                </menu>
+            </menus>
+        </object>
+        <object class="wxPanel" name="panel_1" base="EditPanel">
+            <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <object class="wxStaticText" name="static_text_1" base="EditStaticText">
+                        <label>This file is for testing menus</label>
+                    </object>
+                </object>
+                <object class="sizeritem">
+                    <option>0</option>
+                    <border>0</border>
+                    <flag>wxEXPAND</flag>
+                    <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
+                        <style>wxTE_READONLY</style>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/MenuTest_Classic.py wxglade-1.0.1/tests/casefiles/MenuTest_Classic.py
--- wxglade-0.9.6/tests/casefiles/MenuTest_Classic.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/MenuTest_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,7 +19,11 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((800, 417))
-        
+        self.SetTitle("All Widgets")
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
+        self.SetIcon(_icon)
+
         # Menu Bar
         self.test_menubar = wx.MenuBar()
         global mn_ID1; mn_ID1 = wx.NewId()
@@ -83,69 +87,54 @@
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 1", "Auto ID")
         item = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 2", "Auto ID, handler")
-        self.Bind(wx.EVT_MENU, self.on_auto2, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto2, item)
         self.test_menubar.m_auto3 = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 3", "Auto ID, name, handler")
-        self.Bind(wx.EVT_MENU, self.on_auto3, id=self.test_menubar.m_auto3.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto3, self.test_menubar.m_auto3)
         self.test_menubar.m_auto4 = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 4", "Auto ID, name")
         wxglade_tmp_menu.AppendSeparator()
         wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 1", "Auto ID", wx.ITEM_CHECK)
         item = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 2", "Auto ID, handler", wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.on_auto2, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto2, item)
         self.test_menubar.m_auto3C = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 3", "Auto ID, name, handler", wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.on_auto3, id=self.test_menubar.m_auto3C.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto3, self.test_menubar.m_auto3C)
         self.test_menubar.m_auto4C = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 4", "Auto ID, name", wx.ITEM_CHECK)
         wxglade_tmp_menu_sub = wx.Menu()
         wxglade_tmp_menu_sub.Append(wx.ID_ANY, "Auto 1", "Auto ID", wx.ITEM_RADIO)
         item = wxglade_tmp_menu_sub.Append(wx.ID_ANY, "Auto 2", "Auto ID, handler", wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.on_auto2, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto2, item)
         self.test_menubar.m_auto3R = wxglade_tmp_menu_sub.Append(wx.ID_ANY, "Auto 3", "Auto ID, name, handler", wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.on_auto3, id=self.test_menubar.m_auto3R.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto3, self.test_menubar.m_auto3R)
         self.test_menubar.m_auto4R = wxglade_tmp_menu_sub.Append(wx.ID_ANY, "Auto 4", "Auto ID, name", wx.ITEM_RADIO)
         wxglade_tmp_menu.AppendMenu(wx.ID_ANY, "Radio", wxglade_tmp_menu_sub, "")
         self.test_menubar.Append(wxglade_tmp_menu, "&Auto ID")
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.NewId(), "Minus1 1", "Minus1 ID")
         item = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 2", "Minus1 ID, handler")
-        self.Bind(wx.EVT_MENU, self.on_Minus12, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus12, item)
         self.test_menubar.m_Minus13 = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 3", "Minus1 ID, name, handler")
-        self.Bind(wx.EVT_MENU, self.on_Minus13, id=self.test_menubar.m_Minus13.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus13, self.test_menubar.m_Minus13)
         self.test_menubar.m_Minus14 = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 4", "Minus1 ID, name")
         wxglade_tmp_menu.AppendSeparator()
         wxglade_tmp_menu.Append(wx.NewId(), "Minus1 1", "Minus1 ID", wx.ITEM_CHECK)
         item = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 2", "Minus1 ID, handler", wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.on_Minus12, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus12, item)
         self.test_menubar.m_Minus13C = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 3", "Minus1 ID, name, handler", wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.on_Minus13, id=self.test_menubar.m_Minus13C.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus13, self.test_menubar.m_Minus13C)
         self.test_menubar.m_Minus14C = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 4", "Minus1 ID, name", wx.ITEM_CHECK)
         wxglade_tmp_menu_sub = wx.Menu()
         wxglade_tmp_menu_sub.Append(wx.NewId(), "Minus1 1", "Minus1 ID", wx.ITEM_RADIO)
         item = wxglade_tmp_menu_sub.Append(wx.NewId(), "Minus1 2", "Minus1 ID, handler", wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.on_Minus12, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus12, item)
         self.test_menubar.m_Minus13R = wxglade_tmp_menu_sub.Append(wx.NewId(), "Minus1 3", "Minus1 ID, name, handler", wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.on_Minus13, id=self.test_menubar.m_Minus13R.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus13, self.test_menubar.m_Minus13R)
         self.test_menubar.m_Minus14R = wxglade_tmp_menu_sub.Append(wx.NewId(), "Minus1 4", "Minus1 ID, name", wx.ITEM_RADIO)
         wxglade_tmp_menu.AppendMenu(wx.ID_ANY, "Radio", wxglade_tmp_menu_sub, "")
         self.test_menubar.Append(wxglade_tmp_menu, "&Minus1 ID")
         self.SetMenuBar(self.test_menubar)
         # Menu Bar end
-
-        self.__set_properties()
-        self.__do_layout()
-
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MenuTestFrame.__set_properties
-        self.SetTitle("All Widgets")
-        _icon = wx.NullIcon
-        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
-        self.SetIcon(_icon)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MenuTestFrame.__do_layout
         self.Layout()
         self.Centre()
+
         # end wxGlade
 
     def onShowManual(self, event):  # wxGlade: MenuTestFrame.<event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/MenuTest.cpp wxglade-1.0.1/tests/casefiles/MenuTest.cpp
--- wxglade-0.9.6/tests/casefiles/MenuTest.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/MenuTest.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,6 +21,10 @@
 {
     // begin wxGlade: MenuTestFrame::MenuTestFrame
     SetSize(wxSize(800, 417));
+    SetTitle(wxT("All Widgets"));
+    wxIcon _icon;
+    _icon.CopyFromBitmap(wxArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, wxSize(32, 32)));
+    SetIcon(_icon);
     test_menubar = new wxMenuBar();
     wxMenu *wxglade_tmp_menu;
     wxMenuItem *wxglade_tmp_item;
@@ -117,27 +121,6 @@
     wxglade_tmp_menu->Append(wxID_ANY, wxT("Radio"), wxglade_tmp_menu_sub, wxEmptyString);
     test_menubar->Append(wxglade_tmp_menu, wxT("&Minus1 ID"));
     SetMenuBar(test_menubar);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MenuTestFrame::set_properties()
-{
-    // begin wxGlade: MenuTestFrame::set_properties
-    SetTitle(wxT("All Widgets"));
-    wxIcon _icon;
-    _icon.CopyFromBitmap(wxArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, wxSize(32, 32)));
-    SetIcon(_icon);
-    // end wxGlade
-}
-
-
-void MenuTestFrame::do_layout()
-{
-    // begin wxGlade: MenuTestFrame::do_layout
     Layout();
     Centre();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/MenuTest.h wxglade-1.0.1/tests/casefiles/MenuTest.h
--- wxglade-0.9.6/tests/casefiles/MenuTest.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/MenuTest.h	2020-12-31 14:04:48.000000000 +0000
@@ -44,10 +44,6 @@
     MenuTestFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MenuTestFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MenuTestFrame::attributes
@@ -81,14 +77,14 @@
     DECLARE_EVENT_TABLE();
 
 public:
-    void onShowManual(wxCommandEvent &event); // wxGlade: <event_handler>
-    void onCloseFile(wxCommandEvent &event); // wxGlade: <event_handler>
-    void on_named2(wxCommandEvent &event); // wxGlade: <event_handler>
-    void on_named3(wxCommandEvent &event); // wxGlade: <event_handler>
-    void on_auto2(wxCommandEvent &event); // wxGlade: <event_handler>
-    void on_auto3(wxCommandEvent &event); // wxGlade: <event_handler>
-    void on_Minus12(wxCommandEvent &event); // wxGlade: <event_handler>
-    void on_Minus13(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void onShowManual(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void onCloseFile(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void on_named2(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void on_named3(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void on_auto2(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void on_auto3(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void on_Minus12(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void on_Minus13(wxCommandEvent &event); // wxGlade: <event_handler>
 }; // wxGlade: end class
 
 
diff -Nru wxglade-0.9.6/tests/casefiles/MenuTest_Phoenix.py wxglade-1.0.1/tests/casefiles/MenuTest_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/MenuTest_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/MenuTest_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,7 +19,11 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((800, 417))
-        
+        self.SetTitle("All Widgets")
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
+        self.SetIcon(_icon)
+
         # Menu Bar
         self.test_menubar = wx.MenuBar()
         global mn_ID1; mn_ID1 = wx.NewId()
@@ -83,69 +87,54 @@
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 1", "Auto ID")
         item = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 2", "Auto ID, handler")
-        self.Bind(wx.EVT_MENU, self.on_auto2, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto2, item)
         self.test_menubar.m_auto3 = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 3", "Auto ID, name, handler")
-        self.Bind(wx.EVT_MENU, self.on_auto3, id=self.test_menubar.m_auto3.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto3, self.test_menubar.m_auto3)
         self.test_menubar.m_auto4 = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 4", "Auto ID, name")
         wxglade_tmp_menu.AppendSeparator()
         wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 1", "Auto ID", wx.ITEM_CHECK)
         item = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 2", "Auto ID, handler", wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.on_auto2, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto2, item)
         self.test_menubar.m_auto3C = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 3", "Auto ID, name, handler", wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.on_auto3, id=self.test_menubar.m_auto3C.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto3, self.test_menubar.m_auto3C)
         self.test_menubar.m_auto4C = wxglade_tmp_menu.Append(wx.ID_ANY, "Auto 4", "Auto ID, name", wx.ITEM_CHECK)
         wxglade_tmp_menu_sub = wx.Menu()
         wxglade_tmp_menu_sub.Append(wx.ID_ANY, "Auto 1", "Auto ID", wx.ITEM_RADIO)
         item = wxglade_tmp_menu_sub.Append(wx.ID_ANY, "Auto 2", "Auto ID, handler", wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.on_auto2, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto2, item)
         self.test_menubar.m_auto3R = wxglade_tmp_menu_sub.Append(wx.ID_ANY, "Auto 3", "Auto ID, name, handler", wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.on_auto3, id=self.test_menubar.m_auto3R.GetId())
+        self.Bind(wx.EVT_MENU, self.on_auto3, self.test_menubar.m_auto3R)
         self.test_menubar.m_auto4R = wxglade_tmp_menu_sub.Append(wx.ID_ANY, "Auto 4", "Auto ID, name", wx.ITEM_RADIO)
         wxglade_tmp_menu.Append(wx.ID_ANY, "Radio", wxglade_tmp_menu_sub, "")
         self.test_menubar.Append(wxglade_tmp_menu, "&Auto ID")
         wxglade_tmp_menu = wx.Menu()
         wxglade_tmp_menu.Append(wx.NewId(), "Minus1 1", "Minus1 ID")
         item = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 2", "Minus1 ID, handler")
-        self.Bind(wx.EVT_MENU, self.on_Minus12, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus12, item)
         self.test_menubar.m_Minus13 = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 3", "Minus1 ID, name, handler")
-        self.Bind(wx.EVT_MENU, self.on_Minus13, id=self.test_menubar.m_Minus13.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus13, self.test_menubar.m_Minus13)
         self.test_menubar.m_Minus14 = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 4", "Minus1 ID, name")
         wxglade_tmp_menu.AppendSeparator()
         wxglade_tmp_menu.Append(wx.NewId(), "Minus1 1", "Minus1 ID", wx.ITEM_CHECK)
         item = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 2", "Minus1 ID, handler", wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.on_Minus12, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus12, item)
         self.test_menubar.m_Minus13C = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 3", "Minus1 ID, name, handler", wx.ITEM_CHECK)
-        self.Bind(wx.EVT_MENU, self.on_Minus13, id=self.test_menubar.m_Minus13C.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus13, self.test_menubar.m_Minus13C)
         self.test_menubar.m_Minus14C = wxglade_tmp_menu.Append(wx.NewId(), "Minus1 4", "Minus1 ID, name", wx.ITEM_CHECK)
         wxglade_tmp_menu_sub = wx.Menu()
         wxglade_tmp_menu_sub.Append(wx.NewId(), "Minus1 1", "Minus1 ID", wx.ITEM_RADIO)
         item = wxglade_tmp_menu_sub.Append(wx.NewId(), "Minus1 2", "Minus1 ID, handler", wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.on_Minus12, id=item.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus12, item)
         self.test_menubar.m_Minus13R = wxglade_tmp_menu_sub.Append(wx.NewId(), "Minus1 3", "Minus1 ID, name, handler", wx.ITEM_RADIO)
-        self.Bind(wx.EVT_MENU, self.on_Minus13, id=self.test_menubar.m_Minus13R.GetId())
+        self.Bind(wx.EVT_MENU, self.on_Minus13, self.test_menubar.m_Minus13R)
         self.test_menubar.m_Minus14R = wxglade_tmp_menu_sub.Append(wx.NewId(), "Minus1 4", "Minus1 ID, name", wx.ITEM_RADIO)
         wxglade_tmp_menu.Append(wx.ID_ANY, "Radio", wxglade_tmp_menu_sub, "")
         self.test_menubar.Append(wxglade_tmp_menu, "&Minus1 ID")
         self.SetMenuBar(self.test_menubar)
         # Menu Bar end
-
-        self.__set_properties()
-        self.__do_layout()
-
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MenuTestFrame.__set_properties
-        self.SetTitle("All Widgets")
-        _icon = wx.NullIcon
-        _icon.CopyFromBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_OTHER, (32, 32)))
-        self.SetIcon(_icon)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MenuTestFrame.__do_layout
         self.Layout()
         self.Centre()
+
         # end wxGlade
 
     def onShowManual(self, event):  # wxGlade: MenuTestFrame.<event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/MenuTest.pl wxglade-1.0.1/tests/casefiles/MenuTest.pl
--- wxglade-0.9.6/tests/casefiles/MenuTest.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/MenuTest.pl	2020-12-31 14:04:48.000000000 +0000
@@ -35,6 +35,11 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(800, 417));
+    $self->SetTitle("All Widgets");
+    my $icon = &Wx::wxNullIcon;
+    $icon->CopyFromBitmap(Wx::ArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, Wx::Size->new(32, 32)));
+    $self->SetIcon($icon);
+    
     
 
     # Menu Bar
@@ -126,10 +131,8 @@
     
     # Menu Bar end
 
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->Layout();
+    $self->Centre();
     Wx::Event::EVT_MENU($self, wxID_HELP, $self->can('onShowManual'));
     Wx::Event::EVT_MENU($self, $self->{m_Close}->GetId, $self->can('onCloseFile'));
     Wx::Event::EVT_MENU($self, wxID_HELP, $self->can('onShowManual'));
@@ -161,24 +164,6 @@
 }
 
 
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MenuTestFrame::__set_properties
-    $self->SetTitle("All Widgets");
-    my $icon = &Wx::wxNullIcon;
-    $icon->CopyFromBitmap(Wx::ArtProvider::GetBitmap(wxART_TIP, wxART_OTHER, Wx::Size->new(32, 32)));
-    $self->SetIcon($icon);
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MenuTestFrame::__do_layout
-    $self->Layout();
-    $self->Centre();
-    # end wxGlade
-}
-
 sub onShowManual {
     my ($self, $event) = @_;
     # wxGlade: MenuTestFrame::onShowManual <event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/no_supported_flags.cpp wxglade-1.0.1/tests/casefiles/no_supported_flags.cpp
--- wxglade-0.9.6/tests/casefiles/no_supported_flags.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/no_supported_flags.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,27 +20,11 @@
     wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
 {
     // begin wxGlade: MyFrame::MyFrame
-    label_1 = new wxStaticText(this, wxID_ANY, _("Flag wxST_ELLIPSIZE_END is set but not\nsupported with wx 2.8. Thereby the generated\ncode should not contain this flag."));
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(_("frame_1"));
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxHORIZONTAL);
+    label_1 = new wxStaticText(this, wxID_ANY, _("Flag wxST_ELLIPSIZE_END is set but not\nsupported with wx 2.8. Thereby the generated\ncode should not contain this flag."));
     sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 5);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/no_supported_flags.h wxglade-1.0.1/tests/casefiles/no_supported_flags.h
--- wxglade-0.9.6/tests/casefiles/no_supported_flags.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/no_supported_flags.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/no_supported_flags.lisp wxglade-1.0.1/tests/casefiles/no_supported_flags.lisp
--- wxglade-0.9.6/tests/casefiles/no_supported_flags.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/no_supported_flags.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -25,8 +25,8 @@
 
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
-        (label-1 :initform nil :accessor slot-label-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (label-1 :initform nil :accessor slot-label-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -39,22 +39,16 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
         (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Flag wxST_ELLIPSIZE_END is set but not\nsupported with wx 2.8. Thereby the generated\ncode should not contain this flag.") -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Flag wxST_ELLIPSIZE_END is set but not\nsupported with wx 2.8. Thereby the generated\ncode should not contain this flag.") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/no_supported_flags.pl wxglade-1.0.1/tests/casefiles/no_supported_flags.pl
--- wxglade-0.9.6/tests/casefiles/no_supported_flags.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/no_supported_flags.pl	2020-12-31 14:04:48.000000000 +0000
@@ -33,35 +33,23 @@
         unless defined $style;
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, _T("Flag wxST_ELLIPSIZE_END is set but not\nsupported with wx 2.8. Thereby the generated\ncode should not contain this flag."));
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle(_T("frame_1"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, _T("Flag wxST_ELLIPSIZE_END is set but not\nsupported with wx 2.8. Thereby the generated\ncode should not contain this flag."));
     $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/no_supported_flags.py wxglade-1.0.1/tests/casefiles/no_supported_flags.py
--- wxglade-0.9.6/tests/casefiles/no_supported_flags.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/no_supported_flags.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,23 +18,16 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Flag wxST_ELLIPSIZE_END is set but not\nsupported with wx 2.8. Thereby the generated\ncode should not contain this flag."))
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle(_("frame_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Flag wxST_ELLIPSIZE_END is set but not\nsupported with wx 2.8. Thereby the generated\ncode should not contain this flag."))
         sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/PanelClass.cpp wxglade-1.0.1/tests/casefiles/PanelClass.cpp
--- wxglade-0.9.6/tests/casefiles/PanelClass.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PanelClass.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,58 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "PanelClass.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+DebugPanel::DebugPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL)
+{
+    // begin wxGlade: DebugPanel::DebugPanel
+    SetFont(wxFont(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, 0, wxT("")));
+    wxStaticBoxSizer* sizer_2 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, wxT("sizer_2")), wxVERTICAL);
+    sizer_2->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_2);
+    // end wxGlade
+}
+
+
+Frame::Frame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: Frame::Frame
+    SetSize(wxSize(1688, 1058));
+    SetTitle(wxT("Frame"));
+    notebook_1_Debug = new DebugPanel(this, wxID_ANY);
+    Layout();
+    // end wxGlade
+}
+
+
+class App: public wxApp {
+public:
+    bool OnInit();
+};
+
+IMPLEMENT_APP(App)
+
+bool App::OnInit()
+{
+    wxInitAllImageHandlers();
+    Frame* frame = new Frame(NULL, wxID_ANY, wxEmptyString);
+    SetTopWindow(frame);
+    frame->Show();
+    return true;
+}
diff -Nru wxglade-0.9.6/tests/casefiles/PanelClass.h wxglade-1.0.1/tests/casefiles/PanelClass.h
--- wxglade-0.9.6/tests/casefiles/PanelClass.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PanelClass.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef PANELCLASS_H
+#define PANELCLASS_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+// begin wxGlade: ::dependencies
+// end wxGlade
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+class DebugPanel: public wxPanel {
+public:
+    // begin wxGlade: DebugPanel::ids
+    // end wxGlade
+
+    DebugPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: DebugPanel::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class Frame: public wxFrame {
+public:
+    // begin wxGlade: Frame::ids
+    // end wxGlade
+
+    Frame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: Frame::attributes
+    DebugPanel* notebook_1_Debug;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+#endif // PANELCLASS_H
diff -Nru wxglade-0.9.6/tests/casefiles/PanelClass.pl wxglade-1.0.1/tests/casefiles/PanelClass.pl
--- wxglade-0.9.6/tests/casefiles/PanelClass.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PanelClass.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,114 @@
+#!/usr/bin/perl -w -- 
+#
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+package DebugPanel;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: DebugPanel::new
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    $self->SetFont(Wx::Font->new(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, 0, ""));
+    
+    $self->{sizer_2} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self, wxID_ANY, "sizer_2"), wxVERTICAL);
+    
+    $self->{sizer_2}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_2});
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class DebugPanel
+
+1;
+
+package Frame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: Frame::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(1688, 1058));
+    $self->SetTitle("Frame");
+    
+    $self->{notebook_1_Debug} = DebugPanel->new($self, wxID_ANY);
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class Frame
+
+1;
+
+package App;
+
+use base qw(Wx::App);
+use strict;
+
+sub OnInit {
+    my( $self ) = shift;
+
+    Wx::InitAllImageHandlers();
+
+    my $frame = Frame->new();
+
+    $self->SetTopWindow($frame);
+    $frame->Show(1);
+
+    return 1;
+}
+# end of class App
+
+package main;
+
+unless(caller){
+    my $App = App->new();
+    $App->MainLoop();
+}
diff -Nru wxglade-0.9.6/tests/casefiles/PanelClass.py wxglade-1.0.1/tests/casefiles/PanelClass.py
--- wxglade-0.9.6/tests/casefiles/PanelClass.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PanelClass.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class DebugPanel(wx.Panel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: DebugPanel.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+        self.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, 0, ""))
+
+        sizer_2 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, "sizer_2"), wx.VERTICAL)
+
+        sizer_2.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_2)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class DebugPanel
+
+class Frame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: Frame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((1688, 1058))
+        self.SetTitle("Frame")
+
+        self.notebook_1_Debug = DebugPanel(self, wx.ID_ANY)
+        self.Layout()
+        # end wxGlade
+
+# end of class Frame
+
+class App(wx.App):
+    def OnInit(self):
+        self.frame = Frame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class App
+
+if __name__ == "__main__":
+    App = App(0)
+    App.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/PanelClass.wxg wxglade-1.0.1/tests/casefiles/PanelClass.wxg
--- wxglade-0.9.6/tests/casefiles/PanelClass.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PanelClass.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
+
+<application class="App" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="App" option="0" overwrite="1" path="PanelClass.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="Frame" name="frame" base="EditFrame">
+        <size>1688, 1058</size>
+        <title>Frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="DebugPanel" name="notebook_1_Debug" base="EditPanel">
+            <font>
+                <size>12</size>
+                <family>default</family>
+                <style>normal</style>
+                <weight>bold</weight>
+                <underlined>0</underlined>
+                <face />
+            </font>
+            <style>wxTAB_TRAVERSAL</style>
+            <object class="wxStaticBoxSizer" name="sizer_2" base="EditStaticBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <label>sizer_2</label>
+                <object class="sizerslot" />
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/Perl_Preferences.pl wxglade-1.0.1/tests/casefiles/Perl_Preferences.pl
--- wxglade-0.9.6/tests/casefiles/Perl_Preferences.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Perl_Preferences.pl	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,4 @@
-#!/usr/bin/perl -w -- 
-#
-# generated by wxGlade "faked test version"
+# generated by wxGlade
 #
 # To get wxPerl visit http://www.wxperl.it
 #
@@ -35,136 +33,169 @@
         unless defined $style;
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY);
-    $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{use_menu_icons} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Use icons in menu items"));
-    $self->{frame_tool_win} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Show properties and tree windows as small frames"));
-    $self->{show_progress} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Show progress dialog when loading wxg files"));
-    $self->{remember_geometry} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Remember position and size of wxGlade windows"));
-    $self->{show_sizer_handle} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Show \"handles\" of sizers"));
-    $self->{use_kde_dialogs} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Use native file dialogs on KDE"));
-    $self->{open_save_path} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
-    $self->{codegen_path} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
-    $self->{number_history} = Wx::SpinCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "4", wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 4);
-    $self->{buttons_per_row} = Wx::SpinCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "5", wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 100, 5);
-    $self->{notebook_1_pane_2} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{use_dialog_units} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Use dialog units by default for size properties"));
-    $self->{wxg_backup} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Create backup wxg files"));
-    $self->{codegen_backup} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Create backup files for generated source"));
-    $self->{allow_duplicate_names} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Allow duplicate widget names"));
-    $self->{default_border} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Default border width for widgets"));
-    $self->{default_border_size} = Wx::SpinCtrl->new($self->{notebook_1_pane_2}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 20, );
-    $self->{autosave} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Auto save wxg files every "));
-    $self->{autosave_delay} = Wx::SpinCtrl->new($self->{notebook_1_pane_2}, wxID_ANY, "120", wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 30, 300, 120);
-    $self->{write_timestamp} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Insert timestamp on generated source files"));
-    $self->{write_generated_from} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Insert .wxg file name on generated source files"));
-    $self->{backup_suffix} = Wx::RadioBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Backup options"), wxDefaultPosition, wxDefaultSize, [_T("append ~ to filename"), _T("append .bak to filename")], 2, wxRA_SPECIFY_COLS);
-    $self->{local_widget_path} = Wx::TextCtrl->new($self->{notebook_1_pane_2}, wxID_ANY, "");
-    $self->{choose_widget_path} = Wx::Button->new($self->{notebook_1_pane_2}, wxID_ANY, _T("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
-    $self->{ok} = Wx::Button->new($self, wxID_OK, "");
-    $self->{cancel} = Wx::Button->new($self, wxID_CANCEL, "");
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: wxGladePreferencesUI::__set_properties
     $self->SetTitle(_T("wxGlade: preferences"));
     my $icon = &Wx::wxNullIcon;
-    $icon->CopyFromBitmap(Wx::Bitmap->new("icons/icon.xpm", wxBITMAP_TYPE_ANY));
+    $icon->CopyFromBitmap(Wx::Bitmap->new("icons/icon.png", wxBITMAP_TYPE_ANY));
     $self->SetIcon($icon);
-    $self->{use_menu_icons}->SetValue(1);
-    $self->{frame_tool_win}->SetValue(1);
-    $self->{show_progress}->SetValue(1);
-    $self->{remember_geometry}->SetValue(1);
-    $self->{show_sizer_handle}->SetValue(1);
-    $self->{use_kde_dialogs}->SetValue(1);
-    $self->{open_save_path}->SetMinSize(Wx::Size->new(196, -1));
-    $self->{codegen_path}->SetMinSize(Wx::Size->new(196, -1));
-    $self->{number_history}->SetMinSize(Wx::Size->new(196, -1));
-    $self->{buttons_per_row}->SetMinSize(Wx::Size->new(196, -1));
-    $self->{wxg_backup}->SetValue(1);
-    $self->{codegen_backup}->SetValue(1);
-    $self->{allow_duplicate_names}->Show(0);
-    $self->{default_border_size}->SetMinSize(Wx::Size->new(45, 22));
-    $self->{autosave_delay}->SetMinSize(Wx::Size->new(45, 22));
-    $self->{write_timestamp}->SetValue(1);
-    $self->{backup_suffix}->SetSelection(0);
-    $self->{ok}->SetDefault();
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: wxGladePreferencesUI::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_2} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_5} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_6} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Local widget path")), wxHORIZONTAL);
-    $self->{sizer_7_copy} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_7} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("Interface"));
+    
     $self->{sizer_3} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_4} = Wx::FlexGridSizer->new(4, 2, 0, 0);
+    
+    $self->{use_menu_icons} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Use icons in menu items"));
+    $self->{use_menu_icons}->SetValue(1);
     $self->{sizer_3}->Add($self->{use_menu_icons}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{frame_tool_win} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Show properties and tree windows as small frames"));
+    $self->{frame_tool_win}->SetValue(1);
     $self->{sizer_3}->Add($self->{frame_tool_win}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{show_progress} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Show progress dialog when loading wxg files"));
+    $self->{show_progress}->SetValue(1);
     $self->{sizer_3}->Add($self->{show_progress}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{remember_geometry} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Remember position and size of wxGlade windows"));
+    $self->{remember_geometry}->SetValue(1);
     $self->{sizer_3}->Add($self->{remember_geometry}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{show_sizer_handle} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Show \"handles\" of sizers"));
+    $self->{show_sizer_handle}->SetValue(1);
     $self->{sizer_3}->Add($self->{show_sizer_handle}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{use_kde_dialogs} = Wx::CheckBox->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Use native file dialogs on KDE"));
+    $self->{use_kde_dialogs}->SetValue(1);
     $self->{sizer_3}->Add($self->{use_kde_dialogs}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_4} = Wx::FlexGridSizer->new(4, 2, 0, 0);
+    $self->{sizer_3}->Add($self->{sizer_4}, 0, wxEXPAND, 3);
+    
     my $label_1 = Wx::StaticText->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Initial path for \nfile opening/saving dialogs:"));
     $self->{sizer_4}->Add($label_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
+    $self->{open_save_path} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{open_save_path}->SetMinSize(Wx::Size->new(196, -1));
     $self->{sizer_4}->Add($self->{open_save_path}, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
     my $label_2_copy = Wx::StaticText->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Initial path for \ncode generation file dialogs:"));
     $self->{sizer_4}->Add($label_2_copy, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
+    $self->{codegen_path} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{codegen_path}->SetMinSize(Wx::Size->new(196, -1));
     $self->{sizer_4}->Add($self->{codegen_path}, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
     my $label_2 = Wx::StaticText->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Number of items in file history"));
     $self->{sizer_4}->Add($label_2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
+    $self->{number_history} = Wx::SpinCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "4", wxDefaultPosition, wxDefaultSize, 0, 0, 100, 4);
+    $self->{number_history}->SetMinSize(Wx::Size->new(196, -1));
     $self->{sizer_4}->Add($self->{number_history}, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
     my $label_2_copy_1 = Wx::StaticText->new($self->{notebook_1_pane_1}, wxID_ANY, _T("Number of buttons per row\nin the main palette"));
     $self->{sizer_4}->Add($label_2_copy_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
+    $self->{buttons_per_row} = Wx::SpinCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "5", wxDefaultPosition, wxDefaultSize, 0, 1, 100, 5);
+    $self->{buttons_per_row}->SetMinSize(Wx::Size->new(196, -1));
     $self->{sizer_4}->Add($self->{buttons_per_row}, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    $self->{sizer_4}->AddGrowableCol(1);
-    $self->{sizer_3}->Add($self->{sizer_4}, 0, wxEXPAND, 3);
-    $self->{notebook_1_pane_1}->SetSizer($self->{sizer_3});
+    
+    $self->{notebook_1_pane_2} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_2}, _T("Other"));
+    
+    $self->{sizer_5} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{use_dialog_units} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Use dialog units by default for size properties"));
     $self->{sizer_5}->Add($self->{use_dialog_units}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{wxg_backup} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Create backup wxg files"));
+    $self->{wxg_backup}->SetValue(1);
     $self->{sizer_5}->Add($self->{wxg_backup}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{codegen_backup} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Create backup files for generated source"));
+    $self->{codegen_backup}->SetValue(1);
     $self->{sizer_5}->Add($self->{codegen_backup}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{allow_duplicate_names} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Allow duplicate widget names"));
+    $self->{allow_duplicate_names}->Show(0);
     $self->{sizer_5}->Add($self->{allow_duplicate_names}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_7} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_5}->Add($self->{sizer_7}, 0, wxEXPAND, 0);
+    
+    $self->{default_border} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Default border width for widgets"));
     $self->{sizer_7}->Add($self->{default_border}, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
+    $self->{default_border_size} = Wx::SpinCtrl->new($self->{notebook_1_pane_2}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0, 0, 20, );
+    $self->{default_border_size}->SetMinSize(Wx::Size->new(45, 22));
     $self->{sizer_7}->Add($self->{default_border_size}, 0, wxALL, 5);
-    $self->{sizer_5}->Add($self->{sizer_7}, 0, wxEXPAND, 0);
+    
+    $self->{sizer_7_copy} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_5}->Add($self->{sizer_7_copy}, 0, wxEXPAND, 0);
+    
+    $self->{autosave} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Auto save wxg files every "));
     $self->{sizer_7_copy}->Add($self->{autosave}, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5);
+    
+    $self->{autosave_delay} = Wx::SpinCtrl->new($self->{notebook_1_pane_2}, wxID_ANY, "120", wxDefaultPosition, wxDefaultSize, 0, 30, 300, 120);
+    $self->{autosave_delay}->SetMinSize(Wx::Size->new(45, 22));
     $self->{sizer_7_copy}->Add($self->{autosave_delay}, 0, wxBOTTOM|wxTOP, 5);
+    
     my $label_3 = Wx::StaticText->new($self->{notebook_1_pane_2}, wxID_ANY, _T(" seconds"));
     $self->{sizer_7_copy}->Add($label_3, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxFIXED_MINSIZE|wxTOP, 5);
-    $self->{sizer_5}->Add($self->{sizer_7_copy}, 0, wxEXPAND, 0);
+    
+    $self->{write_timestamp} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Insert timestamp on generated source files"));
+    $self->{write_timestamp}->SetValue(1);
     $self->{sizer_5}->Add($self->{write_timestamp}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{write_generated_from} = Wx::CheckBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Insert .wxg file name on generated source files"));
     $self->{sizer_5}->Add($self->{write_generated_from}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{backup_suffix} = Wx::RadioBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Backup options"), wxDefaultPosition, wxDefaultSize, [_T("append ~ to filename"), _T("append .bak to filename")], 2, wxRA_SPECIFY_COLS);
+    $self->{backup_suffix}->SetSelection(0);
     $self->{sizer_5}->Add($self->{backup_suffix}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_6} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Local widget path")), wxHORIZONTAL);
+    $self->{sizer_5}->Add($self->{sizer_6}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{local_widget_path} = Wx::TextCtrl->new($self->{notebook_1_pane_2}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{local_widget_path}, 1, wxALL, 3);
+    
+    $self->{choose_widget_path} = Wx::Button->new($self->{notebook_1_pane_2}, wxID_ANY, _T("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
     $self->{sizer_6}->Add($self->{choose_widget_path}, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3);
-    $self->{sizer_5}->Add($self->{sizer_6}, 0, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_pane_2}->SetSizer($self->{sizer_5});
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("Interface"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_2}, _T("Other"));
-    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_2} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT|wxALL, 10);
+    
+    $self->{ok} = Wx::Button->new($self, wxID_OK, "");
+    $self->{ok}->SetDefault();
     $self->{sizer_2}->Add($self->{ok}, 0, 0, 0);
+    
+    $self->{cancel} = Wx::Button->new($self, wxID_CANCEL, "");
     $self->{sizer_2}->Add($self->{cancel}, 0, wxLEFT, 10);
-    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT|wxALL, 10);
+    
+    $self->{notebook_1_pane_2}->SetSizer($self->{sizer_5});
+    
+    $self->{sizer_4}->AddGrowableCol(1);
+    
+    $self->{notebook_1_pane_1}->SetSizer($self->{sizer_3});
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
+    $self->SetAffirmativeId($self->{ok}->GetId())
+    $self->SetEscapeId($self->{cancel}->GetId())
+    
     $self->Layout();
     $self->Centre();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class wxGladePreferencesUI
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/Perl_Preferences.wxg wxglade-1.0.1/tests/casefiles/Perl_Preferences.wxg
--- wxglade-0.9.6/tests/casefiles/Perl_Preferences.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Perl_Preferences.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -4,8 +4,10 @@
 <application path="Perl_Preferences.pl" name="" class="" option="0" language="perl" top_window="dialog_1" encoding="ISO-8859-15" use_gettext="1" overwrite="1" use_new_namespace="1" for_version="2.6" is_template="0" indent_amount="4" indent_symbol="space" source_extension=".cpp" header_extension=".h">
     <object class="wxGladePreferencesUI" name="dialog_1" base="EditDialog">
         <style>wxDEFAULT_DIALOG_STYLE</style>
-        <icon>icons/icon.xpm</icon>
+        <icon>icons/icon.png</icon>
         <title>wxGlade: preferences</title>
+        <affirmative>ok</affirmative>
+        <escape>cancel</escape>
         <centered>1</centered>
         <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
             <orient>wxVERTICAL</orient>
diff -Nru wxglade-0.9.6/tests/casefiles/PlOgg1.pl wxglade-1.0.1/tests/casefiles/PlOgg1.pl
--- wxglade-0.9.6/tests/casefiles/PlOgg1.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PlOgg1.pl	2020-12-31 14:04:48.000000000 +0000
@@ -38,27 +38,99 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(500, 300));
+    $self->SetTitle(_T("mp3 2 ogg"));
+    $self->SetFocus();
+    
+    $self->{sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
+    
     $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
     $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("Input File"));
+    
+    $self->{grid_sizer_1} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    
+    my $label_1 = Wx::StaticText->new($self->{notebook_1_pane_1}, wxID_ANY, _T("File name:"));
+    $self->{grid_sizer_1}->Add($label_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
     $self->{text_ctrl_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{grid_sizer_1}->Add($self->{text_ctrl_1}, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
+    
     $self->{button_3} = Wx::Button->new($self->{notebook_1_pane_1}, wxID_OPEN, "");
+    $self->{grid_sizer_1}->Add($self->{button_3}, 0, wxALL, 5);
+    
     $self->{notebook_1_pane_2} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_2}, _T("Converting Options"));
+    
+    $self->{sizer_4} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{radio_box_1} = Wx::RadioBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Sampling Rate"), wxDefaultPosition, wxDefaultSize, [_T("44 kbit"), _T("128 kbit")], 0, wxRA_SPECIFY_ROWS);
+    $self->{radio_box_1}->SetSelection(0);
+    $self->{sizer_4}->Add($self->{radio_box_1}, 0, wxALL|wxEXPAND|wxSHAPED, 5);
+    
     $self->{notebook_1_pane_3} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_3}, _T("Converting Progress"));
+    
+    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{text_ctrl_2} = Wx::TextCtrl->new($self->{notebook_1_pane_3}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
+    $self->{sizer_3}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_pane_4} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_4}, _T("Output File"));
+    
+    $self->{grid_sizer_2} = Wx::FlexGridSizer->new(2, 3, 0, 0);
+    
     $self->{label_2} = Wx::StaticText->new($self->{notebook_1_pane_4}, wxID_ANY, _T("File name:"));
+    $self->{grid_sizer_2}->Add($self->{label_2}, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
     $self->{text_ctrl_3} = Wx::TextCtrl->new($self->{notebook_1_pane_4}, wxID_ANY, "");
+    $self->{grid_sizer_2}->Add($self->{text_ctrl_3}, 0, wxALL|wxEXPAND, 5);
+    
     $self->{button_4} = Wx::Button->new($self->{notebook_1_pane_4}, wxID_OPEN, "");
+    $self->{grid_sizer_2}->Add($self->{button_4}, 0, wxALL, 5);
+    
+    $self->{grid_sizer_2}->Add(20, 20, 0, 0, 0);
+    
     $self->{checkbox_1} = Wx::CheckBox->new($self->{notebook_1_pane_4}, wxID_ANY, _T("Overwrite existing file"));
+    $self->{checkbox_1}->SetToolTipString(_T("Overwrite an existing file"));
+    $self->{checkbox_1}->SetValue(1);
+    $self->{grid_sizer_2}->Add($self->{checkbox_1}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{grid_sizer_2}->Add(20, 20, 0, 0, 0);
+    
     $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
+    
     $self->{button_5} = Wx::Button->new($self, wxID_CLOSE, "");
+    $self->{sizer_2}->Add($self->{button_5}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
     $self->{button_2} = Wx::Button->new($self, wxID_CANCEL, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
+    $self->{sizer_2}->Add($self->{button_2}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
     $self->{button_1} = Wx::Button->new($self, wxID_OK, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->{sizer_2}->Add($self->{button_1}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    $self->{grid_sizer_2}->AddGrowableCol(1);
+    $self->{notebook_1_pane_4}->SetSizer($self->{grid_sizer_2});
+    
+    $self->{notebook_1_pane_3}->SetSizer($self->{sizer_3});
+    
+    $self->{notebook_1_pane_2}->SetSizer($self->{sizer_4});
+    
+    $self->{grid_sizer_1}->AddGrowableCol(1);
+    $self->{notebook_1_pane_1}->SetSizer($self->{grid_sizer_1});
+    
+    $self->{sizer_1}->AddGrowableRow(0);
+    $self->{sizer_1}->AddGrowableCol(0);
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    $self->Centre();
     Wx::Event::EVT_BUTTON($self, $self->{button_1}->GetId, $self->can('startConverting'));
 
     # end wxGlade
@@ -72,59 +144,10 @@
 
 sub __set_properties {
     my $self = shift;
-    # begin wxGlade: PlOgg1_MyDialog::__set_properties
-    $self->SetTitle(_T("mp3 2 ogg"));
-    $self->SetSize(Wx::Size->new(500, 300));
-    $self->SetFocus();
-    $self->{radio_box_1}->SetSelection(0);
-    $self->{checkbox_1}->SetToolTipString(_T("Overwrite an existing file"));
-    $self->{checkbox_1}->SetValue(1);
-    # end wxGlade
 }
 
 sub __do_layout {
     my $self = shift;
-    # begin wxGlade: PlOgg1_MyDialog::__do_layout
-    $self->{sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
-    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    $self->{grid_sizer_2} = Wx::FlexGridSizer->new(2, 3, 0, 0);
-    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_4} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{grid_sizer_1} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    my $label_1 = Wx::StaticText->new($self->{notebook_1_pane_1}, wxID_ANY, _T("File name:"));
-    $self->{grid_sizer_1}->Add($label_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    $self->{grid_sizer_1}->Add($self->{text_ctrl_1}, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_1}->Add($self->{button_3}, 0, wxALL, 5);
-    $self->{notebook_1_pane_1}->SetSizer($self->{grid_sizer_1});
-    $self->{grid_sizer_1}->AddGrowableCol(1);
-    $self->{sizer_4}->Add($self->{radio_box_1}, 0, wxALL|wxEXPAND|wxSHAPED, 5);
-    $self->{notebook_1_pane_2}->SetSizer($self->{sizer_4});
-    $self->{sizer_3}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_pane_3}->SetSizer($self->{sizer_3});
-    $self->{grid_sizer_2}->Add($self->{label_2}, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    $self->{grid_sizer_2}->Add($self->{text_ctrl_3}, 0, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{button_4}, 0, wxALL, 5);
-    $self->{grid_sizer_2}->Add(20, 20, 0, 0, 0);
-    $self->{grid_sizer_2}->Add($self->{checkbox_1}, 0, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add(20, 20, 0, 0, 0);
-    $self->{notebook_1_pane_4}->SetSizer($self->{grid_sizer_2});
-    $self->{grid_sizer_2}->AddGrowableCol(1);
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("Input File"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_2}, _T("Converting Options"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_3}, _T("Converting Progress"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_4}, _T("Output File"));
-    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
-    $self->{sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
-    $self->{sizer_2}->Add($self->{button_5}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_2}->Add($self->{button_2}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_2}->Add($self->{button_1}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
-    $self->SetSizer($self->{sizer_1});
-    $self->{sizer_1}->AddGrowableRow(0);
-    $self->{sizer_1}->AddGrowableCol(0);
-    $self->Layout();
-    $self->Centre();
-    # end wxGlade
 }
 
 sub startConverting {
diff -Nru wxglade-0.9.6/tests/casefiles/PlOgg2_MyDialog.pm wxglade-1.0.1/tests/casefiles/PlOgg2_MyDialog.pm
--- wxglade-0.9.6/tests/casefiles/PlOgg2_MyDialog.pm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PlOgg2_MyDialog.pm	2020-12-31 14:04:48.000000000 +0000
@@ -35,27 +35,98 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(500, 300));
+    $self->SetTitle(_T("mp3 2 ogg"));
+    
+    $self->{sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
+    
     $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
+    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
     $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("Input File"));
+    
+    $self->{grid_sizer_1} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    
+    my $label_1 = Wx::StaticText->new($self->{notebook_1_pane_1}, wxID_ANY, _T("File name:"));
+    $self->{grid_sizer_1}->Add($label_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
     $self->{text_ctrl_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{grid_sizer_1}->Add($self->{text_ctrl_1}, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
+    
     $self->{button_3} = Wx::Button->new($self->{notebook_1_pane_1}, wxID_OPEN, "");
+    $self->{grid_sizer_1}->Add($self->{button_3}, 0, wxALL, 5);
+    
     $self->{notebook_1_pane_2} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_2}, _T("Converting Options"));
+    
+    $self->{sizer_4} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{radio_box_1} = Wx::RadioBox->new($self->{notebook_1_pane_2}, wxID_ANY, _T("Sampling Rate"), wxDefaultPosition, wxDefaultSize, [_T("44 kbit"), _T("128 kbit")], 0, wxRA_SPECIFY_ROWS);
+    $self->{radio_box_1}->SetSelection(0);
+    $self->{sizer_4}->Add($self->{radio_box_1}, 0, wxALL|wxEXPAND|wxSHAPED, 5);
+    
     $self->{notebook_1_pane_3} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_3}, _T("Converting Progress"));
+    
+    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{text_ctrl_2} = Wx::TextCtrl->new($self->{notebook_1_pane_3}, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
+    $self->{sizer_3}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
+    
     $self->{notebook_1_pane_4} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_4}, _T("Output File"));
+    
+    $self->{grid_sizer_2} = Wx::FlexGridSizer->new(2, 3, 0, 0);
+    
     $self->{label_2} = Wx::StaticText->new($self->{notebook_1_pane_4}, wxID_ANY, _T("File name:"));
+    $self->{grid_sizer_2}->Add($self->{label_2}, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    
     $self->{text_ctrl_3} = Wx::TextCtrl->new($self->{notebook_1_pane_4}, wxID_ANY, "");
+    $self->{grid_sizer_2}->Add($self->{text_ctrl_3}, 0, wxALL|wxEXPAND, 5);
+    
     $self->{button_4} = Wx::Button->new($self->{notebook_1_pane_4}, wxID_OPEN, "");
+    $self->{grid_sizer_2}->Add($self->{button_4}, 0, wxALL, 5);
+    
+    $self->{grid_sizer_2}->Add(20, 20, 0, 0, 0);
+    
     $self->{checkbox_1} = Wx::CheckBox->new($self->{notebook_1_pane_4}, wxID_ANY, _T("Overwrite existing file"));
+    $self->{checkbox_1}->SetToolTipString(_T("Overwrite an existing file"));
+    $self->{checkbox_1}->SetValue(1);
+    $self->{grid_sizer_2}->Add($self->{checkbox_1}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{grid_sizer_2}->Add(20, 20, 0, 0, 0);
+    
     $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 3, 0, 0);
+    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
+    
     $self->{button_5} = Wx::Button->new($self, wxID_CLOSE, "");
+    $self->{sizer_2}->Add($self->{button_5}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
     $self->{button_2} = Wx::Button->new($self, wxID_CANCEL, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
+    $self->{sizer_2}->Add($self->{button_2}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
     $self->{button_1} = Wx::Button->new($self, wxID_OK, "", wxDefaultPosition, wxDefaultSize, wxBU_TOP);
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->{sizer_2}->Add($self->{button_1}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    $self->{grid_sizer_2}->AddGrowableCol(1);
+    $self->{notebook_1_pane_4}->SetSizer($self->{grid_sizer_2});
+    
+    $self->{notebook_1_pane_3}->SetSizer($self->{sizer_3});
+    
+    $self->{notebook_1_pane_2}->SetSizer($self->{sizer_4});
+    
+    $self->{grid_sizer_1}->AddGrowableCol(1);
+    $self->{notebook_1_pane_1}->SetSizer($self->{grid_sizer_1});
+    
+    $self->{sizer_1}->AddGrowableRow(0);
+    $self->{sizer_1}->AddGrowableCol(0);
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    $self->Centre();
     Wx::Event::EVT_BUTTON($self, $self->{button_1}->GetId, $self->can('startConverting'));
 
     # end wxGlade
@@ -66,58 +137,10 @@
 
 sub __set_properties {
     my $self = shift;
-    # begin wxGlade: PlOgg2_MyDialog::__set_properties
-    $self->SetTitle(_T("mp3 2 ogg"));
-    $self->SetSize(Wx::Size->new(500, 300));
-    $self->{radio_box_1}->SetSelection(0);
-    $self->{checkbox_1}->SetToolTipString(_T("Overwrite an existing file"));
-    $self->{checkbox_1}->SetValue(1);
-    # end wxGlade
 }
 
 sub __do_layout {
     my $self = shift;
-    # begin wxGlade: PlOgg2_MyDialog::__do_layout
-    $self->{sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
-    $self->{sizer_2} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    $self->{grid_sizer_2} = Wx::FlexGridSizer->new(2, 3, 0, 0);
-    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_4} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{grid_sizer_1} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    my $label_1 = Wx::StaticText->new($self->{notebook_1_pane_1}, wxID_ANY, _T("File name:"));
-    $self->{grid_sizer_1}->Add($label_1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    $self->{grid_sizer_1}->Add($self->{text_ctrl_1}, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_1}->Add($self->{button_3}, 0, wxALL, 5);
-    $self->{notebook_1_pane_1}->SetSizer($self->{grid_sizer_1});
-    $self->{grid_sizer_1}->AddGrowableCol(1);
-    $self->{sizer_4}->Add($self->{radio_box_1}, 0, wxALL|wxEXPAND|wxSHAPED, 5);
-    $self->{notebook_1_pane_2}->SetSizer($self->{sizer_4});
-    $self->{sizer_3}->Add($self->{text_ctrl_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{notebook_1_pane_3}->SetSizer($self->{sizer_3});
-    $self->{grid_sizer_2}->Add($self->{label_2}, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    $self->{grid_sizer_2}->Add($self->{text_ctrl_3}, 0, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{button_4}, 0, wxALL, 5);
-    $self->{grid_sizer_2}->Add(20, 20, 0, 0, 0);
-    $self->{grid_sizer_2}->Add($self->{checkbox_1}, 0, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add(20, 20, 0, 0, 0);
-    $self->{notebook_1_pane_4}->SetSizer($self->{grid_sizer_2});
-    $self->{grid_sizer_2}->AddGrowableCol(1);
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("Input File"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_2}, _T("Converting Options"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_3}, _T("Converting Progress"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_4}, _T("Output File"));
-    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
-    $self->{sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
-    $self->{sizer_2}->Add($self->{button_5}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_2}->Add($self->{button_2}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_2}->Add($self->{button_1}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{sizer_1}->Add($self->{sizer_2}, 0, wxALIGN_RIGHT, 0);
-    $self->SetSizer($self->{sizer_1});
-    $self->{sizer_1}->AddGrowableRow(0);
-    $self->{sizer_1}->AddGrowableCol(0);
-    $self->Layout();
-    $self->Centre();
-    # end wxGlade
 }
 
 sub startConverting {
diff -Nru wxglade-0.9.6/tests/casefiles/PlOgg2_MyFrame.pm wxglade-1.0.1/tests/casefiles/PlOgg2_MyFrame.pm
--- wxglade-0.9.6/tests/casefiles/PlOgg2_MyFrame.pm	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PlOgg2_MyFrame.pm	2020-12-31 14:04:48.000000000 +0000
@@ -35,13 +35,31 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle(_T("FrameOggCompressionDetails"));
+    
+    $self->{sizer_5} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{grid_sizer_3} = Wx::FlexGridSizer->new(3, 1, 0, 0);
+    $self->{sizer_5}->Add($self->{grid_sizer_3}, 1, wxEXPAND, 0);
+    
     $self->{grid_1} = Wx::Grid->new($self, wxID_ANY);
+    $self->{grid_1}->CreateGrid(8, 3);
+    $self->{grid_sizer_3}->Add($self->{grid_1}, 1, wxEXPAND, 0);
+    
     $self->{static_line_2} = Wx::StaticLine->new($self, wxID_ANY);
+    $self->{grid_sizer_3}->Add($self->{static_line_2}, 0, wxALL|wxEXPAND, 5);
+    
     $self->{button_6} = Wx::Button->new($self, wxID_CLOSE, "");
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->{button_6}->SetFocus();
+    $self->{button_6}->SetDefault();
+    $self->{grid_sizer_3}->Add($self->{button_6}, 0, wxALIGN_RIGHT|wxALL, 5);
+    
+    $self->{grid_sizer_3}->AddGrowableRow(0);
+    $self->{grid_sizer_3}->AddGrowableCol(0);
+    
+    $self->SetSizer($self->{sizer_5});
+    
+    $self->Layout();
     # end wxGlade
     return $self;
 
@@ -50,28 +68,10 @@
 
 sub __set_properties {
     my $self = shift;
-    # begin wxGlade: PlOgg2_MyFrame::__set_properties
-    $self->SetTitle(_T("FrameOggCompressionDetails"));
-    $self->{grid_1}->CreateGrid(8, 3);
-    $self->{button_6}->SetFocus();
-    $self->{button_6}->SetDefault();
-    # end wxGlade
 }
 
 sub __do_layout {
     my $self = shift;
-    # begin wxGlade: PlOgg2_MyFrame::__do_layout
-    $self->{sizer_5} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{grid_sizer_3} = Wx::FlexGridSizer->new(3, 1, 0, 0);
-    $self->{grid_sizer_3}->Add($self->{grid_1}, 1, wxEXPAND, 0);
-    $self->{grid_sizer_3}->Add($self->{static_line_2}, 0, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_3}->Add($self->{button_6}, 0, wxALIGN_RIGHT|wxALL, 5);
-    $self->{grid_sizer_3}->AddGrowableRow(0);
-    $self->{grid_sizer_3}->AddGrowableCol(0);
-    $self->{sizer_5}->Add($self->{grid_sizer_3}, 1, wxEXPAND, 0);
-    $self->SetSizer($self->{sizer_5});
-    $self->Layout();
-    # end wxGlade
 }
 
 # end of class PlOgg2_MyFrame
diff -Nru wxglade-0.9.6/tests/casefiles/PyOgg1.py wxglade-1.0.1/tests/casefiles/PyOgg1.py
--- wxglade-0.9.6/tests/casefiles/PyOgg1.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PyOgg1.py	2020-12-31 14:04:48.000000000 +0000
@@ -34,85 +34,109 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
         wx.Dialog.__init__(self, *args, **kwds)
         self.SetSize((500, 300))
+        self.SetTitle(_("mp3 2 ogg"))
+        self.SetFocus()
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=0)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
+
+        grid_sizer_1 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        label_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
+        grid_sizer_1.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        grid_sizer_1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
+
         self.button_3 = wx.Button(self.notebook_1_pane_1, wx.ID_OPEN, "")
+        grid_sizer_1.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
+
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.radio_box_1 = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Sampling Rate"), choices=[_("44 kbit"), _("128 kbit")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.radio_box_1.SetSelection(0)
+        sizer_4.Add(self.radio_box_1, 0, wx.ALL | wx.EXPAND | wx.SHAPED, 5)
+
         self.notebook_1_pane_3 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_pane_3, wx.ID_ANY, "", style=wx.TE_MULTILINE)
+        sizer_3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
+
         self.notebook_1_pane_4 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
+
+        grid_sizer_2 = wx.FlexGridSizer(2, 3, 0, 0)
+
         self.label_2 = wx.StaticText(self.notebook_1_pane_4, wx.ID_ANY, _("File name:"))
+        grid_sizer_2.Add(self.label_2, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_pane_4, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
+
         self.button_4 = wx.Button(self.notebook_1_pane_4, wx.ID_OPEN, "")
+        grid_sizer_2.Add(self.button_4, 0, wx.ALL, 5)
+
+        grid_sizer_2.Add((20, 20), 0, 0, 0)
+
         self.checkbox_1 = wx.CheckBox(self.notebook_1_pane_4, wx.ID_ANY, _("Overwrite existing file"))
+        self.checkbox_1.SetToolTipString(_("Overwrite an existing file"))
+        self.checkbox_1.SetValue(1)
+        grid_sizer_2.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        grid_sizer_2.Add((20, 20), 0, 0, 0)
+
         self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
         self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
+        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_2 = wx.Button(self, wx.ID_CANCEL, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
+        grid_sizer_2.AddGrowableCol(1)
+        self.notebook_1_pane_4.SetSizer(grid_sizer_2)
+
+        self.notebook_1_pane_3.SetSizer(sizer_3)
+
+        self.notebook_1_pane_2.SetSizer(sizer_4)
+
+        grid_sizer_1.AddGrowableCol(1)
+        self.notebook_1_pane_1.SetSizer(grid_sizer_1)
 
-        self.__set_properties()
-        self.__do_layout()
+        sizer_1.AddGrowableRow(0)
+        sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        self.Centre()
 
         self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
         # end wxGlade
 
     def __set_properties(self):
-        # begin wxGlade: PyOgg1_MyDialog.__set_properties
-        self.SetTitle(_("mp3 2 ogg"))
-        self.SetSize((500, 300))
-        self.SetFocus()
-        self.radio_box_1.SetSelection(0)
-        self.checkbox_1.SetToolTipString(_("Overwrite an existing file"))
-        self.checkbox_1.SetValue(1)
-        # end wxGlade
 
         # manually added
         self.SetTitle(_("mp3 2 ogg - started at") + time.asctime())
 
     def __do_layout(self):
-        # begin wxGlade: PyOgg1_MyDialog.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
-        grid_sizer_2 = wx.FlexGridSizer(2, 3, 0, 0)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_1 = wx.FlexGridSizer(1, 3, 0, 0)
-        label_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
-        grid_sizer_1.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        grid_sizer_1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_pane_1.SetSizer(grid_sizer_1)
-        grid_sizer_1.AddGrowableCol(1)
-        sizer_4.Add(self.radio_box_1, 0, wx.ALL | wx.EXPAND | wx.SHAPED, 5)
-        self.notebook_1_pane_2.SetSizer(sizer_4)
-        sizer_3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_3.SetSizer(sizer_3)
-        grid_sizer_2.Add(self.label_2, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        grid_sizer_2.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(self.button_4, 0, wx.ALL, 5)
-        grid_sizer_2.Add((20, 20), 0, 0, 0)
-        grid_sizer_2.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add((20, 20), 0, 0, 0)
-        self.notebook_1_pane_4.SetSizer(grid_sizer_2)
-        grid_sizer_2.AddGrowableCol(1)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
-        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
-        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
-        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
-        sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.AddGrowableRow(0)
-        sizer_1.AddGrowableCol(0)
-        self.Layout()
-        self.Centre()
-        # end wxGlade
 
     def startConverting(self, event):  # wxGlade: PyOgg1_MyDialog.<event_handler>
         print("Event handler 'startConverting' not implemented!")
diff -Nru wxglade-0.9.6/tests/casefiles/PyOgg2_MyDialog.py wxglade-1.0.1/tests/casefiles/PyOgg2_MyDialog.py
--- wxglade-0.9.6/tests/casefiles/PyOgg2_MyDialog.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PyOgg2_MyDialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -20,82 +20,106 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
         wx.Dialog.__init__(self, *args, **kwds)
         self.SetSize((500, 300))
+        self.SetTitle(_("mp3 2 ogg"))
+
+        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=0)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
+
+        grid_sizer_1 = wx.FlexGridSizer(1, 3, 0, 0)
+
+        label_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
+        grid_sizer_1.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         self.text_ctrl_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        grid_sizer_1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
+
         self.button_3 = wx.Button(self.notebook_1_pane_1, wx.ID_OPEN, "")
+        grid_sizer_1.Add(self.button_3, 0, wx.ALL, 5)
+
         self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
+
+        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.radio_box_1 = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Sampling Rate"), choices=[_("44 kbit"), _("128 kbit")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.radio_box_1.SetSelection(0)
+        sizer_4.Add(self.radio_box_1, 0, wx.ALL | wx.EXPAND | wx.SHAPED, 5)
+
         self.notebook_1_pane_3 = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_pane_3, wx.ID_ANY, "", style=wx.TE_MULTILINE)
-        self.notebook_1_pane_4 = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.label_2 = wx.StaticText(self.notebook_1_pane_4, wx.ID_ANY, _("File name:"))
-        self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_pane_4, wx.ID_ANY, "")
-        self.button_4 = wx.Button(self.notebook_1_pane_4, wx.ID_OPEN, "")
-        self.checkbox_1 = wx.CheckBox(self.notebook_1_pane_4, wx.ID_ANY, _("Overwrite existing file"))
-        self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
-        self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
-        self.button_2 = wx.Button(self, wx.ID_CANCEL, "", style=wx.BU_TOP)
-        self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
+        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
 
-        self.__set_properties()
-        self.__do_layout()
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
 
-        self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
-        # end wxGlade
+        self.text_ctrl_2 = wx.TextCtrl(self.notebook_1_pane_3, wx.ID_ANY, "", style=wx.TE_MULTILINE)
+        sizer_3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
 
-    def __set_properties(self):
-        # begin wxGlade: PyOgg2_MyDialog.__set_properties
-        self.SetTitle(_("mp3 2 ogg"))
-        self.SetSize((500, 300))
-        self.radio_box_1.SetSelection(0)
-        self.checkbox_1.SetToolTipString(_("Overwrite an existing file"))
-        self.checkbox_1.SetValue(1)
-        # end wxGlade
+        self.notebook_1_pane_4 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
 
-    def __do_layout(self):
-        # begin wxGlade: PyOgg2_MyDialog.__do_layout
-        sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
         grid_sizer_2 = wx.FlexGridSizer(2, 3, 0, 0)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_1 = wx.FlexGridSizer(1, 3, 0, 0)
-        label_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("File name:"))
-        grid_sizer_1.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        grid_sizer_1.Add(self.text_ctrl_1, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL | wx.EXPAND, 5)
-        grid_sizer_1.Add(self.button_3, 0, wx.ALL, 5)
-        self.notebook_1_pane_1.SetSizer(grid_sizer_1)
-        grid_sizer_1.AddGrowableCol(1)
-        sizer_4.Add(self.radio_box_1, 0, wx.ALL | wx.EXPAND | wx.SHAPED, 5)
-        self.notebook_1_pane_2.SetSizer(sizer_4)
-        sizer_3.Add(self.text_ctrl_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_3.SetSizer(sizer_3)
+
+        self.label_2 = wx.StaticText(self.notebook_1_pane_4, wx.ID_ANY, _("File name:"))
         grid_sizer_2.Add(self.label_2, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.text_ctrl_3 = wx.TextCtrl(self.notebook_1_pane_4, wx.ID_ANY, "")
         grid_sizer_2.Add(self.text_ctrl_3, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.button_4 = wx.Button(self.notebook_1_pane_4, wx.ID_OPEN, "")
         grid_sizer_2.Add(self.button_4, 0, wx.ALL, 5)
+
         grid_sizer_2.Add((20, 20), 0, 0, 0)
+
+        self.checkbox_1 = wx.CheckBox(self.notebook_1_pane_4, wx.ID_ANY, _("Overwrite existing file"))
+        self.checkbox_1.SetToolTipString(_("Overwrite an existing file"))
+        self.checkbox_1.SetValue(1)
         grid_sizer_2.Add(self.checkbox_1, 0, wx.ALL | wx.EXPAND, 5)
+
         grid_sizer_2.Add((20, 20), 0, 0, 0)
-        self.notebook_1_pane_4.SetSizer(grid_sizer_2)
-        grid_sizer_2.AddGrowableCol(1)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Input File"))
-        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Converting Options"))
-        self.notebook_1.AddPage(self.notebook_1_pane_3, _("Converting Progress"))
-        self.notebook_1.AddPage(self.notebook_1_pane_4, _("Output File"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
         sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
+
+        self.button_5 = wx.Button(self, wx.ID_CLOSE, "")
         sizer_2.Add(self.button_5, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
+        self.button_2 = wx.Button(self, wx.ID_CANCEL, "", style=wx.BU_TOP)
         sizer_2.Add(self.button_2, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
+        self.button_1 = wx.Button(self, wx.ID_OK, "", style=wx.BU_TOP)
         sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT, 0)
-        self.SetSizer(sizer_1)
+
+        grid_sizer_2.AddGrowableCol(1)
+        self.notebook_1_pane_4.SetSizer(grid_sizer_2)
+
+        self.notebook_1_pane_3.SetSizer(sizer_3)
+
+        self.notebook_1_pane_2.SetSizer(sizer_4)
+
+        grid_sizer_1.AddGrowableCol(1)
+        self.notebook_1_pane_1.SetSizer(grid_sizer_1)
+
         sizer_1.AddGrowableRow(0)
         sizer_1.AddGrowableCol(0)
+        self.SetSizer(sizer_1)
+
         self.Layout()
         self.Centre()
+
+        self.Bind(wx.EVT_BUTTON, self.startConverting, self.button_1)
         # end wxGlade
 
+    def __set_properties(self):
+
+    def __do_layout(self):
+
     def startConverting(self, event):  # wxGlade: PyOgg2_MyDialog.<event_handler>
         print("Event handler 'startConverting' not implemented!")
         event.Skip()
diff -Nru wxglade-0.9.6/tests/casefiles/PyOgg2_MyFrame.py wxglade-1.0.1/tests/casefiles/PyOgg2_MyFrame.py
--- wxglade-0.9.6/tests/casefiles/PyOgg2_MyFrame.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PyOgg2_MyFrame.py	2020-12-31 14:04:48.000000000 +0000
@@ -21,34 +21,35 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((400, 300))
-        self.grid_1 = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
-        self.static_line_2 = wx.StaticLine(self, wx.ID_ANY)
-        self.button_6 = wx.Button(self, wx.ID_CLOSE, "")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: PyOgg2_MyFrame.__set_properties
         self.SetTitle(_("FrameOggCompressionDetails"))
-        self.grid_1.CreateGrid(8, 3)
-        self.button_6.SetFocus()
-        self.button_6.SetDefault()
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: PyOgg2_MyFrame.__do_layout
         sizer_5 = wx.BoxSizer(wx.VERTICAL)
+
         grid_sizer_3 = wx.FlexGridSizer(3, 1, 0, 0)
+        sizer_5.Add(grid_sizer_3, 1, wx.EXPAND, 0)
+
+        self.grid_1 = wx.grid.Grid(self, wx.ID_ANY, size=(1, 1))
+        self.grid_1.CreateGrid(8, 3)
         grid_sizer_3.Add(self.grid_1, 1, wx.EXPAND, 0)
+
+        self.static_line_2 = wx.StaticLine(self, wx.ID_ANY)
         grid_sizer_3.Add(self.static_line_2, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.button_6 = wx.Button(self, wx.ID_CLOSE, "")
+        self.button_6.SetFocus()
+        self.button_6.SetDefault()
         grid_sizer_3.Add(self.button_6, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+
         grid_sizer_3.AddGrowableRow(0)
         grid_sizer_3.AddGrowableCol(0)
-        sizer_5.Add(grid_sizer_3, 1, wx.EXPAND, 0)
+
         self.SetSizer(sizer_5)
+
         self.Layout()
         # end wxGlade
 
+    def __set_properties(self):
+
+    def __do_layout(self):
+
 # end of class PyOgg2_MyFrame
diff -Nru wxglade-0.9.6/tests/casefiles/Python_Preferences_Classic.py wxglade-1.0.1/tests/casefiles/Python_Preferences_Classic.py
--- wxglade-0.9.6/tests/casefiles/Python_Preferences_Classic.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Python_Preferences_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,185 @@
+# -*- coding: ISO-8859-15 -*-
+#
+# generated by wxGlade 0.9.9pre on Sun Feb 23 19:04:05 2020
+#
+
+import wx
+
+# begin wxGlade: dependencies
+import gettext
+# end wxGlade
+
+# begin wxGlade: extracode
+# Python specific extra code, non-python code will fail!
+import config
+import os
+
+_icon_path = os.path.join(config.icons_path, 'icon.png')
+# end wxGlade
+
+
+class wxGladePreferencesUI(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: wxGladePreferencesUI.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetTitle(_("wxGlade: preferences"))
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(wx.Bitmap(_icon_path, wx.BITMAP_TYPE_ANY))
+        self.SetIcon(_icon)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=0)
+        sizer_1.Add(self.notebook_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Interface"))
+
+        sizer_3 = wx.BoxSizer(wx.VERTICAL)
+
+        self.use_menu_icons = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Use icons in menu items"))
+        self.use_menu_icons.SetValue(1)
+        sizer_3.Add(self.use_menu_icons, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.frame_tool_win = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show properties and tree windows as small frames"))
+        self.frame_tool_win.SetValue(1)
+        sizer_3.Add(self.frame_tool_win, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.show_progress = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show progress dialog when loading wxg files"))
+        self.show_progress.SetValue(1)
+        sizer_3.Add(self.show_progress, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.remember_geometry = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Remember position and size of wxGlade windows"))
+        self.remember_geometry.SetValue(1)
+        sizer_3.Add(self.remember_geometry, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.show_sizer_handle = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show \"handles\" of sizers"))
+        self.show_sizer_handle.SetValue(1)
+        sizer_3.Add(self.show_sizer_handle, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.use_kde_dialogs = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Use native file dialogs on KDE"))
+        self.use_kde_dialogs.SetValue(1)
+        sizer_3.Add(self.use_kde_dialogs, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_4 = wx.FlexGridSizer(4, 2, 0, 0)
+        sizer_3.Add(sizer_4, 0, wx.EXPAND, 3)
+
+        label_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Initial path for \nfile opening/saving dialogs:"))
+        sizer_4.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.open_save_path = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self.open_save_path.SetMinSize((196, -1))
+        sizer_4.Add(self.open_save_path, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        label_2_copy = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Initial path for \ncode generation file dialogs:"))
+        sizer_4.Add(label_2_copy, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.codegen_path = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self.codegen_path.SetMinSize((196, -1))
+        sizer_4.Add(self.codegen_path, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        label_2 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Number of items in file history"))
+        sizer_4.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.number_history = wx.SpinCtrl(self.notebook_1_pane_1, wx.ID_ANY, "4", min=0, max=100, style=0)
+        self.number_history.SetMinSize((196, -1))
+        sizer_4.Add(self.number_history, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        label_2_copy_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Number of buttons per row\nin the main palette"))
+        sizer_4.Add(label_2_copy_1, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.buttons_per_row = wx.SpinCtrl(self.notebook_1_pane_1, wx.ID_ANY, "5", min=1, max=100, style=0)
+        self.buttons_per_row.SetMinSize((196, -1))
+        sizer_4.Add(self.buttons_per_row, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Other"))
+
+        sizer_5 = wx.BoxSizer(wx.VERTICAL)
+
+        self.use_dialog_units = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Use dialog units by default for size properties"))
+        sizer_5.Add(self.use_dialog_units, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.wxg_backup = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Create backup wxg files"))
+        self.wxg_backup.SetValue(1)
+        sizer_5.Add(self.wxg_backup, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.codegen_backup = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Create backup files for generated source"))
+        self.codegen_backup.SetValue(1)
+        sizer_5.Add(self.codegen_backup, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.allow_duplicate_names = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Allow duplicate widget names"))
+        self.allow_duplicate_names.Hide()
+        sizer_5.Add(self.allow_duplicate_names, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_5.Add(sizer_7, 0, wx.EXPAND, 0)
+
+        self.default_border = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Default border width for widgets"))
+        sizer_7.Add(self.default_border, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.default_border_size = wx.SpinCtrl(self.notebook_1_pane_2, wx.ID_ANY, "", min=0, max=20, style=0)
+        self.default_border_size.SetMinSize((45, 22))
+        sizer_7.Add(self.default_border_size, 0, wx.ALL, 5)
+
+        sizer_7_copy = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_5.Add(sizer_7_copy, 0, wx.EXPAND, 0)
+
+        self.autosave = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Auto save wxg files every "))
+        sizer_7_copy.Add(self.autosave, 0, wx.ALIGN_CENTER_VERTICAL | wx.BOTTOM | wx.LEFT | wx.TOP, 5)
+
+        self.autosave_delay = wx.SpinCtrl(self.notebook_1_pane_2, wx.ID_ANY, "120", min=30, max=300, style=0)
+        self.autosave_delay.SetMinSize((45, 22))
+        sizer_7_copy.Add(self.autosave_delay, 0, wx.BOTTOM | wx.TOP, 5)
+
+        label_3 = wx.StaticText(self.notebook_1_pane_2, wx.ID_ANY, _(" seconds"))
+        sizer_7_copy.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL | wx.BOTTOM | wx.FIXED_MINSIZE | wx.TOP, 5)
+
+        self.write_timestamp = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Insert timestamp on generated source files"))
+        self.write_timestamp.SetValue(1)
+        sizer_5.Add(self.write_timestamp, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.write_generated_from = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Insert .wxg file name on generated source files"))
+        sizer_5.Add(self.write_generated_from, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.backup_suffix = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Backup options"), choices=[_("append ~ to filename"), _("append .bak to filename")], majorDimension=2, style=wx.RA_SPECIFY_COLS)
+        self.backup_suffix.SetSelection(0)
+        sizer_5.Add(self.backup_suffix, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_6 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Local widget path")), wx.HORIZONTAL)
+        sizer_5.Add(sizer_6, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.local_widget_path = wx.TextCtrl(self.notebook_1_pane_2, wx.ID_ANY, "")
+        sizer_6.Add(self.local_widget_path, 1, wx.ALL, 3)
+
+        self.choose_widget_path = wx.Button(self.notebook_1_pane_2, wx.ID_ANY, _("..."), style=wx.BU_EXACTFIT)
+        sizer_6.Add(self.choose_widget_path, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 3)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT | wx.ALL, 10)
+
+        self.ok = wx.Button(self, wx.ID_OK, "")
+        self.ok.SetDefault()
+        sizer_2.Add(self.ok, 0, 0, 0)
+
+        self.cancel = wx.Button(self, wx.ID_CANCEL, "")
+        sizer_2.Add(self.cancel, 0, wx.LEFT, 10)
+
+        self.notebook_1_pane_2.SetSizer(sizer_5)
+
+        sizer_4.AddGrowableCol(1)
+
+        self.notebook_1_pane_1.SetSizer(sizer_3)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.SetAffirmativeId(self.ok.GetId())
+        self.SetEscapeId(self.cancel.GetId())
+
+        self.Layout()
+        self.Centre()
+        # end wxGlade
+
+# end of class wxGladePreferencesUI
diff -Nru wxglade-0.9.6/tests/casefiles/Python_Preferences.py wxglade-1.0.1/tests/casefiles/Python_Preferences.py
--- wxglade-0.9.6/tests/casefiles/Python_Preferences.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Python_Preferences.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
 # -*- coding: ISO-8859-15 -*-
 #
-# generated by wxGlade "faked test version"
+# generated by wxGlade
 #
 
 import wx
@@ -15,132 +14,170 @@
 import config
 import os
 
-_icon_path = os.path.join(config.icons_path, 'icon.xpm')
+_icon_path = os.path.join(config.icons_path, 'icon.png')
 # end wxGlade
 
 
 class wxGladePreferencesUI(wx.Dialog):
     def __init__(self, *args, **kwds):
         # begin wxGlade: wxGladePreferencesUI.__init__
-        kwds["style"] = wx.DEFAULT_DIALOG_STYLE
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
         wx.Dialog.__init__(self, *args, **kwds)
-        self.notebook_1 = wx.Notebook(self, wx.ID_ANY)
-        self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.use_menu_icons = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Use icons in menu items"))
-        self.frame_tool_win = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show properties and tree windows as small frames"))
-        self.show_progress = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show progress dialog when loading wxg files"))
-        self.remember_geometry = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Remember position and size of wxGlade windows"))
-        self.show_sizer_handle = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show \"handles\" of sizers"))
-        self.use_kde_dialogs = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Use native file dialogs on KDE"))
-        self.open_save_path = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
-        self.codegen_path = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
-        self.number_history = wx.SpinCtrl(self.notebook_1_pane_1, wx.ID_ANY, "4", min=0, max=100)
-        self.buttons_per_row = wx.SpinCtrl(self.notebook_1_pane_1, wx.ID_ANY, "5", min=1, max=100)
-        self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.use_dialog_units = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Use dialog units by default for size properties"))
-        self.wxg_backup = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Create backup wxg files"))
-        self.codegen_backup = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Create backup files for generated source"))
-        self.allow_duplicate_names = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Allow duplicate widget names"))
-        self.default_border = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Default border width for widgets"))
-        self.default_border_size = wx.SpinCtrl(self.notebook_1_pane_2, wx.ID_ANY, "", min=0, max=20)
-        self.autosave = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Auto save wxg files every "))
-        self.autosave_delay = wx.SpinCtrl(self.notebook_1_pane_2, wx.ID_ANY, "120", min=30, max=300)
-        self.write_timestamp = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Insert timestamp on generated source files"))
-        self.write_generated_from = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Insert .wxg file name on generated source files"))
-        self.backup_suffix = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Backup options"), choices=[_("append ~ to filename"), _("append .bak to filename")], majorDimension=2, style=wx.RA_SPECIFY_COLS)
-        self.local_widget_path = wx.TextCtrl(self.notebook_1_pane_2, wx.ID_ANY, "")
-        self.choose_widget_path = wx.Button(self.notebook_1_pane_2, wx.ID_ANY, _("..."), style=wx.BU_EXACTFIT)
-        self.ok = wx.Button(self, wx.ID_OK, "")
-        self.cancel = wx.Button(self, wx.ID_CANCEL, "")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: wxGladePreferencesUI.__set_properties
         self.SetTitle(_("wxGlade: preferences"))
         _icon = wx.NullIcon
         _icon.CopyFromBitmap(wx.Bitmap(_icon_path, wx.BITMAP_TYPE_ANY))
         self.SetIcon(_icon)
-        self.use_menu_icons.SetValue(1)
-        self.frame_tool_win.SetValue(1)
-        self.show_progress.SetValue(1)
-        self.remember_geometry.SetValue(1)
-        self.show_sizer_handle.SetValue(1)
-        self.use_kde_dialogs.SetValue(1)
-        self.open_save_path.SetMinSize((196, -1))
-        self.codegen_path.SetMinSize((196, -1))
-        self.number_history.SetMinSize((196, -1))
-        self.buttons_per_row.SetMinSize((196, -1))
-        self.wxg_backup.SetValue(1)
-        self.codegen_backup.SetValue(1)
-        self.allow_duplicate_names.Hide()
-        self.default_border_size.SetMinSize((45, 22))
-        self.autosave_delay.SetMinSize((45, 22))
-        self.write_timestamp.SetValue(1)
-        self.backup_suffix.SetSelection(0)
-        self.ok.SetDefault()
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: wxGladePreferencesUI.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.VERTICAL)
-        sizer_6 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Local widget path")), wx.HORIZONTAL)
-        sizer_7_copy = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.notebook_1 = wx.Notebook(self, wx.ID_ANY, style=0)
+        sizer_1.Add(self.notebook_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Interface"))
+
         sizer_3 = wx.BoxSizer(wx.VERTICAL)
-        sizer_4 = wx.FlexGridSizer(4, 2, 0, 0)
+
+        self.use_menu_icons = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Use icons in menu items"))
+        self.use_menu_icons.SetValue(1)
         sizer_3.Add(self.use_menu_icons, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.frame_tool_win = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show properties and tree windows as small frames"))
+        self.frame_tool_win.SetValue(1)
         sizer_3.Add(self.frame_tool_win, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.show_progress = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show progress dialog when loading wxg files"))
+        self.show_progress.SetValue(1)
         sizer_3.Add(self.show_progress, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.remember_geometry = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Remember position and size of wxGlade windows"))
+        self.remember_geometry.SetValue(1)
         sizer_3.Add(self.remember_geometry, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.show_sizer_handle = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Show \"handles\" of sizers"))
+        self.show_sizer_handle.SetValue(1)
         sizer_3.Add(self.show_sizer_handle, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.use_kde_dialogs = wx.CheckBox(self.notebook_1_pane_1, wx.ID_ANY, _("Use native file dialogs on KDE"))
+        self.use_kde_dialogs.SetValue(1)
         sizer_3.Add(self.use_kde_dialogs, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_4 = wx.FlexGridSizer(4, 2, 0, 0)
+        sizer_3.Add(sizer_4, 0, wx.EXPAND, 3)
+
         label_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Initial path for \nfile opening/saving dialogs:"))
         sizer_4.Add(label_1, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.open_save_path = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self.open_save_path.SetMinSize((196, -1))
         sizer_4.Add(self.open_save_path, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         label_2_copy = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Initial path for \ncode generation file dialogs:"))
         sizer_4.Add(label_2_copy, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.codegen_path = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self.codegen_path.SetMinSize((196, -1))
         sizer_4.Add(self.codegen_path, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         label_2 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Number of items in file history"))
         sizer_4.Add(label_2, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.number_history = wx.SpinCtrl(self.notebook_1_pane_1, wx.ID_ANY, "4", min=0, max=100, style=0)
+        self.number_history.SetMinSize((196, -1))
         sizer_4.Add(self.number_history, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
         label_2_copy_1 = wx.StaticText(self.notebook_1_pane_1, wx.ID_ANY, _("Number of buttons per row\nin the main palette"))
         sizer_4.Add(label_2_copy_1, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.buttons_per_row = wx.SpinCtrl(self.notebook_1_pane_1, wx.ID_ANY, "5", min=1, max=100, style=0)
+        self.buttons_per_row.SetMinSize((196, -1))
         sizer_4.Add(self.buttons_per_row, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
-        sizer_4.AddGrowableCol(1)
-        sizer_3.Add(sizer_4, 0, wx.EXPAND, 3)
-        self.notebook_1_pane_1.SetSizer(sizer_3)
+
+        self.notebook_1_pane_2 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Other"))
+
+        sizer_5 = wx.BoxSizer(wx.VERTICAL)
+
+        self.use_dialog_units = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Use dialog units by default for size properties"))
         sizer_5.Add(self.use_dialog_units, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.wxg_backup = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Create backup wxg files"))
+        self.wxg_backup.SetValue(1)
         sizer_5.Add(self.wxg_backup, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.codegen_backup = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Create backup files for generated source"))
+        self.codegen_backup.SetValue(1)
         sizer_5.Add(self.codegen_backup, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.allow_duplicate_names = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Allow duplicate widget names"))
+        self.allow_duplicate_names.Hide()
         sizer_5.Add(self.allow_duplicate_names, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_5.Add(sizer_7, 0, wx.EXPAND, 0)
+
+        self.default_border = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Default border width for widgets"))
         sizer_7.Add(self.default_border, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
+
+        self.default_border_size = wx.SpinCtrl(self.notebook_1_pane_2, wx.ID_ANY, "", min=0, max=20, style=0)
+        self.default_border_size.SetMinSize((45, 22))
         sizer_7.Add(self.default_border_size, 0, wx.ALL, 5)
-        sizer_5.Add(sizer_7, 0, wx.EXPAND, 0)
+
+        sizer_7_copy = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_5.Add(sizer_7_copy, 0, wx.EXPAND, 0)
+
+        self.autosave = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Auto save wxg files every "))
         sizer_7_copy.Add(self.autosave, 0, wx.ALIGN_CENTER_VERTICAL | wx.BOTTOM | wx.LEFT | wx.TOP, 5)
+
+        self.autosave_delay = wx.SpinCtrl(self.notebook_1_pane_2, wx.ID_ANY, "120", min=30, max=300, style=0)
+        self.autosave_delay.SetMinSize((45, 22))
         sizer_7_copy.Add(self.autosave_delay, 0, wx.BOTTOM | wx.TOP, 5)
+
         label_3 = wx.StaticText(self.notebook_1_pane_2, wx.ID_ANY, _(" seconds"))
         sizer_7_copy.Add(label_3, 0, wx.ALIGN_CENTER_VERTICAL | wx.BOTTOM | wx.FIXED_MINSIZE | wx.TOP, 5)
-        sizer_5.Add(sizer_7_copy, 0, wx.EXPAND, 0)
+
+        self.write_timestamp = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Insert timestamp on generated source files"))
+        self.write_timestamp.SetValue(1)
         sizer_5.Add(self.write_timestamp, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.write_generated_from = wx.CheckBox(self.notebook_1_pane_2, wx.ID_ANY, _("Insert .wxg file name on generated source files"))
         sizer_5.Add(self.write_generated_from, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.backup_suffix = wx.RadioBox(self.notebook_1_pane_2, wx.ID_ANY, _("Backup options"), choices=[_("append ~ to filename"), _("append .bak to filename")], majorDimension=2, style=wx.RA_SPECIFY_COLS)
+        self.backup_suffix.SetSelection(0)
         sizer_5.Add(self.backup_suffix, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_6 = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_pane_2, wx.ID_ANY, _("Local widget path")), wx.HORIZONTAL)
+        sizer_5.Add(sizer_6, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.local_widget_path = wx.TextCtrl(self.notebook_1_pane_2, wx.ID_ANY, "")
         sizer_6.Add(self.local_widget_path, 1, wx.ALL, 3)
+
+        self.choose_widget_path = wx.Button(self.notebook_1_pane_2, wx.ID_ANY, _("..."), style=wx.BU_EXACTFIT)
         sizer_6.Add(self.choose_widget_path, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 3)
-        sizer_5.Add(sizer_6, 0, wx.ALL | wx.EXPAND, 5)
-        self.notebook_1_pane_2.SetSizer(sizer_5)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("Interface"))
-        self.notebook_1.AddPage(self.notebook_1_pane_2, _("Other"))
-        sizer_1.Add(self.notebook_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT | wx.ALL, 10)
+
+        self.ok = wx.Button(self, wx.ID_OK, "")
+        self.ok.SetDefault()
         sizer_2.Add(self.ok, 0, 0, 0)
+
+        self.cancel = wx.Button(self, wx.ID_CANCEL, "")
         sizer_2.Add(self.cancel, 0, wx.LEFT, 10)
-        sizer_1.Add(sizer_2, 0, wx.ALIGN_RIGHT | wx.ALL, 10)
+
+        self.notebook_1_pane_2.SetSizer(sizer_5)
+
+        sizer_4.AddGrowableCol(1)
+
+        self.notebook_1_pane_1.SetSizer(sizer_3)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
+        self.SetAffirmativeId(self.ok.GetId())
+        self.SetEscapeId(self.cancel.GetId())
+
         self.Layout()
         self.Centre()
         # end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/Python_Preferences.wxg wxglade-1.0.1/tests/casefiles/Python_Preferences.wxg
--- wxglade-0.9.6/tests/casefiles/Python_Preferences.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Python_Preferences.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -3,10 +3,12 @@
 
 <application path="Python_Preferences.py" name="" class="" option="0" language="python" top_window="dialog_1" encoding="ISO-8859-15" use_gettext="1" overwrite="1" use_new_namespace="1" for_version="2.6" is_template="0">
     <object class="wxGladePreferencesUI" name="dialog_1" base="EditDialog">
-        <extracode># Python specific extra code, non-python code will fail!\nimport config\nimport os\n\n_icon_path = os.path.join(config.icons_path, 'icon.xpm')\n</extracode>
+        <extracode># Python specific extra code, non-python code will fail!\nimport config\nimport os\n\n_icon_path = os.path.join(config.icons_path, 'icon.png')\n</extracode>
         <style>wxDEFAULT_DIALOG_STYLE</style>
         <icon>var:_icon_path</icon>
         <title>wxGlade: preferences</title>
+        <affirmative>ok</affirmative>
+        <escape>cancel</escape>
         <centered>1</centered>
         <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
             <orient>wxVERTICAL</orient>
diff -Nru wxglade-0.9.6/tests/casefiles/PythonSubclass_PythonSubclass.py wxglade-1.0.1/tests/casefiles/PythonSubclass_PythonSubclass.py
--- wxglade-0.9.6/tests/casefiles/PythonSubclass_PythonSubclass.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/PythonSubclass_PythonSubclass.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 #
-# generated by wxGlade 0.8.0a4 on Wed Oct 18 22:02:04 2017
+# generated by wxGlade
 #
 
 import wx
@@ -16,23 +16,16 @@
         # begin wxGlade: PythonSubclass.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: PythonSubclass.__set_properties
         self.SetTitle(_("frame"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: PythonSubclass.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         label_1 = wx.StaticText(self, wx.ID_ANY, _("Hello World !"))
         sizer_1.Add(label_1, 0, wx.ALL, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/Sizers_classattr.cpp wxglade-1.0.1/tests/casefiles/Sizers_classattr.cpp
--- wxglade-0.9.6/tests/casefiles/Sizers_classattr.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Sizers_classattr.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,62 +20,46 @@
     wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
 {
     // begin wxGlade: MyDialog::MyDialog
-    const wxString list_box_1_choices[] = {};
-    list_box_1 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_1_choices, 0);
-    button_4 = new wxButton(this, wxID_ADD, wxEmptyString);
-    button_5 = new wxButton(this, wxID_REMOVE, wxEmptyString);
-    const wxString list_box_2_choices[] = {};
-    list_box_2 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_2_choices, 0);
-    static_line_1 = new wxStaticLine(this, wxID_ANY);
-    button_2 = new wxButton(this, wxID_OK, wxEmptyString);
-    button_1 = new wxButton(this, wxID_CANCEL, wxEmptyString);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyDialog::set_properties()
-{
-    // begin wxGlade: MyDialog::set_properties
     SetTitle(_("dialog_1"));
-    // end wxGlade
-}
-
-
-void MyDialog::do_layout()
-{
-    // begin wxGlade: MyDialog::do_layout
     grid_sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
-    sizer_1 = new wxBoxSizer(wxHORIZONTAL);
     grid_sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
-    sizer_3 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Assigned Permissions:")), wxHORIZONTAL);
-    sizer_4 = new wxFlexGridSizer(4, 1, 0, 0);
+    grid_sizer_1->Add(grid_sizer_2, 1, wxEXPAND, 0);
     sizer_2 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Unassigned Permissions:")), wxHORIZONTAL);
-    sizer_2->Add(list_box_1, 1, wxALL|wxEXPAND, 5);
     grid_sizer_2->Add(sizer_2, 1, wxEXPAND, 0);
+    const wxString list_box_1_choices[] = {};
+    list_box_1 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_1_choices, 0);
+    sizer_2->Add(list_box_1, 1, wxALL|wxEXPAND, 5);
+    sizer_4 = new wxFlexGridSizer(4, 1, 0, 0);
+    grid_sizer_2->Add(sizer_4, 1, wxEXPAND, 0);
     sizer_4->Add(20, 20, 0, wxEXPAND, 0);
+    button_4 = new wxButton(this, wxID_ADD, wxEmptyString);
     sizer_4->Add(button_4, 0, wxALL, 5);
+    button_5 = new wxButton(this, wxID_REMOVE, wxEmptyString);
     sizer_4->Add(button_5, 0, wxALL, 5);
     sizer_4->Add(20, 20, 0, wxEXPAND, 0);
+    sizer_3 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Assigned Permissions:")), wxHORIZONTAL);
+    grid_sizer_2->Add(sizer_3, 1, wxEXPAND, 0);
+    const wxString list_box_2_choices[] = {};
+    list_box_2 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_2_choices, 0);
+    sizer_3->Add(list_box_2, 1, wxALL|wxEXPAND, 5);
+    static_line_1 = new wxStaticLine(this, wxID_ANY);
+    grid_sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
+    sizer_1 = new wxBoxSizer(wxHORIZONTAL);
+    grid_sizer_1->Add(sizer_1, 1, wxALIGN_RIGHT|wxEXPAND, 0);
+    button_2 = new wxButton(this, wxID_OK, wxEmptyString);
+    sizer_1->Add(button_2, 0, wxALL, 5);
+    button_1 = new wxButton(this, wxID_CANCEL, wxEmptyString);
+    sizer_1->Add(button_1, 0, wxALL, 5);
+    
     sizer_4->AddGrowableRow(0);
     sizer_4->AddGrowableRow(3);
-    grid_sizer_2->Add(sizer_4, 1, wxEXPAND, 0);
-    sizer_3->Add(list_box_2, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(sizer_3, 1, wxEXPAND, 0);
     grid_sizer_2->AddGrowableRow(0);
     grid_sizer_2->AddGrowableCol(0);
     grid_sizer_2->AddGrowableCol(2);
-    grid_sizer_1->Add(grid_sizer_2, 1, wxEXPAND, 0);
-    grid_sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
-    sizer_1->Add(button_2, 0, wxALL, 5);
-    sizer_1->Add(button_1, 0, wxALL, 5);
-    grid_sizer_1->Add(sizer_1, 1, wxALIGN_RIGHT|wxEXPAND, 0);
-    SetSizer(grid_sizer_1);
-    grid_sizer_1->Fit(this);
     grid_sizer_1->AddGrowableRow(0);
     grid_sizer_1->AddGrowableCol(0);
+    SetSizer(grid_sizer_1);
+    grid_sizer_1->Fit(this);
     Layout();
     // end wxGlade
 }
diff -Nru wxglade-0.9.6/tests/casefiles/Sizers_classattr.h wxglade-1.0.1/tests/casefiles/Sizers_classattr.h
--- wxglade-0.9.6/tests/casefiles/Sizers_classattr.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Sizers_classattr.h	2020-12-31 14:04:48.000000000 +0000
@@ -37,26 +37,22 @@
     MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
 
 private:
-    // begin wxGlade: MyDialog::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyDialog::attributes
-    wxListBox* list_box_1;
+    wxFlexGridSizer* grid_sizer_1;
+    wxFlexGridSizer* grid_sizer_2;
     wxStaticBoxSizer* sizer_2;
+    wxListBox* list_box_1;
+    wxFlexGridSizer* sizer_4;
     wxButton* button_4;
     wxButton* button_5;
-    wxFlexGridSizer* sizer_4;
-    wxListBox* list_box_2;
     wxStaticBoxSizer* sizer_3;
-    wxFlexGridSizer* grid_sizer_2;
+    wxListBox* list_box_2;
     wxStaticLine* static_line_1;
+    wxBoxSizer* sizer_1;
     wxButton* button_2;
     wxButton* button_1;
-    wxBoxSizer* sizer_1;
-    wxFlexGridSizer* grid_sizer_1;
     // end wxGlade
 }; // wxGlade: end class
 
diff -Nru wxglade-0.9.6/tests/casefiles/Sizers_classattr.lisp wxglade-1.0.1/tests/casefiles/Sizers_classattr.lisp
--- wxglade-0.9.6/tests/casefiles/Sizers_classattr.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Sizers_classattr.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -29,19 +29,19 @@
 
 (defclass MyDialog()
         ((top-window :initform nil :accessor slot-top-window)
-        (list-box-1 :initform nil :accessor slot-list-box-1)
+        (grid-sizer-1 :initform nil :accessor slot-grid-sizer-1)
+        (grid-sizer-2 :initform nil :accessor slot-grid-sizer-2)
         (sizer-2 :initform nil :accessor slot-sizer-2)
+        (list-box-1 :initform nil :accessor slot-list-box-1)
+        (sizer-4 :initform nil :accessor slot-sizer-4)
         (button-4 :initform nil :accessor slot-button-4)
         (button-5 :initform nil :accessor slot-button-5)
-        (sizer-4 :initform nil :accessor slot-sizer-4)
-        (list-box-2 :initform nil :accessor slot-list-box-2)
         (sizer-3 :initform nil :accessor slot-sizer-3)
-        (grid-sizer-2 :initform nil :accessor slot-grid-sizer-2)
+        (list-box-2 :initform nil :accessor slot-list-box-2)
         (static-line-1 :initform nil :accessor slot-static-line-1)
-        (button-2 :initform nil :accessor slot-button-2)
-        (button-1 :initform nil :accessor slot-button-1)
         (sizer-1 :initform nil :accessor slot-sizer-1)
-        (grid-sizer-1 :initform nil :accessor slot-grid-sizer-1)))
+        (button-2 :initform nil :accessor slot-button-2)
+        (button-1 :initform nil :accessor slot-button-1)))
 
 (defun make-MyDialog ()
         (let ((obj (make-instance 'MyDialog)))
@@ -54,53 +54,62 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyDialog.__init__
         (setf (slot-top-window obj) (wxDialog_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_DIALOG_STYLE))
-        (setf (slot-list-box-1 obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0 (vector ) 0))
-        (setf (slot-button-4 obj) (wxButton_Create (slot-top-window obj) wxID_ADD "" -1 -1 -1 -1 0))
-        (setf (slot-button-5 obj) (wxButton_Create (slot-top-window obj) wxID_REMOVE "" -1 -1 -1 -1 0))
-        (setf (slot-list-box-2 obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0 (vector ) 0))
-        (setf (slot-static-line-1 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
-        (setf (slot-button-2 obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 0))
-        (setf (slot-button-1 obj) (wxButton_Create (slot-top-window obj) wxID_CANCEL "" -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyDialog))
-        ;;; begin wxGlade: MyDialog.__set_properties
         (wxWindow_SetTitle (slot-dialog-1 self) (_"dialog_1"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyDialog))
-        ;;; begin wxGlade: MyDialog.__do_layout
+        
         (setf (slot-grid-sizer-1 obj) (wxGridSizer_Create 3 1 0 0))
-        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-grid-sizer-2 obj) (wxGridSizer_Create 1 3 0 0))
-        (setf (slot-sizer-3 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-frame obj) (_"Assigned Permissions:")) wxHORIZONTAL))
-        (setf (slot-sizer-4 obj) (wxGridSizer_Create 4 1 0 0))
+        (wxSizer_AddSizer (slot-grid-sizer-1 obj) (slot-grid-sizer-2 obj) 1 wxEXPAND 0 nil)
+        
         (setf (slot-sizer-2 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-frame obj) (_"Unassigned Permissions:")) wxHORIZONTAL))
-        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-list-box-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
         (wxSizer_AddSizer (slot-grid-sizer-2 obj) (slot-sizer-2 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-list-box-1 obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0 (vector ) 0))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-list-box-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-4 obj) (wxGridSizer_Create 4 1 0 0))
+        (wxSizer_AddSizer (slot-grid-sizer-2 obj) (slot-sizer-4 obj) 1 wxEXPAND 0 nil)
+        
         (wxSizer_AddWindow (slot-sizer-4 obj) ((20, 20) obj) 0 wxEXPAND 0 nil)
+        
+        (setf (slot-button-4 obj) (wxButton_Create (slot-top-window obj) wxID_ADD "" -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-button-4 obj) 0 wxALL 5 nil)
+        
+        (setf (slot-button-5 obj) (wxButton_Create (slot-top-window obj) wxID_REMOVE "" -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-button-5 obj) 0 wxALL 5 nil)
+        
         (wxSizer_AddWindow (slot-sizer-4 obj) ((20, 20) obj) 0 wxEXPAND 0 nil)
+        
+        (setf (slot-sizer-3 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-frame obj) (_"Assigned Permissions:")) wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-grid-sizer-2 obj) (slot-sizer-3 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-list-box-2 obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0 (vector ) 0))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-list-box-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-static-line-1 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-static-line-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-grid-sizer-1 obj) (slot-sizer-1 obj) 1 (logior wxALIGN_RIGHT wxEXPAND) 0 nil)
+        
+        (setf (slot-button-2 obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-button-2 obj) 0 wxALL 5 nil)
+        
+        (setf (slot-button-1 obj) (wxButton_Create (slot-top-window obj) wxID_CANCEL "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-button-1 obj) 0 wxALL 5 nil)
+        
         (wxFlexGridSizer_AddGrowableRow (slot-sizer-4 obj) 0)
         (wxFlexGridSizer_AddGrowableRow (slot-sizer-4 obj) 3)
-        (wxSizer_AddSizer (slot-grid-sizer-2 obj) (slot-sizer-4 obj) 1 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-list-box-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddSizer (slot-grid-sizer-2 obj) (slot-sizer-3 obj) 1 wxEXPAND 0 nil)
+        
         (wxFlexGridSizer_AddGrowableRow (slot-grid-sizer-2 obj) 0)
         (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-2 obj) 0)
         (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-2 obj) 2)
-        (wxSizer_AddSizer (slot-grid-sizer-1 obj) (slot-grid-sizer-2 obj) 1 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-static-line-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-button-2 obj) 0 wxALL 5 nil)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-button-1 obj) 0 wxALL 5 nil)
-        (wxSizer_AddSizer (slot-grid-sizer-1 obj) (slot-sizer-1 obj) 1 (logior wxALIGN_RIGHT wxEXPAND) 0 nil)
-        (wxWindow_SetSizer (slot-frame obj) (slot-grid-sizer-1 obj))
-        (wxSizer_Fit (slot-grid-sizer-1 obj) (slot-frame obj))
+        
         (wxFlexGridSizer_AddGrowableRow (slot-grid-sizer-1 obj) 0)
         (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-1 obj) 0)
+        (wxWindow_SetSizer (slot-frame obj) (slot-grid-sizer-1 obj))
+        (wxSizer_Fit (slot-grid-sizer-1 obj) (slot-frame obj))
+        
         (wxWindow_layout (slot-dialog-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/Sizers_classattr.pl wxglade-1.0.1/tests/casefiles/Sizers_classattr.pl
--- wxglade-0.9.6/tests/casefiles/Sizers_classattr.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Sizers_classattr.pl	2020-12-31 14:04:48.000000000 +0000
@@ -35,66 +35,69 @@
         unless defined $style;
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{list_box_1} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], 0);
-    $self->{button_4} = Wx::Button->new($self, wxID_ADD, "");
-    $self->{button_5} = Wx::Button->new($self, wxID_REMOVE, "");
-    $self->{list_box_2} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], 0);
-    $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
-    $self->{button_2} = Wx::Button->new($self, wxID_OK, "");
-    $self->{button_1} = Wx::Button->new($self, wxID_CANCEL, "");
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyDialog::__set_properties
     $self->SetTitle(_T("dialog_1"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyDialog::__do_layout
+    
     $self->{grid_sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
-    $self->{sizer_1} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{grid_sizer_2} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    $self->{sizer_3} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self, wxID_ANY, _T("Assigned Permissions:")), wxHORIZONTAL);
-    $self->{sizer_4} = Wx::FlexGridSizer->new(4, 1, 0, 0);
+    $self->{grid_sizer_1}->Add($self->{grid_sizer_2}, 1, wxEXPAND, 0);
+    
     $self->{sizer_2} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self, wxID_ANY, _T("Unassigned Permissions:")), wxHORIZONTAL);
-    $self->{sizer_2}->Add($self->{list_box_1}, 1, wxALL|wxEXPAND, 5);
     $self->{grid_sizer_2}->Add($self->{sizer_2}, 1, wxEXPAND, 0);
+    
+    $self->{list_box_1} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], 0);
+    $self->{sizer_2}->Add($self->{list_box_1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_4} = Wx::FlexGridSizer->new(4, 1, 0, 0);
+    $self->{grid_sizer_2}->Add($self->{sizer_4}, 1, wxEXPAND, 0);
+    
     $self->{sizer_4}->Add(20, 20, 0, wxEXPAND, 0);
+    
+    $self->{button_4} = Wx::Button->new($self, wxID_ADD, "");
     $self->{sizer_4}->Add($self->{button_4}, 0, wxALL, 5);
+    
+    $self->{button_5} = Wx::Button->new($self, wxID_REMOVE, "");
     $self->{sizer_4}->Add($self->{button_5}, 0, wxALL, 5);
+    
     $self->{sizer_4}->Add(20, 20, 0, wxEXPAND, 0);
+    
+    $self->{sizer_3} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self, wxID_ANY, _T("Assigned Permissions:")), wxHORIZONTAL);
+    $self->{grid_sizer_2}->Add($self->{sizer_3}, 1, wxEXPAND, 0);
+    
+    $self->{list_box_2} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], 0);
+    $self->{sizer_3}->Add($self->{list_box_2}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
+    $self->{grid_sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{grid_sizer_1}->Add($self->{sizer_1}, 1, wxALIGN_RIGHT|wxEXPAND, 0);
+    
+    $self->{button_2} = Wx::Button->new($self, wxID_OK, "");
+    $self->{sizer_1}->Add($self->{button_2}, 0, wxALL, 5);
+    
+    $self->{button_1} = Wx::Button->new($self, wxID_CANCEL, "");
+    $self->{sizer_1}->Add($self->{button_1}, 0, wxALL, 5);
+    
     $self->{sizer_4}->AddGrowableRow(0);
     $self->{sizer_4}->AddGrowableRow(3);
-    $self->{grid_sizer_2}->Add($self->{sizer_4}, 1, wxEXPAND, 0);
-    $self->{sizer_3}->Add($self->{list_box_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{sizer_3}, 1, wxEXPAND, 0);
+    
     $self->{grid_sizer_2}->AddGrowableRow(0);
     $self->{grid_sizer_2}->AddGrowableCol(0);
     $self->{grid_sizer_2}->AddGrowableCol(2);
-    $self->{grid_sizer_1}->Add($self->{grid_sizer_2}, 1, wxEXPAND, 0);
-    $self->{grid_sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
-    $self->{sizer_1}->Add($self->{button_2}, 0, wxALL, 5);
-    $self->{sizer_1}->Add($self->{button_1}, 0, wxALL, 5);
-    $self->{grid_sizer_1}->Add($self->{sizer_1}, 1, wxALIGN_RIGHT|wxEXPAND, 0);
-    $self->SetSizer($self->{grid_sizer_1});
-    $self->{grid_sizer_1}->Fit($self);
+    
     $self->{grid_sizer_1}->AddGrowableRow(0);
     $self->{grid_sizer_1}->AddGrowableCol(0);
+    $self->SetSizer($self->{grid_sizer_1});
+    $self->{grid_sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyDialog
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/Sizers_classattr.py wxglade-1.0.1/tests/casefiles/Sizers_classattr.py
--- wxglade-0.9.6/tests/casefiles/Sizers_classattr.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Sizers_classattr.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,54 +19,62 @@
         # begin wxGlade: MyDialog.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
         wx.Dialog.__init__(self, *args, **kwds)
-        self.list_box_1 = wx.ListBox(self, wx.ID_ANY, choices=[], style=0)
-        self.button_4 = wx.Button(self, wx.ID_ADD, "")
-        self.button_5 = wx.Button(self, wx.ID_REMOVE, "")
-        self.list_box_2 = wx.ListBox(self, wx.ID_ANY, choices=[], style=0)
-        self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
-        self.button_2 = wx.Button(self, wx.ID_OK, "")
-        self.button_1 = wx.Button(self, wx.ID_CANCEL, "")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyDialog.__set_properties
         self.SetTitle(_("dialog_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyDialog.__do_layout
         self.grid_sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        self.sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+
         self.grid_sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
-        self.sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Assigned Permissions:")), wx.HORIZONTAL)
-        self.sizer_4 = wx.FlexGridSizer(4, 1, 0, 0)
+        self.grid_sizer_1.Add(self.grid_sizer_2, 1, wx.EXPAND, 0)
+
         self.sizer_2 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Unassigned Permissions:")), wx.HORIZONTAL)
-        self.sizer_2.Add(self.list_box_1, 1, wx.ALL | wx.EXPAND, 5)
         self.grid_sizer_2.Add(self.sizer_2, 1, wx.EXPAND, 0)
+
+        self.list_box_1 = wx.ListBox(self, wx.ID_ANY, choices=[], style=0)
+        self.sizer_2.Add(self.list_box_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.sizer_4 = wx.FlexGridSizer(4, 1, 0, 0)
+        self.grid_sizer_2.Add(self.sizer_4, 1, wx.EXPAND, 0)
+
         self.sizer_4.Add((20, 20), 0, wx.EXPAND, 0)
+
+        self.button_4 = wx.Button(self, wx.ID_ADD, "")
         self.sizer_4.Add(self.button_4, 0, wx.ALL, 5)
+
+        self.button_5 = wx.Button(self, wx.ID_REMOVE, "")
         self.sizer_4.Add(self.button_5, 0, wx.ALL, 5)
+
         self.sizer_4.Add((20, 20), 0, wx.EXPAND, 0)
+
+        self.sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Assigned Permissions:")), wx.HORIZONTAL)
+        self.grid_sizer_2.Add(self.sizer_3, 1, wx.EXPAND, 0)
+
+        self.list_box_2 = wx.ListBox(self, wx.ID_ANY, choices=[], style=0)
+        self.sizer_3.Add(self.list_box_2, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        self.grid_sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        self.sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+        self.grid_sizer_1.Add(self.sizer_1, 1, wx.ALIGN_RIGHT | wx.EXPAND, 0)
+
+        self.button_2 = wx.Button(self, wx.ID_OK, "")
+        self.sizer_1.Add(self.button_2, 0, wx.ALL, 5)
+
+        self.button_1 = wx.Button(self, wx.ID_CANCEL, "")
+        self.sizer_1.Add(self.button_1, 0, wx.ALL, 5)
+
         self.sizer_4.AddGrowableRow(0)
         self.sizer_4.AddGrowableRow(3)
-        self.grid_sizer_2.Add(self.sizer_4, 1, wx.EXPAND, 0)
-        self.sizer_3.Add(self.list_box_2, 1, wx.ALL | wx.EXPAND, 5)
-        self.grid_sizer_2.Add(self.sizer_3, 1, wx.EXPAND, 0)
+
         self.grid_sizer_2.AddGrowableRow(0)
         self.grid_sizer_2.AddGrowableCol(0)
         self.grid_sizer_2.AddGrowableCol(2)
-        self.grid_sizer_1.Add(self.grid_sizer_2, 1, wx.EXPAND, 0)
-        self.grid_sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        self.sizer_1.Add(self.button_2, 0, wx.ALL, 5)
-        self.sizer_1.Add(self.button_1, 0, wx.ALL, 5)
-        self.grid_sizer_1.Add(self.sizer_1, 1, wx.ALIGN_RIGHT | wx.EXPAND, 0)
-        self.SetSizer(self.grid_sizer_1)
-        self.grid_sizer_1.Fit(self)
+
         self.grid_sizer_1.AddGrowableRow(0)
         self.grid_sizer_1.AddGrowableCol(0)
+        self.SetSizer(self.grid_sizer_1)
+        self.grid_sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.cpp wxglade-1.0.1/tests/casefiles/Sizers_no_classattr.cpp
--- wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Sizers_no_classattr.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,62 +20,46 @@
     wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
 {
     // begin wxGlade: MyDialog::MyDialog
-    const wxString list_box_1_choices[] = {};
-    list_box_1 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_1_choices, 0);
-    button_4 = new wxButton(this, wxID_ADD, wxEmptyString);
-    button_5 = new wxButton(this, wxID_REMOVE, wxEmptyString);
-    const wxString list_box_2_choices[] = {};
-    list_box_2 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_2_choices, 0);
-    static_line_1 = new wxStaticLine(this, wxID_ANY);
-    button_2 = new wxButton(this, wxID_OK, wxEmptyString);
-    button_1 = new wxButton(this, wxID_CANCEL, wxEmptyString);
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyDialog::set_properties()
-{
-    // begin wxGlade: MyDialog::set_properties
     SetTitle(_("dialog_1"));
-    // end wxGlade
-}
-
-
-void MyDialog::do_layout()
-{
-    // begin wxGlade: MyDialog::do_layout
     wxFlexGridSizer* grid_sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxHORIZONTAL);
     wxFlexGridSizer* grid_sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
-    wxStaticBoxSizer* sizer_3 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Assigned Permissions:")), wxHORIZONTAL);
-    wxFlexGridSizer* sizer_4 = new wxFlexGridSizer(4, 1, 0, 0);
+    grid_sizer_1->Add(grid_sizer_2, 1, wxEXPAND, 0);
     wxStaticBoxSizer* sizer_2 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Unassigned Permissions:")), wxHORIZONTAL);
-    sizer_2->Add(list_box_1, 1, wxALL|wxEXPAND, 5);
     grid_sizer_2->Add(sizer_2, 1, wxEXPAND, 0);
+    const wxString list_box_1_choices[] = {};
+    list_box_1 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_1_choices, 0);
+    sizer_2->Add(list_box_1, 1, wxALL|wxEXPAND, 5);
+    wxFlexGridSizer* sizer_4 = new wxFlexGridSizer(4, 1, 0, 0);
+    grid_sizer_2->Add(sizer_4, 1, wxEXPAND, 0);
     sizer_4->Add(20, 20, 0, wxEXPAND, 0);
+    button_4 = new wxButton(this, wxID_ADD, wxEmptyString);
     sizer_4->Add(button_4, 0, wxALL, 5);
+    button_5 = new wxButton(this, wxID_REMOVE, wxEmptyString);
     sizer_4->Add(button_5, 0, wxALL, 5);
     sizer_4->Add(20, 20, 0, wxEXPAND, 0);
+    wxStaticBoxSizer* sizer_3 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Assigned Permissions:")), wxHORIZONTAL);
+    grid_sizer_2->Add(sizer_3, 1, wxEXPAND, 0);
+    const wxString list_box_2_choices[] = {};
+    list_box_2 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_2_choices, 0);
+    sizer_3->Add(list_box_2, 1, wxALL|wxEXPAND, 5);
+    static_line_1 = new wxStaticLine(this, wxID_ANY);
+    grid_sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxHORIZONTAL);
+    grid_sizer_1->Add(sizer_1, 1, wxALIGN_RIGHT|wxEXPAND, 0);
+    button_2 = new wxButton(this, wxID_OK, wxEmptyString);
+    sizer_1->Add(button_2, 0, wxALL, 5);
+    button_1 = new wxButton(this, wxID_CANCEL, wxEmptyString);
+    sizer_1->Add(button_1, 0, wxALL, 5);
+    
     sizer_4->AddGrowableRow(0);
     sizer_4->AddGrowableRow(3);
-    grid_sizer_2->Add(sizer_4, 1, wxEXPAND, 0);
-    sizer_3->Add(list_box_2, 1, wxALL|wxEXPAND, 5);
-    grid_sizer_2->Add(sizer_3, 1, wxEXPAND, 0);
     grid_sizer_2->AddGrowableRow(0);
     grid_sizer_2->AddGrowableCol(0);
     grid_sizer_2->AddGrowableCol(2);
-    grid_sizer_1->Add(grid_sizer_2, 1, wxEXPAND, 0);
-    grid_sizer_1->Add(static_line_1, 0, wxALL|wxEXPAND, 5);
-    sizer_1->Add(button_2, 0, wxALL, 5);
-    sizer_1->Add(button_1, 0, wxALL, 5);
-    grid_sizer_1->Add(sizer_1, 1, wxALIGN_RIGHT|wxEXPAND, 0);
-    SetSizer(grid_sizer_1);
-    grid_sizer_1->Fit(this);
     grid_sizer_1->AddGrowableRow(0);
     grid_sizer_1->AddGrowableCol(0);
+    SetSizer(grid_sizer_1);
+    grid_sizer_1->Fit(this);
     Layout();
     // end wxGlade
 }
diff -Nru wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.h wxglade-1.0.1/tests/casefiles/Sizers_no_classattr.h
--- wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Sizers_no_classattr.h	2020-12-31 14:04:48.000000000 +0000
@@ -37,10 +37,6 @@
     MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
 
 private:
-    // begin wxGlade: MyDialog::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyDialog::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.lisp wxglade-1.0.1/tests/casefiles/Sizers_no_classattr.lisp
--- wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Sizers_no_classattr.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -29,19 +29,19 @@
 
 (defclass MyDialog()
         ((top-window :initform nil :accessor slot-top-window)
-        (list-box-1 :initform nil :accessor slot-list-box-1)
+        (grid-sizer-1 :initform nil :accessor slot-grid-sizer-1)
+        (grid-sizer-2 :initform nil :accessor slot-grid-sizer-2)
         (sizer-2 :initform nil :accessor slot-sizer-2)
+        (list-box-1 :initform nil :accessor slot-list-box-1)
+        (sizer-4 :initform nil :accessor slot-sizer-4)
         (button-4 :initform nil :accessor slot-button-4)
         (button-5 :initform nil :accessor slot-button-5)
-        (sizer-4 :initform nil :accessor slot-sizer-4)
-        (list-box-2 :initform nil :accessor slot-list-box-2)
         (sizer-3 :initform nil :accessor slot-sizer-3)
-        (grid-sizer-2 :initform nil :accessor slot-grid-sizer-2)
+        (list-box-2 :initform nil :accessor slot-list-box-2)
         (static-line-1 :initform nil :accessor slot-static-line-1)
-        (button-2 :initform nil :accessor slot-button-2)
-        (button-1 :initform nil :accessor slot-button-1)
         (sizer-1 :initform nil :accessor slot-sizer-1)
-        (grid-sizer-1 :initform nil :accessor slot-grid-sizer-1)))
+        (button-2 :initform nil :accessor slot-button-2)
+        (button-1 :initform nil :accessor slot-button-1)))
 
 (defun make-MyDialog ()
         (let ((obj (make-instance 'MyDialog)))
@@ -54,53 +54,62 @@
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyDialog.__init__
         (setf (slot-top-window obj) (wxDialog_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_DIALOG_STYLE))
-        (setf (slot-list-box-1 obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0 (vector ) 0))
-        (setf (slot-button-4 obj) (wxButton_Create (slot-top-window obj) wxID_ADD "" -1 -1 -1 -1 0))
-        (setf (slot-button-5 obj) (wxButton_Create (slot-top-window obj) wxID_REMOVE "" -1 -1 -1 -1 0))
-        (setf (slot-list-box-2 obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0 (vector ) 0))
-        (setf (slot-static-line-1 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
-        (setf (slot-button-2 obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 0))
-        (setf (slot-button-1 obj) (wxButton_Create (slot-top-window obj) wxID_CANCEL "" -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyDialog))
-        ;;; begin wxGlade: MyDialog.__set_properties
         (wxWindow_SetTitle (slot-dialog-1 self) (_"dialog_1"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyDialog))
-        ;;; begin wxGlade: MyDialog.__do_layout
+        
         (setf (slot-grid-sizer-1 obj) (wxGridSizer_Create 3 1 0 0))
-        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
         (setf (slot-grid-sizer-2 obj) (wxGridSizer_Create 1 3 0 0))
-        (setf (slot-sizer-3 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-frame obj) (_"Assigned Permissions:")) wxHORIZONTAL))
-        (setf (slot-sizer-4 obj) (wxGridSizer_Create 4 1 0 0))
+        (wxSizer_AddSizer (slot-grid-sizer-1 obj) (slot-grid-sizer-2 obj) 1 wxEXPAND 0 nil)
+        
         (setf (slot-sizer-2 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-frame obj) (_"Unassigned Permissions:")) wxHORIZONTAL))
-        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-list-box-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
         (wxSizer_AddSizer (slot-grid-sizer-2 obj) (slot-sizer-2 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-list-box-1 obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0 (vector ) 0))
+        (wxSizer_AddWindow (slot-sizer-2 obj) (slot-list-box-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-4 obj) (wxGridSizer_Create 4 1 0 0))
+        (wxSizer_AddSizer (slot-grid-sizer-2 obj) (slot-sizer-4 obj) 1 wxEXPAND 0 nil)
+        
         (wxSizer_AddWindow (slot-sizer-4 obj) ((20, 20) obj) 0 wxEXPAND 0 nil)
+        
+        (setf (slot-button-4 obj) (wxButton_Create (slot-top-window obj) wxID_ADD "" -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-button-4 obj) 0 wxALL 5 nil)
+        
+        (setf (slot-button-5 obj) (wxButton_Create (slot-top-window obj) wxID_REMOVE "" -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-4 obj) (slot-button-5 obj) 0 wxALL 5 nil)
+        
         (wxSizer_AddWindow (slot-sizer-4 obj) ((20, 20) obj) 0 wxEXPAND 0 nil)
+        
+        (setf (slot-sizer-3 obj) (StaticBoxSizer_Create (wxStaticBox:wxStaticBox_Create (slot-frame obj) (_"Assigned Permissions:")) wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-grid-sizer-2 obj) (slot-sizer-3 obj) 1 wxEXPAND 0 nil)
+        
+        (setf (slot-list-box-2 obj) (wxListBox_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 0 (vector ) 0))
+        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-list-box-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-static-line-1 obj) (wxStaticLine_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxLI_HORIZONTAL))
+        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-static-line-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxHORIZONTAL))
+        (wxSizer_AddSizer (slot-grid-sizer-1 obj) (slot-sizer-1 obj) 1 (logior wxALIGN_RIGHT wxEXPAND) 0 nil)
+        
+        (setf (slot-button-2 obj) (wxButton_Create (slot-top-window obj) wxID_OK "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-button-2 obj) 0 wxALL 5 nil)
+        
+        (setf (slot-button-1 obj) (wxButton_Create (slot-top-window obj) wxID_CANCEL "" -1 -1 -1 -1 0))
+        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-button-1 obj) 0 wxALL 5 nil)
+        
         (wxFlexGridSizer_AddGrowableRow (slot-sizer-4 obj) 0)
         (wxFlexGridSizer_AddGrowableRow (slot-sizer-4 obj) 3)
-        (wxSizer_AddSizer (slot-grid-sizer-2 obj) (slot-sizer-4 obj) 1 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-sizer-3 obj) (slot-list-box-2 obj) 1 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddSizer (slot-grid-sizer-2 obj) (slot-sizer-3 obj) 1 wxEXPAND 0 nil)
+        
         (wxFlexGridSizer_AddGrowableRow (slot-grid-sizer-2 obj) 0)
         (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-2 obj) 0)
         (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-2 obj) 2)
-        (wxSizer_AddSizer (slot-grid-sizer-1 obj) (slot-grid-sizer-2 obj) 1 wxEXPAND 0 nil)
-        (wxSizer_AddWindow (slot-grid-sizer-1 obj) (slot-static-line-1 obj) 0 (logior wxALL wxEXPAND) 5 nil)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-button-2 obj) 0 wxALL 5 nil)
-        (wxSizer_AddWindow (slot-sizer-1 obj) (slot-button-1 obj) 0 wxALL 5 nil)
-        (wxSizer_AddSizer (slot-grid-sizer-1 obj) (slot-sizer-1 obj) 1 (logior wxALIGN_RIGHT wxEXPAND) 0 nil)
-        (wxWindow_SetSizer (slot-frame obj) (slot-grid-sizer-1 obj))
-        (wxSizer_Fit (slot-grid-sizer-1 obj) (slot-frame obj))
+        
         (wxFlexGridSizer_AddGrowableRow (slot-grid-sizer-1 obj) 0)
         (wxFlexGridSizer_AddGrowableCol (slot-grid-sizer-1 obj) 0)
+        (wxWindow_SetSizer (slot-frame obj) (slot-grid-sizer-1 obj))
+        (wxSizer_Fit (slot-grid-sizer-1 obj) (slot-frame obj))
+        
         (wxWindow_layout (slot-dialog-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.pl wxglade-1.0.1/tests/casefiles/Sizers_no_classattr.pl
--- wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Sizers_no_classattr.pl	2020-12-31 14:04:48.000000000 +0000
@@ -35,66 +35,69 @@
         unless defined $style;
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{list_box_1} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], 0);
-    $self->{button_4} = Wx::Button->new($self, wxID_ADD, "");
-    $self->{button_5} = Wx::Button->new($self, wxID_REMOVE, "");
-    $self->{list_box_2} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], 0);
-    $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
-    $self->{button_2} = Wx::Button->new($self, wxID_OK, "");
-    $self->{button_1} = Wx::Button->new($self, wxID_CANCEL, "");
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyDialog::__set_properties
     $self->SetTitle(_T("dialog_1"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyDialog::__do_layout
+    
     $self->{grid_sizer_1} = Wx::FlexGridSizer->new(3, 1, 0, 0);
-    $self->{sizer_1} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
     $self->{grid_sizer_2} = Wx::FlexGridSizer->new(1, 3, 0, 0);
-    $self->{sizer_3} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self, wxID_ANY, _T("Assigned Permissions:")), wxHORIZONTAL);
-    $self->{sizer_4} = Wx::FlexGridSizer->new(4, 1, 0, 0);
+    $self->{grid_sizer_1}->Add($self->{grid_sizer_2}, 1, wxEXPAND, 0);
+    
     $self->{sizer_2} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self, wxID_ANY, _T("Unassigned Permissions:")), wxHORIZONTAL);
-    $self->{sizer_2}->Add($self->{list_box_1}, 1, wxALL|wxEXPAND, 5);
     $self->{grid_sizer_2}->Add($self->{sizer_2}, 1, wxEXPAND, 0);
+    
+    $self->{list_box_1} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], 0);
+    $self->{sizer_2}->Add($self->{list_box_1}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_4} = Wx::FlexGridSizer->new(4, 1, 0, 0);
+    $self->{grid_sizer_2}->Add($self->{sizer_4}, 1, wxEXPAND, 0);
+    
     $self->{sizer_4}->Add(20, 20, 0, wxEXPAND, 0);
+    
+    $self->{button_4} = Wx::Button->new($self, wxID_ADD, "");
     $self->{sizer_4}->Add($self->{button_4}, 0, wxALL, 5);
+    
+    $self->{button_5} = Wx::Button->new($self, wxID_REMOVE, "");
     $self->{sizer_4}->Add($self->{button_5}, 0, wxALL, 5);
+    
     $self->{sizer_4}->Add(20, 20, 0, wxEXPAND, 0);
+    
+    $self->{sizer_3} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self, wxID_ANY, _T("Assigned Permissions:")), wxHORIZONTAL);
+    $self->{grid_sizer_2}->Add($self->{sizer_3}, 1, wxEXPAND, 0);
+    
+    $self->{list_box_2} = Wx::ListBox->new($self, wxID_ANY, wxDefaultPosition, wxDefaultSize, [], 0);
+    $self->{sizer_3}->Add($self->{list_box_2}, 1, wxALL|wxEXPAND, 5);
+    
+    $self->{static_line_1} = Wx::StaticLine->new($self, wxID_ANY);
+    $self->{grid_sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxHORIZONTAL);
+    $self->{grid_sizer_1}->Add($self->{sizer_1}, 1, wxALIGN_RIGHT|wxEXPAND, 0);
+    
+    $self->{button_2} = Wx::Button->new($self, wxID_OK, "");
+    $self->{sizer_1}->Add($self->{button_2}, 0, wxALL, 5);
+    
+    $self->{button_1} = Wx::Button->new($self, wxID_CANCEL, "");
+    $self->{sizer_1}->Add($self->{button_1}, 0, wxALL, 5);
+    
     $self->{sizer_4}->AddGrowableRow(0);
     $self->{sizer_4}->AddGrowableRow(3);
-    $self->{grid_sizer_2}->Add($self->{sizer_4}, 1, wxEXPAND, 0);
-    $self->{sizer_3}->Add($self->{list_box_2}, 1, wxALL|wxEXPAND, 5);
-    $self->{grid_sizer_2}->Add($self->{sizer_3}, 1, wxEXPAND, 0);
+    
     $self->{grid_sizer_2}->AddGrowableRow(0);
     $self->{grid_sizer_2}->AddGrowableCol(0);
     $self->{grid_sizer_2}->AddGrowableCol(2);
-    $self->{grid_sizer_1}->Add($self->{grid_sizer_2}, 1, wxEXPAND, 0);
-    $self->{grid_sizer_1}->Add($self->{static_line_1}, 0, wxALL|wxEXPAND, 5);
-    $self->{sizer_1}->Add($self->{button_2}, 0, wxALL, 5);
-    $self->{sizer_1}->Add($self->{button_1}, 0, wxALL, 5);
-    $self->{grid_sizer_1}->Add($self->{sizer_1}, 1, wxALIGN_RIGHT|wxEXPAND, 0);
-    $self->SetSizer($self->{grid_sizer_1});
-    $self->{grid_sizer_1}->Fit($self);
+    
     $self->{grid_sizer_1}->AddGrowableRow(0);
     $self->{grid_sizer_1}->AddGrowableCol(0);
+    $self->SetSizer($self->{grid_sizer_1});
+    $self->{grid_sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyDialog
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.py wxglade-1.0.1/tests/casefiles/Sizers_no_classattr.py
--- wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Sizers_no_classattr.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,54 +19,62 @@
         # begin wxGlade: MyDialog.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
         wx.Dialog.__init__(self, *args, **kwds)
-        self.list_box_1 = wx.ListBox(self, wx.ID_ANY, choices=[], style=0)
-        self.button_4 = wx.Button(self, wx.ID_ADD, "")
-        self.button_5 = wx.Button(self, wx.ID_REMOVE, "")
-        self.list_box_2 = wx.ListBox(self, wx.ID_ANY, choices=[], style=0)
-        self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
-        self.button_2 = wx.Button(self, wx.ID_OK, "")
-        self.button_1 = wx.Button(self, wx.ID_CANCEL, "")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyDialog.__set_properties
         self.SetTitle(_("dialog_1"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyDialog.__do_layout
         grid_sizer_1 = wx.FlexGridSizer(3, 1, 0, 0)
-        sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+
         grid_sizer_2 = wx.FlexGridSizer(1, 3, 0, 0)
-        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Assigned Permissions:")), wx.HORIZONTAL)
-        sizer_4 = wx.FlexGridSizer(4, 1, 0, 0)
+        grid_sizer_1.Add(grid_sizer_2, 1, wx.EXPAND, 0)
+
         sizer_2 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Unassigned Permissions:")), wx.HORIZONTAL)
-        sizer_2.Add(self.list_box_1, 1, wx.ALL | wx.EXPAND, 5)
         grid_sizer_2.Add(sizer_2, 1, wx.EXPAND, 0)
+
+        self.list_box_1 = wx.ListBox(self, wx.ID_ANY, choices=[], style=0)
+        sizer_2.Add(self.list_box_1, 1, wx.ALL | wx.EXPAND, 5)
+
+        sizer_4 = wx.FlexGridSizer(4, 1, 0, 0)
+        grid_sizer_2.Add(sizer_4, 1, wx.EXPAND, 0)
+
         sizer_4.Add((20, 20), 0, wx.EXPAND, 0)
+
+        self.button_4 = wx.Button(self, wx.ID_ADD, "")
         sizer_4.Add(self.button_4, 0, wx.ALL, 5)
+
+        self.button_5 = wx.Button(self, wx.ID_REMOVE, "")
         sizer_4.Add(self.button_5, 0, wx.ALL, 5)
+
         sizer_4.Add((20, 20), 0, wx.EXPAND, 0)
+
+        sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Assigned Permissions:")), wx.HORIZONTAL)
+        grid_sizer_2.Add(sizer_3, 1, wx.EXPAND, 0)
+
+        self.list_box_2 = wx.ListBox(self, wx.ID_ANY, choices=[], style=0)
+        sizer_3.Add(self.list_box_2, 1, wx.ALL | wx.EXPAND, 5)
+
+        self.static_line_1 = wx.StaticLine(self, wx.ID_ANY)
+        grid_sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
+
+        sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
+        grid_sizer_1.Add(sizer_1, 1, wx.ALIGN_RIGHT | wx.EXPAND, 0)
+
+        self.button_2 = wx.Button(self, wx.ID_OK, "")
+        sizer_1.Add(self.button_2, 0, wx.ALL, 5)
+
+        self.button_1 = wx.Button(self, wx.ID_CANCEL, "")
+        sizer_1.Add(self.button_1, 0, wx.ALL, 5)
+
         sizer_4.AddGrowableRow(0)
         sizer_4.AddGrowableRow(3)
-        grid_sizer_2.Add(sizer_4, 1, wx.EXPAND, 0)
-        sizer_3.Add(self.list_box_2, 1, wx.ALL | wx.EXPAND, 5)
-        grid_sizer_2.Add(sizer_3, 1, wx.EXPAND, 0)
+
         grid_sizer_2.AddGrowableRow(0)
         grid_sizer_2.AddGrowableCol(0)
         grid_sizer_2.AddGrowableCol(2)
-        grid_sizer_1.Add(grid_sizer_2, 1, wx.EXPAND, 0)
-        grid_sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5)
-        sizer_1.Add(self.button_2, 0, wx.ALL, 5)
-        sizer_1.Add(self.button_1, 0, wx.ALL, 5)
-        grid_sizer_1.Add(sizer_1, 1, wx.ALIGN_RIGHT | wx.EXPAND, 0)
-        self.SetSizer(grid_sizer_1)
-        grid_sizer_1.Fit(self)
+
         grid_sizer_1.AddGrowableRow(0)
         grid_sizer_1.AddGrowableCol(0)
+        self.SetSizer(grid_sizer_1)
+        grid_sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests_Classic.py wxglade-1.0.1/tests/casefiles/SizersSizeTests_Classic.py
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests_Classic.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -20,1084 +20,1472 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((600, 400))
+        self.SetTitle(_("frame"))
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("BoxSizer"))
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_3_nosize = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_3_nosize, 1, wx.EXPAND, 0)
+
         self._0_N_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_N_N, 0, 0, 0)
+
         self._1_N_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_N_N, 1, 0, 0)
+
         self._0_X_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_X_N, 0, wx.EXPAND, 0)
+
         self._1_X_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_X_N, 1, wx.EXPAND, 0)
+
         self._0_N_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_N_F, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_N_F, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_X_F, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_X_F, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_4_abs = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_4_abs, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_N_N_copy, 0, 0, 0)
+
         self._1_N_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_N_N_copy, 1, 0, 0)
+
         self._0_X_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_X_N_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_X_N_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_N_F_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_N_F_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_X_F_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_X_F_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_5_dlg = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_5_dlg, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._0_N_N_copy_1, 0, 0, 0)
+
         self._1_N_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._1_N_N_copy_1, 1, 0, 0)
+
         self._0_X_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._0_X_N_copy_1, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._1_X_N_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._0_N_F_copy_1, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._1_N_F_copy_1, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._0_X_F_copy_1, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._1_X_F_copy_1, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1abs = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_m1abs, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_N_N_copy_2, 0, 0, 0)
+
         self._1_N_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_N_N_copy_2, 1, 0, 0)
+
         self._0_X_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_X_N_copy_2, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_X_N_copy_2, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_N_F_copy_2, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_N_F_copy_2, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_X_F_copy_2, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_X_F_copy_2, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_absm1 = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_absm1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_N_N_copy_3, 0, 0, 0)
+
         self._1_N_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_N_N_copy_3, 1, 0, 0)
+
         self._0_X_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_X_N_copy_3, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_X_N_copy_3, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_N_F_copy_3, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_N_F_copy_3, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_X_F_copy_3, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_X_F_copy_3, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1dlg = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_m1dlg, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._0_N_N_copy_4, 0, 0, 0)
+
         self._1_N_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._1_N_N_copy_4, 1, 0, 0)
+
         self._0_X_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_4.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._0_X_N_copy_4, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_4.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._1_X_N_copy_4, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._0_N_F_copy_4, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._1_N_F_copy_4, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_6_m1dlg.Add(self._0_X_F_copy_4, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_6_m1dlg.Add(self._1_X_F_copy_4, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_dlgm1 = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_dlgm1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._0_N_N_copy_5, 0, 0, 0)
+
         self._1_N_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._1_N_N_copy_5, 1, 0, 0)
+
         self._0_X_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._0_X_N_copy_5, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._1_X_N_copy_5, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._0_N_F_copy_5, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._1_N_F_copy_5, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._0_X_F_copy_5, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._1_X_F_copy_5, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_WrapSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_WrapSizer, _("WrapSizer"))
+
+        sizer_8 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_3_nosize_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_3_nosize_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._0_N_N_copy_30, 0, 0, 0)
+
         self._1_N_N_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._1_N_N_copy_30, 1, 0, 0)
+
         self._0_X_N_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._0_X_N_copy_30, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._1_X_N_copy_30, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._0_N_F_copy_30, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._1_N_F_copy_30, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._0_X_F_copy_30, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._1_X_F_copy_30, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_4_abs_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_4_abs_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._0_N_N_copy_30_copy, 0, 0, 0)
+
         self._1_N_N_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._1_N_N_copy_30_copy, 1, 0, 0)
+
         self._0_X_N_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._0_X_N_copy_30_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._1_X_N_copy_30_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._0_N_F_copy_30_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._1_N_F_copy_30_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._0_X_F_copy_30_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._1_X_F_copy_30_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_5_dlg_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_5_dlg_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_30_copy_1, (100, 21)))
+        sizer_5_dlg_copy_1.Add(self._0_N_N_copy_30_copy_1, 0, 0, 0)
+
         self._1_N_N_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_30_copy_1, (100, 21)))
+        sizer_5_dlg_copy_1.Add(self._1_N_N_copy_30_copy_1, 1, 0, 0)
+
         self._0_X_N_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_30_copy_1, (100, 21)))
+        sizer_5_dlg_copy_1.Add(self._0_X_N_copy_30_copy_1, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_30_copy_1, (100, 21)))
+        sizer_5_dlg_copy_1.Add(self._1_X_N_copy_30_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
-        self._1_N_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_30_copy_1, (100, 21)))
+        sizer_5_dlg_copy_1.Add(self._0_N_F_copy_30_copy_1, 0, wx.FIXED_MINSIZE, 0)
+
+        self._1_N_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_30_copy_1, (100, 21)))
+        sizer_5_dlg_copy_1.Add(self._1_N_F_copy_30_copy_1, 1, wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_30_copy_1, (100, 21)))
+        sizer_5_dlg_copy_1.Add(self._0_X_F_copy_30_copy_1, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_30_copy_1, (100, 21)))
+        sizer_5_dlg_copy_1.Add(self._1_X_F_copy_30_copy_1, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1abs_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_6_m1abs_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._0_N_N_copy_30_copy_2, 0, 0, 0)
+
         self._1_N_N_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._1_N_N_copy_30_copy_2, 1, 0, 0)
+
         self._0_X_N_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._0_X_N_copy_30_copy_2, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._1_X_N_copy_30_copy_2, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._0_N_F_copy_30_copy_2, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._1_N_F_copy_30_copy_2, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._0_X_F_copy_30_copy_2, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._1_X_F_copy_30_copy_2, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_absm1_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_6_absm1_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._0_N_N_copy_30_copy_3, 0, 0, 0)
+
         self._1_N_N_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._1_N_N_copy_30_copy_3, 1, 0, 0)
+
         self._0_X_N_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._0_X_N_copy_30_copy_3, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._1_X_N_copy_30_copy_3, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._0_N_F_copy_30_copy_3, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._1_N_F_copy_30_copy_3, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._0_X_F_copy_30_copy_3, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._1_X_F_copy_30_copy_3, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1dlg_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_6_m1dlg_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_30_copy_4, (-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._0_N_N_copy_30_copy_4, 0, 0, 0)
+
         self._1_N_N_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_30_copy_4, (-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._1_N_N_copy_30_copy_4, 1, 0, 0)
+
         self._0_X_N_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_30_copy_4, (-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._0_X_N_copy_30_copy_4, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_30_copy_4, (-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._1_X_N_copy_30_copy_4, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_30_copy_4, (-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._0_N_F_copy_30_copy_4, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_30_copy_4, (-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._1_N_F_copy_30_copy_4, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_6_m1dlg_copy_1.Add(self._0_X_F_copy_30_copy_4, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_6_m1dlg_copy_1.Add(self._1_X_F_copy_30_copy_4, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_dlgm1_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_6_dlgm1_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_30_copy_5, (100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._0_N_N_copy_30_copy_5, 0, 0, 0)
+
         self._1_N_N_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_30_copy_5, (100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._1_N_N_copy_30_copy_5, 1, 0, 0)
+
         self._0_X_N_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_30_copy_5, (100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._0_X_N_copy_30_copy_5, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_30_copy_5, (100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._1_X_N_copy_30_copy_5, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_30_copy_5, (100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._0_N_F_copy_30_copy_5, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_30_copy_5, (100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._1_N_F_copy_30_copy_5, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_30_copy_5, (100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._0_X_F_copy_30_copy_5, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_30_copy_5, (100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._1_X_F_copy_30_copy_5, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_StaticBoxSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_StaticBoxSizer, _("StaticBoxSizer"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_3_nosize_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_3_nosize_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_3_nosize_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_N_N_copy_6, 0, 0, 0)
+
         self._1_N_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_N_N_copy_6, 1, 0, 0)
+
         self._0_X_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_X_N_copy_6, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_X_N_copy_6, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_N_F_copy_6, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_N_F_copy_6, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_X_F_copy_6, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_X_F_copy_6, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_4_abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_4_abs_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_4_abs_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_N_N_copy_copy, 0, 0, 0)
+
         self._1_N_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_N_N_copy_copy, 1, 0, 0)
+
         self._0_X_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_X_N_copy_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_X_N_copy_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_N_F_copy_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_N_F_copy_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_X_F_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_X_F_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_5_dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_5_dlg_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_5_dlg_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_7.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._0_N_N_copy_7, 0, 0, 0)
+
         self._1_N_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_7.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._1_N_N_copy_7, 1, 0, 0)
+
         self._0_X_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_7.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._0_X_N_copy_7, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_7.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._1_X_N_copy_7, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_7.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._0_N_F_copy_7, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_7.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._1_N_F_copy_7, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_7.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._0_X_F_copy_7, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_7.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._1_X_F_copy_7, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1abs_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_m1abs_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_N_N_copy_8, 0, 0, 0)
+
         self._1_N_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_N_N_copy_8, 1, 0, 0)
+
         self._0_X_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_X_N_copy_8, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_X_N_copy_8, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_N_F_copy_8, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_N_F_copy_8, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_X_F_copy_8, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_X_F_copy_8, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_absm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_absm1_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_absm1_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_N_N_copy_9, 0, 0, 0)
+
         self._1_N_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_N_N_copy_9, 1, 0, 0)
+
         self._0_X_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_X_N_copy_9, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_X_N_copy_9, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_N_F_copy_9, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_N_F_copy_9, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_X_F_copy_9, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_X_F_copy_9, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1dlg_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_m1dlg_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
-        self._1_N_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
-        self._0_X_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_10.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._0_N_N_copy_10, 0, 0, 0)
+
+        self._1_N_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_10.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._1_N_N_copy_10, 1, 0, 0)
+
+        self._0_X_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_10.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._0_X_N_copy_10, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_10.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._1_X_N_copy_10, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_10.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._0_N_F_copy_10, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_10.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._1_N_F_copy_10, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_6_m1dlg_copy.Add(self._0_X_F_copy_10, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_6_m1dlg_copy.Add(self._1_X_F_copy_10, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_dlgm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_dlgm1_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_dlgm1_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_11.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_N_N_copy_11, 0, 0, 0)
+
         self._1_N_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_11.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_N_N_copy_11, 1, 0, 0)
+
         self._0_X_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_11.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_X_N_copy_11, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_11.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_X_N_copy_11, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_11.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_N_F_copy_11, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_11.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_N_F_copy_11, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_11.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_X_F_copy_11, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_11.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_X_F_copy_11, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_GridSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_GridSizer, _("GridSizer"))
+
+        sizer_4 = wx.GridSizer(7, 8, 0, 0)
+
         self._0_N_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_N_N_copy_12, 0, 0, 0)
+
         self._1_N_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_N_N_copy_12, 1, 0, 0)
+
         self._0_X_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_X_N_copy_12, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_X_N_copy_12, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_N_F_copy_12, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_N_F_copy_12, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_X_F_copy_12, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_X_F_copy_12, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_N_N_copy_copy_copy, 0, 0, 0)
+
         self._1_N_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_N_N_copy_copy_copy, 1, 0, 0)
+
         self._0_X_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_X_N_copy_copy_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_X_N_copy_copy_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_N_F_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_N_F_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_X_F_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_X_F_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_13.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_13, (100, 21)))
+        sizer_4.Add(self._0_N_N_copy_13, 0, 0, 0)
+
         self._1_N_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_13.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_13, (100, 21)))
+        sizer_4.Add(self._1_N_N_copy_13, 1, 0, 0)
+
         self._0_X_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_13.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_13, (100, 21)))
+        sizer_4.Add(self._0_X_N_copy_13, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_13.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_13, (100, 21)))
+        sizer_4.Add(self._1_X_N_copy_13, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_13.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_13, (100, 21)))
+        sizer_4.Add(self._0_N_F_copy_13, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_13.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_13, (100, 21)))
+        sizer_4.Add(self._1_N_F_copy_13, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_13.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_13, (100, 21)))
+        sizer_4.Add(self._0_X_F_copy_13, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_13.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_13, (100, 21)))
+        sizer_4.Add(self._1_X_F_copy_13, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_N_N_copy_14, 0, 0, 0)
+
         self._1_N_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_N_N_copy_14, 1, 0, 0)
+
         self._0_X_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_X_N_copy_14, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_X_N_copy_14, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_N_F_copy_14, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_N_F_copy_14, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_X_F_copy_14, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_X_F_copy_14, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_N_N_copy_15, 0, 0, 0)
+
         self._1_N_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_N_N_copy_15, 1, 0, 0)
+
         self._0_X_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_X_N_copy_15, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_X_N_copy_15, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_N_F_copy_15, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_N_F_copy_15, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_X_F_copy_15, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_X_F_copy_15, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_16.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_16, (-1, 100)))
+        sizer_4.Add(self._0_N_N_copy_16, 0, 0, 0)
+
         self._1_N_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_16.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_16, (-1, 100)))
+        sizer_4.Add(self._1_N_N_copy_16, 1, 0, 0)
+
         self._0_X_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_16.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_16, (-1, 100)))
+        sizer_4.Add(self._0_X_N_copy_16, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_16.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_16, (-1, 100)))
+        sizer_4.Add(self._1_X_N_copy_16, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_16.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_16, (-1, 100)))
+        sizer_4.Add(self._0_N_F_copy_16, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_16.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_16, (-1, 100)))
+        sizer_4.Add(self._1_N_F_copy_16, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_X_F_copy_16, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_X_F_copy_16, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_17.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_17, (100, -1)))
+        sizer_4.Add(self._0_N_N_copy_17, 0, 0, 0)
+
         self._1_N_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_17.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_17, (100, -1)))
+        sizer_4.Add(self._1_N_N_copy_17, 1, 0, 0)
+
         self._0_X_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_17.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_17, (100, -1)))
+        sizer_4.Add(self._0_X_N_copy_17, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_17.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_17, (100, -1)))
+        sizer_4.Add(self._1_X_N_copy_17, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_17.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_17, (100, -1)))
+        sizer_4.Add(self._0_N_F_copy_17, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_17.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_17, (100, -1)))
+        sizer_4.Add(self._1_N_F_copy_17, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_17.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_17, (100, -1)))
+        sizer_4.Add(self._0_X_F_copy_17, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_17.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_17, (100, -1)))
+        sizer_4.Add(self._1_X_F_copy_17, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_FlexGridSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_FlexGridSizer, _("FlexGridSizer"))
+
+        sizer_5 = wx.FlexGridSizer(7, 8, 1, 1)
+
         self._0_N_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_N_N_copy_18, 0, 0, 0)
+
         self._1_N_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_N_N_copy_18, 1, 0, 0)
+
         self._0_X_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_X_N_copy_18, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_X_N_copy_18, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_N_F_copy_18, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_N_F_copy_18, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_X_F_copy_18, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_X_F_copy_18, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_N_N_copy_copy_copy_copy, 0, 0, 0)
+
         self._1_N_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_N_N_copy_copy_copy_copy, 1, 0, 0)
+
         self._0_X_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_X_N_copy_copy_copy_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_X_N_copy_copy_copy_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_N_F_copy_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_N_F_copy_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_X_F_copy_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
-        self._0_N_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
-        self._1_N_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_X_F_copy_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._0_N_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_19.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_19, (100, 21)))
+        sizer_5.Add(self._0_N_N_copy_19, 0, 0, 0)
+
+        self._1_N_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_19.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_19, (100, 21)))
+        sizer_5.Add(self._1_N_N_copy_19, 1, 0, 0)
+
         self._0_X_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_19.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_19, (100, 21)))
+        sizer_5.Add(self._0_X_N_copy_19, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_19.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_19, (100, 21)))
+        sizer_5.Add(self._1_X_N_copy_19, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_19.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_19, (100, 21)))
+        sizer_5.Add(self._0_N_F_copy_19, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_19.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_19, (100, 21)))
+        sizer_5.Add(self._1_N_F_copy_19, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_19.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_19, (100, 21)))
+        sizer_5.Add(self._0_X_F_copy_19, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_19.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_19, (100, 21)))
+        sizer_5.Add(self._1_X_F_copy_19, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_N_N_copy_20, 0, 0, 0)
+
         self._1_N_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_N_N_copy_20, 1, 0, 0)
+
         self._0_X_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_X_N_copy_20, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_X_N_copy_20, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_N_F_copy_20, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_N_F_copy_20, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_X_F_copy_20, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_X_F_copy_20, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_N_N_copy_21, 0, 0, 0)
+
         self._1_N_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_N_N_copy_21, 1, 0, 0)
+
         self._0_X_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_X_N_copy_21, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_X_N_copy_21, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_N_F_copy_21, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_N_F_copy_21, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_X_F_copy_21, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_X_F_copy_21, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_22.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_22, (-1, 100)))
+        sizer_5.Add(self._0_N_N_copy_22, 0, 0, 0)
+
         self._1_N_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_22.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_22, (-1, 100)))
+        sizer_5.Add(self._1_N_N_copy_22, 1, 0, 0)
+
         self._0_X_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_22.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_22, (-1, 100)))
+        sizer_5.Add(self._0_X_N_copy_22, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_22.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_22, (-1, 100)))
+        sizer_5.Add(self._1_X_N_copy_22, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_22.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_22, (-1, 100)))
+        sizer_5.Add(self._0_N_F_copy_22, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_22.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_22, (-1, 100)))
+        sizer_5.Add(self._1_N_F_copy_22, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_X_F_copy_22, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_X_F_copy_22, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_23.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_23, (100, -1)))
+        sizer_5.Add(self._0_N_N_copy_23, 0, 0, 0)
+
         self._1_N_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_23.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_23, (100, -1)))
+        sizer_5.Add(self._1_N_N_copy_23, 1, 0, 0)
+
         self._0_X_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_23.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_23, (100, -1)))
+        sizer_5.Add(self._0_X_N_copy_23, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_23.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_23, (100, -1)))
+        sizer_5.Add(self._1_X_N_copy_23, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_23.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_23, (100, -1)))
+        sizer_5.Add(self._0_N_F_copy_23, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_23.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_23, (100, -1)))
+        sizer_5.Add(self._1_N_F_copy_23, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_23.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_23, (100, -1)))
+        sizer_5.Add(self._0_X_F_copy_23, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_23.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_23, (100, -1)))
+        sizer_5.Add(self._1_X_F_copy_23, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_GridBagSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_GridBagSizer, _("GridBagSizer"))
+
+        sizer_6 = wx.GridBagSizer(1, 1)
+
         self._0_N_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_N_N_copy_24, (0, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_N_N_copy_24, (0, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_X_N_copy_24, (0, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_X_N_copy_24, (0, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_N_F_copy_24, (0, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_N_F_copy_24, (0, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_X_F_copy_24, (0, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_X_F_copy_24, (0, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_N_N_copy_copy_copy_copy_copy, (1, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_N_N_copy_copy_copy_copy_copy, (1, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_X_N_copy_copy_copy_copy_copy, (1, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_X_N_copy_copy_copy_copy_copy, (1, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_N_F_copy_copy_copy_copy_copy, (1, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_N_F_copy_copy_copy_copy_copy, (1, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_X_F_copy_copy_copy_copy_copy, (1, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_X_F_copy_copy_copy_copy_copy, (1, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_25.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_25, (100, 21)))
+        sizer_6.Add(self._0_N_N_copy_25, (2, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_25.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_25, (100, 21)))
+        sizer_6.Add(self._1_N_N_copy_25, (2, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_25.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_25, (100, 21)))
+        sizer_6.Add(self._0_X_N_copy_25, (2, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_25.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_25, (100, 21)))
+        sizer_6.Add(self._1_X_N_copy_25, (2, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_25.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_25, (100, 21)))
+        sizer_6.Add(self._0_N_F_copy_25, (2, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_25.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_25, (100, 21)))
+        sizer_6.Add(self._1_N_F_copy_25, (2, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_25.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_25, (100, 21)))
+        sizer_6.Add(self._0_X_F_copy_25, (2, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_25.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_25, (100, 21)))
+        sizer_6.Add(self._1_X_F_copy_25, (2, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._0_N_N_copy_26, (3, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._1_N_N_copy_26, (3, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._0_X_N_copy_26, (3, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._1_X_N_copy_26, (3, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._0_N_F_copy_26, (3, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._1_N_F_copy_26, (3, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._0_X_F_copy_26, (3, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._1_X_F_copy_26, (3, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._0_N_N_copy_27, (4, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._1_N_N_copy_27, (4, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._0_X_N_copy_27, (4, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._1_X_N_copy_27, (4, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._0_N_F_copy_27, (4, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._1_N_F_copy_27, (4, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._0_X_F_copy_27, (4, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._1_X_F_copy_27, (4, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_28.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_28, (-1, 100)))
+        sizer_6.Add(self._0_N_N_copy_28, (5, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_28.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_28, (-1, 100)))
+        sizer_6.Add(self._1_N_N_copy_28, (5, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_28.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_28, (-1, 100)))
+        sizer_6.Add(self._0_X_N_copy_28, (5, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_28.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_28, (-1, 100)))
+        sizer_6.Add(self._1_X_N_copy_28, (5, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_28.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_28, (-1, 100)))
+        sizer_6.Add(self._0_N_F_copy_28, (5, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self.notebook_1_BorderTest = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self._0_N_N_border_10_none = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._1_N_N_border_0_all = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_X_N_border_5_LEFTRIGHT = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._1_X_N_border_15_BOTTOM = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_N_N_copy_copy_1 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_N_N_copy_31 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_N_N_copy_32 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self.notebook_1_GridBagSizer_Spacers = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.button_1 = wx.Button(self.notebook_1_GridBagSizer_Spacers, wx.ID_ANY, _("button_1"))
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle(_("frame"))
-        self._0_N_N_copy.SetMinSize((100, 21))
-        self._1_N_N_copy.SetMinSize((100, 21))
-        self._0_X_N_copy.SetMinSize((100, 21))
-        self._1_X_N_copy.SetMinSize((100, 21))
-        self._0_N_F_copy.SetMinSize((100, 21))
-        self._1_N_F_copy.SetMinSize((100, 21))
-        self._0_X_F_copy.SetMinSize((100, 21))
-        self._1_X_F_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_1, (100, 21)))
-        self._1_N_N_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_1, (100, 21)))
-        self._0_X_N_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_1, (100, 21)))
-        self._1_X_N_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_1, (100, 21)))
-        self._0_N_F_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_1, (100, 21)))
-        self._1_N_F_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_1, (100, 21)))
-        self._0_X_F_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_1, (100, 21)))
-        self._1_X_F_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_1, (100, 21)))
-        self._0_N_N_copy_2.SetMinSize((-1, 21))
-        self._1_N_N_copy_2.SetMinSize((-1, 21))
-        self._0_X_N_copy_2.SetMinSize((-1, 21))
-        self._1_X_N_copy_2.SetMinSize((-1, 21))
-        self._0_N_F_copy_2.SetMinSize((-1, 21))
-        self._1_N_F_copy_2.SetMinSize((-1, 21))
-        self._0_X_F_copy_2.SetMinSize((-1, 21))
-        self._1_X_F_copy_2.SetMinSize((-1, 21))
-        self._0_N_N_copy_3.SetMinSize((100, -1))
-        self._1_N_N_copy_3.SetMinSize((100, -1))
-        self._0_X_N_copy_3.SetMinSize((100, -1))
-        self._1_X_N_copy_3.SetMinSize((100, -1))
-        self._0_N_F_copy_3.SetMinSize((100, -1))
-        self._1_N_F_copy_3.SetMinSize((100, -1))
-        self._0_X_F_copy_3.SetMinSize((100, -1))
-        self._1_X_F_copy_3.SetMinSize((100, -1))
-        self._0_N_N_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_4, (-1, 100)))
-        self._1_N_N_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_4, (-1, 100)))
-        self._0_X_N_copy_4.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_4, (-1, 100)))
-        self._1_X_N_copy_4.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_4, (-1, 100)))
-        self._0_N_F_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_4, (-1, 100)))
-        self._1_N_F_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_4, (-1, 100)))
-        self._0_N_N_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_5, (100, -1)))
-        self._1_N_N_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_5, (100, -1)))
-        self._0_X_N_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_5, (100, -1)))
-        self._1_X_N_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_5, (100, -1)))
-        self._0_N_F_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_5, (100, -1)))
-        self._1_N_F_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_5, (100, -1)))
-        self._0_X_F_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_5, (100, -1)))
-        self._1_X_F_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_5, (100, -1)))
-        self._0_N_N_copy_30_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_30_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_30_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_30_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_30_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_30_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_30_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_30_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_30_copy_1, (100, 21)))
-        self._1_N_N_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_30_copy_1, (100, 21)))
-        self._0_X_N_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_30_copy_1, (100, 21)))
-        self._1_X_N_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_30_copy_1, (100, 21)))
-        self._0_N_F_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_30_copy_1, (100, 21)))
-        self._1_N_F_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_30_copy_1, (100, 21)))
-        self._0_X_F_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_30_copy_1, (100, 21)))
-        self._1_X_F_copy_30_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_30_copy_1, (100, 21)))
-        self._0_N_N_copy_30_copy_2.SetMinSize((-1, 21))
-        self._1_N_N_copy_30_copy_2.SetMinSize((-1, 21))
-        self._0_X_N_copy_30_copy_2.SetMinSize((-1, 21))
-        self._1_X_N_copy_30_copy_2.SetMinSize((-1, 21))
-        self._0_N_F_copy_30_copy_2.SetMinSize((-1, 21))
-        self._1_N_F_copy_30_copy_2.SetMinSize((-1, 21))
-        self._0_X_F_copy_30_copy_2.SetMinSize((-1, 21))
-        self._1_X_F_copy_30_copy_2.SetMinSize((-1, 21))
-        self._0_N_N_copy_30_copy_3.SetMinSize((100, -1))
-        self._1_N_N_copy_30_copy_3.SetMinSize((100, -1))
-        self._0_X_N_copy_30_copy_3.SetMinSize((100, -1))
-        self._1_X_N_copy_30_copy_3.SetMinSize((100, -1))
-        self._0_N_F_copy_30_copy_3.SetMinSize((100, -1))
-        self._1_N_F_copy_30_copy_3.SetMinSize((100, -1))
-        self._0_X_F_copy_30_copy_3.SetMinSize((100, -1))
-        self._1_X_F_copy_30_copy_3.SetMinSize((100, -1))
-        self._0_N_N_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_30_copy_4, (-1, 100)))
-        self._1_N_N_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_30_copy_4, (-1, 100)))
-        self._0_X_N_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_30_copy_4, (-1, 100)))
-        self._1_X_N_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_30_copy_4, (-1, 100)))
-        self._0_N_F_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_30_copy_4, (-1, 100)))
-        self._1_N_F_copy_30_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_30_copy_4, (-1, 100)))
-        self._0_N_N_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_30_copy_5, (100, -1)))
-        self._1_N_N_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_30_copy_5, (100, -1)))
-        self._0_X_N_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_30_copy_5, (100, -1)))
-        self._1_X_N_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_30_copy_5, (100, -1)))
-        self._0_N_F_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_30_copy_5, (100, -1)))
-        self._1_N_F_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_30_copy_5, (100, -1)))
-        self._0_X_F_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_30_copy_5, (100, -1)))
-        self._1_X_F_copy_30_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_30_copy_5, (100, -1)))
-        self._0_N_N_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_7.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_7, (100, 21)))
-        self._1_N_N_copy_7.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_7, (100, 21)))
-        self._0_X_N_copy_7.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_7, (100, 21)))
-        self._1_X_N_copy_7.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_7, (100, 21)))
-        self._0_N_F_copy_7.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_7, (100, 21)))
-        self._1_N_F_copy_7.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_7, (100, 21)))
-        self._0_X_F_copy_7.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_7, (100, 21)))
-        self._1_X_F_copy_7.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_7, (100, 21)))
-        self._0_N_N_copy_8.SetMinSize((-1, 21))
-        self._1_N_N_copy_8.SetMinSize((-1, 21))
-        self._0_X_N_copy_8.SetMinSize((-1, 21))
-        self._1_X_N_copy_8.SetMinSize((-1, 21))
-        self._0_N_F_copy_8.SetMinSize((-1, 21))
-        self._1_N_F_copy_8.SetMinSize((-1, 21))
-        self._0_X_F_copy_8.SetMinSize((-1, 21))
-        self._1_X_F_copy_8.SetMinSize((-1, 21))
-        self._0_N_N_copy_9.SetMinSize((100, -1))
-        self._1_N_N_copy_9.SetMinSize((100, -1))
-        self._0_X_N_copy_9.SetMinSize((100, -1))
-        self._1_X_N_copy_9.SetMinSize((100, -1))
-        self._0_N_F_copy_9.SetMinSize((100, -1))
-        self._1_N_F_copy_9.SetMinSize((100, -1))
-        self._0_X_F_copy_9.SetMinSize((100, -1))
-        self._1_X_F_copy_9.SetMinSize((100, -1))
-        self._0_N_N_copy_10.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_10, (-1, 100)))
-        self._1_N_N_copy_10.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_10, (-1, 100)))
-        self._0_X_N_copy_10.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_10, (-1, 100)))
-        self._1_X_N_copy_10.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_10, (-1, 100)))
-        self._0_N_F_copy_10.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_10, (-1, 100)))
-        self._1_N_F_copy_10.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_10, (-1, 100)))
-        self._0_N_N_copy_11.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_11, (100, -1)))
-        self._1_N_N_copy_11.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_11, (100, -1)))
-        self._0_X_N_copy_11.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_11, (100, -1)))
-        self._1_X_N_copy_11.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_11, (100, -1)))
-        self._0_N_F_copy_11.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_11, (100, -1)))
-        self._1_N_F_copy_11.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_11, (100, -1)))
-        self._0_X_F_copy_11.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_11, (100, -1)))
-        self._1_X_F_copy_11.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_11, (100, -1)))
-        self._0_N_N_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_13.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_13, (100, 21)))
-        self._1_N_N_copy_13.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_13, (100, 21)))
-        self._0_X_N_copy_13.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_13, (100, 21)))
-        self._1_X_N_copy_13.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_13, (100, 21)))
-        self._0_N_F_copy_13.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_13, (100, 21)))
-        self._1_N_F_copy_13.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_13, (100, 21)))
-        self._0_X_F_copy_13.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_13, (100, 21)))
-        self._1_X_F_copy_13.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_13, (100, 21)))
-        self._0_N_N_copy_14.SetMinSize((-1, 21))
-        self._1_N_N_copy_14.SetMinSize((-1, 21))
-        self._0_X_N_copy_14.SetMinSize((-1, 21))
-        self._1_X_N_copy_14.SetMinSize((-1, 21))
-        self._0_N_F_copy_14.SetMinSize((-1, 21))
-        self._1_N_F_copy_14.SetMinSize((-1, 21))
-        self._0_X_F_copy_14.SetMinSize((-1, 21))
-        self._1_X_F_copy_14.SetMinSize((-1, 21))
-        self._0_N_N_copy_15.SetMinSize((100, -1))
-        self._1_N_N_copy_15.SetMinSize((100, -1))
-        self._0_X_N_copy_15.SetMinSize((100, -1))
-        self._1_X_N_copy_15.SetMinSize((100, -1))
-        self._0_N_F_copy_15.SetMinSize((100, -1))
-        self._1_N_F_copy_15.SetMinSize((100, -1))
-        self._0_X_F_copy_15.SetMinSize((100, -1))
-        self._1_X_F_copy_15.SetMinSize((100, -1))
-        self._0_N_N_copy_16.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_16, (-1, 100)))
-        self._1_N_N_copy_16.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_16, (-1, 100)))
-        self._0_X_N_copy_16.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_16, (-1, 100)))
-        self._1_X_N_copy_16.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_16, (-1, 100)))
-        self._0_N_F_copy_16.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_16, (-1, 100)))
-        self._1_N_F_copy_16.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_16, (-1, 100)))
-        self._0_N_N_copy_17.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_17, (100, -1)))
-        self._1_N_N_copy_17.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_17, (100, -1)))
-        self._0_X_N_copy_17.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_17, (100, -1)))
-        self._1_X_N_copy_17.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_17, (100, -1)))
-        self._0_N_F_copy_17.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_17, (100, -1)))
-        self._1_N_F_copy_17.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_17, (100, -1)))
-        self._0_X_F_copy_17.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_17, (100, -1)))
-        self._1_X_F_copy_17.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_17, (100, -1)))
-        self._0_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_19.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_19, (100, 21)))
-        self._1_N_N_copy_19.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_19, (100, 21)))
-        self._0_X_N_copy_19.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_19, (100, 21)))
-        self._1_X_N_copy_19.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_19, (100, 21)))
-        self._0_N_F_copy_19.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_19, (100, 21)))
-        self._1_N_F_copy_19.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_19, (100, 21)))
-        self._0_X_F_copy_19.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_19, (100, 21)))
-        self._1_X_F_copy_19.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_19, (100, 21)))
-        self._0_N_N_copy_20.SetMinSize((-1, 21))
-        self._1_N_N_copy_20.SetMinSize((-1, 21))
-        self._0_X_N_copy_20.SetMinSize((-1, 21))
-        self._1_X_N_copy_20.SetMinSize((-1, 21))
-        self._0_N_F_copy_20.SetMinSize((-1, 21))
-        self._1_N_F_copy_20.SetMinSize((-1, 21))
-        self._0_X_F_copy_20.SetMinSize((-1, 21))
-        self._1_X_F_copy_20.SetMinSize((-1, 21))
-        self._0_N_N_copy_21.SetMinSize((100, -1))
-        self._1_N_N_copy_21.SetMinSize((100, -1))
-        self._0_X_N_copy_21.SetMinSize((100, -1))
-        self._1_X_N_copy_21.SetMinSize((100, -1))
-        self._0_N_F_copy_21.SetMinSize((100, -1))
-        self._1_N_F_copy_21.SetMinSize((100, -1))
-        self._0_X_F_copy_21.SetMinSize((100, -1))
-        self._1_X_F_copy_21.SetMinSize((100, -1))
-        self._0_N_N_copy_22.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_22, (-1, 100)))
-        self._1_N_N_copy_22.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_22, (-1, 100)))
-        self._0_X_N_copy_22.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_22, (-1, 100)))
-        self._1_X_N_copy_22.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_22, (-1, 100)))
-        self._0_N_F_copy_22.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_22, (-1, 100)))
-        self._1_N_F_copy_22.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_22, (-1, 100)))
-        self._0_N_N_copy_23.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_23, (100, -1)))
-        self._1_N_N_copy_23.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_23, (100, -1)))
-        self._0_X_N_copy_23.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_23, (100, -1)))
-        self._1_X_N_copy_23.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_23, (100, -1)))
-        self._0_N_F_copy_23.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_23, (100, -1)))
-        self._1_N_F_copy_23.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_23, (100, -1)))
-        self._0_X_F_copy_23.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_23, (100, -1)))
-        self._1_X_F_copy_23.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_23, (100, -1)))
-        self._0_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_25.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_25, (100, 21)))
-        self._1_N_N_copy_25.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_25, (100, 21)))
-        self._0_X_N_copy_25.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_25, (100, 21)))
-        self._1_X_N_copy_25.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_25, (100, 21)))
-        self._0_N_F_copy_25.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_25, (100, 21)))
-        self._1_N_F_copy_25.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_25, (100, 21)))
-        self._0_X_F_copy_25.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_25, (100, 21)))
-        self._1_X_F_copy_25.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_25, (100, 21)))
-        self._0_N_N_copy_26.SetMinSize((-1, 21))
-        self._1_N_N_copy_26.SetMinSize((-1, 21))
-        self._0_X_N_copy_26.SetMinSize((-1, 21))
-        self._1_X_N_copy_26.SetMinSize((-1, 21))
-        self._0_N_F_copy_26.SetMinSize((-1, 21))
-        self._1_N_F_copy_26.SetMinSize((-1, 21))
-        self._0_X_F_copy_26.SetMinSize((-1, 21))
-        self._1_X_F_copy_26.SetMinSize((-1, 21))
-        self._0_N_N_copy_27.SetMinSize((100, -1))
-        self._1_N_N_copy_27.SetMinSize((100, -1))
-        self._0_X_N_copy_27.SetMinSize((100, -1))
-        self._1_X_N_copy_27.SetMinSize((100, -1))
-        self._0_N_F_copy_27.SetMinSize((100, -1))
-        self._1_N_F_copy_27.SetMinSize((100, -1))
-        self._0_X_F_copy_27.SetMinSize((100, -1))
-        self._1_X_F_copy_27.SetMinSize((100, -1))
-        self._0_N_N_copy_28.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_28, (-1, 100)))
-        self._1_N_N_copy_28.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_28, (-1, 100)))
-        self._0_X_N_copy_28.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_28, (-1, 100)))
-        self._1_X_N_copy_28.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_28, (-1, 100)))
-        self._0_N_F_copy_28.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_28, (-1, 100)))
-        self._1_N_F_copy_28.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_28, (-1, 100)))
-        self._0_N_N_copy_29.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_29, (100, -1)))
-        self._1_N_N_copy_29.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_29, (100, -1)))
-        self._0_X_N_copy_29.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_29, (100, -1)))
-        self._1_X_N_copy_29.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_29, (100, -1)))
-        self._0_N_F_copy_29.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_29, (100, -1)))
-        self._1_N_F_copy_29.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_29, (100, -1)))
-        self._0_X_F_copy_29.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_29, (100, -1)))
-        self._1_X_F_copy_29.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_29, (100, -1)))
-        self._0_N_N_copy_copy_1.SetMinSize((100, 21))
-        self._0_N_N_copy_31.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_31, (100, 21)))
-        self._0_N_N_copy_32.SetMinSize((-1, 21))
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        grid_sizer_1 = wx.GridBagSizer(0, 0)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_border_15_BOTTOM = wx.BoxSizer(wx.VERTICAL)
-        sizer_border_5_LEFTRIGHT = wx.BoxSizer(wx.VERTICAL)
-        sizer_border_0_ALL = wx.BoxSizer(wx.VERTICAL)
-        sizer_border_10_none = wx.BoxSizer(wx.VERTICAL)
-        sizer_6 = wx.GridBagSizer(1, 1)
-        sizer_5 = wx.FlexGridSizer(7, 8, 1, 1)
-        sizer_4 = wx.GridSizer(7, 8, 0, 0)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6_dlgm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_dlgm1_copy")), wx.VERTICAL)
-        sizer_6_m1dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1dlg_copy")), wx.VERTICAL)
-        sizer_6_absm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_absm1_copy")), wx.VERTICAL)
-        sizer_6_m1abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1abs_copy")), wx.VERTICAL)
-        sizer_5_dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_5_dlg_copy")), wx.VERTICAL)
-        sizer_4_abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_4_abs_copy")), wx.VERTICAL)
-        sizer_3_nosize_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_3_nosize_copy")), wx.VERTICAL)
-        sizer_8 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6_dlgm1_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_6_m1dlg_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_6_absm1_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_6_m1abs_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_5_dlg_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_4_abs_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_3_nosize_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6_dlgm1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_6_m1dlg = wx.BoxSizer(wx.VERTICAL)
-        sizer_6_absm1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_6_m1abs = wx.BoxSizer(wx.VERTICAL)
-        sizer_5_dlg = wx.BoxSizer(wx.VERTICAL)
-        sizer_4_abs = wx.BoxSizer(wx.VERTICAL)
-        sizer_3_nosize = wx.BoxSizer(wx.VERTICAL)
-        sizer_3_nosize.Add(self._0_N_N, 0, 0, 0)
-        sizer_3_nosize.Add(self._1_N_N, 1, 0, 0)
-        sizer_3_nosize.Add(self._0_X_N, 0, wx.EXPAND, 0)
-        sizer_3_nosize.Add(self._1_X_N, 1, wx.EXPAND, 0)
-        sizer_3_nosize.Add(self._0_N_F, 0, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize.Add(self._1_N_F, 1, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize.Add(self._0_X_F, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize.Add(self._1_X_F, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_3_nosize, 1, wx.EXPAND, 0)
-        sizer_4_abs.Add(self._0_N_N_copy, 0, 0, 0)
-        sizer_4_abs.Add(self._1_N_N_copy, 1, 0, 0)
-        sizer_4_abs.Add(self._0_X_N_copy, 0, wx.EXPAND, 0)
-        sizer_4_abs.Add(self._1_X_N_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs.Add(self._0_N_F_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs.Add(self._1_N_F_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs.Add(self._0_X_F_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4_abs.Add(self._1_X_F_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_4_abs, 1, wx.EXPAND, 0)
-        sizer_5_dlg.Add(self._0_N_N_copy_1, 0, 0, 0)
-        sizer_5_dlg.Add(self._1_N_N_copy_1, 1, 0, 0)
-        sizer_5_dlg.Add(self._0_X_N_copy_1, 0, wx.EXPAND, 0)
-        sizer_5_dlg.Add(self._1_X_N_copy_1, 1, wx.EXPAND, 0)
-        sizer_5_dlg.Add(self._0_N_F_copy_1, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg.Add(self._1_N_F_copy_1, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg.Add(self._0_X_F_copy_1, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg.Add(self._1_X_F_copy_1, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_5_dlg, 1, wx.EXPAND, 0)
-        sizer_6_m1abs.Add(self._0_N_N_copy_2, 0, 0, 0)
-        sizer_6_m1abs.Add(self._1_N_N_copy_2, 1, 0, 0)
-        sizer_6_m1abs.Add(self._0_X_N_copy_2, 0, wx.EXPAND, 0)
-        sizer_6_m1abs.Add(self._1_X_N_copy_2, 1, wx.EXPAND, 0)
-        sizer_6_m1abs.Add(self._0_N_F_copy_2, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs.Add(self._1_N_F_copy_2, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs.Add(self._0_X_F_copy_2, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs.Add(self._1_X_F_copy_2, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_m1abs, 1, wx.EXPAND, 0)
-        sizer_6_absm1.Add(self._0_N_N_copy_3, 0, 0, 0)
-        sizer_6_absm1.Add(self._1_N_N_copy_3, 1, 0, 0)
-        sizer_6_absm1.Add(self._0_X_N_copy_3, 0, wx.EXPAND, 0)
-        sizer_6_absm1.Add(self._1_X_N_copy_3, 1, wx.EXPAND, 0)
-        sizer_6_absm1.Add(self._0_N_F_copy_3, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1.Add(self._1_N_F_copy_3, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1.Add(self._0_X_F_copy_3, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1.Add(self._1_X_F_copy_3, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_absm1, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg.Add(self._0_N_N_copy_4, 0, 0, 0)
-        sizer_6_m1dlg.Add(self._1_N_N_copy_4, 1, 0, 0)
-        sizer_6_m1dlg.Add(self._0_X_N_copy_4, 0, wx.EXPAND, 0)
-        sizer_6_m1dlg.Add(self._1_X_N_copy_4, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg.Add(self._0_N_F_copy_4, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg.Add(self._1_N_F_copy_4, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg.Add(self._0_X_F_copy_4, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg.Add(self._1_X_F_copy_4, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_m1dlg, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1.Add(self._0_N_N_copy_5, 0, 0, 0)
-        sizer_6_dlgm1.Add(self._1_N_N_copy_5, 1, 0, 0)
-        sizer_6_dlgm1.Add(self._0_X_N_copy_5, 0, wx.EXPAND, 0)
-        sizer_6_dlgm1.Add(self._1_X_N_copy_5, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1.Add(self._0_N_F_copy_5, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1.Add(self._1_N_F_copy_5, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1.Add(self._0_X_F_copy_5, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1.Add(self._1_X_F_copy_5, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_dlgm1, 1, wx.EXPAND, 0)
-        self.notebook_1_pane_1.SetSizer(sizer_2)
-        sizer_3_nosize_copy_1.Add(self._0_N_N_copy_30, 0, 0, 0)
-        sizer_3_nosize_copy_1.Add(self._1_N_N_copy_30, 1, 0, 0)
-        sizer_3_nosize_copy_1.Add(self._0_X_N_copy_30, 0, wx.EXPAND, 0)
-        sizer_3_nosize_copy_1.Add(self._1_X_N_copy_30, 1, wx.EXPAND, 0)
-        sizer_3_nosize_copy_1.Add(self._0_N_F_copy_30, 0, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy_1.Add(self._1_N_F_copy_30, 1, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy_1.Add(self._0_X_F_copy_30, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy_1.Add(self._1_X_F_copy_30, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_3_nosize_copy_1, 1, wx.EXPAND, 0)
-        sizer_4_abs_copy_1.Add(self._0_N_N_copy_30_copy, 0, 0, 0)
-        sizer_4_abs_copy_1.Add(self._1_N_N_copy_30_copy, 1, 0, 0)
-        sizer_4_abs_copy_1.Add(self._0_X_N_copy_30_copy, 0, wx.EXPAND, 0)
-        sizer_4_abs_copy_1.Add(self._1_X_N_copy_30_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs_copy_1.Add(self._0_N_F_copy_30_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy_1.Add(self._1_N_F_copy_30_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy_1.Add(self._0_X_F_copy_30_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy_1.Add(self._1_X_F_copy_30_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_4_abs_copy_1, 1, wx.EXPAND, 0)
-        sizer_5_dlg_copy_1.Add(self._0_N_N_copy_30_copy_1, 0, 0, 0)
-        sizer_5_dlg_copy_1.Add(self._1_N_N_copy_30_copy_1, 1, 0, 0)
-        sizer_5_dlg_copy_1.Add(self._0_X_N_copy_30_copy_1, 0, wx.EXPAND, 0)
-        sizer_5_dlg_copy_1.Add(self._1_X_N_copy_30_copy_1, 1, wx.EXPAND, 0)
-        sizer_5_dlg_copy_1.Add(self._0_N_F_copy_30_copy_1, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy_1.Add(self._1_N_F_copy_30_copy_1, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy_1.Add(self._0_X_F_copy_30_copy_1, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy_1.Add(self._1_X_F_copy_30_copy_1, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_5_dlg_copy_1, 1, wx.EXPAND, 0)
-        sizer_6_m1abs_copy_1.Add(self._0_N_N_copy_30_copy_2, 0, 0, 0)
-        sizer_6_m1abs_copy_1.Add(self._1_N_N_copy_30_copy_2, 1, 0, 0)
-        sizer_6_m1abs_copy_1.Add(self._0_X_N_copy_30_copy_2, 0, wx.EXPAND, 0)
-        sizer_6_m1abs_copy_1.Add(self._1_X_N_copy_30_copy_2, 1, wx.EXPAND, 0)
-        sizer_6_m1abs_copy_1.Add(self._0_N_F_copy_30_copy_2, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy_1.Add(self._1_N_F_copy_30_copy_2, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy_1.Add(self._0_X_F_copy_30_copy_2, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy_1.Add(self._1_X_F_copy_30_copy_2, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_6_m1abs_copy_1, 1, wx.EXPAND, 0)
-        sizer_6_absm1_copy_1.Add(self._0_N_N_copy_30_copy_3, 0, 0, 0)
-        sizer_6_absm1_copy_1.Add(self._1_N_N_copy_30_copy_3, 1, 0, 0)
-        sizer_6_absm1_copy_1.Add(self._0_X_N_copy_30_copy_3, 0, wx.EXPAND, 0)
-        sizer_6_absm1_copy_1.Add(self._1_X_N_copy_30_copy_3, 1, wx.EXPAND, 0)
-        sizer_6_absm1_copy_1.Add(self._0_N_F_copy_30_copy_3, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy_1.Add(self._1_N_F_copy_30_copy_3, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy_1.Add(self._0_X_F_copy_30_copy_3, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy_1.Add(self._1_X_F_copy_30_copy_3, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_6_absm1_copy_1, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy_1.Add(self._0_N_N_copy_30_copy_4, 0, 0, 0)
-        sizer_6_m1dlg_copy_1.Add(self._1_N_N_copy_30_copy_4, 1, 0, 0)
-        sizer_6_m1dlg_copy_1.Add(self._0_X_N_copy_30_copy_4, 0, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy_1.Add(self._1_X_N_copy_30_copy_4, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy_1.Add(self._0_N_F_copy_30_copy_4, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy_1.Add(self._1_N_F_copy_30_copy_4, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy_1.Add(self._0_X_F_copy_30_copy_4, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy_1.Add(self._1_X_F_copy_30_copy_4, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_6_m1dlg_copy_1, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy_1.Add(self._0_N_N_copy_30_copy_5, 0, 0, 0)
-        sizer_6_dlgm1_copy_1.Add(self._1_N_N_copy_30_copy_5, 1, 0, 0)
-        sizer_6_dlgm1_copy_1.Add(self._0_X_N_copy_30_copy_5, 0, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy_1.Add(self._1_X_N_copy_30_copy_5, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy_1.Add(self._0_N_F_copy_30_copy_5, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy_1.Add(self._1_N_F_copy_30_copy_5, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy_1.Add(self._0_X_F_copy_30_copy_5, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy_1.Add(self._1_X_F_copy_30_copy_5, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_6_dlgm1_copy_1, 1, wx.EXPAND, 0)
-        self.notebook_1_WrapSizer.SetSizer(sizer_8)
-        sizer_3_nosize_copy.Add(self._0_N_N_copy_6, 0, 0, 0)
-        sizer_3_nosize_copy.Add(self._1_N_N_copy_6, 1, 0, 0)
-        sizer_3_nosize_copy.Add(self._0_X_N_copy_6, 0, wx.EXPAND, 0)
-        sizer_3_nosize_copy.Add(self._1_X_N_copy_6, 1, wx.EXPAND, 0)
-        sizer_3_nosize_copy.Add(self._0_N_F_copy_6, 0, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy.Add(self._1_N_F_copy_6, 1, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy.Add(self._0_X_F_copy_6, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy.Add(self._1_X_F_copy_6, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_3_nosize_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs_copy.Add(self._0_N_N_copy_copy, 0, 0, 0)
-        sizer_4_abs_copy.Add(self._1_N_N_copy_copy, 1, 0, 0)
-        sizer_4_abs_copy.Add(self._0_X_N_copy_copy, 0, wx.EXPAND, 0)
-        sizer_4_abs_copy.Add(self._1_X_N_copy_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs_copy.Add(self._0_N_F_copy_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy.Add(self._1_N_F_copy_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy.Add(self._0_X_F_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy.Add(self._1_X_F_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_4_abs_copy, 1, wx.EXPAND, 0)
-        sizer_5_dlg_copy.Add(self._0_N_N_copy_7, 0, 0, 0)
-        sizer_5_dlg_copy.Add(self._1_N_N_copy_7, 1, 0, 0)
-        sizer_5_dlg_copy.Add(self._0_X_N_copy_7, 0, wx.EXPAND, 0)
-        sizer_5_dlg_copy.Add(self._1_X_N_copy_7, 1, wx.EXPAND, 0)
-        sizer_5_dlg_copy.Add(self._0_N_F_copy_7, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy.Add(self._1_N_F_copy_7, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy.Add(self._0_X_F_copy_7, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy.Add(self._1_X_F_copy_7, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_5_dlg_copy, 1, wx.EXPAND, 0)
-        sizer_6_m1abs_copy.Add(self._0_N_N_copy_8, 0, 0, 0)
-        sizer_6_m1abs_copy.Add(self._1_N_N_copy_8, 1, 0, 0)
-        sizer_6_m1abs_copy.Add(self._0_X_N_copy_8, 0, wx.EXPAND, 0)
-        sizer_6_m1abs_copy.Add(self._1_X_N_copy_8, 1, wx.EXPAND, 0)
-        sizer_6_m1abs_copy.Add(self._0_N_F_copy_8, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy.Add(self._1_N_F_copy_8, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy.Add(self._0_X_F_copy_8, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy.Add(self._1_X_F_copy_8, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_m1abs_copy, 1, wx.EXPAND, 0)
-        sizer_6_absm1_copy.Add(self._0_N_N_copy_9, 0, 0, 0)
-        sizer_6_absm1_copy.Add(self._1_N_N_copy_9, 1, 0, 0)
-        sizer_6_absm1_copy.Add(self._0_X_N_copy_9, 0, wx.EXPAND, 0)
-        sizer_6_absm1_copy.Add(self._1_X_N_copy_9, 1, wx.EXPAND, 0)
-        sizer_6_absm1_copy.Add(self._0_N_F_copy_9, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy.Add(self._1_N_F_copy_9, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy.Add(self._0_X_F_copy_9, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy.Add(self._1_X_F_copy_9, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_absm1_copy, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy.Add(self._0_N_N_copy_10, 0, 0, 0)
-        sizer_6_m1dlg_copy.Add(self._1_N_N_copy_10, 1, 0, 0)
-        sizer_6_m1dlg_copy.Add(self._0_X_N_copy_10, 0, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy.Add(self._1_X_N_copy_10, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy.Add(self._0_N_F_copy_10, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy.Add(self._1_N_F_copy_10, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy.Add(self._0_X_F_copy_10, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy.Add(self._1_X_F_copy_10, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_m1dlg_copy, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy.Add(self._0_N_N_copy_11, 0, 0, 0)
-        sizer_6_dlgm1_copy.Add(self._1_N_N_copy_11, 1, 0, 0)
-        sizer_6_dlgm1_copy.Add(self._0_X_N_copy_11, 0, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy.Add(self._1_X_N_copy_11, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy.Add(self._0_N_F_copy_11, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy.Add(self._1_N_F_copy_11, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy.Add(self._0_X_F_copy_11, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy.Add(self._1_X_F_copy_11, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_dlgm1_copy, 1, wx.EXPAND, 0)
-        self.notebook_1_StaticBoxSizer.SetSizer(sizer_3)
-        sizer_4.Add(self._0_N_N_copy_12, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_12, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_12, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_12, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_12, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_12, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_12, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_12, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_copy_copy, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_copy_copy, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_copy_copy, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_copy_copy, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_13, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_13, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_13, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_13, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_13, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_13, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_13, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_13, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_14, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_14, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_14, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_14, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_14, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_14, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_14, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_14, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_15, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_15, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_15, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_15, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_15, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_15, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_15, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_15, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_16, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_16, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_16, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_16, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_16, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_16, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_16, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_16, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_17, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_17, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_17, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_17, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_17, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_17, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_17, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_17, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        self.notebook_1_GridSizer.SetSizer(sizer_4)
-        sizer_5.Add(self._0_N_N_copy_18, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_18, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_18, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_18, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_18, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_18, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_18, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_18, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_copy_copy_copy, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_copy_copy_copy, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_copy_copy_copy, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_copy_copy_copy, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_19, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_19, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_19, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_19, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_19, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_19, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_19, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_19, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_20, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_20, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_20, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_20, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_20, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_20, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_20, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_20, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_21, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_21, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_21, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_21, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_21, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_21, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_21, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_21, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_22, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_22, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_22, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_22, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_22, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_22, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_22, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_22, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_23, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_23, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_23, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_23, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_23, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_23, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_23, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_23, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        self.notebook_1_FlexGridSizer.SetSizer(sizer_5)
-        sizer_5.AddGrowableRow(2)
-        sizer_5.AddGrowableRow(5)
-        sizer_5.AddGrowableCol(1)
-        sizer_5.AddGrowableCol(7)
-        sizer_6.Add(self._0_N_N_copy_24, (0, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_24, (0, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_24, (0, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_24, (0, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_24, (0, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_24, (0, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_24, (0, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_24, (0, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_copy_copy_copy_copy, (1, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_copy_copy_copy_copy, (1, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_copy_copy_copy_copy, (1, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_copy_copy_copy_copy, (1, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_copy_copy_copy_copy, (1, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_copy_copy_copy_copy, (1, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_copy_copy_copy_copy, (1, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_copy_copy_copy_copy, (1, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_25, (2, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_25, (2, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_25, (2, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_25, (2, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_25, (2, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_25, (2, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_25, (2, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_25, (2, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_26, (3, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_26, (3, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_26, (3, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_26, (3, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_26, (3, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_26, (3, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_26, (3, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_26, (3, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_27, (4, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_27, (4, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_27, (4, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_27, (4, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_27, (4, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_27, (4, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_27, (4, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_27, (4, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_28, (5, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_28, (5, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_28, (5, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_28, (5, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_28, (5, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+        self._1_N_F_copy_28.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_28, (-1, 100)))
         sizer_6.Add(self._1_N_F_copy_28, (5, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
         sizer_6.Add(self._0_X_F_copy_28, (5, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._1_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
         sizer_6.Add(self._1_X_F_copy_28, (5, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._0_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_29.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_29, (100, -1)))
         sizer_6.Add(self._0_N_N_copy_29, (6, 0), (1, 1), 0, 0)
+
+        self._1_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_29.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_29, (100, -1)))
         sizer_6.Add(self._1_N_N_copy_29, (6, 1), (1, 1), 0, 0)
+
+        self._0_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_29.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_29, (100, -1)))
         sizer_6.Add(self._0_X_N_copy_29, (6, 2), (1, 1), wx.EXPAND, 0)
+
+        self._1_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_29.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_29, (100, -1)))
         sizer_6.Add(self._1_X_N_copy_29, (6, 3), (1, 1), wx.EXPAND, 0)
+
+        self._0_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_29.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_29, (100, -1)))
         sizer_6.Add(self._0_N_F_copy_29, (6, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._1_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_29.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_29, (100, -1)))
         sizer_6.Add(self._1_N_F_copy_29, (6, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_29.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_29, (100, -1)))
         sizer_6.Add(self._0_X_F_copy_29, (6, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._1_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_29.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_29, (100, -1)))
         sizer_6.Add(self._1_X_F_copy_29, (6, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        self.notebook_1_GridBagSizer.SetSizer(sizer_6)
-        sizer_6.AddGrowableRow(2)
-        sizer_6.AddGrowableRow(5)
-        sizer_6.AddGrowableCol(1)
-        sizer_6.AddGrowableCol(7)
+
+        self.notebook_1_BorderTest = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_BorderTest, _("BorderTest"))
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_border_10_none = wx.BoxSizer(wx.VERTICAL)
+        sizer_7.Add(sizer_border_10_none, 1, wx.EXPAND, 10)
+
+        self._0_N_N_border_10_none = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._0_N_N_border_10_none, 0, 0, 10)
+
+        self._1_N_N_border_0_all = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._1_N_N_border_0_all, 1, wx.ALL, 0)
+
+        self._0_X_N_border_5_LEFTRIGHT = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._0_X_N_border_5_LEFTRIGHT, 0, wx.EXPAND | wx.LEFT | wx.RIGHT, 5)
+
+        self._1_X_N_border_15_BOTTOM = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._1_X_N_border_15_BOTTOM, 1, wx.BOTTOM | wx.EXPAND, 15)
-        sizer_7.Add(sizer_border_10_none, 1, wx.EXPAND, 10)
-        sizer_border_0_ALL.Add(self._0_N_N_copy_copy_1, 0, 0, 0)
+
+        sizer_border_0_ALL = wx.BoxSizer(wx.VERTICAL)
         sizer_7.Add(sizer_border_0_ALL, 1, wx.ALL | wx.EXPAND, 0)
-        sizer_border_5_LEFTRIGHT.Add(self._0_N_N_copy_31, 0, 0, 0)
+
+        self._0_N_N_copy_copy_1 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_1.SetMinSize((100, 21))
+        sizer_border_0_ALL.Add(self._0_N_N_copy_copy_1, 0, 0, 0)
+
+        sizer_border_5_LEFTRIGHT = wx.BoxSizer(wx.VERTICAL)
         sizer_7.Add(sizer_border_5_LEFTRIGHT, 1, wx.LEFT | wx.RIGHT, 5)
-        sizer_border_15_BOTTOM.Add(self._0_N_N_copy_32, 0, 0, 0)
+
+        self._0_N_N_copy_31 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
+        self._0_N_N_copy_31.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_31, (100, 21)))
+        sizer_border_5_LEFTRIGHT.Add(self._0_N_N_copy_31, 0, 0, 0)
+
+        sizer_border_15_BOTTOM = wx.BoxSizer(wx.VERTICAL)
         sizer_7.Add(sizer_border_15_BOTTOM, 1, 0, 15)
-        self.notebook_1_BorderTest.SetSizer(sizer_7)
+
+        self._0_N_N_copy_32 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
+        self._0_N_N_copy_32.SetMinSize((-1, 21))
+        sizer_border_15_BOTTOM.Add(self._0_N_N_copy_32, 0, 0, 0)
+
+        self.notebook_1_GridBagSizer_Spacers = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_GridBagSizer_Spacers, _("GridBagSizer_Spacers"))
+
+        grid_sizer_1 = wx.GridBagSizer(0, 0)
+
+        self.button_1 = wx.Button(self.notebook_1_GridBagSizer_Spacers, wx.ID_ANY, _("button_1"))
         grid_sizer_1.Add(self.button_1, (0, 0), (1, 1), 0, 0)
+
         grid_sizer_1.Add((20, 20), (2, 0), (1, 1), wx.EXPAND, 0)
+
         grid_sizer_1.Add((20, 20), (2, 1), (1, 1), wx.EXPAND, 0)
-        self.notebook_1_GridBagSizer_Spacers.SetSizer(grid_sizer_1)
+
         grid_sizer_1.AddGrowableRow(0)
         grid_sizer_1.AddGrowableRow(2)
         grid_sizer_1.AddGrowableCol(0)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("BoxSizer"))
-        self.notebook_1.AddPage(self.notebook_1_WrapSizer, _("WrapSizer"))
-        self.notebook_1.AddPage(self.notebook_1_StaticBoxSizer, _("StaticBoxSizer"))
-        self.notebook_1.AddPage(self.notebook_1_GridSizer, _("GridSizer"))
-        self.notebook_1.AddPage(self.notebook_1_FlexGridSizer, _("FlexGridSizer"))
-        self.notebook_1.AddPage(self.notebook_1_GridBagSizer, _("GridBagSizer"))
-        self.notebook_1.AddPage(self.notebook_1_BorderTest, _("BorderTest"))
-        self.notebook_1.AddPage(self.notebook_1_GridBagSizer_Spacers, _("GridBagSizer_Spacers"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+        self.notebook_1_GridBagSizer_Spacers.SetSizer(grid_sizer_1)
+
+        self.notebook_1_BorderTest.SetSizer(sizer_7)
+
+        sizer_6.AddGrowableRow(2)
+        sizer_6.AddGrowableRow(5)
+        sizer_6.AddGrowableCol(1)
+        sizer_6.AddGrowableCol(7)
+        self.notebook_1_GridBagSizer.SetSizer(sizer_6)
+
+        sizer_5.AddGrowableRow(2)
+        sizer_5.AddGrowableRow(5)
+        sizer_5.AddGrowableCol(1)
+        sizer_5.AddGrowableCol(7)
+        self.notebook_1_FlexGridSizer.SetSizer(sizer_5)
+
+        self.notebook_1_GridSizer.SetSizer(sizer_4)
+
+        self.notebook_1_StaticBoxSizer.SetSizer(sizer_3)
+
+        self.notebook_1_WrapSizer.SetSizer(sizer_8)
+
+        self.notebook_1_pane_1.SetSizer(sizer_2)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests.cpp wxglade-1.0.1/tests/casefiles/SizersSizeTests.cpp
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -21,1089 +21,1073 @@
 {
     // begin wxGlade: MyFrame::MyFrame
     SetSize(wxSize(600, 400));
+    SetTitle(_("frame"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
     notebook_1 = new wxNotebook(this, wxID_ANY);
-    notebook_1_GridBagSizer_Spacers = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_BorderTest = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_GridBagSizer = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_FlexGridSizer = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_GridSizer = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_StaticBoxSizer = new wxPanel(notebook_1, wxID_ANY);
-    notebook_1_WrapSizer = new wxPanel(notebook_1, wxID_ANY);
+    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
     notebook_1_pane_1 = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_pane_1, _("BoxSizer"));
+    wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL);
+    wxBoxSizer* sizer_3_nosize = new wxBoxSizer(wxVERTICAL);
+    sizer_2->Add(sizer_3_nosize, 1, wxEXPAND, 0);
     _0_N_N = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    sizer_3_nosize->Add(_0_N_N, 0, 0, 0);
     _1_N_N = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    sizer_3_nosize->Add(_1_N_N, 1, 0, 0);
     _0_X_N = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    sizer_3_nosize->Add(_0_X_N, 0, wxEXPAND, 0);
     _1_X_N = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    sizer_3_nosize->Add(_1_X_N, 1, wxEXPAND, 0);
     _0_N_F = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    sizer_3_nosize->Add(_0_N_F, 0, wxFIXED_MINSIZE, 0);
     _1_N_F = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    sizer_3_nosize->Add(_1_N_F, 1, wxFIXED_MINSIZE, 0);
     _0_X_F = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    sizer_3_nosize->Add(_0_X_F, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    sizer_3_nosize->Add(_1_X_F, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxBoxSizer* sizer_4_abs = new wxBoxSizer(wxVERTICAL);
+    sizer_2->Add(sizer_4_abs, 1, wxEXPAND, 0);
     _0_N_N_copy = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_N_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs->Add(_0_N_N_copy, 0, 0, 0);
     _1_N_N_copy = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_N_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs->Add(_1_N_N_copy, 1, 0, 0);
     _0_X_N_copy = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_N_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs->Add(_0_X_N_copy, 0, wxEXPAND, 0);
     _1_X_N_copy = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_N_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs->Add(_1_X_N_copy, 1, wxEXPAND, 0);
     _0_N_F_copy = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_F_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs->Add(_0_N_F_copy, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_F_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs->Add(_1_N_F_copy, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_F_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs->Add(_0_X_F_copy, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_F_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs->Add(_1_X_F_copy, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxBoxSizer* sizer_5_dlg = new wxBoxSizer(wxVERTICAL);
+    sizer_2->Add(sizer_5_dlg, 1, wxEXPAND, 0);
     _0_N_N_copy_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_1->SetMinSize(wxDLG_UNIT(_0_N_N_copy_1, wxSize(100, 21)));
+    sizer_5_dlg->Add(_0_N_N_copy_1, 0, 0, 0);
     _1_N_N_copy_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_1->SetMinSize(wxDLG_UNIT(_1_N_N_copy_1, wxSize(100, 21)));
+    sizer_5_dlg->Add(_1_N_N_copy_1, 1, 0, 0);
     _0_X_N_copy_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_1->SetMinSize(wxDLG_UNIT(_0_X_N_copy_1, wxSize(100, 21)));
+    sizer_5_dlg->Add(_0_X_N_copy_1, 0, wxEXPAND, 0);
     _1_X_N_copy_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_1->SetMinSize(wxDLG_UNIT(_1_X_N_copy_1, wxSize(100, 21)));
+    sizer_5_dlg->Add(_1_X_N_copy_1, 1, wxEXPAND, 0);
     _0_N_F_copy_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_1->SetMinSize(wxDLG_UNIT(_0_N_F_copy_1, wxSize(100, 21)));
+    sizer_5_dlg->Add(_0_N_F_copy_1, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_1->SetMinSize(wxDLG_UNIT(_1_N_F_copy_1, wxSize(100, 21)));
+    sizer_5_dlg->Add(_1_N_F_copy_1, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_1->SetMinSize(wxDLG_UNIT(_0_X_F_copy_1, wxSize(100, 21)));
+    sizer_5_dlg->Add(_0_X_F_copy_1, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_1 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_1->SetMinSize(wxDLG_UNIT(_1_X_F_copy_1, wxSize(100, 21)));
+    sizer_5_dlg->Add(_1_X_F_copy_1, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxBoxSizer* sizer_6_m1abs = new wxBoxSizer(wxVERTICAL);
+    sizer_2->Add(sizer_6_m1abs, 1, wxEXPAND, 0);
     _0_N_N_copy_2 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs->Add(_0_N_N_copy_2, 0, 0, 0);
     _1_N_N_copy_2 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs->Add(_1_N_N_copy_2, 1, 0, 0);
     _0_X_N_copy_2 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs->Add(_0_X_N_copy_2, 0, wxEXPAND, 0);
     _1_X_N_copy_2 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs->Add(_1_X_N_copy_2, 1, wxEXPAND, 0);
     _0_N_F_copy_2 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs->Add(_0_N_F_copy_2, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_2 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs->Add(_1_N_F_copy_2, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_2 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs->Add(_0_X_F_copy_2, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_2 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs->Add(_1_X_F_copy_2, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxBoxSizer* sizer_6_absm1 = new wxBoxSizer(wxVERTICAL);
+    sizer_2->Add(sizer_6_absm1, 1, wxEXPAND, 0);
     _0_N_N_copy_3 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1->Add(_0_N_N_copy_3, 0, 0, 0);
     _1_N_N_copy_3 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1->Add(_1_N_N_copy_3, 1, 0, 0);
     _0_X_N_copy_3 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1->Add(_0_X_N_copy_3, 0, wxEXPAND, 0);
     _1_X_N_copy_3 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1->Add(_1_X_N_copy_3, 1, wxEXPAND, 0);
     _0_N_F_copy_3 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1->Add(_0_N_F_copy_3, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_3 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1->Add(_1_N_F_copy_3, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_3 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1->Add(_0_X_F_copy_3, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_3 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1->Add(_1_X_F_copy_3, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxBoxSizer* sizer_6_m1dlg = new wxBoxSizer(wxVERTICAL);
+    sizer_2->Add(sizer_6_m1dlg, 1, wxEXPAND, 0);
     _0_N_N_copy_4 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_4->SetMinSize(wxDLG_UNIT(_0_N_N_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg->Add(_0_N_N_copy_4, 0, 0, 0);
     _1_N_N_copy_4 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_4->SetMinSize(wxDLG_UNIT(_1_N_N_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg->Add(_1_N_N_copy_4, 1, 0, 0);
     _0_X_N_copy_4 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_4->SetMinSize(wxDLG_UNIT(_0_X_N_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg->Add(_0_X_N_copy_4, 0, wxEXPAND, 0);
     _1_X_N_copy_4 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_4->SetMinSize(wxDLG_UNIT(_1_X_N_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg->Add(_1_X_N_copy_4, 1, wxEXPAND, 0);
     _0_N_F_copy_4 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_4->SetMinSize(wxDLG_UNIT(_0_N_F_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg->Add(_0_N_F_copy_4, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_4 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_4->SetMinSize(wxDLG_UNIT(_1_N_F_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg->Add(_1_N_F_copy_4, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_4 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    sizer_6_m1dlg->Add(_0_X_F_copy_4, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_4 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    sizer_6_m1dlg->Add(_1_X_F_copy_4, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxBoxSizer* sizer_6_dlgm1 = new wxBoxSizer(wxVERTICAL);
+    sizer_2->Add(sizer_6_dlgm1, 1, wxEXPAND, 0);
     _0_N_N_copy_5 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_5->SetMinSize(wxDLG_UNIT(_0_N_N_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1->Add(_0_N_N_copy_5, 0, 0, 0);
     _1_N_N_copy_5 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_5->SetMinSize(wxDLG_UNIT(_1_N_N_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1->Add(_1_N_N_copy_5, 1, 0, 0);
     _0_X_N_copy_5 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_5->SetMinSize(wxDLG_UNIT(_0_X_N_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1->Add(_0_X_N_copy_5, 0, wxEXPAND, 0);
     _1_X_N_copy_5 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_5->SetMinSize(wxDLG_UNIT(_1_X_N_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1->Add(_1_X_N_copy_5, 1, wxEXPAND, 0);
     _0_N_F_copy_5 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_5->SetMinSize(wxDLG_UNIT(_0_N_F_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1->Add(_0_N_F_copy_5, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_5 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_5->SetMinSize(wxDLG_UNIT(_1_N_F_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1->Add(_1_N_F_copy_5, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_5 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_5->SetMinSize(wxDLG_UNIT(_0_X_F_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1->Add(_0_X_F_copy_5, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_5 = new wxTextCtrl(notebook_1_pane_1, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_5->SetMinSize(wxDLG_UNIT(_1_X_F_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1->Add(_1_X_F_copy_5, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    notebook_1_WrapSizer = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_WrapSizer, _("WrapSizer"));
+    wxBoxSizer* sizer_8 = new wxBoxSizer(wxHORIZONTAL);
+    wxWrapSizer* sizer_3_nosize_copy_1 = new wxWrapSizer(wxHORIZONTAL);
+    sizer_8->Add(sizer_3_nosize_copy_1, 1, wxEXPAND, 0);
     _0_N_N_copy_30 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy_1->Add(_0_N_N_copy_30, 0, 0, 0);
     _1_N_N_copy_30 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy_1->Add(_1_N_N_copy_30, 1, 0, 0);
     _0_X_N_copy_30 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy_1->Add(_0_X_N_copy_30, 0, wxEXPAND, 0);
     _1_X_N_copy_30 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy_1->Add(_1_X_N_copy_30, 1, wxEXPAND, 0);
     _0_N_F_copy_30 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy_1->Add(_0_N_F_copy_30, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_30 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy_1->Add(_1_N_F_copy_30, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_30 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy_1->Add(_0_X_F_copy_30, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_30 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy_1->Add(_1_X_F_copy_30, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxWrapSizer* sizer_4_abs_copy_1 = new wxWrapSizer(wxHORIZONTAL);
+    sizer_8->Add(sizer_4_abs_copy_1, 1, wxEXPAND, 0);
     _0_N_N_copy_30_copy = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_30_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy_1->Add(_0_N_N_copy_30_copy, 0, 0, 0);
     _1_N_N_copy_30_copy = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_30_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy_1->Add(_1_N_N_copy_30_copy, 1, 0, 0);
     _0_X_N_copy_30_copy = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_30_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy_1->Add(_0_X_N_copy_30_copy, 0, wxEXPAND, 0);
     _1_X_N_copy_30_copy = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_30_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy_1->Add(_1_X_N_copy_30_copy, 1, wxEXPAND, 0);
     _0_N_F_copy_30_copy = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_30_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy_1->Add(_0_N_F_copy_30_copy, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_30_copy = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_30_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy_1->Add(_1_N_F_copy_30_copy, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_30_copy = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_30_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy_1->Add(_0_X_F_copy_30_copy, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_30_copy = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_30_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy_1->Add(_1_X_F_copy_30_copy, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxWrapSizer* sizer_5_dlg_copy_1 = new wxWrapSizer(wxHORIZONTAL);
+    sizer_8->Add(sizer_5_dlg_copy_1, 1, wxEXPAND, 0);
     _0_N_N_copy_30_copy_1 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_0_N_N_copy_30_copy_1, wxSize(100, 21)));
+    sizer_5_dlg_copy_1->Add(_0_N_N_copy_30_copy_1, 0, 0, 0);
     _1_N_N_copy_30_copy_1 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_1_N_N_copy_30_copy_1, wxSize(100, 21)));
+    sizer_5_dlg_copy_1->Add(_1_N_N_copy_30_copy_1, 1, 0, 0);
     _0_X_N_copy_30_copy_1 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_0_X_N_copy_30_copy_1, wxSize(100, 21)));
+    sizer_5_dlg_copy_1->Add(_0_X_N_copy_30_copy_1, 0, wxEXPAND, 0);
     _1_X_N_copy_30_copy_1 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_1_X_N_copy_30_copy_1, wxSize(100, 21)));
+    sizer_5_dlg_copy_1->Add(_1_X_N_copy_30_copy_1, 1, wxEXPAND, 0);
     _0_N_F_copy_30_copy_1 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_0_N_F_copy_30_copy_1, wxSize(100, 21)));
+    sizer_5_dlg_copy_1->Add(_0_N_F_copy_30_copy_1, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_30_copy_1 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_1_N_F_copy_30_copy_1, wxSize(100, 21)));
+    sizer_5_dlg_copy_1->Add(_1_N_F_copy_30_copy_1, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_30_copy_1 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_0_X_F_copy_30_copy_1, wxSize(100, 21)));
+    sizer_5_dlg_copy_1->Add(_0_X_F_copy_30_copy_1, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_30_copy_1 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_1_X_F_copy_30_copy_1, wxSize(100, 21)));
+    sizer_5_dlg_copy_1->Add(_1_X_F_copy_30_copy_1, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxWrapSizer* sizer_6_m1abs_copy_1 = new wxWrapSizer(wxHORIZONTAL);
+    sizer_8->Add(sizer_6_m1abs_copy_1, 1, wxEXPAND, 0);
     _0_N_N_copy_30_copy_2 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy_1->Add(_0_N_N_copy_30_copy_2, 0, 0, 0);
     _1_N_N_copy_30_copy_2 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy_1->Add(_1_N_N_copy_30_copy_2, 1, 0, 0);
     _0_X_N_copy_30_copy_2 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy_1->Add(_0_X_N_copy_30_copy_2, 0, wxEXPAND, 0);
     _1_X_N_copy_30_copy_2 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy_1->Add(_1_X_N_copy_30_copy_2, 1, wxEXPAND, 0);
     _0_N_F_copy_30_copy_2 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy_1->Add(_0_N_F_copy_30_copy_2, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_30_copy_2 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy_1->Add(_1_N_F_copy_30_copy_2, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_30_copy_2 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy_1->Add(_0_X_F_copy_30_copy_2, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_30_copy_2 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy_1->Add(_1_X_F_copy_30_copy_2, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxWrapSizer* sizer_6_absm1_copy_1 = new wxWrapSizer(wxHORIZONTAL);
+    sizer_8->Add(sizer_6_absm1_copy_1, 1, wxEXPAND, 0);
     _0_N_N_copy_30_copy_3 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_30_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy_1->Add(_0_N_N_copy_30_copy_3, 0, 0, 0);
     _1_N_N_copy_30_copy_3 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_30_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy_1->Add(_1_N_N_copy_30_copy_3, 1, 0, 0);
     _0_X_N_copy_30_copy_3 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_30_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy_1->Add(_0_X_N_copy_30_copy_3, 0, wxEXPAND, 0);
     _1_X_N_copy_30_copy_3 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_30_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy_1->Add(_1_X_N_copy_30_copy_3, 1, wxEXPAND, 0);
     _0_N_F_copy_30_copy_3 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_30_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy_1->Add(_0_N_F_copy_30_copy_3, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_30_copy_3 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_30_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy_1->Add(_1_N_F_copy_30_copy_3, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_30_copy_3 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_30_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy_1->Add(_0_X_F_copy_30_copy_3, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_30_copy_3 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_30_copy_3->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy_1->Add(_1_X_F_copy_30_copy_3, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxWrapSizer* sizer_6_m1dlg_copy_1 = new wxWrapSizer(wxHORIZONTAL);
+    sizer_8->Add(sizer_6_m1dlg_copy_1, 1, wxEXPAND, 0);
     _0_N_N_copy_30_copy_4 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_0_N_N_copy_30_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy_1->Add(_0_N_N_copy_30_copy_4, 0, 0, 0);
     _1_N_N_copy_30_copy_4 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_1_N_N_copy_30_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy_1->Add(_1_N_N_copy_30_copy_4, 1, 0, 0);
     _0_X_N_copy_30_copy_4 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_0_X_N_copy_30_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy_1->Add(_0_X_N_copy_30_copy_4, 0, wxEXPAND, 0);
     _1_X_N_copy_30_copy_4 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_1_X_N_copy_30_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy_1->Add(_1_X_N_copy_30_copy_4, 1, wxEXPAND, 0);
     _0_N_F_copy_30_copy_4 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_0_N_F_copy_30_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy_1->Add(_0_N_F_copy_30_copy_4, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_30_copy_4 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_1_N_F_copy_30_copy_4, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy_1->Add(_1_N_F_copy_30_copy_4, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_30_copy_4 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    sizer_6_m1dlg_copy_1->Add(_0_X_F_copy_30_copy_4, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_30_copy_4 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    sizer_6_m1dlg_copy_1->Add(_1_X_F_copy_30_copy_4, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxWrapSizer* sizer_6_dlgm1_copy_1 = new wxWrapSizer(wxHORIZONTAL);
+    sizer_8->Add(sizer_6_dlgm1_copy_1, 1, wxEXPAND, 0);
     _0_N_N_copy_30_copy_5 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_0_N_N_copy_30_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1_copy_1->Add(_0_N_N_copy_30_copy_5, 0, 0, 0);
     _1_N_N_copy_30_copy_5 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_1_N_N_copy_30_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1_copy_1->Add(_1_N_N_copy_30_copy_5, 1, 0, 0);
     _0_X_N_copy_30_copy_5 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_0_X_N_copy_30_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1_copy_1->Add(_0_X_N_copy_30_copy_5, 0, wxEXPAND, 0);
     _1_X_N_copy_30_copy_5 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_1_X_N_copy_30_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1_copy_1->Add(_1_X_N_copy_30_copy_5, 1, wxEXPAND, 0);
     _0_N_F_copy_30_copy_5 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_0_N_F_copy_30_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1_copy_1->Add(_0_N_F_copy_30_copy_5, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_30_copy_5 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_1_N_F_copy_30_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1_copy_1->Add(_1_N_F_copy_30_copy_5, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_30_copy_5 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_0_X_F_copy_30_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1_copy_1->Add(_0_X_F_copy_30_copy_5, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_30_copy_5 = new wxTextCtrl(notebook_1_WrapSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_1_X_F_copy_30_copy_5, wxSize(100, -1)));
+    sizer_6_dlgm1_copy_1->Add(_1_X_F_copy_30_copy_5, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    notebook_1_StaticBoxSizer = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_StaticBoxSizer, _("StaticBoxSizer"));
+    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
+    wxStaticBoxSizer* sizer_3_nosize_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_3_nosize_copy")), wxVERTICAL);
+    sizer_3->Add(sizer_3_nosize_copy, 1, wxEXPAND, 0);
     _0_N_N_copy_6 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy->Add(_0_N_N_copy_6, 0, 0, 0);
     _1_N_N_copy_6 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy->Add(_1_N_N_copy_6, 1, 0, 0);
     _0_X_N_copy_6 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy->Add(_0_X_N_copy_6, 0, wxEXPAND, 0);
     _1_X_N_copy_6 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy->Add(_1_X_N_copy_6, 1, wxEXPAND, 0);
     _0_N_F_copy_6 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy->Add(_0_N_F_copy_6, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_6 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy->Add(_1_N_F_copy_6, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_6 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy->Add(_0_X_F_copy_6, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_6 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    sizer_3_nosize_copy->Add(_1_X_F_copy_6, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxStaticBoxSizer* sizer_4_abs_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_4_abs_copy")), wxVERTICAL);
+    sizer_3->Add(sizer_4_abs_copy, 1, wxEXPAND, 0);
     _0_N_N_copy_copy = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy->Add(_0_N_N_copy_copy, 0, 0, 0);
     _1_N_N_copy_copy = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy->Add(_1_N_N_copy_copy, 1, 0, 0);
     _0_X_N_copy_copy = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy->Add(_0_X_N_copy_copy, 0, wxEXPAND, 0);
     _1_X_N_copy_copy = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy->Add(_1_X_N_copy_copy, 1, wxEXPAND, 0);
     _0_N_F_copy_copy = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy->Add(_0_N_F_copy_copy, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_copy = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy->Add(_1_N_F_copy_copy, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_copy = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy->Add(_0_X_F_copy_copy, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_copy = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4_abs_copy->Add(_1_X_F_copy_copy, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxStaticBoxSizer* sizer_5_dlg_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_5_dlg_copy")), wxVERTICAL);
+    sizer_3->Add(sizer_5_dlg_copy, 1, wxEXPAND, 0);
     _0_N_N_copy_7 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_7->SetMinSize(wxDLG_UNIT(_0_N_N_copy_7, wxSize(100, 21)));
+    sizer_5_dlg_copy->Add(_0_N_N_copy_7, 0, 0, 0);
     _1_N_N_copy_7 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_7->SetMinSize(wxDLG_UNIT(_1_N_N_copy_7, wxSize(100, 21)));
+    sizer_5_dlg_copy->Add(_1_N_N_copy_7, 1, 0, 0);
     _0_X_N_copy_7 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_7->SetMinSize(wxDLG_UNIT(_0_X_N_copy_7, wxSize(100, 21)));
+    sizer_5_dlg_copy->Add(_0_X_N_copy_7, 0, wxEXPAND, 0);
     _1_X_N_copy_7 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_7->SetMinSize(wxDLG_UNIT(_1_X_N_copy_7, wxSize(100, 21)));
+    sizer_5_dlg_copy->Add(_1_X_N_copy_7, 1, wxEXPAND, 0);
     _0_N_F_copy_7 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_7->SetMinSize(wxDLG_UNIT(_0_N_F_copy_7, wxSize(100, 21)));
+    sizer_5_dlg_copy->Add(_0_N_F_copy_7, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_7 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_7->SetMinSize(wxDLG_UNIT(_1_N_F_copy_7, wxSize(100, 21)));
+    sizer_5_dlg_copy->Add(_1_N_F_copy_7, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_7 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_7->SetMinSize(wxDLG_UNIT(_0_X_F_copy_7, wxSize(100, 21)));
+    sizer_5_dlg_copy->Add(_0_X_F_copy_7, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_7 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_7->SetMinSize(wxDLG_UNIT(_1_X_F_copy_7, wxSize(100, 21)));
+    sizer_5_dlg_copy->Add(_1_X_F_copy_7, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxStaticBoxSizer* sizer_6_m1abs_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_6_m1abs_copy")), wxVERTICAL);
+    sizer_3->Add(sizer_6_m1abs_copy, 1, wxEXPAND, 0);
     _0_N_N_copy_8 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_8->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy->Add(_0_N_N_copy_8, 0, 0, 0);
     _1_N_N_copy_8 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_8->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy->Add(_1_N_N_copy_8, 1, 0, 0);
     _0_X_N_copy_8 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_8->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy->Add(_0_X_N_copy_8, 0, wxEXPAND, 0);
     _1_X_N_copy_8 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_8->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy->Add(_1_X_N_copy_8, 1, wxEXPAND, 0);
     _0_N_F_copy_8 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_8->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy->Add(_0_N_F_copy_8, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_8 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_8->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy->Add(_1_N_F_copy_8, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_8 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_8->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy->Add(_0_X_F_copy_8, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_8 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_8->SetMinSize(wxSize(-1, 21));
+    sizer_6_m1abs_copy->Add(_1_X_F_copy_8, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxStaticBoxSizer* sizer_6_absm1_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_6_absm1_copy")), wxVERTICAL);
+    sizer_3->Add(sizer_6_absm1_copy, 1, wxEXPAND, 0);
     _0_N_N_copy_9 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_9->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy->Add(_0_N_N_copy_9, 0, 0, 0);
     _1_N_N_copy_9 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_9->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy->Add(_1_N_N_copy_9, 1, 0, 0);
     _0_X_N_copy_9 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_9->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy->Add(_0_X_N_copy_9, 0, wxEXPAND, 0);
     _1_X_N_copy_9 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_9->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy->Add(_1_X_N_copy_9, 1, wxEXPAND, 0);
     _0_N_F_copy_9 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_9->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy->Add(_0_N_F_copy_9, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_9 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_9->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy->Add(_1_N_F_copy_9, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_9 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_9->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy->Add(_0_X_F_copy_9, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_9 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_9->SetMinSize(wxSize(100, -1));
+    sizer_6_absm1_copy->Add(_1_X_F_copy_9, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxStaticBoxSizer* sizer_6_m1dlg_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_6_m1dlg_copy")), wxVERTICAL);
+    sizer_3->Add(sizer_6_m1dlg_copy, 1, wxEXPAND, 0);
     _0_N_N_copy_10 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_10->SetMinSize(wxDLG_UNIT(_0_N_N_copy_10, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy->Add(_0_N_N_copy_10, 0, 0, 0);
     _1_N_N_copy_10 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_10->SetMinSize(wxDLG_UNIT(_1_N_N_copy_10, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy->Add(_1_N_N_copy_10, 1, 0, 0);
     _0_X_N_copy_10 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_10->SetMinSize(wxDLG_UNIT(_0_X_N_copy_10, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy->Add(_0_X_N_copy_10, 0, wxEXPAND, 0);
     _1_X_N_copy_10 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_10->SetMinSize(wxDLG_UNIT(_1_X_N_copy_10, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy->Add(_1_X_N_copy_10, 1, wxEXPAND, 0);
     _0_N_F_copy_10 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_10->SetMinSize(wxDLG_UNIT(_0_N_F_copy_10, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy->Add(_0_N_F_copy_10, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_10 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_10->SetMinSize(wxDLG_UNIT(_1_N_F_copy_10, wxSize(-1, 100)));
+    sizer_6_m1dlg_copy->Add(_1_N_F_copy_10, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_10 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    sizer_6_m1dlg_copy->Add(_0_X_F_copy_10, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_10 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    sizer_6_m1dlg_copy->Add(_1_X_F_copy_10, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    wxStaticBoxSizer* sizer_6_dlgm1_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_6_dlgm1_copy")), wxVERTICAL);
+    sizer_3->Add(sizer_6_dlgm1_copy, 1, wxEXPAND, 0);
     _0_N_N_copy_11 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_11->SetMinSize(wxDLG_UNIT(_0_N_N_copy_11, wxSize(100, -1)));
+    sizer_6_dlgm1_copy->Add(_0_N_N_copy_11, 0, 0, 0);
     _1_N_N_copy_11 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_11->SetMinSize(wxDLG_UNIT(_1_N_N_copy_11, wxSize(100, -1)));
+    sizer_6_dlgm1_copy->Add(_1_N_N_copy_11, 1, 0, 0);
     _0_X_N_copy_11 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_11->SetMinSize(wxDLG_UNIT(_0_X_N_copy_11, wxSize(100, -1)));
+    sizer_6_dlgm1_copy->Add(_0_X_N_copy_11, 0, wxEXPAND, 0);
     _1_X_N_copy_11 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_11->SetMinSize(wxDLG_UNIT(_1_X_N_copy_11, wxSize(100, -1)));
+    sizer_6_dlgm1_copy->Add(_1_X_N_copy_11, 1, wxEXPAND, 0);
     _0_N_F_copy_11 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_11->SetMinSize(wxDLG_UNIT(_0_N_F_copy_11, wxSize(100, -1)));
+    sizer_6_dlgm1_copy->Add(_0_N_F_copy_11, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_11 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_11->SetMinSize(wxDLG_UNIT(_1_N_F_copy_11, wxSize(100, -1)));
+    sizer_6_dlgm1_copy->Add(_1_N_F_copy_11, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_11 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_11->SetMinSize(wxDLG_UNIT(_0_X_F_copy_11, wxSize(100, -1)));
+    sizer_6_dlgm1_copy->Add(_0_X_F_copy_11, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_11 = new wxTextCtrl(notebook_1_StaticBoxSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_11->SetMinSize(wxDLG_UNIT(_1_X_F_copy_11, wxSize(100, -1)));
+    sizer_6_dlgm1_copy->Add(_1_X_F_copy_11, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    notebook_1_GridSizer = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_GridSizer, _("GridSizer"));
+    wxGridSizer* sizer_4 = new wxGridSizer(7, 8, 0, 0);
     _0_N_N_copy_12 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    sizer_4->Add(_0_N_N_copy_12, 0, 0, 0);
     _1_N_N_copy_12 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    sizer_4->Add(_1_N_N_copy_12, 1, 0, 0);
     _0_X_N_copy_12 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    sizer_4->Add(_0_X_N_copy_12, 0, wxEXPAND, 0);
     _1_X_N_copy_12 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    sizer_4->Add(_1_X_N_copy_12, 1, wxEXPAND, 0);
     _0_N_F_copy_12 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    sizer_4->Add(_0_N_F_copy_12, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_12 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    sizer_4->Add(_1_N_F_copy_12, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_12 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    sizer_4->Add(_0_X_F_copy_12, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_12 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    sizer_4->Add(_1_X_F_copy_12, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
     _0_N_N_copy_copy_copy = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4->Add(_0_N_N_copy_copy_copy, 0, 0, 0);
     _1_N_N_copy_copy_copy = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4->Add(_1_N_N_copy_copy_copy, 1, 0, 0);
     _0_X_N_copy_copy_copy = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4->Add(_0_X_N_copy_copy_copy, 0, wxEXPAND, 0);
     _1_X_N_copy_copy_copy = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4->Add(_1_X_N_copy_copy_copy, 1, wxEXPAND, 0);
     _0_N_F_copy_copy_copy = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4->Add(_0_N_F_copy_copy_copy, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_copy_copy = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4->Add(_1_N_F_copy_copy_copy, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_copy_copy = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4->Add(_0_X_F_copy_copy_copy, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_copy_copy = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_4->Add(_1_X_F_copy_copy_copy, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
     _0_N_N_copy_13 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_13->SetMinSize(wxDLG_UNIT(_0_N_N_copy_13, wxSize(100, 21)));
+    sizer_4->Add(_0_N_N_copy_13, 0, 0, 0);
     _1_N_N_copy_13 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_13->SetMinSize(wxDLG_UNIT(_1_N_N_copy_13, wxSize(100, 21)));
+    sizer_4->Add(_1_N_N_copy_13, 1, 0, 0);
     _0_X_N_copy_13 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_13->SetMinSize(wxDLG_UNIT(_0_X_N_copy_13, wxSize(100, 21)));
+    sizer_4->Add(_0_X_N_copy_13, 0, wxEXPAND, 0);
     _1_X_N_copy_13 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_13->SetMinSize(wxDLG_UNIT(_1_X_N_copy_13, wxSize(100, 21)));
+    sizer_4->Add(_1_X_N_copy_13, 1, wxEXPAND, 0);
     _0_N_F_copy_13 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_13->SetMinSize(wxDLG_UNIT(_0_N_F_copy_13, wxSize(100, 21)));
+    sizer_4->Add(_0_N_F_copy_13, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_13 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_13->SetMinSize(wxDLG_UNIT(_1_N_F_copy_13, wxSize(100, 21)));
+    sizer_4->Add(_1_N_F_copy_13, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_13 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_13->SetMinSize(wxDLG_UNIT(_0_X_F_copy_13, wxSize(100, 21)));
+    sizer_4->Add(_0_X_F_copy_13, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_13 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_13->SetMinSize(wxDLG_UNIT(_1_X_F_copy_13, wxSize(100, 21)));
+    sizer_4->Add(_1_X_F_copy_13, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
     _0_N_N_copy_14 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_14->SetMinSize(wxSize(-1, 21));
+    sizer_4->Add(_0_N_N_copy_14, 0, 0, 0);
     _1_N_N_copy_14 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_14->SetMinSize(wxSize(-1, 21));
+    sizer_4->Add(_1_N_N_copy_14, 1, 0, 0);
     _0_X_N_copy_14 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_14->SetMinSize(wxSize(-1, 21));
+    sizer_4->Add(_0_X_N_copy_14, 0, wxEXPAND, 0);
     _1_X_N_copy_14 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_14->SetMinSize(wxSize(-1, 21));
+    sizer_4->Add(_1_X_N_copy_14, 1, wxEXPAND, 0);
     _0_N_F_copy_14 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_14->SetMinSize(wxSize(-1, 21));
+    sizer_4->Add(_0_N_F_copy_14, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_14 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_14->SetMinSize(wxSize(-1, 21));
+    sizer_4->Add(_1_N_F_copy_14, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_14 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_14->SetMinSize(wxSize(-1, 21));
+    sizer_4->Add(_0_X_F_copy_14, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_14 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_14->SetMinSize(wxSize(-1, 21));
+    sizer_4->Add(_1_X_F_copy_14, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
     _0_N_N_copy_15 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_15->SetMinSize(wxSize(100, -1));
+    sizer_4->Add(_0_N_N_copy_15, 0, 0, 0);
     _1_N_N_copy_15 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_15->SetMinSize(wxSize(100, -1));
+    sizer_4->Add(_1_N_N_copy_15, 1, 0, 0);
     _0_X_N_copy_15 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_15->SetMinSize(wxSize(100, -1));
+    sizer_4->Add(_0_X_N_copy_15, 0, wxEXPAND, 0);
     _1_X_N_copy_15 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_15->SetMinSize(wxSize(100, -1));
+    sizer_4->Add(_1_X_N_copy_15, 1, wxEXPAND, 0);
     _0_N_F_copy_15 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_15->SetMinSize(wxSize(100, -1));
+    sizer_4->Add(_0_N_F_copy_15, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_15 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_15->SetMinSize(wxSize(100, -1));
+    sizer_4->Add(_1_N_F_copy_15, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_15 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_15->SetMinSize(wxSize(100, -1));
+    sizer_4->Add(_0_X_F_copy_15, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_15 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_15->SetMinSize(wxSize(100, -1));
+    sizer_4->Add(_1_X_F_copy_15, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
     _0_N_N_copy_16 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_16->SetMinSize(wxDLG_UNIT(_0_N_N_copy_16, wxSize(-1, 100)));
+    sizer_4->Add(_0_N_N_copy_16, 0, 0, 0);
     _1_N_N_copy_16 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_16->SetMinSize(wxDLG_UNIT(_1_N_N_copy_16, wxSize(-1, 100)));
+    sizer_4->Add(_1_N_N_copy_16, 1, 0, 0);
     _0_X_N_copy_16 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_16->SetMinSize(wxDLG_UNIT(_0_X_N_copy_16, wxSize(-1, 100)));
+    sizer_4->Add(_0_X_N_copy_16, 0, wxEXPAND, 0);
     _1_X_N_copy_16 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_16->SetMinSize(wxDLG_UNIT(_1_X_N_copy_16, wxSize(-1, 100)));
+    sizer_4->Add(_1_X_N_copy_16, 1, wxEXPAND, 0);
     _0_N_F_copy_16 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_16->SetMinSize(wxDLG_UNIT(_0_N_F_copy_16, wxSize(-1, 100)));
+    sizer_4->Add(_0_N_F_copy_16, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_16 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_16->SetMinSize(wxDLG_UNIT(_1_N_F_copy_16, wxSize(-1, 100)));
+    sizer_4->Add(_1_N_F_copy_16, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_16 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    sizer_4->Add(_0_X_F_copy_16, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_16 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    sizer_4->Add(_1_X_F_copy_16, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
     _0_N_N_copy_17 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_17->SetMinSize(wxDLG_UNIT(_0_N_N_copy_17, wxSize(100, -1)));
+    sizer_4->Add(_0_N_N_copy_17, 0, 0, 0);
     _1_N_N_copy_17 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_17->SetMinSize(wxDLG_UNIT(_1_N_N_copy_17, wxSize(100, -1)));
+    sizer_4->Add(_1_N_N_copy_17, 1, 0, 0);
     _0_X_N_copy_17 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_17->SetMinSize(wxDLG_UNIT(_0_X_N_copy_17, wxSize(100, -1)));
+    sizer_4->Add(_0_X_N_copy_17, 0, wxEXPAND, 0);
     _1_X_N_copy_17 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_17->SetMinSize(wxDLG_UNIT(_1_X_N_copy_17, wxSize(100, -1)));
+    sizer_4->Add(_1_X_N_copy_17, 1, wxEXPAND, 0);
     _0_N_F_copy_17 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_17->SetMinSize(wxDLG_UNIT(_0_N_F_copy_17, wxSize(100, -1)));
+    sizer_4->Add(_0_N_F_copy_17, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_17 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_17->SetMinSize(wxDLG_UNIT(_1_N_F_copy_17, wxSize(100, -1)));
+    sizer_4->Add(_1_N_F_copy_17, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_17 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_17->SetMinSize(wxDLG_UNIT(_0_X_F_copy_17, wxSize(100, -1)));
+    sizer_4->Add(_0_X_F_copy_17, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_17 = new wxTextCtrl(notebook_1_GridSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_17->SetMinSize(wxDLG_UNIT(_1_X_F_copy_17, wxSize(100, -1)));
+    sizer_4->Add(_1_X_F_copy_17, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    notebook_1_FlexGridSizer = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_FlexGridSizer, _("FlexGridSizer"));
+    wxFlexGridSizer* sizer_5 = new wxFlexGridSizer(7, 8, 1, 1);
     _0_N_N_copy_18 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    sizer_5->Add(_0_N_N_copy_18, 0, 0, 0);
     _1_N_N_copy_18 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    sizer_5->Add(_1_N_N_copy_18, 1, 0, 0);
     _0_X_N_copy_18 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    sizer_5->Add(_0_X_N_copy_18, 0, wxEXPAND, 0);
     _1_X_N_copy_18 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    sizer_5->Add(_1_X_N_copy_18, 1, wxEXPAND, 0);
     _0_N_F_copy_18 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    sizer_5->Add(_0_N_F_copy_18, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_18 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    sizer_5->Add(_1_N_F_copy_18, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_18 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    sizer_5->Add(_0_X_F_copy_18, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_18 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    sizer_5->Add(_1_X_F_copy_18, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
     _0_N_N_copy_copy_copy_copy = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_5->Add(_0_N_N_copy_copy_copy_copy, 0, 0, 0);
     _1_N_N_copy_copy_copy_copy = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_5->Add(_1_N_N_copy_copy_copy_copy, 1, 0, 0);
     _0_X_N_copy_copy_copy_copy = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_5->Add(_0_X_N_copy_copy_copy_copy, 0, wxEXPAND, 0);
     _1_X_N_copy_copy_copy_copy = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_5->Add(_1_X_N_copy_copy_copy_copy, 1, wxEXPAND, 0);
     _0_N_F_copy_copy_copy_copy = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_5->Add(_0_N_F_copy_copy_copy_copy, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_copy_copy_copy = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_5->Add(_1_N_F_copy_copy_copy_copy, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_copy_copy_copy = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_5->Add(_0_X_F_copy_copy_copy_copy, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_copy_copy_copy = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
+    sizer_5->Add(_1_X_F_copy_copy_copy_copy, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
     _0_N_N_copy_19 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_19->SetMinSize(wxDLG_UNIT(_0_N_N_copy_19, wxSize(100, 21)));
+    sizer_5->Add(_0_N_N_copy_19, 0, 0, 0);
     _1_N_N_copy_19 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_19->SetMinSize(wxDLG_UNIT(_1_N_N_copy_19, wxSize(100, 21)));
+    sizer_5->Add(_1_N_N_copy_19, 1, 0, 0);
     _0_X_N_copy_19 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_19->SetMinSize(wxDLG_UNIT(_0_X_N_copy_19, wxSize(100, 21)));
+    sizer_5->Add(_0_X_N_copy_19, 0, wxEXPAND, 0);
     _1_X_N_copy_19 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_19->SetMinSize(wxDLG_UNIT(_1_X_N_copy_19, wxSize(100, 21)));
+    sizer_5->Add(_1_X_N_copy_19, 1, wxEXPAND, 0);
     _0_N_F_copy_19 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_19->SetMinSize(wxDLG_UNIT(_0_N_F_copy_19, wxSize(100, 21)));
+    sizer_5->Add(_0_N_F_copy_19, 0, wxFIXED_MINSIZE, 0);
     _1_N_F_copy_19 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_19->SetMinSize(wxDLG_UNIT(_1_N_F_copy_19, wxSize(100, 21)));
+    sizer_5->Add(_1_N_F_copy_19, 1, wxFIXED_MINSIZE, 0);
     _0_X_F_copy_19 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_19->SetMinSize(wxDLG_UNIT(_0_X_F_copy_19, wxSize(100, 21)));
+    sizer_5->Add(_0_X_F_copy_19, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
     _1_X_F_copy_19 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_N_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_N_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_N_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_F_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_N_F_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_X_F_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _1_X_F_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
-    _0_N_N_border_10_none = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
-    _1_N_N_border_0_all = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
-    _0_X_N_border_5_LEFTRIGHT = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
-    _1_X_N_border_15_BOTTOM = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_copy_1 = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_31 = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
-    _0_N_N_copy_32 = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
-    button_1 = new wxButton(notebook_1_GridBagSizer_Spacers, wxID_ANY, _("button_1"));
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
-    SetTitle(_("frame"));
-    _0_N_N_copy->SetMinSize(wxSize(100, 21));
-    _1_N_N_copy->SetMinSize(wxSize(100, 21));
-    _0_X_N_copy->SetMinSize(wxSize(100, 21));
-    _1_X_N_copy->SetMinSize(wxSize(100, 21));
-    _0_N_F_copy->SetMinSize(wxSize(100, 21));
-    _1_N_F_copy->SetMinSize(wxSize(100, 21));
-    _0_X_F_copy->SetMinSize(wxSize(100, 21));
-    _1_X_F_copy->SetMinSize(wxSize(100, 21));
-    _0_N_N_copy_1->SetMinSize(wxDLG_UNIT(_0_N_N_copy_1, wxSize(100, 21)));
-    _1_N_N_copy_1->SetMinSize(wxDLG_UNIT(_1_N_N_copy_1, wxSize(100, 21)));
-    _0_X_N_copy_1->SetMinSize(wxDLG_UNIT(_0_X_N_copy_1, wxSize(100, 21)));
-    _1_X_N_copy_1->SetMinSize(wxDLG_UNIT(_1_X_N_copy_1, wxSize(100, 21)));
-    _0_N_F_copy_1->SetMinSize(wxDLG_UNIT(_0_N_F_copy_1, wxSize(100, 21)));
-    _1_N_F_copy_1->SetMinSize(wxDLG_UNIT(_1_N_F_copy_1, wxSize(100, 21)));
-    _0_X_F_copy_1->SetMinSize(wxDLG_UNIT(_0_X_F_copy_1, wxSize(100, 21)));
-    _1_X_F_copy_1->SetMinSize(wxDLG_UNIT(_1_X_F_copy_1, wxSize(100, 21)));
-    _0_N_N_copy_2->SetMinSize(wxSize(-1, 21));
-    _1_N_N_copy_2->SetMinSize(wxSize(-1, 21));
-    _0_X_N_copy_2->SetMinSize(wxSize(-1, 21));
-    _1_X_N_copy_2->SetMinSize(wxSize(-1, 21));
-    _0_N_F_copy_2->SetMinSize(wxSize(-1, 21));
-    _1_N_F_copy_2->SetMinSize(wxSize(-1, 21));
-    _0_X_F_copy_2->SetMinSize(wxSize(-1, 21));
-    _1_X_F_copy_2->SetMinSize(wxSize(-1, 21));
-    _0_N_N_copy_3->SetMinSize(wxSize(100, -1));
-    _1_N_N_copy_3->SetMinSize(wxSize(100, -1));
-    _0_X_N_copy_3->SetMinSize(wxSize(100, -1));
-    _1_X_N_copy_3->SetMinSize(wxSize(100, -1));
-    _0_N_F_copy_3->SetMinSize(wxSize(100, -1));
-    _1_N_F_copy_3->SetMinSize(wxSize(100, -1));
-    _0_X_F_copy_3->SetMinSize(wxSize(100, -1));
-    _1_X_F_copy_3->SetMinSize(wxSize(100, -1));
-    _0_N_N_copy_4->SetMinSize(wxDLG_UNIT(_0_N_N_copy_4, wxSize(-1, 100)));
-    _1_N_N_copy_4->SetMinSize(wxDLG_UNIT(_1_N_N_copy_4, wxSize(-1, 100)));
-    _0_X_N_copy_4->SetMinSize(wxDLG_UNIT(_0_X_N_copy_4, wxSize(-1, 100)));
-    _1_X_N_copy_4->SetMinSize(wxDLG_UNIT(_1_X_N_copy_4, wxSize(-1, 100)));
-    _0_N_F_copy_4->SetMinSize(wxDLG_UNIT(_0_N_F_copy_4, wxSize(-1, 100)));
-    _1_N_F_copy_4->SetMinSize(wxDLG_UNIT(_1_N_F_copy_4, wxSize(-1, 100)));
-    _0_N_N_copy_5->SetMinSize(wxDLG_UNIT(_0_N_N_copy_5, wxSize(100, -1)));
-    _1_N_N_copy_5->SetMinSize(wxDLG_UNIT(_1_N_N_copy_5, wxSize(100, -1)));
-    _0_X_N_copy_5->SetMinSize(wxDLG_UNIT(_0_X_N_copy_5, wxSize(100, -1)));
-    _1_X_N_copy_5->SetMinSize(wxDLG_UNIT(_1_X_N_copy_5, wxSize(100, -1)));
-    _0_N_F_copy_5->SetMinSize(wxDLG_UNIT(_0_N_F_copy_5, wxSize(100, -1)));
-    _1_N_F_copy_5->SetMinSize(wxDLG_UNIT(_1_N_F_copy_5, wxSize(100, -1)));
-    _0_X_F_copy_5->SetMinSize(wxDLG_UNIT(_0_X_F_copy_5, wxSize(100, -1)));
-    _1_X_F_copy_5->SetMinSize(wxDLG_UNIT(_1_X_F_copy_5, wxSize(100, -1)));
-    _0_N_N_copy_30_copy->SetMinSize(wxSize(100, 21));
-    _1_N_N_copy_30_copy->SetMinSize(wxSize(100, 21));
-    _0_X_N_copy_30_copy->SetMinSize(wxSize(100, 21));
-    _1_X_N_copy_30_copy->SetMinSize(wxSize(100, 21));
-    _0_N_F_copy_30_copy->SetMinSize(wxSize(100, 21));
-    _1_N_F_copy_30_copy->SetMinSize(wxSize(100, 21));
-    _0_X_F_copy_30_copy->SetMinSize(wxSize(100, 21));
-    _1_X_F_copy_30_copy->SetMinSize(wxSize(100, 21));
-    _0_N_N_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_0_N_N_copy_30_copy_1, wxSize(100, 21)));
-    _1_N_N_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_1_N_N_copy_30_copy_1, wxSize(100, 21)));
-    _0_X_N_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_0_X_N_copy_30_copy_1, wxSize(100, 21)));
-    _1_X_N_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_1_X_N_copy_30_copy_1, wxSize(100, 21)));
-    _0_N_F_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_0_N_F_copy_30_copy_1, wxSize(100, 21)));
-    _1_N_F_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_1_N_F_copy_30_copy_1, wxSize(100, 21)));
-    _0_X_F_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_0_X_F_copy_30_copy_1, wxSize(100, 21)));
-    _1_X_F_copy_30_copy_1->SetMinSize(wxDLG_UNIT(_1_X_F_copy_30_copy_1, wxSize(100, 21)));
-    _0_N_N_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
-    _1_N_N_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
-    _0_X_N_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
-    _1_X_N_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
-    _0_N_F_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
-    _1_N_F_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
-    _0_X_F_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
-    _1_X_F_copy_30_copy_2->SetMinSize(wxSize(-1, 21));
-    _0_N_N_copy_30_copy_3->SetMinSize(wxSize(100, -1));
-    _1_N_N_copy_30_copy_3->SetMinSize(wxSize(100, -1));
-    _0_X_N_copy_30_copy_3->SetMinSize(wxSize(100, -1));
-    _1_X_N_copy_30_copy_3->SetMinSize(wxSize(100, -1));
-    _0_N_F_copy_30_copy_3->SetMinSize(wxSize(100, -1));
-    _1_N_F_copy_30_copy_3->SetMinSize(wxSize(100, -1));
-    _0_X_F_copy_30_copy_3->SetMinSize(wxSize(100, -1));
-    _1_X_F_copy_30_copy_3->SetMinSize(wxSize(100, -1));
-    _0_N_N_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_0_N_N_copy_30_copy_4, wxSize(-1, 100)));
-    _1_N_N_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_1_N_N_copy_30_copy_4, wxSize(-1, 100)));
-    _0_X_N_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_0_X_N_copy_30_copy_4, wxSize(-1, 100)));
-    _1_X_N_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_1_X_N_copy_30_copy_4, wxSize(-1, 100)));
-    _0_N_F_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_0_N_F_copy_30_copy_4, wxSize(-1, 100)));
-    _1_N_F_copy_30_copy_4->SetMinSize(wxDLG_UNIT(_1_N_F_copy_30_copy_4, wxSize(-1, 100)));
-    _0_N_N_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_0_N_N_copy_30_copy_5, wxSize(100, -1)));
-    _1_N_N_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_1_N_N_copy_30_copy_5, wxSize(100, -1)));
-    _0_X_N_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_0_X_N_copy_30_copy_5, wxSize(100, -1)));
-    _1_X_N_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_1_X_N_copy_30_copy_5, wxSize(100, -1)));
-    _0_N_F_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_0_N_F_copy_30_copy_5, wxSize(100, -1)));
-    _1_N_F_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_1_N_F_copy_30_copy_5, wxSize(100, -1)));
-    _0_X_F_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_0_X_F_copy_30_copy_5, wxSize(100, -1)));
-    _1_X_F_copy_30_copy_5->SetMinSize(wxDLG_UNIT(_1_X_F_copy_30_copy_5, wxSize(100, -1)));
-    _0_N_N_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_N_N_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_X_N_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_X_N_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_N_F_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_N_F_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_X_F_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_X_F_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_N_N_copy_7->SetMinSize(wxDLG_UNIT(_0_N_N_copy_7, wxSize(100, 21)));
-    _1_N_N_copy_7->SetMinSize(wxDLG_UNIT(_1_N_N_copy_7, wxSize(100, 21)));
-    _0_X_N_copy_7->SetMinSize(wxDLG_UNIT(_0_X_N_copy_7, wxSize(100, 21)));
-    _1_X_N_copy_7->SetMinSize(wxDLG_UNIT(_1_X_N_copy_7, wxSize(100, 21)));
-    _0_N_F_copy_7->SetMinSize(wxDLG_UNIT(_0_N_F_copy_7, wxSize(100, 21)));
-    _1_N_F_copy_7->SetMinSize(wxDLG_UNIT(_1_N_F_copy_7, wxSize(100, 21)));
-    _0_X_F_copy_7->SetMinSize(wxDLG_UNIT(_0_X_F_copy_7, wxSize(100, 21)));
-    _1_X_F_copy_7->SetMinSize(wxDLG_UNIT(_1_X_F_copy_7, wxSize(100, 21)));
-    _0_N_N_copy_8->SetMinSize(wxSize(-1, 21));
-    _1_N_N_copy_8->SetMinSize(wxSize(-1, 21));
-    _0_X_N_copy_8->SetMinSize(wxSize(-1, 21));
-    _1_X_N_copy_8->SetMinSize(wxSize(-1, 21));
-    _0_N_F_copy_8->SetMinSize(wxSize(-1, 21));
-    _1_N_F_copy_8->SetMinSize(wxSize(-1, 21));
-    _0_X_F_copy_8->SetMinSize(wxSize(-1, 21));
-    _1_X_F_copy_8->SetMinSize(wxSize(-1, 21));
-    _0_N_N_copy_9->SetMinSize(wxSize(100, -1));
-    _1_N_N_copy_9->SetMinSize(wxSize(100, -1));
-    _0_X_N_copy_9->SetMinSize(wxSize(100, -1));
-    _1_X_N_copy_9->SetMinSize(wxSize(100, -1));
-    _0_N_F_copy_9->SetMinSize(wxSize(100, -1));
-    _1_N_F_copy_9->SetMinSize(wxSize(100, -1));
-    _0_X_F_copy_9->SetMinSize(wxSize(100, -1));
-    _1_X_F_copy_9->SetMinSize(wxSize(100, -1));
-    _0_N_N_copy_10->SetMinSize(wxDLG_UNIT(_0_N_N_copy_10, wxSize(-1, 100)));
-    _1_N_N_copy_10->SetMinSize(wxDLG_UNIT(_1_N_N_copy_10, wxSize(-1, 100)));
-    _0_X_N_copy_10->SetMinSize(wxDLG_UNIT(_0_X_N_copy_10, wxSize(-1, 100)));
-    _1_X_N_copy_10->SetMinSize(wxDLG_UNIT(_1_X_N_copy_10, wxSize(-1, 100)));
-    _0_N_F_copy_10->SetMinSize(wxDLG_UNIT(_0_N_F_copy_10, wxSize(-1, 100)));
-    _1_N_F_copy_10->SetMinSize(wxDLG_UNIT(_1_N_F_copy_10, wxSize(-1, 100)));
-    _0_N_N_copy_11->SetMinSize(wxDLG_UNIT(_0_N_N_copy_11, wxSize(100, -1)));
-    _1_N_N_copy_11->SetMinSize(wxDLG_UNIT(_1_N_N_copy_11, wxSize(100, -1)));
-    _0_X_N_copy_11->SetMinSize(wxDLG_UNIT(_0_X_N_copy_11, wxSize(100, -1)));
-    _1_X_N_copy_11->SetMinSize(wxDLG_UNIT(_1_X_N_copy_11, wxSize(100, -1)));
-    _0_N_F_copy_11->SetMinSize(wxDLG_UNIT(_0_N_F_copy_11, wxSize(100, -1)));
-    _1_N_F_copy_11->SetMinSize(wxDLG_UNIT(_1_N_F_copy_11, wxSize(100, -1)));
-    _0_X_F_copy_11->SetMinSize(wxDLG_UNIT(_0_X_F_copy_11, wxSize(100, -1)));
-    _1_X_F_copy_11->SetMinSize(wxDLG_UNIT(_1_X_F_copy_11, wxSize(100, -1)));
-    _0_N_N_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_N_N_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_X_N_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_X_N_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_N_F_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_N_F_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_X_F_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_X_F_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_N_N_copy_13->SetMinSize(wxDLG_UNIT(_0_N_N_copy_13, wxSize(100, 21)));
-    _1_N_N_copy_13->SetMinSize(wxDLG_UNIT(_1_N_N_copy_13, wxSize(100, 21)));
-    _0_X_N_copy_13->SetMinSize(wxDLG_UNIT(_0_X_N_copy_13, wxSize(100, 21)));
-    _1_X_N_copy_13->SetMinSize(wxDLG_UNIT(_1_X_N_copy_13, wxSize(100, 21)));
-    _0_N_F_copy_13->SetMinSize(wxDLG_UNIT(_0_N_F_copy_13, wxSize(100, 21)));
-    _1_N_F_copy_13->SetMinSize(wxDLG_UNIT(_1_N_F_copy_13, wxSize(100, 21)));
-    _0_X_F_copy_13->SetMinSize(wxDLG_UNIT(_0_X_F_copy_13, wxSize(100, 21)));
-    _1_X_F_copy_13->SetMinSize(wxDLG_UNIT(_1_X_F_copy_13, wxSize(100, 21)));
-    _0_N_N_copy_14->SetMinSize(wxSize(-1, 21));
-    _1_N_N_copy_14->SetMinSize(wxSize(-1, 21));
-    _0_X_N_copy_14->SetMinSize(wxSize(-1, 21));
-    _1_X_N_copy_14->SetMinSize(wxSize(-1, 21));
-    _0_N_F_copy_14->SetMinSize(wxSize(-1, 21));
-    _1_N_F_copy_14->SetMinSize(wxSize(-1, 21));
-    _0_X_F_copy_14->SetMinSize(wxSize(-1, 21));
-    _1_X_F_copy_14->SetMinSize(wxSize(-1, 21));
-    _0_N_N_copy_15->SetMinSize(wxSize(100, -1));
-    _1_N_N_copy_15->SetMinSize(wxSize(100, -1));
-    _0_X_N_copy_15->SetMinSize(wxSize(100, -1));
-    _1_X_N_copy_15->SetMinSize(wxSize(100, -1));
-    _0_N_F_copy_15->SetMinSize(wxSize(100, -1));
-    _1_N_F_copy_15->SetMinSize(wxSize(100, -1));
-    _0_X_F_copy_15->SetMinSize(wxSize(100, -1));
-    _1_X_F_copy_15->SetMinSize(wxSize(100, -1));
-    _0_N_N_copy_16->SetMinSize(wxDLG_UNIT(_0_N_N_copy_16, wxSize(-1, 100)));
-    _1_N_N_copy_16->SetMinSize(wxDLG_UNIT(_1_N_N_copy_16, wxSize(-1, 100)));
-    _0_X_N_copy_16->SetMinSize(wxDLG_UNIT(_0_X_N_copy_16, wxSize(-1, 100)));
-    _1_X_N_copy_16->SetMinSize(wxDLG_UNIT(_1_X_N_copy_16, wxSize(-1, 100)));
-    _0_N_F_copy_16->SetMinSize(wxDLG_UNIT(_0_N_F_copy_16, wxSize(-1, 100)));
-    _1_N_F_copy_16->SetMinSize(wxDLG_UNIT(_1_N_F_copy_16, wxSize(-1, 100)));
-    _0_N_N_copy_17->SetMinSize(wxDLG_UNIT(_0_N_N_copy_17, wxSize(100, -1)));
-    _1_N_N_copy_17->SetMinSize(wxDLG_UNIT(_1_N_N_copy_17, wxSize(100, -1)));
-    _0_X_N_copy_17->SetMinSize(wxDLG_UNIT(_0_X_N_copy_17, wxSize(100, -1)));
-    _1_X_N_copy_17->SetMinSize(wxDLG_UNIT(_1_X_N_copy_17, wxSize(100, -1)));
-    _0_N_F_copy_17->SetMinSize(wxDLG_UNIT(_0_N_F_copy_17, wxSize(100, -1)));
-    _1_N_F_copy_17->SetMinSize(wxDLG_UNIT(_1_N_F_copy_17, wxSize(100, -1)));
-    _0_X_F_copy_17->SetMinSize(wxDLG_UNIT(_0_X_F_copy_17, wxSize(100, -1)));
-    _1_X_F_copy_17->SetMinSize(wxDLG_UNIT(_1_X_F_copy_17, wxSize(100, -1)));
-    _0_N_N_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_N_N_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_X_N_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_X_N_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_N_F_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_N_F_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_X_F_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_X_F_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_N_N_copy_19->SetMinSize(wxDLG_UNIT(_0_N_N_copy_19, wxSize(100, 21)));
-    _1_N_N_copy_19->SetMinSize(wxDLG_UNIT(_1_N_N_copy_19, wxSize(100, 21)));
-    _0_X_N_copy_19->SetMinSize(wxDLG_UNIT(_0_X_N_copy_19, wxSize(100, 21)));
-    _1_X_N_copy_19->SetMinSize(wxDLG_UNIT(_1_X_N_copy_19, wxSize(100, 21)));
-    _0_N_F_copy_19->SetMinSize(wxDLG_UNIT(_0_N_F_copy_19, wxSize(100, 21)));
-    _1_N_F_copy_19->SetMinSize(wxDLG_UNIT(_1_N_F_copy_19, wxSize(100, 21)));
-    _0_X_F_copy_19->SetMinSize(wxDLG_UNIT(_0_X_F_copy_19, wxSize(100, 21)));
-    _1_X_F_copy_19->SetMinSize(wxDLG_UNIT(_1_X_F_copy_19, wxSize(100, 21)));
-    _0_N_N_copy_20->SetMinSize(wxSize(-1, 21));
-    _1_N_N_copy_20->SetMinSize(wxSize(-1, 21));
-    _0_X_N_copy_20->SetMinSize(wxSize(-1, 21));
-    _1_X_N_copy_20->SetMinSize(wxSize(-1, 21));
-    _0_N_F_copy_20->SetMinSize(wxSize(-1, 21));
-    _1_N_F_copy_20->SetMinSize(wxSize(-1, 21));
-    _0_X_F_copy_20->SetMinSize(wxSize(-1, 21));
-    _1_X_F_copy_20->SetMinSize(wxSize(-1, 21));
-    _0_N_N_copy_21->SetMinSize(wxSize(100, -1));
-    _1_N_N_copy_21->SetMinSize(wxSize(100, -1));
-    _0_X_N_copy_21->SetMinSize(wxSize(100, -1));
-    _1_X_N_copy_21->SetMinSize(wxSize(100, -1));
-    _0_N_F_copy_21->SetMinSize(wxSize(100, -1));
-    _1_N_F_copy_21->SetMinSize(wxSize(100, -1));
-    _0_X_F_copy_21->SetMinSize(wxSize(100, -1));
-    _1_X_F_copy_21->SetMinSize(wxSize(100, -1));
-    _0_N_N_copy_22->SetMinSize(wxDLG_UNIT(_0_N_N_copy_22, wxSize(-1, 100)));
-    _1_N_N_copy_22->SetMinSize(wxDLG_UNIT(_1_N_N_copy_22, wxSize(-1, 100)));
-    _0_X_N_copy_22->SetMinSize(wxDLG_UNIT(_0_X_N_copy_22, wxSize(-1, 100)));
-    _1_X_N_copy_22->SetMinSize(wxDLG_UNIT(_1_X_N_copy_22, wxSize(-1, 100)));
-    _0_N_F_copy_22->SetMinSize(wxDLG_UNIT(_0_N_F_copy_22, wxSize(-1, 100)));
-    _1_N_F_copy_22->SetMinSize(wxDLG_UNIT(_1_N_F_copy_22, wxSize(-1, 100)));
-    _0_N_N_copy_23->SetMinSize(wxDLG_UNIT(_0_N_N_copy_23, wxSize(100, -1)));
-    _1_N_N_copy_23->SetMinSize(wxDLG_UNIT(_1_N_N_copy_23, wxSize(100, -1)));
-    _0_X_N_copy_23->SetMinSize(wxDLG_UNIT(_0_X_N_copy_23, wxSize(100, -1)));
-    _1_X_N_copy_23->SetMinSize(wxDLG_UNIT(_1_X_N_copy_23, wxSize(100, -1)));
-    _0_N_F_copy_23->SetMinSize(wxDLG_UNIT(_0_N_F_copy_23, wxSize(100, -1)));
-    _1_N_F_copy_23->SetMinSize(wxDLG_UNIT(_1_N_F_copy_23, wxSize(100, -1)));
-    _0_X_F_copy_23->SetMinSize(wxDLG_UNIT(_0_X_F_copy_23, wxSize(100, -1)));
-    _1_X_F_copy_23->SetMinSize(wxDLG_UNIT(_1_X_F_copy_23, wxSize(100, -1)));
-    _0_N_N_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_N_N_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_X_N_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_X_N_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_N_F_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_N_F_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_X_F_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _1_X_F_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
-    _0_N_N_copy_25->SetMinSize(wxDLG_UNIT(_0_N_N_copy_25, wxSize(100, 21)));
-    _1_N_N_copy_25->SetMinSize(wxDLG_UNIT(_1_N_N_copy_25, wxSize(100, 21)));
-    _0_X_N_copy_25->SetMinSize(wxDLG_UNIT(_0_X_N_copy_25, wxSize(100, 21)));
-    _1_X_N_copy_25->SetMinSize(wxDLG_UNIT(_1_X_N_copy_25, wxSize(100, 21)));
-    _0_N_F_copy_25->SetMinSize(wxDLG_UNIT(_0_N_F_copy_25, wxSize(100, 21)));
-    _1_N_F_copy_25->SetMinSize(wxDLG_UNIT(_1_N_F_copy_25, wxSize(100, 21)));
-    _0_X_F_copy_25->SetMinSize(wxDLG_UNIT(_0_X_F_copy_25, wxSize(100, 21)));
-    _1_X_F_copy_25->SetMinSize(wxDLG_UNIT(_1_X_F_copy_25, wxSize(100, 21)));
-    _0_N_N_copy_26->SetMinSize(wxSize(-1, 21));
-    _1_N_N_copy_26->SetMinSize(wxSize(-1, 21));
-    _0_X_N_copy_26->SetMinSize(wxSize(-1, 21));
-    _1_X_N_copy_26->SetMinSize(wxSize(-1, 21));
-    _0_N_F_copy_26->SetMinSize(wxSize(-1, 21));
-    _1_N_F_copy_26->SetMinSize(wxSize(-1, 21));
-    _0_X_F_copy_26->SetMinSize(wxSize(-1, 21));
-    _1_X_F_copy_26->SetMinSize(wxSize(-1, 21));
-    _0_N_N_copy_27->SetMinSize(wxSize(100, -1));
-    _1_N_N_copy_27->SetMinSize(wxSize(100, -1));
-    _0_X_N_copy_27->SetMinSize(wxSize(100, -1));
-    _1_X_N_copy_27->SetMinSize(wxSize(100, -1));
-    _0_N_F_copy_27->SetMinSize(wxSize(100, -1));
-    _1_N_F_copy_27->SetMinSize(wxSize(100, -1));
-    _0_X_F_copy_27->SetMinSize(wxSize(100, -1));
-    _1_X_F_copy_27->SetMinSize(wxSize(100, -1));
-    _0_N_N_copy_28->SetMinSize(wxDLG_UNIT(_0_N_N_copy_28, wxSize(-1, 100)));
-    _1_N_N_copy_28->SetMinSize(wxDLG_UNIT(_1_N_N_copy_28, wxSize(-1, 100)));
-    _0_X_N_copy_28->SetMinSize(wxDLG_UNIT(_0_X_N_copy_28, wxSize(-1, 100)));
-    _1_X_N_copy_28->SetMinSize(wxDLG_UNIT(_1_X_N_copy_28, wxSize(-1, 100)));
-    _0_N_F_copy_28->SetMinSize(wxDLG_UNIT(_0_N_F_copy_28, wxSize(-1, 100)));
-    _1_N_F_copy_28->SetMinSize(wxDLG_UNIT(_1_N_F_copy_28, wxSize(-1, 100)));
-    _0_N_N_copy_29->SetMinSize(wxDLG_UNIT(_0_N_N_copy_29, wxSize(100, -1)));
-    _1_N_N_copy_29->SetMinSize(wxDLG_UNIT(_1_N_N_copy_29, wxSize(100, -1)));
-    _0_X_N_copy_29->SetMinSize(wxDLG_UNIT(_0_X_N_copy_29, wxSize(100, -1)));
-    _1_X_N_copy_29->SetMinSize(wxDLG_UNIT(_1_X_N_copy_29, wxSize(100, -1)));
-    _0_N_F_copy_29->SetMinSize(wxDLG_UNIT(_0_N_F_copy_29, wxSize(100, -1)));
-    _1_N_F_copy_29->SetMinSize(wxDLG_UNIT(_1_N_F_copy_29, wxSize(100, -1)));
-    _0_X_F_copy_29->SetMinSize(wxDLG_UNIT(_0_X_F_copy_29, wxSize(100, -1)));
-    _1_X_F_copy_29->SetMinSize(wxDLG_UNIT(_1_X_F_copy_29, wxSize(100, -1)));
-    _0_N_N_copy_copy_1->SetMinSize(wxSize(100, 21));
-    _0_N_N_copy_31->SetMinSize(wxDLG_UNIT(_0_N_N_copy_31, wxSize(100, 21)));
-    _0_N_N_copy_32->SetMinSize(wxSize(-1, 21));
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
-    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
-    wxGridBagSizer* grid_sizer_1 = new wxGridBagSizer(0, 0);
-    wxBoxSizer* sizer_7 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_border_15_BOTTOM = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_border_5_LEFTRIGHT = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_border_0_ALL = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_border_10_none = new wxBoxSizer(wxVERTICAL);
-    wxGridBagSizer* sizer_6 = new wxGridBagSizer(1, 1);
-    wxFlexGridSizer* sizer_5 = new wxFlexGridSizer(7, 8, 1, 1);
-    wxGridSizer* sizer_4 = new wxGridSizer(7, 8, 0, 0);
-    wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
-    wxStaticBoxSizer* sizer_6_dlgm1_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_6_dlgm1_copy")), wxVERTICAL);
-    wxStaticBoxSizer* sizer_6_m1dlg_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_6_m1dlg_copy")), wxVERTICAL);
-    wxStaticBoxSizer* sizer_6_absm1_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_6_absm1_copy")), wxVERTICAL);
-    wxStaticBoxSizer* sizer_6_m1abs_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_6_m1abs_copy")), wxVERTICAL);
-    wxStaticBoxSizer* sizer_5_dlg_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_5_dlg_copy")), wxVERTICAL);
-    wxStaticBoxSizer* sizer_4_abs_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_4_abs_copy")), wxVERTICAL);
-    wxStaticBoxSizer* sizer_3_nosize_copy = new wxStaticBoxSizer(new wxStaticBox(notebook_1_StaticBoxSizer, wxID_ANY, _("sizer_3_nosize_copy")), wxVERTICAL);
-    wxBoxSizer* sizer_8 = new wxBoxSizer(wxHORIZONTAL);
-    wxWrapSizer* sizer_6_dlgm1_copy_1 = new wxWrapSizer(wxHORIZONTAL);
-    wxWrapSizer* sizer_6_m1dlg_copy_1 = new wxWrapSizer(wxHORIZONTAL);
-    wxWrapSizer* sizer_6_absm1_copy_1 = new wxWrapSizer(wxHORIZONTAL);
-    wxWrapSizer* sizer_6_m1abs_copy_1 = new wxWrapSizer(wxHORIZONTAL);
-    wxWrapSizer* sizer_5_dlg_copy_1 = new wxWrapSizer(wxHORIZONTAL);
-    wxWrapSizer* sizer_4_abs_copy_1 = new wxWrapSizer(wxHORIZONTAL);
-    wxWrapSizer* sizer_3_nosize_copy_1 = new wxWrapSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL);
-    wxBoxSizer* sizer_6_dlgm1 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_6_m1dlg = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_6_absm1 = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_6_m1abs = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_5_dlg = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_4_abs = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer* sizer_3_nosize = new wxBoxSizer(wxVERTICAL);
-    sizer_3_nosize->Add(_0_N_N, 0, 0, 0);
-    sizer_3_nosize->Add(_1_N_N, 1, 0, 0);
-    sizer_3_nosize->Add(_0_X_N, 0, wxEXPAND, 0);
-    sizer_3_nosize->Add(_1_X_N, 1, wxEXPAND, 0);
-    sizer_3_nosize->Add(_0_N_F, 0, wxFIXED_MINSIZE, 0);
-    sizer_3_nosize->Add(_1_N_F, 1, wxFIXED_MINSIZE, 0);
-    sizer_3_nosize->Add(_0_X_F, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_3_nosize->Add(_1_X_F, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_2->Add(sizer_3_nosize, 1, wxEXPAND, 0);
-    sizer_4_abs->Add(_0_N_N_copy, 0, 0, 0);
-    sizer_4_abs->Add(_1_N_N_copy, 1, 0, 0);
-    sizer_4_abs->Add(_0_X_N_copy, 0, wxEXPAND, 0);
-    sizer_4_abs->Add(_1_X_N_copy, 1, wxEXPAND, 0);
-    sizer_4_abs->Add(_0_N_F_copy, 0, wxFIXED_MINSIZE, 0);
-    sizer_4_abs->Add(_1_N_F_copy, 1, wxFIXED_MINSIZE, 0);
-    sizer_4_abs->Add(_0_X_F_copy, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4_abs->Add(_1_X_F_copy, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_2->Add(sizer_4_abs, 1, wxEXPAND, 0);
-    sizer_5_dlg->Add(_0_N_N_copy_1, 0, 0, 0);
-    sizer_5_dlg->Add(_1_N_N_copy_1, 1, 0, 0);
-    sizer_5_dlg->Add(_0_X_N_copy_1, 0, wxEXPAND, 0);
-    sizer_5_dlg->Add(_1_X_N_copy_1, 1, wxEXPAND, 0);
-    sizer_5_dlg->Add(_0_N_F_copy_1, 0, wxFIXED_MINSIZE, 0);
-    sizer_5_dlg->Add(_1_N_F_copy_1, 1, wxFIXED_MINSIZE, 0);
-    sizer_5_dlg->Add(_0_X_F_copy_1, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_5_dlg->Add(_1_X_F_copy_1, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_2->Add(sizer_5_dlg, 1, wxEXPAND, 0);
-    sizer_6_m1abs->Add(_0_N_N_copy_2, 0, 0, 0);
-    sizer_6_m1abs->Add(_1_N_N_copy_2, 1, 0, 0);
-    sizer_6_m1abs->Add(_0_X_N_copy_2, 0, wxEXPAND, 0);
-    sizer_6_m1abs->Add(_1_X_N_copy_2, 1, wxEXPAND, 0);
-    sizer_6_m1abs->Add(_0_N_F_copy_2, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_m1abs->Add(_1_N_F_copy_2, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_m1abs->Add(_0_X_F_copy_2, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_m1abs->Add(_1_X_F_copy_2, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_2->Add(sizer_6_m1abs, 1, wxEXPAND, 0);
-    sizer_6_absm1->Add(_0_N_N_copy_3, 0, 0, 0);
-    sizer_6_absm1->Add(_1_N_N_copy_3, 1, 0, 0);
-    sizer_6_absm1->Add(_0_X_N_copy_3, 0, wxEXPAND, 0);
-    sizer_6_absm1->Add(_1_X_N_copy_3, 1, wxEXPAND, 0);
-    sizer_6_absm1->Add(_0_N_F_copy_3, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_absm1->Add(_1_N_F_copy_3, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_absm1->Add(_0_X_F_copy_3, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_absm1->Add(_1_X_F_copy_3, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_2->Add(sizer_6_absm1, 1, wxEXPAND, 0);
-    sizer_6_m1dlg->Add(_0_N_N_copy_4, 0, 0, 0);
-    sizer_6_m1dlg->Add(_1_N_N_copy_4, 1, 0, 0);
-    sizer_6_m1dlg->Add(_0_X_N_copy_4, 0, wxEXPAND, 0);
-    sizer_6_m1dlg->Add(_1_X_N_copy_4, 1, wxEXPAND, 0);
-    sizer_6_m1dlg->Add(_0_N_F_copy_4, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_m1dlg->Add(_1_N_F_copy_4, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_m1dlg->Add(_0_X_F_copy_4, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_m1dlg->Add(_1_X_F_copy_4, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_2->Add(sizer_6_m1dlg, 1, wxEXPAND, 0);
-    sizer_6_dlgm1->Add(_0_N_N_copy_5, 0, 0, 0);
-    sizer_6_dlgm1->Add(_1_N_N_copy_5, 1, 0, 0);
-    sizer_6_dlgm1->Add(_0_X_N_copy_5, 0, wxEXPAND, 0);
-    sizer_6_dlgm1->Add(_1_X_N_copy_5, 1, wxEXPAND, 0);
-    sizer_6_dlgm1->Add(_0_N_F_copy_5, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_dlgm1->Add(_1_N_F_copy_5, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_dlgm1->Add(_0_X_F_copy_5, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_dlgm1->Add(_1_X_F_copy_5, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_2->Add(sizer_6_dlgm1, 1, wxEXPAND, 0);
-    notebook_1_pane_1->SetSizer(sizer_2);
-    sizer_3_nosize_copy_1->Add(_0_N_N_copy_30, 0, 0, 0);
-    sizer_3_nosize_copy_1->Add(_1_N_N_copy_30, 1, 0, 0);
-    sizer_3_nosize_copy_1->Add(_0_X_N_copy_30, 0, wxEXPAND, 0);
-    sizer_3_nosize_copy_1->Add(_1_X_N_copy_30, 1, wxEXPAND, 0);
-    sizer_3_nosize_copy_1->Add(_0_N_F_copy_30, 0, wxFIXED_MINSIZE, 0);
-    sizer_3_nosize_copy_1->Add(_1_N_F_copy_30, 1, wxFIXED_MINSIZE, 0);
-    sizer_3_nosize_copy_1->Add(_0_X_F_copy_30, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_3_nosize_copy_1->Add(_1_X_F_copy_30, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_8->Add(sizer_3_nosize_copy_1, 1, wxEXPAND, 0);
-    sizer_4_abs_copy_1->Add(_0_N_N_copy_30_copy, 0, 0, 0);
-    sizer_4_abs_copy_1->Add(_1_N_N_copy_30_copy, 1, 0, 0);
-    sizer_4_abs_copy_1->Add(_0_X_N_copy_30_copy, 0, wxEXPAND, 0);
-    sizer_4_abs_copy_1->Add(_1_X_N_copy_30_copy, 1, wxEXPAND, 0);
-    sizer_4_abs_copy_1->Add(_0_N_F_copy_30_copy, 0, wxFIXED_MINSIZE, 0);
-    sizer_4_abs_copy_1->Add(_1_N_F_copy_30_copy, 1, wxFIXED_MINSIZE, 0);
-    sizer_4_abs_copy_1->Add(_0_X_F_copy_30_copy, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4_abs_copy_1->Add(_1_X_F_copy_30_copy, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_8->Add(sizer_4_abs_copy_1, 1, wxEXPAND, 0);
-    sizer_5_dlg_copy_1->Add(_0_N_N_copy_30_copy_1, 0, 0, 0);
-    sizer_5_dlg_copy_1->Add(_1_N_N_copy_30_copy_1, 1, 0, 0);
-    sizer_5_dlg_copy_1->Add(_0_X_N_copy_30_copy_1, 0, wxEXPAND, 0);
-    sizer_5_dlg_copy_1->Add(_1_X_N_copy_30_copy_1, 1, wxEXPAND, 0);
-    sizer_5_dlg_copy_1->Add(_0_N_F_copy_30_copy_1, 0, wxFIXED_MINSIZE, 0);
-    sizer_5_dlg_copy_1->Add(_1_N_F_copy_30_copy_1, 1, wxFIXED_MINSIZE, 0);
-    sizer_5_dlg_copy_1->Add(_0_X_F_copy_30_copy_1, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_5_dlg_copy_1->Add(_1_X_F_copy_30_copy_1, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_8->Add(sizer_5_dlg_copy_1, 1, wxEXPAND, 0);
-    sizer_6_m1abs_copy_1->Add(_0_N_N_copy_30_copy_2, 0, 0, 0);
-    sizer_6_m1abs_copy_1->Add(_1_N_N_copy_30_copy_2, 1, 0, 0);
-    sizer_6_m1abs_copy_1->Add(_0_X_N_copy_30_copy_2, 0, wxEXPAND, 0);
-    sizer_6_m1abs_copy_1->Add(_1_X_N_copy_30_copy_2, 1, wxEXPAND, 0);
-    sizer_6_m1abs_copy_1->Add(_0_N_F_copy_30_copy_2, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_m1abs_copy_1->Add(_1_N_F_copy_30_copy_2, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_m1abs_copy_1->Add(_0_X_F_copy_30_copy_2, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_m1abs_copy_1->Add(_1_X_F_copy_30_copy_2, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_8->Add(sizer_6_m1abs_copy_1, 1, wxEXPAND, 0);
-    sizer_6_absm1_copy_1->Add(_0_N_N_copy_30_copy_3, 0, 0, 0);
-    sizer_6_absm1_copy_1->Add(_1_N_N_copy_30_copy_3, 1, 0, 0);
-    sizer_6_absm1_copy_1->Add(_0_X_N_copy_30_copy_3, 0, wxEXPAND, 0);
-    sizer_6_absm1_copy_1->Add(_1_X_N_copy_30_copy_3, 1, wxEXPAND, 0);
-    sizer_6_absm1_copy_1->Add(_0_N_F_copy_30_copy_3, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_absm1_copy_1->Add(_1_N_F_copy_30_copy_3, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_absm1_copy_1->Add(_0_X_F_copy_30_copy_3, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_absm1_copy_1->Add(_1_X_F_copy_30_copy_3, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_8->Add(sizer_6_absm1_copy_1, 1, wxEXPAND, 0);
-    sizer_6_m1dlg_copy_1->Add(_0_N_N_copy_30_copy_4, 0, 0, 0);
-    sizer_6_m1dlg_copy_1->Add(_1_N_N_copy_30_copy_4, 1, 0, 0);
-    sizer_6_m1dlg_copy_1->Add(_0_X_N_copy_30_copy_4, 0, wxEXPAND, 0);
-    sizer_6_m1dlg_copy_1->Add(_1_X_N_copy_30_copy_4, 1, wxEXPAND, 0);
-    sizer_6_m1dlg_copy_1->Add(_0_N_F_copy_30_copy_4, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_m1dlg_copy_1->Add(_1_N_F_copy_30_copy_4, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_m1dlg_copy_1->Add(_0_X_F_copy_30_copy_4, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_m1dlg_copy_1->Add(_1_X_F_copy_30_copy_4, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_8->Add(sizer_6_m1dlg_copy_1, 1, wxEXPAND, 0);
-    sizer_6_dlgm1_copy_1->Add(_0_N_N_copy_30_copy_5, 0, 0, 0);
-    sizer_6_dlgm1_copy_1->Add(_1_N_N_copy_30_copy_5, 1, 0, 0);
-    sizer_6_dlgm1_copy_1->Add(_0_X_N_copy_30_copy_5, 0, wxEXPAND, 0);
-    sizer_6_dlgm1_copy_1->Add(_1_X_N_copy_30_copy_5, 1, wxEXPAND, 0);
-    sizer_6_dlgm1_copy_1->Add(_0_N_F_copy_30_copy_5, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_dlgm1_copy_1->Add(_1_N_F_copy_30_copy_5, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_dlgm1_copy_1->Add(_0_X_F_copy_30_copy_5, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_dlgm1_copy_1->Add(_1_X_F_copy_30_copy_5, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_8->Add(sizer_6_dlgm1_copy_1, 1, wxEXPAND, 0);
-    notebook_1_WrapSizer->SetSizer(sizer_8);
-    sizer_3_nosize_copy->Add(_0_N_N_copy_6, 0, 0, 0);
-    sizer_3_nosize_copy->Add(_1_N_N_copy_6, 1, 0, 0);
-    sizer_3_nosize_copy->Add(_0_X_N_copy_6, 0, wxEXPAND, 0);
-    sizer_3_nosize_copy->Add(_1_X_N_copy_6, 1, wxEXPAND, 0);
-    sizer_3_nosize_copy->Add(_0_N_F_copy_6, 0, wxFIXED_MINSIZE, 0);
-    sizer_3_nosize_copy->Add(_1_N_F_copy_6, 1, wxFIXED_MINSIZE, 0);
-    sizer_3_nosize_copy->Add(_0_X_F_copy_6, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_3_nosize_copy->Add(_1_X_F_copy_6, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_3->Add(sizer_3_nosize_copy, 1, wxEXPAND, 0);
-    sizer_4_abs_copy->Add(_0_N_N_copy_copy, 0, 0, 0);
-    sizer_4_abs_copy->Add(_1_N_N_copy_copy, 1, 0, 0);
-    sizer_4_abs_copy->Add(_0_X_N_copy_copy, 0, wxEXPAND, 0);
-    sizer_4_abs_copy->Add(_1_X_N_copy_copy, 1, wxEXPAND, 0);
-    sizer_4_abs_copy->Add(_0_N_F_copy_copy, 0, wxFIXED_MINSIZE, 0);
-    sizer_4_abs_copy->Add(_1_N_F_copy_copy, 1, wxFIXED_MINSIZE, 0);
-    sizer_4_abs_copy->Add(_0_X_F_copy_copy, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4_abs_copy->Add(_1_X_F_copy_copy, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_3->Add(sizer_4_abs_copy, 1, wxEXPAND, 0);
-    sizer_5_dlg_copy->Add(_0_N_N_copy_7, 0, 0, 0);
-    sizer_5_dlg_copy->Add(_1_N_N_copy_7, 1, 0, 0);
-    sizer_5_dlg_copy->Add(_0_X_N_copy_7, 0, wxEXPAND, 0);
-    sizer_5_dlg_copy->Add(_1_X_N_copy_7, 1, wxEXPAND, 0);
-    sizer_5_dlg_copy->Add(_0_N_F_copy_7, 0, wxFIXED_MINSIZE, 0);
-    sizer_5_dlg_copy->Add(_1_N_F_copy_7, 1, wxFIXED_MINSIZE, 0);
-    sizer_5_dlg_copy->Add(_0_X_F_copy_7, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_5_dlg_copy->Add(_1_X_F_copy_7, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_3->Add(sizer_5_dlg_copy, 1, wxEXPAND, 0);
-    sizer_6_m1abs_copy->Add(_0_N_N_copy_8, 0, 0, 0);
-    sizer_6_m1abs_copy->Add(_1_N_N_copy_8, 1, 0, 0);
-    sizer_6_m1abs_copy->Add(_0_X_N_copy_8, 0, wxEXPAND, 0);
-    sizer_6_m1abs_copy->Add(_1_X_N_copy_8, 1, wxEXPAND, 0);
-    sizer_6_m1abs_copy->Add(_0_N_F_copy_8, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_m1abs_copy->Add(_1_N_F_copy_8, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_m1abs_copy->Add(_0_X_F_copy_8, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_m1abs_copy->Add(_1_X_F_copy_8, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_3->Add(sizer_6_m1abs_copy, 1, wxEXPAND, 0);
-    sizer_6_absm1_copy->Add(_0_N_N_copy_9, 0, 0, 0);
-    sizer_6_absm1_copy->Add(_1_N_N_copy_9, 1, 0, 0);
-    sizer_6_absm1_copy->Add(_0_X_N_copy_9, 0, wxEXPAND, 0);
-    sizer_6_absm1_copy->Add(_1_X_N_copy_9, 1, wxEXPAND, 0);
-    sizer_6_absm1_copy->Add(_0_N_F_copy_9, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_absm1_copy->Add(_1_N_F_copy_9, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_absm1_copy->Add(_0_X_F_copy_9, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_absm1_copy->Add(_1_X_F_copy_9, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_3->Add(sizer_6_absm1_copy, 1, wxEXPAND, 0);
-    sizer_6_m1dlg_copy->Add(_0_N_N_copy_10, 0, 0, 0);
-    sizer_6_m1dlg_copy->Add(_1_N_N_copy_10, 1, 0, 0);
-    sizer_6_m1dlg_copy->Add(_0_X_N_copy_10, 0, wxEXPAND, 0);
-    sizer_6_m1dlg_copy->Add(_1_X_N_copy_10, 1, wxEXPAND, 0);
-    sizer_6_m1dlg_copy->Add(_0_N_F_copy_10, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_m1dlg_copy->Add(_1_N_F_copy_10, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_m1dlg_copy->Add(_0_X_F_copy_10, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_m1dlg_copy->Add(_1_X_F_copy_10, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_3->Add(sizer_6_m1dlg_copy, 1, wxEXPAND, 0);
-    sizer_6_dlgm1_copy->Add(_0_N_N_copy_11, 0, 0, 0);
-    sizer_6_dlgm1_copy->Add(_1_N_N_copy_11, 1, 0, 0);
-    sizer_6_dlgm1_copy->Add(_0_X_N_copy_11, 0, wxEXPAND, 0);
-    sizer_6_dlgm1_copy->Add(_1_X_N_copy_11, 1, wxEXPAND, 0);
-    sizer_6_dlgm1_copy->Add(_0_N_F_copy_11, 0, wxFIXED_MINSIZE, 0);
-    sizer_6_dlgm1_copy->Add(_1_N_F_copy_11, 1, wxFIXED_MINSIZE, 0);
-    sizer_6_dlgm1_copy->Add(_0_X_F_copy_11, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_6_dlgm1_copy->Add(_1_X_F_copy_11, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_3->Add(sizer_6_dlgm1_copy, 1, wxEXPAND, 0);
-    notebook_1_StaticBoxSizer->SetSizer(sizer_3);
-    sizer_4->Add(_0_N_N_copy_12, 0, 0, 0);
-    sizer_4->Add(_1_N_N_copy_12, 1, 0, 0);
-    sizer_4->Add(_0_X_N_copy_12, 0, wxEXPAND, 0);
-    sizer_4->Add(_1_X_N_copy_12, 1, wxEXPAND, 0);
-    sizer_4->Add(_0_N_F_copy_12, 0, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_N_F_copy_12, 1, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_X_F_copy_12, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_X_F_copy_12, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_N_N_copy_copy_copy, 0, 0, 0);
-    sizer_4->Add(_1_N_N_copy_copy_copy, 1, 0, 0);
-    sizer_4->Add(_0_X_N_copy_copy_copy, 0, wxEXPAND, 0);
-    sizer_4->Add(_1_X_N_copy_copy_copy, 1, wxEXPAND, 0);
-    sizer_4->Add(_0_N_F_copy_copy_copy, 0, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_N_F_copy_copy_copy, 1, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_X_F_copy_copy_copy, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_X_F_copy_copy_copy, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_N_N_copy_13, 0, 0, 0);
-    sizer_4->Add(_1_N_N_copy_13, 1, 0, 0);
-    sizer_4->Add(_0_X_N_copy_13, 0, wxEXPAND, 0);
-    sizer_4->Add(_1_X_N_copy_13, 1, wxEXPAND, 0);
-    sizer_4->Add(_0_N_F_copy_13, 0, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_N_F_copy_13, 1, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_X_F_copy_13, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_X_F_copy_13, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_N_N_copy_14, 0, 0, 0);
-    sizer_4->Add(_1_N_N_copy_14, 1, 0, 0);
-    sizer_4->Add(_0_X_N_copy_14, 0, wxEXPAND, 0);
-    sizer_4->Add(_1_X_N_copy_14, 1, wxEXPAND, 0);
-    sizer_4->Add(_0_N_F_copy_14, 0, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_N_F_copy_14, 1, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_X_F_copy_14, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_X_F_copy_14, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_N_N_copy_15, 0, 0, 0);
-    sizer_4->Add(_1_N_N_copy_15, 1, 0, 0);
-    sizer_4->Add(_0_X_N_copy_15, 0, wxEXPAND, 0);
-    sizer_4->Add(_1_X_N_copy_15, 1, wxEXPAND, 0);
-    sizer_4->Add(_0_N_F_copy_15, 0, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_N_F_copy_15, 1, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_X_F_copy_15, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_X_F_copy_15, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_N_N_copy_16, 0, 0, 0);
-    sizer_4->Add(_1_N_N_copy_16, 1, 0, 0);
-    sizer_4->Add(_0_X_N_copy_16, 0, wxEXPAND, 0);
-    sizer_4->Add(_1_X_N_copy_16, 1, wxEXPAND, 0);
-    sizer_4->Add(_0_N_F_copy_16, 0, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_N_F_copy_16, 1, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_X_F_copy_16, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_X_F_copy_16, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_N_N_copy_17, 0, 0, 0);
-    sizer_4->Add(_1_N_N_copy_17, 1, 0, 0);
-    sizer_4->Add(_0_X_N_copy_17, 0, wxEXPAND, 0);
-    sizer_4->Add(_1_X_N_copy_17, 1, wxEXPAND, 0);
-    sizer_4->Add(_0_N_F_copy_17, 0, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_N_F_copy_17, 1, wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_0_X_F_copy_17, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_4->Add(_1_X_F_copy_17, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    notebook_1_GridSizer->SetSizer(sizer_4);
-    sizer_5->Add(_0_N_N_copy_18, 0, 0, 0);
-    sizer_5->Add(_1_N_N_copy_18, 1, 0, 0);
-    sizer_5->Add(_0_X_N_copy_18, 0, wxEXPAND, 0);
-    sizer_5->Add(_1_X_N_copy_18, 1, wxEXPAND, 0);
-    sizer_5->Add(_0_N_F_copy_18, 0, wxFIXED_MINSIZE, 0);
-    sizer_5->Add(_1_N_F_copy_18, 1, wxFIXED_MINSIZE, 0);
-    sizer_5->Add(_0_X_F_copy_18, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_5->Add(_1_X_F_copy_18, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_5->Add(_0_N_N_copy_copy_copy_copy, 0, 0, 0);
-    sizer_5->Add(_1_N_N_copy_copy_copy_copy, 1, 0, 0);
-    sizer_5->Add(_0_X_N_copy_copy_copy_copy, 0, wxEXPAND, 0);
-    sizer_5->Add(_1_X_N_copy_copy_copy_copy, 1, wxEXPAND, 0);
-    sizer_5->Add(_0_N_F_copy_copy_copy_copy, 0, wxFIXED_MINSIZE, 0);
-    sizer_5->Add(_1_N_F_copy_copy_copy_copy, 1, wxFIXED_MINSIZE, 0);
-    sizer_5->Add(_0_X_F_copy_copy_copy_copy, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_5->Add(_1_X_F_copy_copy_copy_copy, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    sizer_5->Add(_0_N_N_copy_19, 0, 0, 0);
-    sizer_5->Add(_1_N_N_copy_19, 1, 0, 0);
-    sizer_5->Add(_0_X_N_copy_19, 0, wxEXPAND, 0);
-    sizer_5->Add(_1_X_N_copy_19, 1, wxEXPAND, 0);
-    sizer_5->Add(_0_N_F_copy_19, 0, wxFIXED_MINSIZE, 0);
-    sizer_5->Add(_1_N_F_copy_19, 1, wxFIXED_MINSIZE, 0);
-    sizer_5->Add(_0_X_F_copy_19, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_19->SetMinSize(wxDLG_UNIT(_1_X_F_copy_19, wxSize(100, 21)));
     sizer_5->Add(_1_X_F_copy_19, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    _0_N_N_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_20->SetMinSize(wxSize(-1, 21));
     sizer_5->Add(_0_N_N_copy_20, 0, 0, 0);
+    _1_N_N_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_20->SetMinSize(wxSize(-1, 21));
     sizer_5->Add(_1_N_N_copy_20, 1, 0, 0);
+    _0_X_N_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_20->SetMinSize(wxSize(-1, 21));
     sizer_5->Add(_0_X_N_copy_20, 0, wxEXPAND, 0);
+    _1_X_N_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_20->SetMinSize(wxSize(-1, 21));
     sizer_5->Add(_1_X_N_copy_20, 1, wxEXPAND, 0);
+    _0_N_F_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_20->SetMinSize(wxSize(-1, 21));
     sizer_5->Add(_0_N_F_copy_20, 0, wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_20->SetMinSize(wxSize(-1, 21));
     sizer_5->Add(_1_N_F_copy_20, 1, wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_20->SetMinSize(wxSize(-1, 21));
     sizer_5->Add(_0_X_F_copy_20, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_20 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_20->SetMinSize(wxSize(-1, 21));
     sizer_5->Add(_1_X_F_copy_20, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    _0_N_N_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_21->SetMinSize(wxSize(100, -1));
     sizer_5->Add(_0_N_N_copy_21, 0, 0, 0);
+    _1_N_N_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_21->SetMinSize(wxSize(100, -1));
     sizer_5->Add(_1_N_N_copy_21, 1, 0, 0);
+    _0_X_N_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_21->SetMinSize(wxSize(100, -1));
     sizer_5->Add(_0_X_N_copy_21, 0, wxEXPAND, 0);
+    _1_X_N_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_21->SetMinSize(wxSize(100, -1));
     sizer_5->Add(_1_X_N_copy_21, 1, wxEXPAND, 0);
+    _0_N_F_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_21->SetMinSize(wxSize(100, -1));
     sizer_5->Add(_0_N_F_copy_21, 0, wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_21->SetMinSize(wxSize(100, -1));
     sizer_5->Add(_1_N_F_copy_21, 1, wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_21->SetMinSize(wxSize(100, -1));
     sizer_5->Add(_0_X_F_copy_21, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_21 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_21->SetMinSize(wxSize(100, -1));
     sizer_5->Add(_1_X_F_copy_21, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    _0_N_N_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_22->SetMinSize(wxDLG_UNIT(_0_N_N_copy_22, wxSize(-1, 100)));
     sizer_5->Add(_0_N_N_copy_22, 0, 0, 0);
+    _1_N_N_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_22->SetMinSize(wxDLG_UNIT(_1_N_N_copy_22, wxSize(-1, 100)));
     sizer_5->Add(_1_N_N_copy_22, 1, 0, 0);
+    _0_X_N_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_22->SetMinSize(wxDLG_UNIT(_0_X_N_copy_22, wxSize(-1, 100)));
     sizer_5->Add(_0_X_N_copy_22, 0, wxEXPAND, 0);
+    _1_X_N_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_22->SetMinSize(wxDLG_UNIT(_1_X_N_copy_22, wxSize(-1, 100)));
     sizer_5->Add(_1_X_N_copy_22, 1, wxEXPAND, 0);
+    _0_N_F_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_22->SetMinSize(wxDLG_UNIT(_0_N_F_copy_22, wxSize(-1, 100)));
     sizer_5->Add(_0_N_F_copy_22, 0, wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_22->SetMinSize(wxDLG_UNIT(_1_N_F_copy_22, wxSize(-1, 100)));
     sizer_5->Add(_1_N_F_copy_22, 1, wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
     sizer_5->Add(_0_X_F_copy_22, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_22 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
     sizer_5->Add(_1_X_F_copy_22, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    _0_N_N_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_23->SetMinSize(wxDLG_UNIT(_0_N_N_copy_23, wxSize(100, -1)));
     sizer_5->Add(_0_N_N_copy_23, 0, 0, 0);
+    _1_N_N_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_23->SetMinSize(wxDLG_UNIT(_1_N_N_copy_23, wxSize(100, -1)));
     sizer_5->Add(_1_N_N_copy_23, 1, 0, 0);
+    _0_X_N_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_23->SetMinSize(wxDLG_UNIT(_0_X_N_copy_23, wxSize(100, -1)));
     sizer_5->Add(_0_X_N_copy_23, 0, wxEXPAND, 0);
+    _1_X_N_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_23->SetMinSize(wxDLG_UNIT(_1_X_N_copy_23, wxSize(100, -1)));
     sizer_5->Add(_1_X_N_copy_23, 1, wxEXPAND, 0);
+    _0_N_F_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_23->SetMinSize(wxDLG_UNIT(_0_N_F_copy_23, wxSize(100, -1)));
     sizer_5->Add(_0_N_F_copy_23, 0, wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_23->SetMinSize(wxDLG_UNIT(_1_N_F_copy_23, wxSize(100, -1)));
     sizer_5->Add(_1_N_F_copy_23, 1, wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_23->SetMinSize(wxDLG_UNIT(_0_X_F_copy_23, wxSize(100, -1)));
     sizer_5->Add(_0_X_F_copy_23, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_23 = new wxTextCtrl(notebook_1_FlexGridSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_23->SetMinSize(wxDLG_UNIT(_1_X_F_copy_23, wxSize(100, -1)));
     sizer_5->Add(_1_X_F_copy_23, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    notebook_1_FlexGridSizer->SetSizer(sizer_5);
-    sizer_5->AddGrowableRow(2);
-    sizer_5->AddGrowableRow(5);
-    sizer_5->AddGrowableCol(1);
-    sizer_5->AddGrowableCol(7);
+    notebook_1_GridBagSizer = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_GridBagSizer, _("GridBagSizer"));
+    wxGridBagSizer* sizer_6 = new wxGridBagSizer(1, 1);
+    _0_N_N_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
     sizer_6->Add(_0_N_N_copy_24, wxGBPosition(0, 0), wxGBSpan(1, 1), 0, 0);
+    _1_N_N_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
     sizer_6->Add(_1_N_N_copy_24, wxGBPosition(0, 1), wxGBSpan(1, 1), 0, 0);
+    _0_X_N_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
     sizer_6->Add(_0_X_N_copy_24, wxGBPosition(0, 2), wxGBSpan(1, 1), wxEXPAND, 0);
+    _1_X_N_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
     sizer_6->Add(_1_X_N_copy_24, wxGBPosition(0, 3), wxGBSpan(1, 1), wxEXPAND, 0);
+    _0_N_F_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
     sizer_6->Add(_0_N_F_copy_24, wxGBPosition(0, 4), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
     sizer_6->Add(_1_N_F_copy_24, wxGBPosition(0, 5), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
     sizer_6->Add(_0_X_F_copy_24, wxGBPosition(0, 6), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_24 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
     sizer_6->Add(_1_X_F_copy_24, wxGBPosition(0, 7), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _0_N_N_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
     sizer_6->Add(_0_N_N_copy_copy_copy_copy_copy, wxGBPosition(1, 0), wxGBSpan(1, 1), 0, 0);
+    _1_N_N_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
     sizer_6->Add(_1_N_N_copy_copy_copy_copy_copy, wxGBPosition(1, 1), wxGBSpan(1, 1), 0, 0);
+    _0_X_N_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
     sizer_6->Add(_0_X_N_copy_copy_copy_copy_copy, wxGBPosition(1, 2), wxGBSpan(1, 1), wxEXPAND, 0);
+    _1_X_N_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
     sizer_6->Add(_1_X_N_copy_copy_copy_copy_copy, wxGBPosition(1, 3), wxGBSpan(1, 1), wxEXPAND, 0);
+    _0_N_F_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
     sizer_6->Add(_0_N_F_copy_copy_copy_copy_copy, wxGBPosition(1, 4), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
     sizer_6->Add(_1_N_F_copy_copy_copy_copy_copy, wxGBPosition(1, 5), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
     sizer_6->Add(_0_X_F_copy_copy_copy_copy_copy, wxGBPosition(1, 6), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_copy_copy_copy_copy = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_copy_copy_copy_copy->SetMinSize(wxSize(100, 21));
     sizer_6->Add(_1_X_F_copy_copy_copy_copy_copy, wxGBPosition(1, 7), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _0_N_N_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_25->SetMinSize(wxDLG_UNIT(_0_N_N_copy_25, wxSize(100, 21)));
     sizer_6->Add(_0_N_N_copy_25, wxGBPosition(2, 0), wxGBSpan(1, 1), 0, 0);
+    _1_N_N_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_25->SetMinSize(wxDLG_UNIT(_1_N_N_copy_25, wxSize(100, 21)));
     sizer_6->Add(_1_N_N_copy_25, wxGBPosition(2, 1), wxGBSpan(1, 1), 0, 0);
+    _0_X_N_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_25->SetMinSize(wxDLG_UNIT(_0_X_N_copy_25, wxSize(100, 21)));
     sizer_6->Add(_0_X_N_copy_25, wxGBPosition(2, 2), wxGBSpan(1, 1), wxEXPAND, 0);
+    _1_X_N_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_25->SetMinSize(wxDLG_UNIT(_1_X_N_copy_25, wxSize(100, 21)));
     sizer_6->Add(_1_X_N_copy_25, wxGBPosition(2, 3), wxGBSpan(1, 1), wxEXPAND, 0);
+    _0_N_F_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_25->SetMinSize(wxDLG_UNIT(_0_N_F_copy_25, wxSize(100, 21)));
     sizer_6->Add(_0_N_F_copy_25, wxGBPosition(2, 4), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_25->SetMinSize(wxDLG_UNIT(_1_N_F_copy_25, wxSize(100, 21)));
     sizer_6->Add(_1_N_F_copy_25, wxGBPosition(2, 5), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_25->SetMinSize(wxDLG_UNIT(_0_X_F_copy_25, wxSize(100, 21)));
     sizer_6->Add(_0_X_F_copy_25, wxGBPosition(2, 6), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_25 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_25->SetMinSize(wxDLG_UNIT(_1_X_F_copy_25, wxSize(100, 21)));
     sizer_6->Add(_1_X_F_copy_25, wxGBPosition(2, 7), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _0_N_N_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_26->SetMinSize(wxSize(-1, 21));
     sizer_6->Add(_0_N_N_copy_26, wxGBPosition(3, 0), wxGBSpan(1, 1), 0, 0);
+    _1_N_N_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_26->SetMinSize(wxSize(-1, 21));
     sizer_6->Add(_1_N_N_copy_26, wxGBPosition(3, 1), wxGBSpan(1, 1), 0, 0);
+    _0_X_N_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_26->SetMinSize(wxSize(-1, 21));
     sizer_6->Add(_0_X_N_copy_26, wxGBPosition(3, 2), wxGBSpan(1, 1), wxEXPAND, 0);
+    _1_X_N_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_26->SetMinSize(wxSize(-1, 21));
     sizer_6->Add(_1_X_N_copy_26, wxGBPosition(3, 3), wxGBSpan(1, 1), wxEXPAND, 0);
+    _0_N_F_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_26->SetMinSize(wxSize(-1, 21));
     sizer_6->Add(_0_N_F_copy_26, wxGBPosition(3, 4), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_26->SetMinSize(wxSize(-1, 21));
     sizer_6->Add(_1_N_F_copy_26, wxGBPosition(3, 5), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_26->SetMinSize(wxSize(-1, 21));
     sizer_6->Add(_0_X_F_copy_26, wxGBPosition(3, 6), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_26 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_26->SetMinSize(wxSize(-1, 21));
     sizer_6->Add(_1_X_F_copy_26, wxGBPosition(3, 7), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _0_N_N_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_27->SetMinSize(wxSize(100, -1));
     sizer_6->Add(_0_N_N_copy_27, wxGBPosition(4, 0), wxGBSpan(1, 1), 0, 0);
+    _1_N_N_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_27->SetMinSize(wxSize(100, -1));
     sizer_6->Add(_1_N_N_copy_27, wxGBPosition(4, 1), wxGBSpan(1, 1), 0, 0);
+    _0_X_N_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_27->SetMinSize(wxSize(100, -1));
     sizer_6->Add(_0_X_N_copy_27, wxGBPosition(4, 2), wxGBSpan(1, 1), wxEXPAND, 0);
+    _1_X_N_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_27->SetMinSize(wxSize(100, -1));
     sizer_6->Add(_1_X_N_copy_27, wxGBPosition(4, 3), wxGBSpan(1, 1), wxEXPAND, 0);
+    _0_N_F_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_27->SetMinSize(wxSize(100, -1));
     sizer_6->Add(_0_N_F_copy_27, wxGBPosition(4, 4), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_27->SetMinSize(wxSize(100, -1));
     sizer_6->Add(_1_N_F_copy_27, wxGBPosition(4, 5), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_27->SetMinSize(wxSize(100, -1));
     sizer_6->Add(_0_X_F_copy_27, wxGBPosition(4, 6), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_27 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_27->SetMinSize(wxSize(100, -1));
     sizer_6->Add(_1_X_F_copy_27, wxGBPosition(4, 7), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _0_N_N_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_28->SetMinSize(wxDLG_UNIT(_0_N_N_copy_28, wxSize(-1, 100)));
     sizer_6->Add(_0_N_N_copy_28, wxGBPosition(5, 0), wxGBSpan(1, 1), 0, 0);
+    _1_N_N_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_28->SetMinSize(wxDLG_UNIT(_1_N_N_copy_28, wxSize(-1, 100)));
     sizer_6->Add(_1_N_N_copy_28, wxGBPosition(5, 1), wxGBSpan(1, 1), 0, 0);
+    _0_X_N_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_28->SetMinSize(wxDLG_UNIT(_0_X_N_copy_28, wxSize(-1, 100)));
     sizer_6->Add(_0_X_N_copy_28, wxGBPosition(5, 2), wxGBSpan(1, 1), wxEXPAND, 0);
+    _1_X_N_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_28->SetMinSize(wxDLG_UNIT(_1_X_N_copy_28, wxSize(-1, 100)));
     sizer_6->Add(_1_X_N_copy_28, wxGBPosition(5, 3), wxGBSpan(1, 1), wxEXPAND, 0);
+    _0_N_F_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_28->SetMinSize(wxDLG_UNIT(_0_N_F_copy_28, wxSize(-1, 100)));
     sizer_6->Add(_0_N_F_copy_28, wxGBPosition(5, 4), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_28->SetMinSize(wxDLG_UNIT(_1_N_F_copy_28, wxSize(-1, 100)));
     sizer_6->Add(_1_N_F_copy_28, wxGBPosition(5, 5), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
     sizer_6->Add(_0_X_F_copy_28, wxGBPosition(5, 6), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_28 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
     sizer_6->Add(_1_X_F_copy_28, wxGBPosition(5, 7), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _0_N_N_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_29->SetMinSize(wxDLG_UNIT(_0_N_N_copy_29, wxSize(100, -1)));
     sizer_6->Add(_0_N_N_copy_29, wxGBPosition(6, 0), wxGBSpan(1, 1), 0, 0);
+    _1_N_N_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_N_copy_29->SetMinSize(wxDLG_UNIT(_1_N_N_copy_29, wxSize(100, -1)));
     sizer_6->Add(_1_N_N_copy_29, wxGBPosition(6, 1), wxGBSpan(1, 1), 0, 0);
+    _0_X_N_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_N_copy_29->SetMinSize(wxDLG_UNIT(_0_X_N_copy_29, wxSize(100, -1)));
     sizer_6->Add(_0_X_N_copy_29, wxGBPosition(6, 2), wxGBSpan(1, 1), wxEXPAND, 0);
+    _1_X_N_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_N_copy_29->SetMinSize(wxDLG_UNIT(_1_X_N_copy_29, wxSize(100, -1)));
     sizer_6->Add(_1_X_N_copy_29, wxGBPosition(6, 3), wxGBSpan(1, 1), wxEXPAND, 0);
+    _0_N_F_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_N_F_copy_29->SetMinSize(wxDLG_UNIT(_0_N_F_copy_29, wxSize(100, -1)));
     sizer_6->Add(_0_N_F_copy_29, wxGBPosition(6, 4), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _1_N_F_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_N_F_copy_29->SetMinSize(wxDLG_UNIT(_1_N_F_copy_29, wxSize(100, -1)));
     sizer_6->Add(_1_N_F_copy_29, wxGBPosition(6, 5), wxGBSpan(1, 1), wxFIXED_MINSIZE, 0);
+    _0_X_F_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _0_X_F_copy_29->SetMinSize(wxDLG_UNIT(_0_X_F_copy_29, wxSize(100, -1)));
     sizer_6->Add(_0_X_F_copy_29, wxGBPosition(6, 6), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    _1_X_F_copy_29 = new wxTextCtrl(notebook_1_GridBagSizer, wxID_ANY, wxEmptyString);
+    _1_X_F_copy_29->SetMinSize(wxDLG_UNIT(_1_X_F_copy_29, wxSize(100, -1)));
     sizer_6->Add(_1_X_F_copy_29, wxGBPosition(6, 7), wxGBSpan(1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
-    notebook_1_GridBagSizer->SetSizer(sizer_6);
-    sizer_6->AddGrowableRow(2);
-    sizer_6->AddGrowableRow(5);
-    sizer_6->AddGrowableCol(1);
-    sizer_6->AddGrowableCol(7);
+    notebook_1_BorderTest = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_BorderTest, _("BorderTest"));
+    wxBoxSizer* sizer_7 = new wxBoxSizer(wxHORIZONTAL);
+    wxBoxSizer* sizer_border_10_none = new wxBoxSizer(wxVERTICAL);
+    sizer_7->Add(sizer_border_10_none, 1, wxEXPAND, 10);
+    _0_N_N_border_10_none = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
     sizer_border_10_none->Add(_0_N_N_border_10_none, 0, 0, 10);
+    _1_N_N_border_0_all = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
     sizer_border_10_none->Add(_1_N_N_border_0_all, 1, wxALL, 0);
+    _0_X_N_border_5_LEFTRIGHT = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
     sizer_border_10_none->Add(_0_X_N_border_5_LEFTRIGHT, 0, wxEXPAND|wxLEFT|wxRIGHT, 5);
+    _1_X_N_border_15_BOTTOM = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
     sizer_border_10_none->Add(_1_X_N_border_15_BOTTOM, 1, wxBOTTOM|wxEXPAND, 15);
-    sizer_7->Add(sizer_border_10_none, 1, wxEXPAND, 10);
-    sizer_border_0_ALL->Add(_0_N_N_copy_copy_1, 0, 0, 0);
+    wxBoxSizer* sizer_border_0_ALL = new wxBoxSizer(wxVERTICAL);
     sizer_7->Add(sizer_border_0_ALL, 1, wxALL|wxEXPAND, 0);
-    sizer_border_5_LEFTRIGHT->Add(_0_N_N_copy_31, 0, 0, 0);
+    _0_N_N_copy_copy_1 = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_copy_1->SetMinSize(wxSize(100, 21));
+    sizer_border_0_ALL->Add(_0_N_N_copy_copy_1, 0, 0, 0);
+    wxBoxSizer* sizer_border_5_LEFTRIGHT = new wxBoxSizer(wxVERTICAL);
     sizer_7->Add(sizer_border_5_LEFTRIGHT, 1, wxLEFT|wxRIGHT, 5);
-    sizer_border_15_BOTTOM->Add(_0_N_N_copy_32, 0, 0, 0);
+    _0_N_N_copy_31 = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_31->SetMinSize(wxDLG_UNIT(_0_N_N_copy_31, wxSize(100, 21)));
+    sizer_border_5_LEFTRIGHT->Add(_0_N_N_copy_31, 0, 0, 0);
+    wxBoxSizer* sizer_border_15_BOTTOM = new wxBoxSizer(wxVERTICAL);
     sizer_7->Add(sizer_border_15_BOTTOM, 1, 0, 15);
-    notebook_1_BorderTest->SetSizer(sizer_7);
+    _0_N_N_copy_32 = new wxTextCtrl(notebook_1_BorderTest, wxID_ANY, wxEmptyString);
+    _0_N_N_copy_32->SetMinSize(wxSize(-1, 21));
+    sizer_border_15_BOTTOM->Add(_0_N_N_copy_32, 0, 0, 0);
+    notebook_1_GridBagSizer_Spacers = new wxPanel(notebook_1, wxID_ANY);
+    notebook_1->AddPage(notebook_1_GridBagSizer_Spacers, _("GridBagSizer_Spacers"));
+    wxGridBagSizer* grid_sizer_1 = new wxGridBagSizer(0, 0);
+    button_1 = new wxButton(notebook_1_GridBagSizer_Spacers, wxID_ANY, _("button_1"));
     grid_sizer_1->Add(button_1, wxGBPosition(0, 0), wxGBSpan(1, 1), 0, 0);
     grid_sizer_1->Add(20, 20, wxGBPosition(2, 0), wxGBSpan(1, 1), wxEXPAND, 0);
     grid_sizer_1->Add(20, 20, wxGBPosition(2, 1), wxGBSpan(1, 1), wxEXPAND, 0);
-    notebook_1_GridBagSizer_Spacers->SetSizer(grid_sizer_1);
+    
     grid_sizer_1->AddGrowableRow(0);
     grid_sizer_1->AddGrowableRow(2);
     grid_sizer_1->AddGrowableCol(0);
-    notebook_1->AddPage(notebook_1_pane_1, _("BoxSizer"));
-    notebook_1->AddPage(notebook_1_WrapSizer, _("WrapSizer"));
-    notebook_1->AddPage(notebook_1_StaticBoxSizer, _("StaticBoxSizer"));
-    notebook_1->AddPage(notebook_1_GridSizer, _("GridSizer"));
-    notebook_1->AddPage(notebook_1_FlexGridSizer, _("FlexGridSizer"));
-    notebook_1->AddPage(notebook_1_GridBagSizer, _("GridBagSizer"));
-    notebook_1->AddPage(notebook_1_BorderTest, _("BorderTest"));
-    notebook_1->AddPage(notebook_1_GridBagSizer_Spacers, _("GridBagSizer_Spacers"));
-    sizer_1->Add(notebook_1, 1, wxEXPAND, 0);
+    notebook_1_GridBagSizer_Spacers->SetSizer(grid_sizer_1);
+    notebook_1_BorderTest->SetSizer(sizer_7);
+    sizer_6->AddGrowableRow(2);
+    sizer_6->AddGrowableRow(5);
+    sizer_6->AddGrowableCol(1);
+    sizer_6->AddGrowableCol(7);
+    notebook_1_GridBagSizer->SetSizer(sizer_6);
+    sizer_5->AddGrowableRow(2);
+    sizer_5->AddGrowableRow(5);
+    sizer_5->AddGrowableCol(1);
+    sizer_5->AddGrowableCol(7);
+    notebook_1_FlexGridSizer->SetSizer(sizer_5);
+    notebook_1_GridSizer->SetSizer(sizer_4);
+    notebook_1_StaticBoxSizer->SetSizer(sizer_3);
+    notebook_1_WrapSizer->SetSizer(sizer_8);
+    notebook_1_pane_1->SetSizer(sizer_2);
     SetSizer(sizer_1);
     Layout();
     // end wxGlade
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests.h wxglade-1.0.1/tests/casefiles/SizersSizeTests.h
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests.h	2020-12-31 14:04:48.000000000 +0000
@@ -39,13 +39,11 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
+    wxNotebook* notebook_1;
+    wxPanel* notebook_1_pane_1;
     wxTextCtrl* _0_N_N;
     wxTextCtrl* _1_N_N;
     wxTextCtrl* _0_X_N;
@@ -102,7 +100,7 @@
     wxTextCtrl* _1_N_F_copy_5;
     wxTextCtrl* _0_X_F_copy_5;
     wxTextCtrl* _1_X_F_copy_5;
-    wxPanel* notebook_1_pane_1;
+    wxPanel* notebook_1_WrapSizer;
     wxTextCtrl* _0_N_N_copy_30;
     wxTextCtrl* _1_N_N_copy_30;
     wxTextCtrl* _0_X_N_copy_30;
@@ -159,7 +157,7 @@
     wxTextCtrl* _1_N_F_copy_30_copy_5;
     wxTextCtrl* _0_X_F_copy_30_copy_5;
     wxTextCtrl* _1_X_F_copy_30_copy_5;
-    wxPanel* notebook_1_WrapSizer;
+    wxPanel* notebook_1_StaticBoxSizer;
     wxTextCtrl* _0_N_N_copy_6;
     wxTextCtrl* _1_N_N_copy_6;
     wxTextCtrl* _0_X_N_copy_6;
@@ -216,7 +214,7 @@
     wxTextCtrl* _1_N_F_copy_11;
     wxTextCtrl* _0_X_F_copy_11;
     wxTextCtrl* _1_X_F_copy_11;
-    wxPanel* notebook_1_StaticBoxSizer;
+    wxPanel* notebook_1_GridSizer;
     wxTextCtrl* _0_N_N_copy_12;
     wxTextCtrl* _1_N_N_copy_12;
     wxTextCtrl* _0_X_N_copy_12;
@@ -273,7 +271,7 @@
     wxTextCtrl* _1_N_F_copy_17;
     wxTextCtrl* _0_X_F_copy_17;
     wxTextCtrl* _1_X_F_copy_17;
-    wxPanel* notebook_1_GridSizer;
+    wxPanel* notebook_1_FlexGridSizer;
     wxTextCtrl* _0_N_N_copy_18;
     wxTextCtrl* _1_N_N_copy_18;
     wxTextCtrl* _0_X_N_copy_18;
@@ -330,7 +328,7 @@
     wxTextCtrl* _1_N_F_copy_23;
     wxTextCtrl* _0_X_F_copy_23;
     wxTextCtrl* _1_X_F_copy_23;
-    wxPanel* notebook_1_FlexGridSizer;
+    wxPanel* notebook_1_GridBagSizer;
     wxTextCtrl* _0_N_N_copy_24;
     wxTextCtrl* _1_N_N_copy_24;
     wxTextCtrl* _0_X_N_copy_24;
@@ -387,7 +385,7 @@
     wxTextCtrl* _1_N_F_copy_29;
     wxTextCtrl* _0_X_F_copy_29;
     wxTextCtrl* _1_X_F_copy_29;
-    wxPanel* notebook_1_GridBagSizer;
+    wxPanel* notebook_1_BorderTest;
     wxTextCtrl* _0_N_N_border_10_none;
     wxTextCtrl* _1_N_N_border_0_all;
     wxTextCtrl* _0_X_N_border_5_LEFTRIGHT;
@@ -395,10 +393,8 @@
     wxTextCtrl* _0_N_N_copy_copy_1;
     wxTextCtrl* _0_N_N_copy_31;
     wxTextCtrl* _0_N_N_copy_32;
-    wxPanel* notebook_1_BorderTest;
-    wxButton* button_1;
     wxPanel* notebook_1_GridBagSizer_Spacers;
-    wxNotebook* notebook_1;
+    wxButton* button_1;
     // end wxGlade
 }; // wxGlade: end class
 
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests_nowrap.py wxglade-1.0.1/tests/casefiles/SizersSizeTests_nowrap.py
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests_nowrap.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests_nowrap.py	2020-12-31 14:04:48.000000000 +0000
@@ -20,897 +20,1213 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((600, 400))
+        self.SetTitle(_("frame"))
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("BoxSizer"))
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_3_nosize = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_3_nosize, 1, wx.EXPAND, 0)
+
         self._0_N_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_N_N, 0, 0, 0)
+
         self._1_N_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_N_N, 1, 0, 0)
+
         self._0_X_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_X_N, 0, wx.EXPAND, 0)
+
         self._1_X_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_X_N, 1, wx.EXPAND, 0)
+
         self._0_N_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_N_F, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_N_F, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_X_F, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_X_F, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_4_abs = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_4_abs, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_N_N_copy, 0, 0, 0)
+
         self._1_N_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_N_N_copy, 1, 0, 0)
+
         self._0_X_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_X_N_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_X_N_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_N_F_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_N_F_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_X_F_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_X_F_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_5_dlg = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_5_dlg, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._0_N_N_copy_1, 0, 0, 0)
+
         self._1_N_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._1_N_N_copy_1, 1, 0, 0)
+
         self._0_X_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._0_X_N_copy_1, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._1_X_N_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._0_N_F_copy_1, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._1_N_F_copy_1, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._0_X_F_copy_1, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_1, (100, 21)))
+        sizer_5_dlg.Add(self._1_X_F_copy_1, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1abs = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_m1abs, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_N_N_copy_2, 0, 0, 0)
+
         self._1_N_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_N_N_copy_2, 1, 0, 0)
+
         self._0_X_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_X_N_copy_2, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_X_N_copy_2, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_N_F_copy_2, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_N_F_copy_2, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_X_F_copy_2, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_X_F_copy_2, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_absm1 = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_absm1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_N_N_copy_3, 0, 0, 0)
+
         self._1_N_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_N_N_copy_3, 1, 0, 0)
+
         self._0_X_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_X_N_copy_3, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_X_N_copy_3, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_N_F_copy_3, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_N_F_copy_3, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_X_F_copy_3, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_X_F_copy_3, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1dlg = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_m1dlg, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._0_N_N_copy_4, 0, 0, 0)
+
         self._1_N_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._1_N_N_copy_4, 1, 0, 0)
+
         self._0_X_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_4.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._0_X_N_copy_4, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_4.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._1_X_N_copy_4, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._0_N_F_copy_4, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_4, (-1, 100)))
+        sizer_6_m1dlg.Add(self._1_N_F_copy_4, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_6_m1dlg.Add(self._0_X_F_copy_4, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_6_m1dlg.Add(self._1_X_F_copy_4, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_dlgm1 = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_dlgm1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._0_N_N_copy_5, 0, 0, 0)
+
         self._1_N_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._1_N_N_copy_5, 1, 0, 0)
+
         self._0_X_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._0_X_N_copy_5, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._1_X_N_copy_5, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._0_N_F_copy_5, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._1_N_F_copy_5, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._0_X_F_copy_5, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_5, (100, -1)))
+        sizer_6_dlgm1.Add(self._1_X_F_copy_5, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_StaticBoxSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_StaticBoxSizer, _("StaticBoxSizer"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_3_nosize_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_3_nosize_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_3_nosize_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_N_N_copy_6, 0, 0, 0)
+
         self._1_N_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_N_N_copy_6, 1, 0, 0)
+
         self._0_X_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_X_N_copy_6, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_X_N_copy_6, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_N_F_copy_6, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_N_F_copy_6, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_X_F_copy_6, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_X_F_copy_6, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_4_abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_4_abs_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_4_abs_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_N_N_copy_copy, 0, 0, 0)
+
         self._1_N_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_N_N_copy_copy, 1, 0, 0)
+
         self._0_X_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_X_N_copy_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_X_N_copy_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_N_F_copy_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_N_F_copy_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_X_F_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_X_F_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_5_dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_5_dlg_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_5_dlg_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_7.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._0_N_N_copy_7, 0, 0, 0)
+
         self._1_N_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_7.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._1_N_N_copy_7, 1, 0, 0)
+
         self._0_X_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_7.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._0_X_N_copy_7, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_7.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._1_X_N_copy_7, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
-        self._1_N_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_7.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._0_N_F_copy_7, 0, wx.FIXED_MINSIZE, 0)
+
+        self._1_N_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_7.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._1_N_F_copy_7, 1, wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_7.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._0_X_F_copy_7, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_7.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_7, (100, 21)))
+        sizer_5_dlg_copy.Add(self._1_X_F_copy_7, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1abs_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_m1abs_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_N_N_copy_8, 0, 0, 0)
+
         self._1_N_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_N_N_copy_8, 1, 0, 0)
+
         self._0_X_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_X_N_copy_8, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_X_N_copy_8, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_N_F_copy_8, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_N_F_copy_8, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_X_F_copy_8, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_X_F_copy_8, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_absm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_absm1_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_absm1_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_N_N_copy_9, 0, 0, 0)
+
         self._1_N_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_N_N_copy_9, 1, 0, 0)
+
         self._0_X_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_X_N_copy_9, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_X_N_copy_9, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_N_F_copy_9, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_N_F_copy_9, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_X_F_copy_9, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_X_F_copy_9, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1dlg_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_m1dlg_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_10.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._0_N_N_copy_10, 0, 0, 0)
+
         self._1_N_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_10.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._1_N_N_copy_10, 1, 0, 0)
+
         self._0_X_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_10.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._0_X_N_copy_10, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_10.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._1_X_N_copy_10, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_10.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._0_N_F_copy_10, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_10.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_10, (-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._1_N_F_copy_10, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_6_m1dlg_copy.Add(self._0_X_F_copy_10, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_6_m1dlg_copy.Add(self._1_X_F_copy_10, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_dlgm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_dlgm1_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_dlgm1_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_11.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_N_N_copy_11, 0, 0, 0)
+
         self._1_N_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_11.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_N_N_copy_11, 1, 0, 0)
+
         self._0_X_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_11.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_X_N_copy_11, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_11.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_X_N_copy_11, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_11.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_N_F_copy_11, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_11.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_N_F_copy_11, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_11.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_X_F_copy_11, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_11.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_11, (100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_X_F_copy_11, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_GridSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_GridSizer, _("GridSizer"))
+
+        sizer_4 = wx.GridSizer(7, 8, 0, 0)
+
         self._0_N_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_N_N_copy_12, 0, 0, 0)
+
         self._1_N_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_N_N_copy_12, 1, 0, 0)
+
         self._0_X_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_X_N_copy_12, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_X_N_copy_12, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_N_F_copy_12, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_N_F_copy_12, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_X_F_copy_12, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_X_F_copy_12, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_N_N_copy_copy_copy, 0, 0, 0)
+
         self._1_N_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_N_N_copy_copy_copy, 1, 0, 0)
+
         self._0_X_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_X_N_copy_copy_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_X_N_copy_copy_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_N_F_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_N_F_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_X_F_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_X_F_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_13.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_13, (100, 21)))
+        sizer_4.Add(self._0_N_N_copy_13, 0, 0, 0)
+
         self._1_N_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_13.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_13, (100, 21)))
+        sizer_4.Add(self._1_N_N_copy_13, 1, 0, 0)
+
         self._0_X_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_13.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_13, (100, 21)))
+        sizer_4.Add(self._0_X_N_copy_13, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_13.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_13, (100, 21)))
+        sizer_4.Add(self._1_X_N_copy_13, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_13.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_13, (100, 21)))
+        sizer_4.Add(self._0_N_F_copy_13, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_13.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_13, (100, 21)))
+        sizer_4.Add(self._1_N_F_copy_13, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_13.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_13, (100, 21)))
+        sizer_4.Add(self._0_X_F_copy_13, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_13.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_13, (100, 21)))
+        sizer_4.Add(self._1_X_F_copy_13, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_N_N_copy_14, 0, 0, 0)
+
         self._1_N_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_N_N_copy_14, 1, 0, 0)
+
         self._0_X_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_X_N_copy_14, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_X_N_copy_14, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_N_F_copy_14, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_N_F_copy_14, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_X_F_copy_14, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_X_F_copy_14, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_N_N_copy_15, 0, 0, 0)
+
         self._1_N_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_N_N_copy_15, 1, 0, 0)
+
         self._0_X_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_X_N_copy_15, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_X_N_copy_15, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_N_F_copy_15, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_N_F_copy_15, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_X_F_copy_15, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_X_F_copy_15, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_16.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_16, (-1, 100)))
+        sizer_4.Add(self._0_N_N_copy_16, 0, 0, 0)
+
         self._1_N_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_16.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_16, (-1, 100)))
+        sizer_4.Add(self._1_N_N_copy_16, 1, 0, 0)
+
         self._0_X_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_16.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_16, (-1, 100)))
+        sizer_4.Add(self._0_X_N_copy_16, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_16.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_16, (-1, 100)))
+        sizer_4.Add(self._1_X_N_copy_16, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_16.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_16, (-1, 100)))
+        sizer_4.Add(self._0_N_F_copy_16, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_16.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_16, (-1, 100)))
+        sizer_4.Add(self._1_N_F_copy_16, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_X_F_copy_16, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_X_F_copy_16, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_17.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_17, (100, -1)))
+        sizer_4.Add(self._0_N_N_copy_17, 0, 0, 0)
+
         self._1_N_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_17.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_17, (100, -1)))
+        sizer_4.Add(self._1_N_N_copy_17, 1, 0, 0)
+
         self._0_X_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_17.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_17, (100, -1)))
+        sizer_4.Add(self._0_X_N_copy_17, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_17.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_17, (100, -1)))
+        sizer_4.Add(self._1_X_N_copy_17, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_17.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_17, (100, -1)))
+        sizer_4.Add(self._0_N_F_copy_17, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_17.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_17, (100, -1)))
+        sizer_4.Add(self._1_N_F_copy_17, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_17.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_17, (100, -1)))
+        sizer_4.Add(self._0_X_F_copy_17, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_17.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_17, (100, -1)))
+        sizer_4.Add(self._1_X_F_copy_17, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_FlexGridSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_FlexGridSizer, _("FlexGridSizer"))
+
+        sizer_5 = wx.FlexGridSizer(7, 8, 1, 1)
+
         self._0_N_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_N_N_copy_18, 0, 0, 0)
+
         self._1_N_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_N_N_copy_18, 1, 0, 0)
+
         self._0_X_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_X_N_copy_18, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_X_N_copy_18, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_N_F_copy_18, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_N_F_copy_18, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_X_F_copy_18, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_X_F_copy_18, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_N_N_copy_copy_copy_copy, 0, 0, 0)
+
         self._1_N_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_N_N_copy_copy_copy_copy, 1, 0, 0)
+
         self._0_X_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_X_N_copy_copy_copy_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_X_N_copy_copy_copy_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_N_F_copy_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_N_F_copy_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_X_F_copy_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_X_F_copy_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_19.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_19, (100, 21)))
+        sizer_5.Add(self._0_N_N_copy_19, 0, 0, 0)
+
         self._1_N_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_19.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_19, (100, 21)))
+        sizer_5.Add(self._1_N_N_copy_19, 1, 0, 0)
+
         self._0_X_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_19.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_19, (100, 21)))
+        sizer_5.Add(self._0_X_N_copy_19, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_19.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_19, (100, 21)))
+        sizer_5.Add(self._1_X_N_copy_19, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_19.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_19, (100, 21)))
+        sizer_5.Add(self._0_N_F_copy_19, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_19.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_19, (100, 21)))
+        sizer_5.Add(self._1_N_F_copy_19, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_19.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_19, (100, 21)))
+        sizer_5.Add(self._0_X_F_copy_19, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_19.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_19, (100, 21)))
+        sizer_5.Add(self._1_X_F_copy_19, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_N_N_copy_20, 0, 0, 0)
+
         self._1_N_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_N_N_copy_20, 1, 0, 0)
+
         self._0_X_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_X_N_copy_20, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_X_N_copy_20, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_N_F_copy_20, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_N_F_copy_20, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_X_F_copy_20, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_X_F_copy_20, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_N_N_copy_21, 0, 0, 0)
+
         self._1_N_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_N_N_copy_21, 1, 0, 0)
+
         self._0_X_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_X_N_copy_21, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_X_N_copy_21, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_N_F_copy_21, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_N_F_copy_21, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_X_F_copy_21, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_X_F_copy_21, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_22.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_22, (-1, 100)))
+        sizer_5.Add(self._0_N_N_copy_22, 0, 0, 0)
+
         self._1_N_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_22.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_22, (-1, 100)))
+        sizer_5.Add(self._1_N_N_copy_22, 1, 0, 0)
+
         self._0_X_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_22.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_22, (-1, 100)))
+        sizer_5.Add(self._0_X_N_copy_22, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_22.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_22, (-1, 100)))
+        sizer_5.Add(self._1_X_N_copy_22, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_22.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_22, (-1, 100)))
+        sizer_5.Add(self._0_N_F_copy_22, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_22.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_22, (-1, 100)))
+        sizer_5.Add(self._1_N_F_copy_22, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_X_F_copy_22, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_X_F_copy_22, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_23.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_23, (100, -1)))
+        sizer_5.Add(self._0_N_N_copy_23, 0, 0, 0)
+
         self._1_N_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_23.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_23, (100, -1)))
+        sizer_5.Add(self._1_N_N_copy_23, 1, 0, 0)
+
         self._0_X_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_23.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_23, (100, -1)))
+        sizer_5.Add(self._0_X_N_copy_23, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_23.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_23, (100, -1)))
+        sizer_5.Add(self._1_X_N_copy_23, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_23.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_23, (100, -1)))
+        sizer_5.Add(self._0_N_F_copy_23, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_23.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_23, (100, -1)))
+        sizer_5.Add(self._1_N_F_copy_23, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_23.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_23, (100, -1)))
+        sizer_5.Add(self._0_X_F_copy_23, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_23.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_23, (100, -1)))
+        sizer_5.Add(self._1_X_F_copy_23, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_GridBagSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_GridBagSizer, _("GridBagSizer"))
+
+        sizer_6 = wx.GridBagSizer(1, 1)
+
         self._0_N_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_N_N_copy_24, (0, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_N_N_copy_24, (0, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_X_N_copy_24, (0, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_X_N_copy_24, (0, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_N_F_copy_24, (0, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_N_F_copy_24, (0, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_X_F_copy_24, (0, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_X_F_copy_24, (0, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_N_N_copy_copy_copy_copy_copy, (1, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_N_N_copy_copy_copy_copy_copy, (1, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_X_N_copy_copy_copy_copy_copy, (1, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_X_N_copy_copy_copy_copy_copy, (1, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_N_F_copy_copy_copy_copy_copy, (1, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_N_F_copy_copy_copy_copy_copy, (1, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_X_F_copy_copy_copy_copy_copy, (1, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_X_F_copy_copy_copy_copy_copy, (1, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_25.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_25, (100, 21)))
+        sizer_6.Add(self._0_N_N_copy_25, (2, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_25.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_25, (100, 21)))
+        sizer_6.Add(self._1_N_N_copy_25, (2, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_25.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_25, (100, 21)))
+        sizer_6.Add(self._0_X_N_copy_25, (2, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_25.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_25, (100, 21)))
+        sizer_6.Add(self._1_X_N_copy_25, (2, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_25.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_25, (100, 21)))
+        sizer_6.Add(self._0_N_F_copy_25, (2, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_25.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_25, (100, 21)))
+        sizer_6.Add(self._1_N_F_copy_25, (2, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_25.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_25, (100, 21)))
+        sizer_6.Add(self._0_X_F_copy_25, (2, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_25.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_25, (100, 21)))
+        sizer_6.Add(self._1_X_F_copy_25, (2, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self.notebook_1_BorderTest = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self._0_N_N_border_10_none = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._1_N_N_border_0_all = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_X_N_border_5_LEFTRIGHT = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._1_X_N_border_15_BOTTOM = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_N_N_copy_copy_1 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_N_N_copy_31 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_N_N_copy_32 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle(_("frame"))
-        self._0_N_N_copy.SetMinSize((100, 21))
-        self._1_N_N_copy.SetMinSize((100, 21))
-        self._0_X_N_copy.SetMinSize((100, 21))
-        self._1_X_N_copy.SetMinSize((100, 21))
-        self._0_N_F_copy.SetMinSize((100, 21))
-        self._1_N_F_copy.SetMinSize((100, 21))
-        self._0_X_F_copy.SetMinSize((100, 21))
-        self._1_X_F_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_1, (100, 21)))
-        self._1_N_N_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_1, (100, 21)))
-        self._0_X_N_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_1, (100, 21)))
-        self._1_X_N_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_1, (100, 21)))
-        self._0_N_F_copy_1.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_1, (100, 21)))
-        self._1_N_F_copy_1.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_1, (100, 21)))
-        self._0_X_F_copy_1.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_1, (100, 21)))
-        self._1_X_F_copy_1.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_1, (100, 21)))
-        self._0_N_N_copy_2.SetMinSize((-1, 21))
-        self._1_N_N_copy_2.SetMinSize((-1, 21))
-        self._0_X_N_copy_2.SetMinSize((-1, 21))
-        self._1_X_N_copy_2.SetMinSize((-1, 21))
-        self._0_N_F_copy_2.SetMinSize((-1, 21))
-        self._1_N_F_copy_2.SetMinSize((-1, 21))
-        self._0_X_F_copy_2.SetMinSize((-1, 21))
-        self._1_X_F_copy_2.SetMinSize((-1, 21))
-        self._0_N_N_copy_3.SetMinSize((100, -1))
-        self._1_N_N_copy_3.SetMinSize((100, -1))
-        self._0_X_N_copy_3.SetMinSize((100, -1))
-        self._1_X_N_copy_3.SetMinSize((100, -1))
-        self._0_N_F_copy_3.SetMinSize((100, -1))
-        self._1_N_F_copy_3.SetMinSize((100, -1))
-        self._0_X_F_copy_3.SetMinSize((100, -1))
-        self._1_X_F_copy_3.SetMinSize((100, -1))
-        self._0_N_N_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_4, (-1, 100)))
-        self._1_N_N_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_4, (-1, 100)))
-        self._0_X_N_copy_4.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_4, (-1, 100)))
-        self._1_X_N_copy_4.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_4, (-1, 100)))
-        self._0_N_F_copy_4.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_4, (-1, 100)))
-        self._1_N_F_copy_4.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_4, (-1, 100)))
-        self._0_N_N_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_5, (100, -1)))
-        self._1_N_N_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_5, (100, -1)))
-        self._0_X_N_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_5, (100, -1)))
-        self._1_X_N_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_5, (100, -1)))
-        self._0_N_F_copy_5.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_5, (100, -1)))
-        self._1_N_F_copy_5.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_5, (100, -1)))
-        self._0_X_F_copy_5.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_5, (100, -1)))
-        self._1_X_F_copy_5.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_5, (100, -1)))
-        self._0_N_N_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_7.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_7, (100, 21)))
-        self._1_N_N_copy_7.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_7, (100, 21)))
-        self._0_X_N_copy_7.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_7, (100, 21)))
-        self._1_X_N_copy_7.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_7, (100, 21)))
-        self._0_N_F_copy_7.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_7, (100, 21)))
-        self._1_N_F_copy_7.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_7, (100, 21)))
-        self._0_X_F_copy_7.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_7, (100, 21)))
-        self._1_X_F_copy_7.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_7, (100, 21)))
-        self._0_N_N_copy_8.SetMinSize((-1, 21))
-        self._1_N_N_copy_8.SetMinSize((-1, 21))
-        self._0_X_N_copy_8.SetMinSize((-1, 21))
-        self._1_X_N_copy_8.SetMinSize((-1, 21))
-        self._0_N_F_copy_8.SetMinSize((-1, 21))
-        self._1_N_F_copy_8.SetMinSize((-1, 21))
-        self._0_X_F_copy_8.SetMinSize((-1, 21))
-        self._1_X_F_copy_8.SetMinSize((-1, 21))
-        self._0_N_N_copy_9.SetMinSize((100, -1))
-        self._1_N_N_copy_9.SetMinSize((100, -1))
-        self._0_X_N_copy_9.SetMinSize((100, -1))
-        self._1_X_N_copy_9.SetMinSize((100, -1))
-        self._0_N_F_copy_9.SetMinSize((100, -1))
-        self._1_N_F_copy_9.SetMinSize((100, -1))
-        self._0_X_F_copy_9.SetMinSize((100, -1))
-        self._1_X_F_copy_9.SetMinSize((100, -1))
-        self._0_N_N_copy_10.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_10, (-1, 100)))
-        self._1_N_N_copy_10.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_10, (-1, 100)))
-        self._0_X_N_copy_10.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_10, (-1, 100)))
-        self._1_X_N_copy_10.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_10, (-1, 100)))
-        self._0_N_F_copy_10.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_10, (-1, 100)))
-        self._1_N_F_copy_10.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_10, (-1, 100)))
-        self._0_N_N_copy_11.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_11, (100, -1)))
-        self._1_N_N_copy_11.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_11, (100, -1)))
-        self._0_X_N_copy_11.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_11, (100, -1)))
-        self._1_X_N_copy_11.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_11, (100, -1)))
-        self._0_N_F_copy_11.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_11, (100, -1)))
-        self._1_N_F_copy_11.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_11, (100, -1)))
-        self._0_X_F_copy_11.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_11, (100, -1)))
-        self._1_X_F_copy_11.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_11, (100, -1)))
-        self._0_N_N_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_13.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_13, (100, 21)))
-        self._1_N_N_copy_13.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_13, (100, 21)))
-        self._0_X_N_copy_13.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_13, (100, 21)))
-        self._1_X_N_copy_13.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_13, (100, 21)))
-        self._0_N_F_copy_13.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_13, (100, 21)))
-        self._1_N_F_copy_13.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_13, (100, 21)))
-        self._0_X_F_copy_13.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_13, (100, 21)))
-        self._1_X_F_copy_13.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_13, (100, 21)))
-        self._0_N_N_copy_14.SetMinSize((-1, 21))
-        self._1_N_N_copy_14.SetMinSize((-1, 21))
-        self._0_X_N_copy_14.SetMinSize((-1, 21))
-        self._1_X_N_copy_14.SetMinSize((-1, 21))
-        self._0_N_F_copy_14.SetMinSize((-1, 21))
-        self._1_N_F_copy_14.SetMinSize((-1, 21))
-        self._0_X_F_copy_14.SetMinSize((-1, 21))
-        self._1_X_F_copy_14.SetMinSize((-1, 21))
-        self._0_N_N_copy_15.SetMinSize((100, -1))
-        self._1_N_N_copy_15.SetMinSize((100, -1))
-        self._0_X_N_copy_15.SetMinSize((100, -1))
-        self._1_X_N_copy_15.SetMinSize((100, -1))
-        self._0_N_F_copy_15.SetMinSize((100, -1))
-        self._1_N_F_copy_15.SetMinSize((100, -1))
-        self._0_X_F_copy_15.SetMinSize((100, -1))
-        self._1_X_F_copy_15.SetMinSize((100, -1))
-        self._0_N_N_copy_16.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_16, (-1, 100)))
-        self._1_N_N_copy_16.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_16, (-1, 100)))
-        self._0_X_N_copy_16.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_16, (-1, 100)))
-        self._1_X_N_copy_16.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_16, (-1, 100)))
-        self._0_N_F_copy_16.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_16, (-1, 100)))
-        self._1_N_F_copy_16.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_16, (-1, 100)))
-        self._0_N_N_copy_17.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_17, (100, -1)))
-        self._1_N_N_copy_17.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_17, (100, -1)))
-        self._0_X_N_copy_17.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_17, (100, -1)))
-        self._1_X_N_copy_17.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_17, (100, -1)))
-        self._0_N_F_copy_17.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_17, (100, -1)))
-        self._1_N_F_copy_17.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_17, (100, -1)))
-        self._0_X_F_copy_17.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_17, (100, -1)))
-        self._1_X_F_copy_17.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_17, (100, -1)))
-        self._0_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_19.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_19, (100, 21)))
-        self._1_N_N_copy_19.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_19, (100, 21)))
-        self._0_X_N_copy_19.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_19, (100, 21)))
-        self._1_X_N_copy_19.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_19, (100, 21)))
-        self._0_N_F_copy_19.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_19, (100, 21)))
-        self._1_N_F_copy_19.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_19, (100, 21)))
-        self._0_X_F_copy_19.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_19, (100, 21)))
-        self._1_X_F_copy_19.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_19, (100, 21)))
-        self._0_N_N_copy_20.SetMinSize((-1, 21))
-        self._1_N_N_copy_20.SetMinSize((-1, 21))
-        self._0_X_N_copy_20.SetMinSize((-1, 21))
-        self._1_X_N_copy_20.SetMinSize((-1, 21))
-        self._0_N_F_copy_20.SetMinSize((-1, 21))
-        self._1_N_F_copy_20.SetMinSize((-1, 21))
-        self._0_X_F_copy_20.SetMinSize((-1, 21))
-        self._1_X_F_copy_20.SetMinSize((-1, 21))
-        self._0_N_N_copy_21.SetMinSize((100, -1))
-        self._1_N_N_copy_21.SetMinSize((100, -1))
-        self._0_X_N_copy_21.SetMinSize((100, -1))
-        self._1_X_N_copy_21.SetMinSize((100, -1))
-        self._0_N_F_copy_21.SetMinSize((100, -1))
-        self._1_N_F_copy_21.SetMinSize((100, -1))
-        self._0_X_F_copy_21.SetMinSize((100, -1))
-        self._1_X_F_copy_21.SetMinSize((100, -1))
-        self._0_N_N_copy_22.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_22, (-1, 100)))
-        self._1_N_N_copy_22.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_22, (-1, 100)))
-        self._0_X_N_copy_22.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_22, (-1, 100)))
-        self._1_X_N_copy_22.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_22, (-1, 100)))
-        self._0_N_F_copy_22.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_22, (-1, 100)))
-        self._1_N_F_copy_22.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_22, (-1, 100)))
-        self._0_N_N_copy_23.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_23, (100, -1)))
-        self._1_N_N_copy_23.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_23, (100, -1)))
-        self._0_X_N_copy_23.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_23, (100, -1)))
-        self._1_X_N_copy_23.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_23, (100, -1)))
-        self._0_N_F_copy_23.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_23, (100, -1)))
-        self._1_N_F_copy_23.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_23, (100, -1)))
-        self._0_X_F_copy_23.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_23, (100, -1)))
-        self._1_X_F_copy_23.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_23, (100, -1)))
-        self._0_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_25.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_25, (100, 21)))
-        self._1_N_N_copy_25.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_25, (100, 21)))
-        self._0_X_N_copy_25.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_25, (100, 21)))
-        self._1_X_N_copy_25.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_25, (100, 21)))
-        self._0_N_F_copy_25.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_25, (100, 21)))
-        self._1_N_F_copy_25.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_25, (100, 21)))
-        self._0_X_F_copy_25.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_25, (100, 21)))
-        self._1_X_F_copy_25.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_25, (100, 21)))
-        self._0_N_N_copy_26.SetMinSize((-1, 21))
-        self._1_N_N_copy_26.SetMinSize((-1, 21))
-        self._0_X_N_copy_26.SetMinSize((-1, 21))
-        self._1_X_N_copy_26.SetMinSize((-1, 21))
-        self._0_N_F_copy_26.SetMinSize((-1, 21))
-        self._1_N_F_copy_26.SetMinSize((-1, 21))
-        self._0_X_F_copy_26.SetMinSize((-1, 21))
-        self._1_X_F_copy_26.SetMinSize((-1, 21))
-        self._0_N_N_copy_27.SetMinSize((100, -1))
-        self._1_N_N_copy_27.SetMinSize((100, -1))
-        self._0_X_N_copy_27.SetMinSize((100, -1))
-        self._1_X_N_copy_27.SetMinSize((100, -1))
-        self._0_N_F_copy_27.SetMinSize((100, -1))
-        self._1_N_F_copy_27.SetMinSize((100, -1))
-        self._0_X_F_copy_27.SetMinSize((100, -1))
-        self._1_X_F_copy_27.SetMinSize((100, -1))
-        self._0_N_N_copy_28.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_28, (-1, 100)))
-        self._1_N_N_copy_28.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_28, (-1, 100)))
-        self._0_X_N_copy_28.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_28, (-1, 100)))
-        self._1_X_N_copy_28.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_28, (-1, 100)))
-        self._0_N_F_copy_28.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_28, (-1, 100)))
-        self._1_N_F_copy_28.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_28, (-1, 100)))
-        self._0_N_N_copy_29.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_29, (100, -1)))
-        self._1_N_N_copy_29.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_29, (100, -1)))
-        self._0_X_N_copy_29.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_29, (100, -1)))
-        self._1_X_N_copy_29.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_29, (100, -1)))
-        self._0_N_F_copy_29.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_29, (100, -1)))
-        self._1_N_F_copy_29.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_29, (100, -1)))
-        self._0_X_F_copy_29.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_29, (100, -1)))
-        self._1_X_F_copy_29.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_29, (100, -1)))
-        self._0_N_N_copy_copy_1.SetMinSize((100, 21))
-        self._0_N_N_copy_31.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_31, (100, 21)))
-        self._0_N_N_copy_32.SetMinSize((-1, 21))
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_border_15_BOTTOM = wx.BoxSizer(wx.VERTICAL)
-        sizer_border_5_LEFTRIGHT = wx.BoxSizer(wx.VERTICAL)
-        sizer_border_0_ALL = wx.BoxSizer(wx.VERTICAL)
-        sizer_border_10_none = wx.BoxSizer(wx.VERTICAL)
-        sizer_6 = wx.GridBagSizer(1, 1)
-        sizer_5 = wx.FlexGridSizer(7, 8, 1, 1)
-        sizer_4 = wx.GridSizer(7, 8, 0, 0)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6_dlgm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_dlgm1_copy")), wx.VERTICAL)
-        sizer_6_m1dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1dlg_copy")), wx.VERTICAL)
-        sizer_6_absm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_absm1_copy")), wx.VERTICAL)
-        sizer_6_m1abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1abs_copy")), wx.VERTICAL)
-        sizer_5_dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_5_dlg_copy")), wx.VERTICAL)
-        sizer_4_abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_4_abs_copy")), wx.VERTICAL)
-        sizer_3_nosize_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_3_nosize_copy")), wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6_dlgm1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_6_m1dlg = wx.BoxSizer(wx.VERTICAL)
-        sizer_6_absm1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_6_m1abs = wx.BoxSizer(wx.VERTICAL)
-        sizer_5_dlg = wx.BoxSizer(wx.VERTICAL)
-        sizer_4_abs = wx.BoxSizer(wx.VERTICAL)
-        sizer_3_nosize = wx.BoxSizer(wx.VERTICAL)
-        sizer_3_nosize.Add(self._0_N_N, 0, 0, 0)
-        sizer_3_nosize.Add(self._1_N_N, 1, 0, 0)
-        sizer_3_nosize.Add(self._0_X_N, 0, wx.EXPAND, 0)
-        sizer_3_nosize.Add(self._1_X_N, 1, wx.EXPAND, 0)
-        sizer_3_nosize.Add(self._0_N_F, 0, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize.Add(self._1_N_F, 1, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize.Add(self._0_X_F, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize.Add(self._1_X_F, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_3_nosize, 1, wx.EXPAND, 0)
-        sizer_4_abs.Add(self._0_N_N_copy, 0, 0, 0)
-        sizer_4_abs.Add(self._1_N_N_copy, 1, 0, 0)
-        sizer_4_abs.Add(self._0_X_N_copy, 0, wx.EXPAND, 0)
-        sizer_4_abs.Add(self._1_X_N_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs.Add(self._0_N_F_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs.Add(self._1_N_F_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs.Add(self._0_X_F_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4_abs.Add(self._1_X_F_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_4_abs, 1, wx.EXPAND, 0)
-        sizer_5_dlg.Add(self._0_N_N_copy_1, 0, 0, 0)
-        sizer_5_dlg.Add(self._1_N_N_copy_1, 1, 0, 0)
-        sizer_5_dlg.Add(self._0_X_N_copy_1, 0, wx.EXPAND, 0)
-        sizer_5_dlg.Add(self._1_X_N_copy_1, 1, wx.EXPAND, 0)
-        sizer_5_dlg.Add(self._0_N_F_copy_1, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg.Add(self._1_N_F_copy_1, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg.Add(self._0_X_F_copy_1, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg.Add(self._1_X_F_copy_1, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_5_dlg, 1, wx.EXPAND, 0)
-        sizer_6_m1abs.Add(self._0_N_N_copy_2, 0, 0, 0)
-        sizer_6_m1abs.Add(self._1_N_N_copy_2, 1, 0, 0)
-        sizer_6_m1abs.Add(self._0_X_N_copy_2, 0, wx.EXPAND, 0)
-        sizer_6_m1abs.Add(self._1_X_N_copy_2, 1, wx.EXPAND, 0)
-        sizer_6_m1abs.Add(self._0_N_F_copy_2, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs.Add(self._1_N_F_copy_2, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs.Add(self._0_X_F_copy_2, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs.Add(self._1_X_F_copy_2, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_m1abs, 1, wx.EXPAND, 0)
-        sizer_6_absm1.Add(self._0_N_N_copy_3, 0, 0, 0)
-        sizer_6_absm1.Add(self._1_N_N_copy_3, 1, 0, 0)
-        sizer_6_absm1.Add(self._0_X_N_copy_3, 0, wx.EXPAND, 0)
-        sizer_6_absm1.Add(self._1_X_N_copy_3, 1, wx.EXPAND, 0)
-        sizer_6_absm1.Add(self._0_N_F_copy_3, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1.Add(self._1_N_F_copy_3, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1.Add(self._0_X_F_copy_3, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1.Add(self._1_X_F_copy_3, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_absm1, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg.Add(self._0_N_N_copy_4, 0, 0, 0)
-        sizer_6_m1dlg.Add(self._1_N_N_copy_4, 1, 0, 0)
-        sizer_6_m1dlg.Add(self._0_X_N_copy_4, 0, wx.EXPAND, 0)
-        sizer_6_m1dlg.Add(self._1_X_N_copy_4, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg.Add(self._0_N_F_copy_4, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg.Add(self._1_N_F_copy_4, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg.Add(self._0_X_F_copy_4, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg.Add(self._1_X_F_copy_4, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_m1dlg, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1.Add(self._0_N_N_copy_5, 0, 0, 0)
-        sizer_6_dlgm1.Add(self._1_N_N_copy_5, 1, 0, 0)
-        sizer_6_dlgm1.Add(self._0_X_N_copy_5, 0, wx.EXPAND, 0)
-        sizer_6_dlgm1.Add(self._1_X_N_copy_5, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1.Add(self._0_N_F_copy_5, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1.Add(self._1_N_F_copy_5, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1.Add(self._0_X_F_copy_5, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1.Add(self._1_X_F_copy_5, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_dlgm1, 1, wx.EXPAND, 0)
-        self.notebook_1_pane_1.SetSizer(sizer_2)
-        sizer_3_nosize_copy.Add(self._0_N_N_copy_6, 0, 0, 0)
-        sizer_3_nosize_copy.Add(self._1_N_N_copy_6, 1, 0, 0)
-        sizer_3_nosize_copy.Add(self._0_X_N_copy_6, 0, wx.EXPAND, 0)
-        sizer_3_nosize_copy.Add(self._1_X_N_copy_6, 1, wx.EXPAND, 0)
-        sizer_3_nosize_copy.Add(self._0_N_F_copy_6, 0, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy.Add(self._1_N_F_copy_6, 1, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy.Add(self._0_X_F_copy_6, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy.Add(self._1_X_F_copy_6, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_3_nosize_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs_copy.Add(self._0_N_N_copy_copy, 0, 0, 0)
-        sizer_4_abs_copy.Add(self._1_N_N_copy_copy, 1, 0, 0)
-        sizer_4_abs_copy.Add(self._0_X_N_copy_copy, 0, wx.EXPAND, 0)
-        sizer_4_abs_copy.Add(self._1_X_N_copy_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs_copy.Add(self._0_N_F_copy_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy.Add(self._1_N_F_copy_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy.Add(self._0_X_F_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy.Add(self._1_X_F_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_4_abs_copy, 1, wx.EXPAND, 0)
-        sizer_5_dlg_copy.Add(self._0_N_N_copy_7, 0, 0, 0)
-        sizer_5_dlg_copy.Add(self._1_N_N_copy_7, 1, 0, 0)
-        sizer_5_dlg_copy.Add(self._0_X_N_copy_7, 0, wx.EXPAND, 0)
-        sizer_5_dlg_copy.Add(self._1_X_N_copy_7, 1, wx.EXPAND, 0)
-        sizer_5_dlg_copy.Add(self._0_N_F_copy_7, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy.Add(self._1_N_F_copy_7, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy.Add(self._0_X_F_copy_7, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy.Add(self._1_X_F_copy_7, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_5_dlg_copy, 1, wx.EXPAND, 0)
-        sizer_6_m1abs_copy.Add(self._0_N_N_copy_8, 0, 0, 0)
-        sizer_6_m1abs_copy.Add(self._1_N_N_copy_8, 1, 0, 0)
-        sizer_6_m1abs_copy.Add(self._0_X_N_copy_8, 0, wx.EXPAND, 0)
-        sizer_6_m1abs_copy.Add(self._1_X_N_copy_8, 1, wx.EXPAND, 0)
-        sizer_6_m1abs_copy.Add(self._0_N_F_copy_8, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy.Add(self._1_N_F_copy_8, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy.Add(self._0_X_F_copy_8, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy.Add(self._1_X_F_copy_8, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_m1abs_copy, 1, wx.EXPAND, 0)
-        sizer_6_absm1_copy.Add(self._0_N_N_copy_9, 0, 0, 0)
-        sizer_6_absm1_copy.Add(self._1_N_N_copy_9, 1, 0, 0)
-        sizer_6_absm1_copy.Add(self._0_X_N_copy_9, 0, wx.EXPAND, 0)
-        sizer_6_absm1_copy.Add(self._1_X_N_copy_9, 1, wx.EXPAND, 0)
-        sizer_6_absm1_copy.Add(self._0_N_F_copy_9, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy.Add(self._1_N_F_copy_9, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy.Add(self._0_X_F_copy_9, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy.Add(self._1_X_F_copy_9, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_absm1_copy, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy.Add(self._0_N_N_copy_10, 0, 0, 0)
-        sizer_6_m1dlg_copy.Add(self._1_N_N_copy_10, 1, 0, 0)
-        sizer_6_m1dlg_copy.Add(self._0_X_N_copy_10, 0, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy.Add(self._1_X_N_copy_10, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy.Add(self._0_N_F_copy_10, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy.Add(self._1_N_F_copy_10, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy.Add(self._0_X_F_copy_10, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy.Add(self._1_X_F_copy_10, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_m1dlg_copy, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy.Add(self._0_N_N_copy_11, 0, 0, 0)
-        sizer_6_dlgm1_copy.Add(self._1_N_N_copy_11, 1, 0, 0)
-        sizer_6_dlgm1_copy.Add(self._0_X_N_copy_11, 0, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy.Add(self._1_X_N_copy_11, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy.Add(self._0_N_F_copy_11, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy.Add(self._1_N_F_copy_11, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy.Add(self._0_X_F_copy_11, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy.Add(self._1_X_F_copy_11, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_dlgm1_copy, 1, wx.EXPAND, 0)
-        self.notebook_1_StaticBoxSizer.SetSizer(sizer_3)
-        sizer_4.Add(self._0_N_N_copy_12, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_12, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_12, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_12, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_12, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_12, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_12, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_12, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_copy_copy, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_copy_copy, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_copy_copy, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_copy_copy, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_13, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_13, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_13, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_13, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_13, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_13, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_13, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_13, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_14, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_14, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_14, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_14, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_14, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_14, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_14, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_14, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_15, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_15, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_15, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_15, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_15, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_15, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_15, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_15, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_16, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_16, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_16, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_16, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_16, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_16, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_16, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_16, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_17, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_17, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_17, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_17, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_17, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_17, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_17, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_17, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        self.notebook_1_GridSizer.SetSizer(sizer_4)
-        sizer_5.Add(self._0_N_N_copy_18, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_18, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_18, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_18, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_18, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_18, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_18, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_18, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_copy_copy_copy, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_copy_copy_copy, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_copy_copy_copy, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_copy_copy_copy, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_19, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_19, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_19, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_19, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_19, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_19, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_19, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_19, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_20, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_20, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_20, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_20, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_20, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_20, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_20, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_20, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_21, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_21, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_21, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_21, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_21, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_21, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_21, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_21, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_22, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_22, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_22, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_22, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_22, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_22, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_22, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_22, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_23, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_23, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_23, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_23, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_23, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_23, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_23, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_23, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        self.notebook_1_FlexGridSizer.SetSizer(sizer_5)
-        sizer_5.AddGrowableRow(2)
-        sizer_5.AddGrowableRow(5)
-        sizer_5.AddGrowableCol(1)
-        sizer_5.AddGrowableCol(7)
-        sizer_6.Add(self._0_N_N_copy_24, (0, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_24, (0, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_24, (0, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_24, (0, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_24, (0, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_24, (0, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_24, (0, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_24, (0, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_copy_copy_copy_copy, (1, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_copy_copy_copy_copy, (1, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_copy_copy_copy_copy, (1, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_copy_copy_copy_copy, (1, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_copy_copy_copy_copy, (1, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_copy_copy_copy_copy, (1, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_copy_copy_copy_copy, (1, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_copy_copy_copy_copy, (1, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_25, (2, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_25, (2, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_25, (2, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_25, (2, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_25, (2, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_25, (2, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_25, (2, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_25, (2, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+        self._0_N_N_copy_26.SetMinSize((-1, 21))
         sizer_6.Add(self._0_N_N_copy_26, (3, 0), (1, 1), 0, 0)
+
+        self._1_N_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_26.SetMinSize((-1, 21))
         sizer_6.Add(self._1_N_N_copy_26, (3, 1), (1, 1), 0, 0)
+
+        self._0_X_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_26.SetMinSize((-1, 21))
         sizer_6.Add(self._0_X_N_copy_26, (3, 2), (1, 1), wx.EXPAND, 0)
+
+        self._1_X_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_26.SetMinSize((-1, 21))
         sizer_6.Add(self._1_X_N_copy_26, (3, 3), (1, 1), wx.EXPAND, 0)
+
+        self._0_N_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_26.SetMinSize((-1, 21))
         sizer_6.Add(self._0_N_F_copy_26, (3, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._1_N_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_26.SetMinSize((-1, 21))
         sizer_6.Add(self._1_N_F_copy_26, (3, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_26.SetMinSize((-1, 21))
         sizer_6.Add(self._0_X_F_copy_26, (3, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._1_X_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_26.SetMinSize((-1, 21))
         sizer_6.Add(self._1_X_F_copy_26, (3, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._0_N_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_27.SetMinSize((100, -1))
         sizer_6.Add(self._0_N_N_copy_27, (4, 0), (1, 1), 0, 0)
+
+        self._1_N_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_27.SetMinSize((100, -1))
         sizer_6.Add(self._1_N_N_copy_27, (4, 1), (1, 1), 0, 0)
+
+        self._0_X_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_27.SetMinSize((100, -1))
         sizer_6.Add(self._0_X_N_copy_27, (4, 2), (1, 1), wx.EXPAND, 0)
+
+        self._1_X_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_27.SetMinSize((100, -1))
         sizer_6.Add(self._1_X_N_copy_27, (4, 3), (1, 1), wx.EXPAND, 0)
+
+        self._0_N_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_27.SetMinSize((100, -1))
         sizer_6.Add(self._0_N_F_copy_27, (4, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._1_N_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_27.SetMinSize((100, -1))
         sizer_6.Add(self._1_N_F_copy_27, (4, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_27.SetMinSize((100, -1))
         sizer_6.Add(self._0_X_F_copy_27, (4, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._1_X_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_27.SetMinSize((100, -1))
         sizer_6.Add(self._1_X_F_copy_27, (4, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._0_N_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_28.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_28, (-1, 100)))
         sizer_6.Add(self._0_N_N_copy_28, (5, 0), (1, 1), 0, 0)
+
+        self._1_N_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_28.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_28, (-1, 100)))
         sizer_6.Add(self._1_N_N_copy_28, (5, 1), (1, 1), 0, 0)
+
+        self._0_X_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_28.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_28, (-1, 100)))
         sizer_6.Add(self._0_X_N_copy_28, (5, 2), (1, 1), wx.EXPAND, 0)
+
+        self._1_X_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_28.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_28, (-1, 100)))
         sizer_6.Add(self._1_X_N_copy_28, (5, 3), (1, 1), wx.EXPAND, 0)
+
+        self._0_N_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_28.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_28, (-1, 100)))
         sizer_6.Add(self._0_N_F_copy_28, (5, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._1_N_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_28.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_28, (-1, 100)))
         sizer_6.Add(self._1_N_F_copy_28, (5, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
         sizer_6.Add(self._0_X_F_copy_28, (5, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._1_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
         sizer_6.Add(self._1_X_F_copy_28, (5, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._0_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_29.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_29, (100, -1)))
         sizer_6.Add(self._0_N_N_copy_29, (6, 0), (1, 1), 0, 0)
+
+        self._1_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_29.SetMinSize(wx.DLG_SZE(self._1_N_N_copy_29, (100, -1)))
         sizer_6.Add(self._1_N_N_copy_29, (6, 1), (1, 1), 0, 0)
+
+        self._0_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_29.SetMinSize(wx.DLG_SZE(self._0_X_N_copy_29, (100, -1)))
         sizer_6.Add(self._0_X_N_copy_29, (6, 2), (1, 1), wx.EXPAND, 0)
+
+        self._1_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_29.SetMinSize(wx.DLG_SZE(self._1_X_N_copy_29, (100, -1)))
         sizer_6.Add(self._1_X_N_copy_29, (6, 3), (1, 1), wx.EXPAND, 0)
+
+        self._0_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_29.SetMinSize(wx.DLG_SZE(self._0_N_F_copy_29, (100, -1)))
         sizer_6.Add(self._0_N_F_copy_29, (6, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._1_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_29.SetMinSize(wx.DLG_SZE(self._1_N_F_copy_29, (100, -1)))
         sizer_6.Add(self._1_N_F_copy_29, (6, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_29.SetMinSize(wx.DLG_SZE(self._0_X_F_copy_29, (100, -1)))
         sizer_6.Add(self._0_X_F_copy_29, (6, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._1_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_29.SetMinSize(wx.DLG_SZE(self._1_X_F_copy_29, (100, -1)))
         sizer_6.Add(self._1_X_F_copy_29, (6, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        self.notebook_1_GridBagSizer.SetSizer(sizer_6)
-        sizer_6.AddGrowableRow(2)
-        sizer_6.AddGrowableRow(5)
-        sizer_6.AddGrowableCol(1)
-        sizer_6.AddGrowableCol(7)
+
+        self.notebook_1_BorderTest = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_BorderTest, _("BorderTest"))
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_border_10_none = wx.BoxSizer(wx.VERTICAL)
+        sizer_7.Add(sizer_border_10_none, 1, wx.EXPAND, 10)
+
+        self._0_N_N_border_10_none = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._0_N_N_border_10_none, 0, 0, 10)
+
+        self._1_N_N_border_0_all = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._1_N_N_border_0_all, 1, wx.ALL, 0)
+
+        self._0_X_N_border_5_LEFTRIGHT = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._0_X_N_border_5_LEFTRIGHT, 0, wx.EXPAND | wx.LEFT | wx.RIGHT, 5)
+
+        self._1_X_N_border_15_BOTTOM = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._1_X_N_border_15_BOTTOM, 1, wx.BOTTOM | wx.EXPAND, 15)
-        sizer_7.Add(sizer_border_10_none, 1, wx.EXPAND, 10)
-        sizer_border_0_ALL.Add(self._0_N_N_copy_copy_1, 0, 0, 0)
+
+        sizer_border_0_ALL = wx.BoxSizer(wx.VERTICAL)
         sizer_7.Add(sizer_border_0_ALL, 1, wx.ALL | wx.EXPAND, 0)
-        sizer_border_5_LEFTRIGHT.Add(self._0_N_N_copy_31, 0, 0, 0)
+
+        self._0_N_N_copy_copy_1 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_1.SetMinSize((100, 21))
+        sizer_border_0_ALL.Add(self._0_N_N_copy_copy_1, 0, 0, 0)
+
+        sizer_border_5_LEFTRIGHT = wx.BoxSizer(wx.VERTICAL)
         sizer_7.Add(sizer_border_5_LEFTRIGHT, 1, wx.LEFT | wx.RIGHT, 5)
-        sizer_border_15_BOTTOM.Add(self._0_N_N_copy_32, 0, 0, 0)
+
+        self._0_N_N_copy_31 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
+        self._0_N_N_copy_31.SetMinSize(wx.DLG_SZE(self._0_N_N_copy_31, (100, 21)))
+        sizer_border_5_LEFTRIGHT.Add(self._0_N_N_copy_31, 0, 0, 0)
+
+        sizer_border_15_BOTTOM = wx.BoxSizer(wx.VERTICAL)
         sizer_7.Add(sizer_border_15_BOTTOM, 1, 0, 15)
+
+        self._0_N_N_copy_32 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
+        self._0_N_N_copy_32.SetMinSize((-1, 21))
+        sizer_border_15_BOTTOM.Add(self._0_N_N_copy_32, 0, 0, 0)
+
         self.notebook_1_BorderTest.SetSizer(sizer_7)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("BoxSizer"))
-        self.notebook_1.AddPage(self.notebook_1_StaticBoxSizer, _("StaticBoxSizer"))
-        self.notebook_1.AddPage(self.notebook_1_GridSizer, _("GridSizer"))
-        self.notebook_1.AddPage(self.notebook_1_FlexGridSizer, _("FlexGridSizer"))
-        self.notebook_1.AddPage(self.notebook_1_GridBagSizer, _("GridBagSizer"))
-        self.notebook_1.AddPage(self.notebook_1_BorderTest, _("BorderTest"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
+        sizer_6.AddGrowableRow(2)
+        sizer_6.AddGrowableRow(5)
+        sizer_6.AddGrowableCol(1)
+        sizer_6.AddGrowableCol(7)
+        self.notebook_1_GridBagSizer.SetSizer(sizer_6)
+
+        sizer_5.AddGrowableRow(2)
+        sizer_5.AddGrowableRow(5)
+        sizer_5.AddGrowableCol(1)
+        sizer_5.AddGrowableCol(7)
+        self.notebook_1_FlexGridSizer.SetSizer(sizer_5)
+
+        self.notebook_1_GridSizer.SetSizer(sizer_4)
+
+        self.notebook_1_StaticBoxSizer.SetSizer(sizer_3)
+
+        self.notebook_1_pane_1.SetSizer(sizer_2)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests_nowrap_Saved.wxg wxglade-1.0.1/tests/casefiles/SizersSizeTests_nowrap_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests_nowrap_Saved.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests_nowrap_Saved.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,2340 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.8.1 on Sat Apr 14 20:01:59 2018 -->
+
+<application class="App" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="App" option="0" overwrite="1" path="SizersSizeTests.py" source_extension=".cpp" top_window="frame" use_gettext="1" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>600, 400</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="wxNotebook" name="notebook_1" base="EditNotebook">
+                    <style>wxNB_TOP</style>
+                    <tabs>
+                        <tab window="notebook_1_pane_1">BoxSizer</tab>
+                        <tab window="notebook_1_StaticBoxSizer">StaticBoxSizer</tab>
+                        <tab window="notebook_1_GridSizer">GridSizer</tab>
+                        <tab window="notebook_1_FlexGridSizer">FlexGridSizer</tab>
+                        <tab window="notebook_1_GridBagSizer">GridBagSizer</tab>
+                        <tab window="notebook_1_BorderTest">BorderTest</tab>
+                    </tabs>
+                    <object class="wxPanel" name="notebook_1_pane_1" base="EditPanel">
+                        <style>wxTAB_TRAVERSAL</style>
+                        <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxBoxSizer" name="sizer_3_nosize" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxBoxSizer" name="sizer_4_abs" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxBoxSizer" name="sizer_5_dlg" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_1" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_1" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_1" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_1" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_1" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_1" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_1" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_1" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxBoxSizer" name="sizer_6_m1abs" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_2" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_2" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_2" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_2" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_2" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_2" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_2" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_2" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxBoxSizer" name="sizer_6_absm1" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_3" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_3" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_3" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_3" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_3" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_3" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_3" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_3" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxBoxSizer" name="sizer_6_m1dlg" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_4" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_4" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_4" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_4" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_4" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_4" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_4" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_4" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxBoxSizer" name="sizer_6_dlgm1" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_5" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_5" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_5" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_5" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_5" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_5" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_5" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_5" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="wxPanel" name="notebook_1_StaticBoxSizer" base="EditPanel">
+                        <style>wxTAB_TRAVERSAL</style>
+                        <object class="wxBoxSizer" name="sizer_3" base="EditBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxStaticBoxSizer" name="sizer_3_nosize_copy" base="EditStaticBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <label>sizer_3_nosize_copy</label>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_6" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_6" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_6" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_6" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_6" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_6" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_6" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_6" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxStaticBoxSizer" name="sizer_4_abs_copy" base="EditStaticBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <label>sizer_4_abs_copy</label>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_copy" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxStaticBoxSizer" name="sizer_5_dlg_copy" base="EditStaticBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <label>sizer_5_dlg_copy</label>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_7" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_7" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_7" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_7" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_7" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_7" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_7" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_7" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxStaticBoxSizer" name="sizer_6_m1abs_copy" base="EditStaticBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <label>sizer_6_m1abs_copy</label>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_8" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_8" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_8" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_8" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_8" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_8" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_8" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_8" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxStaticBoxSizer" name="sizer_6_absm1_copy" base="EditStaticBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <label>sizer_6_absm1_copy</label>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_9" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_9" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_9" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_9" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_9" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_9" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_9" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_9" base="EditTextCtrl">
+                                            <size>100, -1</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxStaticBoxSizer" name="sizer_6_m1dlg_copy" base="EditStaticBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <label>sizer_6_m1dlg_copy</label>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_10" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_10" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_10" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_10" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_10" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_10" base="EditTextCtrl">
+                                            <size>-1, 100d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_10" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_10" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxStaticBoxSizer" name="sizer_6_dlgm1_copy" base="EditStaticBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <label>sizer_6_dlgm1_copy</label>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_11" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_1_N_N_copy_11" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_copy_11" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_copy_11" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_N_F_copy_11" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_N_F_copy_11" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_0_X_F_copy_11" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                        <object class="wxTextCtrl" name="_1_X_F_copy_11" base="EditTextCtrl">
+                                            <size>100, -1d</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="wxPanel" name="notebook_1_GridSizer" base="EditPanel">
+                        <style>wxTAB_TRAVERSAL</style>
+                        <object class="wxGridSizer" name="sizer_4" base="EditGridSizer">
+                            <rows>7</rows>
+                            <cols>8</cols>
+                            <vgap>0</vgap>
+                            <hgap>0</hgap>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_12" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_12" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_12" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_12" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_12" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_12" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_12" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_12" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_13" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_13" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_13" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_13" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_13" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_13" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_13" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_13" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_14" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_14" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_14" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_14" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_14" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_14" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_14" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_14" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_15" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_15" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_15" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_15" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_15" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_15" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_15" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_15" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_16" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_16" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_16" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_16" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_16" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_16" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_16" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_16" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_17" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_17" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_17" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_17" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_17" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_17" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_17" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_17" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="wxPanel" name="notebook_1_FlexGridSizer" base="EditPanel">
+                        <style>wxTAB_TRAVERSAL</style>
+                        <object class="wxFlexGridSizer" name="sizer_5" base="EditFlexGridSizer">
+                            <rows>7</rows>
+                            <cols>8</cols>
+                            <vgap>1</vgap>
+                            <hgap>1</hgap>
+                            <growable_rows>2,5</growable_rows>
+                            <growable_cols>1,7</growable_cols>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_18" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_18" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_18" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_18" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_18" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_18" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_18" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_18" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_19" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_19" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_19" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_19" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_19" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_19" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_19" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_19" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_20" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_20" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_20" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_20" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_20" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_20" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_20" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_20" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_21" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_21" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_21" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_21" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_21" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_21" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_21" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_21" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_22" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_22" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_22" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_22" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_22" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_22" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_22" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_22" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_23" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_23" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_23" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_23" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_23" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_23" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_23" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_23" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="wxPanel" name="notebook_1_GridBagSizer" base="EditPanel">
+                        <style>wxTAB_TRAVERSAL</style>
+                        <object class="wxGridBagSizer" name="sizer_6" base="EditGridBagSizer">
+                            <rows>7</rows>
+                            <cols>8</cols>
+                            <vgap>1</vgap>
+                            <hgap>1</hgap>
+                            <growable_rows>2,5</growable_rows>
+                            <growable_cols>1,7</growable_cols>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_24" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_24" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_24" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_24" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_24" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_24" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_24" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_24" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_copy_copy_copy_copy" base="EditTextCtrl">
+                                    <size>100, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_25" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_25" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_25" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_25" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_25" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_25" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_25" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_25" base="EditTextCtrl">
+                                    <size>100, 21d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_26" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_26" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_26" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_26" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_26" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_26" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_26" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_26" base="EditTextCtrl">
+                                    <size>-1, 21</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_27" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_27" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_27" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_27" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_27" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_27" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_27" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_27" base="EditTextCtrl">
+                                    <size>100, -1</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_28" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_28" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_28" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_28" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_28" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_28" base="EditTextCtrl">
+                                    <size>-1, 100d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_28" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_28" base="EditTextCtrl">
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_0_N_N_copy_29" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <object class="wxTextCtrl" name="_1_N_N_copy_29" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_0_X_N_copy_29" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="_1_X_N_copy_29" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_N_F_copy_29" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_N_F_copy_29" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_0_X_F_copy_29" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <border>0</border>
+                                <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <object class="wxTextCtrl" name="_1_X_F_copy_29" base="EditTextCtrl">
+                                    <size>100, -1d</size>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="wxPanel" name="notebook_1_BorderTest" base="EditPanel">
+                        <style>wxTAB_TRAVERSAL</style>
+                        <object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>10</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxBoxSizer" name="sizer_border_10_none" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>10</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_border_10_none" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>0</border>
+                                        <flag>wxALL</flag>
+                                        <object class="wxTextCtrl" name="_1_N_N_border_0_all" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>5</border>
+                                        <flag>wxLEFT|wxRIGHT|wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_0_X_N_border_5_LEFTRIGHT" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <option>1</option>
+                                        <border>15</border>
+                                        <flag>wxBOTTOM|wxEXPAND</flag>
+                                        <object class="wxTextCtrl" name="_1_X_N_border_15_BOTTOM" base="EditTextCtrl">
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxALL|wxEXPAND</flag>
+                                <object class="wxBoxSizer" name="sizer_border_0_ALL" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_copy_1" base="EditTextCtrl">
+                                            <size>100, 21</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>5</border>
+                                <flag>wxLEFT|wxRIGHT</flag>
+                                <object class="wxBoxSizer" name="sizer_border_5_LEFTRIGHT" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_31" base="EditTextCtrl">
+                                            <size>100, 21d</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>15</border>
+                                <object class="wxBoxSizer" name="sizer_border_15_BOTTOM" base="EditBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <object class="sizeritem">
+                                        <option>0</option>
+                                        <border>0</border>
+                                        <object class="wxTextCtrl" name="_0_N_N_copy_32" base="EditTextCtrl">
+                                            <size>-1, 21</size>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests_nowrap.wxg wxglade-1.0.1/tests/casefiles/SizersSizeTests_nowrap.wxg
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests_nowrap.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests_nowrap.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -2320,6 +2320,7 @@
                             <object class="sizeritem">
                                 <option>1</option>
                                 <border>15</border>
+                                <flag>wxALIGN_RIGHT</flag>
                                 <object class="wxBoxSizer" name="sizer_border_15_BOTTOM" base="EditBoxSizer">
                                     <orient>wxVERTICAL</orient>
                                     <object class="sizeritem">
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests_Phoenix.py wxglade-1.0.1/tests/casefiles/SizersSizeTests_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -20,1084 +20,1472 @@
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((600, 400))
+        self.SetTitle(_("frame"))
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         self.notebook_1 = wx.Notebook(self, wx.ID_ANY)
+        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+
         self.notebook_1_pane_1 = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_pane_1, _("BoxSizer"))
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_3_nosize = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_3_nosize, 1, wx.EXPAND, 0)
+
         self._0_N_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_N_N, 0, 0, 0)
+
         self._1_N_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_N_N, 1, 0, 0)
+
         self._0_X_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_X_N, 0, wx.EXPAND, 0)
+
         self._1_X_N = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_X_N, 1, wx.EXPAND, 0)
+
         self._0_N_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_N_F, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_N_F, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._0_X_F, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_3_nosize.Add(self._1_X_F, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_4_abs = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_4_abs, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_N_N_copy, 0, 0, 0)
+
         self._1_N_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_N_N_copy, 1, 0, 0)
+
         self._0_X_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_X_N_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_X_N_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_N_F_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_N_F_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._0_X_F_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy.SetMinSize((100, 21))
+        sizer_4_abs.Add(self._1_X_F_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_5_dlg = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_5_dlg, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_1.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg.Add(self._0_N_N_copy_1, 0, 0, 0)
+
         self._1_N_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_1.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg.Add(self._1_N_N_copy_1, 1, 0, 0)
+
         self._0_X_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_1.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg.Add(self._0_X_N_copy_1, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_1.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg.Add(self._1_X_N_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_1.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg.Add(self._0_N_F_copy_1, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_1.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg.Add(self._1_N_F_copy_1, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_1.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg.Add(self._0_X_F_copy_1, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_1 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_1.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg.Add(self._1_X_F_copy_1, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1abs = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_m1abs, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_N_N_copy_2, 0, 0, 0)
+
         self._1_N_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_N_N_copy_2, 1, 0, 0)
+
         self._0_X_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_X_N_copy_2, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_X_N_copy_2, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_N_F_copy_2, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_N_F_copy_2, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._0_X_F_copy_2, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_2 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs.Add(self._1_X_F_copy_2, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_absm1 = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_absm1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_N_N_copy_3, 0, 0, 0)
+
         self._1_N_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_N_N_copy_3, 1, 0, 0)
+
         self._0_X_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_X_N_copy_3, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_X_N_copy_3, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_N_F_copy_3, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_N_F_copy_3, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._0_X_F_copy_3, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_3 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1.Add(self._1_X_F_copy_3, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1dlg = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_m1dlg, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_4.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg.Add(self._0_N_N_copy_4, 0, 0, 0)
+
         self._1_N_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_4.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg.Add(self._1_N_N_copy_4, 1, 0, 0)
+
         self._0_X_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_4.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg.Add(self._0_X_N_copy_4, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_4.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg.Add(self._1_X_N_copy_4, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_4.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg.Add(self._0_N_F_copy_4, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_4.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg.Add(self._1_N_F_copy_4, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_6_m1dlg.Add(self._0_X_F_copy_4, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_4 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        sizer_6_m1dlg.Add(self._1_X_F_copy_4, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_dlgm1 = wx.BoxSizer(wx.VERTICAL)
+        sizer_2.Add(sizer_6_dlgm1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_N_copy_5.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1.Add(self._0_N_N_copy_5, 0, 0, 0)
+
         self._1_N_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_N_copy_5.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1.Add(self._1_N_N_copy_5, 1, 0, 0)
+
         self._0_X_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_N_copy_5.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1.Add(self._0_X_N_copy_5, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_N_copy_5.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1.Add(self._1_X_N_copy_5, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_N_F_copy_5.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1.Add(self._0_N_F_copy_5, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_N_F_copy_5.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1.Add(self._1_N_F_copy_5, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._0_X_F_copy_5.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1.Add(self._0_X_F_copy_5, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_5 = wx.TextCtrl(self.notebook_1_pane_1, wx.ID_ANY, "")
+        self._1_X_F_copy_5.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1.Add(self._1_X_F_copy_5, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_WrapSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_WrapSizer, _("WrapSizer"))
+
+        sizer_8 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_3_nosize_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_3_nosize_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._0_N_N_copy_30, 0, 0, 0)
+
         self._1_N_N_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._1_N_N_copy_30, 1, 0, 0)
+
         self._0_X_N_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._0_X_N_copy_30, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._1_X_N_copy_30, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._0_N_F_copy_30, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._1_N_F_copy_30, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._0_X_F_copy_30, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy_1.Add(self._1_X_F_copy_30, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_4_abs_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_4_abs_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._0_N_N_copy_30_copy, 0, 0, 0)
+
         self._1_N_N_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._1_N_N_copy_30_copy, 1, 0, 0)
+
         self._0_X_N_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._0_X_N_copy_30_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._1_X_N_copy_30_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._0_N_F_copy_30_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._1_N_F_copy_30_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._0_X_F_copy_30_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_30_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy_1.Add(self._1_X_F_copy_30_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_5_dlg_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_5_dlg_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_30_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg_copy_1.Add(self._0_N_N_copy_30_copy_1, 0, 0, 0)
+
         self._1_N_N_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_30_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg_copy_1.Add(self._1_N_N_copy_30_copy_1, 1, 0, 0)
+
         self._0_X_N_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_30_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg_copy_1.Add(self._0_X_N_copy_30_copy_1, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_30_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg_copy_1.Add(self._1_X_N_copy_30_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
-        self._1_N_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_30_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg_copy_1.Add(self._0_N_F_copy_30_copy_1, 0, wx.FIXED_MINSIZE, 0)
+
+        self._1_N_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_30_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg_copy_1.Add(self._1_N_F_copy_30_copy_1, 1, wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_30_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg_copy_1.Add(self._0_X_F_copy_30_copy_1, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy_1 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_30_copy_1, wx.Size(100, 21)))
+        sizer_5_dlg_copy_1.Add(self._1_X_F_copy_30_copy_1, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1abs_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_6_m1abs_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._0_N_N_copy_30_copy_2, 0, 0, 0)
+
         self._1_N_N_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._1_N_N_copy_30_copy_2, 1, 0, 0)
+
         self._0_X_N_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._0_X_N_copy_30_copy_2, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._1_X_N_copy_30_copy_2, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._0_N_F_copy_30_copy_2, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._1_N_F_copy_30_copy_2, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._0_X_F_copy_30_copy_2, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy_2 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_30_copy_2.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy_1.Add(self._1_X_F_copy_30_copy_2, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_absm1_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_6_absm1_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._0_N_N_copy_30_copy_3, 0, 0, 0)
+
         self._1_N_N_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._1_N_N_copy_30_copy_3, 1, 0, 0)
+
         self._0_X_N_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._0_X_N_copy_30_copy_3, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._1_X_N_copy_30_copy_3, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._0_N_F_copy_30_copy_3, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._1_N_F_copy_30_copy_3, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._0_X_F_copy_30_copy_3, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy_3 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_30_copy_3.SetMinSize((100, -1))
+        sizer_6_absm1_copy_1.Add(self._1_X_F_copy_30_copy_3, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1dlg_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_6_m1dlg_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_30_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._0_N_N_copy_30_copy_4, 0, 0, 0)
+
         self._1_N_N_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_30_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._1_N_N_copy_30_copy_4, 1, 0, 0)
+
         self._0_X_N_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_30_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._0_X_N_copy_30_copy_4, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_30_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._1_X_N_copy_30_copy_4, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_30_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._0_N_F_copy_30_copy_4, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_30_copy_4, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy_1.Add(self._1_N_F_copy_30_copy_4, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_6_m1dlg_copy_1.Add(self._0_X_F_copy_30_copy_4, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy_4 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        sizer_6_m1dlg_copy_1.Add(self._1_X_F_copy_30_copy_4, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_dlgm1_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
+        sizer_8.Add(sizer_6_dlgm1_copy_1, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_30_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._0_N_N_copy_30_copy_5, 0, 0, 0)
+
         self._1_N_N_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_30_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._1_N_N_copy_30_copy_5, 1, 0, 0)
+
         self._0_X_N_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_30_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._0_X_N_copy_30_copy_5, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_30_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._1_X_N_copy_30_copy_5, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_30_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._0_N_F_copy_30_copy_5, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_30_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._1_N_F_copy_30_copy_5, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_30_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._0_X_F_copy_30_copy_5, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_30_copy_5 = wx.TextCtrl(self.notebook_1_WrapSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_30_copy_5, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy_1.Add(self._1_X_F_copy_30_copy_5, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_StaticBoxSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_StaticBoxSizer, _("StaticBoxSizer"))
+
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_3_nosize_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_3_nosize_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_3_nosize_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_N_N_copy_6, 0, 0, 0)
+
         self._1_N_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_N_N_copy_6, 1, 0, 0)
+
         self._0_X_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_X_N_copy_6, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_X_N_copy_6, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_N_F_copy_6, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_N_F_copy_6, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._0_X_F_copy_6, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_6 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_3_nosize_copy.Add(self._1_X_F_copy_6, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_4_abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_4_abs_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_4_abs_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_N_N_copy_copy, 0, 0, 0)
+
         self._1_N_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_N_N_copy_copy, 1, 0, 0)
+
         self._0_X_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_X_N_copy_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_X_N_copy_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_N_F_copy_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_N_F_copy_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._0_X_F_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy.SetMinSize((100, 21))
+        sizer_4_abs_copy.Add(self._1_X_F_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_5_dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_5_dlg_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_5_dlg_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_7.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_7, wx.Size(100, 21)))
+        sizer_5_dlg_copy.Add(self._0_N_N_copy_7, 0, 0, 0)
+
         self._1_N_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_7.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_7, wx.Size(100, 21)))
+        sizer_5_dlg_copy.Add(self._1_N_N_copy_7, 1, 0, 0)
+
         self._0_X_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_7.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_7, wx.Size(100, 21)))
+        sizer_5_dlg_copy.Add(self._0_X_N_copy_7, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_7.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_7, wx.Size(100, 21)))
+        sizer_5_dlg_copy.Add(self._1_X_N_copy_7, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_7.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_7, wx.Size(100, 21)))
+        sizer_5_dlg_copy.Add(self._0_N_F_copy_7, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_7.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_7, wx.Size(100, 21)))
+        sizer_5_dlg_copy.Add(self._1_N_F_copy_7, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_7.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_7, wx.Size(100, 21)))
+        sizer_5_dlg_copy.Add(self._0_X_F_copy_7, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_7 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_7.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_7, wx.Size(100, 21)))
+        sizer_5_dlg_copy.Add(self._1_X_F_copy_7, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1abs_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_m1abs_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_N_N_copy_8, 0, 0, 0)
+
         self._1_N_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_N_N_copy_8, 1, 0, 0)
+
         self._0_X_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_X_N_copy_8, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_X_N_copy_8, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_N_F_copy_8, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_N_F_copy_8, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._0_X_F_copy_8, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_8 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_8.SetMinSize((-1, 21))
+        sizer_6_m1abs_copy.Add(self._1_X_F_copy_8, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_absm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_absm1_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_absm1_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_N_N_copy_9, 0, 0, 0)
+
         self._1_N_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_N_N_copy_9, 1, 0, 0)
+
         self._0_X_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_X_N_copy_9, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_X_N_copy_9, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_N_F_copy_9, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_N_F_copy_9, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._0_X_F_copy_9, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_9 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_9.SetMinSize((100, -1))
+        sizer_6_absm1_copy.Add(self._1_X_F_copy_9, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_m1dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1dlg_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_m1dlg_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
-        self._1_N_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
-        self._0_X_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_10.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_10, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._0_N_N_copy_10, 0, 0, 0)
+
+        self._1_N_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_10.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_10, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._1_N_N_copy_10, 1, 0, 0)
+
+        self._0_X_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_10.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_10, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._0_X_N_copy_10, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_10.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_10, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._1_X_N_copy_10, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_10.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_10, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._0_N_F_copy_10, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_10.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_10, wx.Size(-1, 100)))
+        sizer_6_m1dlg_copy.Add(self._1_N_F_copy_10, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_6_m1dlg_copy.Add(self._0_X_F_copy_10, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_10 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        sizer_6_m1dlg_copy.Add(self._1_X_F_copy_10, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        sizer_6_dlgm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_dlgm1_copy")), wx.VERTICAL)
+        sizer_3.Add(sizer_6_dlgm1_copy, 1, wx.EXPAND, 0)
+
         self._0_N_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_11.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_11, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_N_N_copy_11, 0, 0, 0)
+
         self._1_N_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_11.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_11, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_N_N_copy_11, 1, 0, 0)
+
         self._0_X_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_11.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_11, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_X_N_copy_11, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_11.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_11, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_X_N_copy_11, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_11.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_11, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_N_F_copy_11, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_11.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_11, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_N_F_copy_11, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_11.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_11, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy.Add(self._0_X_F_copy_11, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_11 = wx.TextCtrl(self.notebook_1_StaticBoxSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_11.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_11, wx.Size(100, -1)))
+        sizer_6_dlgm1_copy.Add(self._1_X_F_copy_11, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_GridSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_GridSizer, _("GridSizer"))
+
+        sizer_4 = wx.GridSizer(7, 8, 0, 0)
+
         self._0_N_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_N_N_copy_12, 0, 0, 0)
+
         self._1_N_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_N_N_copy_12, 1, 0, 0)
+
         self._0_X_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_X_N_copy_12, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_X_N_copy_12, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_N_F_copy_12, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_N_F_copy_12, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_X_F_copy_12, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_12 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_X_F_copy_12, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_N_N_copy_copy_copy, 0, 0, 0)
+
         self._1_N_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_N_N_copy_copy_copy, 1, 0, 0)
+
         self._0_X_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_X_N_copy_copy_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_X_N_copy_copy_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_N_F_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_N_F_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._0_X_F_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy_copy.SetMinSize((100, 21))
+        sizer_4.Add(self._1_X_F_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_13.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_13, wx.Size(100, 21)))
+        sizer_4.Add(self._0_N_N_copy_13, 0, 0, 0)
+
         self._1_N_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_13.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_13, wx.Size(100, 21)))
+        sizer_4.Add(self._1_N_N_copy_13, 1, 0, 0)
+
         self._0_X_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_13.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_13, wx.Size(100, 21)))
+        sizer_4.Add(self._0_X_N_copy_13, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_13.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_13, wx.Size(100, 21)))
+        sizer_4.Add(self._1_X_N_copy_13, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_13.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_13, wx.Size(100, 21)))
+        sizer_4.Add(self._0_N_F_copy_13, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_13.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_13, wx.Size(100, 21)))
+        sizer_4.Add(self._1_N_F_copy_13, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_13.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_13, wx.Size(100, 21)))
+        sizer_4.Add(self._0_X_F_copy_13, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_13 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_13.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_13, wx.Size(100, 21)))
+        sizer_4.Add(self._1_X_F_copy_13, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_N_N_copy_14, 0, 0, 0)
+
         self._1_N_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_N_N_copy_14, 1, 0, 0)
+
         self._0_X_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_X_N_copy_14, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_X_N_copy_14, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_N_F_copy_14, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_N_F_copy_14, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._0_X_F_copy_14, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_14 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_14.SetMinSize((-1, 21))
+        sizer_4.Add(self._1_X_F_copy_14, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_N_N_copy_15, 0, 0, 0)
+
         self._1_N_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_N_N_copy_15, 1, 0, 0)
+
         self._0_X_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_X_N_copy_15, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_X_N_copy_15, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_N_F_copy_15, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_N_F_copy_15, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._0_X_F_copy_15, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_15 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_15.SetMinSize((100, -1))
+        sizer_4.Add(self._1_X_F_copy_15, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_16.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_16, wx.Size(-1, 100)))
+        sizer_4.Add(self._0_N_N_copy_16, 0, 0, 0)
+
         self._1_N_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_16.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_16, wx.Size(-1, 100)))
+        sizer_4.Add(self._1_N_N_copy_16, 1, 0, 0)
+
         self._0_X_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_16.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_16, wx.Size(-1, 100)))
+        sizer_4.Add(self._0_X_N_copy_16, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_16.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_16, wx.Size(-1, 100)))
+        sizer_4.Add(self._1_X_N_copy_16, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_16.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_16, wx.Size(-1, 100)))
+        sizer_4.Add(self._0_N_F_copy_16, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_16.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_16, wx.Size(-1, 100)))
+        sizer_4.Add(self._1_N_F_copy_16, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._0_X_F_copy_16, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_16 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        sizer_4.Add(self._1_X_F_copy_16, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_17.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_17, wx.Size(100, -1)))
+        sizer_4.Add(self._0_N_N_copy_17, 0, 0, 0)
+
         self._1_N_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_17.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_17, wx.Size(100, -1)))
+        sizer_4.Add(self._1_N_N_copy_17, 1, 0, 0)
+
         self._0_X_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_17.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_17, wx.Size(100, -1)))
+        sizer_4.Add(self._0_X_N_copy_17, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_17.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_17, wx.Size(100, -1)))
+        sizer_4.Add(self._1_X_N_copy_17, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_17.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_17, wx.Size(100, -1)))
+        sizer_4.Add(self._0_N_F_copy_17, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_17.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_17, wx.Size(100, -1)))
+        sizer_4.Add(self._1_N_F_copy_17, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_17.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_17, wx.Size(100, -1)))
+        sizer_4.Add(self._0_X_F_copy_17, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_17 = wx.TextCtrl(self.notebook_1_GridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_17.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_17, wx.Size(100, -1)))
+        sizer_4.Add(self._1_X_F_copy_17, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_FlexGridSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_FlexGridSizer, _("FlexGridSizer"))
+
+        sizer_5 = wx.FlexGridSizer(7, 8, 1, 1)
+
         self._0_N_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_N_N_copy_18, 0, 0, 0)
+
         self._1_N_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_N_N_copy_18, 1, 0, 0)
+
         self._0_X_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_X_N_copy_18, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_X_N_copy_18, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_N_F_copy_18, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_N_F_copy_18, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_X_F_copy_18, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_18 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_X_F_copy_18, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_N_N_copy_copy_copy_copy, 0, 0, 0)
+
         self._1_N_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_N_N_copy_copy_copy_copy, 1, 0, 0)
+
         self._0_X_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_X_N_copy_copy_copy_copy, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_X_N_copy_copy_copy_copy, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_N_F_copy_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_N_F_copy_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._0_X_F_copy_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
-        self._0_N_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
-        self._1_N_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_5.Add(self._1_X_F_copy_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._0_N_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_19.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_19, wx.Size(100, 21)))
+        sizer_5.Add(self._0_N_N_copy_19, 0, 0, 0)
+
+        self._1_N_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_19.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_19, wx.Size(100, 21)))
+        sizer_5.Add(self._1_N_N_copy_19, 1, 0, 0)
+
         self._0_X_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_19.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_19, wx.Size(100, 21)))
+        sizer_5.Add(self._0_X_N_copy_19, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_19.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_19, wx.Size(100, 21)))
+        sizer_5.Add(self._1_X_N_copy_19, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_19.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_19, wx.Size(100, 21)))
+        sizer_5.Add(self._0_N_F_copy_19, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_19.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_19, wx.Size(100, 21)))
+        sizer_5.Add(self._1_N_F_copy_19, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_19.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_19, wx.Size(100, 21)))
+        sizer_5.Add(self._0_X_F_copy_19, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_19 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_19.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_19, wx.Size(100, 21)))
+        sizer_5.Add(self._1_X_F_copy_19, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_N_N_copy_20, 0, 0, 0)
+
         self._1_N_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_N_N_copy_20, 1, 0, 0)
+
         self._0_X_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_X_N_copy_20, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_X_N_copy_20, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_N_F_copy_20, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_N_F_copy_20, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._0_X_F_copy_20, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_20 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_20.SetMinSize((-1, 21))
+        sizer_5.Add(self._1_X_F_copy_20, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_N_N_copy_21, 0, 0, 0)
+
         self._1_N_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_N_N_copy_21, 1, 0, 0)
+
         self._0_X_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_X_N_copy_21, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_X_N_copy_21, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_N_F_copy_21, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_N_F_copy_21, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._0_X_F_copy_21, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_21 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_21.SetMinSize((100, -1))
+        sizer_5.Add(self._1_X_F_copy_21, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_22.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_22, wx.Size(-1, 100)))
+        sizer_5.Add(self._0_N_N_copy_22, 0, 0, 0)
+
         self._1_N_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_22.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_22, wx.Size(-1, 100)))
+        sizer_5.Add(self._1_N_N_copy_22, 1, 0, 0)
+
         self._0_X_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_22.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_22, wx.Size(-1, 100)))
+        sizer_5.Add(self._0_X_N_copy_22, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_22.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_22, wx.Size(-1, 100)))
+        sizer_5.Add(self._1_X_N_copy_22, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_22.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_22, wx.Size(-1, 100)))
+        sizer_5.Add(self._0_N_F_copy_22, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_22.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_22, wx.Size(-1, 100)))
+        sizer_5.Add(self._1_N_F_copy_22, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._0_X_F_copy_22, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_22 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        sizer_5.Add(self._1_X_F_copy_22, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_23.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_23, wx.Size(100, -1)))
+        sizer_5.Add(self._0_N_N_copy_23, 0, 0, 0)
+
         self._1_N_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_23.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_23, wx.Size(100, -1)))
+        sizer_5.Add(self._1_N_N_copy_23, 1, 0, 0)
+
         self._0_X_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_23.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_23, wx.Size(100, -1)))
+        sizer_5.Add(self._0_X_N_copy_23, 0, wx.EXPAND, 0)
+
         self._1_X_N_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_23.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_23, wx.Size(100, -1)))
+        sizer_5.Add(self._1_X_N_copy_23, 1, wx.EXPAND, 0)
+
         self._0_N_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_23.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_23, wx.Size(100, -1)))
+        sizer_5.Add(self._0_N_F_copy_23, 0, wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_23.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_23, wx.Size(100, -1)))
+        sizer_5.Add(self._1_N_F_copy_23, 1, wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_23.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_23, wx.Size(100, -1)))
+        sizer_5.Add(self._0_X_F_copy_23, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_23 = wx.TextCtrl(self.notebook_1_FlexGridSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_23.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_23, wx.Size(100, -1)))
+        sizer_5.Add(self._1_X_F_copy_23, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self.notebook_1_GridBagSizer = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_GridBagSizer, _("GridBagSizer"))
+
+        sizer_6 = wx.GridBagSizer(1, 1)
+
         self._0_N_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_N_N_copy_24, (0, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_N_N_copy_24, (0, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_X_N_copy_24, (0, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_X_N_copy_24, (0, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_N_F_copy_24, (0, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_N_F_copy_24, (0, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._0_X_F_copy_24, (0, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_24 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        sizer_6.Add(self._1_X_F_copy_24, (0, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_N_N_copy_copy_copy_copy_copy, (1, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_N_N_copy_copy_copy_copy_copy, (1, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_X_N_copy_copy_copy_copy_copy, (1, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_X_N_copy_copy_copy_copy_copy, (1, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_N_F_copy_copy_copy_copy_copy, (1, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_N_F_copy_copy_copy_copy_copy, (1, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._0_X_F_copy_copy_copy_copy_copy, (1, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_copy_copy_copy_copy = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
+        sizer_6.Add(self._1_X_F_copy_copy_copy_copy_copy, (1, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_25.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_25, wx.Size(100, 21)))
+        sizer_6.Add(self._0_N_N_copy_25, (2, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_25.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_25, wx.Size(100, 21)))
+        sizer_6.Add(self._1_N_N_copy_25, (2, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_25.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_25, wx.Size(100, 21)))
+        sizer_6.Add(self._0_X_N_copy_25, (2, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_25.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_25, wx.Size(100, 21)))
+        sizer_6.Add(self._1_X_N_copy_25, (2, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_25.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_25, wx.Size(100, 21)))
+        sizer_6.Add(self._0_N_F_copy_25, (2, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_25.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_25, wx.Size(100, 21)))
+        sizer_6.Add(self._1_N_F_copy_25, (2, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_25.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_25, wx.Size(100, 21)))
+        sizer_6.Add(self._0_X_F_copy_25, (2, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_25 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_25.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_25, wx.Size(100, 21)))
+        sizer_6.Add(self._1_X_F_copy_25, (2, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._0_N_N_copy_26, (3, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._1_N_N_copy_26, (3, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._0_X_N_copy_26, (3, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._1_X_N_copy_26, (3, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._0_N_F_copy_26, (3, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._1_N_F_copy_26, (3, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._0_X_F_copy_26, (3, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_26 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_26.SetMinSize((-1, 21))
+        sizer_6.Add(self._1_X_F_copy_26, (3, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._0_N_N_copy_27, (4, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._1_N_N_copy_27, (4, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._0_X_N_copy_27, (4, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._1_X_N_copy_27, (4, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._0_N_F_copy_27, (4, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._1_N_F_copy_27, (4, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._0_X_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._0_X_F_copy_27, (4, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._1_X_F_copy_27 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_27.SetMinSize((100, -1))
+        sizer_6.Add(self._1_X_F_copy_27, (4, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
         self._0_N_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_28.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_28, wx.Size(-1, 100)))
+        sizer_6.Add(self._0_N_N_copy_28, (5, 0), (1, 1), 0, 0)
+
         self._1_N_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_28.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_28, wx.Size(-1, 100)))
+        sizer_6.Add(self._1_N_N_copy_28, (5, 1), (1, 1), 0, 0)
+
         self._0_X_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_28.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_28, wx.Size(-1, 100)))
+        sizer_6.Add(self._0_X_N_copy_28, (5, 2), (1, 1), wx.EXPAND, 0)
+
         self._1_X_N_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_28.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_28, wx.Size(-1, 100)))
+        sizer_6.Add(self._1_X_N_copy_28, (5, 3), (1, 1), wx.EXPAND, 0)
+
         self._0_N_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_28.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_28, wx.Size(-1, 100)))
+        sizer_6.Add(self._0_N_F_copy_28, (5, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
         self._1_N_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._0_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self._1_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
-        self.notebook_1_BorderTest = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self._0_N_N_border_10_none = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._1_N_N_border_0_all = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_X_N_border_5_LEFTRIGHT = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._1_X_N_border_15_BOTTOM = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_N_N_copy_copy_1 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_N_N_copy_31 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self._0_N_N_copy_32 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
-        self.notebook_1_GridBagSizer_Spacers = wx.Panel(self.notebook_1, wx.ID_ANY)
-        self.button_1 = wx.Button(self.notebook_1_GridBagSizer_Spacers, wx.ID_ANY, _("button_1"))
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle(_("frame"))
-        self._0_N_N_copy.SetMinSize((100, 21))
-        self._1_N_N_copy.SetMinSize((100, 21))
-        self._0_X_N_copy.SetMinSize((100, 21))
-        self._1_X_N_copy.SetMinSize((100, 21))
-        self._0_N_F_copy.SetMinSize((100, 21))
-        self._1_N_F_copy.SetMinSize((100, 21))
-        self._0_X_F_copy.SetMinSize((100, 21))
-        self._1_X_F_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_1.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_1, wx.Size(100, 21)))
-        self._1_N_N_copy_1.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_1, wx.Size(100, 21)))
-        self._0_X_N_copy_1.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_1, wx.Size(100, 21)))
-        self._1_X_N_copy_1.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_1, wx.Size(100, 21)))
-        self._0_N_F_copy_1.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_1, wx.Size(100, 21)))
-        self._1_N_F_copy_1.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_1, wx.Size(100, 21)))
-        self._0_X_F_copy_1.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_1, wx.Size(100, 21)))
-        self._1_X_F_copy_1.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_1, wx.Size(100, 21)))
-        self._0_N_N_copy_2.SetMinSize((-1, 21))
-        self._1_N_N_copy_2.SetMinSize((-1, 21))
-        self._0_X_N_copy_2.SetMinSize((-1, 21))
-        self._1_X_N_copy_2.SetMinSize((-1, 21))
-        self._0_N_F_copy_2.SetMinSize((-1, 21))
-        self._1_N_F_copy_2.SetMinSize((-1, 21))
-        self._0_X_F_copy_2.SetMinSize((-1, 21))
-        self._1_X_F_copy_2.SetMinSize((-1, 21))
-        self._0_N_N_copy_3.SetMinSize((100, -1))
-        self._1_N_N_copy_3.SetMinSize((100, -1))
-        self._0_X_N_copy_3.SetMinSize((100, -1))
-        self._1_X_N_copy_3.SetMinSize((100, -1))
-        self._0_N_F_copy_3.SetMinSize((100, -1))
-        self._1_N_F_copy_3.SetMinSize((100, -1))
-        self._0_X_F_copy_3.SetMinSize((100, -1))
-        self._1_X_F_copy_3.SetMinSize((100, -1))
-        self._0_N_N_copy_4.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_4, wx.Size(-1, 100)))
-        self._1_N_N_copy_4.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_4, wx.Size(-1, 100)))
-        self._0_X_N_copy_4.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_4, wx.Size(-1, 100)))
-        self._1_X_N_copy_4.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_4, wx.Size(-1, 100)))
-        self._0_N_F_copy_4.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_4, wx.Size(-1, 100)))
-        self._1_N_F_copy_4.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_4, wx.Size(-1, 100)))
-        self._0_N_N_copy_5.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_5, wx.Size(100, -1)))
-        self._1_N_N_copy_5.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_5, wx.Size(100, -1)))
-        self._0_X_N_copy_5.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_5, wx.Size(100, -1)))
-        self._1_X_N_copy_5.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_5, wx.Size(100, -1)))
-        self._0_N_F_copy_5.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_5, wx.Size(100, -1)))
-        self._1_N_F_copy_5.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_5, wx.Size(100, -1)))
-        self._0_X_F_copy_5.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_5, wx.Size(100, -1)))
-        self._1_X_F_copy_5.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_5, wx.Size(100, -1)))
-        self._0_N_N_copy_30_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_30_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_30_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_30_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_30_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_30_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_30_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_30_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_30_copy_1, wx.Size(100, 21)))
-        self._1_N_N_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_30_copy_1, wx.Size(100, 21)))
-        self._0_X_N_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_30_copy_1, wx.Size(100, 21)))
-        self._1_X_N_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_30_copy_1, wx.Size(100, 21)))
-        self._0_N_F_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_30_copy_1, wx.Size(100, 21)))
-        self._1_N_F_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_30_copy_1, wx.Size(100, 21)))
-        self._0_X_F_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_30_copy_1, wx.Size(100, 21)))
-        self._1_X_F_copy_30_copy_1.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_30_copy_1, wx.Size(100, 21)))
-        self._0_N_N_copy_30_copy_2.SetMinSize((-1, 21))
-        self._1_N_N_copy_30_copy_2.SetMinSize((-1, 21))
-        self._0_X_N_copy_30_copy_2.SetMinSize((-1, 21))
-        self._1_X_N_copy_30_copy_2.SetMinSize((-1, 21))
-        self._0_N_F_copy_30_copy_2.SetMinSize((-1, 21))
-        self._1_N_F_copy_30_copy_2.SetMinSize((-1, 21))
-        self._0_X_F_copy_30_copy_2.SetMinSize((-1, 21))
-        self._1_X_F_copy_30_copy_2.SetMinSize((-1, 21))
-        self._0_N_N_copy_30_copy_3.SetMinSize((100, -1))
-        self._1_N_N_copy_30_copy_3.SetMinSize((100, -1))
-        self._0_X_N_copy_30_copy_3.SetMinSize((100, -1))
-        self._1_X_N_copy_30_copy_3.SetMinSize((100, -1))
-        self._0_N_F_copy_30_copy_3.SetMinSize((100, -1))
-        self._1_N_F_copy_30_copy_3.SetMinSize((100, -1))
-        self._0_X_F_copy_30_copy_3.SetMinSize((100, -1))
-        self._1_X_F_copy_30_copy_3.SetMinSize((100, -1))
-        self._0_N_N_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_30_copy_4, wx.Size(-1, 100)))
-        self._1_N_N_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_30_copy_4, wx.Size(-1, 100)))
-        self._0_X_N_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_30_copy_4, wx.Size(-1, 100)))
-        self._1_X_N_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_30_copy_4, wx.Size(-1, 100)))
-        self._0_N_F_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_30_copy_4, wx.Size(-1, 100)))
-        self._1_N_F_copy_30_copy_4.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_30_copy_4, wx.Size(-1, 100)))
-        self._0_N_N_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_30_copy_5, wx.Size(100, -1)))
-        self._1_N_N_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_30_copy_5, wx.Size(100, -1)))
-        self._0_X_N_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_30_copy_5, wx.Size(100, -1)))
-        self._1_X_N_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_30_copy_5, wx.Size(100, -1)))
-        self._0_N_F_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_30_copy_5, wx.Size(100, -1)))
-        self._1_N_F_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_30_copy_5, wx.Size(100, -1)))
-        self._0_X_F_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_30_copy_5, wx.Size(100, -1)))
-        self._1_X_F_copy_30_copy_5.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_30_copy_5, wx.Size(100, -1)))
-        self._0_N_N_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_7.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_7, wx.Size(100, 21)))
-        self._1_N_N_copy_7.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_7, wx.Size(100, 21)))
-        self._0_X_N_copy_7.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_7, wx.Size(100, 21)))
-        self._1_X_N_copy_7.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_7, wx.Size(100, 21)))
-        self._0_N_F_copy_7.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_7, wx.Size(100, 21)))
-        self._1_N_F_copy_7.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_7, wx.Size(100, 21)))
-        self._0_X_F_copy_7.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_7, wx.Size(100, 21)))
-        self._1_X_F_copy_7.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_7, wx.Size(100, 21)))
-        self._0_N_N_copy_8.SetMinSize((-1, 21))
-        self._1_N_N_copy_8.SetMinSize((-1, 21))
-        self._0_X_N_copy_8.SetMinSize((-1, 21))
-        self._1_X_N_copy_8.SetMinSize((-1, 21))
-        self._0_N_F_copy_8.SetMinSize((-1, 21))
-        self._1_N_F_copy_8.SetMinSize((-1, 21))
-        self._0_X_F_copy_8.SetMinSize((-1, 21))
-        self._1_X_F_copy_8.SetMinSize((-1, 21))
-        self._0_N_N_copy_9.SetMinSize((100, -1))
-        self._1_N_N_copy_9.SetMinSize((100, -1))
-        self._0_X_N_copy_9.SetMinSize((100, -1))
-        self._1_X_N_copy_9.SetMinSize((100, -1))
-        self._0_N_F_copy_9.SetMinSize((100, -1))
-        self._1_N_F_copy_9.SetMinSize((100, -1))
-        self._0_X_F_copy_9.SetMinSize((100, -1))
-        self._1_X_F_copy_9.SetMinSize((100, -1))
-        self._0_N_N_copy_10.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_10, wx.Size(-1, 100)))
-        self._1_N_N_copy_10.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_10, wx.Size(-1, 100)))
-        self._0_X_N_copy_10.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_10, wx.Size(-1, 100)))
-        self._1_X_N_copy_10.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_10, wx.Size(-1, 100)))
-        self._0_N_F_copy_10.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_10, wx.Size(-1, 100)))
-        self._1_N_F_copy_10.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_10, wx.Size(-1, 100)))
-        self._0_N_N_copy_11.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_11, wx.Size(100, -1)))
-        self._1_N_N_copy_11.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_11, wx.Size(100, -1)))
-        self._0_X_N_copy_11.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_11, wx.Size(100, -1)))
-        self._1_X_N_copy_11.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_11, wx.Size(100, -1)))
-        self._0_N_F_copy_11.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_11, wx.Size(100, -1)))
-        self._1_N_F_copy_11.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_11, wx.Size(100, -1)))
-        self._0_X_F_copy_11.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_11, wx.Size(100, -1)))
-        self._1_X_F_copy_11.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_11, wx.Size(100, -1)))
-        self._0_N_N_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_13.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_13, wx.Size(100, 21)))
-        self._1_N_N_copy_13.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_13, wx.Size(100, 21)))
-        self._0_X_N_copy_13.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_13, wx.Size(100, 21)))
-        self._1_X_N_copy_13.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_13, wx.Size(100, 21)))
-        self._0_N_F_copy_13.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_13, wx.Size(100, 21)))
-        self._1_N_F_copy_13.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_13, wx.Size(100, 21)))
-        self._0_X_F_copy_13.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_13, wx.Size(100, 21)))
-        self._1_X_F_copy_13.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_13, wx.Size(100, 21)))
-        self._0_N_N_copy_14.SetMinSize((-1, 21))
-        self._1_N_N_copy_14.SetMinSize((-1, 21))
-        self._0_X_N_copy_14.SetMinSize((-1, 21))
-        self._1_X_N_copy_14.SetMinSize((-1, 21))
-        self._0_N_F_copy_14.SetMinSize((-1, 21))
-        self._1_N_F_copy_14.SetMinSize((-1, 21))
-        self._0_X_F_copy_14.SetMinSize((-1, 21))
-        self._1_X_F_copy_14.SetMinSize((-1, 21))
-        self._0_N_N_copy_15.SetMinSize((100, -1))
-        self._1_N_N_copy_15.SetMinSize((100, -1))
-        self._0_X_N_copy_15.SetMinSize((100, -1))
-        self._1_X_N_copy_15.SetMinSize((100, -1))
-        self._0_N_F_copy_15.SetMinSize((100, -1))
-        self._1_N_F_copy_15.SetMinSize((100, -1))
-        self._0_X_F_copy_15.SetMinSize((100, -1))
-        self._1_X_F_copy_15.SetMinSize((100, -1))
-        self._0_N_N_copy_16.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_16, wx.Size(-1, 100)))
-        self._1_N_N_copy_16.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_16, wx.Size(-1, 100)))
-        self._0_X_N_copy_16.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_16, wx.Size(-1, 100)))
-        self._1_X_N_copy_16.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_16, wx.Size(-1, 100)))
-        self._0_N_F_copy_16.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_16, wx.Size(-1, 100)))
-        self._1_N_F_copy_16.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_16, wx.Size(-1, 100)))
-        self._0_N_N_copy_17.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_17, wx.Size(100, -1)))
-        self._1_N_N_copy_17.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_17, wx.Size(100, -1)))
-        self._0_X_N_copy_17.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_17, wx.Size(100, -1)))
-        self._1_X_N_copy_17.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_17, wx.Size(100, -1)))
-        self._0_N_F_copy_17.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_17, wx.Size(100, -1)))
-        self._1_N_F_copy_17.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_17, wx.Size(100, -1)))
-        self._0_X_F_copy_17.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_17, wx.Size(100, -1)))
-        self._1_X_F_copy_17.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_17, wx.Size(100, -1)))
-        self._0_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_19.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_19, wx.Size(100, 21)))
-        self._1_N_N_copy_19.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_19, wx.Size(100, 21)))
-        self._0_X_N_copy_19.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_19, wx.Size(100, 21)))
-        self._1_X_N_copy_19.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_19, wx.Size(100, 21)))
-        self._0_N_F_copy_19.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_19, wx.Size(100, 21)))
-        self._1_N_F_copy_19.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_19, wx.Size(100, 21)))
-        self._0_X_F_copy_19.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_19, wx.Size(100, 21)))
-        self._1_X_F_copy_19.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_19, wx.Size(100, 21)))
-        self._0_N_N_copy_20.SetMinSize((-1, 21))
-        self._1_N_N_copy_20.SetMinSize((-1, 21))
-        self._0_X_N_copy_20.SetMinSize((-1, 21))
-        self._1_X_N_copy_20.SetMinSize((-1, 21))
-        self._0_N_F_copy_20.SetMinSize((-1, 21))
-        self._1_N_F_copy_20.SetMinSize((-1, 21))
-        self._0_X_F_copy_20.SetMinSize((-1, 21))
-        self._1_X_F_copy_20.SetMinSize((-1, 21))
-        self._0_N_N_copy_21.SetMinSize((100, -1))
-        self._1_N_N_copy_21.SetMinSize((100, -1))
-        self._0_X_N_copy_21.SetMinSize((100, -1))
-        self._1_X_N_copy_21.SetMinSize((100, -1))
-        self._0_N_F_copy_21.SetMinSize((100, -1))
-        self._1_N_F_copy_21.SetMinSize((100, -1))
-        self._0_X_F_copy_21.SetMinSize((100, -1))
-        self._1_X_F_copy_21.SetMinSize((100, -1))
-        self._0_N_N_copy_22.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_22, wx.Size(-1, 100)))
-        self._1_N_N_copy_22.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_22, wx.Size(-1, 100)))
-        self._0_X_N_copy_22.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_22, wx.Size(-1, 100)))
-        self._1_X_N_copy_22.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_22, wx.Size(-1, 100)))
-        self._0_N_F_copy_22.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_22, wx.Size(-1, 100)))
-        self._1_N_F_copy_22.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_22, wx.Size(-1, 100)))
-        self._0_N_N_copy_23.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_23, wx.Size(100, -1)))
-        self._1_N_N_copy_23.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_23, wx.Size(100, -1)))
-        self._0_X_N_copy_23.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_23, wx.Size(100, -1)))
-        self._1_X_N_copy_23.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_23, wx.Size(100, -1)))
-        self._0_N_F_copy_23.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_23, wx.Size(100, -1)))
-        self._1_N_F_copy_23.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_23, wx.Size(100, -1)))
-        self._0_X_F_copy_23.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_23, wx.Size(100, -1)))
-        self._1_X_F_copy_23.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_23, wx.Size(100, -1)))
-        self._0_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_N_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_N_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._1_X_F_copy_copy_copy_copy_copy.SetMinSize((100, 21))
-        self._0_N_N_copy_25.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_25, wx.Size(100, 21)))
-        self._1_N_N_copy_25.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_25, wx.Size(100, 21)))
-        self._0_X_N_copy_25.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_25, wx.Size(100, 21)))
-        self._1_X_N_copy_25.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_25, wx.Size(100, 21)))
-        self._0_N_F_copy_25.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_25, wx.Size(100, 21)))
-        self._1_N_F_copy_25.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_25, wx.Size(100, 21)))
-        self._0_X_F_copy_25.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_25, wx.Size(100, 21)))
-        self._1_X_F_copy_25.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_25, wx.Size(100, 21)))
-        self._0_N_N_copy_26.SetMinSize((-1, 21))
-        self._1_N_N_copy_26.SetMinSize((-1, 21))
-        self._0_X_N_copy_26.SetMinSize((-1, 21))
-        self._1_X_N_copy_26.SetMinSize((-1, 21))
-        self._0_N_F_copy_26.SetMinSize((-1, 21))
-        self._1_N_F_copy_26.SetMinSize((-1, 21))
-        self._0_X_F_copy_26.SetMinSize((-1, 21))
-        self._1_X_F_copy_26.SetMinSize((-1, 21))
-        self._0_N_N_copy_27.SetMinSize((100, -1))
-        self._1_N_N_copy_27.SetMinSize((100, -1))
-        self._0_X_N_copy_27.SetMinSize((100, -1))
-        self._1_X_N_copy_27.SetMinSize((100, -1))
-        self._0_N_F_copy_27.SetMinSize((100, -1))
-        self._1_N_F_copy_27.SetMinSize((100, -1))
-        self._0_X_F_copy_27.SetMinSize((100, -1))
-        self._1_X_F_copy_27.SetMinSize((100, -1))
-        self._0_N_N_copy_28.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_28, wx.Size(-1, 100)))
-        self._1_N_N_copy_28.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_28, wx.Size(-1, 100)))
-        self._0_X_N_copy_28.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_28, wx.Size(-1, 100)))
-        self._1_X_N_copy_28.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_28, wx.Size(-1, 100)))
-        self._0_N_F_copy_28.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_28, wx.Size(-1, 100)))
-        self._1_N_F_copy_28.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_28, wx.Size(-1, 100)))
-        self._0_N_N_copy_29.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_29, wx.Size(100, -1)))
-        self._1_N_N_copy_29.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_29, wx.Size(100, -1)))
-        self._0_X_N_copy_29.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_29, wx.Size(100, -1)))
-        self._1_X_N_copy_29.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_29, wx.Size(100, -1)))
-        self._0_N_F_copy_29.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_29, wx.Size(100, -1)))
-        self._1_N_F_copy_29.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_29, wx.Size(100, -1)))
-        self._0_X_F_copy_29.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_29, wx.Size(100, -1)))
-        self._1_X_F_copy_29.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_29, wx.Size(100, -1)))
-        self._0_N_N_copy_copy_1.SetMinSize((100, 21))
-        self._0_N_N_copy_31.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_31, wx.Size(100, 21)))
-        self._0_N_N_copy_32.SetMinSize((-1, 21))
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        grid_sizer_1 = wx.GridBagSizer(0, 0)
-        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_border_15_BOTTOM = wx.BoxSizer(wx.VERTICAL)
-        sizer_border_5_LEFTRIGHT = wx.BoxSizer(wx.VERTICAL)
-        sizer_border_0_ALL = wx.BoxSizer(wx.VERTICAL)
-        sizer_border_10_none = wx.BoxSizer(wx.VERTICAL)
-        sizer_6 = wx.GridBagSizer(1, 1)
-        sizer_5 = wx.FlexGridSizer(7, 8, 1, 1)
-        sizer_4 = wx.GridSizer(7, 8, 0, 0)
-        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6_dlgm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_dlgm1_copy")), wx.VERTICAL)
-        sizer_6_m1dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1dlg_copy")), wx.VERTICAL)
-        sizer_6_absm1_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_absm1_copy")), wx.VERTICAL)
-        sizer_6_m1abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_6_m1abs_copy")), wx.VERTICAL)
-        sizer_5_dlg_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_5_dlg_copy")), wx.VERTICAL)
-        sizer_4_abs_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_4_abs_copy")), wx.VERTICAL)
-        sizer_3_nosize_copy = wx.StaticBoxSizer(wx.StaticBox(self.notebook_1_StaticBoxSizer, wx.ID_ANY, _("sizer_3_nosize_copy")), wx.VERTICAL)
-        sizer_8 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6_dlgm1_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_6_m1dlg_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_6_absm1_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_6_m1abs_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_5_dlg_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_4_abs_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_3_nosize_copy_1 = wx.WrapSizer(wx.HORIZONTAL)
-        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6_dlgm1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_6_m1dlg = wx.BoxSizer(wx.VERTICAL)
-        sizer_6_absm1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_6_m1abs = wx.BoxSizer(wx.VERTICAL)
-        sizer_5_dlg = wx.BoxSizer(wx.VERTICAL)
-        sizer_4_abs = wx.BoxSizer(wx.VERTICAL)
-        sizer_3_nosize = wx.BoxSizer(wx.VERTICAL)
-        sizer_3_nosize.Add(self._0_N_N, 0, 0, 0)
-        sizer_3_nosize.Add(self._1_N_N, 1, 0, 0)
-        sizer_3_nosize.Add(self._0_X_N, 0, wx.EXPAND, 0)
-        sizer_3_nosize.Add(self._1_X_N, 1, wx.EXPAND, 0)
-        sizer_3_nosize.Add(self._0_N_F, 0, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize.Add(self._1_N_F, 1, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize.Add(self._0_X_F, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize.Add(self._1_X_F, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_3_nosize, 1, wx.EXPAND, 0)
-        sizer_4_abs.Add(self._0_N_N_copy, 0, 0, 0)
-        sizer_4_abs.Add(self._1_N_N_copy, 1, 0, 0)
-        sizer_4_abs.Add(self._0_X_N_copy, 0, wx.EXPAND, 0)
-        sizer_4_abs.Add(self._1_X_N_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs.Add(self._0_N_F_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs.Add(self._1_N_F_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs.Add(self._0_X_F_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4_abs.Add(self._1_X_F_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_4_abs, 1, wx.EXPAND, 0)
-        sizer_5_dlg.Add(self._0_N_N_copy_1, 0, 0, 0)
-        sizer_5_dlg.Add(self._1_N_N_copy_1, 1, 0, 0)
-        sizer_5_dlg.Add(self._0_X_N_copy_1, 0, wx.EXPAND, 0)
-        sizer_5_dlg.Add(self._1_X_N_copy_1, 1, wx.EXPAND, 0)
-        sizer_5_dlg.Add(self._0_N_F_copy_1, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg.Add(self._1_N_F_copy_1, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg.Add(self._0_X_F_copy_1, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg.Add(self._1_X_F_copy_1, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_5_dlg, 1, wx.EXPAND, 0)
-        sizer_6_m1abs.Add(self._0_N_N_copy_2, 0, 0, 0)
-        sizer_6_m1abs.Add(self._1_N_N_copy_2, 1, 0, 0)
-        sizer_6_m1abs.Add(self._0_X_N_copy_2, 0, wx.EXPAND, 0)
-        sizer_6_m1abs.Add(self._1_X_N_copy_2, 1, wx.EXPAND, 0)
-        sizer_6_m1abs.Add(self._0_N_F_copy_2, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs.Add(self._1_N_F_copy_2, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs.Add(self._0_X_F_copy_2, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs.Add(self._1_X_F_copy_2, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_m1abs, 1, wx.EXPAND, 0)
-        sizer_6_absm1.Add(self._0_N_N_copy_3, 0, 0, 0)
-        sizer_6_absm1.Add(self._1_N_N_copy_3, 1, 0, 0)
-        sizer_6_absm1.Add(self._0_X_N_copy_3, 0, wx.EXPAND, 0)
-        sizer_6_absm1.Add(self._1_X_N_copy_3, 1, wx.EXPAND, 0)
-        sizer_6_absm1.Add(self._0_N_F_copy_3, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1.Add(self._1_N_F_copy_3, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1.Add(self._0_X_F_copy_3, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1.Add(self._1_X_F_copy_3, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_absm1, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg.Add(self._0_N_N_copy_4, 0, 0, 0)
-        sizer_6_m1dlg.Add(self._1_N_N_copy_4, 1, 0, 0)
-        sizer_6_m1dlg.Add(self._0_X_N_copy_4, 0, wx.EXPAND, 0)
-        sizer_6_m1dlg.Add(self._1_X_N_copy_4, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg.Add(self._0_N_F_copy_4, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg.Add(self._1_N_F_copy_4, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg.Add(self._0_X_F_copy_4, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg.Add(self._1_X_F_copy_4, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_m1dlg, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1.Add(self._0_N_N_copy_5, 0, 0, 0)
-        sizer_6_dlgm1.Add(self._1_N_N_copy_5, 1, 0, 0)
-        sizer_6_dlgm1.Add(self._0_X_N_copy_5, 0, wx.EXPAND, 0)
-        sizer_6_dlgm1.Add(self._1_X_N_copy_5, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1.Add(self._0_N_F_copy_5, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1.Add(self._1_N_F_copy_5, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1.Add(self._0_X_F_copy_5, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1.Add(self._1_X_F_copy_5, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_2.Add(sizer_6_dlgm1, 1, wx.EXPAND, 0)
-        self.notebook_1_pane_1.SetSizer(sizer_2)
-        sizer_3_nosize_copy_1.Add(self._0_N_N_copy_30, 0, 0, 0)
-        sizer_3_nosize_copy_1.Add(self._1_N_N_copy_30, 1, 0, 0)
-        sizer_3_nosize_copy_1.Add(self._0_X_N_copy_30, 0, wx.EXPAND, 0)
-        sizer_3_nosize_copy_1.Add(self._1_X_N_copy_30, 1, wx.EXPAND, 0)
-        sizer_3_nosize_copy_1.Add(self._0_N_F_copy_30, 0, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy_1.Add(self._1_N_F_copy_30, 1, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy_1.Add(self._0_X_F_copy_30, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy_1.Add(self._1_X_F_copy_30, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_3_nosize_copy_1, 1, wx.EXPAND, 0)
-        sizer_4_abs_copy_1.Add(self._0_N_N_copy_30_copy, 0, 0, 0)
-        sizer_4_abs_copy_1.Add(self._1_N_N_copy_30_copy, 1, 0, 0)
-        sizer_4_abs_copy_1.Add(self._0_X_N_copy_30_copy, 0, wx.EXPAND, 0)
-        sizer_4_abs_copy_1.Add(self._1_X_N_copy_30_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs_copy_1.Add(self._0_N_F_copy_30_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy_1.Add(self._1_N_F_copy_30_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy_1.Add(self._0_X_F_copy_30_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy_1.Add(self._1_X_F_copy_30_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_4_abs_copy_1, 1, wx.EXPAND, 0)
-        sizer_5_dlg_copy_1.Add(self._0_N_N_copy_30_copy_1, 0, 0, 0)
-        sizer_5_dlg_copy_1.Add(self._1_N_N_copy_30_copy_1, 1, 0, 0)
-        sizer_5_dlg_copy_1.Add(self._0_X_N_copy_30_copy_1, 0, wx.EXPAND, 0)
-        sizer_5_dlg_copy_1.Add(self._1_X_N_copy_30_copy_1, 1, wx.EXPAND, 0)
-        sizer_5_dlg_copy_1.Add(self._0_N_F_copy_30_copy_1, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy_1.Add(self._1_N_F_copy_30_copy_1, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy_1.Add(self._0_X_F_copy_30_copy_1, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy_1.Add(self._1_X_F_copy_30_copy_1, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_5_dlg_copy_1, 1, wx.EXPAND, 0)
-        sizer_6_m1abs_copy_1.Add(self._0_N_N_copy_30_copy_2, 0, 0, 0)
-        sizer_6_m1abs_copy_1.Add(self._1_N_N_copy_30_copy_2, 1, 0, 0)
-        sizer_6_m1abs_copy_1.Add(self._0_X_N_copy_30_copy_2, 0, wx.EXPAND, 0)
-        sizer_6_m1abs_copy_1.Add(self._1_X_N_copy_30_copy_2, 1, wx.EXPAND, 0)
-        sizer_6_m1abs_copy_1.Add(self._0_N_F_copy_30_copy_2, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy_1.Add(self._1_N_F_copy_30_copy_2, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy_1.Add(self._0_X_F_copy_30_copy_2, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy_1.Add(self._1_X_F_copy_30_copy_2, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_6_m1abs_copy_1, 1, wx.EXPAND, 0)
-        sizer_6_absm1_copy_1.Add(self._0_N_N_copy_30_copy_3, 0, 0, 0)
-        sizer_6_absm1_copy_1.Add(self._1_N_N_copy_30_copy_3, 1, 0, 0)
-        sizer_6_absm1_copy_1.Add(self._0_X_N_copy_30_copy_3, 0, wx.EXPAND, 0)
-        sizer_6_absm1_copy_1.Add(self._1_X_N_copy_30_copy_3, 1, wx.EXPAND, 0)
-        sizer_6_absm1_copy_1.Add(self._0_N_F_copy_30_copy_3, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy_1.Add(self._1_N_F_copy_30_copy_3, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy_1.Add(self._0_X_F_copy_30_copy_3, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy_1.Add(self._1_X_F_copy_30_copy_3, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_6_absm1_copy_1, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy_1.Add(self._0_N_N_copy_30_copy_4, 0, 0, 0)
-        sizer_6_m1dlg_copy_1.Add(self._1_N_N_copy_30_copy_4, 1, 0, 0)
-        sizer_6_m1dlg_copy_1.Add(self._0_X_N_copy_30_copy_4, 0, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy_1.Add(self._1_X_N_copy_30_copy_4, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy_1.Add(self._0_N_F_copy_30_copy_4, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy_1.Add(self._1_N_F_copy_30_copy_4, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy_1.Add(self._0_X_F_copy_30_copy_4, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy_1.Add(self._1_X_F_copy_30_copy_4, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_6_m1dlg_copy_1, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy_1.Add(self._0_N_N_copy_30_copy_5, 0, 0, 0)
-        sizer_6_dlgm1_copy_1.Add(self._1_N_N_copy_30_copy_5, 1, 0, 0)
-        sizer_6_dlgm1_copy_1.Add(self._0_X_N_copy_30_copy_5, 0, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy_1.Add(self._1_X_N_copy_30_copy_5, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy_1.Add(self._0_N_F_copy_30_copy_5, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy_1.Add(self._1_N_F_copy_30_copy_5, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy_1.Add(self._0_X_F_copy_30_copy_5, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy_1.Add(self._1_X_F_copy_30_copy_5, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_8.Add(sizer_6_dlgm1_copy_1, 1, wx.EXPAND, 0)
-        self.notebook_1_WrapSizer.SetSizer(sizer_8)
-        sizer_3_nosize_copy.Add(self._0_N_N_copy_6, 0, 0, 0)
-        sizer_3_nosize_copy.Add(self._1_N_N_copy_6, 1, 0, 0)
-        sizer_3_nosize_copy.Add(self._0_X_N_copy_6, 0, wx.EXPAND, 0)
-        sizer_3_nosize_copy.Add(self._1_X_N_copy_6, 1, wx.EXPAND, 0)
-        sizer_3_nosize_copy.Add(self._0_N_F_copy_6, 0, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy.Add(self._1_N_F_copy_6, 1, wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy.Add(self._0_X_F_copy_6, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3_nosize_copy.Add(self._1_X_F_copy_6, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_3_nosize_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs_copy.Add(self._0_N_N_copy_copy, 0, 0, 0)
-        sizer_4_abs_copy.Add(self._1_N_N_copy_copy, 1, 0, 0)
-        sizer_4_abs_copy.Add(self._0_X_N_copy_copy, 0, wx.EXPAND, 0)
-        sizer_4_abs_copy.Add(self._1_X_N_copy_copy, 1, wx.EXPAND, 0)
-        sizer_4_abs_copy.Add(self._0_N_F_copy_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy.Add(self._1_N_F_copy_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy.Add(self._0_X_F_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4_abs_copy.Add(self._1_X_F_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_4_abs_copy, 1, wx.EXPAND, 0)
-        sizer_5_dlg_copy.Add(self._0_N_N_copy_7, 0, 0, 0)
-        sizer_5_dlg_copy.Add(self._1_N_N_copy_7, 1, 0, 0)
-        sizer_5_dlg_copy.Add(self._0_X_N_copy_7, 0, wx.EXPAND, 0)
-        sizer_5_dlg_copy.Add(self._1_X_N_copy_7, 1, wx.EXPAND, 0)
-        sizer_5_dlg_copy.Add(self._0_N_F_copy_7, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy.Add(self._1_N_F_copy_7, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy.Add(self._0_X_F_copy_7, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5_dlg_copy.Add(self._1_X_F_copy_7, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_5_dlg_copy, 1, wx.EXPAND, 0)
-        sizer_6_m1abs_copy.Add(self._0_N_N_copy_8, 0, 0, 0)
-        sizer_6_m1abs_copy.Add(self._1_N_N_copy_8, 1, 0, 0)
-        sizer_6_m1abs_copy.Add(self._0_X_N_copy_8, 0, wx.EXPAND, 0)
-        sizer_6_m1abs_copy.Add(self._1_X_N_copy_8, 1, wx.EXPAND, 0)
-        sizer_6_m1abs_copy.Add(self._0_N_F_copy_8, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy.Add(self._1_N_F_copy_8, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy.Add(self._0_X_F_copy_8, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1abs_copy.Add(self._1_X_F_copy_8, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_m1abs_copy, 1, wx.EXPAND, 0)
-        sizer_6_absm1_copy.Add(self._0_N_N_copy_9, 0, 0, 0)
-        sizer_6_absm1_copy.Add(self._1_N_N_copy_9, 1, 0, 0)
-        sizer_6_absm1_copy.Add(self._0_X_N_copy_9, 0, wx.EXPAND, 0)
-        sizer_6_absm1_copy.Add(self._1_X_N_copy_9, 1, wx.EXPAND, 0)
-        sizer_6_absm1_copy.Add(self._0_N_F_copy_9, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy.Add(self._1_N_F_copy_9, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy.Add(self._0_X_F_copy_9, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_absm1_copy.Add(self._1_X_F_copy_9, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_absm1_copy, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy.Add(self._0_N_N_copy_10, 0, 0, 0)
-        sizer_6_m1dlg_copy.Add(self._1_N_N_copy_10, 1, 0, 0)
-        sizer_6_m1dlg_copy.Add(self._0_X_N_copy_10, 0, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy.Add(self._1_X_N_copy_10, 1, wx.EXPAND, 0)
-        sizer_6_m1dlg_copy.Add(self._0_N_F_copy_10, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy.Add(self._1_N_F_copy_10, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy.Add(self._0_X_F_copy_10, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_m1dlg_copy.Add(self._1_X_F_copy_10, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_m1dlg_copy, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy.Add(self._0_N_N_copy_11, 0, 0, 0)
-        sizer_6_dlgm1_copy.Add(self._1_N_N_copy_11, 1, 0, 0)
-        sizer_6_dlgm1_copy.Add(self._0_X_N_copy_11, 0, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy.Add(self._1_X_N_copy_11, 1, wx.EXPAND, 0)
-        sizer_6_dlgm1_copy.Add(self._0_N_F_copy_11, 0, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy.Add(self._1_N_F_copy_11, 1, wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy.Add(self._0_X_F_copy_11, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6_dlgm1_copy.Add(self._1_X_F_copy_11, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_3.Add(sizer_6_dlgm1_copy, 1, wx.EXPAND, 0)
-        self.notebook_1_StaticBoxSizer.SetSizer(sizer_3)
-        sizer_4.Add(self._0_N_N_copy_12, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_12, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_12, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_12, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_12, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_12, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_12, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_12, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_copy_copy, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_copy_copy, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_copy_copy, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_copy_copy, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_13, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_13, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_13, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_13, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_13, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_13, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_13, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_13, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_14, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_14, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_14, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_14, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_14, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_14, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_14, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_14, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_15, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_15, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_15, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_15, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_15, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_15, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_15, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_15, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_16, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_16, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_16, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_16, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_16, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_16, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_16, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_16, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_N_N_copy_17, 0, 0, 0)
-        sizer_4.Add(self._1_N_N_copy_17, 1, 0, 0)
-        sizer_4.Add(self._0_X_N_copy_17, 0, wx.EXPAND, 0)
-        sizer_4.Add(self._1_X_N_copy_17, 1, wx.EXPAND, 0)
-        sizer_4.Add(self._0_N_F_copy_17, 0, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_N_F_copy_17, 1, wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._0_X_F_copy_17, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_4.Add(self._1_X_F_copy_17, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        self.notebook_1_GridSizer.SetSizer(sizer_4)
-        sizer_5.Add(self._0_N_N_copy_18, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_18, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_18, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_18, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_18, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_18, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_18, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_18, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_copy_copy_copy, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_copy_copy_copy, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_copy_copy_copy, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_copy_copy_copy, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_copy_copy_copy, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_copy_copy_copy, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_copy_copy_copy, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_copy_copy_copy, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_19, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_19, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_19, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_19, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_19, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_19, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_19, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_19, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_20, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_20, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_20, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_20, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_20, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_20, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_20, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_20, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_21, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_21, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_21, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_21, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_21, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_21, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_21, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_21, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_22, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_22, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_22, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_22, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_22, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_22, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_22, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_22, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_N_N_copy_23, 0, 0, 0)
-        sizer_5.Add(self._1_N_N_copy_23, 1, 0, 0)
-        sizer_5.Add(self._0_X_N_copy_23, 0, wx.EXPAND, 0)
-        sizer_5.Add(self._1_X_N_copy_23, 1, wx.EXPAND, 0)
-        sizer_5.Add(self._0_N_F_copy_23, 0, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_N_F_copy_23, 1, wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._0_X_F_copy_23, 0, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_5.Add(self._1_X_F_copy_23, 1, wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        self.notebook_1_FlexGridSizer.SetSizer(sizer_5)
-        sizer_5.AddGrowableRow(2)
-        sizer_5.AddGrowableRow(5)
-        sizer_5.AddGrowableCol(1)
-        sizer_5.AddGrowableCol(7)
-        sizer_6.Add(self._0_N_N_copy_24, (0, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_24, (0, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_24, (0, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_24, (0, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_24, (0, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_24, (0, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_24, (0, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_24, (0, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_copy_copy_copy_copy, (1, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_copy_copy_copy_copy, (1, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_copy_copy_copy_copy, (1, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_copy_copy_copy_copy, (1, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_copy_copy_copy_copy, (1, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_copy_copy_copy_copy, (1, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_copy_copy_copy_copy, (1, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_copy_copy_copy_copy, (1, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_25, (2, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_25, (2, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_25, (2, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_25, (2, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_25, (2, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_25, (2, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_25, (2, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_25, (2, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_26, (3, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_26, (3, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_26, (3, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_26, (3, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_26, (3, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_26, (3, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_26, (3, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_26, (3, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_27, (4, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_27, (4, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_27, (4, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_27, (4, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_27, (4, 4), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_N_F_copy_27, (4, 5), (1, 1), wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_X_F_copy_27, (4, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._1_X_F_copy_27, (4, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        sizer_6.Add(self._0_N_N_copy_28, (5, 0), (1, 1), 0, 0)
-        sizer_6.Add(self._1_N_N_copy_28, (5, 1), (1, 1), 0, 0)
-        sizer_6.Add(self._0_X_N_copy_28, (5, 2), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._1_X_N_copy_28, (5, 3), (1, 1), wx.EXPAND, 0)
-        sizer_6.Add(self._0_N_F_copy_28, (5, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+        self._1_N_F_copy_28.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_28, wx.Size(-1, 100)))
         sizer_6.Add(self._1_N_F_copy_28, (5, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
         sizer_6.Add(self._0_X_F_copy_28, (5, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._1_X_F_copy_28 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
         sizer_6.Add(self._1_X_F_copy_28, (5, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._0_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_N_copy_29.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_29, wx.Size(100, -1)))
         sizer_6.Add(self._0_N_N_copy_29, (6, 0), (1, 1), 0, 0)
+
+        self._1_N_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_N_copy_29.SetMinSize(wx.DLG_UNIT(self._1_N_N_copy_29, wx.Size(100, -1)))
         sizer_6.Add(self._1_N_N_copy_29, (6, 1), (1, 1), 0, 0)
+
+        self._0_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_N_copy_29.SetMinSize(wx.DLG_UNIT(self._0_X_N_copy_29, wx.Size(100, -1)))
         sizer_6.Add(self._0_X_N_copy_29, (6, 2), (1, 1), wx.EXPAND, 0)
+
+        self._1_X_N_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_N_copy_29.SetMinSize(wx.DLG_UNIT(self._1_X_N_copy_29, wx.Size(100, -1)))
         sizer_6.Add(self._1_X_N_copy_29, (6, 3), (1, 1), wx.EXPAND, 0)
+
+        self._0_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_N_F_copy_29.SetMinSize(wx.DLG_UNIT(self._0_N_F_copy_29, wx.Size(100, -1)))
         sizer_6.Add(self._0_N_F_copy_29, (6, 4), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._1_N_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_N_F_copy_29.SetMinSize(wx.DLG_UNIT(self._1_N_F_copy_29, wx.Size(100, -1)))
         sizer_6.Add(self._1_N_F_copy_29, (6, 5), (1, 1), wx.FIXED_MINSIZE, 0)
+
+        self._0_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._0_X_F_copy_29.SetMinSize(wx.DLG_UNIT(self._0_X_F_copy_29, wx.Size(100, -1)))
         sizer_6.Add(self._0_X_F_copy_29, (6, 6), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
+
+        self._1_X_F_copy_29 = wx.TextCtrl(self.notebook_1_GridBagSizer, wx.ID_ANY, "")
+        self._1_X_F_copy_29.SetMinSize(wx.DLG_UNIT(self._1_X_F_copy_29, wx.Size(100, -1)))
         sizer_6.Add(self._1_X_F_copy_29, (6, 7), (1, 1), wx.EXPAND | wx.FIXED_MINSIZE, 0)
-        self.notebook_1_GridBagSizer.SetSizer(sizer_6)
-        sizer_6.AddGrowableRow(2)
-        sizer_6.AddGrowableRow(5)
-        sizer_6.AddGrowableCol(1)
-        sizer_6.AddGrowableCol(7)
+
+        self.notebook_1_BorderTest = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_BorderTest, _("BorderTest"))
+
+        sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
+
+        sizer_border_10_none = wx.BoxSizer(wx.VERTICAL)
+        sizer_7.Add(sizer_border_10_none, 1, wx.EXPAND, 10)
+
+        self._0_N_N_border_10_none = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._0_N_N_border_10_none, 0, 0, 10)
+
+        self._1_N_N_border_0_all = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._1_N_N_border_0_all, 1, wx.ALL, 0)
+
+        self._0_X_N_border_5_LEFTRIGHT = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._0_X_N_border_5_LEFTRIGHT, 0, wx.EXPAND | wx.LEFT | wx.RIGHT, 5)
+
+        self._1_X_N_border_15_BOTTOM = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
         sizer_border_10_none.Add(self._1_X_N_border_15_BOTTOM, 1, wx.BOTTOM | wx.EXPAND, 15)
-        sizer_7.Add(sizer_border_10_none, 1, wx.EXPAND, 10)
-        sizer_border_0_ALL.Add(self._0_N_N_copy_copy_1, 0, 0, 0)
+
+        sizer_border_0_ALL = wx.BoxSizer(wx.VERTICAL)
         sizer_7.Add(sizer_border_0_ALL, 1, wx.ALL | wx.EXPAND, 0)
-        sizer_border_5_LEFTRIGHT.Add(self._0_N_N_copy_31, 0, 0, 0)
+
+        self._0_N_N_copy_copy_1 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
+        self._0_N_N_copy_copy_1.SetMinSize((100, 21))
+        sizer_border_0_ALL.Add(self._0_N_N_copy_copy_1, 0, 0, 0)
+
+        sizer_border_5_LEFTRIGHT = wx.BoxSizer(wx.VERTICAL)
         sizer_7.Add(sizer_border_5_LEFTRIGHT, 1, wx.LEFT | wx.RIGHT, 5)
-        sizer_border_15_BOTTOM.Add(self._0_N_N_copy_32, 0, 0, 0)
+
+        self._0_N_N_copy_31 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
+        self._0_N_N_copy_31.SetMinSize(wx.DLG_UNIT(self._0_N_N_copy_31, wx.Size(100, 21)))
+        sizer_border_5_LEFTRIGHT.Add(self._0_N_N_copy_31, 0, 0, 0)
+
+        sizer_border_15_BOTTOM = wx.BoxSizer(wx.VERTICAL)
         sizer_7.Add(sizer_border_15_BOTTOM, 1, 0, 15)
-        self.notebook_1_BorderTest.SetSizer(sizer_7)
+
+        self._0_N_N_copy_32 = wx.TextCtrl(self.notebook_1_BorderTest, wx.ID_ANY, "")
+        self._0_N_N_copy_32.SetMinSize((-1, 21))
+        sizer_border_15_BOTTOM.Add(self._0_N_N_copy_32, 0, 0, 0)
+
+        self.notebook_1_GridBagSizer_Spacers = wx.Panel(self.notebook_1, wx.ID_ANY)
+        self.notebook_1.AddPage(self.notebook_1_GridBagSizer_Spacers, _("GridBagSizer_Spacers"))
+
+        grid_sizer_1 = wx.GridBagSizer(0, 0)
+
+        self.button_1 = wx.Button(self.notebook_1_GridBagSizer_Spacers, wx.ID_ANY, _("button_1"))
         grid_sizer_1.Add(self.button_1, (0, 0), (1, 1), 0, 0)
+
         grid_sizer_1.Add(20, 20, (2, 0), (1, 1), wx.EXPAND, 0)
+
         grid_sizer_1.Add(20, 20, (2, 1), (1, 1), wx.EXPAND, 0)
-        self.notebook_1_GridBagSizer_Spacers.SetSizer(grid_sizer_1)
+
         grid_sizer_1.AddGrowableRow(0)
         grid_sizer_1.AddGrowableRow(2)
         grid_sizer_1.AddGrowableCol(0)
-        self.notebook_1.AddPage(self.notebook_1_pane_1, _("BoxSizer"))
-        self.notebook_1.AddPage(self.notebook_1_WrapSizer, _("WrapSizer"))
-        self.notebook_1.AddPage(self.notebook_1_StaticBoxSizer, _("StaticBoxSizer"))
-        self.notebook_1.AddPage(self.notebook_1_GridSizer, _("GridSizer"))
-        self.notebook_1.AddPage(self.notebook_1_FlexGridSizer, _("FlexGridSizer"))
-        self.notebook_1.AddPage(self.notebook_1_GridBagSizer, _("GridBagSizer"))
-        self.notebook_1.AddPage(self.notebook_1_BorderTest, _("BorderTest"))
-        self.notebook_1.AddPage(self.notebook_1_GridBagSizer_Spacers, _("GridBagSizer_Spacers"))
-        sizer_1.Add(self.notebook_1, 1, wx.EXPAND, 0)
+        self.notebook_1_GridBagSizer_Spacers.SetSizer(grid_sizer_1)
+
+        self.notebook_1_BorderTest.SetSizer(sizer_7)
+
+        sizer_6.AddGrowableRow(2)
+        sizer_6.AddGrowableRow(5)
+        sizer_6.AddGrowableCol(1)
+        sizer_6.AddGrowableCol(7)
+        self.notebook_1_GridBagSizer.SetSizer(sizer_6)
+
+        sizer_5.AddGrowableRow(2)
+        sizer_5.AddGrowableRow(5)
+        sizer_5.AddGrowableCol(1)
+        sizer_5.AddGrowableCol(7)
+        self.notebook_1_FlexGridSizer.SetSizer(sizer_5)
+
+        self.notebook_1_GridSizer.SetSizer(sizer_4)
+
+        self.notebook_1_StaticBoxSizer.SetSizer(sizer_3)
+
+        self.notebook_1_WrapSizer.SetSizer(sizer_8)
+
+        self.notebook_1_pane_1.SetSizer(sizer_2)
+
         self.SetSizer(sizer_1)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests.pl wxglade-1.0.1/tests/casefiles/SizersSizeTests.pl
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests.pl	2020-12-31 14:04:48.000000000 +0000
@@ -36,1096 +36,1479 @@
 
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
     $self->SetSize(Wx::Size->new(600, 400));
+    $self->SetTitle(_T("frame"));
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{notebook_1} = Wx::Notebook->new($self, wxID_ANY);
+    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    
     $self->{notebook_1_pane_1} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("BoxSizer"));
+    
+    $self->{sizer_2} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{sizer_3_nosize} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_2}->Add($self->{sizer_3_nosize}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{sizer_3_nosize}->Add($self->{_0_N_N}, 0, 0, 0);
+    
     $self->{_1_N_N} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{sizer_3_nosize}->Add($self->{_1_N_N}, 1, 0, 0);
+    
     $self->{_0_X_N} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{sizer_3_nosize}->Add($self->{_0_X_N}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{sizer_3_nosize}->Add($self->{_1_X_N}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{sizer_3_nosize}->Add($self->{_0_N_F}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{sizer_3_nosize}->Add($self->{_1_N_F}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{sizer_3_nosize}->Add($self->{_0_X_F}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{sizer_3_nosize}->Add($self->{_1_X_F}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_4_abs} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_2}->Add($self->{sizer_4_abs}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_N_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs}->Add($self->{_0_N_N_copy}, 0, 0, 0);
+    
     $self->{_1_N_N_copy} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_N_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs}->Add($self->{_1_N_N_copy}, 1, 0, 0);
+    
     $self->{_0_X_N_copy} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_N_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs}->Add($self->{_0_X_N_copy}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_N_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs}->Add($self->{_1_X_N_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_F_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs}->Add($self->{_0_N_F_copy}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_F_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs}->Add($self->{_1_N_F_copy}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_F_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs}->Add($self->{_0_X_F_copy}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_F_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs}->Add($self->{_1_X_F_copy}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_5_dlg} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_2}->Add($self->{sizer_5_dlg}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_N_copy_1}->SetMinSize($self->{_0_N_N_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg}->Add($self->{_0_N_N_copy_1}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_N_copy_1}->SetMinSize($self->{_1_N_N_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg}->Add($self->{_1_N_N_copy_1}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_N_copy_1}->SetMinSize($self->{_0_X_N_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg}->Add($self->{_0_X_N_copy_1}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_N_copy_1}->SetMinSize($self->{_1_X_N_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg}->Add($self->{_1_X_N_copy_1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_F_copy_1}->SetMinSize($self->{_0_N_F_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg}->Add($self->{_0_N_F_copy_1}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_F_copy_1}->SetMinSize($self->{_1_N_F_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg}->Add($self->{_1_N_F_copy_1}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_F_copy_1}->SetMinSize($self->{_0_X_F_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg}->Add($self->{_0_X_F_copy_1}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_1} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_F_copy_1}->SetMinSize($self->{_1_X_F_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg}->Add($self->{_1_X_F_copy_1}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_m1abs} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_2}->Add($self->{sizer_6_m1abs}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_2} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_N_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs}->Add($self->{_0_N_N_copy_2}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_2} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_N_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs}->Add($self->{_1_N_N_copy_2}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_2} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_N_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs}->Add($self->{_0_X_N_copy_2}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_2} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_N_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs}->Add($self->{_1_X_N_copy_2}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_2} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_F_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs}->Add($self->{_0_N_F_copy_2}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_2} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_F_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs}->Add($self->{_1_N_F_copy_2}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_2} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_F_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs}->Add($self->{_0_X_F_copy_2}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_2} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_F_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs}->Add($self->{_1_X_F_copy_2}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_absm1} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_2}->Add($self->{sizer_6_absm1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_3} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_N_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1}->Add($self->{_0_N_N_copy_3}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_3} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_N_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1}->Add($self->{_1_N_N_copy_3}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_3} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_N_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1}->Add($self->{_0_X_N_copy_3}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_3} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_N_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1}->Add($self->{_1_X_N_copy_3}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_3} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_F_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1}->Add($self->{_0_N_F_copy_3}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_3} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_F_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1}->Add($self->{_1_N_F_copy_3}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_3} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_F_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1}->Add($self->{_0_X_F_copy_3}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_3} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_F_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1}->Add($self->{_1_X_F_copy_3}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_m1dlg} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_2}->Add($self->{sizer_6_m1dlg}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_4} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_N_copy_4}->SetMinSize($self->{_0_N_N_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg}->Add($self->{_0_N_N_copy_4}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_4} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_N_copy_4}->SetMinSize($self->{_1_N_N_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg}->Add($self->{_1_N_N_copy_4}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_4} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_N_copy_4}->SetMinSize($self->{_0_X_N_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg}->Add($self->{_0_X_N_copy_4}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_4} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_N_copy_4}->SetMinSize($self->{_1_X_N_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg}->Add($self->{_1_X_N_copy_4}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_4} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_F_copy_4}->SetMinSize($self->{_0_N_F_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg}->Add($self->{_0_N_F_copy_4}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_4} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_F_copy_4}->SetMinSize($self->{_1_N_F_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg}->Add($self->{_1_N_F_copy_4}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_4} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{sizer_6_m1dlg}->Add($self->{_0_X_F_copy_4}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_4} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{sizer_6_m1dlg}->Add($self->{_1_X_F_copy_4}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_dlgm1} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_2}->Add($self->{sizer_6_dlgm1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_5} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_N_copy_5}->SetMinSize($self->{_0_N_N_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1}->Add($self->{_0_N_N_copy_5}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_5} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_N_copy_5}->SetMinSize($self->{_1_N_N_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1}->Add($self->{_1_N_N_copy_5}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_5} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_N_copy_5}->SetMinSize($self->{_0_X_N_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1}->Add($self->{_0_X_N_copy_5}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_5} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_N_copy_5}->SetMinSize($self->{_1_X_N_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1}->Add($self->{_1_X_N_copy_5}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_5} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_N_F_copy_5}->SetMinSize($self->{_0_N_F_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1}->Add($self->{_0_N_F_copy_5}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_5} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_N_F_copy_5}->SetMinSize($self->{_1_N_F_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1}->Add($self->{_1_N_F_copy_5}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_5} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_0_X_F_copy_5}->SetMinSize($self->{_0_X_F_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1}->Add($self->{_0_X_F_copy_5}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_5} = Wx::TextCtrl->new($self->{notebook_1_pane_1}, wxID_ANY, "");
+    $self->{_1_X_F_copy_5}->SetMinSize($self->{_1_X_F_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1}->Add($self->{_1_X_F_copy_5}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{notebook_1_WrapSizer} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_WrapSizer}, _T("WrapSizer"));
+    
+    $self->{sizer_8} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{sizer_3_nosize_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
+    $self->{sizer_8}->Add($self->{sizer_3_nosize_copy_1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_30} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy_1}->Add($self->{_0_N_N_copy_30}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_30} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy_1}->Add($self->{_1_N_N_copy_30}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_30} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy_1}->Add($self->{_0_X_N_copy_30}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_30} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy_1}->Add($self->{_1_X_N_copy_30}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_30} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy_1}->Add($self->{_0_N_F_copy_30}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_30} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy_1}->Add($self->{_1_N_F_copy_30}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_30} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy_1}->Add($self->{_0_X_F_copy_30}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_30} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy_1}->Add($self->{_1_X_F_copy_30}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_4_abs_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
+    $self->{sizer_8}->Add($self->{sizer_4_abs_copy_1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_30_copy} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy_1}->Add($self->{_0_N_N_copy_30_copy}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_30_copy} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy_1}->Add($self->{_1_N_N_copy_30_copy}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_30_copy} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy_1}->Add($self->{_0_X_N_copy_30_copy}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_30_copy} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy_1}->Add($self->{_1_X_N_copy_30_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_30_copy} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy_1}->Add($self->{_0_N_F_copy_30_copy}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_30_copy} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy_1}->Add($self->{_1_N_F_copy_30_copy}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_30_copy} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy_1}->Add($self->{_0_X_F_copy_30_copy}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_30_copy} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy_1}->Add($self->{_1_X_F_copy_30_copy}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_5_dlg_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
+    $self->{sizer_8}->Add($self->{sizer_5_dlg_copy_1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_30_copy_1} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_30_copy_1}->SetMinSize($self->{_0_N_N_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy_1}->Add($self->{_0_N_N_copy_30_copy_1}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_30_copy_1} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_30_copy_1}->SetMinSize($self->{_1_N_N_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy_1}->Add($self->{_1_N_N_copy_30_copy_1}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_30_copy_1} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_30_copy_1}->SetMinSize($self->{_0_X_N_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy_1}->Add($self->{_0_X_N_copy_30_copy_1}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_30_copy_1} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_30_copy_1}->SetMinSize($self->{_1_X_N_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy_1}->Add($self->{_1_X_N_copy_30_copy_1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_30_copy_1} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_30_copy_1}->SetMinSize($self->{_0_N_F_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy_1}->Add($self->{_0_N_F_copy_30_copy_1}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_30_copy_1} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_30_copy_1}->SetMinSize($self->{_1_N_F_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy_1}->Add($self->{_1_N_F_copy_30_copy_1}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_30_copy_1} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_30_copy_1}->SetMinSize($self->{_0_X_F_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy_1}->Add($self->{_0_X_F_copy_30_copy_1}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_30_copy_1} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_30_copy_1}->SetMinSize($self->{_1_X_F_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy_1}->Add($self->{_1_X_F_copy_30_copy_1}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_m1abs_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
+    $self->{sizer_8}->Add($self->{sizer_6_m1abs_copy_1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_30_copy_2} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy_1}->Add($self->{_0_N_N_copy_30_copy_2}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_30_copy_2} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy_1}->Add($self->{_1_N_N_copy_30_copy_2}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_30_copy_2} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy_1}->Add($self->{_0_X_N_copy_30_copy_2}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_30_copy_2} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy_1}->Add($self->{_1_X_N_copy_30_copy_2}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_30_copy_2} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy_1}->Add($self->{_0_N_F_copy_30_copy_2}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_30_copy_2} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy_1}->Add($self->{_1_N_F_copy_30_copy_2}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_30_copy_2} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy_1}->Add($self->{_0_X_F_copy_30_copy_2}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_30_copy_2} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy_1}->Add($self->{_1_X_F_copy_30_copy_2}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_absm1_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
+    $self->{sizer_8}->Add($self->{sizer_6_absm1_copy_1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_30_copy_3} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy_1}->Add($self->{_0_N_N_copy_30_copy_3}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_30_copy_3} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy_1}->Add($self->{_1_N_N_copy_30_copy_3}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_30_copy_3} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy_1}->Add($self->{_0_X_N_copy_30_copy_3}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_30_copy_3} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy_1}->Add($self->{_1_X_N_copy_30_copy_3}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_30_copy_3} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy_1}->Add($self->{_0_N_F_copy_30_copy_3}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_30_copy_3} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy_1}->Add($self->{_1_N_F_copy_30_copy_3}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_30_copy_3} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy_1}->Add($self->{_0_X_F_copy_30_copy_3}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_30_copy_3} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy_1}->Add($self->{_1_X_F_copy_30_copy_3}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_m1dlg_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
+    $self->{sizer_8}->Add($self->{sizer_6_m1dlg_copy_1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_30_copy_4} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_30_copy_4}->SetMinSize($self->{_0_N_N_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_0_N_N_copy_30_copy_4}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_30_copy_4} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_30_copy_4}->SetMinSize($self->{_1_N_N_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_1_N_N_copy_30_copy_4}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_30_copy_4} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_30_copy_4}->SetMinSize($self->{_0_X_N_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_0_X_N_copy_30_copy_4}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_30_copy_4} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_30_copy_4}->SetMinSize($self->{_1_X_N_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_1_X_N_copy_30_copy_4}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_30_copy_4} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_30_copy_4}->SetMinSize($self->{_0_N_F_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_0_N_F_copy_30_copy_4}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_30_copy_4} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_30_copy_4}->SetMinSize($self->{_1_N_F_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_1_N_F_copy_30_copy_4}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_30_copy_4} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_0_X_F_copy_30_copy_4}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_30_copy_4} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_1_X_F_copy_30_copy_4}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_dlgm1_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
+    $self->{sizer_8}->Add($self->{sizer_6_dlgm1_copy_1}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_30_copy_5} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_30_copy_5}->SetMinSize($self->{_0_N_N_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_0_N_N_copy_30_copy_5}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_30_copy_5} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_30_copy_5}->SetMinSize($self->{_1_N_N_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_1_N_N_copy_30_copy_5}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_30_copy_5} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_30_copy_5}->SetMinSize($self->{_0_X_N_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_0_X_N_copy_30_copy_5}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_30_copy_5} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_30_copy_5}->SetMinSize($self->{_1_X_N_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_1_X_N_copy_30_copy_5}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_30_copy_5} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_30_copy_5}->SetMinSize($self->{_0_N_F_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_0_N_F_copy_30_copy_5}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_30_copy_5} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_30_copy_5}->SetMinSize($self->{_1_N_F_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_1_N_F_copy_30_copy_5}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_30_copy_5} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_30_copy_5}->SetMinSize($self->{_0_X_F_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_0_X_F_copy_30_copy_5}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_30_copy_5} = Wx::TextCtrl->new($self->{notebook_1_WrapSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_30_copy_5}->SetMinSize($self->{_1_X_F_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_1_X_F_copy_30_copy_5}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{notebook_1_StaticBoxSizer} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_StaticBoxSizer}, _T("StaticBoxSizer"));
+    
+    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{sizer_3_nosize_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_3_nosize_copy")), wxVERTICAL);
+    $self->{sizer_3}->Add($self->{sizer_3_nosize_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_6} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy}->Add($self->{_0_N_N_copy_6}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_6} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy}->Add($self->{_1_N_N_copy_6}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_6} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy}->Add($self->{_0_X_N_copy_6}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_6} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy}->Add($self->{_1_X_N_copy_6}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_6} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy}->Add($self->{_0_N_F_copy_6}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_6} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy}->Add($self->{_1_N_F_copy_6}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_6} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy}->Add($self->{_0_X_F_copy_6}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_6} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{sizer_3_nosize_copy}->Add($self->{_1_X_F_copy_6}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_4_abs_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_4_abs_copy")), wxVERTICAL);
+    $self->{sizer_3}->Add($self->{sizer_4_abs_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy}->Add($self->{_0_N_N_copy_copy}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy}->Add($self->{_1_N_N_copy_copy}, 1, 0, 0);
+    
+    $self->{_0_X_N_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy}->Add($self->{_0_X_N_copy_copy}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy}->Add($self->{_1_X_N_copy_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy}->Add($self->{_0_N_F_copy_copy}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy}->Add($self->{_1_N_F_copy_copy}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy}->Add($self->{_0_X_F_copy_copy}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4_abs_copy}->Add($self->{_1_X_F_copy_copy}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_5_dlg_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_5_dlg_copy")), wxVERTICAL);
+    $self->{sizer_3}->Add($self->{sizer_5_dlg_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_7} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_7}->SetMinSize($self->{_0_N_N_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy}->Add($self->{_0_N_N_copy_7}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_7} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_7}->SetMinSize($self->{_1_N_N_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy}->Add($self->{_1_N_N_copy_7}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_7} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_7}->SetMinSize($self->{_0_X_N_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy}->Add($self->{_0_X_N_copy_7}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_7} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_7}->SetMinSize($self->{_1_X_N_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy}->Add($self->{_1_X_N_copy_7}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_7} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_7}->SetMinSize($self->{_0_N_F_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy}->Add($self->{_0_N_F_copy_7}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_7} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_7}->SetMinSize($self->{_1_N_F_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy}->Add($self->{_1_N_F_copy_7}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_7} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_7}->SetMinSize($self->{_0_X_F_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy}->Add($self->{_0_X_F_copy_7}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_7} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_7}->SetMinSize($self->{_1_X_F_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5_dlg_copy}->Add($self->{_1_X_F_copy_7}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_m1abs_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_6_m1abs_copy")), wxVERTICAL);
+    $self->{sizer_3}->Add($self->{sizer_6_m1abs_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_8} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy}->Add($self->{_0_N_N_copy_8}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_8} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy}->Add($self->{_1_N_N_copy_8}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_8} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy}->Add($self->{_0_X_N_copy_8}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_8} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy}->Add($self->{_1_X_N_copy_8}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_8} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy}->Add($self->{_0_N_F_copy_8}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_8} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy}->Add($self->{_1_N_F_copy_8}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_8} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy}->Add($self->{_0_X_F_copy_8}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_8} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_6_m1abs_copy}->Add($self->{_1_X_F_copy_8}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_absm1_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_6_absm1_copy")), wxVERTICAL);
+    $self->{sizer_3}->Add($self->{sizer_6_absm1_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_9} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_9}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy}->Add($self->{_0_N_N_copy_9}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_9} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_9}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy}->Add($self->{_1_N_N_copy_9}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_9} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_9}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy}->Add($self->{_0_X_N_copy_9}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_9} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_9}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy}->Add($self->{_1_X_N_copy_9}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_9} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_9}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy}->Add($self->{_0_N_F_copy_9}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_9} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_9}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy}->Add($self->{_1_N_F_copy_9}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_9} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_9}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy}->Add($self->{_0_X_F_copy_9}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_9} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_9}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_6_absm1_copy}->Add($self->{_1_X_F_copy_9}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_m1dlg_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_6_m1dlg_copy")), wxVERTICAL);
+    $self->{sizer_3}->Add($self->{sizer_6_m1dlg_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_10} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_10}->SetMinSize($self->{_0_N_N_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy}->Add($self->{_0_N_N_copy_10}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_10} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_10}->SetMinSize($self->{_1_N_N_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy}->Add($self->{_1_N_N_copy_10}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_10} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_10}->SetMinSize($self->{_0_X_N_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy}->Add($self->{_0_X_N_copy_10}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_10} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_10}->SetMinSize($self->{_1_X_N_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy}->Add($self->{_1_X_N_copy_10}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_10} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_10}->SetMinSize($self->{_0_N_F_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy}->Add($self->{_0_N_F_copy_10}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_10} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_10}->SetMinSize($self->{_1_N_F_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_6_m1dlg_copy}->Add($self->{_1_N_F_copy_10}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_10} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{sizer_6_m1dlg_copy}->Add($self->{_0_X_F_copy_10}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_10} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{sizer_6_m1dlg_copy}->Add($self->{_1_X_F_copy_10}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{sizer_6_dlgm1_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_6_dlgm1_copy")), wxVERTICAL);
+    $self->{sizer_3}->Add($self->{sizer_6_dlgm1_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_N_copy_11} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_11}->SetMinSize($self->{_0_N_N_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy}->Add($self->{_0_N_N_copy_11}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_11} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_11}->SetMinSize($self->{_1_N_N_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy}->Add($self->{_1_N_N_copy_11}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_11} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_11}->SetMinSize($self->{_0_X_N_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy}->Add($self->{_0_X_N_copy_11}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_11} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_11}->SetMinSize($self->{_1_X_N_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy}->Add($self->{_1_X_N_copy_11}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_11} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_11}->SetMinSize($self->{_0_N_F_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy}->Add($self->{_0_N_F_copy_11}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_11} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_11}->SetMinSize($self->{_1_N_F_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy}->Add($self->{_1_N_F_copy_11}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_11} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_11}->SetMinSize($self->{_0_X_F_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy}->Add($self->{_0_X_F_copy_11}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_11} = Wx::TextCtrl->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_11}->SetMinSize($self->{_1_X_F_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_6_dlgm1_copy}->Add($self->{_1_X_F_copy_11}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{notebook_1_GridSizer} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_GridSizer}, _T("GridSizer"));
+    
+    $self->{sizer_4} = Wx::GridSizer->new(7, 8, 0, 0);
+    
     $self->{_0_N_N_copy_12} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{sizer_4}->Add($self->{_0_N_N_copy_12}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_12} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{sizer_4}->Add($self->{_1_N_N_copy_12}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_12} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{sizer_4}->Add($self->{_0_X_N_copy_12}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_12} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{sizer_4}->Add($self->{_1_X_N_copy_12}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_12} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{sizer_4}->Add($self->{_0_N_F_copy_12}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_12} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{sizer_4}->Add($self->{_1_N_F_copy_12}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_12} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{sizer_4}->Add($self->{_0_X_F_copy_12}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_12} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{sizer_4}->Add($self->{_1_X_F_copy_12}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_0_N_N_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4}->Add($self->{_0_N_N_copy_copy_copy}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4}->Add($self->{_1_N_N_copy_copy_copy}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4}->Add($self->{_0_X_N_copy_copy_copy}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4}->Add($self->{_1_X_N_copy_copy_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4}->Add($self->{_0_N_F_copy_copy_copy}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4}->Add($self->{_1_N_F_copy_copy_copy}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4}->Add($self->{_0_X_F_copy_copy_copy}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_4}->Add($self->{_1_X_F_copy_copy_copy}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_0_N_N_copy_13} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_13}->SetMinSize($self->{_0_N_N_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_4}->Add($self->{_0_N_N_copy_13}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_13} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_13}->SetMinSize($self->{_1_N_N_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_4}->Add($self->{_1_N_N_copy_13}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_13} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_13}->SetMinSize($self->{_0_X_N_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_4}->Add($self->{_0_X_N_copy_13}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_13} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_13}->SetMinSize($self->{_1_X_N_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_4}->Add($self->{_1_X_N_copy_13}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_13} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_13}->SetMinSize($self->{_0_N_F_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_4}->Add($self->{_0_N_F_copy_13}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_13} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_13}->SetMinSize($self->{_1_N_F_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_4}->Add($self->{_1_N_F_copy_13}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_13} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_13}->SetMinSize($self->{_0_X_F_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_4}->Add($self->{_0_X_F_copy_13}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_13} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_13}->SetMinSize($self->{_1_X_F_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_4}->Add($self->{_1_X_F_copy_13}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_0_N_N_copy_14} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_4}->Add($self->{_0_N_N_copy_14}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_14} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_4}->Add($self->{_1_N_N_copy_14}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_14} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_4}->Add($self->{_0_X_N_copy_14}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_14} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_4}->Add($self->{_1_X_N_copy_14}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_14} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_4}->Add($self->{_0_N_F_copy_14}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_14} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_4}->Add($self->{_1_N_F_copy_14}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_14} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_4}->Add($self->{_0_X_F_copy_14}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_14} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_4}->Add($self->{_1_X_F_copy_14}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_0_N_N_copy_15} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_15}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_4}->Add($self->{_0_N_N_copy_15}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_15} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_15}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_4}->Add($self->{_1_N_N_copy_15}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_15} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_15}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_4}->Add($self->{_0_X_N_copy_15}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_15} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_15}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_4}->Add($self->{_1_X_N_copy_15}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_15} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_15}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_4}->Add($self->{_0_N_F_copy_15}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_15} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_15}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_4}->Add($self->{_1_N_F_copy_15}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_15} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_15}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_4}->Add($self->{_0_X_F_copy_15}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_15} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_15}->SetMinSize(Wx::Size->new(100, -1));
+    $self->{sizer_4}->Add($self->{_1_X_F_copy_15}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_0_N_N_copy_16} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_16}->SetMinSize($self->{_0_N_N_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_4}->Add($self->{_0_N_N_copy_16}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_16} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_16}->SetMinSize($self->{_1_N_N_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_4}->Add($self->{_1_N_N_copy_16}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_16} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_16}->SetMinSize($self->{_0_X_N_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_4}->Add($self->{_0_X_N_copy_16}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_16} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_16}->SetMinSize($self->{_1_X_N_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_4}->Add($self->{_1_X_N_copy_16}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_16} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_16}->SetMinSize($self->{_0_N_F_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_4}->Add($self->{_0_N_F_copy_16}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_16} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_16}->SetMinSize($self->{_1_N_F_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
+    $self->{sizer_4}->Add($self->{_1_N_F_copy_16}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_16} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{sizer_4}->Add($self->{_0_X_F_copy_16}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_16} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{sizer_4}->Add($self->{_1_X_F_copy_16}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_0_N_N_copy_17} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_17}->SetMinSize($self->{_0_N_N_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_4}->Add($self->{_0_N_N_copy_17}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_17} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_17}->SetMinSize($self->{_1_N_N_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_4}->Add($self->{_1_N_N_copy_17}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_17} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_17}->SetMinSize($self->{_0_X_N_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_4}->Add($self->{_0_X_N_copy_17}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_17} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_17}->SetMinSize($self->{_1_X_N_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_4}->Add($self->{_1_X_N_copy_17}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_17} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_17}->SetMinSize($self->{_0_N_F_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_4}->Add($self->{_0_N_F_copy_17}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_17} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_17}->SetMinSize($self->{_1_N_F_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_4}->Add($self->{_1_N_F_copy_17}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_17} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_17}->SetMinSize($self->{_0_X_F_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_4}->Add($self->{_0_X_F_copy_17}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_17} = Wx::TextCtrl->new($self->{notebook_1_GridSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_17}->SetMinSize($self->{_1_X_F_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
+    $self->{sizer_4}->Add($self->{_1_X_F_copy_17}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{notebook_1_FlexGridSizer} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_FlexGridSizer}, _T("FlexGridSizer"));
+    
+    $self->{sizer_5} = Wx::FlexGridSizer->new(7, 8, 1, 1);
+    
     $self->{_0_N_N_copy_18} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{sizer_5}->Add($self->{_0_N_N_copy_18}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_18} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{sizer_5}->Add($self->{_1_N_N_copy_18}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_18} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{sizer_5}->Add($self->{_0_X_N_copy_18}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_18} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{sizer_5}->Add($self->{_1_X_N_copy_18}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_18} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{sizer_5}->Add($self->{_0_N_F_copy_18}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_18} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{sizer_5}->Add($self->{_1_N_F_copy_18}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_18} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{sizer_5}->Add($self->{_0_X_F_copy_18}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_18} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{sizer_5}->Add($self->{_1_X_F_copy_18}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_0_N_N_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_5}->Add($self->{_0_N_N_copy_copy_copy_copy}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_5}->Add($self->{_1_N_N_copy_copy_copy_copy}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_5}->Add($self->{_0_X_N_copy_copy_copy_copy}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_5}->Add($self->{_1_X_N_copy_copy_copy_copy}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_5}->Add($self->{_0_N_F_copy_copy_copy_copy}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_5}->Add($self->{_1_N_F_copy_copy_copy_copy}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_5}->Add($self->{_0_X_F_copy_copy_copy_copy}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_5}->Add($self->{_1_X_F_copy_copy_copy_copy}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_0_N_N_copy_19} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_19}->SetMinSize($self->{_0_N_N_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5}->Add($self->{_0_N_N_copy_19}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_19} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_19}->SetMinSize($self->{_1_N_N_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5}->Add($self->{_1_N_N_copy_19}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_19} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_19}->SetMinSize($self->{_0_X_N_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5}->Add($self->{_0_X_N_copy_19}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_19} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_19}->SetMinSize($self->{_1_X_N_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5}->Add($self->{_1_X_N_copy_19}, 1, wxEXPAND, 0);
+    
     $self->{_0_N_F_copy_19} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_19}->SetMinSize($self->{_0_N_F_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5}->Add($self->{_0_N_F_copy_19}, 0, wxFIXED_MINSIZE, 0);
+    
     $self->{_1_N_F_copy_19} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_19}->SetMinSize($self->{_1_N_F_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5}->Add($self->{_1_N_F_copy_19}, 1, wxFIXED_MINSIZE, 0);
+    
     $self->{_0_X_F_copy_19} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_19}->SetMinSize($self->{_0_X_F_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5}->Add($self->{_0_X_F_copy_19}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_1_X_F_copy_19} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_19}->SetMinSize($self->{_1_X_F_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_5}->Add($self->{_1_X_F_copy_19}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
     $self->{_0_N_N_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_5}->Add($self->{_0_N_N_copy_20}, 0, 0, 0);
+    
     $self->{_1_N_N_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_5}->Add($self->{_1_N_N_copy_20}, 1, 0, 0);
+    
     $self->{_0_X_N_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_5}->Add($self->{_0_X_N_copy_20}, 0, wxEXPAND, 0);
+    
     $self->{_1_X_N_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_N_N_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_N_N_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_X_N_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_N_N_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_N_N_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_X_N_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_N_N_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_N_N_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_X_N_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
-    $self->{notebook_1_GridBagSizer} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{_0_N_N_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_N_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_N_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_N_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_N_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_N_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_N_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_N_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_N_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_N_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_N_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_N_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_N_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_N_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_N_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_N_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_N_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_N_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_N_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_N_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_N_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_N_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_N_F_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_N_F_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_0_X_F_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{_1_X_F_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
-    $self->{notebook_1_BorderTest} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{_0_N_N_border_10_none} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
-    $self->{_1_N_N_border_0_all} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
-    $self->{_0_X_N_border_5_LEFTRIGHT} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
-    $self->{_1_X_N_border_15_BOTTOM} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
-    $self->{_0_N_N_copy_copy_1} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
-    $self->{_0_N_N_copy_31} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
-    $self->{_0_N_N_copy_32} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
-    $self->{notebook_1_GridBagSizer_Spacers} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
-    $self->{button_1} = Wx::Button->new($self->{notebook_1_GridBagSizer_Spacers}, wxID_ANY, _T("button_1"));
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
-    $self->SetTitle(_T("frame"));
-    $self->{_0_N_N_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_N_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_N_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_N_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_F_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_F_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_F_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_F_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_N_copy_1}->SetMinSize($self->{_0_N_N_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_N_copy_1}->SetMinSize($self->{_1_N_N_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_N_copy_1}->SetMinSize($self->{_0_X_N_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_N_copy_1}->SetMinSize($self->{_1_X_N_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_F_copy_1}->SetMinSize($self->{_0_N_F_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_F_copy_1}->SetMinSize($self->{_1_N_F_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_F_copy_1}->SetMinSize($self->{_0_X_F_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_F_copy_1}->SetMinSize($self->{_1_X_F_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_N_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_N_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_N_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_N_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_F_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_F_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_F_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_F_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_N_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_N_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_N_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_N_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_F_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_F_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_F_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_F_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_N_copy_4}->SetMinSize($self->{_0_N_N_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_N_copy_4}->SetMinSize($self->{_1_N_N_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_X_N_copy_4}->SetMinSize($self->{_0_X_N_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_X_N_copy_4}->SetMinSize($self->{_1_X_N_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_F_copy_4}->SetMinSize($self->{_0_N_F_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_F_copy_4}->SetMinSize($self->{_1_N_F_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_N_copy_5}->SetMinSize($self->{_0_N_N_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_N_copy_5}->SetMinSize($self->{_1_N_N_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_N_copy_5}->SetMinSize($self->{_0_X_N_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_N_copy_5}->SetMinSize($self->{_1_X_N_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_F_copy_5}->SetMinSize($self->{_0_N_F_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_F_copy_5}->SetMinSize($self->{_1_N_F_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_F_copy_5}->SetMinSize($self->{_0_X_F_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_F_copy_5}->SetMinSize($self->{_1_X_F_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_N_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_N_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_N_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_N_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_F_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_F_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_F_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_F_copy_30_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_N_copy_30_copy_1}->SetMinSize($self->{_0_N_N_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_N_copy_30_copy_1}->SetMinSize($self->{_1_N_N_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_N_copy_30_copy_1}->SetMinSize($self->{_0_X_N_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_N_copy_30_copy_1}->SetMinSize($self->{_1_X_N_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_F_copy_30_copy_1}->SetMinSize($self->{_0_N_F_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_F_copy_30_copy_1}->SetMinSize($self->{_1_N_F_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_F_copy_30_copy_1}->SetMinSize($self->{_0_X_F_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_F_copy_30_copy_1}->SetMinSize($self->{_1_X_F_copy_30_copy_1}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_N_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_N_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_N_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_N_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_F_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_F_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_F_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_F_copy_30_copy_2}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_N_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_N_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_N_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_N_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_F_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_F_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_F_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_F_copy_30_copy_3}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_N_copy_30_copy_4}->SetMinSize($self->{_0_N_N_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_N_copy_30_copy_4}->SetMinSize($self->{_1_N_N_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_X_N_copy_30_copy_4}->SetMinSize($self->{_0_X_N_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_X_N_copy_30_copy_4}->SetMinSize($self->{_1_X_N_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_F_copy_30_copy_4}->SetMinSize($self->{_0_N_F_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_F_copy_30_copy_4}->SetMinSize($self->{_1_N_F_copy_30_copy_4}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_N_copy_30_copy_5}->SetMinSize($self->{_0_N_N_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_N_copy_30_copy_5}->SetMinSize($self->{_1_N_N_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_N_copy_30_copy_5}->SetMinSize($self->{_0_X_N_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_N_copy_30_copy_5}->SetMinSize($self->{_1_X_N_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_F_copy_30_copy_5}->SetMinSize($self->{_0_N_F_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_F_copy_30_copy_5}->SetMinSize($self->{_1_N_F_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_F_copy_30_copy_5}->SetMinSize($self->{_0_X_F_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_F_copy_30_copy_5}->SetMinSize($self->{_1_X_F_copy_30_copy_5}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_N_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_N_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_N_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_N_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_F_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_F_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_F_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_F_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_N_copy_7}->SetMinSize($self->{_0_N_N_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_N_copy_7}->SetMinSize($self->{_1_N_N_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_N_copy_7}->SetMinSize($self->{_0_X_N_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_N_copy_7}->SetMinSize($self->{_1_X_N_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_F_copy_7}->SetMinSize($self->{_0_N_F_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_F_copy_7}->SetMinSize($self->{_1_N_F_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_F_copy_7}->SetMinSize($self->{_0_X_F_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_F_copy_7}->SetMinSize($self->{_1_X_F_copy_7}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_N_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_N_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_N_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_N_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_F_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_F_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_F_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_F_copy_8}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_N_copy_9}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_N_copy_9}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_N_copy_9}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_N_copy_9}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_F_copy_9}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_F_copy_9}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_F_copy_9}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_F_copy_9}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_N_copy_10}->SetMinSize($self->{_0_N_N_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_N_copy_10}->SetMinSize($self->{_1_N_N_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_X_N_copy_10}->SetMinSize($self->{_0_X_N_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_X_N_copy_10}->SetMinSize($self->{_1_X_N_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_F_copy_10}->SetMinSize($self->{_0_N_F_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_F_copy_10}->SetMinSize($self->{_1_N_F_copy_10}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_N_copy_11}->SetMinSize($self->{_0_N_N_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_N_copy_11}->SetMinSize($self->{_1_N_N_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_N_copy_11}->SetMinSize($self->{_0_X_N_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_N_copy_11}->SetMinSize($self->{_1_X_N_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_F_copy_11}->SetMinSize($self->{_0_N_F_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_F_copy_11}->SetMinSize($self->{_1_N_F_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_F_copy_11}->SetMinSize($self->{_0_X_F_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_F_copy_11}->SetMinSize($self->{_1_X_F_copy_11}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_N_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_N_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_N_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_N_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_F_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_F_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_F_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_F_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_N_copy_13}->SetMinSize($self->{_0_N_N_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_N_copy_13}->SetMinSize($self->{_1_N_N_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_N_copy_13}->SetMinSize($self->{_0_X_N_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_N_copy_13}->SetMinSize($self->{_1_X_N_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_F_copy_13}->SetMinSize($self->{_0_N_F_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_F_copy_13}->SetMinSize($self->{_1_N_F_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_F_copy_13}->SetMinSize($self->{_0_X_F_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_F_copy_13}->SetMinSize($self->{_1_X_F_copy_13}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_N_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_N_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_N_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_N_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_F_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_F_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_F_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_F_copy_14}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_N_copy_15}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_N_copy_15}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_N_copy_15}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_N_copy_15}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_F_copy_15}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_F_copy_15}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_F_copy_15}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_F_copy_15}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_N_copy_16}->SetMinSize($self->{_0_N_N_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_N_copy_16}->SetMinSize($self->{_1_N_N_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_X_N_copy_16}->SetMinSize($self->{_0_X_N_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_X_N_copy_16}->SetMinSize($self->{_1_X_N_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_F_copy_16}->SetMinSize($self->{_0_N_F_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_F_copy_16}->SetMinSize($self->{_1_N_F_copy_16}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_N_copy_17}->SetMinSize($self->{_0_N_N_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_N_copy_17}->SetMinSize($self->{_1_N_N_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_N_copy_17}->SetMinSize($self->{_0_X_N_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_N_copy_17}->SetMinSize($self->{_1_X_N_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_F_copy_17}->SetMinSize($self->{_0_N_F_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_F_copy_17}->SetMinSize($self->{_1_N_F_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_F_copy_17}->SetMinSize($self->{_0_X_F_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_F_copy_17}->SetMinSize($self->{_1_X_F_copy_17}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_N_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_N_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_N_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_N_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_F_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_F_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_F_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_F_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_N_copy_19}->SetMinSize($self->{_0_N_N_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_N_copy_19}->SetMinSize($self->{_1_N_N_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_N_copy_19}->SetMinSize($self->{_0_X_N_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_N_copy_19}->SetMinSize($self->{_1_X_N_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_F_copy_19}->SetMinSize($self->{_0_N_F_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_F_copy_19}->SetMinSize($self->{_1_N_F_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_F_copy_19}->SetMinSize($self->{_0_X_F_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_F_copy_19}->SetMinSize($self->{_1_X_F_copy_19}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_N_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_N_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_N_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_N_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_F_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_F_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_F_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_F_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_N_copy_21}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_N_copy_21}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_N_copy_21}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_N_copy_21}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_F_copy_21}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_F_copy_21}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_F_copy_21}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_F_copy_21}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_N_copy_22}->SetMinSize($self->{_0_N_N_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_N_copy_22}->SetMinSize($self->{_1_N_N_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_X_N_copy_22}->SetMinSize($self->{_0_X_N_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_X_N_copy_22}->SetMinSize($self->{_1_X_N_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_F_copy_22}->SetMinSize($self->{_0_N_F_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_F_copy_22}->SetMinSize($self->{_1_N_F_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_N_copy_23}->SetMinSize($self->{_0_N_N_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_N_copy_23}->SetMinSize($self->{_1_N_N_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_N_copy_23}->SetMinSize($self->{_0_X_N_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_N_copy_23}->SetMinSize($self->{_1_X_N_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_F_copy_23}->SetMinSize($self->{_0_N_F_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_F_copy_23}->SetMinSize($self->{_1_N_F_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_F_copy_23}->SetMinSize($self->{_0_X_F_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_F_copy_23}->SetMinSize($self->{_1_X_F_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_N_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_N_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_N_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_N_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_F_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_N_F_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_X_F_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_1_X_F_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_N_copy_25}->SetMinSize($self->{_0_N_N_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_N_copy_25}->SetMinSize($self->{_1_N_N_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_N_copy_25}->SetMinSize($self->{_0_X_N_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_N_copy_25}->SetMinSize($self->{_1_X_N_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_F_copy_25}->SetMinSize($self->{_0_N_F_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_N_F_copy_25}->SetMinSize($self->{_1_N_F_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_X_F_copy_25}->SetMinSize($self->{_0_X_F_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_1_X_F_copy_25}->SetMinSize($self->{_1_X_F_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_N_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_N_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_N_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_N_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_F_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_N_F_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_X_F_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_1_X_F_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
-    $self->{_0_N_N_copy_27}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_N_copy_27}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_N_copy_27}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_N_copy_27}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_F_copy_27}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_N_F_copy_27}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_X_F_copy_27}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_1_X_F_copy_27}->SetMinSize(Wx::Size->new(100, -1));
-    $self->{_0_N_N_copy_28}->SetMinSize($self->{_0_N_N_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_N_copy_28}->SetMinSize($self->{_1_N_N_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_X_N_copy_28}->SetMinSize($self->{_0_X_N_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_X_N_copy_28}->SetMinSize($self->{_1_X_N_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_F_copy_28}->SetMinSize($self->{_0_N_F_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_1_N_F_copy_28}->SetMinSize($self->{_1_N_F_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
-    $self->{_0_N_N_copy_29}->SetMinSize($self->{_0_N_N_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_N_copy_29}->SetMinSize($self->{_1_N_N_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_N_copy_29}->SetMinSize($self->{_0_X_N_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_N_copy_29}->SetMinSize($self->{_1_X_N_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_F_copy_29}->SetMinSize($self->{_0_N_F_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_N_F_copy_29}->SetMinSize($self->{_1_N_F_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_X_F_copy_29}->SetMinSize($self->{_0_X_F_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_1_X_F_copy_29}->SetMinSize($self->{_1_X_F_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
-    $self->{_0_N_N_copy_copy_1}->SetMinSize(Wx::Size->new(100, 21));
-    $self->{_0_N_N_copy_31}->SetMinSize($self->{_0_N_N_copy_31}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
-    $self->{_0_N_N_copy_32}->SetMinSize(Wx::Size->new(-1, 21));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
-    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{grid_sizer_1} = Wx::GridBagSizer->new(0, 0);
-    $self->{sizer_7} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_border_15_BOTTOM} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_border_5_LEFTRIGHT} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_border_0_ALL} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_border_10_none} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_6} = Wx::GridBagSizer->new(1, 1);
-    $self->{sizer_5} = Wx::FlexGridSizer->new(7, 8, 1, 1);
-    $self->{sizer_4} = Wx::GridSizer->new(7, 8, 0, 0);
-    $self->{sizer_3} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_6_dlgm1_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_6_dlgm1_copy")), wxVERTICAL);
-    $self->{sizer_6_m1dlg_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_6_m1dlg_copy")), wxVERTICAL);
-    $self->{sizer_6_absm1_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_6_absm1_copy")), wxVERTICAL);
-    $self->{sizer_6_m1abs_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_6_m1abs_copy")), wxVERTICAL);
-    $self->{sizer_5_dlg_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_5_dlg_copy")), wxVERTICAL);
-    $self->{sizer_4_abs_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_4_abs_copy")), wxVERTICAL);
-    $self->{sizer_3_nosize_copy} = Wx::StaticBoxSizer->new(Wx::StaticBox->new($self->{notebook_1_StaticBoxSizer}, wxID_ANY, _T("sizer_3_nosize_copy")), wxVERTICAL);
-    $self->{sizer_8} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_6_dlgm1_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
-    $self->{sizer_6_m1dlg_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
-    $self->{sizer_6_absm1_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
-    $self->{sizer_6_m1abs_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
-    $self->{sizer_5_dlg_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
-    $self->{sizer_4_abs_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
-    $self->{sizer_3_nosize_copy_1} = Wx::WrapSizer->new(wxHORIZONTAL);
-    $self->{sizer_2} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer_6_dlgm1} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_6_m1dlg} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_6_absm1} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_6_m1abs} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_5_dlg} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_4_abs} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_3_nosize} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->{sizer_3_nosize}->Add($self->{_0_N_N}, 0, 0, 0);
-    $self->{sizer_3_nosize}->Add($self->{_1_N_N}, 1, 0, 0);
-    $self->{sizer_3_nosize}->Add($self->{_0_X_N}, 0, wxEXPAND, 0);
-    $self->{sizer_3_nosize}->Add($self->{_1_X_N}, 1, wxEXPAND, 0);
-    $self->{sizer_3_nosize}->Add($self->{_0_N_F}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_3_nosize}->Add($self->{_1_N_F}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_3_nosize}->Add($self->{_0_X_F}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_3_nosize}->Add($self->{_1_X_F}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_2}->Add($self->{sizer_3_nosize}, 1, wxEXPAND, 0);
-    $self->{sizer_4_abs}->Add($self->{_0_N_N_copy}, 0, 0, 0);
-    $self->{sizer_4_abs}->Add($self->{_1_N_N_copy}, 1, 0, 0);
-    $self->{sizer_4_abs}->Add($self->{_0_X_N_copy}, 0, wxEXPAND, 0);
-    $self->{sizer_4_abs}->Add($self->{_1_X_N_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_4_abs}->Add($self->{_0_N_F_copy}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4_abs}->Add($self->{_1_N_F_copy}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4_abs}->Add($self->{_0_X_F_copy}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4_abs}->Add($self->{_1_X_F_copy}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_2}->Add($self->{sizer_4_abs}, 1, wxEXPAND, 0);
-    $self->{sizer_5_dlg}->Add($self->{_0_N_N_copy_1}, 0, 0, 0);
-    $self->{sizer_5_dlg}->Add($self->{_1_N_N_copy_1}, 1, 0, 0);
-    $self->{sizer_5_dlg}->Add($self->{_0_X_N_copy_1}, 0, wxEXPAND, 0);
-    $self->{sizer_5_dlg}->Add($self->{_1_X_N_copy_1}, 1, wxEXPAND, 0);
-    $self->{sizer_5_dlg}->Add($self->{_0_N_F_copy_1}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5_dlg}->Add($self->{_1_N_F_copy_1}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5_dlg}->Add($self->{_0_X_F_copy_1}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_5_dlg}->Add($self->{_1_X_F_copy_1}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_2}->Add($self->{sizer_5_dlg}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1abs}->Add($self->{_0_N_N_copy_2}, 0, 0, 0);
-    $self->{sizer_6_m1abs}->Add($self->{_1_N_N_copy_2}, 1, 0, 0);
-    $self->{sizer_6_m1abs}->Add($self->{_0_X_N_copy_2}, 0, wxEXPAND, 0);
-    $self->{sizer_6_m1abs}->Add($self->{_1_X_N_copy_2}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1abs}->Add($self->{_0_N_F_copy_2}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1abs}->Add($self->{_1_N_F_copy_2}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1abs}->Add($self->{_0_X_F_copy_2}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1abs}->Add($self->{_1_X_F_copy_2}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_2}->Add($self->{sizer_6_m1abs}, 1, wxEXPAND, 0);
-    $self->{sizer_6_absm1}->Add($self->{_0_N_N_copy_3}, 0, 0, 0);
-    $self->{sizer_6_absm1}->Add($self->{_1_N_N_copy_3}, 1, 0, 0);
-    $self->{sizer_6_absm1}->Add($self->{_0_X_N_copy_3}, 0, wxEXPAND, 0);
-    $self->{sizer_6_absm1}->Add($self->{_1_X_N_copy_3}, 1, wxEXPAND, 0);
-    $self->{sizer_6_absm1}->Add($self->{_0_N_F_copy_3}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_absm1}->Add($self->{_1_N_F_copy_3}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_absm1}->Add($self->{_0_X_F_copy_3}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_absm1}->Add($self->{_1_X_F_copy_3}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_2}->Add($self->{sizer_6_absm1}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1dlg}->Add($self->{_0_N_N_copy_4}, 0, 0, 0);
-    $self->{sizer_6_m1dlg}->Add($self->{_1_N_N_copy_4}, 1, 0, 0);
-    $self->{sizer_6_m1dlg}->Add($self->{_0_X_N_copy_4}, 0, wxEXPAND, 0);
-    $self->{sizer_6_m1dlg}->Add($self->{_1_X_N_copy_4}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1dlg}->Add($self->{_0_N_F_copy_4}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1dlg}->Add($self->{_1_N_F_copy_4}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1dlg}->Add($self->{_0_X_F_copy_4}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1dlg}->Add($self->{_1_X_F_copy_4}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_2}->Add($self->{sizer_6_m1dlg}, 1, wxEXPAND, 0);
-    $self->{sizer_6_dlgm1}->Add($self->{_0_N_N_copy_5}, 0, 0, 0);
-    $self->{sizer_6_dlgm1}->Add($self->{_1_N_N_copy_5}, 1, 0, 0);
-    $self->{sizer_6_dlgm1}->Add($self->{_0_X_N_copy_5}, 0, wxEXPAND, 0);
-    $self->{sizer_6_dlgm1}->Add($self->{_1_X_N_copy_5}, 1, wxEXPAND, 0);
-    $self->{sizer_6_dlgm1}->Add($self->{_0_N_F_copy_5}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_dlgm1}->Add($self->{_1_N_F_copy_5}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_dlgm1}->Add($self->{_0_X_F_copy_5}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_dlgm1}->Add($self->{_1_X_F_copy_5}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_2}->Add($self->{sizer_6_dlgm1}, 1, wxEXPAND, 0);
-    $self->{notebook_1_pane_1}->SetSizer($self->{sizer_2});
-    $self->{sizer_3_nosize_copy_1}->Add($self->{_0_N_N_copy_30}, 0, 0, 0);
-    $self->{sizer_3_nosize_copy_1}->Add($self->{_1_N_N_copy_30}, 1, 0, 0);
-    $self->{sizer_3_nosize_copy_1}->Add($self->{_0_X_N_copy_30}, 0, wxEXPAND, 0);
-    $self->{sizer_3_nosize_copy_1}->Add($self->{_1_X_N_copy_30}, 1, wxEXPAND, 0);
-    $self->{sizer_3_nosize_copy_1}->Add($self->{_0_N_F_copy_30}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_3_nosize_copy_1}->Add($self->{_1_N_F_copy_30}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_3_nosize_copy_1}->Add($self->{_0_X_F_copy_30}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_3_nosize_copy_1}->Add($self->{_1_X_F_copy_30}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_8}->Add($self->{sizer_3_nosize_copy_1}, 1, wxEXPAND, 0);
-    $self->{sizer_4_abs_copy_1}->Add($self->{_0_N_N_copy_30_copy}, 0, 0, 0);
-    $self->{sizer_4_abs_copy_1}->Add($self->{_1_N_N_copy_30_copy}, 1, 0, 0);
-    $self->{sizer_4_abs_copy_1}->Add($self->{_0_X_N_copy_30_copy}, 0, wxEXPAND, 0);
-    $self->{sizer_4_abs_copy_1}->Add($self->{_1_X_N_copy_30_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_4_abs_copy_1}->Add($self->{_0_N_F_copy_30_copy}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4_abs_copy_1}->Add($self->{_1_N_F_copy_30_copy}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4_abs_copy_1}->Add($self->{_0_X_F_copy_30_copy}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4_abs_copy_1}->Add($self->{_1_X_F_copy_30_copy}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_8}->Add($self->{sizer_4_abs_copy_1}, 1, wxEXPAND, 0);
-    $self->{sizer_5_dlg_copy_1}->Add($self->{_0_N_N_copy_30_copy_1}, 0, 0, 0);
-    $self->{sizer_5_dlg_copy_1}->Add($self->{_1_N_N_copy_30_copy_1}, 1, 0, 0);
-    $self->{sizer_5_dlg_copy_1}->Add($self->{_0_X_N_copy_30_copy_1}, 0, wxEXPAND, 0);
-    $self->{sizer_5_dlg_copy_1}->Add($self->{_1_X_N_copy_30_copy_1}, 1, wxEXPAND, 0);
-    $self->{sizer_5_dlg_copy_1}->Add($self->{_0_N_F_copy_30_copy_1}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5_dlg_copy_1}->Add($self->{_1_N_F_copy_30_copy_1}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5_dlg_copy_1}->Add($self->{_0_X_F_copy_30_copy_1}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_5_dlg_copy_1}->Add($self->{_1_X_F_copy_30_copy_1}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_8}->Add($self->{sizer_5_dlg_copy_1}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1abs_copy_1}->Add($self->{_0_N_N_copy_30_copy_2}, 0, 0, 0);
-    $self->{sizer_6_m1abs_copy_1}->Add($self->{_1_N_N_copy_30_copy_2}, 1, 0, 0);
-    $self->{sizer_6_m1abs_copy_1}->Add($self->{_0_X_N_copy_30_copy_2}, 0, wxEXPAND, 0);
-    $self->{sizer_6_m1abs_copy_1}->Add($self->{_1_X_N_copy_30_copy_2}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1abs_copy_1}->Add($self->{_0_N_F_copy_30_copy_2}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1abs_copy_1}->Add($self->{_1_N_F_copy_30_copy_2}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1abs_copy_1}->Add($self->{_0_X_F_copy_30_copy_2}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1abs_copy_1}->Add($self->{_1_X_F_copy_30_copy_2}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_8}->Add($self->{sizer_6_m1abs_copy_1}, 1, wxEXPAND, 0);
-    $self->{sizer_6_absm1_copy_1}->Add($self->{_0_N_N_copy_30_copy_3}, 0, 0, 0);
-    $self->{sizer_6_absm1_copy_1}->Add($self->{_1_N_N_copy_30_copy_3}, 1, 0, 0);
-    $self->{sizer_6_absm1_copy_1}->Add($self->{_0_X_N_copy_30_copy_3}, 0, wxEXPAND, 0);
-    $self->{sizer_6_absm1_copy_1}->Add($self->{_1_X_N_copy_30_copy_3}, 1, wxEXPAND, 0);
-    $self->{sizer_6_absm1_copy_1}->Add($self->{_0_N_F_copy_30_copy_3}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_absm1_copy_1}->Add($self->{_1_N_F_copy_30_copy_3}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_absm1_copy_1}->Add($self->{_0_X_F_copy_30_copy_3}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_absm1_copy_1}->Add($self->{_1_X_F_copy_30_copy_3}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_8}->Add($self->{sizer_6_absm1_copy_1}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_0_N_N_copy_30_copy_4}, 0, 0, 0);
-    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_1_N_N_copy_30_copy_4}, 1, 0, 0);
-    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_0_X_N_copy_30_copy_4}, 0, wxEXPAND, 0);
-    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_1_X_N_copy_30_copy_4}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_0_N_F_copy_30_copy_4}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_1_N_F_copy_30_copy_4}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_0_X_F_copy_30_copy_4}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1dlg_copy_1}->Add($self->{_1_X_F_copy_30_copy_4}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_8}->Add($self->{sizer_6_m1dlg_copy_1}, 1, wxEXPAND, 0);
-    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_0_N_N_copy_30_copy_5}, 0, 0, 0);
-    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_1_N_N_copy_30_copy_5}, 1, 0, 0);
-    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_0_X_N_copy_30_copy_5}, 0, wxEXPAND, 0);
-    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_1_X_N_copy_30_copy_5}, 1, wxEXPAND, 0);
-    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_0_N_F_copy_30_copy_5}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_1_N_F_copy_30_copy_5}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_0_X_F_copy_30_copy_5}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_dlgm1_copy_1}->Add($self->{_1_X_F_copy_30_copy_5}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_8}->Add($self->{sizer_6_dlgm1_copy_1}, 1, wxEXPAND, 0);
-    $self->{notebook_1_WrapSizer}->SetSizer($self->{sizer_8});
-    $self->{sizer_3_nosize_copy}->Add($self->{_0_N_N_copy_6}, 0, 0, 0);
-    $self->{sizer_3_nosize_copy}->Add($self->{_1_N_N_copy_6}, 1, 0, 0);
-    $self->{sizer_3_nosize_copy}->Add($self->{_0_X_N_copy_6}, 0, wxEXPAND, 0);
-    $self->{sizer_3_nosize_copy}->Add($self->{_1_X_N_copy_6}, 1, wxEXPAND, 0);
-    $self->{sizer_3_nosize_copy}->Add($self->{_0_N_F_copy_6}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_3_nosize_copy}->Add($self->{_1_N_F_copy_6}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_3_nosize_copy}->Add($self->{_0_X_F_copy_6}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_3_nosize_copy}->Add($self->{_1_X_F_copy_6}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_3}->Add($self->{sizer_3_nosize_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_4_abs_copy}->Add($self->{_0_N_N_copy_copy}, 0, 0, 0);
-    $self->{sizer_4_abs_copy}->Add($self->{_1_N_N_copy_copy}, 1, 0, 0);
-    $self->{sizer_4_abs_copy}->Add($self->{_0_X_N_copy_copy}, 0, wxEXPAND, 0);
-    $self->{sizer_4_abs_copy}->Add($self->{_1_X_N_copy_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_4_abs_copy}->Add($self->{_0_N_F_copy_copy}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4_abs_copy}->Add($self->{_1_N_F_copy_copy}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4_abs_copy}->Add($self->{_0_X_F_copy_copy}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4_abs_copy}->Add($self->{_1_X_F_copy_copy}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_3}->Add($self->{sizer_4_abs_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_5_dlg_copy}->Add($self->{_0_N_N_copy_7}, 0, 0, 0);
-    $self->{sizer_5_dlg_copy}->Add($self->{_1_N_N_copy_7}, 1, 0, 0);
-    $self->{sizer_5_dlg_copy}->Add($self->{_0_X_N_copy_7}, 0, wxEXPAND, 0);
-    $self->{sizer_5_dlg_copy}->Add($self->{_1_X_N_copy_7}, 1, wxEXPAND, 0);
-    $self->{sizer_5_dlg_copy}->Add($self->{_0_N_F_copy_7}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5_dlg_copy}->Add($self->{_1_N_F_copy_7}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5_dlg_copy}->Add($self->{_0_X_F_copy_7}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_5_dlg_copy}->Add($self->{_1_X_F_copy_7}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_3}->Add($self->{sizer_5_dlg_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1abs_copy}->Add($self->{_0_N_N_copy_8}, 0, 0, 0);
-    $self->{sizer_6_m1abs_copy}->Add($self->{_1_N_N_copy_8}, 1, 0, 0);
-    $self->{sizer_6_m1abs_copy}->Add($self->{_0_X_N_copy_8}, 0, wxEXPAND, 0);
-    $self->{sizer_6_m1abs_copy}->Add($self->{_1_X_N_copy_8}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1abs_copy}->Add($self->{_0_N_F_copy_8}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1abs_copy}->Add($self->{_1_N_F_copy_8}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1abs_copy}->Add($self->{_0_X_F_copy_8}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1abs_copy}->Add($self->{_1_X_F_copy_8}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_3}->Add($self->{sizer_6_m1abs_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_6_absm1_copy}->Add($self->{_0_N_N_copy_9}, 0, 0, 0);
-    $self->{sizer_6_absm1_copy}->Add($self->{_1_N_N_copy_9}, 1, 0, 0);
-    $self->{sizer_6_absm1_copy}->Add($self->{_0_X_N_copy_9}, 0, wxEXPAND, 0);
-    $self->{sizer_6_absm1_copy}->Add($self->{_1_X_N_copy_9}, 1, wxEXPAND, 0);
-    $self->{sizer_6_absm1_copy}->Add($self->{_0_N_F_copy_9}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_absm1_copy}->Add($self->{_1_N_F_copy_9}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_absm1_copy}->Add($self->{_0_X_F_copy_9}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_absm1_copy}->Add($self->{_1_X_F_copy_9}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_3}->Add($self->{sizer_6_absm1_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1dlg_copy}->Add($self->{_0_N_N_copy_10}, 0, 0, 0);
-    $self->{sizer_6_m1dlg_copy}->Add($self->{_1_N_N_copy_10}, 1, 0, 0);
-    $self->{sizer_6_m1dlg_copy}->Add($self->{_0_X_N_copy_10}, 0, wxEXPAND, 0);
-    $self->{sizer_6_m1dlg_copy}->Add($self->{_1_X_N_copy_10}, 1, wxEXPAND, 0);
-    $self->{sizer_6_m1dlg_copy}->Add($self->{_0_N_F_copy_10}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1dlg_copy}->Add($self->{_1_N_F_copy_10}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1dlg_copy}->Add($self->{_0_X_F_copy_10}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_m1dlg_copy}->Add($self->{_1_X_F_copy_10}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_3}->Add($self->{sizer_6_m1dlg_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_6_dlgm1_copy}->Add($self->{_0_N_N_copy_11}, 0, 0, 0);
-    $self->{sizer_6_dlgm1_copy}->Add($self->{_1_N_N_copy_11}, 1, 0, 0);
-    $self->{sizer_6_dlgm1_copy}->Add($self->{_0_X_N_copy_11}, 0, wxEXPAND, 0);
-    $self->{sizer_6_dlgm1_copy}->Add($self->{_1_X_N_copy_11}, 1, wxEXPAND, 0);
-    $self->{sizer_6_dlgm1_copy}->Add($self->{_0_N_F_copy_11}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_dlgm1_copy}->Add($self->{_1_N_F_copy_11}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_dlgm1_copy}->Add($self->{_0_X_F_copy_11}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_6_dlgm1_copy}->Add($self->{_1_X_F_copy_11}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_3}->Add($self->{sizer_6_dlgm1_copy}, 1, wxEXPAND, 0);
-    $self->{notebook_1_StaticBoxSizer}->SetSizer($self->{sizer_3});
-    $self->{sizer_4}->Add($self->{_0_N_N_copy_12}, 0, 0, 0);
-    $self->{sizer_4}->Add($self->{_1_N_N_copy_12}, 1, 0, 0);
-    $self->{sizer_4}->Add($self->{_0_X_N_copy_12}, 0, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_1_X_N_copy_12}, 1, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_0_N_F_copy_12}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_N_F_copy_12}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_X_F_copy_12}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_X_F_copy_12}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_N_N_copy_copy_copy}, 0, 0, 0);
-    $self->{sizer_4}->Add($self->{_1_N_N_copy_copy_copy}, 1, 0, 0);
-    $self->{sizer_4}->Add($self->{_0_X_N_copy_copy_copy}, 0, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_1_X_N_copy_copy_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_0_N_F_copy_copy_copy}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_N_F_copy_copy_copy}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_X_F_copy_copy_copy}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_X_F_copy_copy_copy}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_N_N_copy_13}, 0, 0, 0);
-    $self->{sizer_4}->Add($self->{_1_N_N_copy_13}, 1, 0, 0);
-    $self->{sizer_4}->Add($self->{_0_X_N_copy_13}, 0, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_1_X_N_copy_13}, 1, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_0_N_F_copy_13}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_N_F_copy_13}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_X_F_copy_13}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_X_F_copy_13}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_N_N_copy_14}, 0, 0, 0);
-    $self->{sizer_4}->Add($self->{_1_N_N_copy_14}, 1, 0, 0);
-    $self->{sizer_4}->Add($self->{_0_X_N_copy_14}, 0, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_1_X_N_copy_14}, 1, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_0_N_F_copy_14}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_N_F_copy_14}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_X_F_copy_14}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_X_F_copy_14}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_N_N_copy_15}, 0, 0, 0);
-    $self->{sizer_4}->Add($self->{_1_N_N_copy_15}, 1, 0, 0);
-    $self->{sizer_4}->Add($self->{_0_X_N_copy_15}, 0, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_1_X_N_copy_15}, 1, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_0_N_F_copy_15}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_N_F_copy_15}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_X_F_copy_15}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_X_F_copy_15}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_N_N_copy_16}, 0, 0, 0);
-    $self->{sizer_4}->Add($self->{_1_N_N_copy_16}, 1, 0, 0);
-    $self->{sizer_4}->Add($self->{_0_X_N_copy_16}, 0, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_1_X_N_copy_16}, 1, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_0_N_F_copy_16}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_N_F_copy_16}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_X_F_copy_16}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_X_F_copy_16}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_N_N_copy_17}, 0, 0, 0);
-    $self->{sizer_4}->Add($self->{_1_N_N_copy_17}, 1, 0, 0);
-    $self->{sizer_4}->Add($self->{_0_X_N_copy_17}, 0, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_1_X_N_copy_17}, 1, wxEXPAND, 0);
-    $self->{sizer_4}->Add($self->{_0_N_F_copy_17}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_N_F_copy_17}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_0_X_F_copy_17}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_4}->Add($self->{_1_X_F_copy_17}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{notebook_1_GridSizer}->SetSizer($self->{sizer_4});
-    $self->{sizer_5}->Add($self->{_0_N_N_copy_18}, 0, 0, 0);
-    $self->{sizer_5}->Add($self->{_1_N_N_copy_18}, 1, 0, 0);
-    $self->{sizer_5}->Add($self->{_0_X_N_copy_18}, 0, wxEXPAND, 0);
-    $self->{sizer_5}->Add($self->{_1_X_N_copy_18}, 1, wxEXPAND, 0);
-    $self->{sizer_5}->Add($self->{_0_N_F_copy_18}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_1_N_F_copy_18}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_0_X_F_copy_18}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_1_X_F_copy_18}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_0_N_N_copy_copy_copy_copy}, 0, 0, 0);
-    $self->{sizer_5}->Add($self->{_1_N_N_copy_copy_copy_copy}, 1, 0, 0);
-    $self->{sizer_5}->Add($self->{_0_X_N_copy_copy_copy_copy}, 0, wxEXPAND, 0);
-    $self->{sizer_5}->Add($self->{_1_X_N_copy_copy_copy_copy}, 1, wxEXPAND, 0);
-    $self->{sizer_5}->Add($self->{_0_N_F_copy_copy_copy_copy}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_1_N_F_copy_copy_copy_copy}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_0_X_F_copy_copy_copy_copy}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_1_X_F_copy_copy_copy_copy}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_0_N_N_copy_19}, 0, 0, 0);
-    $self->{sizer_5}->Add($self->{_1_N_N_copy_19}, 1, 0, 0);
-    $self->{sizer_5}->Add($self->{_0_X_N_copy_19}, 0, wxEXPAND, 0);
-    $self->{sizer_5}->Add($self->{_1_X_N_copy_19}, 1, wxEXPAND, 0);
-    $self->{sizer_5}->Add($self->{_0_N_F_copy_19}, 0, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_1_N_F_copy_19}, 1, wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_0_X_F_copy_19}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_1_X_F_copy_19}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{sizer_5}->Add($self->{_0_N_N_copy_20}, 0, 0, 0);
-    $self->{sizer_5}->Add($self->{_1_N_N_copy_20}, 1, 0, 0);
-    $self->{sizer_5}->Add($self->{_0_X_N_copy_20}, 0, wxEXPAND, 0);
+    $self->{_1_X_N_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_5}->Add($self->{_1_X_N_copy_20}, 1, wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_5}->Add($self->{_0_N_F_copy_20}, 0, wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_5}->Add($self->{_1_N_F_copy_20}, 1, wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_5}->Add($self->{_0_X_F_copy_20}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_20} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_20}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_5}->Add($self->{_1_X_F_copy_20}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_N_N_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_21}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_5}->Add($self->{_0_N_N_copy_21}, 0, 0, 0);
+    
+    $self->{_1_N_N_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_21}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_5}->Add($self->{_1_N_N_copy_21}, 1, 0, 0);
+    
+    $self->{_0_X_N_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_21}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_5}->Add($self->{_0_X_N_copy_21}, 0, wxEXPAND, 0);
+    
+    $self->{_1_X_N_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_21}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_5}->Add($self->{_1_X_N_copy_21}, 1, wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_21}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_5}->Add($self->{_0_N_F_copy_21}, 0, wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_21}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_5}->Add($self->{_1_N_F_copy_21}, 1, wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_21}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_5}->Add($self->{_0_X_F_copy_21}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_21} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_21}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_5}->Add($self->{_1_X_F_copy_21}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_N_N_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_22}->SetMinSize($self->{_0_N_N_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_5}->Add($self->{_0_N_N_copy_22}, 0, 0, 0);
+    
+    $self->{_1_N_N_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_22}->SetMinSize($self->{_1_N_N_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_5}->Add($self->{_1_N_N_copy_22}, 1, 0, 0);
+    
+    $self->{_0_X_N_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_22}->SetMinSize($self->{_0_X_N_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_5}->Add($self->{_0_X_N_copy_22}, 0, wxEXPAND, 0);
+    
+    $self->{_1_X_N_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_22}->SetMinSize($self->{_1_X_N_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_5}->Add($self->{_1_X_N_copy_22}, 1, wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_22}->SetMinSize($self->{_0_N_F_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_5}->Add($self->{_0_N_F_copy_22}, 0, wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_22}->SetMinSize($self->{_1_N_F_copy_22}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_5}->Add($self->{_1_N_F_copy_22}, 1, wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
     $self->{sizer_5}->Add($self->{_0_X_F_copy_22}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_22} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
     $self->{sizer_5}->Add($self->{_1_X_F_copy_22}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_N_N_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_23}->SetMinSize($self->{_0_N_N_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_5}->Add($self->{_0_N_N_copy_23}, 0, 0, 0);
+    
+    $self->{_1_N_N_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_23}->SetMinSize($self->{_1_N_N_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_5}->Add($self->{_1_N_N_copy_23}, 1, 0, 0);
+    
+    $self->{_0_X_N_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_23}->SetMinSize($self->{_0_X_N_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_5}->Add($self->{_0_X_N_copy_23}, 0, wxEXPAND, 0);
+    
+    $self->{_1_X_N_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_23}->SetMinSize($self->{_1_X_N_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_5}->Add($self->{_1_X_N_copy_23}, 1, wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_23}->SetMinSize($self->{_0_N_F_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_5}->Add($self->{_0_N_F_copy_23}, 0, wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_23}->SetMinSize($self->{_1_N_F_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_5}->Add($self->{_1_N_F_copy_23}, 1, wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_23}->SetMinSize($self->{_0_X_F_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_5}->Add($self->{_0_X_F_copy_23}, 0, wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_23} = Wx::TextCtrl->new($self->{notebook_1_FlexGridSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_23}->SetMinSize($self->{_1_X_F_copy_23}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_5}->Add($self->{_1_X_F_copy_23}, 1, wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{notebook_1_FlexGridSizer}->SetSizer($self->{sizer_5});
-    $self->{sizer_5}->AddGrowableRow(2);
-    $self->{sizer_5}->AddGrowableRow(5);
-    $self->{sizer_5}->AddGrowableCol(1);
-    $self->{sizer_5}->AddGrowableCol(7);
+    
+    $self->{notebook_1_GridBagSizer} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_GridBagSizer}, _T("GridBagSizer"));
+    
+    $self->{sizer_6} = Wx::GridBagSizer->new(1, 1);
+    
+    $self->{_0_N_N_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{_0_N_N_copy_24}, (0, 0), (1, 1), 0, 0);
+    
+    $self->{_1_N_N_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{_1_N_N_copy_24}, (0, 1), (1, 1), 0, 0);
+    
+    $self->{_0_X_N_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{_0_X_N_copy_24}, (0, 2), (1, 1), wxEXPAND, 0);
+    
+    $self->{_1_X_N_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{_1_X_N_copy_24}, (0, 3), (1, 1), wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{_0_N_F_copy_24}, (0, 4), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{_1_N_F_copy_24}, (0, 5), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{_0_X_F_copy_24}, (0, 6), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_24} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{_1_X_F_copy_24}, (0, 7), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_N_N_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
     $self->{sizer_6}->Add($self->{_0_N_N_copy_copy_copy_copy_copy}, (1, 0), (1, 1), 0, 0);
+    
+    $self->{_1_N_N_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
     $self->{sizer_6}->Add($self->{_1_N_N_copy_copy_copy_copy_copy}, (1, 1), (1, 1), 0, 0);
+    
+    $self->{_0_X_N_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
     $self->{sizer_6}->Add($self->{_0_X_N_copy_copy_copy_copy_copy}, (1, 2), (1, 1), wxEXPAND, 0);
+    
+    $self->{_1_X_N_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
     $self->{sizer_6}->Add($self->{_1_X_N_copy_copy_copy_copy_copy}, (1, 3), (1, 1), wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
     $self->{sizer_6}->Add($self->{_0_N_F_copy_copy_copy_copy_copy}, (1, 4), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
     $self->{sizer_6}->Add($self->{_1_N_F_copy_copy_copy_copy_copy}, (1, 5), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
     $self->{sizer_6}->Add($self->{_0_X_F_copy_copy_copy_copy_copy}, (1, 6), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_copy_copy_copy_copy} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_copy_copy_copy_copy}->SetMinSize(Wx::Size->new(100, 21));
     $self->{sizer_6}->Add($self->{_1_X_F_copy_copy_copy_copy_copy}, (1, 7), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_N_N_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_25}->SetMinSize($self->{_0_N_N_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
     $self->{sizer_6}->Add($self->{_0_N_N_copy_25}, (2, 0), (1, 1), 0, 0);
+    
+    $self->{_1_N_N_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_25}->SetMinSize($self->{_1_N_N_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
     $self->{sizer_6}->Add($self->{_1_N_N_copy_25}, (2, 1), (1, 1), 0, 0);
+    
+    $self->{_0_X_N_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_25}->SetMinSize($self->{_0_X_N_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
     $self->{sizer_6}->Add($self->{_0_X_N_copy_25}, (2, 2), (1, 1), wxEXPAND, 0);
+    
+    $self->{_1_X_N_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_25}->SetMinSize($self->{_1_X_N_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
     $self->{sizer_6}->Add($self->{_1_X_N_copy_25}, (2, 3), (1, 1), wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_25}->SetMinSize($self->{_0_N_F_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
     $self->{sizer_6}->Add($self->{_0_N_F_copy_25}, (2, 4), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_25}->SetMinSize($self->{_1_N_F_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
     $self->{sizer_6}->Add($self->{_1_N_F_copy_25}, (2, 5), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_25}->SetMinSize($self->{_0_X_F_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
     $self->{sizer_6}->Add($self->{_0_X_F_copy_25}, (2, 6), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_25} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_25}->SetMinSize($self->{_1_X_F_copy_25}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
     $self->{sizer_6}->Add($self->{_1_X_F_copy_25}, (2, 7), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_N_N_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_6}->Add($self->{_0_N_N_copy_26}, (3, 0), (1, 1), 0, 0);
+    
+    $self->{_1_N_N_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_6}->Add($self->{_1_N_N_copy_26}, (3, 1), (1, 1), 0, 0);
+    
+    $self->{_0_X_N_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_6}->Add($self->{_0_X_N_copy_26}, (3, 2), (1, 1), wxEXPAND, 0);
+    
+    $self->{_1_X_N_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_6}->Add($self->{_1_X_N_copy_26}, (3, 3), (1, 1), wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_6}->Add($self->{_0_N_F_copy_26}, (3, 4), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_6}->Add($self->{_1_N_F_copy_26}, (3, 5), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_6}->Add($self->{_0_X_F_copy_26}, (3, 6), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_26} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_26}->SetMinSize(Wx::Size->new(-1, 21));
     $self->{sizer_6}->Add($self->{_1_X_F_copy_26}, (3, 7), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_N_N_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_27}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_6}->Add($self->{_0_N_N_copy_27}, (4, 0), (1, 1), 0, 0);
+    
+    $self->{_1_N_N_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_27}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_6}->Add($self->{_1_N_N_copy_27}, (4, 1), (1, 1), 0, 0);
+    
+    $self->{_0_X_N_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_27}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_6}->Add($self->{_0_X_N_copy_27}, (4, 2), (1, 1), wxEXPAND, 0);
+    
+    $self->{_1_X_N_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_27}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_6}->Add($self->{_1_X_N_copy_27}, (4, 3), (1, 1), wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_27}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_6}->Add($self->{_0_N_F_copy_27}, (4, 4), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_27}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_6}->Add($self->{_1_N_F_copy_27}, (4, 5), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_27}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_6}->Add($self->{_0_X_F_copy_27}, (4, 6), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_27} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_27}->SetMinSize(Wx::Size->new(100, -1));
     $self->{sizer_6}->Add($self->{_1_X_F_copy_27}, (4, 7), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_N_N_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_28}->SetMinSize($self->{_0_N_N_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_6}->Add($self->{_0_N_N_copy_28}, (5, 0), (1, 1), 0, 0);
+    
+    $self->{_1_N_N_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_28}->SetMinSize($self->{_1_N_N_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_6}->Add($self->{_1_N_N_copy_28}, (5, 1), (1, 1), 0, 0);
+    
+    $self->{_0_X_N_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_28}->SetMinSize($self->{_0_X_N_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_6}->Add($self->{_0_X_N_copy_28}, (5, 2), (1, 1), wxEXPAND, 0);
+    
+    $self->{_1_X_N_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_28}->SetMinSize($self->{_1_X_N_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_6}->Add($self->{_1_X_N_copy_28}, (5, 3), (1, 1), wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_28}->SetMinSize($self->{_0_N_F_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_6}->Add($self->{_0_N_F_copy_28}, (5, 4), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_28}->SetMinSize($self->{_1_N_F_copy_28}->ConvertDialogSizeToPixels(Wx::Size->new(-1, 100)));
     $self->{sizer_6}->Add($self->{_1_N_F_copy_28}, (5, 5), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{_0_X_F_copy_28}, (5, 6), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_28} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
     $self->{sizer_6}->Add($self->{_1_X_F_copy_28}, (5, 7), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_N_N_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_N_copy_29}->SetMinSize($self->{_0_N_N_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_6}->Add($self->{_0_N_N_copy_29}, (6, 0), (1, 1), 0, 0);
+    
+    $self->{_1_N_N_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_N_copy_29}->SetMinSize($self->{_1_N_N_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_6}->Add($self->{_1_N_N_copy_29}, (6, 1), (1, 1), 0, 0);
+    
+    $self->{_0_X_N_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_N_copy_29}->SetMinSize($self->{_0_X_N_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_6}->Add($self->{_0_X_N_copy_29}, (6, 2), (1, 1), wxEXPAND, 0);
+    
+    $self->{_1_X_N_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_N_copy_29}->SetMinSize($self->{_1_X_N_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_6}->Add($self->{_1_X_N_copy_29}, (6, 3), (1, 1), wxEXPAND, 0);
+    
+    $self->{_0_N_F_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_N_F_copy_29}->SetMinSize($self->{_0_N_F_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_6}->Add($self->{_0_N_F_copy_29}, (6, 4), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_N_F_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_N_F_copy_29}->SetMinSize($self->{_1_N_F_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_6}->Add($self->{_1_N_F_copy_29}, (6, 5), (1, 1), wxFIXED_MINSIZE, 0);
+    
+    $self->{_0_X_F_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_0_X_F_copy_29}->SetMinSize($self->{_0_X_F_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_6}->Add($self->{_0_X_F_copy_29}, (6, 6), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
+    
+    $self->{_1_X_F_copy_29} = Wx::TextCtrl->new($self->{notebook_1_GridBagSizer}, wxID_ANY, "");
+    $self->{_1_X_F_copy_29}->SetMinSize($self->{_1_X_F_copy_29}->ConvertDialogSizeToPixels(Wx::Size->new(100, -1)));
     $self->{sizer_6}->Add($self->{_1_X_F_copy_29}, (6, 7), (1, 1), wxEXPAND|wxFIXED_MINSIZE, 0);
-    $self->{notebook_1_GridBagSizer}->SetSizer($self->{sizer_6});
-    $self->{sizer_6}->AddGrowableRow(2);
-    $self->{sizer_6}->AddGrowableRow(5);
-    $self->{sizer_6}->AddGrowableCol(1);
-    $self->{sizer_6}->AddGrowableCol(7);
+    
+    $self->{notebook_1_BorderTest} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_BorderTest}, _T("BorderTest"));
+    
+    $self->{sizer_7} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{sizer_border_10_none} = Wx::BoxSizer->new(wxVERTICAL);
+    $self->{sizer_7}->Add($self->{sizer_border_10_none}, 1, wxEXPAND, 10);
+    
+    $self->{_0_N_N_border_10_none} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
     $self->{sizer_border_10_none}->Add($self->{_0_N_N_border_10_none}, 0, 0, 10);
+    
+    $self->{_1_N_N_border_0_all} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
     $self->{sizer_border_10_none}->Add($self->{_1_N_N_border_0_all}, 1, wxALL, 0);
+    
+    $self->{_0_X_N_border_5_LEFTRIGHT} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
     $self->{sizer_border_10_none}->Add($self->{_0_X_N_border_5_LEFTRIGHT}, 0, wxEXPAND|wxLEFT|wxRIGHT, 5);
+    
+    $self->{_1_X_N_border_15_BOTTOM} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
     $self->{sizer_border_10_none}->Add($self->{_1_X_N_border_15_BOTTOM}, 1, wxBOTTOM|wxEXPAND, 15);
-    $self->{sizer_7}->Add($self->{sizer_border_10_none}, 1, wxEXPAND, 10);
-    $self->{sizer_border_0_ALL}->Add($self->{_0_N_N_copy_copy_1}, 0, 0, 0);
+    
+    $self->{sizer_border_0_ALL} = Wx::BoxSizer->new(wxVERTICAL);
     $self->{sizer_7}->Add($self->{sizer_border_0_ALL}, 1, wxALL|wxEXPAND, 0);
-    $self->{sizer_border_5_LEFTRIGHT}->Add($self->{_0_N_N_copy_31}, 0, 0, 0);
+    
+    $self->{_0_N_N_copy_copy_1} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
+    $self->{_0_N_N_copy_copy_1}->SetMinSize(Wx::Size->new(100, 21));
+    $self->{sizer_border_0_ALL}->Add($self->{_0_N_N_copy_copy_1}, 0, 0, 0);
+    
+    $self->{sizer_border_5_LEFTRIGHT} = Wx::BoxSizer->new(wxVERTICAL);
     $self->{sizer_7}->Add($self->{sizer_border_5_LEFTRIGHT}, 1, wxLEFT|wxRIGHT, 5);
-    $self->{sizer_border_15_BOTTOM}->Add($self->{_0_N_N_copy_32}, 0, 0, 0);
+    
+    $self->{_0_N_N_copy_31} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
+    $self->{_0_N_N_copy_31}->SetMinSize($self->{_0_N_N_copy_31}->ConvertDialogSizeToPixels(Wx::Size->new(100, 21)));
+    $self->{sizer_border_5_LEFTRIGHT}->Add($self->{_0_N_N_copy_31}, 0, 0, 0);
+    
+    $self->{sizer_border_15_BOTTOM} = Wx::BoxSizer->new(wxVERTICAL);
     $self->{sizer_7}->Add($self->{sizer_border_15_BOTTOM}, 1, 0, 15);
-    $self->{notebook_1_BorderTest}->SetSizer($self->{sizer_7});
+    
+    $self->{_0_N_N_copy_32} = Wx::TextCtrl->new($self->{notebook_1_BorderTest}, wxID_ANY, "");
+    $self->{_0_N_N_copy_32}->SetMinSize(Wx::Size->new(-1, 21));
+    $self->{sizer_border_15_BOTTOM}->Add($self->{_0_N_N_copy_32}, 0, 0, 0);
+    
+    $self->{notebook_1_GridBagSizer_Spacers} = Wx::Panel->new($self->{notebook_1}, wxID_ANY);
+    $self->{notebook_1}->AddPage($self->{notebook_1_GridBagSizer_Spacers}, _T("GridBagSizer_Spacers"));
+    
+    $self->{grid_sizer_1} = Wx::GridBagSizer->new(0, 0);
+    
+    $self->{button_1} = Wx::Button->new($self->{notebook_1_GridBagSizer_Spacers}, wxID_ANY, _T("button_1"));
     $self->{grid_sizer_1}->Add($self->{button_1}, (0, 0), (1, 1), 0, 0);
+    
     $self->{grid_sizer_1}->Add(20, 20, (2, 0), (1, 1), wxEXPAND, 0);
+    
     $self->{grid_sizer_1}->Add(20, 20, (2, 1), (1, 1), wxEXPAND, 0);
-    $self->{notebook_1_GridBagSizer_Spacers}->SetSizer($self->{grid_sizer_1});
+    
     $self->{grid_sizer_1}->AddGrowableRow(0);
     $self->{grid_sizer_1}->AddGrowableRow(2);
     $self->{grid_sizer_1}->AddGrowableCol(0);
-    $self->{notebook_1}->AddPage($self->{notebook_1_pane_1}, _T("BoxSizer"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_WrapSizer}, _T("WrapSizer"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_StaticBoxSizer}, _T("StaticBoxSizer"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_GridSizer}, _T("GridSizer"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_FlexGridSizer}, _T("FlexGridSizer"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_GridBagSizer}, _T("GridBagSizer"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_BorderTest}, _T("BorderTest"));
-    $self->{notebook_1}->AddPage($self->{notebook_1_GridBagSizer_Spacers}, _T("GridBagSizer_Spacers"));
-    $self->{sizer_1}->Add($self->{notebook_1}, 1, wxEXPAND, 0);
+    $self->{notebook_1_GridBagSizer_Spacers}->SetSizer($self->{grid_sizer_1});
+    
+    $self->{notebook_1_BorderTest}->SetSizer($self->{sizer_7});
+    
+    $self->{sizer_6}->AddGrowableRow(2);
+    $self->{sizer_6}->AddGrowableRow(5);
+    $self->{sizer_6}->AddGrowableCol(1);
+    $self->{sizer_6}->AddGrowableCol(7);
+    $self->{notebook_1_GridBagSizer}->SetSizer($self->{sizer_6});
+    
+    $self->{sizer_5}->AddGrowableRow(2);
+    $self->{sizer_5}->AddGrowableRow(5);
+    $self->{sizer_5}->AddGrowableCol(1);
+    $self->{sizer_5}->AddGrowableCol(7);
+    $self->{notebook_1_FlexGridSizer}->SetSizer($self->{sizer_5});
+    
+    $self->{notebook_1_GridSizer}->SetSizer($self->{sizer_4});
+    
+    $self->{notebook_1_StaticBoxSizer}->SetSizer($self->{sizer_3});
+    
+    $self->{notebook_1_WrapSizer}->SetSizer($self->{sizer_8});
+    
+    $self->{notebook_1_pane_1}->SetSizer($self->{sizer_2});
+    
     $self->SetSizer($self->{sizer_1});
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests_Saved.wxg wxglade-1.0.1/tests/casefiles/SizersSizeTests_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests_Saved.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests_Saved.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.9.0pre on Sun Jul  8 22:00:06 2018 -->
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
 
 <application class="App" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="App" option="0" overwrite="1" path="SizersSizeTests.py" source_extension=".cpp" top_window="frame" use_gettext="1" use_new_namespace="1">
     <object class="MyFrame" name="frame" base="EditFrame">
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests.wxg wxglade-1.0.1/tests/casefiles/SizersSizeTests.wxg
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests.wxg	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.9.0pre on Sun Jul  8 22:00:06 2018 -->
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
 
 <application class="App" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="App" option="0" overwrite="1" path="SizersSizeTests.py" source_extension=".cpp" top_window="frame" use_gettext="1" use_new_namespace="1">
     <object class="MyFrame" name="frame" base="EditFrame">
@@ -2808,6 +2808,7 @@
                             <object class="sizeritem">
                                 <option>1</option>
                                 <border>15</border>
+                                <flag>wxALIGN_RIGHT</flag>
                                 <object class="wxBoxSizer" name="sizer_border_15_BOTTOM" base="EditBoxSizer">
                                     <orient>wxVERTICAL</orient>
                                     <object class="sizeritem">
diff -Nru wxglade-0.9.6/tests/casefiles/SizersSizeTests.xrc wxglade-1.0.1/tests/casefiles/SizersSizeTests.xrc
--- wxglade-0.9.6/tests/casefiles/SizersSizeTests.xrc	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/SizersSizeTests.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -1933,313 +1933,425 @@
                             <rows>7</rows>
                             <vgap>1</vgap>
                             <object class="sizeritem">
+                                <cellpos>0,0</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_N_copy_24">
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>0,1</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_N_copy_24">
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>0,2</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_N_copy_24">
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>0,3</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_N_copy_24">
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>0,4</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_F_copy_24">
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>0,5</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_F_copy_24">
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>0,6</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_F_copy_24">
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>0,7</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_F_copy_24">
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>1,0</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_N_copy_copy_copy_copy_copy">
                                     <size>100, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>1,1</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_N_copy_copy_copy_copy_copy">
                                     <size>100, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>1,2</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_N_copy_copy_copy_copy_copy">
                                     <size>100, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>1,3</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_N_copy_copy_copy_copy_copy">
                                     <size>100, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>1,4</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_F_copy_copy_copy_copy_copy">
                                     <size>100, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>1,5</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_F_copy_copy_copy_copy_copy">
                                     <size>100, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>1,6</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_F_copy_copy_copy_copy_copy">
                                     <size>100, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>1,7</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_F_copy_copy_copy_copy_copy">
                                     <size>100, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>2,0</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_N_copy_25">
                                     <size>100, 21d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>2,1</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_N_copy_25">
                                     <size>100, 21d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>2,2</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_N_copy_25">
                                     <size>100, 21d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>2,3</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_N_copy_25">
                                     <size>100, 21d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>2,4</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_F_copy_25">
                                     <size>100, 21d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>2,5</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_F_copy_25">
                                     <size>100, 21d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>2,6</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_F_copy_25">
                                     <size>100, 21d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>2,7</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_F_copy_25">
                                     <size>100, 21d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>3,0</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_N_copy_26">
                                     <size>-1, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>3,1</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_N_copy_26">
                                     <size>-1, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>3,2</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_N_copy_26">
                                     <size>-1, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>3,3</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_N_copy_26">
                                     <size>-1, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>3,4</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_F_copy_26">
                                     <size>-1, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>3,5</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_F_copy_26">
                                     <size>-1, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>3,6</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_F_copy_26">
                                     <size>-1, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>3,7</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_F_copy_26">
                                     <size>-1, 21</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>4,0</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_N_copy_27">
                                     <size>100, -1</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>4,1</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_N_copy_27">
                                     <size>100, -1</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>4,2</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_N_copy_27">
                                     <size>100, -1</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>4,3</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_N_copy_27">
                                     <size>100, -1</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>4,4</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_F_copy_27">
                                     <size>100, -1</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>4,5</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_F_copy_27">
                                     <size>100, -1</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>4,6</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_F_copy_27">
                                     <size>100, -1</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>4,7</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_F_copy_27">
                                     <size>100, -1</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>5,0</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_N_copy_28">
                                     <size>-1, 100d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>5,1</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_N_copy_28">
                                     <size>-1, 100d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>5,2</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_N_copy_28">
                                     <size>-1, 100d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>5,3</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_N_copy_28">
                                     <size>-1, 100d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>5,4</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_F_copy_28">
                                     <size>-1, 100d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>5,5</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_F_copy_28">
                                     <size>-1, 100d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>5,6</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_F_copy_28">
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>5,7</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_F_copy_28">
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>6,0</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_N_copy_29">
                                     <size>100, -1d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
+                                <cellpos>6,1</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_N_copy_29">
                                     <size>100, -1d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>6,2</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_N_copy_29">
                                     <size>100, -1d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND</flag>
+                                <cellpos>6,3</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_N_copy_29">
                                     <size>100, -1d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>6,4</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_N_F_copy_29">
                                     <size>100, -1d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxFIXED_MINSIZE</flag>
+                                <cellpos>6,5</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_N_F_copy_29">
                                     <size>100, -1d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>6,6</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_0_X_F_copy_29">
                                     <size>100, -1d</size>
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 <flag>wxEXPAND|wxFIXED_MINSIZE</flag>
+                                <cellpos>6,7</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxTextCtrl" name="_1_X_F_copy_29">
                                     <size>100, -1d</size>
                                 </object>
@@ -2338,6 +2450,8 @@
                             <rows>3</rows>
                             <vgap>0</vgap>
                             <object class="sizeritem">
+                                <cellpos>0,0</cellpos>
+                                <cellspan>1,1</cellspan>
                                 <object class="wxButton" name="button_1">
                                     <label>button_1</label>
                                 </object>
diff -Nru wxglade-0.9.6/tests/casefiles/Statusbar_wo_labels.cpp wxglade-1.0.1/tests/casefiles/Statusbar_wo_labels.cpp
--- wxglade-0.9.6/tests/casefiles/Statusbar_wo_labels.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Statusbar_wo_labels.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,31 +20,15 @@
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: MyFrame::MyFrame
-    statusbar_without_labels = CreateStatusBar(3);
-    label_1 = new wxStaticText(this, wxID_ANY, _("Example of a statusbar with three fields\nbut without labels in those fields."));
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void MyFrame::set_properties()
-{
-    // begin wxGlade: MyFrame::set_properties
     SetTitle(_("frame_1"));
+    statusbar_without_labels = CreateStatusBar(3);
     int statusbar_without_labels_widths[] = { -1, -1, -1 };
     statusbar_without_labels->SetStatusWidths(3, statusbar_without_labels_widths);
-
-    // end wxGlade
-}
-
-
-void MyFrame::do_layout()
-{
-    // begin wxGlade: MyFrame::do_layout
+    
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    label_1 = new wxStaticText(this, wxID_ANY, _("Example of a statusbar with three fields\nbut without labels in those fields."));
     sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 5);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/Statusbar_wo_labels.h wxglade-1.0.1/tests/casefiles/Statusbar_wo_labels.h
--- wxglade-0.9.6/tests/casefiles/Statusbar_wo_labels.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Statusbar_wo_labels.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,6 @@
     MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: MyFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: MyFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/Statusbar_wo_labels.lisp wxglade-1.0.1/tests/casefiles/Statusbar_wo_labels.lisp
--- wxglade-0.9.6/tests/casefiles/Statusbar_wo_labels.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Statusbar_wo_labels.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -27,8 +27,8 @@
 (defclass MyFrame()
         ((top-window :initform nil :accessor slot-top-window)
         (statusbar-without-labels :initform nil :accessor slot-statusbar-without-labels)
-        (label-1 :initform nil :accessor slot-label-1)
-        (sizer-1 :initform nil :accessor slot-sizer-1)))
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (label-1 :initform nil :accessor slot-label-1)))
 
 (defun make-MyFrame ()
         (let ((obj (make-instance 'MyFrame)))
@@ -40,24 +40,19 @@
 (defmethod init ((obj MyFrame))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: MyFrame.__init__
-        (setf (slot-statusbar-without-labels obj) (wxFrame_CreateStatusBar (slot-top-window obj) 3 0))
-        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Example of a statusbar with three fields\nbut without labels in those fields.") -1 -1 -1 -1 0))
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"frame_1"))
+        
+        (setf (slot-statusbar-without-labels obj) (wxFrame_CreateStatusBar (slot-top-window obj) 3 0))
         (wxStatusBar_SetStatusWidths (slot-statusbar-without-labels obj) 3 (vector -1 -1 -1))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj MyFrame))
-        ;;; begin wxGlade: MyFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (setf (slot-label-1 obj) (wxStaticText_Create (slot-top-window obj) wxID_ANY (_"Example of a statusbar with three fields\nbut without labels in those fields.") -1 -1 -1 -1 0))
         (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 1 (logior wxALL wxEXPAND) 5 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame-1 self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/Statusbar_wo_labels.pl wxglade-1.0.1/tests/casefiles/Statusbar_wo_labels.pl
--- wxglade-0.9.6/tests/casefiles/Statusbar_wo_labels.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Statusbar_wo_labels.pl	2020-12-31 14:04:48.000000000 +0000
@@ -30,38 +30,27 @@
 
     # begin wxGlade: MyFrame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-    $self->{statusbar_without_labels} = $self->CreateStatusBar(3);
-    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, _T("Example of a statusbar with three fields\nbut without labels in those fields."));
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__set_properties
     $self->SetTitle(_T("frame_1"));
+    
+    $self->{statusbar_without_labels} = $self->CreateStatusBar(3);
     $self->{statusbar_without_labels}->SetStatusWidths(-1, -1, -1);
-
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: MyFrame::__do_layout
+    
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{label_1} = Wx::StaticText->new($self, wxID_ANY, _T("Example of a statusbar with three fields\nbut without labels in those fields."));
     $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class MyFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/Statusbar_wo_labels.py wxglade-1.0.1/tests/casefiles/Statusbar_wo_labels.py
--- wxglade-0.9.6/tests/casefiles/Statusbar_wo_labels.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Statusbar_wo_labels.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,26 +18,19 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
-        self.statusbar_without_labels = self.CreateStatusBar(3)
-        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Example of a statusbar with three fields\nbut without labels in those fields."))
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle(_("frame_1"))
-        self.statusbar_without_labels.SetStatusWidths([-1, -1, -1])
 
-        # end wxGlade
+        self.statusbar_without_labels = self.CreateStatusBar(3)
+        self.statusbar_without_labels.SetStatusWidths([-1, -1, -1])
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.label_1 = wx.StaticText(self, wx.ID_ANY, _("Example of a statusbar with three fields\nbut without labels in those fields."))
         sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/styleless-dialog.cpp wxglade-1.0.1/tests/casefiles/styleless-dialog.cpp
--- wxglade-0.9.6/tests/casefiles/styleless-dialog.cpp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/styleless-dialog.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -20,24 +20,7 @@
     wxDialog(parent, id, title, pos, size, style)
 {
     // begin wxGlade: StylelessDialog::StylelessDialog
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void StylelessDialog::set_properties()
-{
-    // begin wxGlade: StylelessDialog::set_properties
     SetTitle(_("Style-less Dialog"));
-    // end wxGlade
-}
-
-
-void StylelessDialog::do_layout()
-{
-    // begin wxGlade: StylelessDialog::do_layout
     Layout();
     // end wxGlade
 }
@@ -47,26 +30,10 @@
     wxFrame(parent, id, title, pos, size, style)
 {
     // begin wxGlade: StylelessFrame::StylelessFrame
-
-    set_properties();
-    do_layout();
-    // end wxGlade
-}
-
-
-void StylelessFrame::set_properties()
-{
-    // begin wxGlade: StylelessFrame::set_properties
     SetTitle(_("Style-less Frame"));
-    // end wxGlade
-}
-
-
-void StylelessFrame::do_layout()
-{
-    // begin wxGlade: StylelessFrame::do_layout
     wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
     sizer_1->Add(0, 0, 0, 0, 0);
+    
     SetSizer(sizer_1);
     sizer_1->Fit(this);
     Layout();
diff -Nru wxglade-0.9.6/tests/casefiles/styleless-dialog.h wxglade-1.0.1/tests/casefiles/styleless-dialog.h
--- wxglade-0.9.6/tests/casefiles/styleless-dialog.h	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/styleless-dialog.h	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,6 @@
     StylelessDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
 
 private:
-    // begin wxGlade: StylelessDialog::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: StylelessDialog::attributes
@@ -55,10 +51,6 @@
     StylelessFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
 
 private:
-    // begin wxGlade: StylelessFrame::methods
-    void set_properties();
-    void do_layout();
-    // end wxGlade
 
 protected:
     // begin wxGlade: StylelessFrame::attributes
diff -Nru wxglade-0.9.6/tests/casefiles/styleless-dialog.lisp wxglade-1.0.1/tests/casefiles/styleless-dialog.lisp
--- wxglade-0.9.6/tests/casefiles/styleless-dialog.lisp	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/styleless-dialog.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -35,17 +35,7 @@
 (defmethod init ((obj StylelessDialog))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: StylelessDialog.__init__
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj StylelessDialog))
-        ;;; begin wxGlade: StylelessDialog.__set_properties
         (wxWindow_SetTitle (slot-dialog self) (_"Style-less Dialog"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj StylelessDialog))
-        ;;; begin wxGlade: StylelessDialog.__do_layout
         (wxWindow_layout (slot-dialog self))
         ;;; end wxGlade
         )
@@ -68,21 +58,15 @@
 (defmethod init ((obj StylelessFrame))
 "Method creates the objects contained in the class."
         ;;; begin wxGlade: StylelessFrame.__init__
-        ;;; end wxGlade
-        )
-
-(defmethod set-properties ((obj StylelessFrame))
-        ;;; begin wxGlade: StylelessFrame.__set_properties
         (wxFrame_SetTitle (slot-top-window obj) (_"Style-less Frame"))
-        ;;; end wxGlade
-        )
-
-(defmethod do-layout ((obj StylelessFrame))
-        ;;; begin wxGlade: StylelessFrame.__do_layout
+        
         (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
         (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
         (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
         (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
         (wxFrame_layout (slot-frame self))
         ;;; end wxGlade
         )
diff -Nru wxglade-0.9.6/tests/casefiles/styleless-dialog.pl wxglade-1.0.1/tests/casefiles/styleless-dialog.pl
--- wxglade-0.9.6/tests/casefiles/styleless-dialog.pl	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/styleless-dialog.pl	2020-12-31 14:04:48.000000000 +0000
@@ -30,30 +30,14 @@
 
     # begin wxGlade: StylelessDialog::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-
-    $self->__set_properties();
-    $self->__do_layout();
-
+    $self->SetTitle(_T("Style-less Dialog"));
+    $self->Layout();
     # end wxGlade
     return $self;
 
 }
 
 
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: StylelessDialog::__set_properties
-    $self->SetTitle(_T("Style-less Dialog"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: StylelessDialog::__do_layout
-    $self->Layout();
-    # end wxGlade
-}
-
 # end of class StylelessDialog
 
 1;
@@ -76,34 +60,22 @@
 
     # begin wxGlade: StylelessFrame::new
     $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
-
-    $self->__set_properties();
-    $self->__do_layout();
-
-    # end wxGlade
-    return $self;
-
-}
-
-
-sub __set_properties {
-    my $self = shift;
-    # begin wxGlade: StylelessFrame::__set_properties
     $self->SetTitle(_T("Style-less Frame"));
-    # end wxGlade
-}
-
-sub __do_layout {
-    my $self = shift;
-    # begin wxGlade: StylelessFrame::__do_layout
+    
     $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
     $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
     $self->SetSizer($self->{sizer_1});
     $self->{sizer_1}->Fit($self);
+    
     $self->Layout();
     # end wxGlade
+    return $self;
+
 }
 
+
 # end of class StylelessFrame
 
 1;
diff -Nru wxglade-0.9.6/tests/casefiles/styleless-dialog.py wxglade-1.0.1/tests/casefiles/styleless-dialog.py
--- wxglade-0.9.6/tests/casefiles/styleless-dialog.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/styleless-dialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,18 +18,7 @@
         # begin wxGlade: StylelessDialog.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Dialog.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: StylelessDialog.__set_properties
         self.SetTitle(_("Style-less Dialog"))
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: StylelessDialog.__do_layout
         self.Layout()
         # end wxGlade
 
@@ -40,22 +29,15 @@
         # begin wxGlade: StylelessFrame.__init__
         kwds["style"] = kwds.get("style", 0)
         wx.Frame.__init__(self, *args, **kwds)
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: StylelessFrame.__set_properties
         self.SetTitle(_("Style-less Frame"))
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: StylelessFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
         sizer_1.Add((0, 0), 0, 0, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
diff -Nru wxglade-0.9.6/tests/casefiles/Test_Editing2.wxg wxglade-1.0.1/tests/casefiles/Test_Editing2.wxg
--- wxglade-0.9.6/tests/casefiles/Test_Editing2.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Test_Editing2.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,295 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 1.0.0a8 on Sun Oct  4 17:39:45 2020 -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="0" path="Tests_full.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>840, 726</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <menubar>1</menubar>
+        <toolbar>1</toolbar>
+        <statusbar>1</statusbar>
+        <object class="wxMenuBar" name="frame_menubar" base="EditMenuBar">
+            <menus>
+                <menu label="File" name="">
+                    <item>
+                        <label>Quit</label>
+                        <handler>on_quit</handler>
+                    </item>
+                </menu>
+            </menus>
+        </object>
+        <object class="wxStatusBar" name="frame_statusbar" base="EditStatusBar">
+            <fields>
+                <field width="-1">frame_statusbar</field>
+            </fields>
+        </object>
+        <object class="wxToolBar" name="frame_toolbar" base="EditToolBar">
+            <tools>
+                <tool>
+                    <id />
+                    <label>New</label>
+                    <type>0</type>
+                    <short_help />
+                    <long_help />
+                    <bitmap1>art:wxART_NEW,wxART_TOOLBAR,24,24</bitmap1>
+                    <bitmap2 />
+                    <handler>on_file_new</handler>
+                </tool>
+                <tool>
+                    <id />
+                    <label>File Open</label>
+                    <type>0</type>
+                    <short_help />
+                    <long_help />
+                    <bitmap1>art:wxART_FILE_OPEN,wxART_TOOLBAR,24,24</bitmap1>
+                    <bitmap2 />
+                    <handler>on_file_open</handler>
+                </tool>
+                <tool>
+                    <id />
+                    <label>File Save</label>
+                    <type>0</type>
+                    <short_help />
+                    <long_help />
+                    <bitmap1>art:wxART_FILE_SAVE,wxART_TOOLBAR,24,24</bitmap1>
+                    <bitmap2 />
+                    <handler>on_file_save</handler>
+                </tool>
+                <tool>
+                    <id />
+                    <label>Quit</label>
+                    <type>0</type>
+                    <short_help />
+                    <long_help />
+                    <bitmap1>art:wxART_QUIT,wxART_TOOLBAR,24,24</bitmap1>
+                    <bitmap2 />
+                    <handler>on_quit</handler>
+                </tool>
+            </tools>
+        </object>
+        <object class="wxNotebook" name="notebook_1" base="EditNotebook">
+            <style>wxNB_TOP</style>
+            <tabs>
+                <tab window="panel_1">notebook_1_pane_1</tab>
+                <tab window="window_1">new tab</tab>
+            </tabs>
+            <object class="wxPanel" name="panel_1" base="EditPanel">
+                <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
+                    <orient>wxVERTICAL</orient>
+                    <attribute>1</attribute>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxButton" name="button_1" base="EditButton">
+                            <label>button_1</label>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxStaticText" name="static_text_1" base="EditStaticText">
+                            <font>
+                                <size>24</size>
+                                <family>default</family>
+                                <style>normal</style>
+                                <weight>normal</weight>
+                                <underlined>0</underlined>
+                                <face />
+                            </font>
+                            <label>static text</label>
+                            <attribute>1</attribute>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>1</option>
+                        <border>0</border>
+                        <flag>wxEXPAND</flag>
+                        <object class="wxStaticBoxSizer" name="sizer_1" base="EditStaticBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+                            <label>A Static Box Sizer</label>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxNotebook" name="notebook_2" base="EditNotebook">
+                                    <style>wxNB_TOP</style>
+                                    <tabs>
+                                        <tab window="notebook_2_pane_1">notebook_2_pane_1</tab>
+                                    </tabs>
+                                    <object class="wxPanel" name="notebook_2_pane_1" base="EditPanel">
+                                        <background>#b000ff</background>
+                                        <style>wxTAB_TRAVERSAL</style>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxButton" name="button_2" base="EditButton">
+                            <font>
+                                <size>24</size>
+                                <family>default</family>
+                                <style>normal</style>
+                                <weight>normal</weight>
+                                <underlined>0</underlined>
+                                <face />
+                            </font>
+                            <label>button_2</label>
+                        </object>
+                    </object>
+                    <object class="sizerslot" />
+                    <object class="sizerslot" />
+                </object>
+            </object>
+            <object class="wxSplitterWindow" name="window_1" base="EditSplitterWindow">
+                <style>wxSP_3D</style>
+                <min_pane_size>20</min_pane_size>
+                <orientation>wxSPLIT_VERTICAL</orientation>
+                <window_1>window_1_pane_1</window_1>
+                <object class="wxPanel" name="window_1_pane_1" base="EditPanel">
+                    <background>#238e6b</background>
+                    <style>wxTAB_TRAVERSAL</style>
+                    <object class="wxGridBagSizer" name="grid_sizer_1" base="EditGridBagSizer">
+                        <rows>3</rows>
+                        <cols>3</cols>
+                        <vgap>0</vgap>
+                        <hgap>0</hgap>
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                        <object class="sizeritem">
+                            <span>1, 2</span>
+                            <border>0</border>
+                            <object class="wxButton" name="button_3" base="EditButton">
+                                <label>button spanning two cols</label>
+                            </object>
+                        </object>
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="MyDialog" name="dialog" base="EditDialog">
+        <title>dialog</title>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>8</border>
+                <flag>wxALL</flag>
+                <object class="wxStaticText" name="static_text_1" base="EditStaticText">
+                    <label>Enter text:</label>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>8</border>
+                <flag>wxALL|wxEXPAND</flag>
+                <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="spacer" name="spacer" base="EditSpacer">
+                    <width>20</width>
+                    <height>20</height>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>8</border>
+                <flag>wxALL|wxALIGN_RIGHT</flag>
+                <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
+                    <orient>wxHORIZONTAL</orient>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxButton" name="button_1" base="EditButton">
+                            <label>button_1</label>
+                            <stockitem>CANCEL</stockitem>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxButton" name="button_2" base="EditButton">
+                            <label>button_2</label>
+                            <default>1</default>
+                            <stockitem>OK</stockitem>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="MyPanelDialog" name="panel" base="EditTopLevelPanel">
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>0</border>
+                <object class="wxButton" name="button_1" base="EditButton">
+                    <label>button_1</label>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>0</border>
+                <object class="wxButton" name="button_2" base="EditButton">
+                    <label>button_2</label>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>0</border>
+                <object class="wxButton" name="button_3" base="EditButton">
+                    <label>button_3</label>
+                </object>
+            </object>
+            <object class="sizeritem">
+                <option>0</option>
+                <border>0</border>
+                <object class="wxButton" name="button_4" base="EditButton">
+                    <label>button_4</label>
+                </object>
+            </object>
+        </object>
+    </object>
+    <object class="NBLeftFrame" name="nb_left_frame" base="EditFrame">
+        <size>1088, 498</size>
+        <title>Frame with NB Left</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxNotebook" name="notebook" base="EditNotebook">
+            <style>wxNB_LEFT</style>
+            <tabs>
+                <tab window="panel_1">page1</tab>
+                <tab window="panel_2">page2</tab>
+            </tabs>
+            <object class="wxPanel" name="panel_1" base="EditPanel">
+                <background>#4f2f2f</background>
+            </object>
+            <object class="wxPanel" name="panel_2" base="EditPanel">
+                <background>#6b8e23</background>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/Test_Editing.wxg wxglade-1.0.1/tests/casefiles/Test_Editing.wxg
--- wxglade-0.9.6/tests/casefiles/Test_Editing.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Test_Editing.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.9.9pre on Fri Jun  5 21:57:15 2020 -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="0" path="Tests_full.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>840, 726</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxNotebook" name="notebook_1" base="EditNotebook">
+            <style>wxNB_TOP</style>
+            <tabs>
+                <tab window="panel_1">notebook_1_pane_1</tab>
+                <tab window="window_1">new tab</tab>
+            </tabs>
+            <object class="wxPanel" name="panel_1" base="EditPanel">
+                <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer">
+                    <orient>wxVERTICAL</orient>
+                    <attribute>1</attribute>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxButton" name="button_1" base="EditButton">
+                            <label>button_1</label>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxStaticText" name="static_text_1" base="EditStaticText">
+                            <font>
+                                <size>24</size>
+                                <family>default</family>
+                                <style>normal</style>
+                                <weight>normal</weight>
+                                <underlined>0</underlined>
+                                <face />
+                            </font>
+                            <label>static text</label>
+                            <attribute>1</attribute>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>1</option>
+                        <border>0</border>
+                        <flag>wxEXPAND</flag>
+                        <object class="wxStaticBoxSizer" name="sizer_1" base="EditStaticBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+                            <label>A Static Box Sizer</label>
+                            <object class="sizeritem">
+                                <option>1</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxNotebook" name="notebook_2" base="EditNotebook">
+                                    <style>wxNB_TOP</style>
+                                    <tabs>
+                                        <tab window="notebook_2_pane_1">notebook_2_pane_1</tab>
+                                    </tabs>
+                                    <object class="wxPanel" name="notebook_2_pane_1" base="EditPanel">
+                                        <background>#b000ff</background>
+                                        <style>wxTAB_TRAVERSAL</style>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <option>0</option>
+                                <border>0</border>
+                                <flag>wxEXPAND</flag>
+                                <object class="wxTextCtrl" name="text_ctrl_1" base="EditTextCtrl">
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <option>0</option>
+                        <border>0</border>
+                        <object class="wxButton" name="button_2" base="EditButton">
+                            <font>
+                                <size>24</size>
+                                <family>default</family>
+                                <style>normal</style>
+                                <weight>normal</weight>
+                                <underlined>0</underlined>
+                                <face />
+                            </font>
+                            <label>button_2</label>
+                        </object>
+                    </object>
+                    <object class="sizerslot" />
+                    <object class="sizerslot" />
+                </object>
+            </object>
+            <object class="wxSplitterWindow" name="window_1" base="EditSplitterWindow">
+                <style>wxSP_3D</style>
+                <min_pane_size>20</min_pane_size>
+                <orientation>wxSPLIT_VERTICAL</orientation>
+                <window_1>window_1_pane_1</window_1>
+                <object class="wxPanel" name="window_1_pane_1" base="EditPanel">
+                    <background>#238e6b</background>
+                    <style>wxTAB_TRAVERSAL</style>
+                    <object class="wxGridBagSizer" name="grid_sizer_1" base="EditGridBagSizer">
+                        <rows>3</rows>
+                        <cols>3</cols>
+                        <vgap>0</vgap>
+                        <hgap>0</hgap>
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                        <object class="sizeritem">
+                            <span>1, 2</span>
+                            <border>0</border>
+                            <object class="wxButton" name="button_3" base="EditButton">
+                                <label>button spanning two cols</label>
+                            </object>
+                        </object>
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                        <object class="sizerslot" />
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/test_grid_custom_base_09.py wxglade-1.0.1/tests/casefiles/test_grid_custom_base_09.py
--- wxglade-0.9.6/tests/casefiles/test_grid_custom_base_09.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_grid_custom_base_09.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,49 @@
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 0.9.6 on Mon Jul 20 23:46:03 2020
+#
+
+import wx
+import wx.grid
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import my_grid
+# end wxGlade
+
+
+class TestGlade(wx.Panel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: TestGlade.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+        self.grid = my_grid.MyGrid(self, wx.ID_ANY, size=(1, 1))
+
+        self.__set_properties()
+        self.__do_layout()
+        # end wxGlade
+
+    def __set_properties(self):
+        # begin wxGlade: TestGlade.__set_properties
+        self.grid.CreateGrid(0, 1)
+        self.grid.SetRowLabelSize(0)
+        self.grid.SetColLabelSize(0)
+        self.grid.EnableEditing(0)
+        self.grid.EnableGridLines(0)
+        self.grid.EnableDragColSize(0)
+        self.grid.EnableDragRowSize(0)
+        self.grid.SetColLabelValue(0, "")
+        # end wxGlade
+
+    def __do_layout(self):
+        # begin wxGlade: TestGlade.__do_layout
+        main_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        main_sizer.Add(self.grid, 1, wx.EXPAND, 0)
+        self.SetSizer(main_sizer)
+        main_sizer.Fit(self)
+        self.Layout()
+        # end wxGlade
+
+# end of class TestGlade
diff -Nru wxglade-0.9.6/tests/casefiles/test_grid_custom_base_09.wxg wxglade-1.0.1/tests/casefiles/test_grid_custom_base_09.wxg
--- wxglade-0.9.6/tests/casefiles/test_grid_custom_base_09.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_grid_custom_base_09.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.9.6 on Mon Jul 20 23:46:33 2020 -->
+
+<application encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="0" option="0" overwrite="1" path="test_grid_custom_base_09.py" source_extension=".cpp" use_gettext="0" use_new_namespace="1">
+    <object class="TestGlade" name="test_glade" base="EditTopLevelPanel">
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer" name="main_sizer" base="EditBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="my_grid.MyGrid" name="grid" base="EditGrid">
+                    <extracode>import my_grid</extracode>
+                    <create_grid>1</create_grid>
+                    <columns>
+                        <column size="-1" />
+                    </columns>
+                    <rows_number>0</rows_number>
+                    <row_label_size>0</row_label_size>
+                    <col_label_size>0</col_label_size>
+                    <enable_editing>0</enable_editing>
+                    <enable_grid_lines>0</enable_grid_lines>
+                    <enable_col_resize>0</enable_col_resize>
+                    <enable_row_resize>0</enable_row_resize>
+                    <enable_grid_resize>1</enable_grid_resize>
+                    <selection_mode>wxGrid.wxGridSelectCells</selection_mode>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/test_grid_custom_base.cpp wxglade-1.0.1/tests/casefiles/test_grid_custom_base.cpp
--- wxglade-0.9.6/tests/casefiles/test_grid_custom_base.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_grid_custom_base.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,35 @@
+// -*- C++ -*-
+//
+// generated by wxGlade 0.9.9pre on Sun Jul 19 13:03:36 2020
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "test_grid_custom_base.h"
+
+
+
+
+TestGlade::TestGlade(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL)
+{
+    wxBoxSizer* main_sizer = new wxBoxSizer(wxHORIZONTAL);
+    grid = new my_grid.MyGrid(this, wxID_ANY);
+    grid->CreateGrid(0, 1);
+    grid->SetRowLabelSize(0);
+    grid->SetColLabelSize(0);
+    grid->EnableEditing(false);
+    grid->EnableGridLines(false);
+    grid->EnableDragColSize(false);
+    grid->EnableDragRowSize(false);
+    grid->SetColLabelValue(0, wxEmptyString);
+    main_sizer->Add(grid, 1, wxEXPAND, 0);
+    
+    SetSizer(main_sizer);
+    main_sizer->Fit(this);
+}
+
diff -Nru wxglade-0.9.6/tests/casefiles/test_grid_custom_base.h wxglade-1.0.1/tests/casefiles/test_grid_custom_base.h
--- wxglade-0.9.6/tests/casefiles/test_grid_custom_base.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_grid_custom_base.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,36 @@
+// -*- C++ -*-
+//
+// generated by wxGlade 0.9.9pre on Sun Jul 19 13:03:36 2020
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef TEST_GRID_CUSTOM_BASE_H
+#define TEST_GRID_CUSTOM_BASE_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+#include <wx/grid.h>
+
+import my_grid
+
+
+class TestGlade: public wxPanel {
+public:
+    TestGlade(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: TestGlade::attributes
+    my_grid.MyGrid* grid;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+#endif // TEST_GRID_CUSTOM_BASE_H
diff -Nru wxglade-0.9.6/tests/casefiles/test_grid_custom_base.lisp wxglade-1.0.1/tests/casefiles/test_grid_custom_base.lisp
--- wxglade-0.9.6/tests/casefiles/test_grid_custom_base.lisp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_grid_custom_base.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,58 @@
+;;; generated by wxGlade 0.9.9pre on Sun Jul 19 13:03:42 2020
+;;;
+
+(asdf:operate 'asdf:load-op 'wxcl)
+(use-package "FFI")
+(ffi:default-foreign-language :stdc)
+
+
+(use-package :my_grid.MyGrid)
+(use-package :wxCL)
+(use-package :wxColour)
+(use-package :wxEvent)
+(use-package :wxEvtHandler)
+(use-package :wxFrame)
+(use-package :wxSizer)
+(use-package :wxWindow)
+(use-package :wx_main)
+(use-package :wx_wrapper)
+
+import my_grid
+
+
+(defclass TestGlade()
+        ((top-window :initform nil :accessor slot-top-window)
+        (main-sizer :initform nil :accessor slot-main-sizer)
+        (grid :initform nil :accessor slot-grid)))
+
+(defun make-TestGlade ()
+        (let ((obj (make-instance 'TestGlade)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj TestGlade))
+"Method creates the objects contained in the class."
+        
+        (setf (slot-main-sizer obj) (wxBoxSizer_Create wxHORIZONTAL))
+        
+        (setf (slot-grid obj) (wxGrid_Create (slot-top-window obj) wxID_ANY -1 -1 -1 -1 wxWANTS_CHARS))
+        (wxGrid_CreateGrid (slot-grid obj) 0 1 0)
+        (wxGrid_SetRowLabelSize (slot-grid obj) 0)
+        (wxGrid_SetColLabelSize (slot-grid obj) 0)
+        (wxGrid_EnableEditing (slot-grid obj) 0)
+        (wxGrid_EnableGridLines (slot-grid obj) 0)
+        (wxGrid_EnableDragColSize (slot-grid obj) 0)
+        (wxGrid_EnableDragRowSize (slot-grid obj) 0)
+        (wxGrid_SetColLabelValue (slot-grid obj) 0 "")
+        (wxSizer_AddWindow (slot-main-sizer obj) (slot-grid obj) 1 wxEXPAND 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-main-sizer obj))
+        (wxSizer_Fit (slot-main-sizer obj) (slot-top-window obj))
+        
+        (wxPanel_layout (slot-test-glade self))
+        )
+
+
+
diff -Nru wxglade-0.9.6/tests/casefiles/test_grid_custom_base.pl wxglade-1.0.1/tests/casefiles/test_grid_custom_base.pl
--- wxglade-0.9.6/tests/casefiles/test_grid_custom_base.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_grid_custom_base.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,55 @@
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+
+import my_grid
+
+package TestGlade;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
+    $self->{main_sizer} = Wx::BoxSizer->new(wxHORIZONTAL);
+    
+    $self->{grid} = my_grid.MyGrid->new($self, wxID_ANY);
+    $self->{grid}->CreateGrid(0, 1);
+    $self->{grid}->SetRowLabelSize(0);
+    $self->{grid}->SetColLabelSize(0);
+    $self->{grid}->EnableEditing(0);
+    $self->{grid}->EnableGridLines(0);
+    $self->{grid}->EnableDragColSize(0);
+    $self->{grid}->EnableDragRowSize(0);
+    $self->{grid}->SetColLabelValue(0, "");
+    $self->{main_sizer}->Add($self->{grid}, 1, wxEXPAND, 0);
+    
+    $self->SetSizer($self->{main_sizer});
+    $self->{main_sizer}->Fit($self);
+    
+    $self->Layout();
+    return $self;
+
+}
+
+
+
+1;
+
diff -Nru wxglade-0.9.6/tests/casefiles/test_grid_custom_base.py wxglade-1.0.1/tests/casefiles/test_grid_custom_base.py
--- wxglade-0.9.6/tests/casefiles/test_grid_custom_base.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_grid_custom_base.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,35 @@
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 0.9.9pre on Sun Jul 19 13:03:30 2020
+#
+
+import wx
+
+import wx.grid
+
+import my_grid
+
+
+class TestGlade(wx.Panel):
+    def __init__(self, *args, **kwds):
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+
+        main_sizer = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.grid = my_grid.MyGrid(self, wx.ID_ANY, size=(1, 1))
+        self.grid.CreateGrid(0, 1)
+        self.grid.SetRowLabelSize(0)
+        self.grid.SetColLabelSize(0)
+        self.grid.EnableEditing(0)
+        self.grid.EnableGridLines(0)
+        self.grid.EnableDragColSize(0)
+        self.grid.EnableDragRowSize(0)
+        self.grid.SetColLabelValue(0, "")
+        main_sizer.Add(self.grid, 1, wx.EXPAND, 0)
+
+        self.SetSizer(main_sizer)
+        main_sizer.Fit(self)
+
+        self.Layout()
+
diff -Nru wxglade-0.9.6/tests/casefiles/test_grid_custom_base.wxg wxglade-1.0.1/tests/casefiles/test_grid_custom_base.wxg
--- wxglade-0.9.6/tests/casefiles/test_grid_custom_base.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_grid_custom_base.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.9.6 on Sun Jul 19 13:03:29 2020 -->
+
+<application encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="0" option="0" overwrite="1" path="test_grid_custom_base.py" source_extension=".cpp" use_gettext="0" use_new_namespace="1">
+    <object class="TestGlade" name="test_glade" base="EditTopLevelPanel">
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer" name="main_sizer" base="EditBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="my_grid.MyGrid" name="grid" base="EditGrid">
+                    <extracode>import my_grid</extracode>
+                    <create_grid>1</create_grid>
+                    <columns>
+                        <column size="-1" />
+                    </columns>
+                    <rows_number>0</rows_number>
+                    <row_label_size>0</row_label_size>
+                    <col_label_size>0</col_label_size>
+                    <enable_editing>0</enable_editing>
+                    <enable_grid_lines>0</enable_grid_lines>
+                    <enable_col_resize>0</enable_col_resize>
+                    <enable_row_resize>0</enable_row_resize>
+                    <enable_grid_resize>1</enable_grid_resize>
+                    <selection_mode>wxGrid.wxGridSelectCells</selection_mode>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/test_grid_custom_base.xrc wxglade-1.0.1/tests/casefiles/test_grid_custom_base.xrc
--- wxglade-0.9.6/tests/casefiles/test_grid_custom_base.xrc	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_grid_custom_base.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- generated by wxGlade -->
+
+<resource version="2.3.0.1">
+    <object class="wxPanel" name="test_glade" subclass="TestGlade">
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <flag>wxEXPAND</flag>
+                <object class="wxGrid" name="grid" subclass="my_grid.MyGrid">
+                    <extracode>import my_grid</extracode>
+                </object>
+            </object>
+        </object>
+    </object>
+</resource>
diff -Nru wxglade-0.9.6/tests/casefiles/test_no_custom_class09.cpp wxglade-1.0.1/tests/casefiles/test_no_custom_class09.cpp
--- wxglade-0.9.6/tests/casefiles/test_no_custom_class09.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_no_custom_class09.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "test_no_custom_class09.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+MyDialog::MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
+{
+    // begin wxGlade: MyDialog::MyDialog
+    SetTitle(wxT("dialog"));
+    wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
+    panel_1 = new my_panel.MyPanel(this, wxID_ANY);
+    main_sizer->Add(panel_1, 1, wxEXPAND, 0);
+    
+    SetSizer(main_sizer);
+    main_sizer->Fit(this);
+    Layout();
+    // end wxGlade
+}
+
diff -Nru wxglade-0.9.6/tests/casefiles/test_no_custom_class09.h wxglade-1.0.1/tests/casefiles/test_no_custom_class09.h
--- wxglade-0.9.6/tests/casefiles/test_no_custom_class09.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_no_custom_class09.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,42 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef TEST_NO_CUSTOM_CLASS09_H
+#define TEST_NO_CUSTOM_CLASS09_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+// begin wxGlade: ::dependencies
+// end wxGlade
+
+// begin wxGlade: ::extracode
+import my_panel
+// end wxGlade
+
+
+class MyDialog: public wxDialog {
+public:
+    // begin wxGlade: MyDialog::ids
+    // end wxGlade
+
+    MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyDialog::attributes
+    my_panel.MyPanel* panel_1;
+    // end wxGlade
+}; // wxGlade: end class
+
+
+#endif // TEST_NO_CUSTOM_CLASS09_H
diff -Nru wxglade-0.9.6/tests/casefiles/test_no_custom_class09.pl wxglade-1.0.1/tests/casefiles/test_no_custom_class09.pl
--- wxglade-0.9.6/tests/casefiles/test_no_custom_class09.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_no_custom_class09.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,56 @@
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import my_panel
+# end wxGlade
+
+package MyDialog;
+
+use Wx qw[:everything];
+use base qw(Wx::Dialog);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyDialog::new
+    $style = wxDEFAULT_DIALOG_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetTitle("dialog");
+    
+    $self->{main_sizer} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{panel_1} = my_panel.MyPanel->new($self, wxID_ANY);
+    $self->{main_sizer}->Add($self->{panel_1}, 1, wxEXPAND, 0);
+    
+    $self->SetSizer($self->{main_sizer});
+    $self->{main_sizer}->Fit($self);
+    
+    $self->Layout();
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyDialog
+
+1;
+
diff -Nru wxglade-0.9.6/tests/casefiles/test_no_custom_class09.py wxglade-1.0.1/tests/casefiles/test_no_custom_class09.py
--- wxglade-0.9.6/tests/casefiles/test_no_custom_class09.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_no_custom_class09.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,34 @@
+# -*- coding: ISO-8859-1 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+import my_panel
+# end wxGlade
+
+
+class MyDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetTitle("dialog")
+
+        main_sizer = wx.BoxSizer(wx.VERTICAL)
+
+        self.panel_1 = my_panel.MyPanel(self, wx.ID_ANY)
+        main_sizer.Add(self.panel_1, 1, wx.EXPAND, 0)
+
+        self.SetSizer(main_sizer)
+        main_sizer.Fit(self)
+
+        self.Layout()
+        # end wxGlade
+
+# end of class MyDialog
diff -Nru wxglade-0.9.6/tests/casefiles/test_no_custom_class09_Saved.wxg wxglade-1.0.1/tests/casefiles/test_no_custom_class09_Saved.wxg
--- wxglade-0.9.6/tests/casefiles/test_no_custom_class09_Saved.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_no_custom_class09_Saved.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.9.9pre on Mon Jul 20 21:22:37 2020 -->
+
+<application encoding="ISO-8859-1" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" option="0" overwrite="1" path="test_no_custom_class09.py" source_extension=".cpp" top_window="" use_gettext="0" use_new_namespace="1">
+    <object class="MyDialog" name="dialog" base="EditDialog">
+        <title>dialog</title>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <object class="wxBoxSizer" name="main_sizer" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="wxPanel" name="panel_1" base="EditPanel" instance_class="my_panel.MyPanel">
+                    <extracode>import my_panel</extracode>
+                    <style>wxTAB_TRAVERSAL</style>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/test_no_custom_class09.wxg wxglade-1.0.1/tests/casefiles/test_no_custom_class09.wxg
--- wxglade-0.9.6/tests/casefiles/test_no_custom_class09.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_no_custom_class09.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade 0.9.6 on Mon Jul 20 20:37:43 2020 -->
+
+<application encoding="ISO-8859-1" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" option="0" overwrite="1" path="test_no_custom_class09.py" source_extension=".cpp" top_window="" use_gettext="0" use_new_namespace="1">
+    <object class="MyDialog" name="dialog" base="EditDialog">
+        <title>dialog</title>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <object class="wxBoxSizer" name="main_sizer" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <border>0</border>
+                <flag>wxEXPAND</flag>
+                <object class="my_panel.MyPanel" name="panel_1" base="EditPanel" no_custom_class="1">
+                    <extracode>import my_panel</extracode>
+                    <style>wxTAB_TRAVERSAL</style>
+                    <no_custom_class>1</no_custom_class>
+                </object>
+            </object>
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/test_no_custom_class09.xrc wxglade-1.0.1/tests/casefiles/test_no_custom_class09.xrc
--- wxglade-0.9.6/tests/casefiles/test_no_custom_class09.xrc	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/test_no_custom_class09.xrc	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- generated by wxGlade 0.9.6 on Mon Jul 20 21:25:25 2020 -->
+
+<resource version="2.3.0.1">
+    <object class="wxDialog" name="dialog" subclass="MyDialog">
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <title>dialog</title>
+        <object class="wxBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <option>1</option>
+                <flag>wxEXPAND</flag>
+                <object class="wxPanel" name="panel_1" subclass="my_panel.MyPanel">
+                    <extracode>import my_panel</extracode>
+                    <style>wxTAB_TRAVERSAL</style>
+                </object>
+            </object>
+        </object>
+    </object>
+</resource>
diff -Nru wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding_Classic.py wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding_Classic.py
--- wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding_Classic.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_menubar = wx.MenuBar()
+        wxglade_tmp_menu = wx.Menu()
+        self.frame_menubar.item1 = wxglade_tmp_menu.Append(wx.ID_ANY, "My Menu Item 1", "")
+        self.Bind(wx.EVT_MENU, self.on_menu_item1, self.frame_menubar.item1)
+        item = wxglade_tmp_menu.Append(wx.ID_ANY, "My Menu Item 1", "without attribute name")
+        self.Bind(wx.EVT_MENU, self.on_menu_item2, item)
+        self.frame_menubar.Append(wxglade_tmp_menu, "Menu 1")
+        self.SetMenuBar(self.frame_menubar)
+        # Menu Bar end
+
+        # Tool Bar
+        self.frame_toolbar = wx.ToolBar(self, -1)
+        tool = self.frame_toolbar.AddLabelTool(wx.ID_ANY, "My Tool", wx.Bitmap("..\\..\\icons\\button.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, "", "")
+        self.Bind(wx.EVT_TOOL, self.on_my_tool, id=tool.GetId())
+        self.SetToolBar(self.frame_toolbar)
+        self.frame_toolbar.Realize()
+        # Tool Bar end
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+
+        # end wxGlade
+
+    def on_menu_item1(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("Event handler 'on_menu_item1' not implemented!")
+        event.Skip()
+
+    def on_menu_item2(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("Event handler 'on_menu_item2' not implemented!")
+        event.Skip()
+
+    def on_my_tool(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("Event handler 'on_my_tool' not implemented!")
+        event.Skip()
+
+# end of class MyFrame
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding.cpp wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding.cpp
--- wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,95 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "Tool_Menu_EventBinding.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: MyFrame::MyFrame
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("frame"));
+    frame_menubar = new wxMenuBar();
+    wxMenu *wxglade_tmp_menu;
+    wxMenuItem *wxglade_tmp_item;
+    wxglade_tmp_menu = new wxMenu();
+    item1 = wxglade_tmp_menu->Append(wxID_ANY, wxT("My Menu Item 1"), wxEmptyString);
+    Bind(wxEVT_MENU, &MyFrame::on_menu_item1, this, item1->GetId());
+    wxglade_tmp_item = wxglade_tmp_menu->Append(wxID_ANY, wxT("My Menu Item 1"), wxT("without attribute name"));
+    Bind(wxEVT_MENU, &MyFrame::on_menu_item2, this, wxglade_tmp_item->GetId());
+    frame_menubar->Append(wxglade_tmp_menu, wxT("Menu 1"));
+    SetMenuBar(frame_menubar);
+    frame_toolbar = new wxToolBar(this, -1);
+    SetToolBar(frame_toolbar);
+    wxToolBarToolBase *wxglade_tmp_tool;
+    wxglade_tmp_tool = frame_toolbar->AddTool(wxID_ANY, wxT("My Tool"), wxBitmap(wxT("..\\..\\icons\\button.png"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString);
+    Bind(wxEVT_MENU, &MyFrame::on_my_tool, this, wxglade_tmp_tool->GetId());
+    frame_toolbar->Realize();
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    Layout();
+    // end wxGlade
+}
+
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    // begin wxGlade: MyFrame::event_table
+    // end wxGlade
+END_EVENT_TABLE();
+
+
+void MyFrame::on_menu_item1(wxCommandEvent &event)  // wxGlade: MyFrame.<event_handler>
+{
+    event.Skip();
+    // notify the user that he hasn't implemented the event handler yet
+    wxLogDebug(wxT("Event handler (MyFrame::on_menu_item1) not implemented yet"));
+}
+
+void MyFrame::on_menu_item2(wxCommandEvent &event)  // wxGlade: MyFrame.<event_handler>
+{
+    event.Skip();
+    // notify the user that he hasn't implemented the event handler yet
+    wxLogDebug(wxT("Event handler (MyFrame::on_menu_item2) not implemented yet"));
+}
+
+void MyFrame::on_my_tool(wxCommandEvent &event)  // wxGlade: MyFrame.<event_handler>
+{
+    event.Skip();
+    // notify the user that he hasn't implemented the event handler yet
+    wxLogDebug(wxT("Event handler (MyFrame::on_my_tool) not implemented yet"));
+}
+
+
+// wxGlade: add MyFrame event handlers
+
+
+class MyApp: public wxApp {
+public:
+    bool OnInit();
+};
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    wxInitAllImageHandlers();
+    MyFrame* frame = new MyFrame(NULL, wxID_ANY, wxEmptyString);
+    SetTopWindow(frame);
+    frame->Show();
+    return true;
+}
diff -Nru wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding.h wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding.h
--- wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,50 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef TOOL_MENU_EVENTBINDING_H
+#define TOOL_MENU_EVENTBINDING_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+// begin wxGlade: ::dependencies
+// end wxGlade
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+class MyFrame: public wxFrame {
+public:
+    // begin wxGlade: MyFrame::ids
+    // end wxGlade
+
+    MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrame::attributes
+    wxMenuItem* item1;
+    wxMenuBar* frame_menubar;
+    wxToolBar* frame_toolbar;
+    // end wxGlade
+
+    DECLARE_EVENT_TABLE();
+
+public:
+    virtual void on_menu_item1(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void on_menu_item2(wxCommandEvent &event); // wxGlade: <event_handler>
+    virtual void on_my_tool(wxCommandEvent &event); // wxGlade: <event_handler>
+}; // wxGlade: end class
+
+
+#endif // TOOL_MENU_EVENTBINDING_H
diff -Nru wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding.lisp wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding.lisp
--- wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding.lisp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,89 @@
+#!/usr/bin/env lisp
+;;;
+;;; generated by wxGlade 0.9.9pre on Wed Oct  9 21:43:25 2019
+;;;
+
+(asdf:operate 'asdf:load-op 'wxcl)
+(use-package "FFI")
+(ffi:default-foreign-language :stdc)
+
+
+;;; begin wxGlade: dependencies
+(use-package :wxCL)
+(use-package :wxColour)
+(use-package :wxEvent)
+(use-package :wxEvtHandler)
+(use-package :wxFrame)
+(use-package :wxMenu)
+(use-package :wxMenuBar)
+(use-package :wxSizer)
+(use-package :wxToolBar)
+(use-package :wxWindow)
+(use-package :wx_main)
+(use-package :wx_wrapper)
+;;; end wxGlade
+
+;;; begin wxGlade: extracode
+;;; end wxGlade
+
+
+(defclass MyFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (frame-menubar :initform nil :accessor slot-frame-menubar)
+        (frame-toolbar :initform nil :accessor slot-frame-toolbar)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyFrame ()
+        (let ((obj (make-instance 'MyFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyFrame.__init__
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxFrame_SetTitle (slot-top-window obj) "frame")
+        
+        ;;; Menu Bar
+        (setf (slot-frame-menubar obj) (wxMenuBar_Create 0))
+        (let ((wxglade_tmp_menu (wxMenu_Create "" 0)))
+        (wxMenu_Append wxglade_tmp_menu wxID_ANY "My Menu Item 1" "" 0)
+        (wxMenu_Append wxglade_tmp_menu wxID_ANY "My Menu Item 1" "without attribute name" 0)
+        		(wxMenuBar_Append (slot-frame-menubar obj) wxglade_tmp_menu "Menu 1"))
+        (wxFrame_SetMenuBar (slot-top-window obj) (slot-frame-menubar obj))
+        ;;; Menu Bar end        
+        
+        ;;; Tool Bar
+        (setf (slot-frame-toolbar obj) (wxToolBar_Create (slot-top-window obj) -1 -1 -1 -1 -1 wxTB_HORIZONTAL))
+        (wxToolBar_AddTool (slot-frame-toolbar obj) wxID_ANY "My Tool" (wxBitmap_CreateLoad "D:\\Python\\wxglade\\wxglade_dev_master\\icons\\button.png" wxBITMAP_TYPE_ANY) wxNullBitmap wxITEM_NORMAL "" "")
+        (wxToolBar_Realize (slot-frame-toolbar obj))
+        (wxToolBar_Realize (slot-frame-toolbar obj))
+        (wxFrame_SetToolBar (slot-top-window obj) (slot-frame-toolbar obj))
+        ;;; Tool Bar end
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxFrame_layout (slot-frame self))
+        ;;; end wxGlade
+        )
+
+;;; end of class MyFrame
+
+
+(defun init-func (fun data evt)
+        (let ((frame (make-MyFrame)))
+        (ELJApp_SetTopWindow (slot-top-window frame))
+        (wxWindow_Show (slot-top-window frame))))
+;;; end of class MyApp
+
+
+(unwind-protect
+    (Eljapp_initializeC (wxclosure_Create #'init-func nil) 0 nil)
+    (ffi:close-foreign-library "../miscellaneous/wxc-msw2.6.2.dll"))
diff -Nru wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding_Phoenix.py wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding_Phoenix.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        # Menu Bar
+        self.frame_menubar = wx.MenuBar()
+        wxglade_tmp_menu = wx.Menu()
+        self.frame_menubar.item1 = wxglade_tmp_menu.Append(wx.ID_ANY, "My Menu Item 1", "")
+        self.Bind(wx.EVT_MENU, self.on_menu_item1, self.frame_menubar.item1)
+        item = wxglade_tmp_menu.Append(wx.ID_ANY, "My Menu Item 1", "without attribute name")
+        self.Bind(wx.EVT_MENU, self.on_menu_item2, item)
+        self.frame_menubar.Append(wxglade_tmp_menu, "Menu 1")
+        self.SetMenuBar(self.frame_menubar)
+        # Menu Bar end
+
+        # Tool Bar
+        self.frame_toolbar = wx.ToolBar(self, -1)
+        tool = self.frame_toolbar.AddTool(wx.ID_ANY, "My Tool", wx.Bitmap("..\\..\\icons\\button.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, "", "")
+        self.Bind(wx.EVT_TOOL, self.on_my_tool, id=tool.GetId())
+        self.SetToolBar(self.frame_toolbar)
+        self.frame_toolbar.Realize()
+        # Tool Bar end
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+
+        # end wxGlade
+
+    def on_menu_item1(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("Event handler 'on_menu_item1' not implemented!")
+        event.Skip()
+
+    def on_menu_item2(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("Event handler 'on_menu_item2' not implemented!")
+        event.Skip()
+
+    def on_my_tool(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("Event handler 'on_my_tool' not implemented!")
+        event.Skip()
+
+# end of class MyFrame
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding.pl wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding.pl
--- wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,125 @@
+#!/usr/bin/perl -w -- 
+#
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+package MyFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyFrame::new
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("frame");
+    
+    
+
+    # Menu Bar
+
+    $self->{frame_menubar} = Wx::MenuBar->new();
+    my $wxglade_tmp_menu;
+    $wxglade_tmp_menu = Wx::Menu->new();
+    $self->{item1} = $wxglade_tmp_menu->Append(wxID_ANY, "My Menu Item 1", "");
+    $wxglade_tmp_menu->Append(wxID_ANY, "My Menu Item 1", "without attribute name");
+    $self->{frame_menubar}->Append($wxglade_tmp_menu, "Menu 1");
+    $self->SetMenuBar($self->{frame_menubar});
+    
+    # Menu Bar end
+
+    
+    
+    # Tool Bar
+    $self->{frame_toolbar} = Wx::ToolBar->new($self, -1);
+    $self->{frame_toolbar}->AddTool(wxID_ANY, "My Tool", Wx::Bitmap->new("..\\..\\icons\\button.png", wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, "", "");
+    $self->SetToolBar($self->{frame_toolbar});
+    $self->{frame_toolbar}->Realize();
+    # Tool Bar end
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    Wx::Event::EVT_MENU($self, $self->{item1}->GetId, $self->can('on_menu_item1'));
+    Wx::Event::EVT_MENU($self, wxID_ANY, $self->can('on_menu_item2'));
+
+    # end wxGlade
+    return $self;
+
+}
+
+
+sub on_menu_item1 {
+    my ($self, $event) = @_;
+    # wxGlade: MyFrame::on_menu_item1 <event_handler>
+    warn "Event handler (on_menu_item1) not implemented";
+    $event->Skip;
+    # end wxGlade
+}
+
+
+sub on_menu_item2 {
+    my ($self, $event) = @_;
+    # wxGlade: MyFrame::on_menu_item2 <event_handler>
+    warn "Event handler (on_menu_item2) not implemented";
+    $event->Skip;
+    # end wxGlade
+}
+
+
+# end of class MyFrame
+
+1;
+
+package MyApp;
+
+use base qw(Wx::App);
+use strict;
+
+sub OnInit {
+    my( $self ) = shift;
+
+    Wx::InitAllImageHandlers();
+
+    my $frame = MyFrame->new();
+
+    $self->SetTopWindow($frame);
+    $frame->Show(1);
+
+    return 1;
+}
+# end of class MyApp
+
+package main;
+
+unless(caller){
+    my $app = MyApp->new();
+    $app->MainLoop();
+}
diff -Nru wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding.wxg wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding.wxg
--- wxglade-0.9.6/tests/casefiles/Tool_Menu_EventBinding.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/Tool_Menu_EventBinding.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
+
+<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="Tool_Menu_EventBinding.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <size>400, 300</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <menubar>1</menubar>
+        <toolbar>1</toolbar>
+        <object class="wxMenuBar" name="frame_menubar" base="EditMenuBar">
+            <menus>
+                <menu label="Menu 1" name="">
+                    <item>
+                        <label>My Menu Item 1</label>
+                        <name>item1</name>
+                        <handler>on_menu_item1</handler>
+                    </item>
+                    <item>
+                        <label>My Menu Item 1</label>
+                        <help_str>without attribute name</help_str>
+                        <handler>on_menu_item2</handler>
+                    </item>
+                </menu>
+            </menus>
+        </object>
+        <object class="wxToolBar" name="frame_toolbar" base="EditToolBar">
+            <tools>
+                <tool>
+                    <id />
+                    <label>My Tool</label>
+                    <type>0</type>
+                    <short_help />
+                    <long_help />
+                    <bitmap1>..\..\icons\button.png</bitmap1>
+                    <bitmap2 />
+                    <handler>on_my_tool</handler>
+                </tool>
+            </tools>
+        </object>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/toplevel_extracode.cpp wxglade-1.0.1/tests/casefiles/toplevel_extracode.cpp
--- wxglade-0.9.6/tests/casefiles/toplevel_extracode.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/toplevel_extracode.cpp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,147 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#include "toplevel_extracode.h"
+
+// begin wxGlade: ::extracode
+// end wxGlade
+
+
+
+MyFrame::MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
+{
+    // begin wxGlade: MyFrame::MyFrame
+    # frame extra code before
+    SetSize(wxSize(400, 300));
+    SetTitle(wxT("frame"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    Layout();
+    # frame extra code after
+    // end wxGlade
+}
+
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    // begin wxGlade: MyFrame::event_table
+    EVT_CLOSE(wxID_ANY, MyFrame::on_close_frame)
+    EVT_MENU_CLOSE(wxID_ANY, MyFrame::on_menu_close_frame)
+    // end wxGlade
+END_EVENT_TABLE();
+
+
+void MyFrame::on_close_frame(wxCloseEvent &event)  // wxGlade: MyFrame.<event_handler>
+{
+    event.Skip();
+    // notify the user that he hasn't implemented the event handler yet
+    wxLogDebug(wxT("Event handler (MyFrame::on_close_frame) not implemented yet"));
+}
+
+void MyFrame::on_menu_close_frame(MenuEvent &event)  // wxGlade: MyFrame.<event_handler>
+{
+    event.Skip();
+    // notify the user that he hasn't implemented the event handler yet
+    wxLogDebug(wxT("Event handler (MyFrame::on_menu_close_frame) not implemented yet"));
+}
+
+
+// wxGlade: add MyFrame event handlers
+
+
+MyDialog::MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
+    wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
+{
+    // begin wxGlade: MyDialog::MyDialog
+    # dialog extra code before
+    SetTitle(wxT("dialog"));
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    sizer_1->Fit(this);
+    Layout();
+    # dialog extra code after
+    // end wxGlade
+}
+
+
+BEGIN_EVENT_TABLE(MyDialog, wxDialog)
+    // begin wxGlade: MyDialog::event_table
+    EVT_CLOSE(wxID_ANY, MyDialog::on_close_dialog)
+    // end wxGlade
+END_EVENT_TABLE();
+
+
+void MyDialog::on_close_dialog(wxCloseEvent &event)  // wxGlade: MyDialog.<event_handler>
+{
+    event.Skip();
+    // notify the user that he hasn't implemented the event handler yet
+    wxLogDebug(wxT("Event handler (MyDialog::on_close_dialog) not implemented yet"));
+}
+
+
+// wxGlade: add MyDialog event handlers
+
+
+MyMenuBar::MyMenuBar():
+    wxMenuBar()
+{
+    // begin wxGlade: MyMenuBar::MyMenuBar
+    # menubar extracode before
+    # menubar extracode after
+    // end wxGlade
+}
+
+
+wxToolBar::wxToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxToolBar(parent, id, pos, size, style)
+{
+    // begin wxGlade: wxToolBar::wxToolBar
+    # toolbar extracode before
+    Realize();
+    # toolbar extracode after
+    // end wxGlade
+}
+
+
+MyDialog1::MyDialog1(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL)
+{
+    // begin wxGlade: MyDialog1::MyDialog1
+    # panel extracode before
+    wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
+    sizer_1->Add(0, 0, 0, 0, 0);
+    
+    SetSizer(sizer_1);
+    sizer_1->Fit(this);
+    # panel extracode after
+    // end wxGlade
+}
+
+
+class MyApp: public wxApp {
+public:
+    bool OnInit();
+};
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    wxInitAllImageHandlers();
+    MyFrame* frame = new MyFrame(NULL, wxID_ANY, wxEmptyString);
+    SetTopWindow(frame);
+    frame->Show();
+    return true;
+}
diff -Nru wxglade-0.9.6/tests/casefiles/toplevel_extracode.h wxglade-1.0.1/tests/casefiles/toplevel_extracode.h
--- wxglade-0.9.6/tests/casefiles/toplevel_extracode.h	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/toplevel_extracode.h	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,113 @@
+// -*- C++ -*-
+//
+// generated by wxGlade
+//
+// Example for compiling a single file project under Linux using g++:
+//  g++ MyApp.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp
+//
+// Example for compiling a multi file project under Linux using g++:
+//  g++ main.cpp $(wx-config --libs) $(wx-config --cxxflags) -o MyApp Dialog1.cpp Frame1.cpp
+//
+
+#ifndef TOPLEVEL_EXTRACODE_H
+#define TOPLEVEL_EXTRACODE_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+
+// begin wxGlade: ::dependencies
+// end wxGlade
+
+// begin wxGlade: ::extracode
+# frame extra code
+# dialog extra code
+// end wxGlade
+
+
+class MyFrame: public wxFrame {
+public:
+    // begin wxGlade: MyFrame::ids
+    // end wxGlade
+
+    MyFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyFrame::attributes
+    // end wxGlade
+
+    DECLARE_EVENT_TABLE();
+
+public:
+    virtual void on_close_frame(wxCloseEvent &event); // wxGlade: <event_handler>
+    virtual void on_menu_close_frame(MenuEvent &event); // wxGlade: <event_handler>
+}; // wxGlade: end class
+
+
+class MyDialog: public wxDialog {
+public:
+    // begin wxGlade: MyDialog::ids
+    // end wxGlade
+
+    MyDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
+
+private:
+
+protected:
+    // begin wxGlade: MyDialog::attributes
+    // end wxGlade
+
+    DECLARE_EVENT_TABLE();
+
+public:
+    virtual void on_close_dialog(wxCloseEvent &event); // wxGlade: <event_handler>
+}; // wxGlade: end class
+
+
+class MyMenuBar: public wxMenuBar {
+public:
+    // begin wxGlade: MyMenuBar::ids
+    // end wxGlade
+
+    MyMenuBar();
+
+private:
+
+protected:
+    // begin wxGlade: MyMenuBar::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class wxToolBar: public wxToolBar {
+public:
+    // begin wxGlade: wxToolBar::ids
+    // end wxGlade
+
+    wxToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxTB_HORIZONTAL|wxNO_BORDER);
+
+private:
+
+protected:
+    // begin wxGlade: wxToolBar::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+class MyDialog1: public wxPanel {
+public:
+    // begin wxGlade: MyDialog1::ids
+    // end wxGlade
+
+    MyDialog1(wxWindow* parent, wxWindowID id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=0);
+
+private:
+
+protected:
+    // begin wxGlade: MyDialog1::attributes
+    // end wxGlade
+}; // wxGlade: end class
+
+
+#endif // TOPLEVEL_EXTRACODE_H
diff -Nru wxglade-0.9.6/tests/casefiles/toplevel_extracode.lisp wxglade-1.0.1/tests/casefiles/toplevel_extracode.lisp
--- wxglade-0.9.6/tests/casefiles/toplevel_extracode.lisp	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/toplevel_extracode.lisp	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,213 @@
+#!/usr/bin/env lisp
+;;;
+;;; generated by wxGlade
+;;;
+
+(asdf:operate 'asdf:load-op 'wxcl)
+(use-package "FFI")
+(ffi:default-foreign-language :stdc)
+
+
+;;; begin wxGlade: dependencies
+(use-package :wxButton)
+(use-package :wxCL)
+(use-package :wxColour)
+(use-package :wxEvent)
+(use-package :wxEvtHandler)
+(use-package :wxFrame)
+(use-package :wxSizer)
+(use-package :wxWindow)
+(use-package :wx_main)
+(use-package :wx_wrapper)
+;;; end wxGlade
+
+;;; begin wxGlade: extracode
+# frame extra code
+# dialog extra code
+;;; end wxGlade
+
+
+(defclass MyFrame()
+        ((top-window :initform nil :accessor slot-top-window)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyFrame ()
+        (let ((obj (make-instance 'MyFrame)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyFrame))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyFrame.__init__
+        # frame extra code before
+        (setf (slot-top-window obj) (wxFrame_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_FRAME_STYLE))
+        (slot-top-window obj).wxWindow_SetSize((400, 300))
+        (wxFrame_SetTitle (slot-top-window obj) "frame")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        
+        (wxFrame_layout (slot-frame self))
+        # frame extra code after
+
+        (wxEvtHandler_Connect (slot-top-window obj) obj (expwxEVT_CLOSE)
+        (wxClosure_Create #'on_close_frame obj))
+        (wxEvtHandler_Connect (slot-top-window obj) obj (expwxEVT_MENU_CLOSE)
+        (wxClosure_Create #'on_menu_close_frame obj))
+        ;;; end wxGlade
+        )
+
+(defun on_close_frame (function data event) ;;; wxGlade: MyFrame.<event_handler>
+        (print "Event handler 'on_close_frame' not implemented!")
+        (when event
+                (wxEvent:wxEvent_Skip event)))
+
+(defun on_menu_close_frame (function data event) ;;; wxGlade: MyFrame.<event_handler>
+        (print "Event handler 'on_menu_close_frame' not implemented!")
+        (when event
+                (wxEvent:wxEvent_Skip event)))
+
+;;; end of class MyFrame
+
+
+
+(defclass MyDialog()
+        ((top-window :initform nil :accessor slot-top-window)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyDialog ()
+        (let ((obj (make-instance 'MyDialog)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyDialog))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyDialog.__init__
+        # dialog extra code before
+        (setf (slot-top-window obj) (wxDialog_create nil wxID_ANY "" -1 -1 -1 -1 wxDEFAULT_DIALOG_STYLE))
+        (wxWindow_SetTitle (slot-dialog self) "dialog")
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
+        (wxWindow_layout (slot-dialog self))
+        # dialog extra code after
+
+        (wxEvtHandler_Connect (slot-top-window obj) obj (expwxEVT_CLOSE)
+        (wxClosure_Create #'on_close_dialog obj))
+        ;;; end wxGlade
+        )
+
+(defun on_close_dialog (function data event) ;;; wxGlade: MyDialog.<event_handler>
+        (print "Event handler 'on_close_dialog' not implemented!")
+        (when event
+                (wxEvent:wxEvent_Skip event)))
+
+;;; end of class MyDialog
+
+
+
+(defclass MyMenuBar()
+        ((top-window :initform nil :accessor slot-top-window)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyMenuBar ()
+        (let ((obj (make-instance 'MyMenuBar)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyMenuBar))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyMenuBar.__init__
+        # menubar extracode before
+        # menubar extracode after
+        ;;; end wxGlade
+        )
+
+;;; end of class MyMenuBar
+
+
+
+(defclass wxToolBar()
+        ((top-window :initform nil :accessor slot-top-window)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-wxToolBar ()
+        (let ((obj (make-instance 'wxToolBar)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj wxToolBar))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: wxToolBar.__init__
+        # toolbar extracode before
+        (wxToolBar_Realize (slot-toolbar obj))
+        # toolbar extracode after
+        ;;; end wxGlade
+        )
+
+;;; end of class wxToolBar
+
+
+
+(defclass MyDialog1()
+        ((top-window :initform nil :accessor slot-top-window)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)
+        (sizer-1 :initform nil :accessor slot-sizer-1)))
+
+(defun make-MyDialog1 ()
+        (let ((obj (make-instance 'MyDialog1)))
+          (init obj)
+          (set-properties obj)
+          (do-layout obj)
+          obj))
+
+(defmethod init ((obj MyDialog1))
+"Method creates the objects contained in the class."
+        ;;; begin wxGlade: MyDialog1.__init__
+        # panel extracode before
+        
+        (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL))
+        
+        (wxSizer_AddWindow (slot-sizer-1 obj) ((0, 0) obj) 0 0 0 nil)
+        
+        (wxWindow_SetSizer (slot-top-window obj) (slot-sizer-1 obj))
+        (wxSizer_Fit (slot-sizer-1 obj) (slot-top-window obj))
+        
+        (wxPanel_layout (slot-panel self))
+        # panel extracode after
+        ;;; end wxGlade
+        )
+
+;;; end of class MyDialog1
+
+
+(defun init-func (fun data evt)
+        (let ((frame (make-MyFrame)))
+        (ELJApp_SetTopWindow (slot-top-window frame))
+        (wxWindow_Show (slot-top-window frame))))
+;;; end of class MyApp
+
+
+(unwind-protect
+    (Eljapp_initializeC (wxclosure_Create #'init-func nil) 0 nil)
+    (ffi:close-foreign-library "../miscellaneous/wxc-msw2.6.2.dll"))
diff -Nru wxglade-0.9.6/tests/casefiles/toplevel_extracode.pl wxglade-1.0.1/tests/casefiles/toplevel_extracode.pl
--- wxglade-0.9.6/tests/casefiles/toplevel_extracode.pl	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/toplevel_extracode.pl	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,245 @@
+#!/usr/bin/perl -w -- 
+#
+# generated by wxGlade
+#
+# To get wxPerl visit http://www.wxperl.it
+#
+
+use Wx qw[:allclasses];
+use strict;
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# frame extra code
+# dialog extra code
+# end wxGlade
+
+package MyFrame;
+
+use Wx qw[:everything];
+use base qw(Wx::Frame);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyFrame::new
+    # frame extra code before
+    $style = wxDEFAULT_FRAME_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetSize(Wx::Size->new(400, 300));
+    $self->SetTitle("frame");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    
+    $self->Layout();
+    # frame extra code after
+    Wx::Event::EVT_CLOSE($self, $self->GetId, $self->can('on_close_frame'));
+    Wx::Event::EVT_MENU_CLOSE($self, $self->GetId, $self->can('on_menu_close_frame'));
+
+    # end wxGlade
+    return $self;
+
+}
+
+
+sub on_close_frame {
+    my ($self, $event) = @_;
+    # wxGlade: MyFrame::on_close_frame <event_handler>
+    warn "Event handler (on_close_frame) not implemented";
+    $event->Skip;
+    # end wxGlade
+}
+
+
+sub on_menu_close_frame {
+    my ($self, $event) = @_;
+    # wxGlade: MyFrame::on_menu_close_frame <event_handler>
+    warn "Event handler (on_menu_close_frame) not implemented";
+    $event->Skip;
+    # end wxGlade
+}
+
+
+# end of class MyFrame
+
+1;
+
+package MyDialog;
+
+use Wx qw[:everything];
+use base qw(Wx::Dialog);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $title, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $title  = ""                 unless defined $title;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyDialog::new
+    # dialog extra code before
+    $style = wxDEFAULT_DIALOG_STYLE
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $title, $pos, $size, $style, $name );
+    $self->SetTitle("dialog");
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->Fit($self);
+    
+    $self->Layout();
+    # dialog extra code after
+    Wx::Event::EVT_CLOSE($self, $self->GetId, $self->can('on_close_dialog'));
+
+    # end wxGlade
+    return $self;
+
+}
+
+
+sub on_close_dialog {
+    my ($self, $event) = @_;
+    # wxGlade: MyDialog::on_close_dialog <event_handler>
+    warn "Event handler (on_close_dialog) not implemented";
+    $event->Skip;
+    # end wxGlade
+}
+
+
+# end of class MyDialog
+
+1;
+
+package MyMenuBar;
+
+use Wx qw[:everything];
+use base qw(Wx::MenuBar);
+use strict;
+
+sub new {
+    my( $self,  ) = @_;
+    # begin wxGlade: MyMenuBar::new
+    # menubar extracode before
+    $self = $self->SUPER::new( @_[1 .. $#_] );
+    my $wxglade_tmp_menu;
+    # menubar extracode after
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyMenuBar
+
+1;
+
+package wxToolBar;
+
+use Wx qw[:everything];
+use base qw(Wx::ToolBar);
+use strict;
+
+sub new {
+    my( $self,  ) = @_;
+    # begin wxGlade: wxToolBar::new
+    # toolbar extracode before
+    $self = $self->SUPER::new( @_[1 .. $#_] );
+    $self->Realize();
+    # toolbar extracode after
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class wxToolBar
+
+1;
+
+package MyDialog1;
+
+use Wx qw[:everything];
+use base qw(Wx::Panel);
+use strict;
+
+sub new {
+    my( $self, $parent, $id, $pos, $size, $style, $name ) = @_;
+    $parent = undef              unless defined $parent;
+    $id     = -1                 unless defined $id;
+    $pos    = wxDefaultPosition  unless defined $pos;
+    $size   = wxDefaultSize      unless defined $size;
+    $name   = ""                 unless defined $name;
+
+    # begin wxGlade: MyDialog1::new
+    # panel extracode before
+    $style = wxTAB_TRAVERSAL
+        unless defined $style;
+
+    $self = $self->SUPER::new( $parent, $id, $pos, $size, $style, $name );
+    
+    $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL);
+    
+    $self->{sizer_1}->Add(0, 0, 0, 0, 0);
+    
+    $self->SetSizer($self->{sizer_1});
+    $self->{sizer_1}->Fit($self);
+    
+    $self->Layout();
+    # panel extracode after
+    # end wxGlade
+    return $self;
+
+}
+
+
+# end of class MyDialog1
+
+1;
+
+package MyApp;
+
+use base qw(Wx::App);
+use strict;
+
+sub OnInit {
+    my( $self ) = shift;
+
+    Wx::InitAllImageHandlers();
+
+    my $frame = MyFrame->new();
+
+    $self->SetTopWindow($frame);
+    $frame->Show(1);
+
+    return 1;
+}
+# end of class MyApp
+
+package main;
+
+unless(caller){
+    my $app = MyApp->new();
+    $app->MainLoop();
+}
diff -Nru wxglade-0.9.6/tests/casefiles/toplevel_extracode.py wxglade-1.0.1/tests/casefiles/toplevel_extracode.py
--- wxglade-0.9.6/tests/casefiles/toplevel_extracode.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/toplevel_extracode.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,130 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# frame extra code
+# dialog extra code
+# end wxGlade
+
+
+class MyFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame.__init__
+        # frame extra code before
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
+        self.SetSize((400, 300))
+        self.SetTitle("frame")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+        # frame extra code after
+
+        self.Bind(wx.EVT_CLOSE, self.on_close_frame, self)
+        self.Bind(wx.EVT_MENU_CLOSE, self.on_menu_close_frame, self)
+        # end wxGlade
+
+    def on_close_frame(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("Event handler 'on_close_frame' not implemented!")
+        event.Skip()
+
+    def on_menu_close_frame(self, event):  # wxGlade: MyFrame.<event_handler>
+        print("Event handler 'on_menu_close_frame' not implemented!")
+        event.Skip()
+
+# end of class MyFrame
+
+class MyDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialog.__init__
+        # dialog extra code before
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetTitle("dialog")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # dialog extra code after
+
+        self.Bind(wx.EVT_CLOSE, self.on_close_dialog, self)
+        # end wxGlade
+
+    def on_close_dialog(self, event):  # wxGlade: MyDialog.<event_handler>
+        print("Event handler 'on_close_dialog' not implemented!")
+        event.Skip()
+
+# end of class MyDialog
+
+class MyMenuBar(wx.MenuBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyMenuBar.__init__
+        # menubar extracode before
+        wx.MenuBar.__init__(self, *args, **kwds)
+        # menubar extracode after
+        # end wxGlade
+
+# end of class MyMenuBar
+
+class wxToolBar(wx.ToolBar):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: wxToolBar.__init__
+        # toolbar extracode before
+        kwds["style"] = kwds.get("style", 0)
+        wx.ToolBar.__init__(self, *args, **kwds)
+        self.Realize()
+        # toolbar extracode after
+        # end wxGlade
+
+# end of class wxToolBar
+
+class MyDialog1(wx.Panel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyDialog1.__init__
+        # panel extracode before
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_1.Add((0, 0), 0, 0, 0)
+
+        self.SetSizer(sizer_1)
+        sizer_1.Fit(self)
+
+        self.Layout()
+        # panel extracode after
+        # end wxGlade
+
+# end of class MyDialog1
+
+class MyApp(wx.App):
+    def OnInit(self):
+        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.SetTopWindow(self.frame)
+        self.frame.Show()
+        return True
+
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
diff -Nru wxglade-0.9.6/tests/casefiles/toplevel_extracode.wxg wxglade-1.0.1/tests/casefiles/toplevel_extracode.wxg
--- wxglade-0.9.6/tests/casefiles/toplevel_extracode.wxg	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/toplevel_extracode.wxg	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!-- generated by wxGlade "faked test version" on XXX XXX NN NN:NN:NN NNNN -->
+
+<application class="MyApp" encoding="UTF-8" for_version="2.8" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="./toplevel_extracode.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="MyFrame" name="frame" base="EditFrame">
+        <extracode># frame extra code</extracode>
+        <extracode_pre># frame extra code before</extracode_pre>
+        <extracode_post># frame extra code after</extracode_post>
+        <events>
+            <handler event="EVT_CLOSE">on_close_frame</handler>
+            <handler event="EVT_MENU_CLOSE">on_menu_close_frame</handler>
+        </events>
+        <size>400, 300</size>
+        <title>frame</title>
+        <style>wxDEFAULT_FRAME_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyDialog" name="dialog" base="EditDialog">
+        <extracode># dialog extra code</extracode>
+        <extracode_pre># dialog extra code before</extracode_pre>
+        <extracode_post># dialog extra code after</extracode_post>
+        <events>
+            <handler event="EVT_CLOSE">on_close_dialog</handler>
+        </events>
+        <title>dialog</title>
+        <style>wxDEFAULT_DIALOG_STYLE</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+    <object class="MyMenuBar" name="menubar" base="EditMenuBar">
+        <extracode_pre># menubar extracode before</extracode_pre>
+        <extracode_post># menubar extracode after</extracode_post>
+        <menus>
+        </menus>
+    </object>
+    <object class="wxToolBar" name="toolbar" base="EditToolBar">
+        <extracode_pre># toolbar extracode before</extracode_pre>
+        <extracode_post># toolbar extracode after</extracode_post>
+        <tools>
+        </tools>
+    </object>
+    <object class="MyDialog1" name="panel" base="EditTopLevelPanel">
+        <extracode_pre># panel extracode before</extracode_pre>
+        <extracode_post># panel extracode after</extracode_post>
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizerslot" />
+        </object>
+    </object>
+</application>
diff -Nru wxglade-0.9.6/tests/casefiles/toplevels_no_size_Classic.py wxglade-1.0.1/tests/casefiles/toplevels_no_size_Classic.py
--- wxglade-0.9.6/tests/casefiles/toplevels_no_size_Classic.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/toplevels_no_size_Classic.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,23 +18,16 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.button_2 = wx.Button(self, wx.ID_ANY, "button_2")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle("frame")
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.button_2 = wx.Button(self, wx.ID_ANY, "button_2")
         sizer_1.Add(self.button_2, 0, 0, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
@@ -45,23 +38,16 @@
         # begin wxGlade: MyDialog.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
         wx.Dialog.__init__(self, *args, **kwds)
-        self.button_1 = wx.Button(self, wx.ID_ANY, "button_1")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyDialog.__set_properties
         self.SetTitle("dialog")
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyDialog.__do_layout
         sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.button_1 = wx.Button(self, wx.ID_ANY, "button_1")
         sizer_2.Add(self.button_1, 0, 0, 0)
+
         self.SetSizer(sizer_2)
         sizer_2.Fit(self)
+
         self.Layout()
         # end wxGlade
 
@@ -72,48 +58,48 @@
         # begin wxGlade: wxgMeasurementsByDayPnl.__init__
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
         wx.Panel.__init__(self, *args, **kwds)
-        self._LCTRL_days = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
-        self._LCTRL_results = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
-        self._TCTRL_measurements = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_AUTO_URL | wx.TE_MULTILINE | wx.TE_READONLY)
-        self._LBL_no_of_docs = wx.StaticText(self, wx.ID_ANY, "")
-        self._BTN_show_docs = wx.Button(self, wx.ID_ANY, "Show X documents")
 
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_day_selected, self._LCTRL_days)
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_result_selected, self._LCTRL_results)
-        self.Bind(wx.EVT_BUTTON, self._on_show_docs_button_pressed, self._BTN_show_docs)
-        # end wxGlade
+        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
 
-    def __set_properties(self):
-        # begin wxGlade: wxgMeasurementsByDayPnl.__set_properties
+        self._LCTRL_days = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
         self._LCTRL_days.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_days, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        self._LCTRL_results = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
         self._LCTRL_results.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_results, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        __szr_details = wx.BoxSizer(wx.VERTICAL)
+        __szr_main.Add(__szr_details, 1, wx.EXPAND, 0)
+
+        self._TCTRL_measurements = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_AUTO_URL | wx.TE_MULTILINE | wx.TE_READONLY)
         self._TCTRL_measurements.SetMinSize((255, 102))
         self._TCTRL_measurements.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_BACKGROUND))
+        __szr_details.Add(self._TCTRL_measurements, 1, wx.EXPAND, 0)
+
+        __szr_show_docs = wx.BoxSizer(wx.HORIZONTAL)
+        __szr_details.Add(__szr_show_docs, 0, wx.EXPAND, 0)
+
+        self._LBL_no_of_docs = wx.StaticText(self, wx.ID_ANY, "")
         self._LBL_no_of_docs.SetMinSize((100, 100))
+        __szr_show_docs.Add(self._LBL_no_of_docs, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 3)
+
+        self._BTN_show_docs = wx.Button(self, wx.ID_ANY, "Show X documents")
         self._BTN_show_docs.SetMinSize((100, 100))
         self._BTN_show_docs.SetToolTip(wx.ToolTip("Show lab related documents for the episode of the selected measurement."))
         self._BTN_show_docs.Enable(False)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: wxgMeasurementsByDayPnl.__do_layout
-        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
-        __szr_details = wx.BoxSizer(wx.VERTICAL)
-        __szr_show_docs = wx.BoxSizer(wx.HORIZONTAL)
-        __szr_main.Add(self._LCTRL_days, 1, wx.EXPAND | wx.RIGHT, 5)
-        __szr_main.Add(self._LCTRL_results, 1, wx.EXPAND | wx.RIGHT, 5)
-        __szr_details.Add(self._TCTRL_measurements, 1, wx.EXPAND, 0)
-        __szr_show_docs.Add(self._LBL_no_of_docs, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 3)
         __szr_show_docs.Add(self._BTN_show_docs, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
         __szr_show_docs.Add((20, 20), 1, wx.EXPAND, 0)
-        __szr_details.Add(__szr_show_docs, 0, wx.EXPAND, 0)
-        __szr_main.Add(__szr_details, 1, wx.EXPAND, 0)
+
         self.SetSizer(__szr_main)
         __szr_main.Fit(self)
+
         self.Layout()
+
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_day_selected, self._LCTRL_days)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_result_selected, self._LCTRL_results)
+        self.Bind(wx.EVT_BUTTON, self._on_show_docs_button_pressed, self._BTN_show_docs)
         # end wxGlade
 
     def _on_day_selected(self, event):  # wxGlade: wxgMeasurementsByDayPnl.<event_handler>
@@ -130,54 +116,107 @@
 
 # end of class wxgMeasurementsByDayPnl
 
-class MyFrame1(wx.Frame):
+class wxgMeasurementsByDayPnl(wx.Panel):
     def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame1.__init__
-        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
-        wx.Frame.__init__(self, *args, **kwds)
+        # begin wxGlade: wxgMeasurementsByDayPnl.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+
+        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
+
         self._LCTRL_days = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
-        self._LCTRL_results = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
-        self._TCTRL_measurements = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_AUTO_URL | wx.TE_MULTILINE | wx.TE_READONLY)
-        self._LBL_no_of_docs = wx.StaticText(self, wx.ID_ANY, "")
-        self._BTN_show_docs = wx.Button(self, wx.ID_ANY, "Show X documents")
+        self._LCTRL_days.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_days, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        self._LCTRL_days_copy = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
+        self._LCTRL_days_copy.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_days_copy, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        self.SetSizer(__szr_main)
+        __szr_main.Fit(self)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.Layout()
 
         self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_day_selected, self._LCTRL_days)
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_result_selected, self._LCTRL_results)
-        self.Bind(wx.EVT_BUTTON, self._on_show_docs_button_pressed, self._BTN_show_docs)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_day_selected, self._LCTRL_days_copy)
+        # end wxGlade
+
+    def _on_day_selected(self, event):  # wxGlade: wxgMeasurementsByDayPnl.<event_handler>
+        print("Event handler '_on_day_selected' not implemented!")
+        event.Skip()
+
+# end of class wxgMeasurementsByDayPnl
+
+class wxgMeasurementsByDayPnl(wx.Panel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: wxgMeasurementsByDayPnl.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+
+        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, "")
+        __szr_main.Add(self.text_ctrl_1, 0, 0, 0)
+
+        self.text_ctrl_2 = wx.TextCtrl(self, wx.ID_ANY, "")
+        __szr_main.Add(self.text_ctrl_2, 0, 0, 0)
+
+        self.SetSizer(__szr_main)
+        __szr_main.Fit(self)
+
+        self.Layout()
         # end wxGlade
 
-    def __set_properties(self):
-        # begin wxGlade: MyFrame1.__set_properties
+# end of class wxgMeasurementsByDayPnl
+
+class MyFrame1(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame1.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
         self.SetTitle("frame_1")
+
+        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
+
+        self._LCTRL_days = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
         self._LCTRL_days.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_days, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        self._LCTRL_results = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
         self._LCTRL_results.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_results, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        __szr_details = wx.BoxSizer(wx.VERTICAL)
+        __szr_main.Add(__szr_details, 1, wx.EXPAND, 0)
+
+        self._TCTRL_measurements = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_AUTO_URL | wx.TE_MULTILINE | wx.TE_READONLY)
         self._TCTRL_measurements.SetMinSize((255, 102))
         self._TCTRL_measurements.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_BACKGROUND))
+        __szr_details.Add(self._TCTRL_measurements, 1, wx.EXPAND, 0)
+
+        __szr_show_docs = wx.BoxSizer(wx.HORIZONTAL)
+        __szr_details.Add(__szr_show_docs, 0, wx.EXPAND, 0)
+
+        self._LBL_no_of_docs = wx.StaticText(self, wx.ID_ANY, "")
         self._LBL_no_of_docs.SetMinSize((100, 100))
+        __szr_show_docs.Add(self._LBL_no_of_docs, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 3)
+
+        self._BTN_show_docs = wx.Button(self, wx.ID_ANY, "Show X documents")
         self._BTN_show_docs.SetMinSize((100, 100))
         self._BTN_show_docs.SetToolTip(wx.ToolTip("Show lab related documents for the episode of the selected measurement."))
         self._BTN_show_docs.Enable(False)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame1.__do_layout
-        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
-        __szr_details = wx.BoxSizer(wx.VERTICAL)
-        __szr_show_docs = wx.BoxSizer(wx.HORIZONTAL)
-        __szr_main.Add(self._LCTRL_days, 1, wx.EXPAND | wx.RIGHT, 5)
-        __szr_main.Add(self._LCTRL_results, 1, wx.EXPAND | wx.RIGHT, 5)
-        __szr_details.Add(self._TCTRL_measurements, 1, wx.EXPAND, 0)
-        __szr_show_docs.Add(self._LBL_no_of_docs, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 3)
         __szr_show_docs.Add(self._BTN_show_docs, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
         __szr_show_docs.Add((20, 20), 1, wx.EXPAND, 0)
-        __szr_details.Add(__szr_show_docs, 0, wx.EXPAND, 0)
-        __szr_main.Add(__szr_details, 1, wx.EXPAND, 0)
+
         self.SetSizer(__szr_main)
         __szr_main.Fit(self)
+
         self.Layout()
+
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_day_selected, self._LCTRL_days)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_result_selected, self._LCTRL_results)
+        self.Bind(wx.EVT_BUTTON, self._on_show_docs_button_pressed, self._BTN_show_docs)
         # end wxGlade
 
     def _on_day_selected(self, event):  # wxGlade: MyFrame1.<event_handler>
diff -Nru wxglade-0.9.6/tests/casefiles/toplevels_no_size_Phoenix.py wxglade-1.0.1/tests/casefiles/toplevels_no_size_Phoenix.py
--- wxglade-0.9.6/tests/casefiles/toplevels_no_size_Phoenix.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/casefiles/toplevels_no_size_Phoenix.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,23 +18,16 @@
         # begin wxGlade: MyFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.button_2 = wx.Button(self, wx.ID_ANY, "button_2")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
         self.SetTitle("frame")
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        self.button_2 = wx.Button(self, wx.ID_ANY, "button_2")
         sizer_1.Add(self.button_2, 0, 0, 0)
+
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
+
         self.Layout()
         # end wxGlade
 
@@ -45,23 +38,16 @@
         # begin wxGlade: MyDialog.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE
         wx.Dialog.__init__(self, *args, **kwds)
-        self.button_1 = wx.Button(self, wx.ID_ANY, "button_1")
-
-        self.__set_properties()
-        self.__do_layout()
-        # end wxGlade
-
-    def __set_properties(self):
-        # begin wxGlade: MyDialog.__set_properties
         self.SetTitle("dialog")
-        # end wxGlade
 
-    def __do_layout(self):
-        # begin wxGlade: MyDialog.__do_layout
         sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.button_1 = wx.Button(self, wx.ID_ANY, "button_1")
         sizer_2.Add(self.button_1, 0, 0, 0)
+
         self.SetSizer(sizer_2)
         sizer_2.Fit(self)
+
         self.Layout()
         # end wxGlade
 
@@ -72,48 +58,48 @@
         # begin wxGlade: wxgMeasurementsByDayPnl.__init__
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
         wx.Panel.__init__(self, *args, **kwds)
-        self._LCTRL_days = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
-        self._LCTRL_results = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
-        self._TCTRL_measurements = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_AUTO_URL | wx.TE_MULTILINE | wx.TE_READONLY)
-        self._LBL_no_of_docs = wx.StaticText(self, wx.ID_ANY, "")
-        self._BTN_show_docs = wx.Button(self, wx.ID_ANY, "Show X documents")
 
-        self.__set_properties()
-        self.__do_layout()
-
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_day_selected, self._LCTRL_days)
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_result_selected, self._LCTRL_results)
-        self.Bind(wx.EVT_BUTTON, self._on_show_docs_button_pressed, self._BTN_show_docs)
-        # end wxGlade
+        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
 
-    def __set_properties(self):
-        # begin wxGlade: wxgMeasurementsByDayPnl.__set_properties
+        self._LCTRL_days = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
         self._LCTRL_days.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_days, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        self._LCTRL_results = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
         self._LCTRL_results.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_results, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        __szr_details = wx.BoxSizer(wx.VERTICAL)
+        __szr_main.Add(__szr_details, 1, wx.EXPAND, 0)
+
+        self._TCTRL_measurements = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_AUTO_URL | wx.TE_MULTILINE | wx.TE_READONLY)
         self._TCTRL_measurements.SetMinSize((255, 102))
         self._TCTRL_measurements.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BACKGROUND))
+        __szr_details.Add(self._TCTRL_measurements, 1, wx.EXPAND, 0)
+
+        __szr_show_docs = wx.BoxSizer(wx.HORIZONTAL)
+        __szr_details.Add(__szr_show_docs, 0, wx.EXPAND, 0)
+
+        self._LBL_no_of_docs = wx.StaticText(self, wx.ID_ANY, "")
         self._LBL_no_of_docs.SetMinSize((100, 100))
+        __szr_show_docs.Add(self._LBL_no_of_docs, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 3)
+
+        self._BTN_show_docs = wx.Button(self, wx.ID_ANY, "Show X documents")
         self._BTN_show_docs.SetMinSize((100, 100))
         self._BTN_show_docs.SetToolTip("Show lab related documents for the episode of the selected measurement.")
         self._BTN_show_docs.Enable(False)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: wxgMeasurementsByDayPnl.__do_layout
-        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
-        __szr_details = wx.BoxSizer(wx.VERTICAL)
-        __szr_show_docs = wx.BoxSizer(wx.HORIZONTAL)
-        __szr_main.Add(self._LCTRL_days, 1, wx.EXPAND | wx.RIGHT, 5)
-        __szr_main.Add(self._LCTRL_results, 1, wx.EXPAND | wx.RIGHT, 5)
-        __szr_details.Add(self._TCTRL_measurements, 1, wx.EXPAND, 0)
-        __szr_show_docs.Add(self._LBL_no_of_docs, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 3)
         __szr_show_docs.Add(self._BTN_show_docs, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
         __szr_show_docs.Add((20, 20), 1, wx.EXPAND, 0)
-        __szr_details.Add(__szr_show_docs, 0, wx.EXPAND, 0)
-        __szr_main.Add(__szr_details, 1, wx.EXPAND, 0)
+
         self.SetSizer(__szr_main)
         __szr_main.Fit(self)
+
         self.Layout()
+
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_day_selected, self._LCTRL_days)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_result_selected, self._LCTRL_results)
+        self.Bind(wx.EVT_BUTTON, self._on_show_docs_button_pressed, self._BTN_show_docs)
         # end wxGlade
 
     def _on_day_selected(self, event):  # wxGlade: wxgMeasurementsByDayPnl.<event_handler>
@@ -130,54 +116,107 @@
 
 # end of class wxgMeasurementsByDayPnl
 
-class MyFrame1(wx.Frame):
+class wxgMeasurementsByDayPnl(wx.Panel):
     def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame1.__init__
-        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
-        wx.Frame.__init__(self, *args, **kwds)
+        # begin wxGlade: wxgMeasurementsByDayPnl.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+
+        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
+
         self._LCTRL_days = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
-        self._LCTRL_results = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
-        self._TCTRL_measurements = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_AUTO_URL | wx.TE_MULTILINE | wx.TE_READONLY)
-        self._LBL_no_of_docs = wx.StaticText(self, wx.ID_ANY, "")
-        self._BTN_show_docs = wx.Button(self, wx.ID_ANY, "Show X documents")
+        self._LCTRL_days.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_days, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        self._LCTRL_days_copy = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
+        self._LCTRL_days_copy.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_days_copy, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        self.SetSizer(__szr_main)
+        __szr_main.Fit(self)
 
-        self.__set_properties()
-        self.__do_layout()
+        self.Layout()
 
         self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_day_selected, self._LCTRL_days)
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_result_selected, self._LCTRL_results)
-        self.Bind(wx.EVT_BUTTON, self._on_show_docs_button_pressed, self._BTN_show_docs)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_day_selected, self._LCTRL_days_copy)
+        # end wxGlade
+
+    def _on_day_selected(self, event):  # wxGlade: wxgMeasurementsByDayPnl.<event_handler>
+        print("Event handler '_on_day_selected' not implemented!")
+        event.Skip()
+
+# end of class wxgMeasurementsByDayPnl
+
+class wxgMeasurementsByDayPnl(wx.Panel):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: wxgMeasurementsByDayPnl.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+
+        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, "")
+        __szr_main.Add(self.text_ctrl_1, 0, 0, 0)
+
+        self.text_ctrl_2 = wx.TextCtrl(self, wx.ID_ANY, "")
+        __szr_main.Add(self.text_ctrl_2, 0, 0, 0)
+
+        self.SetSizer(__szr_main)
+        __szr_main.Fit(self)
+
+        self.Layout()
         # end wxGlade
 
-    def __set_properties(self):
-        # begin wxGlade: MyFrame1.__set_properties
+# end of class wxgMeasurementsByDayPnl
+
+class MyFrame1(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MyFrame1.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
+        wx.Frame.__init__(self, *args, **kwds)
         self.SetTitle("frame_1")
+
+        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
+
+        self._LCTRL_days = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
         self._LCTRL_days.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_days, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        self._LCTRL_results = cReportListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_REPORT)
         self._LCTRL_results.SetMinSize((100, 100))
+        __szr_main.Add(self._LCTRL_results, 1, wx.EXPAND | wx.RIGHT, 5)
+
+        __szr_details = wx.BoxSizer(wx.VERTICAL)
+        __szr_main.Add(__szr_details, 1, wx.EXPAND, 0)
+
+        self._TCTRL_measurements = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_AUTO_URL | wx.TE_MULTILINE | wx.TE_READONLY)
         self._TCTRL_measurements.SetMinSize((255, 102))
         self._TCTRL_measurements.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BACKGROUND))
+        __szr_details.Add(self._TCTRL_measurements, 1, wx.EXPAND, 0)
+
+        __szr_show_docs = wx.BoxSizer(wx.HORIZONTAL)
+        __szr_details.Add(__szr_show_docs, 0, wx.EXPAND, 0)
+
+        self._LBL_no_of_docs = wx.StaticText(self, wx.ID_ANY, "")
         self._LBL_no_of_docs.SetMinSize((100, 100))
+        __szr_show_docs.Add(self._LBL_no_of_docs, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 3)
+
+        self._BTN_show_docs = wx.Button(self, wx.ID_ANY, "Show X documents")
         self._BTN_show_docs.SetMinSize((100, 100))
         self._BTN_show_docs.SetToolTip("Show lab related documents for the episode of the selected measurement.")
         self._BTN_show_docs.Enable(False)
-        # end wxGlade
-
-    def __do_layout(self):
-        # begin wxGlade: MyFrame1.__do_layout
-        __szr_main = wx.BoxSizer(wx.HORIZONTAL)
-        __szr_details = wx.BoxSizer(wx.VERTICAL)
-        __szr_show_docs = wx.BoxSizer(wx.HORIZONTAL)
-        __szr_main.Add(self._LCTRL_days, 1, wx.EXPAND | wx.RIGHT, 5)
-        __szr_main.Add(self._LCTRL_results, 1, wx.EXPAND | wx.RIGHT, 5)
-        __szr_details.Add(self._TCTRL_measurements, 1, wx.EXPAND, 0)
-        __szr_show_docs.Add(self._LBL_no_of_docs, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 3)
         __szr_show_docs.Add(self._BTN_show_docs, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+
         __szr_show_docs.Add((20, 20), 1, wx.EXPAND, 0)
-        __szr_details.Add(__szr_show_docs, 0, wx.EXPAND, 0)
-        __szr_main.Add(__szr_details, 1, wx.EXPAND, 0)
+
         self.SetSizer(__szr_main)
         __szr_main.Fit(self)
+
         self.Layout()
+
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_day_selected, self._LCTRL_days)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_result_selected, self._LCTRL_results)
+        self.Bind(wx.EVT_BUTTON, self._on_show_docs_button_pressed, self._BTN_show_docs)
         # end wxGlade
 
     def _on_day_selected(self, event):  # wxGlade: MyFrame1.<event_handler>
diff -Nru wxglade-0.9.6/tests/test_bugs_new.py wxglade-1.0.1/tests/test_bugs_new.py
--- wxglade-0.9.6/tests/test_bugs_new.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/test_bugs_new.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 """
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2017-2018 Dietmar Schwertberger
+@copyright: 2017-2019 Dietmar Schwertberger
 
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
@@ -96,6 +96,27 @@
         """Test top_window property and addition of notebook pages with base classes"""
         self.load_and_generate('Bugs_2018-01-16', test_GUI=False)
 
+    def test_issue371(self):
+        """Test issue #371 - C++ code generation"""
+        self.load_and_generate('Issue_371', excluded=("lisp",), test_GUI=False)
+
+    def test_issue385(self):
+        "generate code, add grid, generate code with 'keep user code', check whether imports are added"""
+        self.load_and_generate('Issue385_step_1', test_GUI=False, preview=False)  # w/o grid and 'keep user code'
+        for ext in ("py","cpp","pl","lisp","h"):
+            src = self._get_outputfile_path('Issue385_step_1.%s'%ext)
+            dst = self._get_outputfile_path('Issue385_step_2.%s'%ext)
+            if ext=="py" and not os.path.exists(src):
+                src = self._get_outputfile_path('Issue385_step_1_Classic.%s'%ext)
+                dst = self._get_outputfile_path('Issue385_step_2_Classic.%s'%ext)
+            if ext=="py" and not os.path.exists(src):
+                src = self._get_outputfile_path('Issue385_step_1_Phoenix.%s'%ext)
+                dst = self._get_outputfile_path('Issue385_step_2_Phoenix.%s'%ext)
+            if os.path.exists(dst): os.remove(dst)
+            os.rename(src, dst)
+        self.load_and_generate('Issue385_step_2', test_GUI=False, preview=False)  # w grid and 'keep user code'
+        self.load_and_generate('Issue385_step_2', test_GUI=False, preview=False)  # same, ensure nothing is doubled
+
 
 if __name__ == '__main__':
     unittest.main(exit=False)
diff -Nru wxglade-0.9.6/tests/test_cli.py wxglade-1.0.1/tests/test_cli.py
--- wxglade-0.9.6/tests/test_cli.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/test_cli.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,25 @@
+"""
+@copyright: 2020 Dietmar Schwertberger
+
+@license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
+"""
+
+
+from testsupport_new import WXGladeCLITest
+
+import common, wxglade
+import unittest, os
+
+
+class TestCodegen(WXGladeCLITest):
+    "Test CLI code generation"
+
+    def test_codegen_AllWidgets_30(self):
+        self.generate('AllWidgets_30', excluded=["lisp"])
+
+    def test_codegen_AllWidgets_28(self):
+        self.generate('AllWidgets_28')
+
+
+if __name__ == '__main__':
+    unittest.main(exit=False)
diff -Nru wxglade-0.9.6/tests/test_editing.py wxglade-1.0.1/tests/test_editing.py
--- wxglade-0.9.6/tests/test_editing.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/tests/test_editing.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,150 @@
+"""
+@copyright: 2019-2020 Dietmar Schwertberger
+
+@license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
+"""
+
+
+from testsupport_new import WXGladeGUITest
+
+import common, clipboard
+import unittest, wx, time
+
+
+class TestEditing(WXGladeGUITest):
+    "Test for e.g. cut/paste; to be extended..."
+
+    def test_crash_on_cut_paste(self):
+        "with NEW_STRUCTURE at first there were crashes when cutting the static box sizer"
+        basename = 'crash_on_cut_paste'
+        infilename = self._get_casefile_path( '%s.wxg'%basename )
+        common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
+        editor = common.root.find_widget_from_path( 'App/frame/sizer_limit/panel_3/sizer_8' )
+        common.app_tree.show_toplevel( None, common.root.find_widget_from_path('App/frame') )
+        self._process_wx_events()
+        parent = editor.parent
+
+        # cut
+        data = clipboard.dump_widget(editor)
+        editor.remove()
+        self._process_wx_events()
+        # paste again
+        parent.clipboard_paste(data)
+        self._process_wx_events()
+
+        # save and check .wxg file
+        generated_filename = self._get_outputfile_path(infilename)
+        common.main._save_app(generated_filename)
+        self._compare_files(infilename, generated_filename)
+
+        # generate and check python code
+        app = common.root
+
+        expected_filename = self._get_casefile_path( '%s.py'%basename )
+        generated_filename = self._get_outputfile_path( '%s.py'%basename )
+        app.properties["output_path"].set(generated_filename)
+        common.app_tree.root.generate_code()
+        self._compare_files(expected_filename, generated_filename, check_mtime=True)
+
+    def sleep(self, dt=1.0):
+        end = time.time() + dt
+        while time.time() < end:
+            self._process_wx_events()
+
+    def check_no_overlap(self, editor, rectangles=None):
+        # recursively check that all widgets have been created and sizer children do not overlap
+        if rectangles is None: rectangles = []
+        for child in editor.get_all_children():
+            if child.IS_SLOT and child.overlapped: continue
+            if editor.IS_SIZER and not child.IS_SIZER:
+                rect = child.widget.GetRect()
+                for r in rectangles:
+                    self.assertFalse( rect.Intersects(r) )
+                rectangles.append(rect)
+            elif editor.IS_SIZER and child.IS_SIZER:
+                self.check_no_overlap(child, rectangles)
+            self.check_no_overlap(child)
+
+    def test_editing_1(self):
+        basename = 'Test_Editing'
+        infilename = self._get_casefile_path( '%s.wxg'%basename )
+        common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
+        wx.SafeYield()
+        app = common.root  # shortcut
+        common.app_tree.show_toplevel( None, app.children[0] )
+        # ensure that there's no overlap of elements
+        self.check_no_overlap(app.children[0])
+
+        # cut static box sizer
+        widget = app.find_widget_from_path("app/frame/notebook_1/panel_1/sizer_2/sizer_1")
+        parent = widget.parent
+        index = widget.index
+        data = self.simulate_cut(widget)
+        # paste again
+        self.simulate_paste(parent, index, data)
+
+        # insert panel into splitter; change "Scrollable" to test re-creation
+        widget = app.find_widget_from_path("app/frame/notebook_1/window_1/SLOT 1")
+        import widgets.panel.panel
+        panel = widgets.panel.panel.builder(widget.parent, widget.index)
+        self.assertTrue(isinstance(panel.widget, wx.Panel))
+        panel.properties["scrollable"].set(True, notify=True)
+        self.assertTrue(isinstance(panel.widget, wx.ScrolledWindow))
+        #panel.widget.GetSize()
+        #wx.Size(404, 659)
+        #self.sleep(1.0)
+
+        # set span of button inside gridbag sizer
+        widget = app.find_widget_from_path("app/frame/notebook_1/window_1/window_1_pane_1/grid_sizer_1/button_3")
+        widget.properties["span"].set((2,2), notify=True)
+        #self.sleep(1.0)
+
+        # XXX test change_sizer
+
+        ## save and check .wxg file
+        #generated_filename = self._get_outputfile_path(infilename)
+        #common.main._save_app(generated_filename)
+        #self._compare_files(infilename, generated_filename)
+
+    def test_editing_2(self):
+        basename = 'Test_Editing2'
+        infilename = self._get_casefile_path( '%s.wxg'%basename )
+        common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
+        wx.SafeYield()
+        app = common.root  # shortcut
+        common.app_tree.show_toplevel( None, app.children[0] )
+        # ensure that there's no overlap of elements
+        self.check_no_overlap(app.children[0])
+        
+        # change font size for static text and asserts it's size change
+        text = common.root.find_widget_from_path("app/frame/notebook_1/panel_1/sizer_2/static_text_1")
+        rect1 = text.widget.GetRect()
+        size1 = text.widget.GetSize()
+        font_p = text.properties["font"]
+        font_p.set( (42, 'default', 'normal', 'normal', 0, ''), notify=True)
+        self.check_no_overlap(text.parent)
+        return
+
+        # cut static box sizer
+        widget = app.find_widget_from_path("app/frame/notebook_1/panel_1/sizer_2/sizer_1")
+        parent = widget.parent
+        index = widget.index
+        data = self.simulate_cut(widget)
+        # paste again
+        self.simulate_paste(parent, index, data)
+
+        # insert panel into splitter; change "Scrollable" to test re-creation
+        widget = app.find_widget_from_path("app/frame/notebook_1/window_1/SLOT 1")
+        import widgets.panel.panel
+        panel = widgets.panel.panel.builder(widget.parent, widget.index)
+        self.assertTrue(isinstance(panel.widget, wx.Panel))
+        panel.properties["scrollable"].set(True, notify=True)
+        self.assertTrue(isinstance(panel.widget, wx.ScrolledWindow))
+
+        # set span of button inside gridbag sizer
+        widget = app.find_widget_from_path("app/frame/notebook_1/window_1/window_1_pane_1/grid_sizer_1/button_3")
+        widget.properties["span"].set((2,2), notify=True)
+
+
+if __name__ == '__main__':
+    unittest.main(exit=False)
diff -Nru wxglade-0.9.6/tests/test_gui_new.py wxglade-1.0.1/tests/test_gui_new.py
--- wxglade-0.9.6/tests/test_gui_new.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/test_gui_new.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,7 +2,7 @@
 Graphical tests
 
 @copyright: 2012-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
@@ -54,10 +54,10 @@
         self.load_and_generate('ComplexExample_30', excluded=["lisp"])
         #self.load_and_generate('ComplexExample_30', included=["lisp"])
         # Lisp code has to raise an exception
-        common.app_tree.app.properties["language"].set("lisp")
+        common.app_tree.root.properties["language"].set("lisp")
         self._process_wx_events()
-        common.app_tree.root.widget.generate_code()
-        self._assert_error_message("Generating Lisp code for wxWidgets version 3.0 is not supported")
+        common.app_tree.root.generate_code()
+        self._assert_error_message("Generating Lisp code")
 
     def test_CodeGeneration_CustomWidget(self):
         'Test GUI code generation using "CustomWidget"'
@@ -86,6 +86,10 @@
         self.load_and_generate('FontTest28', test_GUI=True)
         self.load_and_generate('FontTest', test_GUI=False)
 
+    def test_Frame_Size(self):
+        "Generate Fit() code for the second frame"
+        self.load_and_generate('Frame_Size', test_GUI=False)
+
     def test_Grid(self):
         "Test code generation with a grid widgets and handling events"
         self.load_and_generate('Grid', test_GUI=False)
@@ -112,19 +116,19 @@
         config.preferences.default_border = False
         config.preferences.default_border_size = 0
 
-        self.load_and_generate('Python_Preferences', included=["Python"], test_GUI=True)
-        self.load_and_generate('Perl_Preferences', included=["Perl"], test_GUI=False, preview=False)
+        self.load_and_generate('Python_Preferences', included=["python"], test_GUI=True)
+        self.load_and_generate('Perl_Preferences', included=["perl"], test_GUI=False, preview=False)
         self.load_and_generate('CPP_Preferences', included=["C++"], test_GUI=True)
-        self.load_and_generate('Lisp_Preferences', included=["Lisp"], test_GUI=True)
+        self.load_and_generate('Lisp_Preferences', included=["lisp"], test_GUI=True)
 
         # with default border
         config.preferences.default_border = True
         config.preferences.default_border_size = 5
 
-        self.load_and_generate('Python_Preferences', included=["Python"], test_GUI=True)
-        self.load_and_generate('Perl_Preferences', included=["Perl"], test_GUI=False, preview=False)
+        self.load_and_generate('Python_Preferences', included=["python"], test_GUI=True)
+        self.load_and_generate('Perl_Preferences', included=["perl"], test_GUI=False, preview=False)
         self.load_and_generate('CPP_Preferences', included=["C++"], test_GUI=True)
-        self.load_and_generate('Lisp_Preferences', included=["Lisp"], test_GUI=True)
+        self.load_and_generate('Lisp_Preferences', included=["lisp"], test_GUI=True)
 
         config.preferences.default_border, config.preferences.default_border_size = restore
 
@@ -135,6 +139,30 @@
         # store sizer references
         self.load_and_generate('Sizers_classattr', test_GUI=False)
 
+    def test_bases_etc(self):
+        # test changes in data structure and code generation from 0.9 to 1.0
+        self.load_and_generate('BasesEtc_w_sizers', test_GUI=True)  # test files generated with v0.9.5 and re-ordered
+        self.load_and_generate('BasesEtc', test_GUI=True)           # test files generated with 0.9.9pre
+
+    def test_grid_custom_base(self):
+        # test custom base for grid and also "Mark code block" deactivated
+        self.load_and_generate('test_grid_custom_base', test_GUI=True)
+
+    def test_keep_code_migration(self):
+        # test migration from 0.9 to 1.0: __do_layout and __set_properties should be removed
+        # C++: "virtual" will not be added here:  "public: void on_button_plot(wxCommandEvent &event);"
+        # copy old files
+        for ext in ("py","cpp","pl","lisp", "h"):
+            old_filename = self._get_casefile_path('matplotlib_example_old.%s'%ext)
+            generate_filename = self._get_outputfile_path('matplotlib_example.%s'%ext)
+            self._copy_and_modify(old_filename, generate_filename)
+        # the standard test will do the rest
+        self.load_and_generate('matplotlib_example', test_GUI=True)
+
+    def test_class_migration(self):
+        # test migration from 0.9 to 1.0
+        self.load_and_generate('test_no_custom_class09', test_GUI=True)
+
     def test_Python_Ogg1(self):
         "Test Python code generation with overwriting a single existing file, preserving manually added code"
         # set up filenames, copy the old file to the output path and modify it to trigger re-writing
@@ -145,12 +173,12 @@
 
         # load and set up project
         common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
-        common.app_tree.app.properties["overwrite"].set(False)  # overwrite is 0 in the file
-        common.app_tree.app.properties["output_path"].set(generate_filename)
-        common.app_tree.app.properties["language"].set("python")
+        common.app_tree.root.properties["overwrite"].set(False)  # overwrite is 0 in the file
+        common.app_tree.root.properties["output_path"].set(generate_filename)
+        common.app_tree.root.properties["language"].set("python")
         # generate, compare and check for overwriting
         self._process_wx_events()
-        common.app_tree.root.widget.generate_code()
+        common.app_tree.root.generate_code()
         self._compare_files(expected_filename, generate_filename, check_mtime=True)
 
     def test_Python_Ogg2(self):
@@ -170,12 +198,12 @@
 
         # load and set up project
         common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
-        common.app_tree.app.properties["overwrite"].set(False)  # overwrite is 0 in the file
-        common.app_tree.app.properties["output_path"].set(self.outDirectory)
-        common.app_tree.app.properties["language"].set("python")
+        common.app_tree.root.properties["overwrite"].set(False)  # overwrite is 0 in the file
+        common.app_tree.root.properties["output_path"].set(self.outDirectory)
+        common.app_tree.root.properties["language"].set("python")
         # generate, compare and check for overwriting
         self._process_wx_events()
-        common.app_tree.root.widget.generate_code()
+        common.app_tree.root.generate_code()
         self._compare_files(expected_app,    generate_app, check_mtime=True)
         self._compare_files(expected_dialog, generate_dialog, check_mtime=True)
         self._compare_files(expected_frame,  generate_frame, check_mtime=True)
@@ -197,13 +225,15 @@
     
             # load and set up project
             common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
-            common.app_tree.app.properties["overwrite"].set(False)  # overwrite is 0 in the file already
-            common.app_tree.app.properties["output_path"].set(generate_filename)
-            common.app_tree.app.properties["language"].set(language)
+            common.app_tree.root.properties["overwrite"].set(False)  # overwrite is 0 in the file already
+            common.app_tree.root.properties["output_path"].set(generate_filename)
+            common.app_tree.root.properties["language"].set(language)
             # generate, compare and check for overwriting
             self._process_wx_events()
-            common.app_tree.root.widget.generate_code()
+            common.app_tree.root.generate_code()
             self._compare_files(expected_filename, generate_filename, check_mtime=True)
+            if language=="C++":
+                self._compare_files(expected_filename_h, generate_filename_h, check_mtime=True)
 
     def test_all_Ogg2(self):
         "Test Python code generation with overwriting a single existing file, preserving manually added code"
@@ -221,13 +251,15 @@
     
             # load and set up project
             common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
-            common.app_tree.app.properties["overwrite"].set(False)  # overwrite is 0 in the file
-            common.app_tree.app.properties["output_path"].set(generate_filename)
-            common.app_tree.app.properties["language"].set(language)
+            common.app_tree.root.properties["overwrite"].set(False)  # overwrite is 0 in the file
+            common.app_tree.root.properties["output_path"].set(generate_filename)
+            common.app_tree.root.properties["language"].set(language)
             # generate, compare and check for overwriting
             self._process_wx_events()
-            common.app_tree.root.widget.generate_code()
+            common.app_tree.root.generate_code()
             self._compare_files(expected_filename, generate_filename, check_mtime=True)
+            if language=="C++":
+                self._compare_files(expected_filename_h, generate_filename_h, check_mtime=True)
 
     def test_all_Ogg2(self):
         "Test code generation with overwriting multiples existing files, preserving manually added code"
@@ -259,53 +291,60 @@
 
             # load and set up project
             common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
-            common.app_tree.app.properties["overwrite"].set(False)  # overwrite is 0 in the file
-            common.app_tree.app.properties["output_path"].set(self.outDirectory)
-            common.app_tree.app.properties["language"].set(language)
+            common.app_tree.root.properties["overwrite"].set(False)  # overwrite is 0 in the file
+            common.app_tree.root.properties["output_path"].set(self.outDirectory)
+            common.app_tree.root.properties["language"].set(language)
             # generate, compare and check for overwriting
             self._process_wx_events()
             if language=="C++":
-                common.app_tree.app.app_filename = P+APP
-            common.app_tree.root.widget.generate_code()
+                common.app_tree.root.app_filename = P+APP
+            common.app_tree.root.generate_code()
             check_mtime = language!="perl"
             self._compare_files(expected_app,    generate_app,    check_mtime=check_mtime)
             self._compare_files(expected_dialog, generate_dialog, check_mtime=check_mtime)
             self._compare_files(expected_frame,  generate_frame,  check_mtime=check_mtime)
 
+            if language=="C++":
+                self._compare_files(expected_filename_dialog_h, generate_filename_dialog_h, check_mtime=True)
+                self._compare_files(expected_filename_frame_h, generate_filename_frame_h, check_mtime=True)
+
+    def test_all_Tool_Menu_EventBinding(self):
+        self.load_and_generate('Tool_Menu_EventBinding', excluded=["lisp"], test_GUI=False)
+
     def test_OutputFileAndDirectory(self):
         "Test check for output file and directory"
         infilename = self._get_casefile_path('Python_Preferences.wxg')
         common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
 
         # Single output file out_path shouldn't be a directory, non-existing file or non-writable directory
-        common.app_tree.app.properties["output_path"].set(self.outDirectory)
-        common.app_tree.root.widget.generate_code()
-        self._assert_error_message( "can not be a directory when generating a single file" )
-
-        common.app_tree.app.properties["output_path"].set( os.path.join(self.outDirectory,"non-existing/result.py") )
-        common.app_tree.root.widget.generate_code()
-        self._assert_error_message( "must be an existing directory" )
+        common.app_tree.root.properties["output_path"].set(self.outDirectory)
+        common.app_tree.root.generate_code()
+        self._assert_error_message( "path is directory" )
+
+        common.app_tree.root.properties["output_path"].set( os.path.join(self.outDirectory,"non-existing/result.py") )
+        common.app_tree.root.generate_code()
+        self._assert_error_message( "directory does not exist" )
 
-        #common.app_tree.app.properties["output_path"].set( os.path.join(self.outDirectory,"non-writable/result.py") )
-        #common.app_tree.root.widget.generate_code()
+        #common.app_tree.root.properties["output_path"].set( os.path.join(self.outDirectory,"non-writable/result.py") )
+        #common.app_tree.root.generate_code()
         #self._assert_error_message( "" )
 
         # Multiple output file out_path should be a writable directory
-        common.app_tree.app.properties["multiple_files"].set(1)
-        common.app_tree.app.properties["output_path"].set( os.path.join(self.outDirectory,"non-existing") )
-        common.app_tree.root.widget.generate_code()
-        self._assert_error_message( " must be an existing directory" )
+        common.app_tree.root.properties["multiple_files"].set(1)
+        common.app_tree.root.properties["output_path"].set( os.path.join(self.outDirectory,"non-existing") )
+        common.app_tree.root.generate_code()
+        self._assert_error_message( "directory does not exist" )
 
-        #common.app_tree.app.properties["output_path"].set( os.path.join(self.outDirectory,"non-writable") )
-        #common.app_tree.root.widget.generate_code()
+        #common.app_tree.root.properties["output_path"].set( os.path.join(self.outDirectory,"non-writable") )
+        #common.app_tree.root.generate_code()
         #self._assert_error_message( "can not be a directory when generating a single file" )
 
     def test_PythonSubclass(self):
         "check for correct import: from package.name import name"
         infilename = self._get_casefile_path('PythonSubclass.wxg')
         common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
-        common.app_tree.app.filename = self._get_outputfile_path('PythonSubclass.wxg')
-        common.app_tree.root.widget.generate_code()
+        common.app_tree.root.filename = self._get_outputfile_path('PythonSubclass.wxg')
+        common.app_tree.root.generate_code()
 
         expected_filename = self._get_casefile_path("PythonSubclass.py")
         generated_filename = self._get_outputfile_path("PythonSubclass.py")
@@ -318,17 +357,17 @@
         "Test for multi file XRC projects."
         infilename = self._get_casefile_path('Python_Preferences.wxg')
         common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
-        common.app_tree.app.properties["multiple_files"].set(1)
-        common.app_tree.app.properties["language"].set("XRC")
-        common.app_tree.root.widget.generate_code()
+        common.app_tree.root.properties["multiple_files"].set(1)
+        common.app_tree.root.properties["language"].set("XRC")
+        common.app_tree.root.generate_code()
         self._assert_error_message( "XRC code cannot be split into multiple files" )
 
     def test_WxgTemplateCodegenNotPossible(self):
         "Test for code generation from a template"
         infilename = self._get_casefile_path('Python_Preferences.wxg')
         common.main._open_app(infilename, use_progress_dialog=False, add_to_history=False)
-        common.app_tree.app.properties["is_template"].set(True)
-        common.app_tree.root.widget.generate_code()
+        common.app_tree.root.properties["is_template"].set(True)
+        common.app_tree.root.generate_code()
         self._assert_error_message( "Code generation from a template is not possible" )
 
     def test_SizersSize(self):
@@ -341,6 +380,14 @@
     def test_Menu(self):
         self.load_and_generate('MenuTest', excluded=["lisp"], test_GUI=True)
 
+    def test_Menu_lambda_handlers_keep_code(self):
+        # copy .py file to test "Keep user code"
+        old_filename = self._get_casefile_path('MenuHandlers_Lambda.py')
+        generate_filename = self._get_outputfile_path("MenuHandlers_Lambda.py")
+        self._copy_and_modify(old_filename, generate_filename)
+        # the standard test will do the rest
+        self.load_and_generate('MenuHandlers_Lambda', included=["python"], test_GUI=True)
+
     def _assert_styles(self, got, expected, msg=None):
         if isinstance(got,      str): got      = got.split("|")
         if isinstance(expected, str): expected = expected.split("|")
@@ -354,28 +401,13 @@
         # XXX actually generate a file and simulate editing
 
         #common.palette._open_app(infilename, use_progress_dialog=False, add_to_history=False)
-        common.app_tree.clear()
-        common.app_tree.app.init()
+        common.app_tree.root.clear()
+        common.app_tree.root.init()
         import widgets.frame.frame
-        widgets.frame.frame.builder(None,None,0, "wxFrame", "MyFrame", "frame")
+        frame = widgets.frame.frame.builder(common.root, 0, "wxFrame", "MyFrame", "frame")
 
-        item = common.app_tree.root.children[0]
-        common.adding_widget = True
-        common.widget_to_add = "EditHyperlinkCtrl"
-        item.widget.sizer.children[1].on_drop_widget(None)
-        hyperlink = item.widget.sizer.children[1]
-
-        ## expand tree and show edit window
-        #tree = common.app_tree.drop_target()
-        #root = tree.GetRootItem()
-        #first, cookie = tree.GetFirstChild(root)
-        #if first.IsOk():
-            #tree.expand()
-            #self._process_wx_events()
-            #tree.SelectItem(first)
-            #self._process_wx_events()
-            #node = tree.GetPyData(first)
-            #tree.show_toplevel(node)
+        import widgets.hyperlink_ctrl.hyperlink_ctrl
+        hyperlink = widgets.hyperlink_ctrl.hyperlink_ctrl.builder(frame, 0, "Hyperlink")
         self._process_wx_events()
         # check available style names
         sp = hyperlink.properties["style"]
@@ -456,16 +488,13 @@
     def test_missing_application_attributes(self):
         #"Test load wxg file w/ missing <application> attributes and generate code"
         "convert .xrc file with missing <application> attributes to .wxg and load it"
+        # this will fail on Python 3.8 as the ordering of elements is not defined
         # convert .xrc to .wxg
         infilename  = self._get_casefile_path('app_wo_attrs_gui.xrc')
         generated_filename = self._get_outputfile_path('app_wo_attrs_gui.wxg')
         xrc2wxg.convert(infilename, generated_filename)
         # compare
-        if sys.version_info[:2]< (3,8):
-            # before 3.8 attribute names were ordered, now they are preserved
-            expected_filename = self._get_casefile_path('app_wo_attrs_gui.wxg')
-        else:
-            expected_filename = self._get_casefile_path('app_wo_attrs_gui_new.wxg')
+        expected_filename = self._get_casefile_path('app_wo_attrs_gui.wxg')
         self._compare_files(expected_filename, generated_filename)
         # open the .wxg file; there should be no problem
         self._messageBox = None
@@ -474,12 +503,21 @@
 
     def test_toplevels_no_size(self):
         "Test frame, panel, dialog without size"
+        # previous versions wrote only the last of the three panels
         self.load_and_generate('toplevels_no_size', test_GUI=True)
 
+    def test_toplevels_code_pre_post(self):
+        "Test frame, dialog without extracode_pre, extracode_post"
+        self.load_and_generate('toplevel_extracode', test_GUI=False)
+
     def test_unsupported_flags(self):
         "Test code generation with unsupported flags"
         self.load_and_generate('no_supported_flags', test_GUI=False)
 
+    def test_panel_class(self):
+        "Test code generation for a standalone panel class"
+        self.load_and_generate('PanelClass', excluded=("lisp",), test_GUI=False)
+
     @unittest.skipIf(wx.VERSION[:2]<(3,0), "not all supported (import_test.xrc fails")
     def test_load_xrc(self):
         "Test loading XRC files"
diff -Nru wxglade-0.9.6/tests/testsupport_new.py wxglade-1.0.1/tests/testsupport_new.py
--- wxglade-0.9.6/tests/testsupport_new.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tests/testsupport_new.py	2020-12-31 14:04:48.000000000 +0000
@@ -39,8 +39,8 @@
 
     # Language specific constants for file names: language, file prefix, file extensions
     language_constants = [("python","Py", ".py", ".py"),("perl","Pl", ".pl", ".pm"),
-                          ("C++","CPP", ".cpp", ".cpp"),("lisp","Lisp", ".lisp",".lisp"),
-                          ("XRC","xrc", ".xrc",".xrc")]
+                          ("C++","CPP", ".cpp", ".cpp"),("XRC","xrc", ".xrc",".xrc"),
+                          ("lisp","Lisp", ".lisp",".lisp")]  # keep Lisp at end as only 2.8 is supported
 
     @classmethod
     def setUpClass(cls):
@@ -53,7 +53,7 @@
         config.preferences.autosave = False
         config.preferences.write_timestamp = False
         config.preferences.show_progress = False
-        config.version = '"faked test version"'
+        #config.version = '"faked test version"'
 
         # make e.g. the preview raise Exceptions
         config.testing = True
@@ -80,6 +80,15 @@
         "Cleanup"
         pass
 
+    def _get_languages(self, excluded=None, included=None):
+        if included is None:
+            languages = set( [l[0] for l in self.language_constants] + ["wxg"] )
+        else:
+            languages = set(included)
+        if excluded is not None:
+            languages -= set(excluded)
+        return languages
+
     def _read_file_lines(self, filename):
         "read a file, split into lines and drop 'generated by ...'"
         with open(filename, "rb") as f:
@@ -103,6 +112,8 @@
         # open files, split into lines and convert to str/unicode
         expected  = self._read_file_lines(expected_filename)
         generated = self._read_file_lines(generated_filename)
+        if expected  and expected[0].startswith(b'#!/usr/bin/env python'):  expected[0]  = expected[0].rstrip(b"3")
+        if generated and generated[0].startswith(b'#!/usr/bin/env python'): generated[0] = generated[0].rstrip(b"3")
         if expected == generated: return False
         expected  = [s.decode('ascii', 'replace') for s in expected]
         generated = [s.decode('ascii', 'replace') for s in generated]
@@ -112,7 +123,7 @@
                 expected_  = [l for l in expected  if not l.strip().startswith("<size>") and not "SetSize" in l]
                 generated_ = [l for l in generated if not l.strip().startswith("<size>") and not "SetSize" in l]
                 if expected_ == generated_: return False
-        
+
         diff = difflib.unified_diff(expected, generated, fromfile=expected_filename, tofile=generated_filename, lineterm='')
         diff = list(diff)
         print( '\n'.join(diff[:40]) )
@@ -169,10 +180,77 @@
     @classmethod
     def setUpClass(cls):
         logging.disable(logging.WARNING)
-        wxglade.init_stage1()
-        wxglade.init_localization()
+        wxglade.init_stage1(options=None)
+        #wxglade.init_localization()
         wxglade.init_stage2(False)
 
+    def generate(self, basename, excluded=None, included=None):
+        "Load a wxGlade document 'basename' and generate code for all languages except the ones in list 'excluded'"
+        languages = self._get_languages(excluded, included)
+        infilename = self._get_casefile_path( '%s.wxg'%basename )
+
+        if compat.PYTHON2:
+            # the languages that failed due to differences to expected files
+            diff_fails = []
+        else:
+            # with Python 3, we use subTests
+            subtest = 0
+
+        # now test full code generation
+        for language, dummy, ext, dummy in self.language_constants:
+            if not language in languages: continue
+
+            if language=="C++" and app.multiple_files:
+                app_basename = os.path.splitext(config.default_cpp_app_name)[0]
+                app_basename = "%s_%s"%(first_window.klass.split("_")[0], app_basename)
+                app.app_filename = app_basename
+                expected_leafname = "%s.%s"%(app_basename, app.source_extension)
+            else:
+                expected_leafname = '%s%s' % (basename, ext)
+            expected_filename = self._get_casefile_path( expected_leafname )
+            #if not expected_filename: continue
+            if expected_filename:
+                generated_filename = self._get_outputfile_path(expected_filename)
+            else:
+                generated_filename = self._get_outputfile_path(expected_leafname)
+
+            wxglade.command_line_code_generation( infilename, language, generated_filename )
+
+            app = common.root
+
+            # set absolute "Output path", language and generate code
+            #if not expected_filename: continue
+
+            compare_files = [(expected_filename, generated_filename)]
+            if language == 'C++':
+                if not app.multiple_files:
+                    # compare header file as well
+                    expected_filename_h  = '%s.%s' % ( os.path.splitext(expected_filename )[0], app.header_extension )
+                    generated_filename_h = '%s.%s' % ( os.path.splitext(generated_filename)[0], app.header_extension )
+                    compare_files.append( (expected_filename, generated_filename) )
+                    compare_files.append( (expected_filename_h, generated_filename_h) )
+                else:
+                    for toplevel in app.children:
+                        classname = toplevel.klass
+                        # class C++ file
+                        expected_filename = self._get_casefile_path( "%s.%s"%(classname, app.source_extension) )
+                        if expected_filename:
+                            compare_files.append( (expected_filename, self._get_outputfile_path(expected_filename) ) )
+                        # class header file
+                        expected_filename = self._get_casefile_path( "%s.%s"%(classname, app.header_extension) )
+                        if expected_filename:
+                            compare_files.append( (expected_filename, self._get_outputfile_path(expected_filename) ) )
+
+            for expected_filename, generated_filename in compare_files:
+                if compat.PYTHON2:  # no subtests
+                    if self._compare_files(expected_filename, generated_filename): diff_fails.append(language)
+                else:
+                    with self.subTest(subtest):
+                        self._compare_files(expected_filename, generated_filename)
+                    subtest += 1
+        if compat.PYTHON2:
+            self.assertFalse(diff_fails, "Expected and generated files do not match for %s"%",".join(diff_fails))
+
 
 import xrc2wxg
 import wx
@@ -215,6 +293,8 @@
         cls.app = wx.App()
         cls.locale = wx.Locale(wx.LANGUAGE_DEFAULT)
         compat.wx_ArtProviderPush(main.wxGladeArtProvider())
+        import history
+        common.history = history.History()
         cls.frame = main.wxGladeFrame()
 
         # suppress wx error messages
@@ -261,12 +341,7 @@
 
     def load_and_generate(self, basename, excluded=None, included=None, test_GUI=True, preview=True):
         "Load a wxGlade document 'basename' and generate code for all languages except the ones in list 'excluded'"
-        if included is None:
-            languages = set( [l[0] for l in self.language_constants] + ["wxg"] )
-        else:
-            languages = set(included)
-        if excluded is not None:
-            languages -= set(excluded)
+        languages = self._get_languages(excluded, included)
 
         # open file
         infilename = self._get_inputfile_path('%s.wxg' % basename)
@@ -274,22 +349,20 @@
 
         # some shortcuts
         tree = common.app_tree
-        app = tree.app
+        app = common.root
 
         if test_GUI or preview:
             # expand tree and show edit window
-            first_window_node = app.node.children[0]
-            first_window = first_window_node.widget
-            first_window_item = first_window_node.item
+            first_window = app.children[0]
         if test_GUI:
-            if first_window_item.IsOk():
-                tree.expand()
+            if first_window.item.IsOk():
+                tree.Expand(tree.root.item)
                 self._process_wx_events()
-                tree.SelectItem(first_window_item)
+                tree.SelectItem(first_window.item)
                 self._process_wx_events()
-                tree.show_toplevel(first_window_node)
+                tree.show_toplevel(first_window)
             self._process_wx_events()
-        if preview:
+        if preview and "preview" in first_window.properties:
             first_window.properties["preview"]()
             self._process_wx_events()
 
@@ -313,12 +386,12 @@
                     self._compare_files(compare_filename, generated_filename)
                 subtest += 1
 
-        # try to generate code with empty output path -> will fail
-        app.properties["output_path"].set("")
-        app.generate_code()
-
         # first test should fail because no output file is given
-        self._assert_error_message( u'You must specify an output file' )
+        if not app.multiple_files:
+            # try to generate code with empty output path -> will fail
+            app.properties["output_path"].set("")
+            app.generate_code()
+            self._assert_error_message( u'You must specify an output file' )
 
         # now test full code generation
         for language, dummy, ext, dummy in self.language_constants:
@@ -329,12 +402,15 @@
                 app_basename = os.path.splitext(config.default_cpp_app_name)[0]
                 app_basename = "%s_%s"%(first_window.klass.split("_")[0], app_basename)
                 app.app_filename = app_basename
-                expected_filename = self._get_casefile_path( "%s.%s"%(app_basename, app.source_extension) )
-                # first_window.klass  # 'Bug179_Frame'
+                expected_leafname = "%s.%s"%(app_basename, app.source_extension)
             else:
-                expected_filename = self._get_casefile_path( '%s%s' % (basename, ext) )
-            if not expected_filename: continue
-            generated_filename = self._get_outputfile_path(expected_filename)
+                expected_leafname = '%s%s' % (basename, ext)
+            expected_filename = self._get_casefile_path( expected_leafname )
+            #if not expected_filename: continue
+            if expected_filename:
+                generated_filename = self._get_outputfile_path(expected_filename)
+            else:
+                generated_filename = self._get_outputfile_path(expected_leafname)
 
             # check for language first
             self.assertTrue( language in common.code_writers, "No codewriter loaded for %s" % language )
@@ -344,9 +420,15 @@
                 app.properties["output_path"].set( os.path.dirname(generated_filename) )
             else:
                 app.properties["output_path"].set(generated_filename)
+            if language=="lisp" and app.properties["for_version"]!="2.8":
+                app.properties["for_version"].set("2.8")
             app.properties["language"].set(language)
             self._process_wx_events()
-            app.generate_code()
+            try:
+                app.generate_code()
+            except:
+                if expected_filename: raise
+            if not expected_filename: continue
 
             self._assert_info_message(u'Code generation completed successfully')
 
@@ -359,8 +441,8 @@
                     compare_files.append( (expected_filename, generated_filename) )
                     compare_files.append( (expected_filename_h, generated_filename_h) )
                 else:
-                    for toplevel in app.node.children:
-                        classname = toplevel.widget.klass
+                    for toplevel in app.children:
+                        classname = toplevel.klass
                         # class C++ file
                         expected_filename = self._get_casefile_path( "%s.%s"%(classname, app.source_extension) )
                         if expected_filename:
@@ -389,3 +471,19 @@
         with open(target, "wb") as outfile:
             outfile.write(content)
         shutil.copystat( source, target )
+
+    def simulate_cut(self, widget):
+        # returns XML data
+        import clipboard
+        ret = clipboard.dump_widget(widget)
+        widget.remove()
+        wx.SafeYield()
+        return ret
+
+    def simulate_paste(self, parent, pos, data):
+        # accepts XML data; returns True on success
+        import clipboard
+        ret = clipboard._paste(parent, pos, data)
+        wx.SafeYield()
+        return ret
+
diff -Nru wxglade-0.9.6/tree.py wxglade-1.0.1/tree.py
--- wxglade-0.9.6/tree.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/tree.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,435 +3,33 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
-import logging, os.path, sys, time
+import os.path
 import wx
 import misc, common, compat, config, clipboard
-import edit_sizers, application
 
+DEBUG = config.debugging and False
+if DEBUG:
+    import utilities
 
-
-class Node(object):
-    __empty_win = None
-
-    def __init__(self, widget=None, children=None):
-        self.widget = widget      # e.g. EditPanel or EditBoxSizer
-        self.children = children  # list of Node or SlotNode instances
-        self.parent = None        # parent node; will be set in Tree.add/insert
-        self.item = None
-    @property
-    def is_toplevel(self):
-        if self.parent.parent is None:
-            return True
-        return False
-
-    @classmethod
-    def remove_rec(cls, node):
-        "recursively remove node and it's children"
-        for child_node in (node.children or []):
-            cls.remove_rec(child_node)
-        node.children = None
-        if node.widget is not None:
-            # call the widget's ``destructor''
-            node.widget.delete()
-        node.widget = None
-
-    def remove(self):
-        self.remove_rec(self)
-        try:
-            self.parent.children.remove(self)
-        except:
-            pass
-
-    def has_ancestor(self, node):
-        "Returns True if node is parent or parents parent ..."
-        parent = self.parent
-        if parent is None: return False
-        while True:
-            if node is parent: return True
-            if parent.parent is None: return False
-            parent = parent.parent
-
-    def write(self, output, tabs, class_names=None):
-        "Writes the xml code for the widget to the given output file"
-        # XXX move this to the widget
-        assert self.widget is not None
-
-        # write object tag, including class, name, base
-        classname = getattr(self.widget, '_classname', self.widget.__class__.__name__)
-        # to disable custom class code generation (for panels...)
-        if getattr(self.widget, 'no_custom_class', False):
-            no_custom = u' no_custom_class="1"'
-        else:
-            no_custom = ""
-        outer_tabs = u'    ' * tabs
-        output.append(u'%s<object %s %s %s%s>\n' % ( outer_tabs,
-                                                     common.format_xml_attrs(**{'class': self.widget.klass}),
-                                                     common.format_xml_attrs(name=self.widget.name),
-                                                     common.format_xml_attrs(base=classname),
-                                                     no_custom) )
-
-        # write properties, but without name and class
-        # XXX be 100% compatible to 0.7.2, where option is written into the object; remove later
-        properties = self.widget.get_properties(without=set(edit_sizers.SizerBase.MANAGED_PROPERTIES))
-        #properties = self.widget.get_properties(without=set(["pos","flag","border"]))
-        for prop in properties:
-            prop.write(output, tabs+1)
-
-        if class_names is not None and self.widget.__class__.__name__ != 'CustomWidget':
-            class_names.add(self.widget.klass)
-
-        if isinstance(self.widget, edit_sizers.SizerBase):
-            for child in self.children or []:
-                if not isinstance(child, SlotNode):# hasattr(child, 'widget'):
-                    inner_xml = []
-
-                    for name in edit_sizers.SizerBase.MANAGED_PROPERTIES:
-                        name = child.widget.properties[name]
-                        if name is not None:
-                            name.write(inner_xml, tabs+2)
-
-                    child.write(inner_xml, tabs+2, class_names)
-                    stmt = common.format_xml_tag( u'object', inner_xml, tabs+1,
-                                                  is_xml=True, **{'class': 'sizeritem'} )
-                    output.extend(stmt)
-                else:
-                    child.write(output, tabs+1)
-        elif self.children is not None:
-            for child in self.children:
-                child.write(output, tabs+1, class_names)
-        output.append(u'%s</object>\n' % outer_tabs)
-
-    def get_image(self, image=None):
-        "Get an image for this node"
-        if image is not None:
-            return image
-
-        name = self.widget.__class__.__name__
-        widget = self.widget
-
-        if name=="SizerSlot":
-            name = "EditSizerSlot"
-            if hasattr(self.parent.widget, "orient"):
-                sizer_orient = self.parent.widget.orient
-                if sizer_orient is not None:
-                    if sizer_orient==wx.VERTICAL:
-                        name = "EditVerticalSizerSlot"
-                    elif sizer_orient==wx.HORIZONTAL:
-                        name = "EditHorizontalSizerSlot"
-            elif hasattr(self.parent.widget, "orientation"):
-                if self.parent.widget.orientation=="wxSPLIT_VERTICAL":
-                    name = 'EditSplitterSlot-Left'  if widget.pos==1 else  'EditSplitterSlot-Right'
-                else:
-                    name = 'EditSplitterSlot-Top'   if widget.pos==1 else  'EditSplitterSlot-Bottom'
-
-        elif name in ("EditStaticBoxSizer", "EditBoxSizer"):
-            # with or without label, horizontal/vertical
-            if widget.orient & wx.VERTICAL:
-                name = "EditVerticalSizer"
-            elif widget.orient & wx.HORIZONTAL:
-                name = "EditHorizontalSizer"
-            else:
-                name = "EditSpacer"
-        elif name=="EditWrapSizer":
-            if widget.orient & wx.VERTICAL:
-                name = "EditVerticalWrapSizer"
-            else:
-                name = "EditHorizontalWrapSizer"
-
-        elif name == "EditSplitterWindow":
-            if widget.orientation=="wxSPLIT_HORIZONTAL":
-                name = 'EditSplitterWindow-h'
-
-        index = WidgetTree.images.get(name, -1)
-        return index
-
-    def refresh(self, refresh_label=True, refresh_image=True):
-        common.app_tree.refresh(self, refresh_label, refresh_image)
-
-
-class SlotNode(Node):
-    "Placeholder for an empty sizer slot"
-    def write(self, output, tabs, class_names=None):
-        if self.widget.sizer is None or self.widget.sizer.is_virtual(): return
-        output.extend( common.format_xml_tag( u'object', '', tabs, **{'class': 'sizerslot'}) )
-
-
-class Tree(object):
-    "A class to represent a hierarchy of widgets"
-
-    def __init__(self, root=None, app=None):
-        # initialise instance logger
-        self._logger = logging.getLogger(self.__class__.__name__)
-
-        # initialise instance
-        self.root = root
-        if self.root is None: self.root = Node()
-        self.current = self.root
-        self.app = app   # reference to the app properties
-        self.names = {}  # dictionary of names of the widgets: each entry is a dictionary, one for each toplevel widget
-
-    def _find_toplevel(self, node):
-        assert node is not None, _("None node in _find_toplevel")
-        if node.parent is self.root:
-            return node
-        while node.parent is not self.root:
-            node = node.parent
-        return node
-
-    def get_toplevel_class_names(self):
-        ret = []
-        for c in self.root.children or []:
-            ret.append(c.widget.klass)
-        return ret
-
-    def get_all_class_names(self, node=None):
-        if node is None: node = self.root
-        ret = []
-        for c in node.children or []:
-            name = getattr(c.widget, "klass", None)
-            if name: ret.append(name)
-            ret += self.get_all_class_names(c)
-
-        return ret
-
-    def get_all_names(self):
-        ret = set()
-        for n in self.names:
-            ret.update(self.names[n].keys())
-        return ret
-
-    def has_name(self, name, node=None):
-        if node is None:
-            for n in self.names:
-                if name in self.names[n]:
-                    return True
-            return False
-        else:
-            node = self._find_toplevel(node) # node is a name
-            return name in self.names[node]
-
-    def add(self, child, parent=None):
-        if parent is None: parent = self.root
-        if parent.children is None: parent.children = []
-        parent.children.append(child)
-        child.parent = parent
-        self.current = child
-        self.names.setdefault(self._find_toplevel(child), {})[child.widget.name] = 1
-        if parent is self.root and getattr(child.widget.__class__, '_is_toplevel_window', False):
-            self.app.add_top_window(child.widget.name)
-            
-        if not isinstance(child.widget, edit_sizers.SizerSlot):
-            self.app.check_codegen(child.widget)
-
-    def insert(self, child, parent, index):
-        # if at index there is a SlotNode, replace this, otherwise insert
-        if parent is None: parent = self.root
-        if parent.children is None or index>=len(parent.children):
-            self.add(child, parent)
-            return
-        if isinstance( parent.children[index], SlotNode ):
-            if not isinstance(child, SlotNode):
-                self.remove( parent.children[index] )
-
-        parent.children.insert(index, child)
-        child.parent = parent
-        self.current = child
-        self.names.setdefault(self._find_toplevel(child), {})[child.widget.name] = 1
-        if parent is self.root:
-            self.app.add_top_window(child.widget.name)
-            
-        if not isinstance(child.widget, edit_sizers.SizerSlot):
-            self.app.check_codegen(child.widget)
-
-    def clear_name_rec(self, n):
-        if n.parent is self.root:
-            del self.names[n]
-            return
-        try:
-            del self.names[self._find_toplevel(n)][n.widget.name]
-        except (KeyError, AttributeError):
-            pass
-
-        for c in (n.children or []):
-            self.clear_name_rec(c)
-
-    def remove(self, node=None):
-        if node is not None:
-            self.clear_name_rec(node)
-            if node.parent is self.root and getattr(node.widget, "_is_toplevel_window", False):
-                self.app.remove_top_window(node.widget.name)
-            node.remove()
-        elif self.root.children:
-            for n in self.root.children:
-                n.remove()
-            self.root.children = None
-            self.names = {}
-
-    def write(self, output, tabs=0):
-        """Writes the xml equivalent of this tree to the given output file.
-        This function writes unicode to the outfile."""
-        # XXX move this to application.Application
-        timestring = time.asctime()  if not config.testing else  'XXX XXX NN NN:NN:NN NNNN'
-        output.append( u'<?xml version="1.0"?>\n'
-                       u'<!-- generated by wxGlade %s on %s -->\n\n' % (config.version, timestring) )
-
-        attrs = ["name","class","language","top_window","encoding","use_gettext", "overwrite", "mark_blocks",
-                 "for_version","is_template","indent_amount"]
-        props = [self.app.properties[attr] for attr in attrs]
-        attrs = dict( (attr,prop.get_string_value()) for attr,prop in zip(attrs,props) if not prop.deactivated )
-        top_window_p = self.app.properties["top_window"]
-        if top_window_p.deactivated and top_window_p.value:
-            attrs["top_window"] = top_window_p.value
-        attrs["option"] = self.app.properties["multiple_files"].get_string_value()
-        attrs["indent_symbol"] = self.app.properties["indent_mode"].get_string_value()
-        attrs["path"] = self.app.properties["output_path"].get_string_value()
-        attrs['use_new_namespace'] = 1
-        # add a . to the file extensions
-        attrs["source_extension"] = '.' + self.app.properties["source_extension"].get_string_value()
-        attrs["header_extension"] = '.' + self.app.properties["header_extension"].get_string_value()
-
-        inner_xml = []
-
-        if self.app.is_template and getattr(self.app, 'template_data', None):
-            self.app.template_data.write(inner_xml, tabs+1)
-
-        class_names = set()
-        if self.root.children is not None:
-            for c in self.root.children:
-                c.write(inner_xml, tabs+1, class_names)
-
-        output.extend( common.format_xml_tag( u'application', inner_xml, is_xml=True, **attrs ) )
-
-        return class_names
-
-    def change_node(self, node, widget):
-        "Changes the node 'node' so that it refers to 'widget'"
-        try:
-            del self.names[self._find_toplevel(node)][node.widget.name]
-        except KeyError:
-            pass
-        node.widget = widget
-        self.names.setdefault(self._find_toplevel(node), {})[widget.name] = 1
-
-    def change_node_pos(self, node, new_pos, index=None):
-        if index is None: index = node.parent.children.index(node)
-        if index >= new_pos:
-            node.parent.children.insert(new_pos, node)
-            del node.parent.children[index + 1]
-        else:
-            del node.parent.children[index]
-            node.parent.children.insert(new_pos+1, node)
-
-    def _find_widget(self, widget, node):
-        if node.widget is None or node.widget.widget is None:
-            return
-        if widget is node.widget.widget: return node
-        button = getattr(node.widget.widget, "_btn", None)
-        if button is not None and widget is button: return node
-        if hasattr(node.widget.widget, "GetStaticBox"):
-            if widget is node.widget.widget.GetStaticBox(): return node
-        if node.children:
-            for child in node.children:
-                found = self._find_widget(widget, child)
-                if found is not None:
-                    return found
-        return None
-
-    def find_widget(self, widget, node=None):
-        # returns node
-        nodes = [node] if node is not None else self.root.children
-        for node in nodes:
-            found = self._find_widget(widget, node)
-            if found is not None:
-                return found
-
-    def _find_widgets_by_classnames(self, node, classnames):
-        ret = []
-        if node.widget.__class__.__name__ in classnames:
-            ret.append(node.widget)
-        if node.children:
-            for c in node.children:
-                ret += self._find_widgets_by_classnames(c,classnames)
-        return ret
-
-    def find_widgets_by_classnames(self, node, classnames):
-        if isinstance(classnames, str):
-            classnames = set([classnames])
-        return self._find_widgets_by_classnames(node, classnames)
-
-    def _prn(self, node, level):
-        if isinstance(node, SlotNode):
-            print("  "*level, "SLOT")
-        else:
-            print("  "*level, node.widget)
-            if node.children:
-                for c in node.children:
-                    self._prn(c, level+1)
-
-    def prn(self, start_node=None):
-        "print structure to stdout for debugging"
-        if start_node is None: start_node = self.root
-        self._prn(start_node, 0)
-
-    def clear(self):
-        # delete all children; call common.app_tree.app.new() or .init() afterwards
-        self.skip_select = True
-        if self.root.children:
-            while self.root.children:
-                c = self.root.children[-1]
-                if c.widget: c.widget.remove()
-            self.root.children = None
-        self.skip_select = False
-
-    def set_title(self, value):
-        if value is None: value = ""
-        self.title = value
-
-    def get_title(self):
-        if not self.title: self.title = ' '
-        return self.title
-
-    def refresh_name(self, node, previous_name=None):
-        names = self.names.setdefault(self._find_toplevel(node), {})
-        if previous_name is not None and previous_name in names:
-            del names[previous_name]
-        names[node.widget.name] = 1
-
-    def refresh(self, node, refresh_label=True, refresh_image=True):
-        # nothing to, do when there is no GUI
-        pass
-        
-    
-class WidgetTree(wx.TreeCtrl, Tree):
+class WidgetTree(wx.TreeCtrl):#, Tree):
     "Tree with the ability to display the hierarchy of widgets"
     images = {} # Dictionary of icons of the widgets displayed
-    _logger = None # Class specific logging instance
     def __init__(self, parent, application):
-        self._logger = logging.getLogger(self.__class__.__name__)
         style = wx.TR_DEFAULT_STYLE|wx.TR_HAS_VARIABLE_ROW_HEIGHT
         style |= wx.TR_EDIT_LABELS
         if wx.Platform == '__WXGTK__':    style |= wx.TR_NO_LINES|wx.TR_FULL_ROW_HIGHLIGHT
         elif wx.Platform == '__WXMAC__':  style &= ~wx.TR_ROW_LINES
         wx.TreeCtrl.__init__(self, parent, -1, style=style)
-        root_node = Node(application)
-        application.node = root_node
         self.cur_widget = None  # reference to the selected widget
-        Tree.__init__(self, root_node, application)
-        image_list = wx.ImageList(21, 21)
-        image_list.Add(wx.Bitmap(os.path.join(config.icons_path, 'application.xpm'), wx.BITMAP_TYPE_XPM))
-        for w in WidgetTree.images:
-            WidgetTree.images[w] = image_list.Add(misc.get_xpm_bitmap(WidgetTree.images[w]))
-        self.AssignImageList(image_list)
-        root_node.item = self.AddRoot(_('Application'), 0)
-        self._SetItemData(root_node.item, root_node)
-        self.skip_select = 0  # necessary to avoid an infinite loop on win32, as SelectItem fires an
-                              # EVT_TREE_SEL_CHANGED event
-        self.title = ' '
-        self.set_title(self.title)
+        self.root = application
+        self._load_images()
+        application.item = self.AddRoot(_('Application'), 0)
+        self._SetItemData(application.item, application)
+        self.skip_select = 0  # avoid an infinite loop on win32, as SelectItem fires an EVT_TREE_SEL_CHANGED event
 
         self.drop_target = clipboard.DropTarget(self, toplevel=True)
         self.SetDropTarget(self.drop_target)
@@ -446,34 +44,84 @@
         self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.begin_drag)
         self.Bind(wx.EVT_LEAVE_WINDOW, self.on_leave_window)
         self.Bind(wx.EVT_MOUSE_EVENTS, self.on_mouse_events)
-        
+
         self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.begin_edit_label)
         self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.end_edit_label)
         #self.Bind(wx.EVT_KEY_DOWN, misc.on_key_down_event)
         self.Bind(wx.EVT_KEY_DOWN, self.on_key_down_event)
         #self.Bind(wx.EVT_CHAR_HOOK, self.on_char)  # on wx 2.8 the event will not be delivered to the child
+        self.Bind(wx.EVT_TREE_DELETE_ITEM, self.on_delete_item)
 
-    def _label_editable(self, widget=None):
-        if widget is None: widget = self.cur_widget
-        if widget is None: return False
-        if not "name" in widget.properties: return False
-        if not "label" in widget.properties: return True
-        label = widget.label
-        # no editing in case of special characters
-        if "\n" in label or "\t" in label or "'" in label or '"' in label: return False
-        if len(label)>24: return False
-        return True
+    def _load_images(self):
+        bitmaps = {}
+        for name, path in WidgetTree.images.items():
+            img = misc.get_xpm_bitmap(path).ConvertToImage()
+            # add 1 white pixel more at top and bottom
+            img.Resize((21,23), (0,1), -1,-1,-1)
+            bitmaps[name] = img.ConvertToBitmap()
+
+        # grid sizer slots:
+        # load template with one active slot and build new images with slot at any position top/left to bottom/right
+        fn = os.path.join(config.icons_path, 'grid_sizer_slot_template.png')  # bottom / right in black
+        template = wx.Image(fn, wx.BITMAP_TYPE_PNG)
+        t_empty  = template.GetSubImage( (0,0,7,7) )    # empty slot
+        t_active = template.GetSubImage( (0,7,7,7) )    # active slot
+        t_bottom = template.GetSubImage( (0,20,20,1) )  # typically a black line at bottom
+        t_right  = template.GetSubImage( (20,0,1,20) )  # typically a black line at right
+        for pos_v in (0,1,2):           # active slot v
+            for pos_h in (0,1,2):       # active slot h
+                img = compat.wx_EmptyImage(21, 21)
+                for x in (0,1,2):       # left, center, right
+                    for y in (0,1,2):   # top, middle, button
+                        t = t_active  if x==pos_h and y==pos_v else  t_empty
+                        img.Paste(t, x*7, y*7)
+                img.Paste(t_bottom, 0,20)
+                img.Paste(t_right, 20,0)
+                # add 1 white pixel more at top and bottom, store; store also -Disabled version
+                img.Resize((21,23), (0,1), -1,-1,-1)
+                name = 'EditGridSizerSlot-%d%d'%(pos_h,pos_v)
+                bmp = bitmaps[name] = img.ConvertToBitmap()
+                if hasattr(bmp, "ConvertToDisabled"):
+                    bitmaps['%s-Disabled'%name] = bmp.ConvertToDisabled()
+                else:
+                    bitmaps['%s-Disabled'%name] = img.AdjustChannels(1.5, 1.5, 1.5).ConvertToBitmap()
+
+        # store in the bitmap list
+        image_list = wx.ImageList(21, 23)
+        app_image = wx.Image(os.path.join(config.icons_path, 'application.png'), wx.BITMAP_TYPE_PNG)
+        app_image.Resize((21,23), (0,1), -1,-1,-1)
+        image_list.Add( app_image.ConvertToBitmap() )
+        for name, bitmap in bitmaps.items():
+            WidgetTree.images[name] = image_list.Add(bitmap)
+        self.AssignImageList(image_list)
 
     def on_char(self, event):
         "called from main: start label editing on F2; skip events while editing"
-        if event.GetKeyCode()==wx.WXK_F2 and self.cur_widget and self._label_editable():
+        keycode = event.GetKeyCode()
+        if keycode==wx.WXK_F2 and self.cur_widget and self.cur_widget._label_editable():
             # start label editing
-            self.EditLabel( self.cur_widget.node.item )
+            self.EditLabel( self.cur_widget.item )
             return True
         if isinstance(self.FindFocus(), wx.TextCtrl):
             # currently editing
             event.Skip()
             return True
+        if keycode in (wx.WXK_UP, wx.WXK_DOWN, wx.WXK_LEFT, wx.WXK_RIGHT):
+            event.Skip()
+            return True
+        if keycode==wx.WXK_RETURN and self.cur_widget and self.cur_widget.item:
+            if self.cur_widget.IS_SLOT:
+                if self.cur_widget.overlapped: return True
+                return False
+            if self.cur_widget.IS_TOPLEVEL and self.cur_widget.children:
+                self.show_toplevel(None, editor=self.cur_widget)
+                return True
+            elif not self.IsExpanded(self.cur_widget.item) and self.cur_widget.children:
+                self.ExpandAllChildren(self.cur_widget.item)
+                return True
+            elif self.IsExpanded(self.cur_widget.item):
+                self.Collapse(self.cur_widget.item)
+                return True
         return False
 
     def on_key_down_event(self, event):
@@ -483,7 +131,7 @@
             #return
         if event.GetKeyCode()==wx.WXK_WINDOWS_MENU and self.cur_widget:
             # windows menu key pressed -> display context menu for selected item
-            item = self.RootItem  if self.cur_widget is self.app else  self.cur_widget.node.item
+            item = self.RootItem  if self.cur_widget is common.root else  self.cur_widget.item
             if item:
                 rect = self.GetBoundingRect(item, textOnly=True)
                 if rect is not None:
@@ -496,18 +144,19 @@
     def begin_drag(self, evt):
         # start drag & drop
         item = evt.GetItem()
-        node = self._GetItemData(item)
-        if node is self.root or isinstance(node, SlotNode): return  # application and slots can't be dragged
-        widget = node.widget
+        widget = self._GetItemData(item)
+        if not widget:
+            if config.debugging: raise ValueError("internal error")
+            return
+        if widget is self.root or widget.IS_SLOT: return  # application and slots can't be dragged
         self._drag_ongoing = True
         clipboard.begin_drag(self, widget)
         self._drag_ongoing = False
 
     def begin_edit_label(self, evt):
         # Begin editing a label. This can be prevented by calling Veto()
-        widget = self._GetItemData( evt.Item ).widget
-        #if "name" not in widget.properties: evt.Veto()
-        if not self._label_editable(widget): evt.Veto()
+        widget = self._GetItemData( evt.Item )
+        if not widget or not widget._label_editable(): evt.Veto()
 
     def _split_name_label(self, new_value):
         # split user input into name and label; if there's no colon but a quotation mark, it's just a label
@@ -535,30 +184,38 @@
         # Finish editing a label. This can be prevented by calling Veto()
         if evt.IsEditCancelled(): return
         item = evt.Item
-        node = self._GetItemData( item )
-        widget = node.widget
+        widget = self._GetItemData( item )
         if "name" not in widget.properties: return
 
         new_value = evt.Label
-        if new_value==self._build_label(node): return
+        if new_value==widget._get_tree_label(): return
 
-        new_name = new_label = new_title = new_tab = new_class = None
-        
-        if node.widget.klass != node.widget.base and node.widget.klass != 'wxScrolledWindow':
+        new_name = new_label = new_title = new_tab = new_class = new_stockitem = None
+
+        if widget.check_prop_truth("class"):
             if new_value.count("(")==1 and new_value.count(")")==1:
                 pre, new_class = new_value.split("(")
                 new_class, post = new_class.split(")")
                 if pre.endswith(" "): pre = pre[:-1]
                 new_value = pre+post
 
-        if "label" in widget.properties and self._label_editable(widget):
+        if widget.check_prop_truth("stockitem"):
+            if ":" in new_value:
+                new_name, new_stockitem = new_value.split(":", 1)
+                new_stockitem = new_stockitem.strip().upper()
+                if not new_stockitem in widget.STOCKITEMS: new_stockitem = None
+            elif new_value.strip().upper() in widget.STOCKITEMS:
+                new_stockitem = new_value.strip().upper()
+            else:
+                new_name = new_value
+        elif "label" in widget.properties and widget._label_editable():
             new_name, new_label = self._split_name_label(new_value)
         elif "label" in widget.properties:
             # label is not editable, but name may have changed
             new_name, dummy = self._split_name_label(new_value)
-        elif getattr(node.widget, "has_title", None):
+        elif getattr(widget, "has_title", None):
             new_name, new_title = self._split_name_label(new_value)
-        elif getattr(node.widget, "parent", None) and node.widget.parent.klass=="wxNotebook" and "]" in new_value:
+        elif getattr(widget, "parent", None) and widget.parent.WX_CLASS=="wxNotebook" and "]" in new_value:
             # notebook pages: include page title: "[title] name"
             new_tab, new_name = new_value.rsplit("]",1)
             if "[" in new_tab: new_tab = new_tab.split("[",1)[-1]
@@ -566,15 +223,14 @@
         else:
             new_name = new_value
 
-
         # check name
         if new_name:
             name_p = widget.properties["name"]
             if new_name==name_p.get(): new_name = None
         if new_name:
             # check
-            OK = name_p.check(new_name)
-            if not OK: new_name = None
+            warning, error = name_p.check_value(new_name)
+            if warning or error: new_name = None
 
         # check class/klass
         if new_class:
@@ -582,19 +238,24 @@
             if new_class==class_p.get(): new_class = None
         if new_class:
             # check
-            OK = class_p.check(new_class)
-            if not OK: new_class = None
+            warning, error = name_p.check_value(new_class)
+            if warning or error: new_class = None
 
         # check label
         if new_label is not None:
             label_p = widget.properties["label"]
             if new_label==label_p.get(): new_label = None
-        if not new_name and new_label is None and new_title is None and new_tab is None and new_class is None:
+        if (not new_name and new_label is None and new_title is None and new_tab is None and new_class is None
+            and not new_stockitem):
             # no change or an error
             wx.Bell()
             evt.Veto()
             return
         # check title
+        if new_stockitem is not None:
+            stockitem_p = widget.properties["stockitem"]
+            if new_stockitem==stockitem_p.get(): new_stockitem = None
+        # check title
         if new_title is not None:
             title_p = widget.properties["title"]
             if new_title==title_p.get(): new_title = None
@@ -602,8 +263,8 @@
         if new_tab is not None:
             notebook = widget.parent
             tabs_p = notebook.properties["tabs"]
-            if widget in notebook.pages:
-                index = notebook.pages.index(node.widget)
+            if widget in notebook.children:
+                index = notebook.children.index(widget)
                 if notebook.tabs[index][0]==new_tab:
                     new_tab = None
                 else:
@@ -626,67 +287,21 @@
             label_p.previous_value = label_p.value
             label_p.set(new_label, notify=False)
             modified.add("label")
+        if new_stockitem:
+            stockitem_p.previous_value = stockitem_p.value
+            stockitem_p.set(new_stockitem, notify=False)
+            modified.add("stockitem")
         if new_title:
             title_p.previous_value = title_p.value
             title_p.set(new_title, notify=False)
             modified.add("title")
         if modified:
             widget.properties_changed(modified)
-            self.app.saved = False  # update the status of the app
+            self.root.saved = False  # update the status of the app
         if new_tab:
             tabs_p.previous_value = tabs_p.value
             tabs_p.set(new_tabs, notify=True)
-        wx.CallAfter( self.refresh, node, refresh_label=True)  # setting from within the event handler does not work
-
-    def _build_label(self, node):
-        # get a label for node
-        import notebook
-        if isinstance(node.widget, edit_sizers.SizerSlot):
-            if node.widget.label: return node.widget.label
-            pos = node.widget.pos
-            if node.widget.sizer and isinstance(node.widget.sizer, edit_sizers.GridSizerBase):
-                # row/col
-                sizer = node.widget.sizer
-                rows, cols = sizer._get_actual_rows_cols()
-                row = (pos-1) // cols + 1  # 1 based at the moment
-                col = (pos-1) %  cols + 1
-                return "SLOT  %d/%d"%(row, col)
-            elif isinstance(node.widget.sizer, notebook.notebook.NotebookVirtualSizer):
-                return "Notebook Page %d"%(pos)
-            else:
-                return "SLOT %d"%(pos)
-        s = node.widget.name
-        if (node.widget.__class__.__name__=="CustomWidget" or
-            (node.widget.klass != node.widget.base and node.widget.klass != 'wxScrolledWindow') ):
-            # special case...
-            s += ' (%s)' % node.widget.klass
-            if getattr(node.widget, "has_title", None):
-                # include title
-                s += ': "%s"'%node.widget.title
-        elif "label" in node.widget.properties and node.widget.properties["label"].is_active():
-            # include label of control
-            label = node.widget.label
-            label = label.replace("\n","\\n").replace("\t","\\t")
-            if '"' in label:
-                if len(label)>36:
-                    s += ": '%s..."%(label[:30])
-                else:
-                    s += ": '%s'"%label
-            else:
-                if len(label)>24:
-                    s += ': "%s...'%(label[:30])
-                else:
-                    s += ': "%s"'%label
-        elif getattr(node.widget, "has_title", None):
-            # include title
-            s += ': "%s"'%node.widget.title
-        elif getattr(node.widget, "parent", None) and node.widget.parent.klass=="wxNotebook":
-            # notebook pages: include page title: "[title] name"
-            notebook = node.widget.parent
-            if node.widget in notebook.pages:
-                title = notebook.tabs[notebook.pages.index(node.widget)][0]
-                s = '[%s] %s'%(title, s)
-        return s
+        wx.CallAfter( self.refresh, widget, refresh_label=True)  # setting from within the event handler does not work
 
     if compat.IS_CLASSIC:
         def _SetItemData(self, item, data):
@@ -705,80 +320,183 @@
                 # on GTK the above bool may return True even if the item is being deleted
                 return None
 
-    def add(self, child, parent=None, select=True):
-        "appends child to the list of parent's children"
-        assert isinstance(child, Node)
-
-        Tree.add(self, child, parent)
-        image = child.get_image()
-        if parent is None: parent = parent.item = self.GetRootItem()
-        child.item = self.AppendItem(parent.item, self._build_label(child), image)
-        self._SetItemData(child.item, child)
+    def add2(self, child, parent, index, item=None):
+        "insert an item for child into the list of parent's items; optionally re-use old item"
+        image = self.images.get( child._get_tree_image(), -1)
+        label = child._get_tree_label()
+        if item is None:
+            if index is None:
+                item = child.item = self.AppendItem(parent.item, label, image)
+            else:
+                item = child.item = compat.wx_Tree_InsertItemBefore(self, parent.item, index, label, image)
+        else:
+            # re-use
+            child.item = item
+            self.refresh(child)
+        self._SetItemData(item, child)
         if self.auto_expand:
             self.Expand(parent.item)
-            if select:
-                self.select_item(child)
-
-
-    def insert(self, child, parent, index, select=True):
-        "inserts child to the list of parent's children at index; a SlotNode at index is overwritten"
-        assert isinstance(child, Node)
-        # pos is index
-        if parent is None:
-            # XXX check whether this is called at all
-            parent = self._GetItemData( self.GetRootItem() )
-        assert isinstance(parent, Node)
-
-        # parent is a Node, i.e. Dummy or Button are not in parent.children
-        if parent.children is None or index>=len(parent.children):
-            self.add(child, parent, select=select)
+        if DEBUG:
+            print("added item", utilities.hx(item), child, child.item)
+        return item
+
+    def remove(self, editor):
+        # just remove the mutual references between editor and tree item
+        if editor.item is None: return  # could be during common.root.clear() when there is an error on loading
+        self._SetItemData(editor.item, None)
+        editor.item = None
+
+    ####################################################################################################################
+    # new implementation:
+    def on_delete_item(self, event):
+        item = event.GetItem()
+        editor = self._GetItemData( item )
+        if DEBUG:
+            print("on_delete_item", utilities.hx(item), editor, editor and editor.item or None)
+        if editor is not None and editor.item is item:
+            editor.item = None
+
+    def _get_children_items(self, item):
+        items = []
+        child_item, cookie = self.GetFirstChild(item)
+        while child_item.IsOk():
+            items.append(child_item)
+            child_item, cookie = self.GetNextChild(item, cookie)
+        return items
+
+    def _build_children(self, editor, item, recursive=True):
+        # XXX a better algorithm would be nice
+        # currently it's checked from the start and from the end how many are matching; all inbetween are replaced
+        if DEBUG: print("_build_children", editor)
+        children = editor.get_all_children()
+        items = self._get_children_items(editor.item)
+        if DEBUG: print("children", children)
+        if DEBUG: print("items", items)
+        item_editors = []
+        for child_item in items:
+            child = self._GetItemData(child_item)
+            if child is not None and (not children or not child in children):
+                self._SetItemData(child_item, None)
+                if child.item is child_item:
+                    if DEBUG: print("removed child.item", utilities.hx(child), utilities.hx(child.item))
+                    child.item = None  # is probably None already
+                item_editors.append(None)
+            else:
+                item_editors.append(child)
+        if DEBUG: print("item_editors", item_editors)
+        if DEBUG: print()
+        match_beginning = 0
+        for c,child in enumerate(children):
+            if c<len(item_editors) and item_editors[c] is child:
+                match_beginning = c+1
+            else:
+                break
+        match_end = 0
+        c = -1
+        while match_beginning+match_end<len(children):
+            if match_end<len(item_editors) and item_editors[c] is children[c]:
+                match_end += 1
+            else:
+                break
+            c -= 1
+
+        if len(children) > len(item_editors):
+            # insert or add items, right after match_beginning
+            for n in range( len(children) - len(item_editors) ):
+                index = match_beginning + n
+                child = children[index]
+                item = self.add2(child, parent=editor, index=index)
+                items.insert(index, item)
+        elif len(children) < len(item_editors):
+            # remove items, right after match_beginning
+            for n in range( len(item_editors) - len(children) ):
+                index = match_beginning 
+                child_item = items[index]
+                self.Delete(child_item)
+                del items[match_beginning]
+        if match_beginning+match_end<len(children):
+            # length matches, re-use item in the middle
+            for index in range(match_beginning, len(children)-match_end):
+                child = children[index]
+                item = self.add2(child, parent=editor, index=index, item=items[index])
+        
+        if not recursive:
+            # update labels and images, called e.g. when notebook pages change
+            for child in children:
+                self.refresh(child)
             return
+        for child, item in zip(children, items):
+            self._build_children(child, item)
 
-        Tree.insert(self, child, parent, index)
-        image = child.get_image()
-        child.item = compat.wx_Tree_InsertItemBefore(self, parent.item, index, self._build_label(child), image)
-        self._SetItemData(child.item, child)
-        if self.auto_expand:
-            self.Expand(parent.item)
-            if select:
-                self.select_item(child)
-
-    def remove(self, node=None, delete=True):
-        self.app.saved = False  # update the status of the app
-        Tree.remove(self, node)
-        if node is not None:
-            if delete:
-                self.Delete(node.item)
-        else:
-            wx.TreeCtrl.Destroy(self)
-
-    def refresh_name(self, node, previous_name=None):
-        Tree.refresh_name(self, node, previous_name)
-        self.SetItemText(node.item, self._build_label(node))
+    def build(self, editor=None, recursive=True, freeze=False):
+        if DEBUG:
+            print("="*80)
+            print("build", editor, recursive)
+        # (re-)build tree from data structure
+        # e.g. .build(control)
+        # XXX if recursive is not True, ensure that all children are refreshed, as e.g. slot numbers may have changed
+        if freeze: self.Freeze()  # Freeze/Thaw makes the tree scroll around, so it should only be used for major change
+        try:
+            if editor is None:
+                editor = self.root
+                item = self.GetRootItem()
+            else:
+                item = editor.item
+                if item is None and editor.parent.item:
+                    # check whether at the same position there is an item already without an editor
+                    pos = editor.parent._get_child_pos(editor)
+                    items = self._get_children_items(editor.parent.item)
+                    if len(items)>pos and self._GetItemData(items[pos]) is None:
+                        item = items[pos]
+                        editor.item = item
+                        self._SetItemData(item, editor)
+                        self.refresh(editor)
+                while item is None:
+                    editor = editor.parent
+                    item = editor.item
+            self._build_children(editor, item, recursive)
+        finally:
+            if freeze: self.Thaw()
+        #if config.debugging or DEBUG:
+        if DEBUG:
+            import utilities
+            utilities.TreePrinter(editor)
+
+    def OnCompareItems(self, item1, item2):
+        # only used when re-ordering toplevel items
+        editor1 = self._GetItemData(item1)
+        editor2 = self._GetItemData(item2)
+        parent = editor1.parent
+        assert parent is editor2.parent and parent is common.root
+        index1 = parent.children.index(editor1)
+        index2 = parent.children.index(editor2)
+        if index1<index2: return -1
+        return +1
 
-    def refresh(self, node, refresh_label=True, refresh_image=True):
+    def refresh(self, editor, refresh_label=True, refresh_image=True):
         # refresh label and/or image
+        if editor.item is None: return
         if refresh_label:
-            self.SetItemText(node.item, self._build_label(node))
+            self.SetItemText(editor.item, editor._get_tree_label())
         if refresh_image:
-            image = node.get_image()
-            self.SetItemImage(node.item, image)
+            image = self.images.get( editor._get_tree_image(), -1)
+            self.SetItemImage(editor.item, image)
 
-    def select_item(self, node):
+    def select_item(self, editor):
         self.skip_select = True
-        self.SelectItem(node.item)
+        self.SelectItem(editor.item)
         self.skip_select = False
-        self._set_cur_widget(node.widget)
+        self._set_cur_widget(editor)
         misc.set_focused_widget(self.cur_widget)
 
-    def _set_cur_widget(self, widget):
+    def _set_cur_widget(self, editor):
         # set self.cur_widget; adjust label colors and bold if required (on Windows)
-        if self.cur_widget and wx.Platform == "__WXMSW__":
-            item = self.cur_widget.node.item
+        if self.cur_widget and wx.Platform == "__WXMSW__" and self.cur_widget.item:
+            item = self.cur_widget.item
             self.SetItemTextColour(item, wx.NullColour)
             self.SetItemBold( item, False )
-        self.cur_widget = widget
-        item = widget.node.item
+        self.cur_widget = editor
+        item = editor.item
         self.EnsureVisible(item)
         # ensure that the icon is visible
         text_rect = self.GetBoundingRect(item, True)
@@ -787,60 +505,65 @@
         if wx.Platform == "__WXMSW__":
             self.SetItemBold(item, True)
             self.SetItemTextColour(item, wx.BLUE)
-    def set_current_widget(self, widget):
+        s = editor._get_tooltip_string()
+        common.main.user_message( s and s.replace("\n", " ") or "" )
+
+    def set_current_widget(self, editor):
         # interface from common.set_focused_widget
-        if widget is None or widget is self.cur_widget: return
-        if widget is self.root.widget:
-            node = self.root
-        else:
-            node = widget.node
+        if editor is None or editor is self.cur_widget or editor.item is None: return
         self.skip_select = True
-        self.SelectItem(node.item)
+        self.SelectItem(editor.item)
+        if not self.IsExpanded(editor.item) and (not hasattr(self, "HasFocus") or not self.HasFocus()):
+            self.Expand(editor.item)
         self.skip_select = False
-        self._set_cur_widget(widget)
+        self._set_cur_widget(editor)
 
     def on_change_selection(self, event):
-        if self.skip_select: return  # triggered by self.SelectItem in self.set_current_widget
+        if self.skip_select:
+            event.Skip()
+            return  # triggered by self.SelectItem in self.set_current_widget
         item = event.GetItem()
-        widget = self._GetItemData(item).widget
-        self._set_cur_widget(widget)
-        misc.set_focused_widget(widget)
-        if not self.IsExpanded(item):
+        editor = self._GetItemData(item)
+        if not editor:  # can happen during build/rebuild_tree
+            event.Skip()
+            return
+        self._set_cur_widget(editor)
+        misc.set_focused_widget(editor)
+        if not self.IsExpanded(item) and (not hasattr(self, "HasFocus") or not self.HasFocus()):
             self.Expand(item)
         self.SetFocus()
 
     def on_left_click(self, event):
         if not common.adding_widget: return event.Skip()
-        node = self._find_node_by_pos( *event.GetPosition() )
-        if not node: return event.Skip()
+        editor = self.find_editor_by_pos( *event.GetPosition() )
+        if not editor: return event.Skip()
 
-        item = node.widget
-        compatible, message = item.check_drop_compatibility()
+        compatible, message = editor.check_drop_compatibility()
         if not compatible:
             event.Skip()
             misc.error_message(message)
             return
 
         common.adding_window = event.GetEventObject().GetTopLevelParent()
-        if isinstance(item, edit_sizers.SizerSlot):
-            item.on_drop_widget(event)
-        elif common.adding_sizer:
-            item.drop_sizer()
+        if editor.IS_SLOT:
+            editor.on_drop_widget(event)
+        elif common.adding_sizer or True:
+            editor.drop_sizer()
         common.adding_window = None
+        self.SetFocus()  # required instead of Skip if widget builder is showing a dialog
 
     def on_left_dclick(self, event):
         x, y = event.GetPosition()
-        node = self._find_node_by_pos(x, y)
-        if not node:
+        editor = self.find_editor_by_pos(x, y)
+        if not editor:
             event.Skip()
             return
-        widget = node.widget
-        if widget.klass=='wxMenuBar':
-            widget.properties["menus"].edit_menus()
-        elif widget.klass=='wxToolBar':
-            widget.properties["tools"].edit_tools()
-        elif node.parent is self.root:
-            self.show_toplevel(None, widget)
+        if editor.WX_CLASS=='wxMenuBar':
+            editor.properties["menus"].edit_menus()
+        elif editor.WX_CLASS=='wxToolBar':
+            editor.properties["tools"].edit_tools()
+        elif editor.IS_TOPLEVEL:
+            self.show_toplevel(None, editor)
         else:
             event.Skip()
 
@@ -851,21 +574,21 @@
     def on_menu(self, event):
         # the first entry in the popup menu, i.e. the name was selected
         if self._popup_menu_widget is None: return
-        if not getattr(self._popup_menu_widget, "_is_toplevel_window", False): return
-        self.show_toplevel( None, self._popup_menu_widget )
+        if self._popup_menu_widget.IS_TOPLEVEL:
+            self.show_toplevel( None, self._popup_menu_widget )
 
     def on_mouse_events(self, event):
         if not self._drag_ongoing and not event.IsButton():
             message = None
             # set cursor to indicate a possible drop
             x,y = event.GetPosition()
-            node = self._find_node_by_pos(x, y, toplevels_only=False)
-            if node is not None:
+            editor = self.find_editor_by_pos(x, y, toplevels_only=False)
+            if editor is not None:
                 if not common.adding_widget:
                     self.SetCursor(wx.STANDARD_CURSOR)
                 else:
                     # check whether the item can be dropped here
-                    compatible, message = node.widget.check_drop_compatibility()
+                    compatible, message = editor.check_drop_compatibility()
                     if compatible:
                         self.SetCursor(wx.CROSS_CURSOR) # a Cursor instance
                     else:
@@ -876,252 +599,65 @@
         event.Skip()
 
     def popup_menu(self, event, pos=None):
-        node = self._find_node_by_pos(*event.GetPosition())
-        if not node: return
-        self.select_item(node)
-        self._popup_menu_widget = node.widget
-        node.widget.popup_menu(event, pos)
+        editor = self.find_editor_by_pos(*event.GetPosition())
+        if not editor: return
+        self.select_item(editor)
+        self._popup_menu_widget = editor
+        editor.popup_menu(event, pos)
         self._popup_menu_widget = None
 
-    def expand(self, node=None, yes=True):
-        "expands or collapses the given node"
-        if node is None: node = self.root
-        if yes: self.Expand(node.item)
-        else: self.Collapse(node.item)
-
-    def set_title(self, value):
-        Tree.set_title(self, value)
-        try:
-            self.GetTopLevelParent().SetTitle(_('wxGlade: %s') % value)
-        except:
-            pass
-
-    def create_widgets(self, node):
-        "Shows the widget of the given node and all its children"
-        node.widget.create()
-        self.expand(node, True)
-        if node.children:
-            for c in node.children:
-                self.create_widgets(c)
-        node.widget.post_load()  # only edit_sizers.SizerBase has this method implemented and calls it for toplevel
-        # XXX also notebook.EditNotebook!
-
-    def _show_widget_toplevel(self, node):
-        # creates/shows the widget of the given toplevel node and all its children
-        if not wx.IsBusy(): wx.BeginBusyCursor()
-        if not node.widget.widget:
-            node.widget.create_widget()
-            node.widget.finish_widget_creation()
-            if not node.widget.__class__.__name__ in ('EditMenuBar', 'EditToolBar'):
-                node.widget.drop_target = clipboard.DropTarget(node.widget)
-                node.widget.widget.SetDropTarget(node.widget.drop_target)
-
-        with node.widget.frozen():
-            if node.children:
-                for c in node.children:
-                    self.create_widgets(c)
-            node.widget.post_load()  # only edit_sizers.SizerBase has this method implemented and calls it for toplevel
-            node.widget.create()
-            if node.widget.widget.TopLevel:
-                node.widget.widget.Show()
-            else:
-                node.widget.widget.GetParent().Show()
-
-            #misc.set_focused_widget(node.widget)
-            node.widget.widget.Raise()
-            # set the best size for the widget (if no one is given)
-            props = node.widget.properties
-            if 'size' in props and not props['size'].is_active():
-                if node.widget.sizer:
-                    node.widget.sizer.fit_parent()
-                elif getattr(node.widget,"top_sizer",None):
-                    wx.Yield()  # by now, there are probably many EVT_SIZE in the queue
-                    node.widget.top_sizer.fit_parent()
-
-        if wx.IsBusy(): wx.EndBusyCursor()
-
-    def show_toplevel(self, event, widget=None):
+    def show_toplevel(self, event, editor=None):
         "Event handler for left double-clicks: if the click is above a toplevel widget and this is hidden, shows it"
-        if widget is None:
+        if editor is None:
             try: x, y = event.GetPosition()
             except AttributeError:
                 # if we are here, event is a CommandEvent and not a MouseEvent
-                node = self._GetItemData(self.GetSelection())
-                self.expand(node)  # if we are here, the widget must be shown
+                editor = self._GetItemData(self.GetSelection())
+                self.ExpandAllChildren(editor.item)  # if we are here, the widget must be shown
             else:
-                node = self._find_node_by_pos(x, y, toplevels_only=True)
-        else:
-            node = widget.node
+                editor = self.find_editor_by_pos(x, y, toplevels_only=True)
 
-        if node is None or node is self.root: return
+        if editor is None or editor.IS_ROOT: return
 
         # the actual toplevel widget may be one level higher, e.g. for a Panel, which is embedded in a Frame
         set_size = None
-        if getattr(node.widget, "_is_toplevel_window", False) or getattr(node.widget, "_is_toplevel", False):
+        if editor.IS_TOPLEVEL:
             # toplevel window or a menu/status bar
-            toplevel_widget = node.widget.widget
-            size_p    = node.widget.properties.get("size")
-            toolbar_p = node.widget.properties.get("toolbar")
-            if size_p is not None and size_p.is_active() and toolbar_p is not None and toolbar_p.value:
+            toplevel_widget = editor.widget
+            if editor.check_prop("size") and editor.check_prop("toolbar") and editor.toolbar:
                 # apply workaround for size changes due to a toolbar; this would cause problems with automatic testing
-                set_size = size_p.get_size()
+                set_size = editor.properties.get("size").get_size()
         else:
-            toplevel_widget = node.widget.widget.GetParent()
+            toplevel_widget = editor.widget.GetParent()
 
-        if not node.widget.is_visible():
+        if not editor.is_visible():
             # added by rlawson to expand node on showing top level widget
-            self.expand(node)
-            self._show_widget_toplevel(node)
+            self.ExpandAllChildren(editor.item)
+            editor.show_widget()
+
             if wx.Platform != '__WXMSW__' and set_size is not None:
-                toplevel_widget = node.widget.widget  # above it was not yet created
+                #  XXX integrate with above or remove above again?
+                toplevel_widget = editor.widget  # above it was not yet created
                 wx.CallAfter(toplevel_widget.SetSize, set_size)
         else:
-            toplevel_widget.GetTopLevelParent().Hide()
-
-            # added by rlawson to collapse only the toplevel node, not collapse back to root node
-            #self.select_item(node)
-            #misc.set_focused_widget(node.widget)
+            editor.hide_widget()
+            #toplevel_widget.GetTopLevelParent().Hide()
             if event: event.Skip()
-        if "design" in node.widget.properties: node.widget.design.update_label()
+        if "design" in editor.properties: editor.design.update_label()
 
-    def _find_node_by_pos(self, x, y, toplevels_only=False):
+    def find_editor_by_pos(self, x, y, toplevels_only=False):
         """Finds the node which is displayed at the given coordinates. Returns None if there's no match.
         If toplevels_only is True, scans only root's children"""
         item, flags = self.HitTest((x, y))
         if item and flags & (wx.TREE_HITTEST_ONITEMLABEL | wx.TREE_HITTEST_ONITEMICON):
-            node = self._GetItemData(item)
-            if not toplevels_only or node.parent is self.root:
-                return node
+            editor = self._GetItemData(item)
+            if not toplevels_only or editor.parent is self.root:
+                return editor
         return None
 
-    def find_widget_by_pos(self, x, y, toplevels_only=False):
-        node = self._find_node_by_pos(x, y, toplevels_only)
-        if node is None: return None
-        # expand node if user remains at position
-        last_pos = getattr(self, "_last_find_widget_pos", None)
-        self._last_find_widget_pos = (x,y)
-        if last_pos and last_pos==(x,y) and not self.IsExpanded(node.item): self.Expand(node.item)
-        return node.widget
-
-    def change_node(self, node, widget, new_node=None):
-        if new_node is not None:
-            # this is a bit of a hack to replace the old widget node with a SlotNode
-            # XXX probably it would be better to modify the Node class to take care of SizerSlot instances
-            parent = new_node.parent = node.parent
-            index = parent.children.index(node)
-            parent.children[index] = new_node
-            new_node.item = node.item
-            self._SetItemData(node.item, new_node)
-            old_children = node.children
-            self.remove(node, delete=False)  # don't delete the node, as we just want to modify it
-            for c in old_children or []:     # but the children
-                self.Delete(c.item)
-            node = new_node
-            self.names.setdefault(Tree._find_toplevel(self, node), {})[str(node.widget.name)] = 1
-        Tree.change_node(self, node, widget)
-        self.SetItemImage(node.item, node.get_image() )
-        self.SetItemText(node.item, self._build_label(node))
-
-    def _append_rec(self, parent, node):
-        # helper for the next method
-        idx = WidgetTree.images.get(node.widget.__class__.__name__, -1)
-        node.item = self.AppendItem( parent.item, self._build_label(node), idx )
-        self._SetItemData(node.item, node)
-        if node.children:
-            for c in node.children:
-                self._append_rec(node, c)
-        self.Expand(node.item)
-
-    def change_node_pos(self, node, new_pos):
-        if new_pos >= self.GetChildrenCount(node.parent.item, False):
-            return
-        index = node.parent.children.index(node)
-        Tree.change_node_pos(self, node, new_pos, index)
-        old_item = node.item
-        image = self.GetItemImage(node.item)
-        self.Freeze()
-        if index >= new_pos:
-            node.item = compat.wx_Tree_InsertItemBefore( self, node.parent.item, new_pos, self._build_label(node), image )
-        else:
-            node.item = compat.wx_Tree_InsertItemBefore( self, node.parent.item, new_pos+1, self._build_label(node), image )
-        self._SetItemData(node.item, node)
-
-        if node.children:
-            for c in node.children:
-                self._append_rec(node, c)
-        self.Expand(node.item)
-        self.Delete(old_item)
-        self.Thaw()
-
-    def get_selected_path(self, w=None):
-        """returns a list of widget names, from the toplevel to the selected one
-        Example: ['frame_1', 'sizer_1', 'panel_1', 'sizer_2', 'button_1']
-                 if button_1 is the currently selected widget"""
-        ret = []
-        if w is None: w = self.cur_widget
-        oldw = None
-        while w is not None:
-            oldw = w
-            if isinstance(w, edit_sizers.SizerSlot):
-                ret.append("SLOT %d"%w.pos)
-            else:
-                ret.append(w.name)
-            sizer = getattr(w, 'sizer', None)
-            if getattr(w, 'parent', "") is None:
-                w = w.parent
-            elif sizer is not None and not sizer.is_virtual():
-                w = sizer
-            else:
-                if isinstance(w, edit_sizers.SizerBase):
-                    w = w.window
-                elif isinstance(w, application.Application):
-                    w = None
-                else:
-                    w = w.parent
-        ret.reverse()
-        # ALB 2007-08-28: remember also the position of the toplevel window in the selected path
-        if oldw is not None and oldw.widget is not None:
-            assert oldw.widget
-            pos = misc.get_toplevel_parent(oldw.widget).GetPosition()
-            ret[0] = (ret[0], pos)
-        return ret
-
-    def get_widget_path(self, w):
-        ret = self.get_selected_path(w)
-        if isinstance(ret[0], tuple):
-            ret[0] = ret[0][0]
-        return tuple(ret)
-    def find_widget_from_path(self, path):
-        pass
-
-    def select_path(self, path):
-        "sets the selected widget from a path_list, which should be in the form returned by get_selected_path"
-        index = 0
-        item, cookie = self._get_first_child(self.GetRootItem())
-        itemok = parent = pos = None
-        while item.IsOk() and index < len(path):
-            widget = self._GetItemData(item).widget
-            name = path[index]
-            if index == 0 and isinstance(name, tuple):
-                name, pos = name
-            if widget.name == name:
-                #self.EnsureVisible(item)
-                itemok = item
-                if parent is None:
-                    parent = self._GetItemData(itemok)
-                self._set_cur_widget(widget)
-                item, cookie = self._get_first_child(item)
-                index += 1
-            else:
-                item = self.GetNextSibling(item)
-        if itemok is not None:
-            node = self._GetItemData(itemok)
-            if parent is not None:
-                self._show_widget_toplevel(parent)
-                common.app_tree.expand(parent)
-                if pos is not None:
-                    misc.get_toplevel_parent(parent.widget).SetPosition(pos)
-            self.select_item(node)
-
-    def _get_first_child(self, item):
-        return self.GetFirstChild(item)
+    def change_item_editor(self, old, new, keep_children=False):
+        # called from edit_sizers.change_sizer
+        self._SetItemData(old.item, new)
+        new.item = old.item
+        old.item = None
+        self.refresh(new)
diff -Nru wxglade-0.9.6/utilities.py wxglade-1.0.1/utilities.py
--- wxglade-0.9.6/utilities.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/utilities.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,21 +1,24 @@
 """
 Utilities, e.g. for debugging
 
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 
 from __future__ import print_function
 
+import sys, os
 import wx
 
 
 def hx(obj):
     return hex(id(obj)).upper()
 
+
 class StructurePrinter:
-    # print the structure and sizes of a window with all it's children
+    # print the structure and sizes of a wx window with all it's children
+    # this is not the wxGlade data structure
     def __init__(self, window):
         self.window(window, 0)
 
@@ -52,11 +55,12 @@
     def window(self, widget, si, indent=0):
         cname = widget.GetClassName() # u'wxPanel'
         name  = widget.GetName() # u'panel'
+        HEX = hx(widget)
         try:
             best_size = widget.GetBestSize()
         except AttributeError:
             best_size ="???"
-        print( "  "*indent, "%s: %s %s"%(cname, name, hx(widget)), widget.GetSize(), best_size, widget.GetEffectiveMinSize() )
+        print( "  "*indent, "%s: %s %s"%(cname, name, HEX), widget.GetSize(), best_size, widget.GetEffectiveMinSize() )
 
         if si: self._sizer_item(si, indent)
 
@@ -77,3 +81,100 @@
         self._sizer_item(si, indent)
         print()
 
+
+class TreePrinter:
+    # print the structure of the TreeCtrl
+    def __init__(self, root):
+        print("=============================================================================")
+        self.prn(root, 0)
+        print("=============================================================================")
+
+    def prn(self, editor, indent=0):
+        all_children = editor.get_all_children()
+        if not all_children: return
+        for child in all_children:
+            klass = "class" in child.PROPERTIES and child.klass or None
+            print( "  "*indent, child.WX_CLASS, klass, getattr(child, "custom_class", "---"), child.IS_TOPLEVEL)
+            self.prn(child, indent+1)
+
+        print()
+
+
+def trace1(func, *args, **kwargs):
+    # use built-in trace module to write an execution trace to stdout
+    # e.g. utilities.trace1(clipboard.paste, focused_widget)
+    import sys, trace
+
+    tracer = trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix],
+                         ignoremods=["gui_mixins", "new_properties", "decorators", "__init__", "clipboard"], 
+                         trace=1, count=0)
+
+    editor = common.root.children[-1]
+    tracer.runfunc(editor.create_widgets)
+
+    # make a report, placing output in the current directory
+    r = tracer.results()
+    if filename:
+        r.write_results_file(path, lines, lnotab, lines_hit, encoding=None)
+    else:
+        r.write_results(show_missing=True, coverdir=".")
+
+
+# own implementation for wxGlade
+TRACING = False
+def trace(filename, func, *args, **kwargs):
+    start_trace(filename)
+    func(*args, **kwargs)
+    stop_trace()
+
+def start_trace():
+    global TRACING
+    if TRACING: return
+    TRACING = True
+    sys.settrace(trace_calls)
+
+def stop_trace():
+    sys.settrace(None)
+    global TRACING
+    TRACING = False
+
+
+_FILES = {}
+def _get_line(filename, line_no):
+    if not filename in _FILES:
+        _FILES[filename] = open(filename, "r").readlines()
+    return _FILES[filename][line_no-1]
+
+
+def trace_lines(frame, event, arg):
+    if event != 'line': return
+    co = frame.f_code
+    func_name = co.co_name
+    line_no = frame.f_lineno
+    filename = co.co_filename
+    if os.path.isfile(filename):
+        print( '  %30s: %5d' % (func_name, line_no), _get_line(filename, line_no), end="" )
+    else:
+        print( '  %30s: %5d' % (func_name, line_no) )
+
+def trace_calls(frame, event, arg):
+    if event != 'call': return
+    co = frame.f_code
+    func_name = co.co_name
+    
+    if func_name in ("__getattr__", "<genexpr>", "<listcomp>"): return
+    
+    if func_name in ("cn",): return
+    #if func_name.startswith("_",): return
+    if func_name in ("wxname2attr",): return
+
+    filename = co.co_filename
+    if filename.startswith(sys.prefix) or filename.startswith(sys.exec_prefix): return
+
+    modulename = filename.split(os.sep)[-1].split(".")[0]
+    if modulename in ("new_properties", "gui_mixins", "decorators", "log", "main", "misc", "compat",): return
+
+    line_no = frame.f_lineno
+    print( ' -> %s:%s %s' % (modulename, line_no, func_name))
+
+    return trace_lines
diff -Nru wxglade-0.9.6/version.py wxglade-1.0.1/version.py
--- wxglade-0.9.6/version.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/version.py	2020-12-31 14:04:48.000000000 +0000
@@ -1 +1 @@
-__version__ = "0.9.6"  # don't forget to update also the wxglade shell script, sphinx/conf.py and wxglade.desktop
\ No newline at end of file
+__version__ = "1.0.1"  # don't forget to update also the wxglade shell script, sphinx/conf.py and wxGlade.desktop
diff -Nru wxglade-0.9.6/wcodegen/dialogs.py wxglade-1.0.1/wcodegen/dialogs.py
--- wxglade-0.9.6/wcodegen/dialogs.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/wcodegen/dialogs.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-"""\
-Dialogs to ask users during widget initialisation triggered by an graphical
-user interaction.
-
-@copyright: 2014-2016 Carsten Grohmann
-@copyright: 2019 Dietmar Schwertberger
-@license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
-"""
-
-import wx
-
-
-class WidgetStyleSelectionDialog(wx.Dialog):
-    "User dialog to select a style during widget creation"
-    def __init__(self, dlg_title, box_label, choices, options=None, defaults=None):
-        """Initialise the dialog and draw the content
-
-        dlg_title: Dialog title
-        box_label: Label of the draw around the listed choices
-        choices: Choices to select one (string list)"""
-        pos = wx.GetMousePosition()
-        wx.Dialog.__init__(self, None, -1, dlg_title, pos)
-
-        szr = wx.BoxSizer(wx.VERTICAL)
-
-        self.box = wx.RadioBox( self, wx.ID_ANY, box_label, wx.DefaultPosition, wx.DefaultSize,choices.split('|'),
-                                1, style=wx.RA_SPECIFY_COLS )
-        self.box.SetSelection(0)
-        szr.Add(self.box, 5, wx.ALL | wx.EXPAND, 10)
-
-        if options:
-            self.options = []
-            for o, option in enumerate(options):
-                cb = wx.CheckBox(self, -1, option)
-                cb.SetValue(defaults and defaults[o])
-                szr.Add(cb, 0, wx.ALL, 10)
-                self.options.append(cb)
-
-        btn = wx.Button(self, wx.ID_OK, _('OK'))
-        btn.SetDefault()
-        szr.Add(btn, 0, wx.BOTTOM | wx.ALIGN_CENTER, 10)
-
-        self.SetAutoLayout(True)
-        self.SetSizer(szr)
-        szr.Fit(self)
-
-    def get_selection(self):
-        "Return the selected choice."
-        return self.box.GetStringSelection()
-
-    def get_options(self):
-        return [o.GetValue() for o in self.options]
\ No newline at end of file
diff -Nru wxglade-0.9.6/wcodegen/__init__.py wxglade-1.0.1/wcodegen/__init__.py
--- wxglade-0.9.6/wcodegen/__init__.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/wcodegen/__init__.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,6 +2,7 @@
 Common code used by all widget code generators
 
 @copyright: 2013-2016 Carsten Grohmann
+@copyright: 2019 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -11,28 +12,37 @@
 import new_properties as np
 
 import copy, logging, os.path
-from .dialogs import *
 from gui_mixins import StylesMixin
 
 
 class BaseCodeWriter(object):
     "Base for all code writer classes"
     def __init__(self):
-        "Initialise only instance variables using there defaults."
-        # initialise instance logger
-        self._logger = logging.getLogger(self.__class__.__name__)
-
-    def __getstate__(self):
-        state = self.__dict__.copy()
-        del state['_logger']
-        return state
+        pass
 
-    def __setstate__(self, state):
-        self.__dict__.update(state)
+    # the following methods will be implemented in derived classes to return the actual code
+    def get_code(self, obj):
+        """Returns initial and final code for non-toplevel objects/classes.
+        final is mainly used for sizers to call SetSizer(sizer_1) at the end"""
+        return [], []
+
+    def get_properties_code(self, obj):
+        """Returns a list of strings with the code to set properties etc.
+        Called on its own only for toplevel classes."""
+        return []
+
+    def get_init_code(self, obj):
+        """Called on its own only for toplevel objects/classes."""
+        return []
 
-        # re-initialise logger instance deleted from __getstate__
-        self._logger = logging.getLogger(self.__class__.__name__)
+    def get_layout_code(self, obj):
+        """Returns code for the final code of toplevel objects (classes)."""
+        return []
 
+    def get_code_per_child(self, obj, child):
+        """Returns code that will be inserted after the child code; e.g. for adding element to a sizer.
+        It's placed before the final code returned from get_code()."""
+        return []
 
 
 class BaseLanguageMixin(StylesMixin):
@@ -145,11 +155,11 @@
 class PerlMixin(BaseLanguageMixin):
     """Perl specific but generic settings and functions
 
-    @cvar _perl_constant_list: Incomplete list of wx constants used in wxPerl
-                               Constants don't follow the Wx::ObjectName name schema.
-                               There is a need to handle constants separately.
-                               See also L{cn} and wxPerl/trunk/Constant.xs.
-    @type _perl_constant_list: list[str]"""
+    _perl_constant_list: Incomplete list of wx constants used in wxPerl
+                         Constants don't follow the Wx::ObjectName name schema.
+                         There is a need to handle constants separately.
+                         See also cn() and wxPerl/trunk/Constant.xs.
+    _perl_constant_list: list[str]"""
     comment_sign = '#'
     default_extensions = ['pl', 'pm']
     language = 'perl'
@@ -266,7 +276,7 @@
     klass: wxWidgets class name or None"""
 
     # List of extra modules to import; this list can be changed on demand.
-    # It'll be reset to the initial value stored in L{__import_modules} within L{_reset_vars()}.
+    # It'll be reset to the initial value stored in __import_modules within _reset_vars().
     # example: import_modules = ['use Wx::Grid;\\n']
     import_modules = [] 
     # Copy of the initial state of import_modules. This copy is used to restore the initial state within _reset_vars().
@@ -290,7 +300,7 @@
 
     # see: generate_code_bitmap(), _prepare_bitmap()
     tmpl_inline_artprovider = '' # to inline a bitmap from wxArtProvider; doesn't end with a newline
-    tmpl_inline_bitmap      = '' # to inline a C{wxBitmap(...)} call; doesn't end with a newline
+    tmpl_inline_bitmap      = '' # to inline a wxBitmap(...) call; doesn't end with a newline
     tmpl_inline_emptybitmap = '' # to create an empty wxBitmap; doesn't end with a newline
 
     tmpl_import_artprovider = '' # to import / include the art provider; see _prepare_bitmap()
@@ -300,12 +310,12 @@
     has_selection  = False  # Flag to create a SetSelection(...) call; see tmpl_selection
     tmpl_selection = ''    # Template to create a SetSelection(...) call; see has_selection
 
-    has_setdefault  = False # Flag to create a C{SetDefault()} call.
-    tmpl_setdefault = ''    # Template to create a C{SetDefault()} call.
+    has_setdefault  = False # Flag to create a SetDefault() call.
+    tmpl_setdefault = ''    # Template to create a SetDefault() call.
 
-    has_setvalue  = False  # Flag to create a C{SetValue(...)} call;     see tmpl_setvalue, has_setvalue1
-    has_setvalue1 = False  # Flag to create a C{SetValue(1)} call;       see tmpl_setvalue, has_setvalue
-    tmpl_setvalue = ''     # Template to create a C{SetValue(...)} call; see has_setvalue, has_setvalue1
+    has_setvalue  = False  # Flag to create a SetValue(...) call;     see tmpl_setvalue, has_setvalue1
+    has_setvalue1 = False  # Flag to create a SetValue(1) call;       see tmpl_setvalue, has_setvalue
+    tmpl_setvalue = ''     # Template to create a SetValue(...) call; see has_setvalue, has_setvalue1
 
     # see default_style:
     prefix_style      = False # Prepend wxDefaultPosition and wxDefaultSize to the widget style if the style will be set
@@ -319,7 +329,7 @@
         # call inherited constructor
         BaseCodeWriter.__init__(self)
         self.config = {}
-        self.klass = klass  # the .base attribute of the widgets, e.g. EditFrame.base='wxFrame'
+        self.klass = klass
 
         # store initial content
         if hasattr(self, 'import_modules'):
@@ -328,8 +338,7 @@
             self.__import_modules = []
 
         # Copy non-style settings (Style settings will be handled in StylesMixin fully)
-        if klass and klass in config.widget_config:
-            self.klass = klass
+        if klass in config.widget_config:
             for item in config.widget_config[self.klass]:
                 if item == 'style_defs':
                     continue
@@ -375,7 +384,7 @@
         else:
             if self.set_default_style:
                 if style and not fmt_style:
-                    self._logger.debug( _('Unsupported attribute %s use default %s instead'), style, self.default_style)
+                    logging.debug( _('Unsupported attribute %s use default %s instead'), style, self.default_style)
                 style = self.tmpl_flags % fmt_default_style
             else:
                 style = ''
@@ -384,21 +393,14 @@
         return style
 
     def _prepare_tmpl_content(self, obj):
-        "Prepare and set template variables; obj is instance of L{xml_parse.CodeObject}; returns dict"
+        "Prepare and set template variables; obj is instance of xml_parse.CodeObject; returns dict"
         self.tmpl_dict['comment'] = self.codegen.comment_sign
         self.tmpl_dict['tab'] = self.codegen.tabs(1)
         self.tmpl_dict['store_as_attr'] = self.codegen.store_as_attr(obj)
         self.tmpl_dict['id_name'], self.tmpl_dict['id_number'] = self.codegen.generate_code_id(obj)
         self.tmpl_dict['id'] = self.tmpl_dict['id_number']
         self.tmpl_dict['obj_name'] = self.codegen._format_name(obj.name)
-
-        klass = obj.klass
-        if klass == obj.base:
-            klass = self.cn(klass)
-        else:
-            klass = self.cn_class(klass)
-        self.tmpl_dict['klass'] = klass
-
+        self.tmpl_dict['klass'] = obj.get_instantiation_class(self.cn, self.cn_class, self.codegen.preview)
         self.tmpl_dict['store_as_attr'] = self.codegen.store_as_attr(obj)
 
         if obj.check_prop('style'): self.tmpl_dict['style'] = self._prepare_style(obj.properties["style"])
@@ -428,23 +430,27 @@
             if not isinstance(p, np.BitmapProperty): continue
             value = p.get_value()
             if value.startswith('art:'): need_artprovider = True
+            self.tmpl_dict[p_name] = self.generate_code_bitmap(value)
             if '%%(%s)s'%p_name in self.tmpl:
                 # constructor argument
-                self.tmpl_dict[p_name] = self.generate_code_bitmap(value)
                 have_constructor_argument = True
             elif value and (not p.min_version or self.codegen.for_version>=p.min_version):
                 # property to be set after construction, e.g.: ...SetBitmapDisabled(disabled_bitmap)
-                self.tmpl_dict[p_name] = self.generate_code_bitmap(value)
                 setname = p_name.replace( "_bitmap", "").capitalize()
                 if compat.IS_CLASSIC and setname=="Pressed":
                     setname = "Selected"  # probably only wx 2.8
                 if setname=="Bitmap": setname = ""
                 # build template, e.g. '%(name)s.SetBitmapDisabled(%(disabled_bitmap)s)\n'
+
                 tmpl = self.tmpl2_bitmap_property%(setname, p_name)
+                if p_name=="bitmap" and obj.check_prop_nodefault("bitmap_dir"):
+                    direction = self.cn( obj.properties["bitmap_dir"].get_string_value() )
+                    tmpl = self.tmpl2_bitmap_property_with_dir%(setname, p_name, direction)
+
                 self.tmpl_props.append(tmpl)
 
         # import artprovider?
-        if need_artprovider:
+        if need_artprovider and self.tmpl_import_artprovider:
             self.import_modules.append(self.tmpl_import_artprovider)
 
         # size
@@ -475,7 +481,7 @@
                 self.tmpl_dict['selection'] = selection_p.get()
                 self.has_selection = True
 
-    def generate_code_bitmap(self, bitmap):
+    def generate_code_bitmap(self, bitmap, required=False):
         """Returns a code fragment that generates an wxBitmap object
 
         bitmap: Bitmap definition string
@@ -483,15 +489,16 @@
         see: tmpl_inline_bitmap, get_inline_stmt_emptybitmap(), get_inline_stmt_artprovider()"""
         assert self.tmpl_inline_bitmap
 
-        if not bitmap:
+        if not bitmap and not required:
             return self.codegen.cn('wxNullBitmap')
+
         preview = self.codegen.preview
 
-        if preview and ( bitmap.startswith('var:') or bitmap.startswith('code:') ):
-            preview_icon = os.path.join(config.icons_path, "icon.xpm")
+        if ( preview and ( bitmap.startswith('var:') or bitmap.startswith('code:') ) ) or (not bitmap and required):
+            preview_icon = os.path.join(config.icons_path, "icon.png")
             return self.tmpl_inline_bitmap % { 'name': self.codegen.cn('wxBitmap'),
                                                'bitmap': self.codegen.quote_path(preview_icon),
-                                               'bitmap_type': self.codegen.cn('wxBITMAP_TYPE_XPM') }
+                                               'bitmap_type': self.codegen.cn('wxBITMAP_TYPE_ANY') }
 
         if bitmap.startswith('var:'):
             return self.tmpl_inline_bitmap % { 'name': self.codegen.cn('wxBitmap'),
@@ -511,9 +518,9 @@
 
     def get_code(self, obj):
         """Generates language specific code for the wxWidget object from a template by filling variables
-        generated by L{_prepare_tmpl_content()}."""
+        generated by _prepare_tmpl_content()."""
         assert self.tmpl or obj.klass in ('spacer','sizerslot')#,'sizeritem')
-        init_lines = []
+        lines = []
         self._reset_vars()
 
         self._prepare_tmpl_content(obj)
@@ -526,51 +533,51 @@
         self._prepare_bitmaps(obj)
 
         if self.tmpl_dict['id_name']:
-            init_lines.append(self.tmpl_dict['id_name'])
+            lines.append(self.tmpl_dict['id_name'])
 
         if self.tmpl_before:
             for line in self.tmpl_before:
-                init_lines.append(line % self.tmpl_dict)
+                lines.append(line % self.tmpl_dict)
 
-        init_lines.append(self.tmpl % self.tmpl_dict)
+        lines.append(self.tmpl % self.tmpl_dict)
 
         if self.tmpl_after:
             for line in self.tmpl_after:
-                init_lines.append(line % self.tmpl_dict)
+                lines.append(line % self.tmpl_dict)
 
-        prop_lines = self.codegen.generate_common_properties(obj)
+        lines.extend( self.codegen.generate_code_common_properties(obj) )
 
         if self.tmpl_props:
             for line in self.tmpl_props:
-                prop_lines.append(line % self.tmpl_dict)
+                lines.append(line % self.tmpl_dict)
 
         if self.has_setvalue1:
             assert self.tmpl_setvalue
             assert not self.has_setvalue
             self.tmpl_dict['value_unquoted'] = '1'
-            prop_lines.append(self.tmpl_setvalue % self.tmpl_dict)
+            lines.append(self.tmpl_setvalue % self.tmpl_dict)
 
         if self.has_setvalue and self.tmpl_dict['value_unquoted']:
             assert self.tmpl_setvalue
             assert not self.has_setvalue1
-            prop_lines.append(self.tmpl_setvalue % self.tmpl_dict)
+            lines.append(self.tmpl_setvalue % self.tmpl_dict)
 
         if self.has_setdefault:
             assert self.tmpl_setdefault
-            prop_lines.append(self.tmpl_setdefault % self.tmpl_dict)
+            lines.append(self.tmpl_setdefault % self.tmpl_dict)
 
         if self.has_selection and self.tmpl_dict['selection']!=-1:
             assert self.tmpl_selection
-            prop_lines.append(self.tmpl_selection % self.tmpl_dict)
+            lines.append(self.tmpl_selection % self.tmpl_dict)
 
         if hasattr(self, "get_more_properties_code"):
-            prop_lines += self.get_more_properties_code(obj)
+            lines += self.get_more_properties_code(obj)
 
-        if not self.tmpl_dict['store_as_attr']:
-            # the object doesn't have to be stored as an attribute of the
-            # custom class, but it is just considered part of the layout
-            return [], [], init_lines + prop_lines
-        return init_lines, prop_lines, []
+        #if not self.tmpl_dict['store_as_attr']:
+            ## the object doesn't have to be stored as an attribute of the
+            ## custom class, but it is just considered part of the layout
+            #return [], init_lines + prop_lines
+        return lines, []
 
     def get_event_handlers(self, obj):
         """Returns a list of event handlers defined for the given object (CodeObject instance).
@@ -588,18 +595,10 @@
         if not events: return ret
 
         if 'events' not in self.config:
-            self._logger.warn( _('Object %(name)s(%(klass)s contains unknown events: %(events)s)'),
+            logging.warn( _('Object %(name)s(%(klass)s contains unknown events: %(events)s)'),
                                {'name':obj.name,'klass': obj.klass, 'events':events})
             return ret
 
-        #win_id = self.codegen.generate_code_id(obj)[1]
-        #if self.use_names_for_binding_events and (win_id == '-1' or win_id == self.codegen.cn('wxID_ANY')):
-            #win_id = self.codegen.add_object_format_name(obj.name)
-        if self.use_names_for_binding_events:
-            win_id = self.codegen.add_object_format_name(obj.name)
-        else:
-            win_id = self.codegen.generate_code_id(obj)[1]
-
         try:
             default_event = self.config['events']['default']['type']
         except KeyError:
@@ -607,9 +606,6 @@
 
         for event, handler in sorted( events ):
             if not handler: continue
-            if event not in self.config['events']:
-                self._logger.warn( _('Ignore unknown event %s for %s'), event, obj.klass )
-                continue
 
             if self.codegen.preview and handler.startswith("lambda "):
                 if self.codegen.language!='python': continue
@@ -628,7 +624,7 @@
             type_generic = 'type_%s' % major
             try:
                 evt_type = self.config['events'][event][type_generic]
-                ret.append((win_id, event, handler, evt_type))
+                ret.append((obj, event, handler, evt_type))
                 continue
             except KeyError:
                 pass
@@ -638,12 +634,14 @@
                 evt_type = self.config['events'][event]['type']
             except KeyError:
                 evt_type = default_event
-            ret.append((win_id, event, handler, evt_type))
+            ret.append((obj, event, handler, evt_type))
         return ret
 
     def get_properties_code(self, obj):
         """Generates language specific code to set properties for the wxWidget object from a template
         by filling variables generated by _prepare_tmpl_content(); returns list of strings; see tmpl_props"""
+        # called only from generate_code_ctor when creating a class constructor to get the first lines
+        # otherwise properties are part of the code returned by get_code
         prop_lines = []
         self._reset_vars()
 
@@ -655,6 +653,7 @@
     def get_layout_code(self, obj):
         """Generates language specific code to create the layout for the wxWidget object from a template
         by filling variables generated by _prepare_tmpl_content(); returns list of strings; see tmpl_props"""
+        # called only from generate_code_ctor when creating a class constructor to get the last lines
         layout_lines = []
         self._reset_vars()
 
@@ -693,7 +692,7 @@
                 raise ValueError
 
         except ValueError:
-            self._logger.warn('Malformed statement to create a bitmap via wxArtProvider(): %s', bitmap)
+            logging.warn('Malformed statement to create a bitmap via wxArtProvider(): %s', bitmap)
 
         stmt = self.tmpl_inline_artprovider % {'art_id': self.codegen.cn(art_id),
                                                'art_client': self.codegen.cn(art_client),
@@ -718,7 +717,7 @@
             size = bitmap[6:]
             width, height = [int(item.strip()) for item in size.split(',', 1)]
         except ValueError:
-            self._logger.warn( 'Malformed statement to create an empty bitmap: %s', bitmap )
+            logging.warn( 'Malformed statement to create an empty bitmap: %s', bitmap )
         stmt = self.tmpl_inline_emptybitmap % { 'width': width, 'height': height }
         return stmt
 
@@ -771,6 +770,7 @@
     tmpl_inline_bitmap      = '%(name)s(%(bitmap)s, %(bitmap_type)s)'
     tmpl_inline_emptybitmap = 'wxBitmap(%(width)s, %(height)s)'
     tmpl2_bitmap_property   = '%%(name)s->SetBitmap%s(%%(%s)s);\n'
+    tmpl2_bitmap_property_with_dir = '%%(name)s->SetBitmap%s(%%(%s)s, %s);\n'
 
     tmpl_selection   = '%(name)s->SetSelection(%(selection)s);\n'
     tmpl_setvalue    = '%(name)s->SetValue(%(value_unquoted)s);\n'
@@ -802,18 +802,20 @@
 
         # Toplevel widgets like wxFrame or wxDialog don't have a parent object.
         # The parent object is optional for MenuBar and ToolBar widgets.
-        if not obj.parent:
+        parent = obj.parent_window
+        if not parent:
             # this breaks the generated code
             self.tmpl_dict['parent'] = 'Do not use the "parent" substitution in code templates for toplevel windows'
-        elif not obj.parent.is_toplevel:
-            self.tmpl_dict['parent'] = '%s' % obj.parent.name
+        elif not parent.IS_CLASS:
+            self.tmpl_dict['parent'] = '%s' % parent.name
         else:
             self.tmpl_dict['parent'] = 'this'
 
         if self.tmpl_dict['store_as_attr']:
             self.tmpl_dict['name'] = self.codegen._format_classattr(obj)
         else:
-            self.tmpl_dict['name'] = '%s* %s' % (obj.klass, obj.name)
+            klass = obj.get_prop_value("class", obj.WX_CLASS)
+            self.tmpl_dict['name'] = '%s* %s' % (klass, obj.name)
 
         if 'id_name' in self.tmpl_dict:
             # An enum with the IDs has been generated in codegen.cpp_codegen.CPPCodeWriter.add_class() already
@@ -822,7 +824,7 @@
         return
 
     def get_code(self, obj):
-        init, props_buf, layout = BaseWidgetWriter.get_code(self, obj)
+        init, post = BaseWidgetWriter.get_code(self, obj)
 
         # default get_code() returns a tuple of three lists (init, properties
         # and layout).
@@ -834,10 +836,10 @@
         else:
             ids = []
 
-        return init, ids, props_buf, layout
+        return init, ids, post
 
     def format_widget_access(self, obj):
-        if obj.is_toplevel:
+        if obj.IS_CLASS:
             return 'this'
         else:
             return '%s' % obj.name
@@ -850,6 +852,7 @@
     tmpl_inline_bitmap      = '(%(name)s_CreateLoad %(bitmap)s %(bitmap_type)s)'
     tmpl_inline_emptybitmap = 'wxBitmap_Create(%(width)s %(height)s)'
     tmpl2_bitmap_property   = '(wxBitmapButton_SetBitmap%s (slot-%%(name)s obj) %%(%s)s)\n'
+    tmpl2_bitmap_property_with_dir = '(wxBitmapButton_SetBitmap%s (slot-%%(name)s obj) %%(%s)s %s)\n'
 
     tmpl_concatenate_choices = ' '
     tmpl_selection   = '(%(klass)s_SetSelection %(name)s %(selection)s)\n'
@@ -863,11 +866,12 @@
 
         # Toplevel widgets like wxFrame or wxDialog don't have a parent object.
         # The parent object is optional for MenuBar and ToolBar widgets.
-        if not obj.parent:
+        parent = obj.parent_window
+        if not parent:
             # this breaks the generated code
             self.tmpl_dict['parent'] = 'Do not use the "parent" substitution in code templates for toplevel windows'
-        elif not obj.parent.is_toplevel:
-            self.tmpl_dict['parent'] = '(slot-%s obj)' % self.codegen._format_name(obj.parent.name)
+        elif not parent.IS_CLASS:
+            self.tmpl_dict['parent'] = '(slot-%s obj)' % self.codegen._format_name(parent.name)
         else:
             self.tmpl_dict['parent'] = '(slot-top-window obj)'
 
@@ -893,6 +897,7 @@
     tmpl_inline_bitmap      = '%(name)s->new(%(bitmap)s, %(bitmap_type)s)'
     tmpl_inline_emptybitmap = 'Wx::Bitmap->new(%(width)s, %(height)s)'
     tmpl2_bitmap_property   = '%%(name)s->SetBitmap%s(%%(%s)s);\n'
+    tmpl2_bitmap_property_with_dir = '%%(name)s->SetBitmap%s(%%(%s)s, %s);\n'
 
     tmpl_selection   = '%(name)s->SetSelection(%(selection)s);\n'
     tmpl_setvalue    = '%(name)s->SetValue(%(value_unquoted)s);\n'
@@ -906,11 +911,12 @@
 
         # Toplevel widgets like wxFrame or wxDialog don't have a parent object.
         # The parent object is optional for MenuBar and ToolBar widgets.
-        if not obj.parent:
+        parent = obj.parent_window
+        if not parent:
             # this breaks the generated code
             self.tmpl_dict['parent'] = 'Do not use the "parent" substitution in code templates for toplevel windows'
-        elif not obj.parent.is_toplevel:
-            self.tmpl_dict['parent'] = '$self->{%s}' % obj.parent.name
+        elif not parent.IS_CLASS:
+            self.tmpl_dict['parent'] = '$self->{%s}' % parent.name
         else:
             self.tmpl_dict['parent'] = '$self'
 
@@ -933,6 +939,7 @@
     else:
         tmpl_inline_emptybitmap = 'wx.Bitmap(%(width)s, %(height)s)'
     tmpl2_bitmap_property = '%%(name)s.SetBitmap%s(%%(%s)s)\n'
+    tmpl2_bitmap_property_with_dir = '%%(name)s.SetBitmap%s(%%(%s)s, dir=%s)\n'
 
     tmpl_flags       = ', style=%s'
     tmpl_selection   = '%(name)s.SetSelection(%(selection)s)\n'
@@ -946,11 +953,12 @@
 
         # Toplevel widgets like wxFrame or wxDialog don't have a parent object.
         # The parent object is optional for MenuBar and ToolBar widgets.
-        if not obj.parent:
+        parent = obj.parent_window
+        if not parent:
             # this breaks the generated code
             self.tmpl_dict['parent'] = 'Do not use the "parent" substitution in code templates for toplevel windows'
-        elif not obj.parent.is_toplevel:
-            self.tmpl_dict['parent'] = 'self.%s' % obj.parent.name
+        elif not parent.IS_CLASS:
+            self.tmpl_dict['parent'] = 'self.%s' % parent.name
         else:
             self.tmpl_dict['parent'] = 'self'
 
diff -Nru wxglade-0.9.6/wcodegen/taghandler.py wxglade-1.0.1/wcodegen/taghandler.py
--- wxglade-0.9.6/wcodegen/taghandler.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/wcodegen/taghandler.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 """\
 Base classes for custom tag handlers.
 
-The custon tag handlers are called within the XML parsers in L{xml_parse}.
+The custon tag handlers are called within the XML parsers in xml_parse.
 
 @copyright: 2016 Carsten Grohmann
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
diff -Nru wxglade-0.9.6/widgets/bitmap_button/bitmap_button.py wxglade-1.0.1/widgets/bitmap_button/bitmap_button.py
--- wxglade-0.9.6/widgets/bitmap_button/bitmap_button.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/bitmap_button/bitmap_button.py	2020-12-31 14:04:48.000000000 +0000
@@ -8,22 +8,22 @@
 
 import wx
 
-import common, config, compat
+import common, misc
 from edit_windows import ManagedBase, EditStylesMixin
 from gui_mixins import BitmapMixin
-from tree import Node
 import new_properties as np
 
 
-class EditBitmapButton(ManagedBase, EditStylesMixin, BitmapMixin):
+class EditBitmapButton(BitmapMixin, ManagedBase, EditStylesMixin):
     "Class to handle wxBitmapButton objects"
 
+    WX_CLASS = "wxBitmapButton"
     _PROPERTIES = ["Widget", "bitmap", "disabled_bitmap", "pressed_bitmap", "current_bitmap", "focus_bitmap",
                    "default", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, bmp_file, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxBitmapButton', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, bmp_file):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
         BitmapMixin.__init__(self)
 
@@ -37,64 +37,41 @@
 
     def create_widget(self):
         bmp = self.get_preview_obj_bitmap()
-        #try:
-        self.widget = wx.BitmapButton(self.parent.widget, self.id, bmp, style=self.style)
-        self.widget._bitmap_size = tuple(bmp.Size)
-        self._set_preview_bitmaps()#include_bitmap=False)
+        self.widget = wx.BitmapButton(self.parent_window.widget, wx.ID_ANY, bmp, style=self.style)
+        self._set_preview_bitmaps()
 
-        #except AttributeError:
-            #self.widget = wx.BitmapButton(self.parent.widget, self.id, bmp)
-
-    def properties_changed(self, modified=None):
+    def _properties_changed(self, modified, actions):
         "update label (and size if label/stockitem have changed)"
-        BitmapMixin._properties_changed(self, modified)
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        BitmapMixin._properties_changed(self, modified, actions)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditBitmapButton objects"
-    name = 'bitmap_button_%s' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'bitmap_button_%s' % number[0]
-    bitmap = wx.FileSelector(_("Select the image for the button"))
+    name = parent.toplevel_parent.get_next_contained_name('bitmap_button_%d')
+    bitmap = misc.RelativeFileSelector("Select the image for the button")
     with parent.frozen():
-        button = EditBitmapButton(name, parent, wx.NewId(), bitmap, sizer, pos)
-        button.properties["style"].set_to_default()
-        button.check_defaults()
-        node = Node(button)
-        button.node = node
-        if parent.widget: button.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditBitmapButton(name, parent, index, bitmap)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditBitmapButton objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    button = EditBitmapButton(label, parent, wx.NewId(), '', sizer, pos)
-    if attrs.input_file_version and attrs.input_file_version<(0,9):
-        # backwards compatibility
-        button.properties["style"].set_to_default()
-    #sizer.set_item(button.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(button)
-    button.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return button
+    editor = EditBitmapButton(name, parent, index, '')
+    #if attrs.input_file_version and attrs.input_file_version<(0,9):
+    if parser.input_file_version and parser.check_input_file_version((0,9)):  # backwards compatibility
+        editor.properties["style"].set_to_default()
+    return editor
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditBitmapButton'] = EditBitmapButton
     common.widgets['EditBitmapButton'] = builder
     common.widgets_from_xml['EditBitmapButton'] = xml_builder
 
-    return common.make_object_button('EditBitmapButton', 'bitmap_button.xpm')
+    return common.make_object_button('EditBitmapButton', 'bitmap_button.png')
diff -Nru wxglade-0.9.6/widgets/button/button.py wxglade-1.0.1/widgets/button/button.py
--- wxglade-0.9.6/widgets/button/button.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/button/button.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,34 +3,39 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
-import config, common, compat
+import common, compat
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 from .button_stockitems import *
 from gui_mixins import BitmapMixin
 
 
-class EditButton(ManagedBase, EditStylesMixin, BitmapMixin):
+class EditButton(BitmapMixin, ManagedBase, EditStylesMixin):
     "Class to handle wxButton objects"
 
+    WX_CLASS = "wxButton"
     STOCKITEMS = sorted( ButtonStockItems.stock_ids.keys())
     _PROPERTIES = ["Widget", "label", "stockitem",
                    "bitmap", "disabled_bitmap", "pressed_bitmap", "current_bitmap", "focus_bitmap",
-                   "default", "style"]
+                   "default", "style", "bitmap_dir"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    _PROPERTY_HELP = {"default":"This sets the button to be the default item for the panel or dialog box.",
-                      "stockitem":"Standard IDs for button identifiers"}
+    _PROPERTY_HELP = {"default":"This sets the button to be the default item for the toplevel window.\n"
+                                "(On Windows this is only supported for Dialogs.)",
+                      "stockitem":"Standard IDs for button identifiers.\n\n"
+                                  "You can edit these in the Tree view as well.\n\n"
+                                  "If stockitem buttons like OK and CANCEL are placed in a StdDialogButtonSizer, "
+                                  "they will be re-ordered according to the platform style guide.",
+                      "bitmap_dir":"If bitmap is set: Position of the bitmap in the button."}
 
-    def __init__(self, name, parent, id, label, sizer, pos):
+    def __init__(self, name, parent, index, label):
         # Initialise parent classes
-        ManagedBase.__init__(self, name, 'wxButton', parent, id, sizer, pos)
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
         BitmapMixin.__init__(self)
 
@@ -45,20 +50,31 @@
         self.current_bitmap  = np.BitmapPropertyD(min_version=(3,0))
         self.focus_bitmap    = np.BitmapPropertyD(min_version=(3,0))
 
+        values = [wx.LEFT, wx.RIGHT, wx.TOP, wx.BOTTOM]
+        aliases = ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
+        p = self.bitmap_dir = np.RadioProperty(wx.LEFT, values, columns=4, aliases=aliases, default_value=wx.LEFT)
+        p.min_version = (3,0)
+        p.blocked = True
+
     def create_widget(self):
         stockitem_p = self.properties["stockitem"]
         if stockitem_p.is_active():
             label = ButtonStockItems.stock_ids[stockitem_p.get()]
         else:
             label = self.label
-        self.widget = wx.Button(self.parent.widget, self.id, label, style=self.style)
-        if compat.IS_PHOENIX:
+        self.widget = wx.Button(self.parent_window.widget, wx.ID_ANY, label, style=self.style)
+        if compat.version[0]>=3 and int(common.root.for_version[0])>2:
             self._set_preview_bitmaps()
+            if self.bitmap_dir!=wx.LEFT:
+                self.widget.SetBitmapPosition(self.bitmap_dir)
 
-    def properties_changed(self, modified=None):
+    def _properties_changed(self, modified, actions):
         "update label (and size if label/stockitem have changed)"
 
-        label_modified = not modified or "label" in modified
+        if "bitmap" in modified:
+            self.properties["bitmap_dir"].set_blocked( not self.check_prop_truth("bitmap") )
+
+        label_modified = not modified or ("label" in modified or "font" in modified)
 
         if not modified or "stockitem" in modified:
             # if stockitem is set, label needs to be deactivated and window id is wxID_...
@@ -69,66 +85,53 @@
                 #self.properties["id"].default_value = new_id  # avoid this value to be written to XML
 
                 l = ButtonStockItems.stock_ids[self.stockitem]
-                if self.widget:
-                    self.widget.SetLabel(l)
+                if self.widget: self.widget.SetLabel(l)
             else:
                 self.properties["label"].set_blocked(False)
-                #self.properties["id"].default_value = "wxID_ANY"
                 label_modified = True
 
-        if label_modified and self.properties["label"].is_active():
-            if self.widget:
-                self.widget.SetLabel(self.label)
+        if modified and "font" in modified and wx.Platform == '__WXGTK__':
+            # on GTK setting a smaller font would fail
+            actions.update(("recreate2","label","sizeevent"))
+            return
+
+        if label_modified and self.properties["label"].is_active() and self.widget:
+            self.widget.SetLabel(self.label)
+            label_modified = True
+
+        if label_modified or (modified and "stockitem" in modified):
+            actions.update(("layout","label","sizeevent"))
 
-        if label_modified or "name" in modified:
-            common.app_tree.refresh(self.node, refresh_label=True)
+        if modified and ("label" in modified or "stockitem" in modified): actions.add("label")
 
-        BitmapMixin._properties_changed(self, modified)
-        self._set_widget_best_size()
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        if "bitmap_dir" in modified and self.widget:
+            self.widget.SetBitmapPosition(self.bitmap_dir)
 
+        BitmapMixin._properties_changed(self, modified, actions)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditButton objects"
-    name = u'button_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = u'button_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('button_%d')
     with parent.frozen():
-        button = EditButton(name, parent, wx.NewId(), name, sizer, pos)
-        button.properties["style"].set_to_default()
-        button.check_defaults()
-        node = Node(button)
-        button.node = node
-        if parent.widget: button.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditButton(name, parent, index, name)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditButton objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    button = EditButton(name, parent, wx.NewId(), '', sizer, pos)
-    #sizer.set_item(button.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(button)
-    button.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return button
+    return EditButton(name, parent, index, '')
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditButton'] = EditButton
     common.widgets['EditButton'] = builder
     common.widgets_from_xml['EditButton'] = xml_builder
 
-    return common.make_object_button('EditButton', 'button.xpm')
+    return common.make_object_button('EditButton', 'button.png')
diff -Nru wxglade-0.9.6/widgets/button/button_stockitems.py wxglade-1.0.1/widgets/button/button_stockitems.py
--- wxglade-0.9.6/widgets/button/button_stockitems.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/button/button_stockitems.py	2020-12-31 14:04:48.000000000 +0000
@@ -52,4 +52,3 @@
         "ZOOM_IN" :             "Zoom &In",
         "ZOOM_OUT" :            "Zoom &Out",
     }
-
diff -Nru wxglade-0.9.6/widgets/button/codegen.py wxglade-1.0.1/widgets/button/codegen.py
--- wxglade-0.9.6/widgets/button/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/button/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,9 +17,8 @@
     def _prepare_tmpl_content(self, obj):
         wcodegen.PythonWidgetCodeWriter._prepare_tmpl_content(self, obj)
 
-        stockitem = obj.stockitem
-        if stockitem:
-            self.tmpl_dict['id_number'] = self.codegen.cn("wxID_" + stockitem)
+        if obj.check_prop_truth("stockitem"):
+            self.tmpl_dict['id_number'] = self.codegen.cn("wxID_" + obj.stockitem)
             self.tmpl_dict['id'] = self.tmpl_dict['id_number']
             self.tmpl_dict['label'] = self.codegen.quote_str('')
 
@@ -35,10 +34,9 @@
     def _prepare_tmpl_content(self, obj):
         wcodegen.CppWidgetCodeWriter._prepare_tmpl_content(self, obj)
 
-        stockitem = obj.stockitem
-        if stockitem:
+        if obj.check_prop_truth("stockitem"):
             self.tmpl_dict['label'] = self.codegen.quote_str('')
-            self.tmpl_dict['id_number'] = self.codegen.cn("wxID_" + stockitem)
+            self.tmpl_dict['id_number'] = self.codegen.cn("wxID_" + obj.stockitem)
             self.tmpl_dict['id'] = self.tmpl_dict['id_number']
 
         self.has_setdefault = obj.default
diff -Nru wxglade-0.9.6/widgets/button/lisp_codegen.py wxglade-1.0.1/widgets/button/lisp_codegen.py
--- wxglade-0.9.6/widgets/button/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/button/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,7 +17,7 @@
     def _prepare_tmpl_content(self, obj):
         wcodegen.LispWidgetCodeWriter._prepare_tmpl_content(self, obj)
 
-        if obj.stockitem:
+        if obj.check_prop_truth("stockitem"):
             self.tmpl_dict['label'] = self.codegen.quote_str('')
             self.tmpl_dict['id_number'] = self.codegen.cn("wxID_" + obj.stockitem)
             self.tmpl_dict['id'] = self.tmpl_dict['id_number']
diff -Nru wxglade-0.9.6/widgets/button/perl_codegen.py wxglade-1.0.1/widgets/button/perl_codegen.py
--- wxglade-0.9.6/widgets/button/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/button/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,10 +18,9 @@
     def _prepare_tmpl_content(self, obj):
         wcodegen.PerlWidgetCodeWriter._prepare_tmpl_content(self, obj)
 
-        stockitem = obj.stockitem
-        if stockitem:
+        if obj.check_prop_truth("stockitem"):
             self.tmpl_dict['label'] = self.codegen.quote_str('')
-            self.tmpl_dict['id_number'] = self.codegen.cn("wxID_" + stockitem)
+            self.tmpl_dict['id_number'] = self.codegen.cn("wxID_" + obj.stockitem)
             self.tmpl_dict['id'] = self.tmpl_dict['id_number']
 
         self.has_setdefault = obj.default
diff -Nru wxglade-0.9.6/widgets/calendar_ctrl/calendar_ctrl.py wxglade-1.0.1/widgets/calendar_ctrl/calendar_ctrl.py
--- wxglade-0.9.6/widgets/calendar_ctrl/calendar_ctrl.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/calendar_ctrl/calendar_ctrl.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,13 +3,12 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import common, compat, config
 import new_properties as np
 import decorators
@@ -25,12 +24,13 @@
 class EditCalendarCtrl(ManagedBase, EditStylesMixin):
     "Class to handle wxCalendarCtrl objects"
 
+    WX_CLASS = "wxCalendarCtrl"
     _PROPERTIES = ["Widget", "default", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, sizer, pos):
+    def __init__(self, name, parent, index):
         # Initialise parent classes
-        ManagedBase.__init__(self, name, 'wxCalendarCtrl', parent, id, sizer, pos)
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -38,7 +38,7 @@
 
     def create_widget(self):
         # TODO add all the other parameters for the CalendarCtrl especially style=self.style and the initial date
-        self.widget = CalendarCtrl(self.parent.widget, self.id, style=self.style)
+        self.widget = CalendarCtrl(self.parent_window.widget, wx.ID_ANY, style=self.style)
 
     # handle compatibility:
     @decorators.memoize
@@ -52,50 +52,30 @@
             attr = getattr(wx.calendar, cn)
         return attr
 
-    def properties_changed(self, modified=None):
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+    def _properties_changed(self, modified, actions):
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditCalendarCtrl objects"
-    label = 'calendar_ctrl_%d' % number[0]
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = 'calendar_ctrl_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('calendar_ctrl_%d')
     with parent.frozen():
-        calendar_ctrl = EditCalendarCtrl(label, parent, wx.NewId(), sizer, pos)
-        calendar_ctrl.properties["style"].set_to_default()
-        calendar_ctrl.check_defaults()
-        node = Node(calendar_ctrl)
-        calendar_ctrl.node = node
-        if parent.widget: calendar_ctrl.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
-
-
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
-    "factory to build EditCalendarCtrl objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    calendar_ctrl = EditCalendarCtrl(label, parent, wx.NewId(), sizer, pos)
-    #sizer.set_item(calendar_ctrl.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(calendar_ctrl)
-    calendar_ctrl.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return calendar_ctrl
+        editor = EditCalendarCtrl(name, parent, index)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
+
+
+def xml_builder(parser, base, name, parent, index):
+    return EditCalendarCtrl(name, parent, index)
 
 
 def initialize():
     "initialization function for the module; returns an icon to be added to the main palette"
+    common.widget_classes['EditCalendarCtrl'] = EditCalendarCtrl
     common.widgets['EditCalendarCtrl'] = builder
     common.widgets_from_xml['EditCalendarCtrl'] = xml_builder
 
-    return common.make_object_button('EditCalendarCtrl', 'calendar_ctrl.xpm')
+    return common.make_object_button('EditCalendarCtrl', 'calendar_ctrl.png')
diff -Nru wxglade-0.9.6/widgets/calendar_ctrl/codegen.py wxglade-1.0.1/widgets/calendar_ctrl/codegen.py
--- wxglade-0.9.6/widgets/calendar_ctrl/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/calendar_ctrl/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/calendar_ctrl/wconfig.py wxglade-1.0.1/widgets/calendar_ctrl/wconfig.py
--- wxglade-0.9.6/widgets/calendar_ctrl/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/calendar_ctrl/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -9,10 +9,12 @@
     'wxklass': 'wxCalendarCtrl',
     'style_defs': {
         'wxCAL_SUNDAY_FIRST': {
-            'desc': _('Show Sunday as the first day in the week')
+            'desc': _('Show Sunday as the first day in the week'),
+            'exclude': 'wxCAL_MONDAY_FIRST'
         },
         'wxCAL_MONDAY_FIRST': {
-            'desc': _('Show Monday as the first day in the week')
+            'desc': _('Show Monday as the first day in the week'),
+            'exclude': 'wxCAL_SUNDAY_FIRST'
         },
         'wxCAL_SHOW_HOLIDAYS': {
             'desc': _('Highlight holidays in the calendar (only generic)')
@@ -21,28 +23,23 @@
             'desc': _('Disable the year changing')
         },
         'wxCAL_NO_MONTH_CHANGE': {
-            'desc': _('Disable the month (and, implicitly, the year) '
-                      'changing')
+            'desc': _('Disable the month (and, implicitly, the year) changing')
         },
         'wxCAL_SHOW_SURROUNDING_WEEKS': {
-            'desc': _('Show the neighbouring weeks in the previous and next '
-                      'months')
+            'desc': _('Show the neighbouring weeks in the previous and next months')
         },
         'wxCAL_SEQUENTIAL_MONTH_SELECTION': {
-            'desc': _('Use alternative, more compact, style for the month '
-                      'and year selection controls.')
+            'desc': _('Use alternative, more compact, style for the month and year selection controls.')
         },
         'wxCAL_SHOW_WEEK_NUMBERS': {
-            'desc': _('Show week numbers on the left side of the calendar. '
-                      '(not in generic)'),
+            'desc': _('Show week numbers on the left side of the calendar. (not in generic)'),
             'supported_by': ('wx3',),
         },
     },
     'default_style': 'wxCAL_SHOW_HOLIDAYS',
     'style_list': ['wxCAL_SUNDAY_FIRST', 'wxCAL_MONDAY_FIRST',
                    'wxCAL_SHOW_HOLIDAYS', 'wxCAL_NO_YEAR_CHANGE',
-                   'wxCAL_NO_MONTH_CHANGE', 'wxCAL_SHOW_SURROUNDING_WEEKS',
-                   'wxCAL_SHOW_WEEK_NUMBERS',
+                   'wxCAL_NO_MONTH_CHANGE', 'wxCAL_SHOW_SURROUNDING_WEEKS', 'wxCAL_SHOW_WEEK_NUMBERS',
                    'wxCAL_SEQUENTIAL_MONTH_SELECTION'],
     'events': {
         'default': {
diff -Nru wxglade-0.9.6/widgets/checkbox/checkbox_base.py wxglade-1.0.1/widgets/checkbox/checkbox_base.py
--- wxglade-0.9.6/widgets/checkbox/checkbox_base.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/checkbox/checkbox_base.py	2020-12-31 14:04:48.000000000 +0000
@@ -7,17 +7,14 @@
 
 
 class CheckBoxMixin(object):
-    """\
-    Generic code to handle wxCheckbox code in all language code generators
-    """
+    "Generic code to handle wxCheckbox code in all language code generators"
 
     def _prepare_checkbox_content(self, obj):
-        """\
+        """
         Prepare template variables for 3-state checkbox
 
-        @param obj: Instance of L{xml_parse.CodeObject}
-        @type obj: xml_parse.CodeObject
-        """
+        obj: Instance of xml_parse.CodeObject
+        obj: xml_parse.CodeObject"""
         checked = obj.checked
         if self.cn_f('wxCHK_3STATE') in self.tmpl_dict['style']:
             checked = self.config['number2state'][checked]
@@ -26,13 +23,8 @@
         else:
             self.has_setvalue1 = checked
 
-    def _get_checkbox_code(self, prop_lines):
-        """\
-        Add code to set the state of a 3-state checkbox to prop_lines.
-
-        @param prop_lines:
-        @type prop_lines: list
-        """
+    def _get_checkbox_code(self):
+        "Returns code to set the state of a 3-state checkbox to prop_lines."
         if self.cn_f('wxCHK_3STATE') in self.tmpl_dict['style']:
-            prop_lines.append(self.tmpl_set3statevalue % self.tmpl_dict)
-        return
+            return [self.tmpl_set3statevalue % self.tmpl_dict]
+        return []
diff -Nru wxglade-0.9.6/widgets/checkbox/checkbox.py wxglade-1.0.1/widgets/checkbox/checkbox.py
--- wxglade-0.9.6/widgets/checkbox/checkbox.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/checkbox/checkbox.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,20 +3,20 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 import common, config
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 
 
 class EditCheckBox(ManagedBase, EditStylesMixin):
     "Class to handle wxCheckBox objects"
 
+    WX_CLASS = "wxCheckBox"
     _PROPERTIES = ["Widget", "label", "checked", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     _PROPERTY_LABELS = {"checked":"wxCheckBox state"}
@@ -24,13 +24,13 @@
     # Convert the position of "checked" RadioProperty to wxCheckBoxState
     index2state = { 0: wx.CHK_UNCHECKED, 1: wx.CHK_CHECKED, 2: wx.CHK_UNDETERMINED }
 
-    def __init__(self, name, parent, id, label, sizer, pos):
+    def __init__(self, name, parent, index, label=""):
         "Class to handle wxCheckBox objects"
-        ManagedBase.__init__(self, name, 'wxCheckBox', parent, id, sizer, pos)
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
-        self.label = np.TextProperty("", multiline="grow")
+        self.label = np.TextProperty(label, multiline="grow")
 
         # value: Checkbox state (0 = unchecked, 1 = checked, 2 = undetermined)
         values = [0,1,2]
@@ -38,16 +38,14 @@
         self.value = np.IntRadioProperty(0, values, labels, columns=3, default_value=0, name="checked") # rename to value?
 
     def create_widget(self):
-        self.widget = wx.CheckBox(self.parent.widget, self.id, self.label)
+        self.widget = wx.CheckBox(self.parent_window.widget, wx.ID_ANY, self.label)
         self.widget.SetValue(self.value)
         def on_checkbox(event):
             value = 1 if event.IsChecked() else 0
             self.properties["checked"].set(value)
-        self.widget.Bind(wx.EVT_CHECKBOX, on_checkbox, id=self.id)
-
-    def properties_changed(self, modified):
-        resize = False
+        self.widget.Bind(wx.EVT_CHECKBOX, on_checkbox, id=self.widget.GetId())
 
+    def _properties_changed(self, modified, actions):
         if not modified or "style" in modified:
             checked_p = self.properties['checked']
             if 'wxCHK_3STATE' in self.properties["style"].value_set:
@@ -57,12 +55,6 @@
                 if checked_p.value == 2:
                     checked_p.set(0)
 
-        if not modified or "label" in modified:
-            if self.widget:
-                self.widget.SetLabel(self.label)
-                resize = True
-            common.app_tree.refresh(self.node, refresh_label=True)
-
         if not modified or "checked" in modified:
             if self.widget:
                 if self.widget.Is3State():
@@ -70,53 +62,43 @@
                 else:
                     self.widget.SetValue(self.value)
 
-        if resize: self._set_widget_best_size()
-
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
-
+        if not modified or "label" in modified:
+            if self.widget:
+                self.widget.SetLabel(self.label)
+            actions.update(("layout","label"))
 
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditCheckBox objects"
-    label = 'checkbox_%d' % number[0]
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = 'checkbox_%d' % number[0]
+    import dialogs, misc
+    name = parent.toplevel_parent.get_next_contained_name('checkbox_%d')
+    dlg = dialogs.WidgetStyleSelectionDialog("CheckBox", None, None, ["?Label"])
+    with misc.disable_stay_on_top(common.adding_window or parent):
+        res = dlg.ShowModal()
+    label, = dlg.get_options()
+    dlg.Destroy()
+    if res != wx.ID_OK: return
+
     with parent.frozen():
-        checkbox = EditCheckBox(label, parent, wx.NewId(), label, sizer, pos)
-        checkbox.properties["style"].set_to_default()
-        checkbox.check_defaults()
-        node = Node(checkbox)
-        checkbox.node = node
-        if parent.widget: checkbox.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditCheckBox(name, parent, index, label)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditCheckBox objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    checkbox = EditCheckBox( label, parent, wx.NewId(), "", sizer, pos)
-    #sizer.set_item(checkbox.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(checkbox)
-    checkbox.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return checkbox
+    return EditCheckBox( name, parent, index, "" )
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
+    common.widget_classes['EditCheckBox'] = EditCheckBox
     common.widgets['EditCheckBox'] = builder
     common.widgets_from_xml['EditCheckBox'] = xml_builder
 
-    return common.make_object_button('EditCheckBox', 'checkbox.xpm')
+    return common.make_object_button('EditCheckBox', 'checkbox.png')
diff -Nru wxglade-0.9.6/widgets/checkbox/codegen.py wxglade-1.0.1/widgets/checkbox/codegen.py
--- wxglade-0.9.6/widgets/checkbox/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/checkbox/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -21,9 +21,9 @@
         self._prepare_checkbox_content(obj)
 
     def get_code(self, obj):
-        init_lines, prop_lines, layout_lines = super(PythonCheckBoxGenerator, self).get_code(obj)
-        self._get_checkbox_code(prop_lines)
-        return init_lines, prop_lines, layout_lines
+        init_lines, final_lines = super(PythonCheckBoxGenerator, self).get_code(obj)
+        init_lines.extend( self._get_checkbox_code() )
+        return init_lines, final_lines
 
 
 
@@ -36,9 +36,9 @@
         self._prepare_checkbox_content(obj)
 
     def get_code(self, obj):
-        init_lines, id_lines, prop_lines, layout_lines = super(CppCheckBoxGenerator, self).get_code(obj)
-        self._get_checkbox_code(prop_lines)
-        return init_lines, id_lines, prop_lines, layout_lines
+        init_lines, id_lines, final_lines = super(CppCheckBoxGenerator, self).get_code(obj)
+        init_lines.extend( self._get_checkbox_code() )
+        return init_lines, id_lines, final_lines
 
 
 def initialize():
diff -Nru wxglade-0.9.6/widgets/checkbox/lisp_codegen.py wxglade-1.0.1/widgets/checkbox/lisp_codegen.py
--- wxglade-0.9.6/widgets/checkbox/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/checkbox/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -21,10 +21,9 @@
         self._prepare_checkbox_content(obj)
 
     def get_code(self, obj):
-        init_lines, prop_lines, layout_lines = \
-            super(LispCheckBoxGenerator, self).get_code(obj)
-        self._get_checkbox_code(prop_lines)
-        return init_lines, prop_lines, layout_lines
+        init_lines, final_lines =super(LispCheckBoxGenerator, self).get_code(obj)
+        init_lines.extend( self._get_checkbox_code() )
+        return init_lines, final_lines
 
 
 def initialize():
diff -Nru wxglade-0.9.6/widgets/checkbox/perl_codegen.py wxglade-1.0.1/widgets/checkbox/perl_codegen.py
--- wxglade-0.9.6/widgets/checkbox/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/checkbox/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -20,9 +20,9 @@
         self._prepare_checkbox_content(obj)
 
     def get_code(self, obj):
-        init_lines, prop_lines, layout_lines = super(PerlCheckBoxGenerator, self).get_code(obj)
-        self._get_checkbox_code(prop_lines)
-        return init_lines, prop_lines, layout_lines
+        init_lines, final_lines = super(PerlCheckBoxGenerator, self).get_code(obj)
+        init_lines.extend( self._get_checkbox_code() )
+        return init_lines, final_lines
 
 
 def initialize():
diff -Nru wxglade-0.9.6/widgets/check_list_box/check_list_box.py wxglade-1.0.1/widgets/check_list_box/check_list_box.py
--- wxglade-0.9.6/widgets/check_list_box/check_list_box.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/check_list_box/check_list_box.py	2020-12-31 14:04:48.000000000 +0000
@@ -4,14 +4,13 @@
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014 Carsten Grohmann
 @copyright: 2015 Franco Bugnano
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 import common
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 from ChoicesProperty import *
 
@@ -19,11 +18,12 @@
 class EditCheckListBox(ManagedBase, EditStylesMixin):
     "Class to handle wxCheckListBox objects"
     # XXX maybe inherit from EditChoice
+    WX_CLASS = "wxCheckListBox"
     _PROPERTIES = ["Widget", "style", "selection", "choices"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, choices, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxCheckListBox', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, choices):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -32,7 +32,7 @@
 
     def create_widget(self):
         choices = [c[0] for c in self.choices]
-        self.widget = wx.CheckListBox(self.parent.widget, self.id, choices=choices)
+        self.widget = wx.CheckListBox(self.parent_window.widget, wx.ID_ANY, choices=choices)
         self.widget.SetSelection(self.selection)
         self.widget.Bind(wx.EVT_LEFT_DOWN, self.on_set_focus)
 
@@ -41,7 +41,7 @@
             return ChoicesHandler(self)
         return ManagedBase.get_property_handler(self, prop_name)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         # self.selection needs to be in range (-1,len(self.choices))
         choices = self.choices
         max_selection = len(choices)-1
@@ -55,8 +55,7 @@
                 # update widget
                 self.widget.Clear()
                 for c in choices: self.widget.Append(c[0])
-                if not self.properties['size'].is_active():
-                    self.sizer.set_item_best_size(self, size=self.widget.GetBestSize())
+                actions.add("layout")
 
         if not modified or "selection" in modified or set_selection:
             if self.selection>max_selection:
@@ -66,50 +65,30 @@
         if self.widget and set_selection:
             self.widget.SetSelection(self.selection)  # -1 is identical to wx.NOT_FOUND
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditCheckListBox objects"
-    name = 'check_list_box_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'check_list_box_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('check_list_box_%d')
     with parent.frozen():
-        check_list_box = EditCheckListBox(name, parent, wx.NewId(), [[u'choice 1'],], sizer, pos)
-        check_list_box.properties["style"].set_to_default()
-        node = Node(check_list_box)
-    ##     sizer.set_item(pos, size=check_list_box.GetBestSize())
-        check_list_box.node = node
-        if parent.widget: check_list_box.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditCheckListBox(name, parent, index, [[u'choice 1']])
+        editor.properties["style"].set_to_default()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditCheckListBox objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    check_list_box = EditCheckListBox(name, parent, wx.NewId(), [], sizer, pos)
-    #sizer.set_item(check_list_box.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(check_list_box)
-    check_list_box.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return check_list_box
+    return EditCheckListBox(name, parent, index, [])
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditCheckListBox'] = EditCheckListBox
     common.widgets['EditCheckListBox'] = builder
     common.widgets_from_xml['EditCheckListBox'] = xml_builder
 
-    return common.make_object_button('EditCheckListBox', 'list_box.xpm')
+    return common.make_object_button('EditCheckListBox', 'list_box.png')
diff -Nru wxglade-0.9.6/widgets/choice/choice.py wxglade-1.0.1/widgets/choice/choice.py
--- wxglade-0.9.6/widgets/choice/choice.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/choice/choice.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,14 +3,13 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 import common, config
 from edit_windows import ManagedBase
-from tree import Node
 import new_properties as np
 
 from ChoicesProperty import *
@@ -19,11 +18,12 @@
 
 class EditChoice(ManagedBase):
     "Class to handle wxChoice objects"
+    WX_CLASS = "wxChoice"
     _PROPERTIES = ["Widget", "selection", "choices"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, choices, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxChoice', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, choices):
+        ManagedBase.__init__(self, name, parent, index)
 
         # initialise instance properties
         self.selection = np.SpinProperty(0, val_range=(-1,len(choices)-1), immediate=True )
@@ -31,7 +31,7 @@
 
     def create_widget(self):
         choices = [c[0] for c in self.choices]
-        self.widget = wx.Choice(self.parent.widget, self.id, choices=choices)
+        self.widget = wx.Choice(self.parent_window.widget, wx.ID_ANY, choices=choices)
         self.widget.SetSelection(self.selection)
         self.widget.Bind(wx.EVT_LEFT_DOWN, self.on_set_focus)
 
@@ -40,7 +40,7 @@
             return ChoicesHandler(self)
         return ManagedBase.get_property_handler(self, prop_name)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         # self.selection needs to be in range (-1,len(self.choices)-1)
         choices = self.choices
         max_selection = len(choices)-1
@@ -53,8 +53,7 @@
                 # update widget
                 self.widget.Clear()
                 for c in choices: self.widget.Append(c[0])
-                if not self.properties['size'].is_active():
-                    self.sizer.set_item_best_size(self, size=self.widget.GetBestSize())
+                actions.add("layout")
 
         if not modified or "selection" in modified or set_selection:
             set_selection = True
@@ -63,50 +62,30 @@
         if self.widget and set_selection and self.widget.GetSelection()!=self.selection:
             self.widget.SetSelection(self.selection)
 
-        ManagedBase.properties_changed(self, modified)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditChoice objects"
-    name = 'choice_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'choice_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('choice_%d')
     with parent.frozen():
-        choice = EditChoice(name, parent, wx.NewId(), [(u'choice 1',)], sizer, pos)
-        choice.check_defaults()
-        node = Node(choice)
-        #sizer.set_item(pos, size=choice.GetBestSize())
-        choice.node = node
-        if parent.widget: choice.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditChoice(name, parent, index, [(u'choice 1',)])
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditChoice objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    choice = EditChoice(name, parent, wx.NewId(), [], sizer, pos)
-    #sizer.set_item(choice.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(choice)
-    choice.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return choice
+    return EditChoice(name, parent, index, [])
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditChoice'] = EditChoice
     common.widgets['EditChoice'] = builder
     common.widgets_from_xml['EditChoice'] = xml_builder
 
-    return common.make_object_button('EditChoice', 'choice.xpm')
+    return common.make_object_button('EditChoice', 'choice.png')
diff -Nru wxglade-0.9.6/widgets/ChoicesProperty.py wxglade-1.0.1/widgets/ChoicesProperty.py
--- wxglade-0.9.6/widgets/ChoicesProperty.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/ChoicesProperty.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -55,8 +55,7 @@
                 self.choices.append([char_data, self.cur_checked])
             self.cur_checked = None
         elif name == 'choices':
-            self.owner.properties['choices'].set(self.choices)
-            self.owner.properties_changed(["choices"])
+            self.owner.properties['choices'].load(self.choices)
             self.choices = []
             return True  # remove the handler
 
diff -Nru wxglade-0.9.6/widgets/combo_box/combo_box.py wxglade-1.0.1/widgets/combo_box/combo_box.py
--- wxglade-0.9.6/widgets/combo_box/combo_box.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/combo_box/combo_box.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -11,7 +11,6 @@
 
 import common, config, compat
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 from ChoicesProperty import *
 
@@ -19,13 +18,14 @@
 class EditComboBox(ManagedBase, EditStylesMixin):
     "Class to handle wxComboBox objects"
 
+    WX_CLASS = "wxComboBox"
     _PROPERTIES = ["Widget", "style", "selection", "choices"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    update_widget_style = False
+    recreate_on_style_change = True
 
-    def __init__(self, name, parent, id, choices, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxComboBox', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, choices):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -35,7 +35,7 @@
     def create_widget(self):
         choices = [c[0] for c in self.choices]
         selection = self.selection
-        self.widget = wx.ComboBox(self.parent.widget, self.id, choices=choices)
+        self.widget = wx.ComboBox(self.parent_window.widget, wx.ID_ANY, choices=choices, style=self.style)
         self.widget.Bind(wx.EVT_SET_FOCUS, self.on_set_focus)
         self.widget.SetSelection(selection)
 
@@ -44,7 +44,7 @@
             return ChoicesHandler(self)
         return ManagedBase.get_property_handler(self, prop_name)
 
-    def properties_changed(self, modified):  # the same code as for EditChoice and EditCheckListBox
+    def _properties_changed(self, modified, actions):  # the same code as for EditChoice and EditCheckListBox
         # self.selection needs to be in range (-1,len(self.choices)-1)
         choices = self.choices
         max_selection = len(choices)-1
@@ -57,8 +57,7 @@
                 # update widget
                 self.widget.Clear()
                 for c in choices: self.widget.Append(c[0])
-                if not self.properties['size'].is_active():
-                    self.sizer.set_item_best_size(self, size=self.widget.GetBestSize())
+                actions.add("layout")
 
         if not modified or "selection" in modified or set_selection:
             set_selection = True
@@ -67,50 +66,30 @@
         if self.widget and set_selection and self.widget.GetSelection()!=self.selection:
             self.widget.SetSelection(self.selection)
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditComboBox objects"
-    name = 'combo_box_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'combo_box_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('combo_box_%d')
     with parent.frozen():
-        combo = EditComboBox(name, parent, wx.NewId(), [], sizer, pos)
-        combo.properties["style"].set_to_default()
-        combo.check_defaults()
-        node = Node(combo)
-    #    sizer.set_item(pos, size=choice.GetBestSize())
-        combo.node = node
-        if parent.widget: combo.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditComboBox(name, parent, index, [])
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditComboBox objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    combo = EditComboBox(name, parent, wx.NewId(), [], sizer, pos)
-    #sizer.set_item(combo.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(combo)
-    combo.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return combo
+    return EditComboBox(name, parent, index, [])
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditComboBox'] = EditComboBox
     common.widgets['EditComboBox'] = builder
     common.widgets_from_xml['EditComboBox'] = xml_builder
 
-    return common.make_object_button('EditComboBox', 'combo_box.xpm')
+    return common.make_object_button('EditComboBox', 'combo_box.png')
diff -Nru wxglade-0.9.6/widgets/custom_widget/codegen.py wxglade-1.0.1/widgets/custom_widget/codegen.py
--- wxglade-0.9.6/widgets/custom_widget/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/custom_widget/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2016 Carsten Grohmann
-@copyright: 2017 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -34,27 +34,23 @@
 class PythonCustomWidgetGenerator(wcodegen.PythonWidgetCodeWriter):
     def get_code(self, widget):
         #if self.codegen.preview and widget.klass not in widget.parser.class_names:
-        if self.codegen.preview and widget.klass not in self.codegen.class_names:
+        if self.codegen.preview:
             # if this CustomWidget refers to another class in the same wxg
             # file, use that for the preview
             return self.get_code_preview(widget)
         prop = widget.properties
         id_name, id = self.codegen.generate_code_id(widget)
-        parent = self.format_widget_access(widget.parent)
+        parent = self.format_widget_access(widget.parent_window)
         init = []
         if id_name: init.append(id_name)
         arguments = format_ctor_arguments( widget.arguments, parent, id, widget.size)
-        cust_ctor = widget.custom_ctor.strip()
-        if cust_ctor:
-            ctor = cust_ctor
-        else:
-            ctor = widget.klass
+        ctor = widget.custom_ctor.strip() or widget.instance_class
         init.append( 'self.%s = %s(%s)\n' % (widget.name, ctor, ", ".join(arguments)) )
-        props_buf = self.codegen.generate_common_properties(widget)
-        return init, props_buf, []
+        init += self.codegen.generate_code_common_properties(widget)
+        return init, []
 
     def get_code_preview(self, widget):
-        parent = self.format_widget_access(widget.parent)
+        parent = self.format_widget_access(widget.parent_window)
         init = []
         append = init.append
         append('self.%s = wx.Window(%s, -1, style=wx.FULL_REPAINT_ON_RESIZE)\n' % (widget.name, parent))
@@ -86,7 +82,7 @@
             append(line + '\n')
         append( 'self.%s.Bind(wx.EVT_PAINT, self_%s_on_paint)\n' % (widget.name, widget.name) )
         append( 'self.%s.Bind(wx.EVT_ERASE_BACKGROUND, lambda event: None)\n' % widget.name )
-        return init, [], []
+        return init, []
 
 
 class CppCustomWidgetGenerator(wcodegen.CppWidgetCodeWriter):
@@ -96,19 +92,14 @@
             ids = [id_name]
         else:
             ids = []
-        if not widget.parent.is_toplevel:
-            parent = '%s' % widget.parent.name
-        else:
-            parent = 'this'
+
+        parent = self.format_widget_access(widget.parent_window)
+
         arguments = format_ctor_arguments( widget.arguments, parent, id, widget.size )
-        cust_ctor = widget.custom_ctor.strip()
-        if cust_ctor:
-            ctor = cust_ctor
-        else:
-            ctor = 'new ' + widget.klass
+        ctor = widget.custom_ctor.strip() or ('new ' + widget.instance_class)
         init = [ '%s = %s(%s);\n' % (widget.name, ctor, ", ".join(arguments)) ]
-        props_buf = self.codegen.generate_common_properties(widget)
-        return init, ids, props_buf, []
+        init += self.codegen.generate_code_common_properties(widget)
+        return init, ids, []
 
 
 
@@ -120,7 +111,7 @@
         def write(self, outfile, ntabs, properties=None):
             if properties is None: properties = {}
             # first, fix the class:
-            self.klass = obj.klass
+            self.subclass = self.klass = obj.instance_class
             # delete the custom constructor property
             properties['custom_ctor'] = None
             # then, the attributes:
diff -Nru wxglade-0.9.6/widgets/custom_widget/custom_widget.py wxglade-1.0.1/widgets/custom_widget/custom_widget.py
--- wxglade-0.9.6/widgets/custom_widget/custom_widget.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/custom_widget/custom_widget.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,13 +3,12 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2017-2019 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 import common, misc
-from tree import Node
 from wcodegen.taghandler import BaseXmlBuilderTagHandler
 import new_properties as np
 from edit_windows import ManagedBase
@@ -40,8 +39,7 @@
 
     def end_elem(self, name):
         if name == 'arguments':
-            self.parent.properties['arguments'].set(self.arguments)
-            self.parent.properties_changed(["arguments"])
+            self.parent.properties['arguments'].load(self.arguments)
             return True
         elif name == 'argument':
             char_data = self.get_char_data()
@@ -56,14 +54,19 @@
     arguments: Constructor arguments
     custom_ctor: if not empty, an arbitrary piece of code that will be used instead of the constructor name"""
 
+    WX_CLASS = "CustomWidget"
     _PROPERTIES = ["Widget", "custom_ctor", "arguments"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
     _PROPERTY_LABELS = { 'custom_constructor':'Custom constructor' }
-    _PROPERTY_HELP   = { 'custom_constructor':'Specify a custom constructor like a factory method' }
-
-    def __init__(self, name, klass, parent, id, sizer, pos):
-        ManagedBase.__init__(self, name, klass, parent, id, sizer, pos)
+    _PROPERTY_HELP   = { 'custom_constructor':'Specify a custom constructor like a factory method',
+                         "instance_class":("The class that should be instantiated, e.g. 'mycontrols.MyCtrl'.\n\n"
+                            "You need to ensure that the class is available.\n"
+                            "Add required import code to 'Extra (import) code for this widget' on the Code tab.")}
+
+    def __init__(self, name, parent, index, instance_class=None):
+        ManagedBase.__init__(self, name, parent, index, instance_class or "wxWindow")
+        self.properties["instance_class"].deactivated = None
 
         # initialise instance properties
         cols      = [('Arguments', np.GridProperty.STRING)]
@@ -71,12 +74,12 @@
         self.custom_ctor = np.TextPropertyD("", name="custom_constructor", strip=True, default_value="")
 
     def create_widget(self):
-        self.widget = wx.Window( self.parent.widget, self.id, style=wx.BORDER_SUNKEN | wx.FULL_REPAINT_ON_RESIZE)
+        self.widget = wx.Window(self.parent_window.widget, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.FULL_REPAINT_ON_RESIZE)
         self.widget.Bind(wx.EVT_PAINT, self.on_paint)
         self.widget.Bind(wx.EVT_ERASE_BACKGROUND, lambda event:None)
 
-    def finish_widget_creation(self):
-        ManagedBase.finish_widget_creation(self, sel_marker_parent=self.widget)
+    def finish_widget_creation(self, level):
+        ManagedBase.finish_widget_creation(self, level, sel_marker_parent=self.widget)
 
     def on_paint(self, event):
         dc = wx.PaintDC(self.widget)
@@ -87,7 +90,7 @@
         w, h = self.widget.GetClientSize()
         dc.DrawLine(0, 0, w, h)
         dc.DrawLine(w, 0, 0, h)
-        text = _('Custom Widget: %s') % self.klass
+        text = _('Custom Widget: %s') % self.instance_class
         tw, th = dc.GetTextExtent(text)
         x = (w - tw)//2
         y = (h - th)//2
@@ -100,11 +103,10 @@
             return ArgumentsHandler(self)
         return ManagedBase.get_property_handler(self, name)
 
-    def properties_changed(self, modified):
-        if not modified or "klass" in modified:
-            if self.widget:
-                self.widget.Refresh()
-        ManagedBase.properties_changed(self, modified)
+    def _properties_changed(self, modified, actions):
+        if modified and "instance_class" in modified:
+            actions.update(("refresh","label"))
+        ManagedBase._properties_changed(self, modified, actions)
 
 
 class Dialog(wx.Dialog):
@@ -112,14 +114,13 @@
     validation_re  = re.compile(r'^[a-zA-Z_\.]+[\w-]*(\[\w*\])*$')  # does not avoid ".."
     def __init__(self):
         title = _('Enter widget class')
-        pos = wx.GetMousePosition()
-        wx.Dialog.__init__(self, None, -1, title, pos)
+        wx.Dialog.__init__(self, None, -1, title, wx.GetMousePosition())
         klass = 'CustomWidget'
 
         self.classname = wx.TextCtrl(self, -1, klass)
         sizer = wx.BoxSizer(wx.VERTICAL)
         hsizer = wx.BoxSizer(wx.HORIZONTAL)
-        hsizer.Add(wx.StaticText(self, -1, _('class')), 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+        hsizer.Add(wx.StaticText(self, -1, _('Instance class')), 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
         hsizer.Add(self.classname, 1, wx.ALIGN_CENTER_VERTICAL|wx.TOP|wx.BOTTOM|wx.RIGHT, 3)
         sizer.Add(hsizer, 0, wx.EXPAND)
 
@@ -146,7 +147,7 @@
         self.OK_button.Enable( OK )
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for CustomWidget objects"
 
     dialog = Dialog()
@@ -156,47 +157,26 @@
     dialog.Destroy()
     if res != wx.ID_OK: return
 
-    name = 'window_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'window_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('window_%d')
     with parent.frozen():
-        win = CustomWidget(name, klass, parent, wx.NewId(), sizer, pos)
-        node = Node(win)
-        win.node = node
-
-        win.properties["arguments"].set( [['$parent'], ['$id']] )  # ,['$width'],['$height']]
-        win.properties["proportion"].set(1)
-        win.properties["flag"].set("wxEXPAND")
-        if parent.widget: win.create()
-
-    common.app_tree.insert(node, sizer.node, pos-1)
-    #sizer.set_item(win.pos, 1, wx.EXPAND)
+        editor = CustomWidget(name, parent, index, klass)
+        editor.properties["arguments"].set( [['$parent'], ['$id']] )  # ,['$width'],['$height']]
+        editor.properties["proportion"].set(1)
+        editor.properties["flag"].set("wxEXPAND")
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build CustomWidget objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if not sizer or not sizeritem:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    klass = attrs.get("class", "CustomWidget")
-    win = CustomWidget(name, klass, parent, wx.NewId(), sizer, pos)
-    #sizer.set_item(win.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(win)
-    win.node = node
-    if pos is None: common.app_tree.add(node, sizer.node)
-    else: common.app_tree.insert(node, sizer.node, pos-1)
-    return win
+    return CustomWidget(name, parent, index)
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
+    common.widget_classes['CustomWidget'] = CustomWidget
     common.widgets['CustomWidget'] = builder
     common.widgets_from_xml['CustomWidget'] = xml_builder
 
-    return common.make_object_button('CustomWidget', 'custom.xpm', tip='Add a custom widget')
+    return common.make_object_button('CustomWidget', 'custom.png', tip='Add a custom widget')
 
diff -Nru wxglade-0.9.6/widgets/custom_widget/lisp_codegen.py wxglade-1.0.1/widgets/custom_widget/lisp_codegen.py
--- wxglade-0.9.6/widgets/custom_widget/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/custom_widget/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,19 +19,18 @@
         init = []
         id_name, id = self.codegen.generate_code_id(widget)
 
-        if not widget.parent.is_toplevel:
-            parent = '(object-%s self)' % self.codegen._format_name(widget.parent.name)
+        if not widget.parent_window.IS_CLASS:
+            parent = '(object-%s self)' % self.codegen._format_name(widget.parent_window.name)
         else:
             parent = 'nil'
 
-        if id_name:
-            init.append(id_name)
+        if id_name: init.append(id_name)
         arguments = format_ctor_arguments( widget.arguments, parent, id, widget.size )
         widget_name = self.codegen._format_name(widget.name)
-        init.append( '(setf %s (%s_Create %s))\n' % (widget_name, widget.klass, " ".join(arguments)) )
-        props_buf = self.codegen.generate_common_properties(widget)
+        init.append( '(setf %s (%s_Create %s))\n' % (widget_name, widget.instance_class, " ".join(arguments)) )
+        init += self.codegen.generate_code_common_properties(widget)
 
-        return init, props_buf, []
+        return init, []
 
 
 def initialize():
diff -Nru wxglade-0.9.6/widgets/custom_widget/perl_codegen.py wxglade-1.0.1/widgets/custom_widget/perl_codegen.py
--- wxglade-0.9.6/widgets/custom_widget/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/custom_widget/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2004 D. H. aka crazyinsomniac on sourceforge
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2017 Dietmar Schwertberger
+@copyright: 2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -17,20 +17,16 @@
     def get_code(self, widget):
         init = []
         id_name, id = self.codegen.generate_code_id(widget)
-        parent = self.format_widget_access(widget.parent)
+        parent = self.format_widget_access(widget.parent_window)
+
+        if id_name: init.append(id_name)
 
-        if id_name:
-            init.append(id_name)
         arguments = format_ctor_arguments(widget.arguments, parent, id, widget.size)
-        cust_ctor = widget.custom_ctor.strip()
-        if cust_ctor:
-            ctor = cust_ctor
-        else:
-            ctor = widget.klass + '->new'
+        ctor = widget.custom_ctor.strip() or (widget.instance_class + '->new')
         init.append( '$self->{%s} = %s(%s);\n' % (widget.name, ctor, ", ".join(arguments)) )
-        props_buf = self.codegen.generate_common_properties(widget)
+        init += self.codegen.generate_code_common_properties(widget)
 
-        return init, props_buf, []
+        return init, []
 
 
 def initialize():
diff -Nru wxglade-0.9.6/widgets/custom_widget/wconfig.py wxglade-1.0.1/widgets/custom_widget/wconfig.py
--- wxglade-0.9.6/widgets/custom_widget/wconfig.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/widgets/custom_widget/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,12 @@
+"""\
+widget configuration to make events editable
+
+@copyright: 2020 Dietmar Schwertberger
+@license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
+"""
+
+config = {
+    'wxklass': "CustomWidget",
+    'style_defs':{},
+    'events': {},
+}
diff -Nru wxglade-0.9.6/widgets/datepicker_ctrl/codegen.py wxglade-1.0.1/widgets/datepicker_ctrl/codegen.py
--- wxglade-0.9.6/widgets/datepicker_ctrl/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/datepicker_ctrl/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/datepicker_ctrl/datepicker_ctrl.py wxglade-1.0.1/widgets/datepicker_ctrl/datepicker_ctrl.py
--- wxglade-0.9.6/widgets/datepicker_ctrl/datepicker_ctrl.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/datepicker_ctrl/datepicker_ctrl.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,13 +3,12 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import common, compat, config
 import decorators
 
@@ -25,17 +24,18 @@
     "Class to handle wxDatePickerCtrl objects"
     # XXX unify with EditCalendarCtrl?
 
+    WX_CLASS = "wxDatePickerCtrl"
     _PROPERTIES = ["Widget", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, sizer, pos):
+    def __init__(self, name, parent, index):
         # Initialise parent classes
-        ManagedBase.__init__(self, name, 'wxDatePickerCtrl', parent, id, sizer, pos)
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
     def create_widget(self):
         # TODO add all the other parameters for the DatePickerCtrl initial date
-        self.widget = DatePickerCtrl(self.parent.widget, self.id, style=self.style)
+        self.widget = DatePickerCtrl(self.parent_window.widget, wx.ID_ANY, style=self.style)
 
     # handle compatibility:
     @decorators.memoize
@@ -44,50 +44,31 @@
         module = wx if compat.IS_CLASSIC else wx.adv
         return getattr(module, cn)
 
-    def properties_changed(self, modified=None):
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+    def _properties_changed(self, modified, actions):
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditDatePickerCtrl objects"
-    label = 'datepicker_ctrl_%d' % number[0]
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = 'datepicker_ctrl_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('datepicker_ctrl_%d')
     with parent.frozen():
-        datepicker_ctrl = EditDatePickerCtrl(label, parent, wx.NewId(), sizer, pos)
-        datepicker_ctrl.properties["style"].set_to_default()
-        datepicker_ctrl.check_defaults()
-        node = Node(datepicker_ctrl)
-        datepicker_ctrl.node = node
-        if parent.widget: datepicker_ctrl.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditDatePickerCtrl(name, parent, index)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditDatePickerCtrl objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    datepicker_ctrl = EditDatePickerCtrl(label, parent, wx.NewId(), sizer, pos)
-    #sizer.set_item(datepicker_ctrl.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(datepicker_ctrl)
-    datepicker_ctrl.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return datepicker_ctrl
+    return EditDatePickerCtrl(name, parent, index)
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditDatePickerCtrl'] = EditDatePickerCtrl
     common.widgets['EditDatePickerCtrl'] = builder
     common.widgets_from_xml['EditDatePickerCtrl'] = xml_builder
 
-    return common.make_object_button('EditDatePickerCtrl', 'datepicker_ctrl.xpm')
+    return common.make_object_button('EditDatePickerCtrl', 'datepicker_ctrl.png')
diff -Nru wxglade-0.9.6/widgets/dialog/codegen.py wxglade-1.0.1/widgets/dialog/codegen.py
--- wxglade-0.9.6/widgets/dialog/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/dialog/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,6 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
+@copyright: 2019-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -17,17 +18,28 @@
     def get_properties_code(self, obj):
         out = []
         if obj.title:
-            out.append('self.SetTitle(%s)\n' % self.codegen.quote_str(obj.title))
+            out.append( 'self.SetTitle(%s)\n' % self.codegen.quote_str(obj.title) )
         if obj.icon:
-            stmt_icon = self.generate_code_bitmap(obj.icon)
-            out.append('_icon = %s\n' % self.cn('wxNullIcon'))
-            out.append('_icon.CopyFromBitmap(%s)\n' % stmt_icon)
-            out.append('self.SetIcon(_icon)\n')
-        out.extend(self.codegen.generate_common_properties(obj))
+            stmt_icon = self.generate_code_bitmap(obj.icon )
+            out.append( '_icon = %s\n' % self.cn('wxNullIcon') )
+            out.append( '_icon.CopyFromBitmap(%s)\n' % stmt_icon )
+            out.append( 'self.SetIcon(_icon)\n' )
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
     def get_layout_code(self, obj):
-        ret = ['self.Layout()\n']
+        ret = []
+
+        # SetAffirmativeId and SetEscapeId, if defined
+        if obj.check_prop_truth("affirmative"):
+            buttons = obj.find_children(obj.affirmative, "wxButton")
+            if buttons: ret.append( "self.SetAffirmativeId(%s.GetId())\n" % self.format_widget_access(buttons[0]) )
+        if obj.check_prop_truth("escape"):
+            buttons = obj.find_children(obj.escape, "wxButton")
+            if buttons: ret.append( "self.SetEscapeId(%s.GetId())\n" % self.format_widget_access(buttons[0]) )
+        if ret: ret.append("\n")
+
+        ret.append('self.Layout()\n')
         if "centered" in obj.properties and obj.centered:
             ret.append('self.Centre()\n')
         return ret
@@ -48,17 +60,28 @@
         Returns a list of strings containing the generated code"""
         out = []
         if obj.title:
-            out.append('SetTitle(%s);\n' % self.codegen.quote_str(obj.title))
+            out.append( 'SetTitle(%s);\n' % self.codegen.quote_str(obj.title) )
         if obj.icon:
             stmt_icon = self.generate_code_bitmap(obj.icon)
-            out.append('wxIcon _icon;\n')
-            out.append('_icon.CopyFromBitmap(%s);\n' % stmt_icon)
-            out.append('SetIcon(_icon);\n')
-        out.extend(self.codegen.generate_common_properties(obj))
+            out.append( 'wxIcon _icon;\n' )
+            out.append( '_icon.CopyFromBitmap(%s);\n' % stmt_icon )
+            out.append( 'SetIcon(_icon);\n' )
+        out.extend( self.codegen.generate_code_common_properties(obj) )
         return out
 
     def get_layout_code(self, obj):
-        ret = ['Layout();\n']
+        ret = []
+
+        # SetAffirmativeId and SetEscapeId, if defined
+        if obj.check_prop_truth("affirmative"):
+            buttons = obj.find_children(obj.affirmative, "wxButton")
+            if buttons: ret.append( "SetAffirmativeId(%s->GetId())\n" % self.format_widget_access(buttons[0]) )
+        if obj.check_prop_truth("escape"):
+            buttons = obj.find_children(obj.escape, "wxButton")
+            if buttons: ret.append( "SetEscapeId(%s->GetId())\n" % self.format_widget_access(buttons[0]) )
+        if ret: ret.append("\n")
+
+        ret.append( 'Layout();\n' )
         if "centered" in obj.properties and obj.centered:
             ret.append('Centre();\n')
         return ret
@@ -79,7 +102,6 @@
 def initialize():
     klass = 'wxDialog'
     common.class_names['EditDialog'] = klass
-    common.toplevels['EditDialog'] = 1
     common.register('python', klass, PythonDialogGenerator(klass))
     common.register('C++', klass, CppDialogGenerator(klass))
     common.register('XRC', klass, xrc_code_generator)
diff -Nru wxglade-0.9.6/widgets/dialog/dialog.py wxglade-1.0.1/widgets/dialog/dialog.py
--- wxglade-0.9.6/widgets/dialog/dialog.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/dialog/dialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -11,27 +11,73 @@
 import wx
 
 import common, compat, config, misc
-from tree import Node
 import new_properties as np
-from edit_windows import TopLevelBase, EditStylesMixin
+from edit_windows import WindowBase, TopLevelBase, EditStylesMixin
 from gui_mixins import BitmapMixin
 
 
-class EditDialog(TopLevelBase, EditStylesMixin, BitmapMixin):
-    _PROPERTIES =["Widget", "title", "icon", "centered", "sizehints","menubar", "toolbar", "statusbar", "style"]
+class AffirmativePropertyD(np.ListBoxPropertyD):
+
+    def track_name(self, old_name=None, new_name=None):
+        # if the current value is removed (new_name=None), it will be remembered and re-used if added again
+        # this is to keep it over a cut/paste or drag/drop
+        if self.value is not None and old_name==self.value:
+            # current button is being edited
+            if new_name is None:
+                # current button has been deleted
+                self.previous_value = old_name
+                self.value = None
+            else:
+                self.value = new_name
+        elif self.value is None and old_name is None and new_name==self.previous_value:
+            buttons = self.owner.find_children(new_name, "wxButton")
+            if buttons:
+                # the previous button has been pasted again
+                self.value = new_name
+            self.previous_value = None
+
+    def create_editor(self, panel, sizer):
+        buttons = self.owner.find_children(None, "wxButton")
+        self.choices = [button.name for button in buttons]
+        if self.deactivated:
+            # deactivated, but stockitems ID_OK or ID_CANCEL are used inside, display these as defaults
+            buttons = [b for b in buttons if b.check_prop_truth("stockitem")]
+            buttons = [b.name for b in buttons if b.stockitem==self.default_value]
+            self.value = buttons[0]  if buttons else  ""
+        super(AffirmativePropertyD, self).create_editor(panel, sizer)
+
+
+class EditDialog(BitmapMixin, TopLevelBase, EditStylesMixin):
+    WX_CLASS = "wxDialog"
+    CHILDREN = -1
+    _PROPERTIES =["Widget", "title", "icon", "centered", "affirmative", "escape",
+                  "sizehints","menubar", "toolbar", "statusbar", "style"]
     PROPERTIES = TopLevelBase.PROPERTIES + _PROPERTIES + TopLevelBase.EXTRA_PROPERTIES
     _PROPERTY_LABELS = { "sizehints":'Set Size Hints'}
-    
-    def __init__(self, name, parent, id, title, style=wx.DEFAULT_DIALOG_STYLE, klass='wxDialog'):
-        TopLevelBase.__init__(self, name, klass, parent, id, title=title)
-        self.base = 'wxDialog'
+    _PROPERTY_HELP = {"size":WindowBase._PROPERTY_HELP["size_sizehints"],
+                      "affirmative":"Inside dialogs by default the OK button is the one which is pressed\n"
+                                    "when the user hits Enter.\n"
+                                    "(The OK button is the button with 'Stockitem' property set to 'OK'.)\n"
+                                    "Select a different button to be used instead.\n"
+                                    "Usually, you need to activate 'Default' for the button as well.\n"
+                                    "See SetAffirmativeId and SetEscapeId in the wx documentation.",
+                      "escape":"Inside dialogs by default the CANCEL button is the one which is pressed\n"
+                               "when the user hits Escape.\n"
+                               "(The CANCEL button is the button with 'Stockitem' property set to 'CANCEL'.)\n"
+                               "Select a different button to be used instead.\n"
+                               "See SetAffirmativeId and SetEscapeId in the wx documentation."}
+
+    def __init__(self, name, parent, klass, title, style=wx.DEFAULT_DIALOG_STYLE):
+        TopLevelBase.__init__(self, name, parent, klass, title)
         EditStylesMixin.__init__(self)
         self.properties["style"].set(style)
 
         # initialise instance properties
-        self.icon      = np.BitmapPropertyD("")
-        self.centered  = np.CheckBoxProperty(False, default_value=False)
-        self.sizehints = np.CheckBoxProperty(False, default_value=False)
+        self.icon        = np.BitmapPropertyD("")
+        self.affirmative = AffirmativePropertyD("", default_value="OK")
+        self.escape      = AffirmativePropertyD("", default_value="CANCEL")
+        self.centered    = np.CheckBoxProperty(False, default_value=False)
+        self.sizehints   = np.CheckBoxProperty(False, default_value=False)
 
     def create_widget(self):
         if self.parent:
@@ -46,12 +92,11 @@
 
         # change 2002-10-09: now we create a wxFrame instead of a wxDialog,
         # because the latter gives troubles I wasn't able to solve when using wxPython 2.3.3.1 :-/
-        self.widget = wx.Frame(parent, self.id, "", style=default_style)
+        self.widget = wx.Frame(parent, wx.ID_ANY, "", style=default_style)
         self.widget.SetBackgroundColour(compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_BTNFACE))
         self._set_widget_icon()
 
-    def finish_widget_creation(self):
-        TopLevelBase.finish_widget_creation(self)
+    def child_widgets_created(self, level):
         if not self.properties['size'].is_active():
             self.widget.SetSize((400, 300))
 
@@ -59,83 +104,96 @@
         if self.icon:
             bitmap = self.get_preview_obj_bitmap(self.icon.strip())
         else:
-            xpm = os.path.join(config.icons_path, 'dialog.xpm')
+            xpm = os.path.join(config.icons_path, 'dialog.png')
             bitmap = misc.get_xpm_bitmap(xpm)
 
         icon = compat.wx_EmptyIcon()
         icon.CopyFromBitmap(bitmap)
         self.widget.SetIcon(icon)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "icon" in modified and self.widget: self._set_widget_icon()
-        TopLevelBase.properties_changed(self, modified)
-        EditStylesMixin.properties_changed(self, modified)
+        TopLevelBase._properties_changed(self, modified, actions)
+        EditStylesMixin._properties_changed(self, modified, actions)
 
+    def track_contained_name(self, old_name=None, new_name=None):
+        TopLevelBase.track_contained_name(self, old_name, new_name)
+        self.properties["affirmative"].track_name( old_name, new_name )
+        self.properties["escape"].track_name( old_name, new_name )
 
 
-def builder(parent, sizer, pos, number=[0]):
+def builder(parent, index, klass=None, base=None, name=None):
     "factory function for EditDialog objects"
-    import window_dialog
-    base_classes = ['wxDialog', 'wxPanel']
-    klass = 'wxDialog' if common.app_tree.app.language.lower()=='xrc' else 'MyDialog'
-
-    dialog = window_dialog.WindowDialog(klass, base_classes, 'Select widget type', True)
-    res = dialog.show()
-    dialog.Destroy()
-    if res is None: return
-    klass, base = res
-    name = 'dialog'  if base == "wxDialog"  else  "panel"
-    name = dialog.get_next_name(name)
+    import window_dialog, edit_base, panel
+    if klass is None or base is None:
+        klass = 'wxDialog' if common.root.language.lower()=='xrc' else 'MyDialog'
+
+        dialog = window_dialog.DialogOrPanelDialog(klass)
+        res = dialog.show()
+        add_sizer = dialog.get_options()[0]
+        button_names, button_types = dialog.get_selected_buttons()
+        dialog.Destroy()
+        if res is None: return
+        klass, base = res
+        name = 'dialog'  if base == "wxDialog"  else  "panel"
+        name = dialog.get_next_name(name)
+        interactive = True
+    else:
+        interactive = False
 
     if base == "wxDialog":
-        is_panel = False
-        dialog = EditDialog(name, parent, wx.NewId(), name, "wxDEFAULT_DIALOG_STYLE", klass=klass)
+        editor = EditDialog(name, parent, klass, name, "wxDEFAULT_DIALOG_STYLE")
+    else:
+        editor = panel.EditTopLevelPanel(name, parent, klass)
+
+    if interactive and add_sizer:
+        # add a default panel and vertical sizer to the frame; optionally add buttons if it's a Dialog
+        import edit_sizers, widgets.button.button
+        slots = 2  if base=="wxDialog" and button_names else  1
+        szr = edit_sizers._builder(editor, 0, slots=slots)
+        if base=="wxDialog":
+            button_szr = edit_sizers._builder(szr, 1, "StdDialogButtonSizer", slots=len(button_names))
+            button_szr.properties["border"].set(4)
+            button_szr.properties["flag"].set("wxALL|wxALIGN_RIGHT")
+            i = 0
+            for button_name, button_type in zip(button_names, button_types):
+                name = "button_%s"%button_name
+                label = "OK" if button_name=="OK" else button_name.capitalize()
+                button = widgets.button.button.EditButton(name, button_szr, i, label)
+                button.properties["stockitem"].set(button_name, activate=True)
+                if button_type=="A":
+                    editor.properties["affirmative"].set(name, activate=True)
+                    button.properties["default"].set(True)
+                if button_type=="C":
+                    editor.properties["escape"].set(name, activate=True)
+                i += 1
     else:
-        is_panel = True
-        import panel
-        dialog = panel.EditTopLevelPanel(name, parent, wx.NewId(), klass=klass)
-    node = Node(dialog)
-    dialog.node = node
-    dialog.create()
+        # just add a slot
+        edit_base.Slot(editor, 0)
+
+    editor.create()
     if base == "wxDialog":
-        dialog.widget.Show()
+        editor.widget.Show()
     else:
-        dialog.widget.GetParent().Show()  # the panel is created as child of a Frame
-    common.app_tree.add(node)
-    dialog.design.update_label()
+        editor.widget.GetParent().Show()  # the panel is created as child of a Frame
+    editor.design.update_label()
     if wx.Platform == '__WXMSW__':
-        if not is_panel:
-            w = dialog.widget
-        else:
-            w = dialog.widget.GetParent()
+        w = editor.widget.GetTopLevelParent()
         w.CenterOnScreen()
         w.Raise()
 
-    import clipboard
-    dialog.drop_target = clipboard.DropTarget(dialog)
-    dialog.widget.SetDropTarget(dialog.drop_target)
+    return editor
 
 
-
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditDialog objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    dialog = EditDialog(label, parent, wx.NewId(), "", style=0)
-    node = Node(dialog)
-    dialog.node = node
-    common.app_tree.add(node)
-    return dialog
+    return EditDialog(name, parent, "Dialog", "", 0)
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
-    cwx = common.widgets_from_xml
-    cwx['EditDialog'] = xml_builder
-
+    common.widget_classes['EditDialog'] = EditDialog
     common.widgets['EditDialog'] = builder
+    common.widgets_from_xml['EditDialog'] = xml_builder
 
-    return common.make_object_button('EditDialog', 'dialog.xpm', 1, tip='Add a Dialog/Panel')
+    return common.make_object_button('EditDialog', 'dialog.png', 1, tip='Add a Dialog/Panel')
diff -Nru wxglade-0.9.6/widgets/dialog/lisp_codegen.py wxglade-1.0.1/widgets/dialog/lisp_codegen.py
--- wxglade-0.9.6/widgets/dialog/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/dialog/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,6 +3,7 @@
 
 @copyright: 2002-2004 D. H. aka crazyinsomniac on sourceforge
 @copyright: 2014-2016 Carsten Grohmann
+@copyright: 2019-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -23,12 +24,26 @@
             out.append( '(wxWindow_SetTitle (slot-%s self) %s)\n' % (obj_name, self.codegen.quote_str(obj.title)) )
         if obj.icon:
             out.append( ';;; generating code for setting icons is not implemented\n' )
-        out.extend(self.codegen.generate_common_properties(obj))
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
     def get_layout_code(self, obj):
+        ret = []
         obj_name = self.codegen._format_name(obj.name)
-        ret = ['(wxWindow_layout (slot-%s self))\n' % obj_name]
+
+        # info about GetId required
+        ## SetAffirmativeId and SetEscapeId, if defined
+        #if obj.check_prop_truth("affirmative"):
+            #buttons = obj.find_children(obj.affirmative, "wxButton")
+            #fmt = "(wxWindow_SetAffirmativeId (slot-%s self) %s->GetId())\n"
+            #if buttons: ret.append( fmt % (obj_name, self.format_widget_access(buttons[0])) )
+        #if obj.check_prop_truth("escape"):
+            #buttons = obj.find_children(obj.escape, "wxButton")
+            #fmt = "(wxWindow_SetEscapeId (slot-%s self) %s->GetId())\n"
+            #if buttons: ret.append( fmt % (obj_name, self.format_widget_access(buttons[0])) )
+        #if ret: ret.append("\n")
+
+        ret.append( '(wxWindow_layout (slot-%s self))\n' % obj_name )
         if obj.centered:
             ret.append( '(wxWindow_Centre (slot-%s self) wxBOTH)\n' % obj_name )
         return ret
@@ -37,5 +52,4 @@
 def initialize():
     klass = 'wxDialog'
     common.class_names['EditDialog'] = klass
-    common.toplevels['EditDialog'] = 1
     common.register('lisp', klass, LispDialogGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/dialog/perl_codegen.py wxglade-1.0.1/widgets/dialog/perl_codegen.py
--- wxglade-0.9.6/widgets/dialog/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/dialog/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -15,7 +15,7 @@
     new_signature = ['$parent', '$id', '$title', '$pos', '$size', '$style', '$name']
 
     def get_code(self, obj):
-        return [], [], []
+        return [], []
 
     def get_properties_code(self, obj):
         out = []
@@ -26,11 +26,22 @@
             out.append('my $icon = &Wx::wxNullIcon;\n')
             out.append('$icon->CopyFromBitmap(%s);\n' % stmt_icon)
             out.append('$self->SetIcon($icon);\n')
-        out.extend(self.codegen.generate_common_properties(obj))
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
     def get_layout_code(self, obj):
-        ret = ['$self->Layout();\n']
+        ret = []
+
+        # SetAffirmativeId and SetEscapeId, if defined
+        if obj.check_prop_truth("affirmative"):
+            buttons = obj.find_children(obj.affirmative, "wxButton")
+            if buttons: ret.append( "$self->SetAffirmativeId(%s->GetId())\n" % self.format_widget_access(buttons[0]) )
+        if obj.check_prop_truth("escape"):
+            buttons = obj.find_children(obj.escape, "wxButton")
+            if buttons: ret.append( "$self->SetEscapeId(%s->GetId())\n" % self.format_widget_access(buttons[0]) )
+        if ret: ret.append("\n")
+
+        ret.append( '$self->Layout();\n' )
         if "centered" in obj.properties and obj.centered:
             ret.append('$self->Centre();\n')
         return ret
@@ -39,5 +50,4 @@
 def initialize():
     klass = 'wxDialog'
     common.class_names['EditDialog'] = klass
-    common.toplevels['EditDialog'] = 1
     common.register('perl', klass, PerlDialogGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/dialog/wconfig.py wxglade-1.0.1/widgets/dialog/wconfig.py
--- wxglade-0.9.6/widgets/dialog/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/dialog/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -46,14 +46,7 @@
                    'wxDIALOG_NO_PARENT',
                    'wxFULL_REPAINT_ON_RESIZE', 'wxCLIP_CHILDREN'],
     'events': {
-        'default': {
-            'type': 'wxCloseEvent',
-            'supported_by': ('wx3',),
-        },
-        'EVT_CLOSE': {},
-        'EVT_INIT_DIALOG': {},
+        'EVT_CLOSE': {'type':'wxCloseEvent'},
+        'EVT_INIT_DIALOG': {'type':'wxInitDialogEvent'},
     },
 }
-
-
-
diff -Nru wxglade-0.9.6/widgets/frame/codegen.py wxglade-1.0.1/widgets/frame/codegen.py
--- wxglade-0.9.6/widgets/frame/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/frame/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2017 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -24,11 +24,22 @@
             out.append('_icon = %s\n' % self.cn('wxNullIcon'))
             out.append('_icon.CopyFromBitmap(%s)\n' % stmt_icon)
             out.append('self.SetIcon(_icon)\n')
-        out.extend(self.codegen.generate_common_properties(obj))
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
     def get_layout_code(self, obj):
-        ret = ['self.Layout()\n']
+        ret = []
+        if not obj.check_prop("size") and obj.children and obj.children[0].WX_CLASS=="wxPanel":
+            panel = obj.children[0]
+            if panel.children and panel.children[0].IS_SIZER:
+                # add e.g. 'sizer.Fit(self)' if frame has no explicit size and the structure is frame->panel->sizer
+                sizer = panel.children[0]
+                tmpl = self.codegen.obj_builders[sizer.WX_CLASS].tmpl_Fit
+                d = {"sizer_name":self.codegen.format_generic_access(sizer),
+                     "parent_widget":self.codegen.format_generic_access(obj)}
+                ret.append( tmpl%d )
+        ret.append( 'self.Layout()\n' )
+
         if "centered" in obj.properties and obj.centered:
             ret.append('self.Centre()\n')
         return ret
@@ -73,7 +84,7 @@
                    ('long', 'style', 'wxDEFAULT_FRAME_STYLE')]
 
     def get_code(self, obj):
-        return [], [], [], []  # the frame can't be a children
+        return [], [], [] # the frame can't be a children
 
     def get_properties_code(self, obj):
         out = []
@@ -84,11 +95,22 @@
             out.append('wxIcon _icon;\n')
             out.append('_icon.CopyFromBitmap(%s);\n' % stmt_icon)
             out.append('SetIcon(_icon);\n')
-        out.extend(self.codegen.generate_common_properties(obj))
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
     def get_layout_code(self, obj):
-        ret = ['Layout();\n']
+        ret = []
+        if not obj.check_prop("size") and obj.children and obj.children[0].WX_CLASS=="wxPanel":
+            panel = obj.children[0]
+            if panel.children and panel.children[0].IS_SIZER:
+                # add e.g. 'sizer.Fit(frame);' if frame has no explicit size and the structure is frame->panel->sizer
+                sizer = panel.children[0]
+                tmpl = self.codegen.obj_builders[sizer.WX_CLASS].tmpl_Fit
+                d = {"sizer_name":self.codegen.format_generic_access(sizer),
+                     "parent_widget":self.codegen.format_generic_access(obj)}
+                ret.append( tmpl%d )
+        ret.append( 'Layout();\n' )
+
         if obj.centered:
             ret.append('Centre();\n')
         return ret
@@ -106,32 +128,23 @@
 
 def initialize():
     klass = 'wxFrame'
-    cn = common.class_names
-    cn['EditFrame'] = klass
-    cn['EditMDIChildFrame'] = 'wxMDIChildFrame'
-    common.toplevels['EditFrame'] = 1
-    common.toplevels['EditMDIChildFrame'] = 1
+    common.class_names['EditFrame'] = klass
+    common.class_names['EditMDIChildFrame'] = 'wxMDIChildFrame'
 
     pygen = common.code_writers.get('python')
     if pygen:
-        awh = pygen.add_widget_handler
+        awh = pygen.register_widget_code_generator
         awh('wxFrame', PythonFrameCodeGenerator(klass))
         awh('wxMDIChildFrame', PythonFrameCodeGenerator(klass))
 
-        aph = pygen.add_property_handler
-        #aph('menubar', pygen.DummyPropertyHandler)
-
     xrcgen = common.code_writers.get('XRC')
     if xrcgen:
-        awh = xrcgen.add_widget_handler
+        awh = xrcgen.register_widget_code_generator
         awh('wxFrame', xrc_frame_code_generator)
         awh('wxMDIChildFrame', xrcgen.NotImplementedXrcObject)
 
     cppgen = common.code_writers.get('C++')
     if cppgen:
-        awh = cppgen.add_widget_handler
+        awh = cppgen.register_widget_code_generator
         awh('wxFrame', CppFrameCodeGenerator(klass))
         awh('wxMDIChildFrame', CppMDIChildFrameCodeGenerator(klass))
-
-        #aph = cppgen.add_property_handler
-        #aph('menubar', cppgen.DummyPropertyHandler)
diff -Nru wxglade-0.9.6/widgets/frame/frame.py wxglade-1.0.1/widgets/frame/frame.py
--- wxglade-0.9.6/widgets/frame/frame.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/frame/frame.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,29 +3,66 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 import os
 import common, config, misc, compat
-from tree import Node
 import new_properties as np
-from edit_windows import TopLevelBase, EditStylesMixin
+from edit_windows import WindowBase, TopLevelBase, EditStylesMixin, Slot
 from gui_mixins import BitmapMixin
 
 
-class EditFrame(TopLevelBase, EditStylesMixin, BitmapMixin):
+
+class BarProperty(np.CheckBoxProperty):
+    # when checkbox is checked, a MenuBar/ToolBar/StatusBar will be created or destroyed
+    def __init__(self, widget_name="MenuBar"):
+        self.widget_name = widget_name
+        self.widget_index = None
+        np.CheckBoxProperty.__init__(self, False, default_value=False)
+
+    def set_owner(self, owner, attributename):
+        # set e.g. owner._menubar to None; "_menubar" is the attribute name / index for storing the bar
+        np.CheckBoxProperty.set_owner(self, owner, attributename)
+        self.widget_index = "_" + attributename
+        setattr(owner, self.widget_index, None)
+
+    def on_value_edited(self, new_value, active=None):
+        # user has clicked the checkbox
+        # the main modification to np.Property.on_value_edited is that it does not store the modification in the history
+        if active is not None: self.deactivated = not active
+
+        # create or remove the bar:
+        if new_value:
+            bar = common.widgets["Edit"+self.widget_name](self.owner, self.widget_index, True)
+        else:
+            bar = getattr(self.owner, self.widget_index).remove()
+        setattr(self.owner, self.widget_index, bar)
+        misc.rebuild_tree(widget=self.owner, recursive=False, focus=True)
+
+        self.set(new_value)
+        self._notify()
+
+
+class EditFrame(BitmapMixin, TopLevelBase, EditStylesMixin):
+    WX_CLASS = "wxFrame"
     _PROPERTIES =["Widget", "title", "icon", "centered", "sizehints","menubar", "toolbar", "statusbar", "style"]
-    PROPERTIES = TopLevelBase.PROPERTIES + _PROPERTIES
-    _PROPERTY_HELP   = { 'icon':'Icon for this window.' }
+    PROPERTIES = TopLevelBase.PROPERTIES + _PROPERTIES + TopLevelBase.EXTRA_PROPERTIES
+    #np.insert_after(PROPERTIES, "class", "custom_base")
+    _PROPERTY_HELP   = { 'icon':'Icon for this window.',
+                         "size":"Specify the size of the frame.\n\n"
+                                "If you don't specify, the Fit() method of the contained sizer will be called\n"
+                                "such that the frame will fit the minimum required size of the contained widgets.\n\n"
+                                "For a frame that's unusual. Usually you set the size and make the contents expand "
+                                "to fill the available space." }
     _PROPERTY_LABELS = { "sizehints":'Set Size Hints', "menubar":'Has MenuBar', "toolbar":'Has ToolBar',
                          "statusbar":'Has StatusBar' }
+    ATT_CHILDREN = ["_menubar", "_statusbar", "_toolbar"]
 
-    def __init__(self, name, parent, id, title, style=wx.DEFAULT_FRAME_STYLE, klass='wxFrame'): #XXX style is not used
-        TopLevelBase.__init__(self, name, klass, parent, id, title=title)
-        self.base = 'wxFrame'
+    def __init__(self, name, parent, klass, title, style=wx.DEFAULT_FRAME_STYLE): #XXX style is not used
+        TopLevelBase.__init__(self, name, parent, klass, title)
         EditStylesMixin.__init__(self)
         self.properties["style"].set(style)
 
@@ -33,194 +70,131 @@
         self.icon      = np.BitmapPropertyD("")
         self.centered  = np.CheckBoxProperty(False, default_value=False)
         self.sizehints = np.CheckBoxProperty(False, default_value=False)
-        self.menubar   = np.CheckBoxProperty(False, default_value=False)
-        self.toolbar   = np.CheckBoxProperty(False, default_value=False)
-        if "statusbar" in self.PROPERTIES:
-            self.statusbar = np.CheckBoxProperty(False, default_value=False)
-            self._statusbar = None
-        else:
-            self.statusbar = None
-        self._menubar = self._toolbar = None  # these properties will hold the EditMenubar instances etc.
+
+        self.menubar   = BarProperty("MenuBar")
+        self.toolbar   = BarProperty("ToolBar")
+        if "statusbar" in self.PROPERTIES:  # not for MDIChildFrame
+            self.statusbar = BarProperty("StatusBar")
 
     def create_widget(self):
-        if self.parent:
-            parent = self.parent.widget
-        else:
-            #parent = common.palette
-            parent = None
+        parent = None
         style = self.style
         if common.pin_design_window: style |= wx.STAY_ON_TOP
-        self.widget = wx.Frame(parent, self.id, self.title, style=style)
+        self.widget = wx.Frame(parent, wx.ID_ANY, self.title, style=style)
         self._set_widget_icon()
 
-    def finish_widget_creation(self):
+    def finish_widget_creation(self, level):
         # add menu, status and tool bar
-        TopLevelBase.finish_widget_creation(self)
+        TopLevelBase.finish_widget_creation(self, level)
         if not self.properties['size'].is_active():
             self.widget.SetSize((400, 300))
         if wx.Platform == '__WXMSW__':
             self.widget.CenterOnScreen()
-        if self.menubar and self._menubar.widget:
-            self.widget.SetMenuBar(self._menubar.widget)
-        if self.statusbar and self._statusbar.widget:
-            self.widget.SetStatusBar(self._statusbar.widget)
-        if self.toolbar and self._toolbar.widget:
-            self.widget.SetToolBar(self._toolbar.widget)
-
-    def remove(self, *args):
-        # remove menu, status and tool bar
-        if self.menubar:
-            self._menubar = self._menubar.remove(gtk_do_nothing=True)
-        if self.statusbar:
-            self._statusbar = self._statusbar.remove(do_nothing=True)
-        if self.toolbar:
-            self._toolbar = self._toolbar.remove(do_nothing=True)
-        TopLevelBase.remove(self, *args)
+        if self.check_prop_truth("menubar")   and self._menubar.widget:   self.widget.SetMenuBar(self._menubar.widget)
+        if self.check_prop_truth("statusbar") and self._statusbar.widget: self.widget.SetStatusBar(self._statusbar.widget)
+        if self.check_prop_truth("toolbar")   and self._toolbar.widget:   self.widget.SetToolBar(self._toolbar.widget)
 
     def _set_widget_icon(self):
         if self.icon:
             bitmap = self.get_preview_obj_bitmap(self.icon.strip())
         else:
-            xpm = os.path.join(config.icons_path, 'frame.xpm')
+            xpm = os.path.join(config.icons_path, 'frame.png')
             bitmap = misc.get_xpm_bitmap(xpm)
 
         icon = compat.wx_EmptyIcon()
         icon.CopyFromBitmap(bitmap)
         self.widget.SetIcon(icon)
 
-    def _set_menu_bar(self):
-        if self.menubar:
-            # create a MenuBar
-            from menubar import EditMenuBar
-            self._menubar = EditMenuBar(self.name + '_menubar', 'wxMenuBar', self)
-            self._menubar.node = Node(self._menubar)
-            common.app_tree.add(self._menubar.node, self.node)
-            if self.widget: self._menubar.create()
-        else:
-            # remove
-            if self._menubar is None: return
-            self._menubar = self._menubar.remove()
-
-    def _set_status_bar(self):
-        if self.statusbar:
-            # create a StatusBar
-            from statusbar import EditStatusBar
-            self._statusbar = EditStatusBar(self.name + '_statusbar', 'wxStatusBar', self)
-            if self.widget: self._statusbar.create()
-        else:
-            # remove
-            if self._statusbar is None: return
-            self._statusbar = self._statusbar.remove()
-        if self.widget:
-            # this is needed at least on win32
-            wx.PostEvent( self.widget, wx.SizeEvent(self.widget.GetSize(), self.widget.GetId()) )
-
-    def _set_tool_bar(self):
-        if self.toolbar:
-            # create a ToolBar
-            from toolbar import EditToolBar
-            self._toolbar = EditToolBar(self.name + '_toolbar', 'wxToolBar', self)
-            self._toolbar.node = Node(self._toolbar)
-            common.app_tree.add(self._toolbar.node, self.node)
-
-            if self.widget: self._toolbar.create()
-        else:
-            # remove
-            if self._toolbar is None: return
-            self._toolbar = self._toolbar.remove()
-
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "icon" in modified and self.widget: self._set_widget_icon()
 
-        if not modified or "menubar" in modified:   self._set_menu_bar()
-        if not modified or "statusbar" in modified: self._set_status_bar()
-        if not modified or "toolbar" in modified:   self._set_tool_bar()
-
-        TopLevelBase.properties_changed(self, modified)
-        EditStylesMixin.properties_changed(self, modified)
+        TopLevelBase._properties_changed(self, modified, actions)
+        EditStylesMixin._properties_changed(self, modified, actions)
 
 
 
 class EditMDIChildFrame(EditFrame):
-    _is_toplevel_window = False  # avoid to appear in the "Top Window" property of the app
+    WX_CLASS = "wxMDIChildFrame"
+    IS_TOPLEVEL_WINDOW = False  # avoid to appear in the "Top Window" property of the app
     PROPERTIES = [p for p in EditFrame.PROPERTIES if p!="statusbar"]
-    #def __init__(self, *args, **kwds):
-        #EditFrame.__init__(self, *args, **kwds)
-        #self.base = 'wxFrame' # XXX is this correct?
+    ATT_CHILDREN = ["_menubar", "_toolbar"]
+    TREE_ICON = "EditFrame"
 
 
+# options for WindowDialog when interactively adding a Frame
+options = ["Add panel and sizer"]
+last_choices = [True]
+_option_help = """\
+On some platforms, I think mainly Windows, the panel is responsible for the navigation through the controls.
+Without the panel you can't use Tab and Shift+Tab to navigate through the controls.
+Also on Windows the background colour of the plain frame will look darker than usual."""
 
-def builder(parent, sizer, pos, klass=None, base=None, name=None):
+if config.debugging:
+    # for testing the error handling
+    options.append("Provoke an error")
+    last_choices.append(False)
+
+
+def builder(parent, index, klass=None, base=None, name=None):
     "factory function for EditFrame objects"
+    global last_choices
     if klass is None or base is None:
         import window_dialog
         base_classes = ['wxFrame', 'wxMDIChildFrame']
-        klass = 'wxFrame' if common.app_tree.app.language.lower()=='xrc' else 'MyFrame'
+        klass = 'wxFrame' if common.root.language.lower()=='xrc' else 'MyFrame'
         
-        dialog = window_dialog.WindowDialog(klass, base_classes, 'Select frame class', True)
+        dialog = window_dialog.WindowDialog(klass, base_classes, 'Select frame class', True, options, last_choices)
+        compat.SetToolTip(dialog.option_controls[0], _option_help)
         res = dialog.show()
         dialog.Destroy()
         if res is None: return None
         klass, base = res
+        last_choices[:] = dialog.get_options()  # remember for next time
+        if config.debugging and last_choices[1]: XXX  # provoke an error
         name = dialog.get_next_name("frame")
+        interactive = True
+    else:
+        interactive = False  # last_choices not to be obeyed
 
     if base == "wxFrame":
         base_class = EditFrame
     else:
         base_class = EditMDIChildFrame
-    frame = base_class(name, parent, wx.NewId(), name, "wxDEFAULT_FRAME_STYLE", klass=klass)
-    frame.properties['size'].set( (400,300), activate=True )
-    node = Node(frame)
-    frame.node = node
-    common.app_tree.add(node)
-    frame.create()
-    frame.widget.Show()
-    frame.design.update_label()
-
-    # add a default vertical sizer to the frame
-    import edit_sizers
-    edit_sizers._builder(frame, None, 0)
-    # now select the frame's node in the tree
-    common.app_tree.select_item(node)
-
-    import clipboard
-    frame.drop_target = clipboard.DropTarget(frame)
-    frame.widget.SetDropTarget(frame.drop_target)
-
-    if wx.Platform == '__WXMSW__':
-        #frame.widget.CenterOnScreen()
-        frame.widget.Raise()
-
-
-def _make_builder(base_class):
-    def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
-        from xml_parse import XmlParsingError
-        try:
-            label = attrs['name']
-        except KeyError:
-            raise XmlParsingError(_("'name' attribute missing"))
-        if attrs.input_file_version and attrs.input_file_version<(0,8):
-            # backwards compatibility
-            style = "wxDEFAULT_FRAME_STYLE"
-        else:
-            style = 0
-        frame = base_class(label, parent, wx.NewId(), "", style)
-        node = Node(frame)
-        frame.node = node
-        common.app_tree.add(node)
-        return frame
-    return xml_builder
+    editor = base_class(name, parent, klass, name, "wxDEFAULT_FRAME_STYLE")
+    editor.properties['size'].set( (400,300), activate=True )
+    editor.design.update_label()
+
+    if interactive and last_choices[0]:
+        # add a default panel and vertical sizer to the frame
+        import edit_sizers, widgets.panel.panel
+        panel_editor = widgets.panel.panel.builder(editor, 0)
+        edit_sizers._builder(panel_editor, 0)
+    else:
+        # just add a slot
+        Slot(editor, 0)
+
+    editor.create()
+
+    return editor
+
+
+_base_classes = {'EditFrame':EditFrame, 'EditMDIChildFrame':EditMDIChildFrame}
+def xml_builder(parser, base, name, parent, index):
+    if parser.input_file_version and parser.check_input_file_version((0,8)):
+        # backwards compatibility
+        style = "wxDEFAULT_FRAME_STYLE"
+    else:
+        style = 0
+    return _base_classes[base](name, parent, "Frame", "", style)
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
-    cwx = common.widgets_from_xml
-    cwx['EditFrame']         = _make_builder(EditFrame)
-    cwx['EditMDIChildFrame'] = _make_builder(EditMDIChildFrame)
-
+    common.widget_classes['EditFrame'] = EditFrame
     common.widgets['EditFrame'] = builder
+    common.widgets_from_xml['EditFrame'] = xml_builder
+
+    common.widget_classes['EditMDIChildFrame'] = EditMDIChildFrame
+    common.widgets_from_xml['EditMDIChildFrame'] = xml_builder
 
-    from tree import WidgetTree
-    import os.path
-    WidgetTree.images['EditMDIChildFrame'] = os.path.join( config.icons_path, 'frame.xpm' )
-    return common.make_object_button('EditFrame', 'frame.xpm', 1)
+    return common.make_object_button('EditFrame', 'frame.png', 1)
diff -Nru wxglade-0.9.6/widgets/frame/lisp_codegen.py wxglade-1.0.1/widgets/frame/lisp_codegen.py
--- wxglade-0.9.6/widgets/frame/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/frame/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -22,11 +22,22 @@
             append( '(wxFrame_SetTitle (slot-top-window obj) %s)\n' % self.codegen.quote_str(obj.title) )
         if obj.icon:
             append( ';;; generating code for setting icons is not implemented\n' )
-        out.extend(self.codegen.generate_common_properties(obj))
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
     def get_layout_code(self, obj):
-        ret = ['(wxFrame_layout (slot-%s self))\n' % self.codegen._format_name(obj.name)]
+        ret = []
+        if not obj.check_prop("size") and obj.children and obj.children[0].WX_CLASS=="wxPanel":
+            panel = obj.children[0]
+            if panel.children and panel.children[0].IS_SIZER:
+                # add e.g. 'sizer.Fit(self)' if frame has no explicit size and the structure is frame->panel->sizer
+                sizer = panel.children[0]
+                tmpl = self.codegen.obj_builders[sizer.WX_CLASS].tmpl_Fit
+                d = {"sizer_name":self.codegen.format_generic_access(sizer),
+                     "parent_widget":self.codegen.format_generic_access(obj)}
+                ret.append( tmpl%d )
+        ret.append( '(wxFrame_layout (slot-%s self))\n' % self.codegen._format_name(obj.name) )
+
         if obj.centered:
             ret.append('(wxFrame_Centre (slot-top-window obj) wxBOTH)\n')
         return ret
@@ -41,14 +52,9 @@
     cn = common.class_names
     cn['EditFrame'] = klass
     cn['EditMDIChildFrame'] = 'wxMDIChildFrame'
-    common.toplevels['EditFrame'] = 1
-    common.toplevels['EditMDIChildFrame'] = 1
 
     lispgen = common.code_writers.get('lisp')
     if lispgen:
-        awh = lispgen.add_widget_handler
+        awh = lispgen.register_widget_code_generator
         awh('wxFrame', LispFrameCodeGenerator(klass))
         awh('wxMDIChildFrame', LispMDIChildFrameCodeGenerator(klass))
-
-        #aph = lispgen.add_property_handler
-        #aph('menubar', lispgen.DummyPropertyHandler)
diff -Nru wxglade-0.9.6/widgets/frame/perl_codegen.py wxglade-1.0.1/widgets/frame/perl_codegen.py
--- wxglade-0.9.6/widgets/frame/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/frame/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -14,7 +14,7 @@
     new_signature = ['$parent', '$id', '$title', '$pos', '$size', '$style', '$name']
 
     def get_code(self, obj):
-        return [], [], [], []  # the frame can't be a children
+        return [], []  # the frame can't be a children
 
     def get_properties_code(self, obj):
         out = []
@@ -26,11 +26,22 @@
             out.append('my $icon = &Wx::wxNullIcon;\n')
             out.append('$icon->CopyFromBitmap(%s);\n' % stmt_icon)
             out.append('$self->SetIcon($icon);\n')
-        out.extend(self.codegen.generate_common_properties(obj))
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
     def get_layout_code(self, obj):
-        ret = ['$self->Layout();\n']
+        ret = []
+        if not obj.check_prop("size") and obj.children and obj.children[0].WX_CLASS=="wxPanel":
+            panel = obj.children[0]
+            if panel.children and panel.children[0].IS_SIZER:
+                # add e.g. 'sizer.Fit(self)' if frame has no explicit size and the structure is frame->panel->sizer
+                sizer = panel.children[0]
+                tmpl = self.codegen.obj_builders[sizer.WX_CLASS].tmpl_Fit
+                d = {"sizer_name":self.codegen.format_generic_access(sizer),
+                     "parent_widget":self.codegen.format_generic_access(obj)}
+                ret.append( tmpl%d )
+        ret.append( '$self->Layout();\n' )
+
         if obj.centered:
             ret.append('$self->Centre();\n')
         return ret
@@ -45,14 +56,9 @@
     cn = common.class_names
     cn['EditFrame'] = klass
     cn['EditMDIChildFrame'] = 'wxMDIChildFrame'
-    common.toplevels['EditFrame'] = 1
-    common.toplevels['EditMDIChildFrame'] = 1
 
     plgen = common.code_writers.get('perl')
     if plgen:
-        awh = plgen.add_widget_handler
+        awh = plgen.register_widget_code_generator
         awh('wxFrame', PerlFrameCodeGenerator(klass))
         awh('wxMDIChildFrame', PerlMDIChildFrameCodeGenerator(klass))
-
-        #aph = plgen.add_property_handler
-        #aph('menubar', plgen.DummyPropertyHandler)
diff -Nru wxglade-0.9.6/widgets/frame/wconfig.py wxglade-1.0.1/widgets/frame/wconfig.py
--- wxglade-0.9.6/widgets/frame/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/frame/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,7 +2,7 @@
 wxFrame widget configuration
 
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -54,5 +54,11 @@
                    'wxFRAME_FLOAT_ON_PARENT', 'wxNO_BORDER',
                    'wxFULL_REPAINT_ON_RESIZE',
                    'wxTAB_TRAVERSAL', 'wxCLIP_CHILDREN'],
+    'events': {
+        'EVT_CLOSE': {'type':'wxCloseEvent'},
+        'EVT_MENU_OPEN': {'type':'MenuEvent'},
+        'EVT_MENU_CLOSE': {'type':'MenuEvent'},
+        'EVT_MENU_HIGHLIGHT': {'type':'MenuEvent'},
+        'EVT_MENU_HIGHLIGHT_ALL': {'type':'MenuEvent'},
+    },
 }
-
diff -Nru wxglade-0.9.6/widgets/gauge/gauge.py wxglade-1.0.1/widgets/gauge/gauge.py
--- wxglade-0.9.6/widgets/gauge/gauge.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/gauge/gauge.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,27 +2,26 @@
 wxGauge objects
 
 @copyright: 2002-2007 Alberto Griggio
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
-import common, misc
-import wcodegen
+import common
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 
 
 class EditGauge(ManagedBase, EditStylesMixin):
     "Class to handle wxGauge objects"
 
+    WX_CLASS = "wxGauge"
     _PROPERTIES = ["Widget", "range", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     recreate_on_style_change = True
 
-    def __init__(self, name, parent, id, style, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxGauge', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, style):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
         if style: self.properties["style"].set(style)
 
@@ -30,71 +29,42 @@
         self.range = np.SpinProperty(10, val_range=(0,10000000), immediate=True)
 
     def create_widget(self):
-        self.widget = wx.Gauge(self.parent.widget, self.id, self.range, style=self.style)
+        self.widget = wx.Gauge(self.parent_window.widget, wx.ID_ANY, self.range, style=self.style)
         if self.range>=3: self.widget.SetValue(self.range//3)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "range" in modified and self.widget:
             self.widget.SetRange(self.range)
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
-editor_class = EditGauge
-editor_icon = 'gauge.xpm'
-editor_name = 'EditGauge'
-editor_style = ''
 
-dlg_title = _('wxGauge')
-box_title = _('Orientation')
-choices = 'wxGA_HORIZONTAL|wxGA_VERTICAL'
-tmpl_label = 'gauge'
-
-
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "Factory function for editor objects from GUI"
-    dialog = wcodegen.WidgetStyleSelectionDialog( dlg_title, box_title, choices)
+    import dialogs, misc
+    dialog = dialogs.WidgetStyleSelectionDialog( _('wxGauge'), _('Orientation'), 'wxGA_HORIZONTAL|wxGA_VERTICAL')
     with misc.disable_stay_on_top(common.adding_window or parent):
         res = dialog.ShowModal()
     style = dialog.get_selection()
     dialog.Destroy()
-    if res != wx.ID_OK:
-        return
+    if res != wx.ID_OK: return
 
-    label = '%s_%d' % (tmpl_label, number[0])
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = '%s_%d' % (tmpl_label, number[0])
+    name = parent.toplevel_parent.get_next_contained_name('gauge_%d')
     with parent.frozen():
-        widget = editor_class(label, parent, wx.ID_ANY, style, sizer, pos)
-        node = Node(widget)
-        widget.node = node
-        widget.properties["flag"].set("wxEXPAND")
-        if parent.widget: widget.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditGauge(name, parent, index, style)
+        editor.properties["flag"].set("wxEXPAND")
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "Factory to build editor objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    widget = editor_class(name, parent, wx.ID_ANY, editor_style, sizer, pos)
-    #sizer.set_item(widget.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(widget)
-    widget.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return widget
+    return EditGauge(name, parent, index, '')
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
-    common.widgets[editor_name] = builder
-    common.widgets_from_xml[editor_name] = xml_builder
-    return common.make_object_button(editor_name, editor_icon)
+    common.widget_classes['EditGauge'] = EditGauge
+    common.widgets['EditGauge'] = builder
+    common.widgets_from_xml['EditGauge'] = xml_builder
+    return common.make_object_button('EditGauge', 'gauge.png')
diff -Nru wxglade-0.9.6/widgets/generic_calendar_ctrl/generic_calendar_ctrl.py wxglade-1.0.1/widgets/generic_calendar_ctrl/generic_calendar_ctrl.py
--- wxglade-0.9.6/widgets/generic_calendar_ctrl/generic_calendar_ctrl.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/generic_calendar_ctrl/generic_calendar_ctrl.py	2020-12-31 14:04:48.000000000 +0000
@@ -4,13 +4,12 @@
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014 Carsten Grohmann
 @copyright: 2015 Franco Bugnano
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import common, compat, config
 import new_properties as np
 import decorators
@@ -25,12 +24,13 @@
     "Class to handle wxGenericCalendarCtrl objects"
     # XXX unify with EditCalendarCtrl?
 
+    WX_CLASS = "wxGenericCalendarCtrl"
     _PROPERTIES = ["Widget", "default", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, sizer, pos):
+    def __init__(self, name, parent, index):
         # Initialise parent classes
-        ManagedBase.__init__(self, name, 'wxGenericCalendarCtrl', parent, id, sizer, pos)
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -38,7 +38,7 @@
 
     def create_widget(self):
         # TODO add all the other parameters for the GenericCalendarCtrl especially style=self.style and the initial date
-        self.widget = GenericCalendarCtrl(self.parent.widget, self.id, style=self.style)
+        self.widget = GenericCalendarCtrl(self.parent_window.widget, wx.ID_ANY, style=self.style)
 
     # handle compatibility:
     @decorators.memoize
@@ -52,50 +52,31 @@
             attr = getattr(wx, cn)
         return attr
 
-    def properties_changed(self, modified=None):
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+    def _properties_changed(self, modified, actions):
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditGenericCalendarCtrl objects"
-    label = 'generic_calendar_ctrl_%d' % number[0]
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = 'generic_calendar_ctrl_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('generic_calendar_ctrl_%d')
     with parent.frozen():
-        calendar_ctrl = EditGenericCalendarCtrl(label, parent, wx.NewId(), sizer, pos)
-        calendar_ctrl.properties["style"].set_to_default()
-        calendar_ctrl.check_defaults()
-        node = Node(calendar_ctrl)
-        calendar_ctrl.node = node
-        if parent.widget: calendar_ctrl.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditGenericCalendarCtrl(name, parent, index)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditGenericCalendarCtrl objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    calendar_ctrl = EditGenericCalendarCtrl(label, parent, wx.NewId(), sizer, pos)
-    #sizer.set_item(calendar_ctrl.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(calendar_ctrl)
-    calendar_ctrl.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return calendar_ctrl
+    return EditGenericCalendarCtrl(name, parent, index)
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditGenericCalendarCtrl'] = EditGenericCalendarCtrl
     common.widgets['EditGenericCalendarCtrl'] = builder
     common.widgets_from_xml['EditGenericCalendarCtrl'] = xml_builder
 
-    return common.make_object_button('EditGenericCalendarCtrl', 'calendar_ctrl.xpm')
+    return common.make_object_button('EditGenericCalendarCtrl', 'calendar_ctrl.png')
diff -Nru wxglade-0.9.6/widgets/generic_calendar_ctrl/wconfig.py wxglade-1.0.1/widgets/generic_calendar_ctrl/wconfig.py
--- wxglade-0.9.6/widgets/generic_calendar_ctrl/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/generic_calendar_ctrl/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -11,10 +11,12 @@
     'supported_by': ('wx3',),
     'style_defs': {
         'wxCAL_SUNDAY_FIRST': {
-            'desc': _('Show Sunday as the first day in the week')
+            'desc': _('Show Sunday as the first day in the week'),
+            'exclude': 'wxCAL_MONDAY_FIRST'
         },
         'wxCAL_MONDAY_FIRST': {
-            'desc': _('Show Monday as the first day in the week')
+            'desc': _('Show Monday as the first day in the week'),
+            'exclude': 'wxCAL_SUNDAY_FIRST'
         },
         'wxCAL_SHOW_HOLIDAYS': {
             'desc': _('Highlight holidays in the calendar (only generic)')
@@ -49,6 +51,3 @@
         'EVT_CALENDAR_WEEKDAY_CLICKED': {},
     },
 }
-
-
-
diff -Nru wxglade-0.9.6/widgets/grid/codegen.py wxglade-1.0.1/widgets/grid/codegen.py
--- wxglade-0.9.6/widgets/grid/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/grid/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,7 +2,7 @@
 Code generator functions for wxGrid objects
 
 @copyright: 2002-2007 Alberto Griggio
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @copyright: 2017 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
@@ -26,16 +26,14 @@
 
     def get_code(self, obj):
         id_name, id = self.codegen.generate_code_id(obj)
-        parent = self.format_widget_access(obj.parent)
+        parent = self.format_widget_access(obj.parent_window)
         init = []
         if id_name:
             init.append(id_name)
-        klass = obj.klass
-        if klass == obj.base:
-            klass = self.cn(klass)
+        klass = obj.get_instantiation_class(self.cn, self.cn_class, self.codegen.preview)
         init.append('self.%s = %s(%s, %s, size=(1, 1))\n' % (obj.name, klass, parent, id))
-        props_buf = self.get_properties_code(obj)
-        return init, props_buf, []
+        init += self.get_properties_code(obj)
+        return init, []
 
     def get_properties_code(self, obj):
         if not obj.create_grid: return []
@@ -86,7 +84,7 @@
             if size>0:
                 out.append( '%s.SetRowSize(%s, %s)\n' % (name, i, size) )
 
-        out.extend(self.codegen.generate_common_properties(obj))
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
 
@@ -98,16 +96,15 @@
         "generates C++ code for wxGrid objects."
         id_name, id = self.codegen.generate_code_id(obj)
         ids = [id_name]  if id_name else  []
-        parent = self.format_widget_access(obj.parent)
-        init = ['%s = new %s(%s, %s);\n' % (obj.name, obj.klass, parent, id)]
-        props_buf = self.get_properties_code(obj)
-        return init, ids, props_buf, []
+        parent = self.format_widget_access(obj.parent_window)
+        klass = obj.get_instantiation_class(self.cn, self.cn_class, self.codegen.preview)
+        init = ['%s = new %s(%s, %s);\n' % (obj.name, klass, parent, id)]
+        init += self.get_properties_code(obj)
+        return init, ids, []
 
     def get_properties_code(self, obj):
         out = []
-        name = 'this'
-        if not obj.is_toplevel: name = obj.name
-        prop = obj.properties
+        name = self.format_widget_access(obj)
 
         if not obj.create_grid:
             return []
@@ -154,7 +151,7 @@
             if size>0:
                 out.append('%s->SetRowSize(%s, %s);\n' % (name, i, size))
 
-        out.extend(self.codegen.generate_common_properties(obj))
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
 
diff -Nru wxglade-0.9.6/widgets/grid/grid.py wxglade-1.0.1/widgets/grid/grid.py
--- wxglade-0.9.6/widgets/grid/grid.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/grid/grid.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,15 +3,13 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
-import wx
 from wx.grid import *
 import common, misc, compat
 from edit_windows import ManagedBase
-from tree import Node
 import new_properties as np
 from wcodegen.taghandler import BaseXmlBuilderTagHandler
 
@@ -30,7 +28,7 @@
                 inner_xml += common.format_xml_tag(u'column', label, tabs+1, size=size)
             output.extend( common.format_xml_tag(u'columns', inner_xml, tabs, is_xml=True) )
 
-    def _get_label(self, col):
+    def _get_default_label(self, col):
         s = []
         while True:
             s.append(chr(ord('A') + col%26))
@@ -41,27 +39,14 @@
 
     def _check_label(self, label, i):
         "return True if it's not the default value"
-        return label != self._get_label(i)
-
-    def add_row(self, event):
-        np.GridProperty.add_row(self, event)
-        rows = self.grid.NumberRows
-        label = self._get_label(rows-1)
-        self.grid.SetCellValue(rows-1, 0, label)
-        # take the default column width from the previous row
-        col_width = -1 if rows==1 else int(self.grid.GetCellValue(rows-2, 1))
-        self.grid.SetCellValue(rows-1, 1, str(col_width))
-        self.editing_values[-1] = [label, col_width]
-
-    def insert_row(self, event):
-        np.GridProperty.insert_row(self, event)
-        label = self._get_label(self.cur_row)
-        self.grid.SetCellValue(self.cur_row, 0, label)
-        # take the default column width from the previous row
-        col_width = -1 if self.cur_row<1 else int(self.grid.GetCellValue(self.cur_row-1, 1))
-        self.grid.SetCellValue(self.cur_row, 1, str(col_width))
-        self.editing_values[self.cur_row] = [label, col_width]
+        return label != self._get_default_label(i)
 
+    def _get_default_row(self, row):
+        label = self._get_default_label(row)
+        values = self._ensure_editing_copy()
+        # by default, take width from previous column
+        col_width = values and values[row-1][1] or -1
+        return [label, col_width]
 
 
 class ColsHandler(BaseXmlBuilderTagHandler):
@@ -79,8 +64,7 @@
 
     def end_elem(self, name):
         if name == 'columns':
-            self.parent.properties['columns'].set(self.columns)
-            self.parent.properties_changed(["columns"])
+            self.parent.properties['columns'].load(self.columns)
             return True
         elif name == 'column':
             char_data = self.get_char_data()
@@ -89,16 +73,16 @@
 
 
 class GridRowsProperty(GridColsProperty):
-    def _get_label(self, row):
-        return str(row)
+    def _get_default_label(self, row):
+        return str(row+1)
 
     def _check_label(self, label, i):
         "return True if it's not the default value"
-        return label != self._get_label(i)
+        return label != self._get_default_label(i)
 
     def load(self, value, activate=None, deactivate=None, notify=False):
         if isinstance(value, compat.unicode):
-            value =  [[str(n),-1] for n in range(int(value))]
+            value =  [[self._get_default_label(row),-1] for row in range(int(value))]
         np.GridProperty.load(self, value, activate, deactivate, notify)
 
     def write(self, output, tabs):
@@ -106,7 +90,7 @@
         inner_xml = []
         rows = self.get()
         for i, (label, size) in enumerate(rows):
-            if size!=-1 or label!=str(i):
+            if size!=-1 or self._check_label(label, i):
                 is_default=False
             inner_xml += common.format_xml_tag(u'row', label, tabs+1, size=size)
         if not is_default:
@@ -116,24 +100,12 @@
             # just write the number of rows
             output.extend( common.format_xml_tag(u'rows_number', str(len(rows)), tabs) )
 
-    def add_row(self, event):
-        np.GridProperty.add_row(self, event)
-        rows = self.grid.NumberRows
-        label = self._get_label(rows-1)
-        self.grid.SetCellValue(rows-1, 0, label)
-        # take the default row width from the previous row
-        col_width = -1 if rows==1 else int(self.grid.GetCellValue(rows-2, 1))
-        self.grid.SetCellValue(rows-1, 1, str(col_width))
-        self.editing_values[-1] = [label, col_width]
-
-    def insert_row(self, event):
-        np.GridProperty.insert_row(self, event)
-        label = self._get_label(self.cur_row)
-        self.grid.SetCellValue(self.cur_row, 0, label)
-        # take the default row width from the previous row
-        col_width = -1 if self.cur_row<1 else int(self.grid.GetCellValue(self.cur_row-1, 1))
-        self.grid.SetCellValue(self.cur_row, 1, str(col_width))
-        self.editing_values[self.cur_row] = [label, col_width]
+    def _get_default_row(self, row):
+        label = self._get_default_label(row)
+        values = self._ensure_editing_copy()
+        # by default, take width from previous row
+        col_width = values and values[row-1][1] or -1
+        return [label, col_width]
 
 
 
@@ -152,8 +124,7 @@
 
     def end_elem(self, name):
         if name == 'rows':
-            self.parent.properties['rows'].set(self.rows)
-            self.parent.properties_changed(["rows"])
+            self.parent.properties['rows'].load(self.rows, notify=True)
             return True
         elif name == 'row':
             char_data = self.get_char_data()
@@ -162,7 +133,7 @@
 
 
 class EditGrid(ManagedBase):
-
+    WX_CLASS = "wxGrid"
     _PROPERTIES =["Widget", 'create_grid', 'row_label_size', 'col_label_size',
                   'enable_editing', 'enable_grid_lines', 'enable_col_resize', 'enable_row_resize', 'enable_grid_resize',
                   'lines_color', 'label_bg_color', 'selection_mode', 'columns', 'rows']
@@ -176,15 +147,15 @@
     #_SELECTION_MODES = { 'wxGrid.wxGridSelectCells':0, 'wxGrid.wxGridSelectRows':1, 'wxGrid.wxGridSelectColumns':2 }
     _SELECTION_MODES = ('wxGrid.wxGridSelectCells', 'wxGrid.wxGridSelectRows', 'wxGrid.wxGridSelectColumns')
 
-    def __init__(self, name, parent, id, sizer, pos):
+    def __init__(self, name, parent, index):
         "Class to handle wxGrid objects"
-        ManagedBase.__init__(self, name, 'wxGrid', parent, id, sizer, pos)
+        ManagedBase.__init__(self, name, parent, index)
 
         # instance properties
         self.create_grid = np.CheckBoxProperty(True)
         columns = [['A', -1], ['B', -1], ['C', -1]]
         self.columns = GridColsProperty([])
-        rows =  [[str(n),-1] for n in range(10)]
+        rows =  [[str(n+1),-1] for n in range(10)]
         self.rows = GridRowsProperty( rows )
         self.properties["rows_number"] = self.properties["rows"]  # backward compatibility
         #self.rows_number        = np.SpinProperty(10, immediate=True)
@@ -204,7 +175,7 @@
                                                columns=3)
 
     def create_widget(self):
-        self.widget = Grid(self.parent.widget, self.id, (200, 200))
+        self.widget = Grid(self.parent_window.widget, wx.ID_ANY, (200, 200))
         #self.widget.CreateGrid(self.rows_number, len(self.columns))
         self.widget.CreateGrid(len(self.rows), len(self.columns))
 
@@ -303,11 +274,10 @@
                     self.widget.SetRowSize(i, size)
                 self.widget.SetRowLabelValue(i, label.replace('\\n', '\n'))
 
-        self.widget.ForceRefresh()
-
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         self._update_widget_properties(modified)
-        ManagedBase.properties_changed(self, modified)
+        if modified: actions.add("refresh")
+        ManagedBase._properties_changed(self, modified, actions)
 
     def get_property_handler(self, name):
         if name == 'columns': return ColsHandler(self)
@@ -316,47 +286,28 @@
 
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditGrid objects"
-    label = 'grid_%d' % number[0]
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = 'grid_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('grid_%d')
     with parent.frozen():
-        grid = EditGrid(label, parent, wx.NewId(), sizer, pos)
+        editor = EditGrid(name, parent, index)
         # A grid should be wx.EXPANDed and 'option' should be 1, or you can't see it.
-        grid.properties["proportion"].set(1)
-        grid.properties["flag"].set("wxEXPAND")
-        node = Node(grid)
-        grid.node = node
-        if parent.widget: grid.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor.properties["proportion"].set(1)
+        editor.properties["flag"].set("wxEXPAND")
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditGrid objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    grid = EditGrid(label, parent, wx.NewId(), sizer, pos)
-    #sizer.set_item(grid.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(grid)
-    grid.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return grid
+    return EditGrid(name, parent, index)
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette."
+    common.widget_classes['EditGrid'] = EditGrid
     common.widgets['EditGrid'] = builder
     common.widgets_from_xml['EditGrid'] = xml_builder
 
-    return common.make_object_button('EditGrid', 'grid.xpm')
+    return common.make_object_button('EditGrid', 'grid.png')
 
diff -Nru wxglade-0.9.6/widgets/grid/lisp_codegen.py wxglade-1.0.1/widgets/grid/lisp_codegen.py
--- wxglade-0.9.6/widgets/grid/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/grid/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -15,15 +15,15 @@
 
     def get_code(self, obj):
         id_name, id = self.codegen.generate_code_id(obj)
-        parent = self.format_widget_access(obj.parent)
+        parent = self.format_widget_access(obj.parent_window)
         init = []
         if id_name:
             init.append(id_name)
 
         obj_name = self.codegen._format_name(obj.name)
         init.append('(setf (slot-%s obj) (wxGrid_Create %s %s -1 -1 -1 -1 wxWANTS_CHARS))\n' % (obj_name, parent, id))
-        props_buf = self.get_properties_code(obj)
-        return init, props_buf, []
+        init += self.get_properties_code(obj)
+        return init, []
 
     def get_properties_code(self, obj):
         if not obj.create_grid: return []
@@ -71,7 +71,7 @@
             if size>0:
                 out.append('(wxGrid_SetRowSize (slot-%s obj) %s %s)\n' % (name, i, size))
 
-        out.extend(self.codegen.generate_common_properties(obj))
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
 
diff -Nru wxglade-0.9.6/widgets/grid/perl_codegen.py wxglade-1.0.1/widgets/grid/perl_codegen.py
--- wxglade-0.9.6/widgets/grid/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/grid/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -15,20 +15,15 @@
 
     def get_code(self, obj):
         id_name, id = self.codegen.generate_code_id(obj)
-        parent = self.format_widget_access(obj.parent)
+        parent = self.format_widget_access(obj.parent_window)
         init = []
         if id_name:
             init.append(id_name)
 
-        klass = obj.base
-        if klass != obj.klass:
-            klass = obj.klass
-        else:
-            klass = klass.replace('wx', 'Wx::', 1)
-
+        klass = obj.get_instantiation_class(self.cn, self.cn_class)
         init.append('$self->{%s} = %s->new(%s, %s);\n' % (obj.name, klass, parent, id))
-        props_buf = self.get_properties_code(obj)
-        return init, props_buf, []
+        init += self.get_properties_code(obj)
+        return init, []
 
     def get_properties_code(self, obj):
         if not obj.create_grid: return []
@@ -76,7 +71,7 @@
             if size>0:
                 out.append( '%s->SetRowSize(%s, %s);\n' % (name, i, size) )
 
-        out.extend(self.codegen.generate_common_properties(obj))
+        out.extend(self.codegen.generate_code_common_properties(obj))
         return out
 
 
diff -Nru wxglade-0.9.6/widgets/grid/wconfig.py wxglade-1.0.1/widgets/grid/wconfig.py
--- wxglade-0.9.6/widgets/grid/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/grid/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,7 +2,7 @@
 wxGrid widget configuration
 
 @copyright: 2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/hyperlink_ctrl/hyperlink_ctrl.py wxglade-1.0.1/widgets/hyperlink_ctrl/hyperlink_ctrl.py
--- wxglade-0.9.6/widgets/hyperlink_ctrl/hyperlink_ctrl.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/hyperlink_ctrl/hyperlink_ctrl.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,7 +2,7 @@
 wxHyperlinkCtrl objects
 
 @copyright: 2012-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -10,7 +10,6 @@
 import wx
 import common, compat, config
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 import decorators
 
@@ -23,7 +22,8 @@
 
 class EditHyperlinkCtrl(ManagedBase, EditStylesMixin):
     "Class to handle wxHyperlinkCtrl objects"
-    _PROPERTIES = ["Widget", "label", "style", "url", "attribute"]
+    WX_CLASS = "wxHyperlinkCtrl"
+    _PROPERTIES = ["Widget", "url", "label", "style", "attribute"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     ManagedBase.MOVE_PROPERTY(PROPERTIES, "attribute", "name")
     _PROPERTY_HELP = { 'label':"Label of the hyperlink",
@@ -31,32 +31,30 @@
                        "attribute":'Store instance as attribute of window class; e.g. self.bitmap_1 = wx.wxStaticBitmap'
                                    '(...)\nWithout this, you can not access the bitmap from your program.'}
 
-    def __init__(self, name, parent, id, label, sizer, pos):
+    def __init__(self, name, parent, index, label):
         # Initialise parent classes
-        ManagedBase.__init__(self, name, 'wxHyperlinkCtrl', parent, id, sizer, pos)
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
-        self.label = np.TextProperty(label, multiline=True)
+        self.label = np.TextProperty(label, multiline="grow")
         self.url   = np.TextProperty("")
         self.attribute = np.CheckBoxProperty(False, default_value=False)
 
     def create_widget(self):
-        self.widget = HyperlinkCtrl(self.parent.widget, self.id, self.label, self.url)
+        self.widget = HyperlinkCtrl(self.parent_window.widget, wx.ID_ANY, self.label, self.url)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "label" in modified:
-            if self.widget:
-                self.widget.SetLabel(self.label)
-                self._set_widget_best_size()
-            common.app_tree.refresh(self.node, refresh_label=True)
+            if self.widget: self.widget.SetLabel(self.label)
+            if modified: actions.add("layout")
 
         if not modified or "url" in modified:
-            if self.widget:
-                self.widget.SetURL(self.url)
+            if self.widget: self.widget.SetURL(self.url)
+            if modified: actions.add("layout")
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
     # handle compatibility:
     @decorators.memoize
@@ -66,46 +64,37 @@
         return getattr(module, cn)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index, url=None, label=None):
     "factory function for EditHyperlinkCtrl objects"
-    name = u'hyperlink_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = u'hyperlink_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('hyperlink_%d')
+    if url is None and label is None:
+        import dialogs, misc
+        dlg = dialogs.WidgetStyleSelectionDialog(_("Hyperlink"), None, None, ["?URL", "?Label"])
+        with misc.disable_stay_on_top(common.adding_window or parent):
+            res = dlg.ShowModal()
+        url, label = dlg.get_options()
+        dlg.Destroy()
+        if res != wx.ID_OK: return
+
     with parent.frozen():
-        hyperlink_ctrl = EditHyperlinkCtrl(name, parent, wx.NewId(), name, sizer, pos)
-        hyperlink_ctrl.properties["style"].set_to_default()
-        hyperlink_ctrl.properties["attribute"].set(True)  # allow to modificate it later on...
-        hyperlink_ctrl.check_defaults()
-        node = Node(hyperlink_ctrl)
-        hyperlink_ctrl.node = node
-        if parent.widget: hyperlink_ctrl.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditHyperlinkCtrl(name, parent, index, label or "")
+        editor.properties["style"].set_to_default()
+        editor.properties["attribute"].set(True)  # allow to modificate it later on...
+        editor.properties["url"].set(url or "")
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditHyperlinkCtrl objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    hyperlink_ctrl = EditHyperlinkCtrl(name, parent, wx.NewId(), "", sizer, pos)
-    #sizer.set_item(hyperlink_ctrl.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(hyperlink_ctrl)
-    hyperlink_ctrl.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return hyperlink_ctrl
+    return EditHyperlinkCtrl(name, parent, index, "")
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditHyperlinkCtrl'] = EditHyperlinkCtrl
     common.widgets['EditHyperlinkCtrl'] = builder
     common.widgets_from_xml['EditHyperlinkCtrl'] = xml_builder
 
-    return common.make_object_button('EditHyperlinkCtrl', 'hyperlink_ctrl.xpm')
+    return common.make_object_button('EditHyperlinkCtrl', 'hyperlink_ctrl.png')
diff -Nru wxglade-0.9.6/widgets/list_box/list_box.py wxglade-1.0.1/widgets/list_box/list_box.py
--- wxglade-0.9.6/widgets/list_box/list_box.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/list_box/list_box.py	2020-12-31 14:04:48.000000000 +0000
@@ -9,18 +9,18 @@
 import wx
 import common
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 from ChoicesProperty import *
 
 
 class EditListBox(ManagedBase, EditStylesMixin):
     "Class to handle wxListBox objects"
+    WX_CLASS = "wxListBox"
     _PROPERTIES = ["Widget", "style", "selection", "choices"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, choices, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxListBox', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, choices):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -29,7 +29,7 @@
 
     def create_widget(self):
         choices = [c[0] for c in self.choices]
-        self.widget = wx.ListBox(self.parent.widget, self.id, choices=choices)
+        self.widget = wx.ListBox(self.parent_window.widget, wx.ID_ANY, choices=choices)
         if self.selection>=0: self.widget.SetSelection(self.selection)
         self.widget.Bind(wx.EVT_LEFT_DOWN, self.on_set_focus)
 
@@ -38,7 +38,7 @@
             return ChoicesHandler(self)
         return ManagedBase.get_property_handler(self, prop_name)
 
-    def properties_changed(self, modified):  # XXX from CheckListBox
+    def _properties_changed(self, modified, actions):  # XXX from CheckListBox
         # self.selection needs to be in range (-1,len(self.choices)-1)
         choices = self.choices
         max_selection = len(choices)-1
@@ -52,8 +52,7 @@
                 # update widget
                 self.widget.Clear()
                 for c in choices: self.widget.Append(c[0])
-                if not self.properties['size'].is_active():
-                    self.sizer.set_item_best_size(self, size=self.widget.GetBestSize())
+                if modified: actions.add("layout")
 
         if not modified or "selection" in modified or set_selection:
             if self.selection>max_selection:
@@ -63,50 +62,30 @@
         if self.widget and set_selection:
             self.widget.SetSelection(self.selection)  # -1 is identical to wx.NOT_FOUND
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditListBox objects"
-    name = 'list_box_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'list_box_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('list_box_%d')
     with parent.frozen():
-        list_box = EditListBox(name, parent, wx.NewId(), [[u'choice 1'],], sizer, pos)
-        list_box.properties["style"].set_to_default()
-        node = Node(list_box)
-    ##     sizer.set_item(pos, size=list_box.GetBestSize())
-        list_box.node = node
-        if parent.widget: list_box.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditListBox(name, parent, index, [[u'choice 1']])
+        editor.properties["style"].set_to_default()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditListBox objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    list_box = EditListBox(name, parent, wx.NewId(), [], sizer, pos)
-    #sizer.set_item(list_box.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(list_box)
-    list_box.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return list_box
+    return EditListBox(name, parent, index, [])
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditListBox'] = EditListBox
     common.widgets['EditListBox'] = builder
     common.widgets_from_xml['EditListBox'] = xml_builder
 
-    return common.make_object_button('EditListBox', 'list_box.xpm')
+    return common.make_object_button('EditListBox', 'list_box.png')
diff -Nru wxglade-0.9.6/widgets/list_ctrl/codegen.py wxglade-1.0.1/widgets/list_ctrl/codegen.py
--- wxglade-0.9.6/widgets/list_ctrl/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/list_ctrl/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -25,13 +25,15 @@
         cols_p = obj.properties["columns"]
         columns = cols_p.value
 
+        tmpl_append_column, tmpl_append_row = self._get_row_col_templates()
+
         for i, (heading,width) in enumerate(columns):
             values = {"name":name, "heading":self.codegen.quote_str(heading), "width":width, "col":i}
-            out.append( self.tmpl_append_column % values )
+            out.append( tmpl_append_column % values )
 
         if self.codegen.preview:
             for r in range(rows_number):
-                out.append( self.tmpl_append_row % (name, r) )
+                out.append( tmpl_append_row % (name, r) )
 
         return out
 
@@ -39,19 +41,23 @@
 class PythonListCtrlGenerator(ListCtrlPropertyGeneratorMixin, wcodegen.PythonWidgetCodeWriter):
     tmpl = '%(name)s = %(klass)s(%(parent)s, %(id)s%(style)s)\n'
 
-    # templates for adding columns and rows (rows are for preview only)
-    if compat.IS_PHOENIX:
-        tmpl_append_column = '%(name)s.AppendColumn(%(heading)s, format=wx.LIST_FORMAT_LEFT, width=%(width)d)\n'
-        tmpl_append_row = '%s.InsertItem(%d, "")\n'
-    else:
-        tmpl_append_column ='%(name)s.InsertColumn(%(col)d, %(heading)s, format=wx.LIST_FORMAT_LEFT, width=%(width)d)\n'
-        tmpl_append_row = '%s.InsertStringItem(%d, "")\n'
+    def _get_row_col_templates(self):
+        # templates for adding columns and rows (rows are for preview only)
+        if self.codegen.for_version >= (3,0) and compat.IS_PHOENIX:
+            tmpl_append_column = '%(name)s.AppendColumn(%(heading)s, format=wx.LIST_FORMAT_LEFT, width=%(width)d)\n'
+            tmpl_append_row = '%s.InsertItem(%d, "")\n'
+        else:
+            tmpl_append_column ='%(name)s.InsertColumn(%(col)d, %(heading)s, format=wx.LIST_FORMAT_LEFT, width=%(width)d)\n'
+            tmpl_append_row = '%s.InsertStringItem(%d, "")\n'
+        return (tmpl_append_column, tmpl_append_row)
 
 
 class CppListCtrlGenerator(ListCtrlPropertyGeneratorMixin, wcodegen.CppWidgetCodeWriter):
     import_modules = ['<wx/listctrl.h>']
     tmpl = '%(name)s = new %(klass)s(%(parent)s, %(id)s%(style)s);\n'
-    tmpl_append_column = '%(name)s->AppendColumn(%(heading)s, wxLIST_FORMAT_LEFT, %(width)d);\n'
+    def _get_row_col_templates(self):
+        tmpl_append_column = '%(name)s->AppendColumn(%(heading)s, wxLIST_FORMAT_LEFT, %(width)d);\n'
+        return (tmpl_append_column, None)
 
 
 def xrc_code_generator(obj):
diff -Nru wxglade-0.9.6/widgets/list_ctrl/list_ctrl.py wxglade-1.0.1/widgets/list_ctrl/list_ctrl.py
--- wxglade-0.9.6/widgets/list_ctrl/list_ctrl.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/list_ctrl/list_ctrl.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -11,29 +11,30 @@
 from edit_windows import ManagedBase, EditStylesMixin
 from widgets.grid.grid import GridColsProperty, ColsHandler
 import new_properties as np
-from tree import Node
 import common, misc, compat
 
 
 class EditListCtrl(ManagedBase, EditStylesMixin):
     "Class to handle wxListCtrl objects"
 
-    update_widget_style = True
-
+    WX_CLASS = "wxListCtrl"
     _PROPERTIES = ["Widget", "style", "columns", "rows_number"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     _PROPERTY_HELP = {"rows_number":"This is just used for the design and preview windows.",
                       "columns":"Only for style LC_REPORT."}
+    recreate_on_style_change = True
 
-    def __init__(self, name, parent, id, sizer, pos, style=wx.LC_REPORT | wx.BORDER_SUNKEN):
-        ManagedBase.__init__(self, name, 'wxListCtrl', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, style=wx.LC_REPORT | wx.BORDER_SUNKEN):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
         if style: self.properties["style"].set(style)
         self.columns = GridColsProperty([])
         self.rows_number = np.SpinProperty(0, immediate=True, default_value=0)
+        self.properties["style"]._ignore_names = {"wxLC_VIRTUAL"}
+        self.properties["style"]._one_required = {"wxLC_ICON", "wxLC_SMALL_ICON", "wxLC_LIST", "wxLC_REPORT"}
 
     def create_widget(self):
-        self.widget = wx.ListCtrl(self.parent.widget, self.id, style=self.style)
+        self.widget = wx.ListCtrl(self.parent_window.widget, wx.ID_ANY, style=self.style)
         self._update_widget_properties(modified=None)
         self.widget.Bind(wx.EVT_LIST_COL_CLICK, self.on_set_focus)
         self.widget.Bind(wx.EVT_LIST_COL_END_DRAG, self._on_grid_col_resize)
@@ -49,8 +50,8 @@
         prop._check_for_user_modification(value)
         prop.update_display()
 
-    def finish_widget_creation(self):
-        ManagedBase.finish_widget_creation(self, sel_marker_parent=self.widget)
+    def finish_widget_creation(self, level):
+        ManagedBase.finish_widget_creation(self, level, sel_marker_parent=self.widget)
 
     def _set_name(self):
         if not self.widget: return
@@ -62,10 +63,12 @@
             elif self.columns:
                 compat.ListCtrl_SetStringItem(self.widget, 0, 0, "List Control: %s"%self.name)
 
-    def properties_changed(self, modified):
-        EditStylesMixin.properties_changed(self, modified)
+    def _properties_changed(self, modified, actions):
+        EditStylesMixin._properties_changed(self, modified, actions)
+        if "recreate2" in actions: return
         self._update_widget_properties(modified)
-        ManagedBase.properties_changed(self, modified)
+        if modified: actions.add("refresh")
+        ManagedBase._properties_changed(self, modified, actions)
         if not modified or "name" in modified:
             self._set_name()
 
@@ -100,57 +103,37 @@
                         compat.ListCtrl_InsertStringItem(self.widget, i, "")
     
             self._set_name()
-        self.widget.Refresh()
 
     def get_property_handler(self, name):
         if name == 'columns': return ColsHandler(self)
         return ManagedBase.get_property_handler(self, name)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditListCtrl objects"
-    name = 'list_ctrl_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'list_ctrl_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('list_ctrl_%d')
     with parent.frozen():
-        list_ctrl = EditListCtrl(name, parent, wx.NewId(), sizer, pos)
+        editor = EditListCtrl(name, parent, index)
         #list_ctrl.properties["style"].set_to_default()  # default is wxLC_ICON
-        list_ctrl.properties["columns"].set( [['A', -1], ['B', -1], ['C', -1]] )
-        list_ctrl.properties["rows_number"].set(10)
-        list_ctrl.properties["style"].set( ["wxLC_REPORT", "wxLC_HRULES", "wxLC_VRULES"] )
-        node = Node(list_ctrl)
-        list_ctrl.node = node
-        list_ctrl.properties["proportion"].set(1)
-        list_ctrl.properties["flag"].set("wxEXPAND")
-        if parent.widget: list_ctrl.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
-    #sizer.set_item(list_ctrl.pos, 1, wx.EXPAND)
+        editor.properties["columns"].set( [['A', -1], ['B', -1], ['C', -1]] )
+        editor.properties["rows_number"].set(10)
+        editor.properties["style"].set( ["wxLC_REPORT", "wxLC_HRULES", "wxLC_VRULES"] )
+        editor.properties["proportion"].set(1)
+        editor.properties["flag"].set("wxEXPAND")
+        if parent.widget: editor.create()
+    #sizer.set_item(list_ctrl.index, 1, wx.EXPAND)
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory function to build EditListCtrl objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    list_ctrl = EditListCtrl(name, parent, wx.NewId(), sizer, pos, style=0)
-    #sizer.set_item(list_ctrl.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(list_ctrl)
-    list_ctrl.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return list_ctrl
+    return EditListCtrl(name, parent, index, 0)
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
+    common.widget_classes['EditListCtrl'] = EditListCtrl
     common.widgets['EditListCtrl'] = builder
     common.widgets_from_xml['EditListCtrl'] = xml_builder
 
-    return common.make_object_button('EditListCtrl', 'list_ctrl.xpm')
+    return common.make_object_button('EditListCtrl', 'list_ctrl.png')
diff -Nru wxglade-0.9.6/widgets/list_ctrl/wconfig.py wxglade-1.0.1/widgets/list_ctrl/wconfig.py
--- wxglade-0.9.6/widgets/list_ctrl/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/list_ctrl/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,7 +19,7 @@
         },
         'wxLC_VIRTUAL': {
             'desc': _('The application provides items text on demand. May only be used with wxLC_REPORT.'),
-            'exclude': 'wxLC_LIST|wxLC_ICON|wxLC_SMALL_ICON',
+            'disabled': 'wxLC_LIST|wxLC_ICON|wxLC_SMALL_ICON',
         },
         'wxLC_ICON': {
             'desc': _('Large icon view, with optional labels.'),
diff -Nru wxglade-0.9.6/widgets/menubar/codegen.py wxglade-1.0.1/widgets/menubar/codegen.py
--- wxglade-0.9.6/widgets/menubar/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/menubar/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -36,10 +36,11 @@
                 else:
                     if id_declaration: id_declarations.append(id_declaration)
                     id = val
-                    if val!='wx.ID_ANY': id_access = val
+                    if val!='wx.ID_ANY': id_access = "id=%s"%val
 
                 label = quote_str(item.label)
                 help_str = quote_str(item.help_str)
+
                 if item.children:
                     # a submenu
                     name = item.name or '%s_sub' % menu
@@ -62,11 +63,11 @@
                         name = '%s.%s' % (obj_name, item.name)
                         assignment = '%s = '%name
                         if not id_access:
-                            id_access = "%s.GetId()"%name
+                            id_access = name
                     elif item.handler and not id_access:
                         # assignment to local variable to bind handler
                         assignment = 'item = '
-                        id_access = 'item.GetId()'
+                        id_access = 'item'
                     else:
                         # no assignment necessary, as no handler defined
                         assignment = ''
@@ -75,9 +76,9 @@
                     else:
                         out.append( '%s%s.Append(%s, %s, %s)\n' % ( assignment, menu, id, label, help_str) )
 
-                    if item.handler:
+                    if item.handler and (not self.codegen.preview or not item.handler.startswith("lambda ")):
                         handler = item.handler if "." in item.handler else "self.%s"%item.handler
-                        out.append( "self.Bind(wx.EVT_MENU, %s, id=%s)\n"%(handler, id_access) )
+                        out.append( "self.Bind(wx.EVT_MENU, %s, %s)\n"%(handler, id_access) )
 
         for m in obj.menus:
             menu = m.root
@@ -91,15 +92,14 @@
         return id_declarations + out
 
     def get_code(self, obj):
-        if obj.klass == obj.base:
-            klass = self.cn(obj.klass)
-        else:
-            klass = obj.klass
-        init = [ '\n', '# Menu Bar\n', 'self.%s = %s()\n' % (obj.name, klass) ]
-        init.extend(self.get_init_code(obj))
-        init.append('self.SetMenuBar(self.%s)\n' % obj.name)
-        init.append('# Menu Bar end\n')
-        return init, [], []
+        klass = obj.get_instantiation_class(self.cn, self.cn_class, self.codegen.preview)
+
+        code = [ '# Menu Bar\n', 'self.%s = %s()\n' % (obj.name, klass) ]
+        if not obj.IS_CLASS:  # if it's a class, then the menus will be generated in the class code
+            code.extend(self.get_init_code(obj))
+        code.append('self.SetMenuBar(self.%s)\n' % obj.name)
+        code.append('# Menu Bar end\n')
+        return code, []
 
     def get_event_handlers(self, obj):
         out = []
@@ -177,11 +177,12 @@
     constructor = []
 
     def get_code(self, obj):
-        init = [ '%s = new %s();\n' % (obj.name, obj.klass) ]
+        klass = obj.get_instantiation_class(self.cn, self.cn_class)
+        init = [ '%s = new %s();\n' % (obj.name, klass) ]
         init.extend(self.get_properties_code(obj))
         init.append('SetMenuBar(%s);\n' % obj.name)
         ids = self.get_ids_code(obj)
-        return init, ids, [], []
+        return init, ids, []
 
     def get_properties_code(self, obj):
         out = []
@@ -216,7 +217,7 @@
 
                     if item.name:
                         # assign to attribute
-                        self.codegen.classes[obj.parent.klass].sub_objs.append( ('wxMenuItem',item.name) )
+                        self.codegen.classes[obj.parent].sub_objs.append( ('wxMenuItem',item.name) )
                         assignment = '%s = '%item.name
                         if not id_access:
                             id_access = "%s->GetId()"%item.name
@@ -234,7 +235,6 @@
                         out.append( '%s%s->Append(%s, %s, %s);\n' % (assignment, menu, id, label, help_str) )
 
                     if item.handler:
-                        # Python
                         handler = item.handler if "::" in item.handler else '%s::%s'%(obj.parent.klass, item.handler)
 
                         if self.codegen.for_version==(2,8):
@@ -252,7 +252,7 @@
             if menu.name:
                 # assign to attribute
                 name = menu.name
-                self.codegen.classes[obj.parent.klass].sub_objs.append( ('wxMenu',menu.name) )
+                self.codegen.classes[obj.parent].sub_objs.append( ('wxMenu',menu.name) )
             else:
                 name = 'wxglade_tmp_menu'
             out.append('%s = new wxMenu();\n' % name)
@@ -304,7 +304,6 @@
 def initialize():
     klass = 'wxMenuBar'
     common.class_names['EditMenuBar'] = klass
-    common.toplevels['EditMenuBar'] = 1
     common.register('python', klass, PythonMenubarGenerator(klass) )
     common.register('C++',    klass, CppMenubarGenerator(klass),   )
     common.register('XRC',    klass, xrc_code_generator,           )
diff -Nru wxglade-0.9.6/widgets/menubar/__init__.py wxglade-1.0.1/widgets/menubar/__init__.py
--- wxglade-0.9.6/widgets/menubar/__init__.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/menubar/__init__.py	2020-12-31 14:04:48.000000000 +0000
@@ -7,10 +7,8 @@
 
 
 def initialize():
-    import config
     from . import codegen
     codegen.initialize()
-    #if config.use_gui:
     from . import menubar
     global EditMenuBar
     EditMenuBar = menubar.EditMenuBar
diff -Nru wxglade-0.9.6/widgets/menubar/lisp_codegen.py wxglade-1.0.1/widgets/menubar/lisp_codegen.py
--- wxglade-0.9.6/widgets/menubar/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/menubar/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -68,16 +68,15 @@
 
     def get_code(self, obj):
         obj_name = self.codegen._format_name(obj.name)
-        init = [ '\n', ';;; Menu Bar\n', '(setf (slot-%s obj) (wxMenuBar_Create 0))\n' % obj_name ]
+        init = [ ';;; Menu Bar\n', '(setf (slot-%s obj) (wxMenuBar_Create 0))\n' % obj_name ]
         init.extend(self.get_init_code(obj))
         init.append('(wxFrame_SetMenuBar (slot-top-window obj) (slot-%s obj))\n' % obj_name)
-        init.append(';;; Menu Bar end\n\n')
-        return init, [], []
+        init.append(';;; Menu Bar end\n')
+        return init, []
 
 
 
 def initialize():
     klass = 'wxMenuBar'
     common.class_names['EditMenuBar'] = klass
-    common.toplevels['EditMenuBar'] = 1
     common.register('lisp', klass, LispMenubarGenerator(klass) )
diff -Nru wxglade-0.9.6/widgets/menubar/menubar.py wxglade-1.0.1/widgets/menubar/menubar.py
--- wxglade-0.9.6/widgets/menubar/menubar.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/menubar/menubar.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,113 +3,103 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
+import re
 
 import common, compat, config, misc
-from MenuTree import *
-from tree import Node
 from wcodegen.taghandler import BaseXmlBuilderTagHandler
+from MenuTree import MenuTree
 import new_properties as np
 from edit_windows import EditBase, PreviewMixin
 
+if compat.IS_CLASSIC:
+    from .MenuItemDialog28 import MenuItemDialog as _MenuItemDialog
+else:
+    from .MenuItemDialog import MenuItemDialog as _MenuItemDialog
+
+
+class MenuItemDialog(_MenuItemDialog):
+    # _MenuItemDialog is generated from res/MenuItemDialog
+    columns = ["level", "label", "event_handler", "name", "type", "help_str", "id"]
+    coltypes = {"type":int}
+    # these will be copied:
+    default_item = (None,"item","","",0,"","")
+    separator_item = (None,"---","---","---","---","---","---")
 
-class MenuItemDialog(wx.Dialog):
-    def __init__(self, parent, owner, items=None):
-        style = wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER|wx.WANTS_CHARS
-        wx.Dialog.__init__(self, parent, -1, _("Menu editor"), style=style)
-        self.create_gui()
-
-        self.Bind(wx.EVT_TEXT, self.on_label_edited, self.label)
-        self.Bind(wx.EVT_TEXT, self.on_event_handler_edited, self.event_handler)
-        self.Bind(wx.EVT_TEXT, self.on_name_edited, self.name)
-        self.Bind(wx.EVT_TEXT, self.on_help_str_edited, self.help_str)
-        self.Bind(wx.EVT_TEXT, self.on_id_edited, self.id)
-        self.Bind(wx.EVT_RADIOBOX, self.on_type_edited, self.check_radio)
-
-        self.Bind(wx.EVT_BUTTON, self.move_item_left, self.move_left)
-        self.Bind(wx.EVT_BUTTON, self.move_item_right, self.move_right)
-        self.Bind(wx.EVT_BUTTON, self.move_item_up, self.move_up)
-        self.Bind(wx.EVT_BUTTON, self.move_item_down, self.move_down)
-        self.Bind(wx.EVT_BUTTON, self.add_item, self.add)
-        self.Bind(wx.EVT_BUTTON, self.remove_item, self.remove)
-        self.Bind(wx.EVT_BUTTON, self.add_separator, self.add_sep)
-        self.Bind(wx.EVT_BUTTON, self.on_cancel, self.cancel)
-        self.Bind(wx.EVT_BUTTON, self.on_OK, self.ok)
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.show_item, self.menu_items)
+    name_re = re.compile(r'^[a-zA-Z_]+[\w-]*(\[\w*\])*$')
+    handler_re = re.compile(r'^(([a-zA-Z_]+[a-zA-Z0-9_-]*)|()|(lambda .*))$')
 
-        self.Bind(wx.EVT_CHAR_HOOK, self.on_char)
-        self.remove.Bind(wx.EVT_CHAR_HOOK, self.on_button_char)  # to ignore the Enter key while the focus is on Remove
+    def __init__(self, parent, owner, items=None):
+        _MenuItemDialog.__init__(self, parent)
 
         self.owner = owner
 
-        # ALB 2004-09-26: workaround to make the scroll wheel work...
-        self.menu_items.Bind(wx.EVT_MOUSEWHEEL, lambda e: e.Skip())
-
-        self.menu_items.InsertColumn(0, _("Label"))
-        self.menu_items.InsertColumn(1, _("Event Handler"))
-        self.menu_items.InsertColumn(2, _("Name"))
-        self.menu_items.InsertColumn(3, _("Type"))
-        self.menu_items.InsertColumn(4, _("Help String"))
-        self.menu_items.InsertColumn(5, _("Id"))
-
-        self.menu_items.SetColumnWidth(0, 180)
-        self.menu_items.SetColumnWidth(1, 180)
-        self.menu_items.SetColumnWidth(2, 120)
-        self.menu_items.SetColumnWidth(3, 35)
-        self.menu_items.SetColumnWidth(4, 250)
-        self.menu_items.SetColumnWidth(5, 50)
-        self.SetSize( (900, 600) )
-
-        import re
-        self.handler_re = self.name_re = re.compile(r'^[a-zA-Z_]+[\w-]*(\[\w*\])*$')
-
         self.selected_index = -1  # index of the selected element in the wx.ListCtrl menu_items
         self._ignore_events = False
 
-        # track focus
-        self._last_focus = None
-        for ctrl in (self.label, self.event_handler, self.name, self.help_str, self.id):
-            ctrl.Bind(wx.EVT_SET_FOCUS, self.on_focus)
-
         if items:
             self.add_items(items)
             self._select_item(0)
         else:
             self._enable_fields(False)
 
-    def on_focus(self, event):
-        # track focus
-        self._last_focus = event.GetEventObject()
-        event.Skip()
+        self.Bind(wx.EVT_CHAR_HOOK, self.on_char)
+        self.remove.Bind(wx.EVT_CHAR_HOOK, self.on_button_char)  # to ignore the Enter key while the focus is on Remove
+        self.items.Bind(wx.EVT_MOUSEWHEEL, lambda e: e.Skip())  # workaround to make the scroll wheel work...
+
 
     def on_char(self, event):
         # keyboard navigation: up/down arrows
         focus = self.FindFocus()
         k = event.GetKeyCode()
         if k==wx.WXK_TAB:
-            if focus is self.check_radio:
+            if focus is self.type:
                 self.label.SetFocus()
             else:
                 event.Skip()
             return
 
-        if k==wx.WXK_RETURN:  # ignore Enter key
+        if k in (wx.WXK_DOWN, wx.WXK_UP) and focus is self.type:
+            event.Skip()
             return
+
+        if event.AltDown():
+            if k==wx.WXK_RETURN or k==ord("O"):
+                self.EndModal(wx.ID_OK)
+                return
+            if k==ord("C"):
+                self.EndModal(wx.ID_CANCEL)
+                return
+
+        if event.ControlDown() and k==wx.WXK_RETURN:
+            self.EndModal(wx.ID_OK)
+            return
+
+        if k==wx.WXK_RETURN:  # ignore Enter key except when editing an item in the list control
+            if not (self.items.EditControl and event.GetEventObject() is self.items.EditControl):
+                return
+
         if k==wx.WXK_DOWN:
             if event.AltDown():
                 self.move_item_down(event)
             else:
-                self._select_item(self.selected_index+1)
+                if self.selected_index+1 < self.items.GetItemCount():
+                    self._select_item(self.selected_index+1)
+                else:
+                    wx.Bell()
             return
         if k==wx.WXK_UP:
             if event.AltDown():
                 self.move_item_up(event)
             else:
-                self._select_item(self.selected_index-1)
+                if self.selected_index>0:
+                    self._select_item(self.selected_index-1)
+                else:
+                    wx.Bell()
             return
         if k==wx.WXK_RIGHT and event.AltDown():
             self.move_item_right(event)
@@ -124,141 +114,59 @@
         if event.GetKeyCode() != wx.WXK_RETURN:
             event.Skip()
 
-    def create_gui(self):
-        self.SetTitle("Menu Editor")
 
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.VERTICAL)
-        grid_sizer_2 = wx.FlexGridSizer(5, 2, 0, 0)
-
-        # menu item fields
-        label_6 = wx.StaticText(self, wx.ID_ANY, "Label:")
-        grid_sizer_2.Add(label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.label = wx.TextCtrl(self, wx.ID_ANY, "")
-        grid_sizer_2.Add(self.label, 1, wx.EXPAND, 0)
-
-        label_7 = wx.StaticText(self, wx.ID_ANY, "Event Handler:")
-        grid_sizer_2.Add(label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.event_handler = wx.TextCtrl(self, wx.ID_ANY, "")
-        grid_sizer_2.Add(self.event_handler, 1, wx.EXPAND, 0)
-
-        label_8 = wx.StaticText(self, wx.ID_ANY, "(Attribute) Name:")
-        grid_sizer_2.Add(label_8, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.name = wx.TextCtrl(self, wx.ID_ANY, "")
-        grid_sizer_2.Add(self.name, 1, wx.EXPAND, 0)
-
-        label_9 = wx.StaticText(self, wx.ID_ANY, "Help String:")
-        grid_sizer_2.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.help_str = wx.TextCtrl(self, wx.ID_ANY, "")
-        grid_sizer_2.Add(self.help_str, 1, wx.EXPAND, 0)
-
-        label_10 = wx.StaticText(self, wx.ID_ANY, "ID:")
-        grid_sizer_2.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.id = wx.TextCtrl(self, wx.ID_ANY, "")
-        grid_sizer_2.Add(self.id, 0, 0, 0)
-
-        grid_sizer_2.AddGrowableCol(1)
-        sizer_5.Add(grid_sizer_2, 2, wx.EXPAND, 0)
-
-        # radio box for type
-        self.check_radio = wx.RadioBox(self, wx.ID_ANY, "Type", choices=["Normal", "Checkable", "Radio"],
-                                       majorDimension=1, style=wx.RA_SPECIFY_COLS)
-        self.check_radio.SetSelection(0)
-        sizer_5.Add(self.check_radio, 0, wx.ALL | wx.EXPAND, 4)
-
-        sizer_5.Add((20, 20), 1, 0, 0)
-
-        # editor action buttons
-        self.move_left  = wx.Button(self, wx.ID_ANY, "&<")
-        self.move_right = wx.Button(self, wx.ID_ANY, "&>")
-        self.move_up    = wx.Button(self, wx.ID_ANY, "&Up")
-        self.move_down  = wx.Button(self, wx.ID_ANY, "&Down")
-        self.add     = wx.Button(self, wx.ID_ANY, "&Add")
-        self.remove  = wx.Button(self, wx.ID_ANY, "&Remove")
-        self.add_sep = wx.Button(self, wx.ID_ANY, "Add &Separator")
-
-        # dialog action buttons; these will be handled, instead of using stock OK/Cancel buttons
-        self.ok     = wx.Button(self, wx.ID_ANY, "OK")
-        self.cancel = wx.Button(self, wx.ID_ANY, "Cancel")
-
-        sizer_6.Add(self.ok, 0, wx.ALL, 5)
-        sizer_6.Add(self.cancel, 0, wx.ALL, 5)
-        sizer_5.Add(sizer_6, 0, wx.EXPAND, 0)
-        sizer_1.Add(sizer_5, 0, wx.EXPAND, 0)
-        sizer_2.Add(self.move_left, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
-        sizer_2.Add(self.move_right, 0, wx.BOTTOM | wx.RIGHT | wx.TOP, 8)
-        sizer_2.Add(self.move_up, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
-        sizer_2.Add(self.move_down, 0, wx.BOTTOM | wx.RIGHT | wx.TOP, 8)
-        sizer_2.Add((20, 20), 1, 0, 0)
-        sizer_2.Add(self.add, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
-        sizer_2.Add(self.remove, 0, wx.BOTTOM | wx.TOP, 8)
-        sizer_2.Add(self.add_sep, 0, wx.ALL, 8)
-        sizer_2.Add((20, 20), 2, 0, 0)
-        sizer_1.Add(sizer_2, 0, wx.EXPAND, 0)
-
-        self.menu_items = wx.ListCtrl(self, wx.ID_ANY, style=wx.BORDER_DEFAULT | wx.BORDER_SUNKEN | wx.LC_EDIT_LABELS |
-                                                         wx.LC_REPORT | wx.LC_SINGLE_SEL | wx.NO_FULL_REPAINT_ON_RESIZE)
-        sizer_1.Add(self.menu_items, 1, wx.EXPAND, 0)
-        self.SetSizer(sizer_1)
-        sizer_1.Fit(self)
-        sizer_1.SetSizeHints(self)
-        self.Layout()
-
-        # set tooltips
-        for c in (label_6, self.label):
-            compat.SetToolTip(c, "The menu entry text;\nenter & for access keys (using ALT key)\nappend e.g. \\tCtrl-X for keyboard shortcut")
-        for c in (label_7, self.event_handler):
-            compat.SetToolTip(c, "Enter the name of an event handler method; this will be created as stub")
-        for c in (label_8, self.name):
-            compat.SetToolTip(c, "optional: enter a name to store the menu item as attribute of the menu bar")
-        for c in (label_10, self.id):
-            compat.SetToolTip(c, "optional: enter wx ID")
-        compat.SetToolTip( self.move_up, "Move selected item up" )
-        compat.SetToolTip( self.move_down, "Move selected item down" )
-        compat.SetToolTip( self.menu_items, "For navigation use the mouse or the up/down arrows" )
-        compat.SetToolTip( self.move_left,  "Move the selected item up by one menu level" )
-        compat.SetToolTip( self.move_right, "Move the selected item down by one menu level" )
-
-    def _enable_fields(self, enable=True):
-        for s in (self.event_handler, self.id, self.name, self.help_str, self.check_radio, self.label):
-            s.Enable(enable)
+    def _enable_fields(self, enable=True, clear=False):
+        if clear:
+            restore = self._ignore_events
+            self._ignore_events = True
+        for name in self.columns:
+            control = getattr(self, name, None)
+            if not control: continue
+            control.Enable(enable)
+            if clear and isinstance(control, wx.TextCtrl): control.SetValue("")
+        if clear: self._ignore_events = restore
+
+    def _get_item_text(self, index, col):
+        if isinstance(col, str): col = self.columns.index(col)
+        return self.items.GetItem(index, col).GetText()
+
+    def _get_all_texts(self, index):
+        return [self._get_item_text(index, j) for j in range(len(self.columns))]
+
+    def _set_item_string(self, index, col, s):
+        if not isinstance(s, compat.unicode): s = misc.wxstr(s)
+        if isinstance(col, str): col = self.columns.index(col)
+        compat.ListCtrl_SetStringItem(self.items, index, col, s)
+    
+    def _insert_item_string(self, index, s):
+        if not isinstance(s, compat.unicode): s = misc.wxstr(s)
+        return compat.ListCtrl_InsertStringItem(self.items, index, s)
 
-    def add_item(self, event):
-        "Event handler called when the Add button is clicked"
-        index = self.selected_index = self.selected_index + 1
-        indent = ""
-        if not self.menu_items.GetItemCount():
+    def _add_new_item(self, unindented_item):
+        # helper for the next two methods
+        index = self.selected_index + 1
+        item_level = 0
+        if not self.items.GetItemCount():
             self._enable_fields()
         if index < 0:
-            index = self.menu_items.GetItemCount()
+            index = self.items.GetItemCount()
         elif index > 0:
-            indent = "    " * self.item_level(index-1)
-        name, label, id, check_radio = "", "item", "", "0"
-        self.menu_items.InsertStringItem(index, indent + label)
-        self.menu_items.SetStringItem(index, 2, name)
-        self.menu_items.SetStringItem(index, 3, check_radio)
-        self.menu_items.SetStringItem(index, 5, id)
-        # fix bug 698074
-        self.menu_items.SetItemState(index, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED)
+            item_level = self.item_level(index-1)
+        item = list(unindented_item)
+        if item[1]=="---" and item_level==0: return wx.Bell()
+        indent = "    " * item_level
+        item[0] = str(item_level)
+        item[1] = indent+item[1]
+        self._insert_item(index, item)
         self._select_item(index, force=True)
 
+    def add_item(self, event):
+        "Event handler called when the Add button is clicked"
+        self._add_new_item(self.default_item)
+
     def add_separator(self, event):
         "Event handler called when the Add Separator button is clicked"
-        index = self.selected_index + 1
-        label = '---'
-        if not self.menu_items.GetItemCount():
-            self._enable_fields()
-        if index < 0:
-            index = self.menu_items.GetItemCount()
-        elif index > 0:
-            label = "    " * self.item_level(index-1) + '---'
-        self.menu_items.InsertStringItem(index, label)
-        self.menu_items.SetStringItem(index, 2, '---')  # name
-        self.menu_items.SetStringItem(index, 5, '---')  # id
-        # fix bug 698074
-        self.menu_items.SetItemState(index, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED)
+        self._add_new_item(self.separator_item)
 
     def show_item(self, event):
         "Event handler called when a menu item in the list is selected"
@@ -267,50 +175,56 @@
         event.Skip()
 
     def _select_item(self, index, force=False):
-        if index >= self.menu_items.GetItemCount() or index<0 or (index==self.selected_index and not force): return
-        self._ignore_events = True
-        self.menu_items.Select(index)
+        item_count = self.items.GetItemCount()
+        if index == -1 and item_count: index = 0
+        if index >= item_count and item_count: index = item_count-1
+        if index==self.selected_index and not force: return
         self.selected_index = index
-        if self.menu_items.GetItem(index, 2).GetText() != '---':
+        if index == -1:
+            self._enable_fields(False, clear=True)
+            self._enable_buttons()
+            return
+
+        self._ignore_events = True
+        self.items.Select(index)
+
+        if self._get_item_text(index, "name") != '---':
             # skip if the selected item is a separator
-            for (s, i) in ((self.label, 0), (self.event_handler, 1), (self.name, 2), (self.help_str, 4), (self.id, 5)):
-                # at this point, the value should be validated already
-                s.SetBackgroundColour( compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW) )
-                s.SetValue(self.menu_items.GetItem(index, i).GetText())
+            for i,colname in enumerate(self.columns):
+                s = getattr(self, colname, None)
+                if not s: continue
+                coltype = self.coltypes.get(colname,None)
+                value = self._get_item_text(index, i)
+                if coltype is None:
+                    # at this point, the value should be validated already
+                    s.SetBackgroundColour( compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW) )
+                    s.SetValue(value)
+                elif coltype is int:
+                    s.SetSelection( int(value) )
             self.label.SetValue(self.label.GetValue().lstrip())
-            try:
-                self.check_radio.SetSelection( int(self.menu_items.GetItem(index, 3).GetText()) )
-            except:
-                self.check_radio.SetSelection(0)
             self._enable_fields(True)
-            # set focus to text field again
-            focus = self.FindFocus()
-            if not isinstance(focus, wx.TextCtrl) and isinstance(self._last_focus, wx.TextCtrl):
-                self._last_focus.SetFocus()
         else:
-            for c in (self.label, self.event_handler, self.name, self.help_str, self.id):
-                c.SetValue("")
-            self._enable_fields(False)
+            self._enable_fields(False, clear=True)
         self._enable_buttons()
-        if force:
-            self.label.SetFocus()
-            self.label.SelectAll()
+        state = wx.LIST_STATE_SELECTED | wx.LIST_STATE_FOCUSED
+        self.items.SetItemState(index, state, state)  # fix bug 698071
 
     def _enable_buttons(self):
         # activate the left/right/up/down buttons
         index = self.selected_index
-        item_level = self.item_level(index)
-        item_count = self.menu_items.GetItemCount()
-        self.move_left.Enable( not (index+1<item_count and (item_level < self.item_level(index+1)) ))
+        if index>=0: item_level = self.item_level(index)
+        item_count = self.items.GetItemCount()
+        self.move_left.Enable( index!=0 and not (index+1<item_count and (item_level < self.item_level(index+1)) ))
         self.move_right.Enable( index>=1 and item_level <= self.item_level(index-1) )
         self.move_up.Enable( index>0 )
         self.move_down.Enable( index<item_count-1 )
+        self.remove.Enable(item_count)
         self._ignore_events = False
 
     def on_label_edited(self, event):
         if not self._ignore_events:
             value = "    " * self.item_level(self.selected_index) + self.label.GetValue().lstrip()
-            self.menu_items.SetStringItem(self.selected_index, 0, value)
+            self._set_item_string(self.selected_index, "label", value)
         event.Skip()
 
     def on_event_handler_edited(self, event):
@@ -322,9 +236,7 @@
             self.event_handler.SetBackgroundColour(wx.RED)
             valid = False
         self.event_handler.Refresh()
-        if valid and not self._ignore_events:
-            self.menu_items.SetStringItem(self.selected_index, 1, value)
-        event.Skip()
+        self._on_edited(event, "event_handler", value, valid)
 
     def on_name_edited(self, event):
         value = self.name.GetValue()
@@ -336,75 +248,77 @@
             valid = False
         if value and valid and not self._ignore_events:
             # check for double names
-            for i in range(self.menu_items.GetItemCount()):
+            for i in range(self.items.GetItemCount()):
                 if i==self.selected_index: continue
-                if value == self.menu_items.GetItem(i, 2).GetText():
+                if value == self._get_item_text(i, "name"):
                     valid = False
                     self.name.SetBackgroundColour( wx.Colour(255, 255, 0, 255) )  # YELLOW
                     break
         self.name.Refresh()
+        self._on_edited(event, "name", value, valid)
+
+    def _on_edited(self, event, colname, value, valid=True):
         if valid and not self._ignore_events:
-            self.menu_items.SetStringItem(self.selected_index, 2, value)
+            self._set_item_string(self.selected_index, colname, value)
         event.Skip()
 
     def on_type_edited(self, event):
-        if not self._ignore_events:
-            self.menu_items.SetStringItem(self.selected_index, 3, str(self.check_radio.GetSelection()))
-        event.Skip()
+        self._on_edited(event, "type", str(self.type.GetSelection()))
 
     def on_help_str_edited(self, event):
-        if not self._ignore_events:
-            self.menu_items.SetStringItem(self.selected_index, 4, self.help_str.GetValue())
-        event.Skip()
+        self._on_edited(event, "help_str", self.help_str.GetValue())
 
     def on_id_edited(self, event):
-        if not self._ignore_events:
-            self.menu_items.SetStringItem(self.selected_index, 5, self.id.GetValue())
-        event.Skip()
+        self._on_edited(event, "id", self.id.GetValue())
 
     def item_level(self, index, label=None):
         "returns the indentation level of the menu item at the given index"
-        label = self.menu_items.GetItem(index, 0).GetText()
-        return (len(label) - len(label.lstrip())) // 4
+        return int(self._get_item_text(index, 0))
 
     def remove_item(self, event):
         "Event handler called when the Remove button is clicked"
         if self.selected_index < 0: return
-        index = self.selected_index+1
-        if index<self.menu_items.GetItemCount() and (self.item_level(self.selected_index) < self.item_level(index)):
+        index = self.selected_index
+        if index+1 < self.items.GetItemCount() and (self.item_level(index) < self.item_level(index+1)):
             # the item to be deleted is parent to the following item -> move up the following item
-            self._move_item_left(index)
-            #self.selected_index = index-1
-        for s in (self.name, self.id, self.label, self.help_str, self.event_handler):
-            s.SetValue("")
-        self.check_radio.SetSelection(0)
-        self.menu_items.DeleteItem(self.selected_index)
-        if not self.menu_items.GetItemCount():
-            self._enable_fields(False)
-        self.selected_index -= 1
-        self.menu_items.Select(self.selected_index)
+            self.move_item_left(index=index+1)
+        self.items.DeleteItem(index)
+        index = max(self.selected_index-1,0) if self.items.GetItemCount() else -1
+        self._select_item( index, force=True)
+
+    def _insert_item(self, index, item):
+        self._insert_item_string(index, item[0])
+        for col, value in enumerate(item):
+            if col==0: continue
+            value = compat.unicode(value) if value is not None else ""
+            self._set_item_string(index, col, value)
+        self.items.SetItemState(index, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED)  # fix bug 698074
+
+    def _get_item(self, index):
+        ret = []
+        for colname in self.columns:
+            value = self._get_item_text(index, colname)
+            if colname in self.coltypes:
+                value = self.coltypes[colname](value)
+            ret.append(value)
+        return ret
 
     def add_items(self, menus):
-        """adds the content of 'menus' to self.menu_items. menus is a sequence of
+        """adds the content of 'menus' to self.items. menus is a sequence of
         trees which describes the structure of the menus"""
-        indent = " " * 4
-        if compat.IS_CLASSIC:
-            set_item = self.menu_items.SetStringItem
-            add_item = self.menu_items.InsertStringItem
-        else:
-            set_item = self.menu_items.SetItem
-            add_item = self.menu_items.InsertItem
-        index = [0]
+        indent = "    "
 
         def add(node, level):
-            i = index[0]
-            add_item(i, misc.wxstr(indent * level + node.label.lstrip().replace("\t","\\t")))
-            set_item(i, 1, misc.wxstr(node.handler))
-            set_item(i, 2, misc.wxstr(node.name))
-            set_item(i, 4, misc.wxstr(node.help_str))
-            set_item(i, 5, misc.wxstr(node.id))
+            i = self.items.GetItemCount()
+            self._insert_item_string(i, level)
+            label = indent * level + node.label.lstrip().replace("\t","\\t")
+            self._set_item_string(i, "label", label)
+            self._set_item_string(i, "event_handler", node.handler)
+            self._set_item_string(i, "name", node.name)
+            self._set_item_string(i, "help_str", node.help_str)
+            self._set_item_string(i, "id", node.id)
             if node.label==node.name==node.id=='---':
-                set_item(i, 3, '')
+                self._set_item_string(i, "type", '')
             else:
                 item_type = 0
                 try:
@@ -414,30 +328,28 @@
                         item_type = 2
                 except ValueError:
                     pass
-                set_item(i, 3, misc.wxstr(item_type))
-            index[0] += 1
+                self._set_item_string(i, "type", misc.wxstr(item_type))
             for item in node.children:
                 add(item, level+1)
+
         for tree in menus:
             add(tree.root, 0)
-        if self.menu_items.GetItemCount():
+        if self.items.GetItemCount():
             self._enable_fields()
 
     def get_menus(self):
         """returns the contents of self.menu_items as a list of trees which
         describe the structure of the menus in the format used by EditMenuBar"""
-        #def get(i, j): return self.menu_items.GetItem(i, j).GetText()
-        def get(i, j): return self.menu_items.GetItem(i, j).GetText()
         trees = []
 
         def add(node, index):
-            label = get(index, 0).lstrip().replace("\\t", "\t")
-            id = get(index, 5)
-            name = get(index, 2)
-            help_str = get(index, 4)
-            event_handler = get(index, 1)
+            label         = self._get_item_text(index, "label").lstrip().replace("\\t", "\t")
+            id            = self._get_item_text(index, "id")
+            name          = self._get_item_text(index, "name")
+            help_str      = self._get_item_text(index, "help_str")
+            event_handler = self._get_item_text(index, "event_handler")
             try:
-                item_type = int(get(index, 3))
+                item_type = int(self._get_item_text(index, "type"))
             except ValueError:
                 item_type = 0
             checkable = item_type == 1 and misc.wxstr("1") or misc.wxstr("")
@@ -448,11 +360,12 @@
             return n
         level = 0
         curr_item = None
-        for index in range(self.menu_items.GetItemCount()):
-            label = get(index, 0).replace("\\t", "\t")
-            lvl = self.item_level(index)  # get the indentation level
+        for index in range(self.items.GetItemCount()):
+            label = self._get_item_text(index, "label").replace("\\t", "\t")
+            lvl = self.item_level(index)
             if not lvl:
-                t = MenuTree( get(index, 2), label, id=get(index, 5), handler=get(index, 1) )
+                t = MenuTree( self._get_item_text(index, "name"), label,
+                              id=self._get_item_text(index, "id"), handler=self._get_item_text(index, "event_handler") )
                 curr_item = t.root
                 level = 1
                 trees.append(t)
@@ -468,116 +381,108 @@
 
         return trees
 
-    def _move_item_left(self, index):
-        if index > 0:
-            if ( index+1 < self.menu_items.GetItemCount() and (self.item_level(index) < self.item_level(index+1)) ):
-                return
-            label = self.menu_items.GetItem(index, 0).GetText()
-            if label[:4] == "    ":
-                self.menu_items.SetStringItem(index, 0, label[4:])
-                self.menu_items.SetItemState(index, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED)
-            self._enable_buttons()
-
-    def move_item_left(self, event):
+    def move_item_left(self, event=None, index=None):
         """moves the selected menu item one level up in the hierarchy, i.e.
         shifts its label 4 spaces left in self.menu_items"""
-        self.menu_items.SetFocus()
-        self._move_item_left(self.selected_index)
-
-    def _move_item_right(self, index):
-        if index > 0 and (self.item_level(index) <= self.item_level(index-1)):
-            label = self.menu_items.GetItem(index, 0).GetText()
-            self.menu_items.SetStringItem(index, 0, misc.wxstr(" "*4) + label)
-            self.menu_items.SetItemState(index, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED)
-            self._enable_buttons()
+        if index is None:
+            index = self.selected_index
+        if index <= 0:
+            return wx.Bell()
+        level = self.item_level(index)
+        if level==0 or ( index+1 < self.items.GetItemCount() and (level < self.item_level(index+1)) ):
+            return wx.Bell()
+        label = self._get_item_text(index, "label")
+        if level==1 and label.endswith("---"):
+            return wx.Bell()
+        level -= 1
+        self._set_item_string(index, "label", label[4:])
+        self._set_item_string(index, "level", level)
+        self.items.SetItemState(index, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED)
+        self._enable_buttons()
 
     def move_item_right(self, event):
         """moves the selected menu item one level down in the hierarchy, i.e.
         shifts its label 4 spaces right in self.menu_items"""
-        self.menu_items.SetFocus()
-        self._move_item_right(self.selected_index)
+        index = self.selected_index
+        if index <= 0:
+            wx.Bell()
+            return
+        level = self.item_level(index)
+        if level > self.item_level(index-1):
+            wx.Bell()
+            return
+        level += 1
+        label = self._get_item_text(index, "label")
+        self._set_item_string(index, "label", misc.wxstr(" "*4) + label)
+        self._set_item_string(index, "level", level)
+        self.items.SetItemState(index, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED)
+        self._enable_buttons()
 
     def move_item_up(self, event):
         "moves the selected menu item before the previous one at the same level in self.menu_items"
-        self.menu_items.SetFocus()
-        index = self._do_move_item(event, self.selected_index, False)
-        if index is not None:
-            state = wx.LIST_STATE_SELECTED | wx.LIST_STATE_FOCUSED
-            self.menu_items.SetItemState(index, state, state)
+        if self.selected_index<=0:
+            wx.Bell()
+            return
+        self._do_move_item(event, self.selected_index, False)
 
     def _do_move_item(self, event, index, is_down):
         """internal function used by move_item_up and move_item_down.
         Returns the new index of the moved item, or None if no change occurred"""
-        #index = self.selected_index
-        if index <= 0: return None
-
-        def get(i, j): return self.menu_items.GetItem(i, j).GetText()
+        if index <= 0:
+            return wx.Bell()
 
-        def getall(i): return [get(i, j) for j in range(6)]
         level = self.item_level(index)
-        items_to_move = [ getall(index) ]
+        items_to_move = [ self._get_all_texts(index) ]
         i = index+1
-        while i < self.menu_items.GetItemCount():
+        while i < self.items.GetItemCount():
             # collect the items to move up
-            if level < self.item_level(i):
-                items_to_move.append(getall(i))
+            if self.item_level(i) > level:
+                items_to_move.append(self._get_all_texts(i))
                 i += 1
             else: break
         i = index-1
         while i >= 0:
             lvl = self.item_level(i)
             if level == lvl: break
-            elif level > lvl: return None
+            elif level > lvl:
+                return wx.Bell()
             i -= 1
-        delete = self.menu_items.DeleteItem
-        insert = self.menu_items.InsertStringItem
-        set = self.menu_items.SetStringItem
         for j in range(len(items_to_move)-1, -1, -1):
-            delete(index+j)
+            self.items.DeleteItem(index+j)
         items_to_move.reverse()
-        for label, id, name, help_str, check_radio, event_handler in items_to_move:
-            i = insert(i, label)
-            set(i, 1, id)
-            set(i, 2, name)
-            set(i, 3, help_str)
-            set(i, 4, check_radio)
-            set(i, 5, event_handler)
+        for level, label, event_handler, name, type_, help_str, id in items_to_move:
+            i = self._insert_item_string(i, level)
+            self._set_item_string(i, "label", label)
+            self._set_item_string(i, "name", name)
+            self._set_item_string(i, "help_str", help_str)
+            self._set_item_string(i, "type", type_)
+            self._set_item_string(i, "event_handler", event_handler)
+            self._set_item_string(i, "id", id)
         ret_idx = i
         if is_down: ret_idx += len(items_to_move)
-        return ret_idx
+        self._select_item(ret_idx, True)
 
     def move_item_down(self, event):
         "moves the selected menu item after the next one at the same level in self.menu_items"
-        self.menu_items.SetFocus()
+        if self.selected_index < 0: return
         index = self.selected_index
-        self.selected_index = -1
-        if index < 0: return
-
-        def get(i, j): return self.menu_items.GetItem(i, j).GetText()
 
-        def getall(i): return [get(i, j) for j in range(6)]
         level = self.item_level(index)
         i = index+1
-        while i < self.menu_items.GetItemCount():
+        while i < self.items.GetItemCount():
             # collect the items to move down
-            if level < self.item_level(i):
+            if self.item_level(i) > level:
                 i += 1
             else: break
-        if i < self.menu_items.GetItemCount():
-            # _do_move_item works with selected_index, so we must assing to
-            # it the right value before the call
-            #self.selected_index = i
-            self.selected_index = self._do_move_item(event, i, True)
-            # fix bug 698071
-            state = wx.LIST_STATE_SELECTED | wx.LIST_STATE_FOCUSED
-            self.menu_items.SetItemState(self.selected_index, state, state)
+        if i < self.items.GetItemCount():
+            self._do_move_item(event, i, True)
         else:
-            # restore the selected index
-            self.selected_index = index
+            wx.Bell()
 
     # the action buttons are not linked to ESC and Enter to avoid accidental modifications
     def on_cancel(self, event):
         self.EndModal(wx.ID_CANCEL)
+
     def on_OK(self, event):
         self.EndModal(wx.ID_OK)
 
@@ -587,7 +492,6 @@
 
     def __init__(self):
         np.Property.__init__(self, [])
-        #self.menu_items = {}
 
     def create_editor(self, panel, sizer):
         self.edit_btn = wx.Button(panel, -1, _("Edit menus..."))
@@ -603,7 +507,9 @@
             parent = None
         dialog = MenuItemDialog( parent, self.owner, items=self.value )
         if not self.value: dialog.add_item(None)
-        if dialog.ShowModal() == wx.ID_OK:
+        with misc.disable_stay_on_top(common.adding_window or parent):
+            res = dialog.ShowModal()
+        if res == wx.ID_OK:
             self.on_value_edited(dialog.get_menus())
         dialog.Destroy()
 
@@ -631,21 +537,13 @@
         if name == 'menu':
             self.menu_depth += 1
             if self.menu_depth == 1:
-                t = MenuTree(attrs['name'],
-                             attrs['label'],
-                             attrs.get('itemid', ''),
-                             attrs.get('help_str', ''),
-                             handler=attrs.get('handler', ''))
+                t = MenuTree( attrs['name'], attrs['label'], attrs.get('itemid', ''), attrs.get('help_str', ''),
+                              handler=attrs.get('handler', '') )
                 self.curr_menu.append( (t.root,) )
-                #self.owner.menus.append(t)
-                #self.owner.properties["menus"].value.append(t)
                 self.menus.append(t)
                 return
-            node = MenuTree.Node(label=attrs['label'],
-                                 name=attrs['name'],
-                                 id=attrs.get('itemid', ''),
-                                 help_str=attrs.get('help_str', ''),
-                                 handler=attrs.get('handler', ''))
+            node = MenuTree.Node( label=attrs['label'], name=attrs['name'], id=attrs.get('itemid', ''),
+                                  help_str=attrs.get('help_str', ''), handler=attrs.get('handler', '') )
             cm = self.curr_menu[-1]
             cm[0].children.append(node)
             node.parent = cm[0]
@@ -676,10 +574,7 @@
             self.menu_depth -= 1
             self.curr_menu.pop()
         elif name == 'menus':
-            #self.owner.set_menus(self.owner.menus)
-            #self.owner.properties["menus"].set(self.owner.menus)
-            self.owner.properties["menus"].set(self.menus)
-            self.owner.properties_changed(["menus"])
+            self.owner.properties["menus"].load(self.menus)
             return True
 
     def char_data(self, data):
@@ -689,38 +584,30 @@
 
 
 
-class EditMenuBar(EditBase, PreviewMixin):
-    __hidden_frame = None  # used on GTK to reparent a menubar before deletion
+class EditMenuBar(EditBase):#, PreviewMixin):
 
-    _PROPERTIES = ["menus", "preview"]
+    WX_CLASS = "wxMenuBar"
+    _PROPERTIES = ["menus",]
     PROPERTIES = EditBase.PROPERTIES + _PROPERTIES + EditBase.EXTRA_PROPERTIES
+    CHILDREN = 0
 
-    def __init__(self, name, klass, parent):
-        custom_class = parent is None
-        EditBase.__init__(self, name, klass, parent, wx.NewId(), custom_class=custom_class)
-        self.base = 'wxMenuBar'
+    def __init__(self, name, parent):
+        EditBase.__init__(self, name, parent, "_menubar")
 
         self.menus = MenuProperty()
         self.window_id = None  # just a dummy for code generation
 
         self._mb = None  # the real menubar
-        if not self.parent:
-            PreviewMixin.__init__(self)  # add a preview button
-            self._is_toplevel = True
-        else:
-            self.preview = None
-            self._is_toplevel = False
+        self.parent.properties["menubar"].set(True, notify=False)
+
+    def create(self):
+        EditBase.create(self)
+        if self.IS_TOPLEVEL and self.widget:
+            self.widget.Show()
+            self.widget.Raise()
 
     def create_widget(self):
-        if wx.Platform == '__WXGTK__' and not EditMenuBar.__hidden_frame:
-            EditMenuBar.__hidden_frame = wx.Frame(common.main, -1, "")
-            EditMenuBar.__hidden_frame.Hide()
-        if self.parent:
-            self.widget = self._mb = wx.MenuBar()
-            if self.parent.widget: self.parent.widget.SetMenuBar(self.widget)
-            if wx.Platform == '__WXMSW__' or wx.Platform == '__WXMAC__':
-                self.widget.SetFocus = lambda : None
-        else:
+        if self.IS_TOPLEVEL:
             # "top-level" menubar
             self.widget = wx.Frame(None, -1, misc.design_title(self.name))
             self.widget.SetClientSize((400, 30))
@@ -729,13 +616,25 @@
             self.widget.SetBackgroundColour(self._mb.GetBackgroundColour())
             import os
             icon = compat.wx_EmptyIcon()
-            xpm = os.path.join(config.icons_path, 'menubar.xpm')
+            xpm = os.path.join(config.icons_path, 'menubar.png')
             icon.CopyFromBitmap(misc.get_xpm_bitmap(xpm))
             self.widget.SetIcon(icon)
             self.widget.Bind(wx.EVT_CLOSE, lambda e: self.hide_widget())
+        else:
+            if wx.Platform=="_WXMAC__": return   # XXX check how a toplevel menu bar behaves on Mac OS
+            self.widget = self._mb = wx.MenuBar()
+            if self.parent.widget: self.parent.widget.SetMenuBar(self.widget)
+            if wx.Platform == '__WXMSW__' or wx.Platform == '__WXMAC__':
+                self.widget.SetFocus = lambda : None
+
         self.widget.Bind(wx.EVT_LEFT_DOWN, self.on_set_focus)
         self.set_menus()  # show the menus
 
+    def remove(self):
+        EditBase.remove(self)
+        if 'menubar' in self.parent.properties:
+            self.parent.properties['menubar'].set(False)
+
     def set_menus(self):
         if not self._mb: return  # nothing left to do
         for i in range(self._mb.GetMenuCount()):
@@ -773,27 +672,21 @@
             else: self._mb.Append(m, misc.wxstr(menu.root.label))
         self._mb.Refresh()
 
-    def remove(self, *args, **kwds):
-        if self.parent is not None:
-            self.parent.properties['menubar'].set(False)
-            self.parent._menubar = None
-            if kwds.get('gtk_do_nothing', False) and wx.Platform == '__WXGTK__':
-                # workaround to prevent some segfaults on GTK: unfortunately,
-                # I'm not sure that this works in all cases, and moreover it
-                # could probably leak some memory (but I'm not sure)
-                self.widget = None
-            else:
-                if self.parent.widget:
-                    self.parent.widget.SetMenuBar(None)
-        else:
-            if self.widget:
-                compat.DestroyLater(self.widget)
-                self.widget = None
-        EditBase.remove(self)
+    def destroy_widget(self, level):
+        # if parent is being deleted, we rely on this being destroyed
+        if level==0 and not self.IS_TOPLEVEL and self.parent.widget:
+            self.parent.widget.SetMenuBar(None)
+        if level==0:
+            EditBase.destroy_widget(self, level)
+
+    def hide_widget(self, *args):
+        if self.widget and self.IS_TOPLEVEL:
+            self.widget.Hide()
+            common.app_tree.Collapse(self.item)
+            common.app_tree.select_item(self.parent)
 
     def popup_menu(self, event, pos=None):
-        if self.parent is not None:
-            return  # do nothing in this case
+        if not self.IS_TOPLEVEL: return
         super(EditMenuBar, self).popup_menu(event, pos)
 
     def _create_popup_menu(self, widget=None):
@@ -816,12 +709,6 @@
 
         return menu
 
-    def hide_widget(self, *args):
-        if self.widget and self.widget is not self._mb:
-            self.widget.Hide()
-            common.app_tree.expand(self.node, False)
-            common.app_tree.select_item(self.node.parent)
-
     def set_name(self, name):
         EditBase.set_name(self, name)
         if self.widget is not self._mb:
@@ -832,70 +719,90 @@
             return MenuHandler(self)
         return None
 
-    def properties_changed(self, modified):
-        if not modified or "menus" in modified:
-            self.set_menus()
-        EditBase.properties_changed(self, modified)
+    def _properties_changed(self, modified, actions):
+        if not modified or "menus" in modified: self.set_menus()
+        EditBase._properties_changed(self, modified, actions)
 
-    def check_compatibility(self, widget, typename=None, report=False):
+    def check_compatibility(self, widget, typename=None):
         return (False,"No pasting possible here.")
     def check_drop_compatibility(self):
         return (False,"Use menu editor: Properties -> Edit menus...")
 
 
 
-def builder(parent, sizer, pos, number=[0]):
-    "factory function for EditMenuBar objects"
-    import window_dialog as wd
-    klass = 'wxMenuBar' if common.app_tree.app.language.lower()=='xrc' else 'MyMenuBar'
+class EditTopLevelMenuBar(EditMenuBar, PreviewMixin):
+    WXG_BASE = "EditMenuBar"
+    IS_TOPLEVEL = True
+    _PROPERTIES = ["menus", "preview"]
+    PROPERTIES = EditBase.PROPERTIES + _PROPERTIES + EditBase.EXTRA_PROPERTIES
+    np.insert_after(PROPERTIES, "name", "class")
+    TREE_ICON = "EditMenuBar"
 
-    # if e.g. on a frame, suggest the user to add the menu bar to this
-    toplevel_widget = None
-    if misc.focused_widget is not None and misc.focused_widget.node.parent:
-        toplevel_widget = common.app_tree._find_toplevel(misc.focused_widget.node).widget
-        if not "menubar" in toplevel_widget.properties:
-            toplevel_widget = None
-    if toplevel_widget is not None:
-        dialog = wd.StandaloneOrChildDialog(klass, "Select menubar type and class", toplevel_widget, "menubar")
+    def __init__(self, name, parent, class_):
+        EditBase.__init__(self, name, parent, None, class_)
+
+        self.menus = MenuProperty()
+        self.window_id = None  # just a dummy for code generation
+
+        self._mb = None  # the real menubar
+
+        PreviewMixin.__init__(self)  # add a preview button
+
+    def show_widget(self):
+        if not self.widget: self.create()
+        self.widget.Show()
+
+
+def builder(parent, index, klass=None):
+    "factory function for EditMenuBar objects"
+    # this one is a bit special as usually it's called with parent=application
+    # if a frame w/o menubar is focused, it will ask the user whether he wants to add a menubar to that
+    if klass is None:
+        import window_dialog as wd
+        klass = 'wxMenuBar' if common.root.language.lower()=='xrc' else 'MyMenuBar'
+    
+        # if e.g. on a frame, suggest the user to add the menu bar to this
+        toplevel_widget = None
+        if misc.focused_widget is not None and not misc.focused_widget.IS_ROOT:
+            toplevel_widget = misc.focused_widget.toplevel_parent
+            if not "menubar" in toplevel_widget.properties: toplevel_widget = None
+        if toplevel_widget is not None:
+            dialog = wd.StandaloneOrChildDialog(klass, "Select menubar type and class", toplevel_widget, "menubar")
+        else:
+            dialog = wd.WindowDialog(klass, None, 'Select standalone menubar class', True)
+    
+        klass = dialog.show()
+        dialog.Destroy()
+        if klass is None: return None
     else:
-        dialog = wd.WindowDialog(klass, None, 'Select standalone menubar class', True)
+        # allow to call builder(frame, None, True)
+        toplevel_widget = parent
 
-    klass = dialog.show()
-    dialog.Destroy()
-    if klass is None: return
-    if klass is True:
-        # add to toplevel widget
-        toplevel_widget.properties["menubar"].set(True, notify=True)
-        return
-    name = dialog.get_next_name("menubar")
-    with parent and parent.frozen() or misc.dummy_contextmanager():
-        mb = EditMenuBar(name, klass, parent)
-        mb.node = Node(mb)
-        common.app_tree.add(mb.node)
-        mb.create()
-        mb.widget.Show()
+    if index=="_menubar" or klass is True:
+        # add to frame
+        editor = EditMenuBar(toplevel_widget.name+"_menubar", toplevel_widget)
+        if toplevel_widget.widget: editor.create()
+        return editor
 
+    # a standalone menubar
+    name = dialog.get_next_name("menubar")
+    editor = EditTopLevelMenuBar(name, parent, klass)
+    editor.create()
+    editor.widget.Show()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditMenuBar objects from a XML file"
-    name = attrs.get('name')
-    if parent is not None:
-        if name:
-            parent._menubar.properties["name"].set(name)
-            parent._menubar.properties_changed(["name"])
-        return parent._menubar
-    else:
-        mb = EditMenuBar(name, attrs.get('class', 'wxMenuBar'), None)
-        mb.node = Node(mb)
-        common.app_tree.add(mb.node)
-        return mb
+    if parent.IS_ROOT:
+        return EditTopLevelMenuBar(name, parent, "MenuBar")
+    return EditMenuBar(name, parent)
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
-    cwx = common.widgets_from_xml
-    cwx['EditMenuBar'] = xml_builder
+    common.widget_classes['EditMenuBar'] = EditMenuBar
     common.widgets['EditMenuBar'] = builder
+    common.widgets_from_xml['EditMenuBar'] = xml_builder
 
-    return common.make_object_button('EditMenuBar', 'menubar.xpm', 1)
+    return common.make_object_button('EditMenuBar', 'menubar.png', 1)
diff -Nru wxglade-0.9.6/widgets/menubar/MenuItemDialog28.py wxglade-1.0.1/widgets/menubar/MenuItemDialog28.py
--- wxglade-0.9.6/widgets/menubar/MenuItemDialog28.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/widgets/menubar/MenuItemDialog28.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,221 @@
+# -*- coding: CP1252 -*-
+#
+# generated by wxGlade 1.0.0a8 on Sun Oct  4 20:07:03 2020
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MenuItemDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MenuItemDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetSize((900, 600))
+        self.SetTitle("Menu Editor")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_5, 0, wx.EXPAND, 0)
+
+        grid_sizer_2 = wx.FlexGridSizer(5, 2, 0, 0)
+        sizer_5.Add(grid_sizer_2, 2, wx.EXPAND, 0)
+
+        label_6 = wx.StaticText(self, wx.ID_ANY, "Label:")
+        label_6.SetToolTipString("The menu entry text;\nenter & for access keys (using ALT key)\nappend e.g. \\tCtrl-X for keyboard shortcut")
+        grid_sizer_2.Add(label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.label = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.label.SetToolTipString("The menu entry text;\nenter & for access keys (using ALT key)\nappend e.g. \\tCtrl-X for keyboard shortcut")
+        grid_sizer_2.Add(self.label, 1, wx.EXPAND, 0)
+
+        label_7 = wx.StaticText(self, wx.ID_ANY, "Event Handler:")
+        label_7.SetToolTipString("Enter the name of an event handler method; this will be created as stub.\n\nAlternatively, for Python you may supply a lambda function like e.g.:\nlambda evt: self.on_menu_item('item x')")
+        grid_sizer_2.Add(label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.event_handler = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.event_handler.SetToolTipString("Enter the name of an event handler method; this will be created as stub.\n\nAlternatively, for Python you may supply a lambda function like e.g.:\nlambda evt: self.on_menu_item('item x')")
+        grid_sizer_2.Add(self.event_handler, 1, wx.EXPAND, 0)
+
+        label_8 = wx.StaticText(self, wx.ID_ANY, "(Attribute) Name:")
+        label_8.SetToolTipString("optional: enter a name to store the menu item as attribute of the menu bar")
+        grid_sizer_2.Add(label_8, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.name = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.name.SetToolTipString("optional: enter a name to store the menu item as attribute of the menu bar")
+        grid_sizer_2.Add(self.name, 1, wx.EXPAND, 0)
+
+        label_9 = wx.StaticText(self, wx.ID_ANY, "Help String:")
+        grid_sizer_2.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.help_str = wx.TextCtrl(self, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.help_str, 1, wx.EXPAND, 0)
+
+        label_10 = wx.StaticText(self, wx.ID_ANY, "ID:")
+        label_10.SetToolTipString("optional: enter wx ID")
+        grid_sizer_2.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.id = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.id.SetToolTipString("optional: enter wx ID")
+        grid_sizer_2.Add(self.id, 0, 0, 0)
+
+        self.type = wx.RadioBox(self, wx.ID_ANY, "Type", choices=["Normal", "Checkable", "Radio"], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        self.type.SetSelection(0)
+        sizer_5.Add(self.type, 0, wx.ALL | wx.EXPAND, 4)
+
+        sizer_5.Add((20, 20), 1, wx.EXPAND, 0)
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+        sizer_5.Add(sizer_6, 0, wx.EXPAND, 0)
+
+        self.ok = wx.Button(self, wx.ID_OK, "&OK")
+        self.ok.SetToolTipString("Alt+O or Alt+Enter or Ctrl+Enter")
+        sizer_6.Add(self.ok, 0, wx.ALL, 5)
+
+        self.cancel = wx.Button(self, wx.ID_CANCEL, "&Cancel")
+        self.cancel.SetToolTipString("Alt+C or Alt+F4")
+        sizer_6.Add(self.cancel, 0, wx.ALL, 5)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_2, 0, wx.EXPAND, 0)
+
+        self.move_left = wx.Button(self, wx.ID_ANY, "&<")
+        self.move_left.SetToolTipString("Move the selected item up by one menu level (Alt-Left)")
+        sizer_2.Add(self.move_left, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
+
+        self.move_right = wx.Button(self, wx.ID_ANY, "&>")
+        self.move_right.SetToolTipString("Move the selected item down by one menu level (Alt-Right)")
+        sizer_2.Add(self.move_right, 0, wx.BOTTOM | wx.RIGHT | wx.TOP, 8)
+
+        self.move_up = wx.Button(self, wx.ID_ANY, "&Up")
+        self.move_up.SetToolTipString("Move selected item up (Alt-Up)")
+        sizer_2.Add(self.move_up, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
+
+        self.move_down = wx.Button(self, wx.ID_ANY, "&Down")
+        self.move_down.SetToolTipString("Move selected item down (Alt-Down)")
+        sizer_2.Add(self.move_down, 0, wx.BOTTOM | wx.RIGHT | wx.TOP, 8)
+
+        sizer_2.Add((20, 20), 1, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.add = wx.Button(self, wx.ID_ANY, "&Add")
+        self.add.SetToolTipString("Alt+A")
+        sizer_2.Add(self.add, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
+
+        self.remove = wx.Button(self, wx.ID_ANY, "&Remove")
+        self.remove.SetToolTipString("Alt+R")
+        sizer_2.Add(self.remove, 0, wx.BOTTOM | wx.TOP, 8)
+
+        self.add_sep = wx.Button(self, wx.ID_ANY, "Add &Separator")
+        self.add_sep.SetToolTipString("Alt+S")
+        sizer_2.Add(self.add_sep, 0, wx.ALL, 8)
+
+        sizer_2.Add((20, 20), 2, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.items = wx.ListCtrl(self, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_EDIT_LABELS | wx.LC_REPORT | wx.LC_SINGLE_SEL)
+        self.items.SetToolTipString("For navigation use the mouse or the up/down arrows")
+        self.items.InsertColumn(0, "Level", format=wx.LIST_FORMAT_LEFT, width=30)
+        self.items.InsertColumn(1, "Label", format=wx.LIST_FORMAT_LEFT, width=180)
+        self.items.InsertColumn(2, "Event Handler", format=wx.LIST_FORMAT_LEFT, width=180)
+        self.items.InsertColumn(3, "Name", format=wx.LIST_FORMAT_LEFT, width=120)
+        self.items.InsertColumn(4, "Type", format=wx.LIST_FORMAT_LEFT, width=35)
+        self.items.InsertColumn(5, "Help String", format=wx.LIST_FORMAT_LEFT, width=250)
+        self.items.InsertColumn(6, "ID", format=wx.LIST_FORMAT_LEFT, width=50)
+        sizer_1.Add(self.items, 1, wx.EXPAND, 0)
+
+        grid_sizer_2.AddGrowableCol(1)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+
+        self.Bind(wx.EVT_TEXT, self.on_label_edited, self.label)
+        self.Bind(wx.EVT_TEXT, self.on_event_handler_edited, self.event_handler)
+        self.Bind(wx.EVT_TEXT, self.on_name_edited, self.name)
+        self.Bind(wx.EVT_TEXT, self.on_help_str_edited, self.help_str)
+        self.Bind(wx.EVT_TEXT, self.on_id_edited, self.id)
+        self.Bind(wx.EVT_RADIOBOX, self.on_type_edited, self.type)
+        self.Bind(wx.EVT_BUTTON, self.on_OK, self.ok)
+        self.Bind(wx.EVT_BUTTON, self.on_cancel, self.cancel)
+        self.Bind(wx.EVT_BUTTON, self.move_item_left, self.move_left)
+        self.Bind(wx.EVT_BUTTON, self.move_item_right, self.move_right)
+        self.Bind(wx.EVT_BUTTON, self.move_item_up, self.move_up)
+        self.Bind(wx.EVT_BUTTON, self.move_item_down, self.move_down)
+        self.Bind(wx.EVT_BUTTON, self.add_item, self.add)
+        self.Bind(wx.EVT_BUTTON, self.remove_item, self.remove)
+        self.Bind(wx.EVT_BUTTON, self.add_separator, self.add_sep)
+        self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.on_label_edited, self.items)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.show_item, self.items)
+        # end wxGlade
+
+    def on_label_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_label_edited' not implemented!")
+        event.Skip()
+
+    def on_event_handler_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_event_handler_edited' not implemented!")
+        event.Skip()
+
+    def on_name_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_name_edited' not implemented!")
+        event.Skip()
+
+    def on_help_str_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_help_str_edited' not implemented!")
+        event.Skip()
+
+    def on_id_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_id_edited' not implemented!")
+        event.Skip()
+
+    def on_type_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_type_edited' not implemented!")
+        event.Skip()
+
+    def on_OK(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_OK' not implemented!")
+        event.Skip()
+
+    def on_cancel(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_cancel' not implemented!")
+        event.Skip()
+
+    def move_item_left(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'move_item_left' not implemented!")
+        event.Skip()
+
+    def move_item_right(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'move_item_right' not implemented!")
+        event.Skip()
+
+    def move_item_up(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'move_item_up' not implemented!")
+        event.Skip()
+
+    def move_item_down(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'move_item_down' not implemented!")
+        event.Skip()
+
+    def add_item(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'add_item' not implemented!")
+        event.Skip()
+
+    def remove_item(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'remove_item' not implemented!")
+        event.Skip()
+
+    def add_separator(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'add_separator' not implemented!")
+        event.Skip()
+
+    def show_item(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'show_item' not implemented!")
+        event.Skip()
+
+# end of class MenuItemDialog
diff -Nru wxglade-0.9.6/widgets/menubar/MenuItemDialog.py wxglade-1.0.1/widgets/menubar/MenuItemDialog.py
--- wxglade-0.9.6/widgets/menubar/MenuItemDialog.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/widgets/menubar/MenuItemDialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,221 @@
+# -*- coding: CP1252 -*-
+#
+# generated by wxGlade 1.0.0a8 on Sun Oct  4 20:06:52 2020
+#
+
+import wx
+
+# begin wxGlade: dependencies
+# end wxGlade
+
+# begin wxGlade: extracode
+# end wxGlade
+
+
+class MenuItemDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        # begin wxGlade: MenuItemDialog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetSize((900, 600))
+        self.SetTitle("Menu Editor")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_5, 0, wx.EXPAND, 0)
+
+        grid_sizer_2 = wx.FlexGridSizer(5, 2, 0, 0)
+        sizer_5.Add(grid_sizer_2, 2, wx.EXPAND, 0)
+
+        label_6 = wx.StaticText(self, wx.ID_ANY, "Label:")
+        label_6.SetToolTip("The menu entry text;\nenter & for access keys (using ALT key)\nappend e.g. \\tCtrl-X for keyboard shortcut")
+        grid_sizer_2.Add(label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.label = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.label.SetToolTip("The menu entry text;\nenter & for access keys (using ALT key)\nappend e.g. \\tCtrl-X for keyboard shortcut")
+        grid_sizer_2.Add(self.label, 1, wx.EXPAND, 0)
+
+        label_7 = wx.StaticText(self, wx.ID_ANY, "Event Handler:")
+        label_7.SetToolTip("Enter the name of an event handler method; this will be created as stub.\n\nAlternatively, for Python you may supply a lambda function like e.g.:\nlambda evt: self.on_menu_item('item x')")
+        grid_sizer_2.Add(label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.event_handler = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.event_handler.SetToolTip("Enter the name of an event handler method; this will be created as stub.\n\nAlternatively, for Python you may supply a lambda function like e.g.:\nlambda evt: self.on_menu_item('item x')")
+        grid_sizer_2.Add(self.event_handler, 1, wx.EXPAND, 0)
+
+        label_8 = wx.StaticText(self, wx.ID_ANY, "(Attribute) Name:")
+        label_8.SetToolTip("optional: enter a name to store the menu item as attribute of the menu bar")
+        grid_sizer_2.Add(label_8, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.name = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.name.SetToolTip("optional: enter a name to store the menu item as attribute of the menu bar")
+        grid_sizer_2.Add(self.name, 1, wx.EXPAND, 0)
+
+        label_9 = wx.StaticText(self, wx.ID_ANY, "Help String:")
+        grid_sizer_2.Add(label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.help_str = wx.TextCtrl(self, wx.ID_ANY, "")
+        grid_sizer_2.Add(self.help_str, 1, wx.EXPAND, 0)
+
+        label_10 = wx.StaticText(self, wx.ID_ANY, "ID:")
+        label_10.SetToolTip("optional: enter wx ID")
+        grid_sizer_2.Add(label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.id = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.id.SetToolTip("optional: enter wx ID")
+        grid_sizer_2.Add(self.id, 0, 0, 0)
+
+        self.type = wx.RadioBox(self, wx.ID_ANY, "Type", choices=["Normal", "Checkable", "Radio"], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        self.type.SetSelection(0)
+        sizer_5.Add(self.type, 0, wx.ALL | wx.EXPAND, 4)
+
+        sizer_5.Add((20, 20), 1, wx.EXPAND, 0)
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+        sizer_5.Add(sizer_6, 0, wx.EXPAND, 0)
+
+        self.ok = wx.Button(self, wx.ID_OK, "&OK")
+        self.ok.SetToolTip("Alt+O or Alt+Enter or Ctrl+Enter")
+        sizer_6.Add(self.ok, 0, wx.ALL, 5)
+
+        self.cancel = wx.Button(self, wx.ID_CANCEL, "&Cancel")
+        self.cancel.SetToolTip("Alt+C or Alt+F4")
+        sizer_6.Add(self.cancel, 0, wx.ALL, 5)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_2, 0, wx.EXPAND, 0)
+
+        self.move_left = wx.Button(self, wx.ID_ANY, "&<")
+        self.move_left.SetToolTip("Move the selected item up by one menu level (Alt-Left)")
+        sizer_2.Add(self.move_left, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
+
+        self.move_right = wx.Button(self, wx.ID_ANY, "&>")
+        self.move_right.SetToolTip("Move the selected item down by one menu level (Alt-Right)")
+        sizer_2.Add(self.move_right, 0, wx.BOTTOM | wx.RIGHT | wx.TOP, 8)
+
+        self.move_up = wx.Button(self, wx.ID_ANY, "&Up")
+        self.move_up.SetToolTip("Move selected item up (Alt-Up)")
+        sizer_2.Add(self.move_up, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
+
+        self.move_down = wx.Button(self, wx.ID_ANY, "&Down")
+        self.move_down.SetToolTip("Move selected item down (Alt-Down)")
+        sizer_2.Add(self.move_down, 0, wx.BOTTOM | wx.RIGHT | wx.TOP, 8)
+
+        sizer_2.Add((20, 20), 1, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.add = wx.Button(self, wx.ID_ANY, "&Add")
+        self.add.SetToolTip("Alt+A")
+        sizer_2.Add(self.add, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
+
+        self.remove = wx.Button(self, wx.ID_ANY, "&Remove")
+        self.remove.SetToolTip("Alt+R")
+        sizer_2.Add(self.remove, 0, wx.BOTTOM | wx.TOP, 8)
+
+        self.add_sep = wx.Button(self, wx.ID_ANY, "Add &Separator")
+        self.add_sep.SetToolTip("Alt+S")
+        sizer_2.Add(self.add_sep, 0, wx.ALL, 8)
+
+        sizer_2.Add((20, 20), 2, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.items = wx.ListCtrl(self, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_EDIT_LABELS | wx.LC_REPORT | wx.LC_SINGLE_SEL)
+        self.items.SetToolTip("For navigation use the mouse or the up/down arrows")
+        self.items.AppendColumn("Level", format=wx.LIST_FORMAT_LEFT, width=30)
+        self.items.AppendColumn("Label", format=wx.LIST_FORMAT_LEFT, width=180)
+        self.items.AppendColumn("Event Handler", format=wx.LIST_FORMAT_LEFT, width=180)
+        self.items.AppendColumn("Name", format=wx.LIST_FORMAT_LEFT, width=120)
+        self.items.AppendColumn("Type", format=wx.LIST_FORMAT_LEFT, width=35)
+        self.items.AppendColumn("Help String", format=wx.LIST_FORMAT_LEFT, width=250)
+        self.items.AppendColumn("ID", format=wx.LIST_FORMAT_LEFT, width=50)
+        sizer_1.Add(self.items, 1, wx.EXPAND, 0)
+
+        grid_sizer_2.AddGrowableCol(1)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+
+        self.Bind(wx.EVT_TEXT, self.on_label_edited, self.label)
+        self.Bind(wx.EVT_TEXT, self.on_event_handler_edited, self.event_handler)
+        self.Bind(wx.EVT_TEXT, self.on_name_edited, self.name)
+        self.Bind(wx.EVT_TEXT, self.on_help_str_edited, self.help_str)
+        self.Bind(wx.EVT_TEXT, self.on_id_edited, self.id)
+        self.Bind(wx.EVT_RADIOBOX, self.on_type_edited, self.type)
+        self.Bind(wx.EVT_BUTTON, self.on_OK, self.ok)
+        self.Bind(wx.EVT_BUTTON, self.on_cancel, self.cancel)
+        self.Bind(wx.EVT_BUTTON, self.move_item_left, self.move_left)
+        self.Bind(wx.EVT_BUTTON, self.move_item_right, self.move_right)
+        self.Bind(wx.EVT_BUTTON, self.move_item_up, self.move_up)
+        self.Bind(wx.EVT_BUTTON, self.move_item_down, self.move_down)
+        self.Bind(wx.EVT_BUTTON, self.add_item, self.add)
+        self.Bind(wx.EVT_BUTTON, self.remove_item, self.remove)
+        self.Bind(wx.EVT_BUTTON, self.add_separator, self.add_sep)
+        self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.on_label_edited, self.items)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.show_item, self.items)
+        # end wxGlade
+
+    def on_label_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_label_edited' not implemented!")
+        event.Skip()
+
+    def on_event_handler_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_event_handler_edited' not implemented!")
+        event.Skip()
+
+    def on_name_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_name_edited' not implemented!")
+        event.Skip()
+
+    def on_help_str_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_help_str_edited' not implemented!")
+        event.Skip()
+
+    def on_id_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_id_edited' not implemented!")
+        event.Skip()
+
+    def on_type_edited(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_type_edited' not implemented!")
+        event.Skip()
+
+    def on_OK(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_OK' not implemented!")
+        event.Skip()
+
+    def on_cancel(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'on_cancel' not implemented!")
+        event.Skip()
+
+    def move_item_left(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'move_item_left' not implemented!")
+        event.Skip()
+
+    def move_item_right(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'move_item_right' not implemented!")
+        event.Skip()
+
+    def move_item_up(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'move_item_up' not implemented!")
+        event.Skip()
+
+    def move_item_down(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'move_item_down' not implemented!")
+        event.Skip()
+
+    def add_item(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'add_item' not implemented!")
+        event.Skip()
+
+    def remove_item(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'remove_item' not implemented!")
+        event.Skip()
+
+    def add_separator(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'add_separator' not implemented!")
+        event.Skip()
+
+    def show_item(self, event):  # wxGlade: MenuItemDialog.<event_handler>
+        print("Event handler 'show_item' not implemented!")
+        event.Skip()
+
+# end of class MenuItemDialog
diff -Nru wxglade-0.9.6/widgets/menubar/perl_codegen.py wxglade-1.0.1/widgets/menubar/perl_codegen.py
--- wxglade-0.9.6/widgets/menubar/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/menubar/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -36,6 +36,9 @@
                     if name: ids.append(name)
                     id = val
 
+                label = self.codegen.quote_str(item.label)
+                help_str = self.codegen.quote_str(item.help_str)
+
                 if item.children:
                     if item.name:
                         name = item.name
@@ -47,8 +50,7 @@
 
                     append('%s = Wx::Menu->new();\n' % name)
                     append_items(name, item.children)
-                    append( '%s->Append(%s, %s, %s, %s);\n' % (menu, id, self.codegen.quote_str(item.label),
-                                                               name, self.codegen.quote_str(item.help_str)) )
+                    append( '%s->Append(%s, %s, %s, %s);\n' % (menu, id, label, name, help_str) )
                 else:
                     item_type = 0
                     if item.checkable == '1':
@@ -62,17 +64,9 @@
                         itemname = ''
 
                     if item_type:
-                        append('%s%s->Append(%s, %s, %s, %s);\n' %
-                               (itemname, menu, id,
-                                self.codegen.quote_str(item.label),
-                                self.codegen.quote_str(item.help_str),
-                                item_type))
+                        append( '%s%s->Append(%s, %s, %s, %s);\n' % (itemname, menu, id, label, help_str, item_type) )
                     else:
-
-                        append('%s%s->Append(%s, %s, %s);\n' %
-                               (itemname, menu, id,
-                                self.codegen.quote_str(item.label),
-                                self.codegen.quote_str(item.help_str)))
+                        append( '%s%s->Append(%s, %s, %s);\n' % (itemname, menu, id, label, help_str) )
         #self._logger.debug('menus = %s', menus)
 
         obj_name = self.format_widget_access(obj)
@@ -93,46 +87,32 @@
         return ids + out
 
     def get_code(self, obj):
-        klass = obj.base
-        if klass != obj.klass:
-            klass = obj.klass
-        else:
-            klass = self.cn(klass)
+        klass = obj.get_instantiation_class(self.cn, self.cn_class)
 
-        init = ['\n\n', '# Menu Bar\n\n', '$self->{%s} = %s->new();\n' %
-                (obj.name, klass)]
+        init = [ '\n\n', '# Menu Bar\n\n', '$self->{%s} = %s->new();\n' % (obj.name, klass) ]
         init.extend(self.get_init_code(obj))
         init.append('$self->SetMenuBar($self->{%s});\n' % obj.name)
         init.append('\n')
         init.append('# Menu Bar end\n\n')
-        return init, [], []
+        return init, []
 
     def get_event_handlers(self, obj):
-        out = []
+        ret = []
 
         def do_get(item):
-            ret = []
-            if item.name:
-                val = self.codegen.add_object_format_name(item.name)
-            else:
-                name, val = self.codegen.generate_code_id(None, item.id)
-                if not val:
-                    val = '-1'  # but this is wrong anyway...
             if item.handler:
-                ret.append((val, 'EVT_MENU', item.handler, 'wxCommandEvent'))
-            if item.children:
-                for c in item.children:
-                    ret.extend(do_get(c))
-            return ret
+                ret.append((item, 'EVT_MENU', item.handler, 'wxCommandEvent'))
+            for c in item.children:
+                do_get(c)
 
         for menu in obj.menus:
-            out.extend(do_get(menu.root))
-        return out
+            do_get(menu.root)
+
+        return ret
 
 
 
 def initialize():
     klass = 'wxMenuBar'
     common.class_names['EditMenuBar'] = klass
-    common.toplevels['EditMenuBar'] = 1
     common.register('perl', klass, PerlMenubarGenerator(klass), ) #'menus', MenuHandler)
diff -Nru wxglade-0.9.6/widgets/MenuTree.py wxglade-1.0.1/widgets/MenuTree.py
--- wxglade-0.9.6/widgets/MenuTree.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/MenuTree.py	2020-12-31 14:04:48.000000000 +0000
@@ -15,6 +15,12 @@
 class MenuTree(object):
     "A class to represent a menu on a wxMenuBar"
     class Node:
+        # the following are for compatibility with the tree structure, used by format_generic_access
+        IS_CLASS = IS_SIZER = False
+        klass = classname = None
+        properties = []
+        IS_NAMED = True
+        WX_CLASS = None  # for Perl
         def __init__(self, label="", id="", name="", help_str="", checkable="", radio="", handler=""):
             self.label = label
             self.id = id
diff -Nru wxglade-0.9.6/widgets/notebook/codegen.py wxglade-1.0.1/widgets/notebook/codegen.py
--- wxglade-0.9.6/widgets/notebook/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/notebook/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,6 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
+@copyright: 2019 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -15,45 +16,38 @@
         self._reset_vars()
         wcodegen.PythonWidgetCodeWriter._prepare_tmpl_content(self, window)
 
-        prop = window.properties
         id_name, id = self.codegen.generate_code_id(window)
+        parent = self.format_widget_access(window.parent_window)
 
-        layout_props = []
-        for label, tab_win in zip(window.tabs, window.pages):
-            label = label[0]
-            if tab_win.klass == "sizerslot":
-                tab_win = "wx.Panel(self.%s)"%window.name
-            else:
-                tab_win = 'self.%s'%tab_win.name
-            layout_props.append('self.%s.AddPage(%s, %s)\n'%(window.name, tab_win, self.codegen.quote_str(label)))
-            
-        parent = self.format_widget_access(window.parent)
-        if window.is_toplevel:
+        klass = window.get_instantiation_class(self.cn, self.cn_class, self.codegen.preview)
+
+        if window.IS_CLASS:
             l = []
-            if id_name:
-                l.append(id_name)
-            l.append('self.%s = %s(%s, %s)\n' % (window.name, self.codegen.get_class(window.klass), parent, id))
-            return l, [], []
-        klass = window.klass
-        if self.codegen.preview:
-            klass = 'wxNotebook'
+            if id_name: l.append(id_name)
+            l.append('self.%s = %s(%s, %s)\n' % (window.name, klass, parent, id))
+            return l, []
+
         init = []
-        if id_name:
-            init.append(id_name)
-        init.append(('self.%s = ' + self.cn(klass) + '(%s, %s%s)\n')%(window.name, parent, id, self.tmpl_dict['style']))
+        if id_name: init.append(id_name)
+        init.append(('self.%s = ' + klass + '(%s, %s%s)\n')%(window.name, parent, id, self.tmpl_dict['style']))
 
-        props_buf = self.codegen.generate_common_properties(window)
-        return init, props_buf, layout_props
+        init += self.codegen.generate_code_common_properties(window)
+        return init, []
 
-    def get_properties_code(self, obj):
-        prop = obj.properties
-        props_buf = []
-        for label, tab_win in zip(obj.tabs, obj.pages):
-            label = label[0]
-            props_buf.append( 'self.AddPage(self.%s, %s)\n' % (tab_win.name, self.codegen.quote_str(label)) )
-        props_buf.extend(self.codegen.generate_common_properties(obj))
-        return props_buf
+    def get_layout_code(self, obj):
+        # called for a toplevel class
+        return self.codegen.generate_code_common_properties(obj)
+
+    def get_code_per_child(self, obj, child):
+        i = obj.children.index(child)
+        label = obj.tabs[i][0]
 
+        if child.IS_SLOT:
+            tab_win = "wx.Panel(self.%s)"%obj.name
+        else:
+            tab_win = 'self.%s'%child.name
+        notebook = self.format_widget_access(obj)  # 'self' or 'self.%s'%obj.name
+        return ['%s.AddPage(%s, %s)\n'%(notebook, tab_win, self.codegen.quote_str(label))]
 
 
 def xrc_code_generator(obj):
@@ -74,14 +68,14 @@
             xrcgen.DefaultXrcObject.write(self, output, ntabs, properties)
 
         def write_child_prologue(self, child, output, ntabs):
-            if self.widget.pages:
-                label = self.widget.tabs[child.widget.pos-1][0]  # pos is 1-based
+            if self.widget.children:
+                label = self.widget.tabs[child.widget.index][0]
                 tab_s = '    ' * ntabs
                 output.append( tab_s + '<object class="notebookpage">\n' )
                 output.append( tab_s + '<label>%s</label>\n' % escape(label) )
 
         def write_child_epilogue(self, child, output, ntabs):
-            if self.widget.pages:
+            if self.widget.children:
                 output.append( '    '*ntabs + '</object>\n' )
 
     return NotebookXrcObject(obj)
@@ -97,51 +91,44 @@
 
     def get_code(self, window):
         "generates the C++ code for wxNotebook"
+        # this is not called for toplevel classes
         self._reset_vars()
         wcodegen.CppWidgetCodeWriter._prepare_tmpl_content(self, window)
 
-        prop = window.properties
         id_name, id = self.codegen.generate_code_id(window)
         if id_name:
             ids = [id_name]
         else:
             ids = []
 
-        layout_props = []
-        for label, tab_win in zip(window.tabs, window.pages):
-            label = label[0]
-            layout_props.append('%s->AddPage(%s, %s);\n' % (window.name, tab_win.name, self.codegen.quote_str(label)))
-
-        if not window.parent.is_toplevel:
-            parent = '%s' % window.parent.name
-        else:
-            parent = 'this'
-        if window.is_toplevel:
-            l = ['%s = new %s(%s, %s);\n' % (window.name, window.klass, parent, id)]
-            return l, ids, [], []
-        init = ['%s = new %s(%s, %s%s);\n' % (window.name, window.klass, parent, id, self.tmpl_dict['style'])]
-
-        props_buf = self.codegen.generate_common_properties(window)
-
-        return init, ids, props_buf, layout_props
-
-    def get_properties_code(self, obj):
-        prop = obj.properties
-        props_buf = []
-        for label, tab_win in zip(obj.tabs, obj.pages):
-            label = label[0]
-            props_buf.append( 'AddPage(%s, %s);\n' % (tab_win.name, self.codegen.quote_str(label)) )
-        props_buf.extend(self.codegen.generate_common_properties(obj))
-        return props_buf
+        parent = self.format_widget_access(window.parent_window)
+        klass = window.get_instantiation_class()
 
+        if window.IS_CLASS:
+            l = ['%s = new %s(%s, %s);\n' % (window.name, klass, parent, id)]
+            return l, ids, []
+        init = ['%s = new %s(%s, %s%s);\n' % (window.name, klass, parent, id, self.tmpl_dict['style'])]
+
+        init += self.codegen.generate_code_common_properties(window)
+
+        return init, ids, []
+
+    def get_layout_code(self, obj):
+        # called for a toplevel class
+        return self.codegen.generate_code_common_properties(obj)
+
+    def get_code_per_child(self, obj, child):
+        i = obj.children.index(child)
+        label = self.codegen.quote_str( obj.tabs[i][0] )
+        if obj.IS_CLASS:
+            return ['AddPage(%s, %s);\n' % (child.name, label)]
+        return ['%s->AddPage(%s, %s);\n' % (obj.name, child.name, label)]
 
 
 def initialize():
     klass = 'wxNotebook'
     common.class_names['EditNotebook'] = klass
     common.class_names['NotebookPane'] = 'wxPanel'
-    common.toplevels['EditNotebook'] = 1
-    common.toplevels['NotebookPane'] = 1
     common.register('python', klass, PythonNotebookGenerator(klass) )
     common.register('C++',    klass, CppNotebookGenerator(klass) )
     common.register('XRC',    klass, xrc_code_generator )
diff -Nru wxglade-0.9.6/widgets/notebook/lisp_codegen.py wxglade-1.0.1/widgets/notebook/lisp_codegen.py
--- wxglade-0.9.6/widgets/notebook/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/notebook/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,25 +17,18 @@
         self._reset_vars()
         wcodegen.LispWidgetCodeWriter._prepare_tmpl_content(self, window)
 
-        prop = window.properties
         id_name, id = self.codegen.generate_code_id(window)
         window_name = self.codegen._format_name(window.name)
 
-        layout_props = []
-        for label, tab_win in zip(window.tabs, window.pages):
-            tab_win = tab_win.name.replace('_', '-')
-            fmt = '(wxNotebook_AddPage (slot-%s obj) (slot-%s obj) %s 1 -1)\n'
-            layout_props.append( fmt % (window_name, tab_win, self.codegen.quote_str(label[0]) ) )
+        parent = self.format_widget_access(window.parent_window)
 
-        parent = self.format_widget_access(window.parent)
-
-        if window.is_toplevel:
+        if window.IS_CLASS:
             l = []
             if id_name:
                 l.append(id_name)
             fmt = '(setf (slot-%s obj) (wxNotebook_Create %s %s -1 -1 -1 -1 wxNB_TOP))\n'
             l.append( fmt % (window_name, parent, id) )
-            return l, [], []
+            return l, []
 
         init = []
         if id_name:
@@ -43,23 +36,28 @@
         fmt = '(setf (slot-%s obj) (wxNotebook_Create %s %s -1 -1 -1 -1 %s))\n'
         init.append( fmt % (window_name, parent, id, self.tmpl_dict['style']) )
 
-        props_buf = self.codegen.generate_common_properties(window)
-        return init, props_buf, layout_props
+        init += self.codegen.generate_code_common_properties(window)
+        return init, []
 
-    def get_properties_code(self, obj):
-        props_buf = []
-        for label, tab_win in zip(obj.tabs, obj.pages):
-            fmt = '(wxNotebook_AddPage (slot-%s obj) page %s 1 -1);\n'
-            props_buf.append( fmt % (tab_win.name, self.codegen.quote_str(label[0]) ) )
-        props_buf.extend(self.codegen.generate_common_properties(obj))
-        return props_buf
+    def get_layout_code(self, obj):
+        # called for a toplevel class
+        return self.codegen.generate_code_common_properties(obj)
+
+    def get_code_per_child(self, obj, child):
+        i = obj.children.index(child)
+        label = self.codegen.quote_str( obj.tabs[i][0] )
+
+        if obj.IS_CLASS:
+            return ['(wxNotebook_AddPage (slot-%s obj) page %s 1 -1);\n'% (child.name, label)]
+
+        tab_win = child.name.replace('_', '-')
+        notebook = self.codegen._format_name(obj.name)
+        return ['(wxNotebook_AddPage (slot-%s obj) (slot-%s obj) %s 1 -1)\n' % (notebook, tab_win, label)]
 
 
 def initialize():
     klass = 'wxNotebook'
     common.class_names['EditNotebook'] = klass
     common.class_names['NotebookPane'] = 'wxPanel'
-    common.toplevels['EditNotebook'] = 1
-    common.toplevels['NotebookPane'] = 1
 
     common.register('lisp', klass, LispNotebookGenerator(klass) )
diff -Nru wxglade-0.9.6/widgets/notebook/notebook.py wxglade-1.0.1/widgets/notebook/notebook.py
--- wxglade-0.9.6/widgets/notebook/notebook.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/notebook/notebook.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,172 +3,29 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2016 Carsten Grohmann
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 import common, compat, misc
-import wcodegen
-from tree import Node, SlotNode
 import new_properties as np
 from edit_windows import ManagedBase, EditStylesMixin
-from edit_sizers.edit_sizers import Sizer, SizerSlot
 from wcodegen.taghandler import BaseXmlBuilderTagHandler
-from xml_parse import XmlParsingError
-
-from panel import EditPanel
-
-
-
-class NotebookVirtualSizer(Sizer):
-    '"Virtual sizer" responsible for the management of the pages of a Notebook'
-    PROPERTIES = [] # no editable properties
-    def __init__(self, *args, **kwds):
-        Sizer.__init__(self, *args, **kwds)
-        self._itempos = 0
-
-    def set_item(self, pos, proportion=None, span=None, flag=None, border=None, size=None, force_layout=True):
-        "Updates the layout of the item at the given pos; (re-)creates the notebook page if required"
-        if not self.window.widget:
-            return
-        index = pos-1 # 0 based
-        item = self.window.pages[index]
-        if not item or not item.widget:
-            return
-        label = self.window.tabs[index][0]
-        if not (index < self.window.widget.GetPageCount()):
-            self.window.widget.AddPage(item.widget, label) # this is e.g. for the first creation after loading a file
-        elif self.window.widget.GetPage(index) is not item.widget:
-            # XXX delete this part if it's not called; insert_tab and remove_tab should handle this now
-            if self.window.widget.GetPageCount()==len(self.window.pages):
-                #self.window.widget.RemovePage(index) # deletes the specified page, without deleting the associated window
-                self.window.widget.DeletePage(index)  # deletes the specified page, and the associated window
-            self.window.widget.InsertPage(index, item.widget, label)
-            self.window.widget.SetSelection(index)
-            try:
-                wx.CallAfter(item.sel_marker.update)
-            except AttributeError:
-                #self._logger.exception(_('Internal Error'))
-                pass
-        if self.window.sizer is not None:
-            self.window.sizer.set_item_best_size( self.window, size=self.window.widget.GetBestSize() )
-
-    def set_item_best_size(self, widget, size=None, force_layout=True):
-        pass
-
-    def item_properties_modified(self, widget, modified=None, force_layout=True):
-        if not self.window.widget: return
-        index = widget.pos-1 # 0 based
-        item = self.window.pages[index]
-        if not item or not item.widget: return
-        label = self.window.tabs[index][0]
-        if not (index < self.window.widget.GetPageCount()):
-            self.window.widget.AddPage(item.widget, label) # this is e.g. for the first creation after loading a file
-        elif self.window.widget.GetPage(index) is not item.widget:
-            # XXX delete this part if it's not called; insert_tab and remove_tab should handle this now
-            if self.window.widget.GetPageCount()==len(self.window.pages):
-                #self.window.widget.RemovePage(index) # deletes the specified page, without deleting the associated window
-                self.window.widget.DeletePage(index)  # deletes the specified page, and the associated window
-            self.window.widget.InsertPage(index, item.widget, label)
-            self.window.widget.SetSelection(index)
-            try:
-                wx.CallAfter(item.sel_marker.update)
-            except AttributeError:
-                #self._logger.exception(_('Internal Error'))
-                pass
-        if self.window.sizer is not None:
-            #self.window.sizer.set_item( self.window.pos, size=self.window.widget.GetBestSize() )
-            self.window.sizer.set_item_best_size( self.window, size=self.window.widget.GetBestSize() )
-
-    ####################################################################################################################
-    # new implementation
-    def insert_tab(self, index):
-        "inserts or adds a page"
-        #label, item = self.window.tabs[index]
-        label = self.window.tabs[index][0]
-        item = self.window.pages[index]
-        if not (index < self.window.widget.GetPageCount()):
-            self.window.widget.AddPage(item.widget, label)
-        elif self.window.widget.GetPage(index) is not item.widget:
-            self.window.widget.InsertPage(index, item.widget, label)
-
-        try:
-            wx.CallAfter(item.sel_marker.update)
-        except AttributeError:
-            pass
-        if self.window.sizer is not None:
-            self.window.sizer.set_item_best_size( self.window, size=self.window.widget.GetBestSize() )
-
-    def remove_tab(self, index):
-        if not self.window.widget: return
-        #self.window.widget.DeletePage(index)  # deletes the specified page, and the associated window
-        self.window.widget.RemovePage(index)  # deletes the specified page
-    ####################################################################################################################
-
-    def add_item(self, item, pos=None, size=None, force_layout=True):
-        "Adds an item to self.window"
-        #if not self.window.pages:
-            ## during XML parsing, the tab names are set before
-            #page_count = len(self.window.properties["tabs"].value)
-            #self.window.pages.extend( [None]*page_count )
-        try:
-            self.window.pages[pos-1] = item
-        except IndexError:
-            raise XmlParsingError( _('Notebook widget "%s" does not have any tabs!')%self.window.name )
-        item._dont_destroy = True
-
-    def free_slot(self, pos, force_layout=True):
-        "Replaces the element at pos with an empty slot"
-        if self.window._is_removing_pages or not self.window.widget:
-            return
-        slot = SizerSlot(self.window, self, pos) # XXX node handling?
-        #self._logger.debug('free: %s, %s, %s', slot, slot.pos, pos)
-        slot.create()
-        label = self.window.tabs[pos-1][0]
-        self.window.widget.RemovePage(pos-1)
-
-        w = self.window.pages[pos-1]
-        old_node = w.node
-        self.window.pages[pos-1] = slot
-        slot.node = node = SlotNode(slot)
-        common.app_tree.change_node( old_node, slot, node )
-
-        self.window.widget.InsertPage(pos-1, slot.widget, label)
-        self.window.widget.SetSelection(pos-1)
-        return slot
-
-    def get_itempos(self, attrs):
-        "Get position of sizer item (used in xml_parse)"
-        try:
-            name = attrs.get("original_name")
-            if name is None: name = attrs["name"]
-            return self.window.pages.index(name) + 1
-        except ValueError:
-            raise XmlParsingError( _('Notebook widget "%s" does not have tab "%s"!')%(self.window.name, attrs["name"]) )
-
-    def is_virtual(self):
-        return True
-
-    def _add_popup_menu_items(self, menu, item, widget):
-        # called from managed widget items' _create_popup_menu method
-        i = misc.append_menu_item(menu, -1, _('Insert Notebook Tab before') ) # \tCtrl+I') )
-        misc.bind_menu_item_after(widget, i, self.window.insert_tab, item.pos-1, "new tab")
-
-        if item.pos==len(self.window.tabs): # last slot -> allow to add
-            i = misc.append_menu_item(menu, -1, _('Add Notebook Tab') ) # \tCtrl+A') )
-            misc.bind_menu_item_after(widget, i, self.window.insert_tab, item.pos, "new tab")
-        menu.AppendSeparator()
+import panel, edit_sizers, edit_base
 
 
 class NotebookPagesProperty(np.GridProperty):
     def __init__(self, value, cols):
         col_widths = [300,]
-        np.GridProperty.__init__(self, value, cols, col_sizes=col_widths, can_remove_last=False, with_index=True)
+        np.GridProperty.__init__(self, value, cols, col_sizes=col_widths, can_remove_last=True, with_index=True)
+
+    def _get_default_row(self, index):
+        return ["Page %d"%(index+1)]
 
     def write(self, output, tabs):
         inner_xml = []
-        for (name,), window in zip(self.owner.tabs, self.owner.pages):
+        for (name,), window in zip(self.owner.tabs, self.owner.children):
             # XXX what happens with empty pages?
             if window:
                 inner_xml += common.format_xml_tag(u'tab', name, tabs+1, window=window.name)
@@ -194,98 +51,99 @@
 
     def end_elem(self, name):
         if name == 'tabs':
-            self.parent.pages[:] = self.pagenames
-            self.parent.properties['tabs'].set(self.tab_names)
-            self.parent.properties_changed(["tabs"])
+            self.parent.pages = self.pagenames
+            self.parent.children = [None]*len(self.tab_names)
+            self.parent.properties['tabs'].load(self.tab_names)
             return True
         elif name == 'tab':
+            # actually, the tab labels
             char_data = self.get_char_data()
             self.tab_names.append([misc.wxstr(char_data),])
         return False
 
 
-
 class EditNotebook(ManagedBase, EditStylesMixin):
     "Class to handle wxNotebook objects"
-    _custom_base_classes = True
     _next_notebook_number = 1 # next free number for notebook names
-    update_widget_style = False
 
+    WX_CLASS = "wxNotebook"
+    IS_CONTAINER = True
     _PROPERTIES = ["Widget", "no_custom_class", "style", "tabs"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
+    np.insert_after(PROPERTIES, "name", "class", "custom_base")
 
-    def __init__(self, name, parent, id, style, sizer, pos):
-        name = name or self.next_notebook_name()  # create new and (still) unused notebook name
-        ManagedBase.__init__(self, name, 'wxNotebook', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, style):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
         self.properties["style"].set(style)
 
-        self.virtual_sizer = NotebookVirtualSizer(self)
-        self._is_removing_pages = False
-
         # initialise instance properties
-        self.pages = []  # the windows per page
-        tabs = []  # list of pages of this notebook (actually a list of 2-list label, window)
+        self.pages = None  # on loading from XML, this will be used
+        tabs = []  # list of page labels of this notebook
         tab_cols = [('Tab label', np.GridProperty.STRING)]
         self.tabs = NotebookPagesProperty(tabs, tab_cols)
         self.no_custom_class = np.CheckBoxProperty(False, default_value=False)
 
-        self.next_pane_number = 1  # first pane should have number 1
-
     def create_widget(self):
-        self.widget = wx.Notebook( self.parent.widget, self.id, style=self.style )
-        for c,label in zip(self.pages, self.tabs):
-            c.create()
-            if isinstance(c, SizerSlot):
-                self.widget.AddPage(c.widget, label[0])
-        #self.widget.Bind(wx.EVT_KEY_DOWN, misc.on_key_down_event)
+        self.widget = wx.Notebook( self.parent_window.widget, wx.ID_ANY, style=self.style )
 
-    def post_load(self):
+    def child_widgets_created(self, level):
         # at this time, all children should be available
-        # no longer required when the data structure is changed
-        if not self.sizer.is_virtual():
-            self.sizer.item_properties_modified2(self)
+        self.pages = None
+        if not self.parent.IS_SIZER or not self.widget: return
+        w,h = self.properties["size"].get_size(self.widget)
+        sz = self.parent
+        sz.widget.SetItemMinSize(self.widget, w, h)
 
     def on_set_focus(self, event):
         # allow switching of pages
         misc.set_focused_widget(self)
         event.Skip()
-        #misc.exec_after(self.widget.Refresh())
 
     ####################################################################################################################
-    # new implementation:
-    # together with NotebookVirtualSizer insert_tab, remove_tab, free_tab
-    def insert_tab(self, index, label):
-        # add tab/page this needs to be done before EditPanel calls self.virtual_sizer.add_item
-        tabs_p = self.properties["tabs"]
-        tabs = tabs_p.get()   # the value will be modified in place
-        tabs.insert(index, [label,])
-        tabs_p.set(tabs)
-        self.pages.insert(index, None)
-
-        # adjust pos of the following pages
-        for i, page in enumerate(self.pages[index+1:]):
-            pos_p = page.properties["pos"]
-            pos_p.set(index+2+i)
+    def vs_insert_tab(self, index):
+        "inserts or adds a page"
+        label = self.tabs[index][0]
+        item = self.children[index]
+        if not (index < self.widget.GetPageCount()):
+            self.widget.AddPage(item.widget, label)
+        elif self.widget.GetPage(index) is not item.widget:
+            self.widget.InsertPage(index, item.widget, label)
+
+        try:
+            wx.CallAfter(item.sel_marker.update)
+        except AttributeError:
+            pass
+        if hasattr(self.parent, "set_item_best_size"):
+            self.parent.set_item_best_size( self, size=self.widget.GetBestSize() )
+
+    def add_slot(self):
+        # actually adds a page, but it needs to be compatible to sizers
+        self.insert_tab(len(self.children), "new tab")
+
+    def insert_tab(self, index, label, add_panel=True, add_sizer=False):
+        # add tab/page; called from GUI
+        self.properties["tabs"].insert( index, [label,] )
 
         # create panel and node, add to tree
-        pos = index+1
-        window = EditPanel( self.next_pane_name(), self, -1, self.virtual_sizer, pos )
-        window._dont_destroy = True
-        window.node = node = Node(window)
-
-        #common.app_tree.add(node, self.node, index)
-        self.virtual_sizer.add_item(window, pos)
-        common.app_tree.insert(node, self.node, index)
+        self.insert_item(None, index)  # placeholder
+        if add_panel:
+            if not isinstance(add_panel, compat.unicode): add_panel = self.next_pane_name()
+            editor = panel.EditPanel( add_panel, self, index )
+            if add_sizer:
+                sizer = edit_sizers._builder(editor, 0)
+        else:
+            # just add a slot
+            editor = edit_base.Slot(self, index)
 
         if self.widget:
             # add to widget
-            window.create()
-            compat.SetToolTip(window.widget, _("Notebook page pane:\nAdd a sizer here") )
-            self.virtual_sizer.insert_tab(index)
+            editor.create()
+            compat.SetToolTip(editor.widget, _("Notebook page pane:\nAdd a sizer here") )
+            self.vs_insert_tab(index)
 
             try:
-                wx.CallAfter(window.sel_marker.update)
+                wx.CallAfter(editor.sel_marker.update)
             except AttributeError:
                 #self._logger.exception(_('Internal Error'))
                 if config.debugging: raise
@@ -293,113 +151,151 @@
             self.widget.SetSelection(index)
 
         self.properties["tabs"].update_display()
+        misc.rebuild_tree(self)
+
+    def remove_item(self, child, level, keep_slot=False):
+        if not keep_slot:
+            tabs_p = self.properties["tabs"]
+            # if the length is different, then due to tabs_p.apply calling self.set_tabs and so it's removed already
+            if len(tabs_p.value)==len(self.children):
+                del tabs_p.value[child.index]
+        ManagedBase.remove_item(self, child, level, keep_slot)
 
     @misc.restore_focus
-    def set_tabs(self, old_names, indices):  # called from tabs proberty on Apply button
+    def set_tabs(self, old_labels, indices):  # called from tabs property on Apply button
         """tabs: list of strings
         indices: the current indices of the tabs or None for a new tab; re-ordering is currently not supported"""
-        keep_indices = [i for i in indices if i is not None]
+        keep_indices = [index for index in indices if index is not None]
         if keep_indices != sorted(keep_indices):
             raise ValueError("Re-ordering is not yet implemented")
         keep_indices = set(keep_indices)
-        new_names = old_names[:]
 
         # set tab labels of existing pages, if modified
-        for (name,), index in zip(self.tabs, indices):
-            if index is not None and old_names[index]!=name:
-                new_names[index] = [name,]
-                if self.widget:
-                    self.widget.SetPageText(index, name)
+        for (label,), index in zip(self.tabs, indices):
+            if index is not None and old_labels[index]!=label and self.widget:
+                self.widget.SetPageText(index, label)
 
         # remove tabs
-        for index in range(len(old_names)-1, -1, -1):
+        for index in range(len(old_labels)-1, -1, -1):
             if not index in keep_indices:
-                self._is_removing_pages = True
-                self.virtual_sizer.remove_tab(index)            # remove from sizer; does not delete window
-                self.pages[index]._remove()                     # delete the page content without setting the focus
-                common.app_tree.remove(self.pages[index].node)  # remove from tree
-                del self.pages[index]                           # delete from page list
-                del new_names[index]                            # delete from list of names
-                self._is_removing_pages = False
+                self.children[index].recursive_remove(level=0)
 
         # insert/add tabs
         added = None
-        for i, (name,) in enumerate(self.tabs):
-            index = indices[i]
-            if index is not None:
-                # old tab to be kept, just ensure that pos is correct
-                pos_p = self.pages[i].properties["pos"]
-                if pos_p.value!=i+1: pos_p.set(i+1)
-                continue
+        for index, (label,) in enumerate(self.tabs):
+            if indices[index] is not None: continue  # keep tab
 
             # actually add/insert
-            new_names.insert(i, [name,]) # this needs to be done before EditPanel calls self.virtual_sizer.add_item
-            self.pages.insert(i, None)
+            self.children.insert(index, None)
             # create panel and node, add to tree
-            pos = i+1
-            suggestion = "%s_%s" % (self.name, name)
-            window = EditPanel( self.next_pane_name(suggestion), self, -1, self.virtual_sizer, pos )
-            window._dont_destroy = True
-            node = window.node = Node(window)
-
-            # adjust pos of the following pages
-            for p, page in enumerate(self.pages[i+1:]):
-                pos_p = page.properties["pos"]
-                pos_p.set(i+2+p)
-
-            self.virtual_sizer.add_item(window, pos)
-            common.app_tree.insert(node, self.node, i, select=False)
+            suggestion = "%s_%s" % (self.name, label)
+            editor = panel.EditPanel( self.next_pane_name(suggestion), self, index )
 
             if self.widget:
                 # add to widget
-                window.create()
-                compat.SetToolTip(window.widget, _("Notebook page pane:\nAdd a sizer here") )
-                self.virtual_sizer.insert_tab(i)
+                editor.create()
+                self.vs_insert_tab(index)
     
                 try:
-                    wx.CallAfter(window.sel_marker.update)
+                    wx.CallAfter(editor.sel_marker.update)
                 except AttributeError:
                     if config.debugging: raise
 
-                added = i  # remember last added index for selection
+                added = index  # remember last added index for selection
 
         # select the last added tab
         if added is not None and self.widget:
             self.widget.SetSelection(added)
 
-        # update tree labels
-        for node in self.node.children:
-            node.refresh(refresh_label=True, refresh_image=False)
+        common.app_tree.build(self, recursive=False)
 
     ####################################################################################################################
+    def destroying_child_widget(self, child, index):
+        self.widget.RemovePage(index) # deletes the specified page, without deleting the associated window
+
+    def child_widget_created(self, child, level):
+        # add, insert or replace a notebook page
+        index = child.index
+        label = self.tabs[index][0]
+        if not (index < self.widget.GetPageCount()):
+            # this is e.g. for the first creation after loading a file
+            self.widget.AddPage(child.widget, label)
+        else:
+            # single page being replaced; e.g. panel -> slot or slot -> panel
+            self.widget.InsertPage(index, child.widget, label)
+        if level==0:
+            self.widget.SetSelection(index)
+            try:
+                wx.CallAfter(child.sel_marker.update)
+            except AttributeError:
+                pass
+
+    def get_itempos(self, attrs):
+        "Get position of sizer item (used in xml_parse)"
+        # only used when loading from XML, while pages is defined
+        name = attrs.get("original_name", None) or attrs['name']
+        try:
+            return self.pages.index(name)
+        except ValueError:
+            from xml_parse import XmlParsingError
+            raise XmlParsingError( _('Notebook widget "%s" does not have tab "%s"!')%(self.name, name) )
 
-    def delete(self):
+    ####################################################################################################################
+    def destroy_widget(self, level, later=True):
         if self.widget: self.widget.DeleteAllPages()
-        ManagedBase.delete(self)
+        ManagedBase.destroy_widget(self, level, later)
 
     def get_property_handler(self, name):
         if name == 'tabs':
             return TabsHandler(self)
         return ManagedBase.get_property_handler(self, name)
 
-    def properties_changed(self, modified):
+    def _get_direction(self, value_set):
+        if value_set is None: return None
+        if 'wxNB_LEFT' in value_set: return "L"
+        if 'wxNB_RIGHT' in value_set: return "R"
+        if 'wxNB_BOTTOM' in value_set: return "B"
+        return "T"
+
+    def _properties_changed(self, modified, actions):
         if modified and "tabs" in modified and self.widget:
             for i,(tab,) in enumerate(self.tabs):
                 self.widget.SetPageText(i,tab)
-            
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        
+        if modified and "style" in modified:
+            # wxNB_TOP to wxNB_BOTTOM can be changed on the fly; any other change requires re-creation
+            p = self.properties["style"]
+            new = self._get_direction(p.value_set)
+            old = self._get_direction(p.previous_value)
+            if wx.Platform=="__WXMSW__" and ((old=="T" and new=="B") or (old=="B" and new=="T")):
+                actions.add("layout")
+            elif old!=new:
+                actions.add("recreate2")
 
-    # helpers ##########################################################################################################
-    def next_notebook_name(self):
-        # return new and (still) unused notebook name
-        while True:
-            name = 'notebook_%d' % EditNotebook._next_notebook_number
-            if not common.app_tree.has_name(name):
-                break
-            EditNotebook._next_notebook_number += 1
-        return name
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
+
+    ####################################################################################################################
+    def _add_popup_menu_items(self, menu, widget):
+        # called from managed widget items' _create_popup_menu method
+            i = misc.append_menu_item(menu, -1, _('Add Notebook Tab') )
+            misc.bind_menu_item_after(widget, i, self.add_slot)
+
+    def _add_parent_popup_menu_items(self, menu, item, widget):
+        # called from managed widget items' _create_popup_menu method
+        if item.IS_SLOT:
+            i = misc.append_menu_item(menu, -1, _('Remove Notebook Tab\tDel') )
+            misc.bind_menu_item_after(widget, i, item.remove)
+
+        i = misc.append_menu_item(menu, -1, _('Insert Notebook Tab before') ) # \tCtrl+I') )
+        misc.bind_menu_item_after(widget, i, self.insert_tab, item.index, "new tab")
 
+        if item.index==len(self.tabs)-1: # last slot -> allow to add
+            i = misc.append_menu_item(menu, -1, _('Add Notebook Tab') ) # \tCtrl+A') )
+            misc.bind_menu_item_after(widget, i, self.add_slot)
+        menu.AppendSeparator()
+
+    # helpers ##########################################################################################################
     def next_pane_name(self, suggestion=None):
         # return new and (still) unused pane name
         if suggestion:
@@ -407,90 +303,64 @@
             while suggestion and "0"<=suggestion[0]<="9":
                 del suggestion[0]
             suggestion = "".join(suggestion)
-        if suggestion and not common.app_tree.has_name(suggestion):
+        if suggestion and suggestion not in self.toplevel_parent.names:
             return suggestion
-        while True:
-            pane_name = "%s_pane_%d" % (self.name, self.next_pane_number)
-            self.next_pane_number += 1
-            if not common.app_tree.has_name(pane_name):
-                break
-        return pane_name
-
-    def find_page(self, page):
-        "returns the index of the given page in the notebook, or -1 if the page cannot be found"
-        if not self.widget: return -1
-        for i,p in enumerate(self.pages):
-            if p is page:
-                if i < self.widget.GetPageCount():
-                    return i
-                else:
-                    return -1
-        return -1
-
-    def on_load(self):
-        # create slot nodes for empty slots
-        for p,page in enumerate(self.pages):
-            if page is not None and not isinstance(page, compat.basestring): continue
-            self.pages[p] = slot = SizerSlot(self, self.virtual_sizer, p+1)
-            node = slot.node = SlotNode(slot)
-            common.app_tree.insert(node, self.node, p)
-
-editor_class = EditNotebook
-editor_icon = 'notebook.xpm'
-editor_name = 'EditNotebook'
-editor_style = ''
-
-dlg_title = _('wxNotebook')
-box_title = _('Orientation')
-choices = 'wxNB_TOP|wxNB_BOTTOM|wxNB_LEFT|wxNB_RIGHT'
-tmpl_label = 'notebook'
+        tmpl = "%s_pane_%%d" % self.name
+        tabs = set(tab[0] for tab in self.tabs)
+        return self.toplevel_parent.get_next_contained_name(tmpl, tabs)
+
+    def _get_slot_label(self, index):
+        title = self.tabs[index][0]
+        return '[%s] PAGE %s'%(title, index)
 
+    def check_compatibility(self, widget, typename=None):
+        return (False,"No objects can be pasted here; paste to empty pages instead.")
 
-def builder(parent, sizer, pos, number=[1]):
+    def check_drop_compatibility(self):
+        # checks whether a widget can be dropped here
+        return (False, "Items can only be added to empty pages/slots, not to the notebook itself.")
+
+    def _get_parent_tooltip(self, index):
+        return "Notebook page %s:"%index
+
+
+def builder(parent, index):
     "Factory function for editor objects from GUI"
-    dialog = wcodegen.WidgetStyleSelectionDialog(dlg_title, box_title, choices)
+    import dialogs
+    choices = 'wxNB_TOP|wxNB_BOTTOM|wxNB_LEFT|wxNB_RIGHT'
+    options = [("Pages", (0,20)),
+                ">Add panels",
+                ">Add sizers to panels"]
+    defaults = [1, True, False]
+    dialog = dialogs.WidgetStyleSelectionDialog(_('wxNotebook'), _('Orientation'), choices, options, defaults)
     with misc.disable_stay_on_top(common.adding_window or parent):
         res = dialog.ShowModal()
     style = dialog.get_selection()
+    pages, add_panels, add_sizers = dialog.get_options()
     dialog.Destroy()
-    if res != wx.ID_OK:
-        return
+    if res != wx.ID_OK: return
+
+    name = parent.toplevel_parent.get_next_contained_name('notebook_%d')
     with parent.frozen():
-        widget = editor_class(None, parent, wx.ID_ANY, style, sizer, pos)
-        node = Node(widget)
-        widget.node = node
-        widget.virtual_sizer.node = node
-        widget.properties["proportion"].set(1)
-        widget.properties["flag"].set("wxEXPAND")
-        if parent.widget: widget.create()
-        common.app_tree.insert(node, sizer.node, pos-1)
-    
-        widget.insert_tab(0, widget.next_pane_name()) # next_pane_name will be used as label and as pane name, if possible
-        #sizer.set_item(widget.pos, 1, wx.EXPAND)
+        editor = EditNotebook(name, parent, index, style)
+        editor.properties["proportion"].set(1)
+        editor.properties["flag"].set("wxEXPAND")
+        for n in range(pages):
+            # next_pane_name will be used as label and as pane name, if possible
+            name = editor.next_pane_name()
+            editor.insert_tab(n, name, add_panel=add_panels and name or False, add_sizer=add_sizers) 
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "Factory to build editor objects from a XML file"
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    widget = editor_class(name, parent, wx.ID_ANY, editor_style, sizer, pos)
-    #sizer.set_item(widget.pos)
-    node = Node(widget)
-    widget.node = node
-    widget.virtual_sizer.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return widget
+    return EditNotebook(name, parent, index, '')
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
-    common.widgets[editor_name] = builder
-    common.widgets_from_xml[editor_name] = xml_builder
-    return common.make_object_button(editor_name, editor_icon)
+    common.widget_classes['EditNotebook'] = EditNotebook
+    common.widgets['EditNotebook'] = builder
+    common.widgets_from_xml['EditNotebook'] = xml_builder
+    return common.make_object_button('EditNotebook', 'notebook.png')
diff -Nru wxglade-0.9.6/widgets/notebook/perl_codegen.py wxglade-1.0.1/widgets/notebook/perl_codegen.py
--- wxglade-0.9.6/widgets/notebook/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/notebook/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,51 +18,35 @@
         self._reset_vars()
         wcodegen.PerlWidgetCodeWriter._prepare_tmpl_content(self, window)
 
-        prop = window.properties
         id_name, id = self.codegen.generate_code_id(window)
 
-        layout_props = []
-        for label, tab_win in zip(window.tabs, window.pages):
-            layout_props.append('$self->{%s}->AddPage($self->{%s}, %s);\n' %
-                                (window.name, tab_win.name, self.codegen.quote_str(label[0])) )
-
-        parent = self.format_widget_access(window.parent)
-
-        if window.is_toplevel:
-            klass = window.base
-            if klass != window.klass:
-                klass = window.klass
-            else:
-                klass = self.cn(klass)
+        parent = self.format_widget_access(window.parent_window)
+        klass = window.get_instantiation_class(self.cn, self.cn_class)
 
+        if window.IS_CLASS:
             l = []
-            if id_name:
-                l.append(id_name)
+            if id_name: l.append(id_name)
             l.append( '$self->{%s} = %s->new(%s, %s);\n' % ( window.name, klass, parent, id) )
-            return l, [], []
+            return l, []
         init = []
-        if id_name:
-            init.append(id_name)
-        init.append( '$self->{%s} = %s->new(%s, %s%s);\n' % (
-                     window.name, self.cn(window.klass), parent, id, self.tmpl_dict['style']) )
-
-        props_buf = self.codegen.generate_common_properties(window)
-        return init, props_buf, layout_props
-
-    def get_properties_code(self, obj):
-        prop = obj.properties
-        props_buf = []
-        for label, tab_win in zip(obj.tabs, obj.pages):
-            label = label[0]
-            props_buf.append( '$self->AddPage($self->{%s}, %s);\n' % (tab_win.name, self.codegen.quote_str(label)) )
-        props_buf.extend(self.codegen.generate_common_properties(obj))
-        return props_buf
+        if id_name: init.append(id_name)
+        init.append( '$self->{%s} = %s->new(%s, %s%s);\n' % ( window.name, klass, parent, id, self.tmpl_dict['style']) )
+
+        init += self.codegen.generate_code_common_properties(window)
+        return init, []
+
+    def get_layout_code(self, obj):
+        return self.codegen.generate_code_common_properties(obj)
+
+    def get_code_per_child(self, obj, child):
+        i = obj.children.index(child)
+        label = self.codegen.quote_str( obj.tabs[i][0] )
+        notebook = self.format_widget_access(obj)  # '$self' or '$self->{%s}'%obj.name
+        return ['%s->AddPage($self->{%s}, %s);\n' % (notebook, child.name, label)]
 
 
 def initialize():
     klass = 'wxNotebook'
     common.class_names['EditNotebook'] = klass
     common.class_names['NotebookPane'] = 'wxPanel'
-    common.toplevels['EditNotebook'] = 1
-    common.toplevels['NotebookPane'] = 1
     common.register( 'perl', klass, PerlNotebookGenerator(klass) )
diff -Nru wxglade-0.9.6/widgets/panel/codegen.py wxglade-1.0.1/widgets/panel/codegen.py
--- wxglade-0.9.6/widgets/panel/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/panel/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -13,45 +13,42 @@
 
 class PythonPanelGenerator(wcodegen.PythonWidgetCodeWriter):
     def get_code(self, panel):
+        # this is not called for toplevel panels
         scrollable = panel.scrollable
         id_name, id = self.codegen.generate_code_id(panel)
-        parent = self.format_widget_access(panel.parent)
-        if panel.is_toplevel:
+        parent = self.format_widget_access(panel.parent_window)
+
+        klass = panel.get_instantiation_class(self.cn, self.cn_class, self.codegen.preview)
+
+        if panel.IS_CLASS:
             l = []
             if id_name: l.append(id_name)
-            l.append('self.%s = %s(%s, %s)\n' % (panel.name, self.codegen.get_class(panel.klass), parent, id))
-            return l, [], []
+            l.append('self.%s = %s(%s, %s)\n' % (panel.name, klass, parent, id))
+            return l, []
+
         init = []
-        if id_name:
-            init.append(id_name)
+        if id_name: init.append(id_name)
+
         style = panel.properties["style"].get_string_value() or 'wxTAB_TRAVERSAL'
         if scrollable or style != 'wxTAB_TRAVERSAL':
             style = ", style=%s" % self.cn_f(style)
         else:
             style = ''
-        #if not int(panel.properties.get('no_custom_class', False)) or panel.preview:
-        if not panel.no_custom_class or self.codegen.preview:
-            if scrollable:
-                klass = self.cn( 'wxScrolledWindow')
-            else:
-                klass = self.cn('wxPanel')
-        else:
-            klass = panel.klass
-            if klass in ('wxPanel', 'wxScrolledWindow'):
-                klass = self.cn(klass)
+
         init.append( 'self.%s = %s(%s, %s%s)\n' % (panel.name, klass, parent, id, style) )
-        props_buf = self.codegen.generate_common_properties(panel)
-        if scrollable and panel.check_prop("scroll_rate"):
-            props_buf.append('self.%s.SetScrollRate(%s)\n' % (panel.name, panel.scroll_rate))
-        return init, props_buf, []
+        init.extend( self.codegen.generate_code_common_properties(panel) )
+        if panel.scrollable and panel.check_prop("scroll_rate"):
+            init.append( 'self.%s.SetScrollRate(%s)\n' % (panel.name, panel.scroll_rate) )
+        return init, []
 
     def get_properties_code(self, obj):
-        props_buf = self.codegen.generate_common_properties(obj)
+        props_buf = self.codegen.generate_code_common_properties(obj)
         if obj.scrollable and obj.check_prop("scroll_rate"):
             props_buf.append('self.SetScrollRate(%s)\n' % obj.scroll_rate)
         return props_buf
 
     def get_layout_code(self, obj):
+        # called for toplevel panel
         ret = ['self.Layout()\n']
         if "centered" in obj.properties and obj.centered:
             ret.append('self.Centre()\n')
@@ -73,38 +70,29 @@
             ids = [id_name]
         else:
             ids = []
-        if not panel.parent.is_toplevel:
-            parent = '%s' % panel.parent.name
-        else:
-            parent = 'this'
-        if panel.is_toplevel:
+        parent = self.format_widget_access(panel.parent_window)
+        klass = panel.get_instantiation_class(self.cn, self.cn_class)
+        if panel.IS_CLASS:
             l = [ '%s = new %s(%s, %s);\n' % (panel.name, panel.klass, parent, id) ]
-            return l, ids, [], []
+            return l, ids, []
         extra = ''
         style = panel.properties["style"].get_string_value() or 'wxTAB_TRAVERSAL'
         if scrollable or style != 'wxTAB_TRAVERSAL':
             extra = ', wxDefaultPosition, wxDefaultSize, %s' % style
-        if not panel.no_custom_class:
-            if scrollable:
-                klass = 'wxScrolledWindow'
-            else:
-                klass = 'wxPanel'
-        else:
-            klass = panel.klass
+
         init = [ '%s = new %s(%s, %s%s);\n' % (panel.name, klass, parent, id, extra) ]
-        props_buf = self.codegen.generate_common_properties(panel)
+        init += self.codegen.generate_code_common_properties(panel)
         if scrollable and panel.check_prop("scroll_rate"):
-            props_buf.append('%s->SetScrollRate(%s);\n' % (panel.name, panel.scroll_rate))
-        return init, ids, props_buf, []
+            init.append('%s->SetScrollRate(%s);\n' % (panel.name, panel.scroll_rate))
+        return init, ids, []
 
     def get_properties_code(self, obj):
-        props_buf = self.codegen.generate_common_properties(obj)
+        props_buf = self.codegen.generate_code_common_properties(obj)
         if obj.scrollable and obj.check_prop("scroll_rate"):
             props_buf.append('SetScrollRate(%s);\n' % obj.scroll_rate)
         return props_buf
 
 
-
 def xrc_code_generator(obj):
     xrcgen = common.code_writers['XRC']
 
@@ -126,13 +114,9 @@
     klass = 'wxPanel'
     common.class_names['EditPanel'] = klass
     common.class_names['EditTopLevelPanel'] = klass
-    common.toplevels['EditPanel'] = 1
-    common.toplevels['EditTopLevelPanel'] = 1
 
     common.class_names['EditScrolledWindow'] = 'wxScrolledWindow'
     common.class_names['EditTopLevelScrolledWindow'] = 'wxScrolledWindow'
-    common.toplevels['EditScrolledWindow'] = 1
-    common.toplevels['EditTopLevelScrolledWindow'] = 1
 
     common.register('python', klass,              PythonPanelGenerator(klass))
     common.register('python', 'wxScrolledWindow', PythonPanelGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/panel/lisp_codegen.py wxglade-1.0.1/widgets/panel/lisp_codegen.py
--- wxglade-0.9.6/widgets/panel/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/panel/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2004 D.H. aka crazyinsomniac on sourceforge.net
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -18,17 +18,16 @@
         scrollable = panel.scrollable
 
         id_name, id = self.codegen.generate_code_id(panel)
-        parent = self.format_widget_access(panel.parent)
+        parent = self.format_widget_access(panel.parent_window)
         panel_name = self.codegen._format_name(panel.name)
 
-        if panel.is_toplevel:
+        if panel.IS_CLASS:
             l = []
-            if id_name:
-                l.append(id_name)
+            if id_name: l.append(id_name)
 
             panel_name = panel.name
             l.append( '(setf (slot-%s obj) (wxPanel_Create %s %s -1 -1 -1 -1))\n' % (panel_name, parent, id) )
-            return l, [], []
+            return l, []
 
         init = []
         if id_name: init.append(id_name)
@@ -41,14 +40,14 @@
 
         init.append( '(setf (slot-%s obj) (wxPanel_Create %s %s -1 -1 -1 -1 %s))\n' % (panel_name, parent, id, style) )
 
-        props_buf = self.codegen.generate_common_properties(panel)
+        init += self.codegen.generate_code_common_properties(panel)
         if scrollable and panel.check_prop("scroll_rate"):
             sr = panel.scroll_rate.replace(',', ' ')
-            props_buf.append( '(wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-%s obj) %s)\n'% (panel_name, sr) )
-        return init, props_buf, []
+            init.append( '(wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-%s obj) %s)\n'% (panel_name, sr) )
+        return init, []
 
     def get_properties_code(self, obj):
-        props_buf = self.codegen.generate_common_properties(obj)
+        props_buf = self.codegen.generate_code_common_properties(obj)
         if obj.scrollable and obj.check_prop("scroll_rate"):
             sr = obj.scroll_rate.replace(',', ' ')
             props_buf.append('(wxScrolledWindow:wxScrolledWindow_SetScrollRate (slot-%s obj))\n' % sr)
@@ -65,7 +64,5 @@
     klass = 'wxPanel'
     common.class_names['EditPanel'] = klass
     common.class_names['EditTopLevelPanel'] = klass
-    common.toplevels['EditPanel'] = 1
-    common.toplevels['EditTopLevelPanel'] = 1
     common.register('lisp', klass, LispPanelGenerator(klass))
     common.register('lisp', 'wxScrolledWindow', LispPanelGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/panel/panel.py wxglade-1.0.1/widgets/panel/panel.py
--- wxglade-0.9.6/widgets/panel/panel.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/panel/panel.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,15 +3,13 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import logging
 import wx
-import clipboard
-import common, compat, config, misc
-from tree import Node
+import common, config, misc, clipboard
 import new_properties as np
 from edit_windows import ManagedBase, TopLevelBase, EditStylesMixin
 
@@ -19,37 +17,42 @@
 
 class PanelBase(EditStylesMixin):
     "Class PanelBase"
-    _custom_base_classes = True
 
-    _PROPERTIES = ["Widget", "no_custom_class", "style", "scrollable", "scroll_rate"]
-    _PROPERTY_LABELS = {'no_custom_class':"Don't generate code for this class"}
-    _PROPERTY_HELP = {'no_custom_class':'If this is a custom class, setting this property prevents wxGlade\n'
-                                        'from generating the class definition code'}
+    _PROPERTIES = ["Widget", "style", "scrollable", "scroll_rate"]
+    CHILDREN = -1  # 0 or 1; either a sizer or nothing
+    TREE_ICON = "EditPanel"
 
     def __init__(self, style='wxTAB_TRAVERSAL'):
         "Class to handle wxPanel objects"
-        # initialise instance logger
-        self._logger = logging.getLogger(self.__class__.__name__)
-
-        # initialise instance
         EditStylesMixin.__init__(self, 'wxPanel')
-        self.top_sizer = None  # sizer to handle the layout of children
 
         # initialise properties
-        self.no_custom_class = np.CheckBoxProperty(False, default_value=False)
         self.scrollable      = np.CheckBoxProperty(False, default_value=False)
         self.scroll_rate = prop = np.IntPairPropertyD( "10, 10" )
         prop.set_blocked(True)
 
         if style: self.properties["style"].set(style)
 
-    def finish_widget_creation(self):
-        super(PanelBase, self).finish_widget_creation(sel_marker_parent=self.widget)
+    def get_editor_name(self):
+        ret = self.__class__.__name__
+        if self.WX_CLASS=="wxScrolledWindow":
+            # self.scrolled is True
+            # "EditPanel"         -> 'EditScrolledWindow'
+            # "EditTopLevelPanel" -> "EditTopLevelScrolledWindow"
+            ret = ret.replace("Panel", "ScrolledWindow")
+        return ret
+
+    def finish_widget_creation(self, level):
+        if self.IS_TOPLEVEL:
+            super(PanelBase, self).finish_widget_creation(level)
+        else:
+            super(PanelBase, self).finish_widget_creation(level, sel_marker_parent=self.widget)
+
         if self.scrollable:
             self.widget.SetScrollRate( *self.properties["scroll_rate"].get_tuple() )
         # this must be done here since ManagedBase.finish_widget_creation normally sets EVT_LEFT_DOWN to update_view
         if not self.widget.Disconnect(-1, -1, wx.wxEVT_LEFT_DOWN):
-            self._logger.warning( _("EditPanel: Unable to disconnect the event handler") )
+            logging.warning( _("EditPanel: Unable to disconnect the event handler") )
         self.widget.Bind(wx.EVT_LEFT_DOWN, self.drop_sizer)
 
     def _update_markers(self, event):
@@ -65,45 +68,47 @@
         event.Skip()
 
     def on_enter(self, event):
-        if not self.top_sizer and common.adding_sizer:
+        if self.children and common.adding_sizer:
             self.widget.SetCursor(wx.CROSS_CURSOR)
         else:
             self.widget.SetCursor(wx.STANDARD_CURSOR)
 
     def set_sizer(self, sizer):
-        self.top_sizer = sizer
-        if self.top_sizer and self.top_sizer.widget and self.widget:
+        if sizer and sizer.widget and self.widget:
             self.widget.SetAutoLayout(True)
-            self.widget.SetSizer(self.top_sizer.widget)
+            self.widget.SetSizer(sizer.widget)
             self.widget.Layout()
-        elif self.top_sizer is None and self.widget:
+        elif sizer is None and self.widget:
             self.widget.SetSizer(None)
 
-    def drop_sizer(self, event=None):
-        if self.top_sizer or not common.adding_sizer:
+    def drop_sizer(self, event=None, reset=None):
+        if self.children or not common.adding_sizer:
             self.on_set_focus(event)  # default behaviour: call show_properties
             return
         if self.widget: self.widget.SetCursor(wx.NullCursor)
-        common.widgets[common.widget_to_add](self, None, None)
+        new_widget = common.widgets[common.widget_to_add](self, None)
+        if new_widget is None: return
+        misc.rebuild_tree(new_widget)
+        if reset is False: return
         if event is None or not misc.event_modifier_copy(event):
             common.adding_widget = common.adding_sizer = False
             common.widget_to_add = None
-        common.app_tree.app.saved = False
 
     def check_drop_compatibility(self):
-        if self.top_sizer:
-            return (False, 'Sizer already set for this panel')
+        if self.children:
+            return (False, 'Sizer or child widget already set for this panel.')
+
         if common.adding_sizer:
             return (True, None)
-        return (False, 'Only sizers can be added here')
+        return (False, 'Only sizers can be added here; optionally, delete the panel and add e.g. a notebook. ')
 
     def get_widget_best_size(self):
-        if self.top_sizer and self.widget.GetSizer():
-            self.top_sizer.fit_parent()
+        if self.children and self.widget.GetSizer():
+            self.children[0].fit_parent()
             return self.widget.GetSize()
         return self.widget.__class__.GetBestSize(self.widget)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "scrollable" in modified:
             if self.scrollable:
                 if self.klass == 'wxPanel':
@@ -118,42 +123,32 @@
 
         if self.widget and modified:
             if "scrollable" in modified and self.properties["scrollable"].previous_value!=self.scrollable:
-                self.recreate_widget()
+                actions.add("recreate")
             elif "scroll_rate" in modified and self.scrollable and isinstance(self.widget, wx.ScrolledWindow):
                 self.widget.SetScrollRate( *self.properties["scroll_rate"].get_tuple() )
-        EditStylesMixin.properties_changed(self, modified)
-
-    def __getstate__(self):
-        state = self.__dict__.copy()
-        del state['_logger']
-        return state
-
-    def __setstate__(self, state):
-        self.__dict__.update(state)
-
-        # re-initialise logger instance deleted from __getstate__
-        self._logger = logging.getLogger(self.__class__.__name__)
-
+        EditStylesMixin._properties_changed(self, modified, actions)
 
 
 class EditPanel(PanelBase, ManagedBase):
     "Class to handle wxPanel objects"
-
+    WX_CLASS = "wxPanel"  # this will be overwritten in properties_changed depending on the "scrolled" property
+    WX_CLASSES = ("wxPanel", "wxScrolledWindow")
     PROPERTIES = ManagedBase.PROPERTIES + PanelBase._PROPERTIES + ManagedBase.EXTRA_PROPERTIES
+    np.insert_after(PROPERTIES, "name", "class", "custom_base")
 
-    def __init__(self, name, parent, id, sizer, pos, style='wxTAB_TRAVERSAL'):
-        ManagedBase.__init__(self, name, 'wxPanel', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, style='wxTAB_TRAVERSAL'):
+        ManagedBase.__init__(self, name, parent, index)
         PanelBase.__init__(self, style)
 
     def create_widget(self):
         # to be done: use ScrolledWindow only if scrolling is required
         if self.scrollable:
-            self.widget = wx.ScrolledWindow(self.parent.widget, self.id, style=0)
+            self.widget = wx.ScrolledWindow(self.parent_window.widget, wx.ID_ANY, style=0)
         else:
-            self.widget = wx.Panel(self.parent.widget, self.id, style=0)
+            self.widget = wx.Panel(self.parent_window.widget, wx.ID_ANY, style=0)
         self.widget.Bind(wx.EVT_ENTER_WINDOW, self.on_enter)
         self.widget.GetBestSize = self.get_widget_best_size
-        if self.sizer.is_virtual():
+        if not self.parent.IS_SIZER:
             def GetBestSize():
                 if self.widget and self.widget.GetSizer():
                     return self.widget.GetSizer().GetMinSize()
@@ -161,9 +156,11 @@
             self.widget.GetBestSize = GetBestSize
 
     def set_sizer(self, sizer):
+        # called from sizer.create: self.window.set_sizer(self)
+        assert self.children and sizer is self.children[0]
         super(EditPanel, self).set_sizer(sizer)
-        if self.top_sizer and self.top_sizer.widget and self.widget:
-            self.sizer.set_item_best_size(self, size=self.widget.GetBestSize())
+        if sizer and sizer.widget and self.widget:
+            sizer.set_item_best_size(self, size=self.widget.GetBestSize())
 
     def _create_popup_menu(self, widget=None):
         if widget is None: widget = self.widget
@@ -177,11 +174,11 @@
 
         i = misc.append_menu_item(menu, -1, _('Paste Sizer\tCtrl+V'), wx.ART_PASTE)
         misc.bind_menu_item_after(widget, i, clipboard.paste, self)
-        if self.top_sizer is not None or not clipboard.check("sizer"): i.Enable(False)
+        if self.children or not clipboard.check("sizer"): i.Enable(False)
         menu.AppendSeparator()
 
-        if self.sizer and hasattr(self.sizer, "_add_popup_menu_items"):
-            self.sizer._add_popup_menu_items(menu, self, widget)
+        if hasattr(self.parent, "_add_parent_popup_menu_items"):
+            self.parent._add_parent_popup_menu_items(menu, self, widget)
 
         i = misc.append_menu_item(menu, -1, _('Preview'))
         misc.bind_menu_item_after(widget, i, self.preview_parent)
@@ -190,52 +187,51 @@
 
     def check_compatibility(self, widget, typename=None, report=True):
         "check whether widget can be pasted"
+        if self.children and not self.children[0].IS_SLOT:
+            return (False, 'Sizer already set for this panel')
         if typename is not None:
             if typename!="sizer":
                 return (False, 'Only sizers can be pasted here')
-            if self.top_sizer:
-                return (False, 'Sizer set already')
             return (True, None)
 
-        import edit_sizers
-        if not isinstance(widget, edit_sizers.Sizer):
+        if not widget.IS_SIZER:
             return (False, 'Only sizers can be pasted here')
-        #if self.sizer is not None:
-        if self.top_sizer:
-            return (False, 'Sizer set already')
         return (True, None)
 
     def clipboard_paste(self, clipboard_data):
         "Insert a widget from the clipboard to the current destination"
         if self.widget: size = self.widget.GetSize()
-        ret = clipboard._paste(self, None, 0, clipboard_data)
+        ret = clipboard._paste(self, 0, clipboard_data)
         if self.widget: self.widget.SetSize(size)
         return ret
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "scrollable" in modified:
             if self.scrollable:
-                # 2003-06-26 ALB: change the "class name", to allow code generation
-                # for a wxScrolledWindow (see Node.write and common.class_names usage in xml_parse.py)
-                self._classname = 'EditScrolledWindow'
+                self.WX_CLASS = "wxScrolledWindow"
             else:
-                self._classname = self.__class__.__name__
-        PanelBase.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+                self.WX_CLASS = "wxPanel"
+        PanelBase._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
     def get_properties(self, without=set()):
         # return list of properties to be written to XML file
         if not self.scrollable: without.add("scroll_rate")
         return ManagedBase.get_properties(self, without)
 
+    def _get_tooltip(self):
+        if self.parent.WX_CLASS in ("wxSplitterWindow", "wxNotebook"):
+            return "Add a sizer here; optionally, delete the panel and add e.g. a notebook, splitter or grid. "
+        return "Add a sizer here"
 
-class EditTopLevelPanel(PanelBase, TopLevelBase):
-    _is_toplevel_window = False  # avoid to appear in the "Top Window" property of the app
 
+class EditTopLevelPanel(PanelBase, TopLevelBase):
+    IS_TOPLEVEL_WINDOW = False  # avoid to appear in the "Top Window" property of the app
+    WX_CLASS = "wxPanel"
     PROPERTIES = TopLevelBase.PROPERTIES + PanelBase._PROPERTIES + TopLevelBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, klass='wxPanel', style='wxTAB_TRAVERSAL'):
-        TopLevelBase.__init__(self, name, klass, parent, id)
+    def __init__(self, name, parent, klass, style='wxTAB_TRAVERSAL'):
+        TopLevelBase.__init__(self, name, parent, klass)
         PanelBase.__init__(self, style)
         self.skip_on_size = False
 
@@ -249,7 +245,7 @@
             win = wx.Frame( common.main, -1, misc.design_title(self.name), size=(400, 300), style=style )
             import os, compat
             icon = compat.wx_EmptyIcon()
-            xpm = os.path.join(config.icons_path, 'panel.xpm')
+            xpm = os.path.join(config.icons_path, 'panel.png')
             icon.CopyFromBitmap(misc.get_xpm_bitmap(xpm))
             win.SetIcon(icon)
             win.Bind(wx.EVT_CLOSE, self.hide_widget)  # CLOSE event of the frame, not the panel
@@ -257,45 +253,32 @@
                 win.CentreOnScreen()
 
         if self.scrollable:
-            self.widget = wx.ScrolledWindow(win, self.id, style=0)
+            self.widget = wx.ScrolledWindow(win, wx.ID_ANY, style=0)
         else:
-            self.widget = wx.Panel(win, self.id, style=0)
+            self.widget = wx.Panel(win, wx.ID_ANY, style=0)
         self.widget.Bind(wx.EVT_ENTER_WINDOW, self.on_enter)
         self.widget.GetBestSize = self.get_widget_best_size
         #self.widget.SetSize = win.SetSize
 
     def create(self):
-        # XXX refactor this
-        size_p = self.properties['size']
-        oldval = size_p.get()
         super(EditTopLevelPanel, self).create()
-        if self.widget:
-            if not size_p.is_active() and self.top_sizer:
-                self.top_sizer.fit_parent()
-        if size_p.is_active() and oldval!=size_p.get():
-            size_p.set(oldval)
-            self.set_size()
+        if not self.check_prop("size") and self.children and self.children[0].IS_SIZER:
+            self.children[0].fit_parent()
+
+    def destroy_widget(self, level):
+        # handle containing frame
+        win = self.widget and self.widget.GetParent() or None
+        super(EditTopLevelPanel, self).destroy_widget(level)
+        if win is not None: win.Destroy()
 
     def hide_widget(self, event=None):
         # this is called from the context menu and from the EVT_CLOSE of the Frame
         self.widget.GetParent().Hide()
-        common.app_tree.expand(self.node, False)
+        common.app_tree.Collapse(self.item)
         self.design.update_label()
 
-    def set_name(self, name):
-        super(EditTopLevelPanel, self).set_name(name)
-        if self.widget:
-            self.widget.GetParent().SetTitle(misc.design_title(self.name))
-
-    def delete(self):
-        win = None
-        if self.widget:
-            win = self.widget.GetParent()
-        super(EditTopLevelPanel, self).delete()
-        if win is not None:
-            win.Destroy()
-
     def on_size(self, event):
+        # handle containing frame
         w, h = event.GetSize()
         if self.skip_on_size:
             self.skip_on_size = False
@@ -305,20 +288,18 @@
         if self.widget.GetParent().GetClientSize() != (w, h):
             self.widget.GetParent().SetClientSize((w+2, h+2))
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "scrollable" in modified:
             if self.scrollable:
-                # 2003-06-26 ALB: change the "class name", to allow code generation
-                # for a wxScrolledWindow (see Node.write and common.class_names usage in xml_parse.py)
-                self._classname = 'EditTopLevelScrolledWindow'
+                self.WX_CLASS = "wxScrolledWindow"
             else:
-                self._classname = self.__class__.__name__
+                self.WX_CLASS = "wxPanel"
         if not modified or "name" in modified:
             if self.widget:
                 self.widget.GetParent().SetTitle(misc.design_title(self.name))
 
-        PanelBase.properties_changed(self, modified)
-        TopLevelBase.properties_changed(self, modified)
+        PanelBase._properties_changed(self, modified, actions)
+        TopLevelBase._properties_changed(self, modified, actions)
 
     def get_properties(self, without=set()):
         # return list of properties to be written to XML file
@@ -326,77 +307,42 @@
         return TopLevelBase.get_properties(self, without)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditPanel objects"
-    name = 'panel_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'panel_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('panel_%d')
     with parent.frozen():
-        panel = EditPanel(name, parent, wx.NewId(), sizer, pos, style='')
-        node = Node(panel)
-        panel.node = node
-        panel.properties["proportion"].set(1)
-        panel.properties["flag"].set("wxEXPAND")
-        if parent.widget: panel.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
-    #sizer.set_item(panel.pos, 1, wx.EXPAND)
+        editor = EditPanel(name, parent, index, style='')
+        editor.properties["proportion"].set(1)
+        editor.properties["flag"].set("wxEXPAND")
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditPanel objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if not sizer or not sizeritem:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    panel = EditPanel(name, parent, wx.NewId(), sizer, pos, style='')
-    #sizer.set_item(panel.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(panel)
-    panel.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return panel
-
-
-def xml_toplevel_builder(attrs, parent, sizer, sizeritem, pos=None):
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    panel = EditTopLevelPanel( label, parent, wx.NewId(), style='' )
-    node = Node(panel)
-    panel.node = node
-    common.app_tree.add(node)
-    return panel
+    return EditPanel(name, parent, index, '')
+
+
+def xml_toplevel_builder(parser, base, name, parent, index):
+    return EditTopLevelPanel( name, parent, "Panel", '' )
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditPanel'] = EditPanel
     common.widgets['EditPanel'] = builder
     common.widgets_from_xml['EditPanel'] = xml_builder
 
-    #common.widgets['EditScrolledWindow'] = builder
+    common.widget_classes['EditScrolledWindow'] = EditPanel
     common.widgets_from_xml['EditScrolledWindow'] = xml_builder
 
+    common.widget_classes['EditTopLevelPanel'] = EditTopLevelPanel
     common.widgets_from_xml['EditTopLevelPanel'] = xml_toplevel_builder
+    common.widget_classes['EditTopLevelScrolledWindow'] = EditTopLevelPanel
     common.widgets_from_xml['EditTopLevelScrolledWindow'] = xml_toplevel_builder
-    from tree import WidgetTree
-    import os.path
-    icon = os.path.join(config.icons_path, 'panel.xpm')
-    WidgetTree.images['EditTopLevelPanel'] = icon
-    WidgetTree.images['EditScrolledWindow'] = icon
-    WidgetTree.images['EditTopLevelScrolledWindow'] = icon
 
     # these are for backwards compatibility (may be removed someday...)
     common.widgets_from_xml['SplitterPane'] = xml_builder
-    WidgetTree.images['SplitterPane'] = os.path.join( config.icons_path, 'panel.xpm' )
     common.widgets_from_xml['NotebookPane'] = xml_builder
-    WidgetTree.images['NotebookPane'] = os.path.join( config.icons_path, 'panel.xpm' )
-    return common.make_object_button('EditPanel', 'panel.xpm', tip='Add a Panel/ScrolledWindow')
+    return common.make_object_button('EditPanel', 'panel.png', tip='Add a Panel/ScrolledWindow')
 
diff -Nru wxglade-0.9.6/widgets/panel/perl_codegen.py wxglade-1.0.1/widgets/panel/perl_codegen.py
--- wxglade-0.9.6/widgets/panel/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/panel/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2004 D.H. aka crazyinsomniac on sourceforge.net
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -19,21 +19,14 @@
         scrollable = panel.scrollable
 
         id_name, id = self.codegen.generate_code_id(panel)
-        parent = self.format_widget_access(panel.parent)
+        parent = self.format_widget_access(panel.parent_window)
+        klass = panel.get_instantiation_class(self.cn, self.cn_class)
 
-        if panel.is_toplevel:
+        if panel.IS_CLASS:
             l = []
-            if id_name:
-                l.append(id_name)
-
-            klass = panel.base
-            if klass != panel.klass:
-                klass = panel.klass
-            else:
-                klass = klass.replace('wx', 'Wx::', 1)
-
+            if id_name: l.append(id_name)
             l.append( '$self->{%s} = %s->new(%s, %s);\n' % (panel.name, klass, parent, id) )
-            return l, [], []
+            return l, []
 
         init = []
         if id_name:
@@ -41,29 +34,20 @@
         style = panel.properties["style"].get_string_value() or 'wxTAB_TRAVERSAL'
         if not (scrollable or style != 'wxTAB_TRAVERSAL'):
             style = ''
-        #if not int(panel.properties.get('no_custom_class', False)):
-        if not panel.no_custom_class:
-            if scrollable:
-                klass = 'Wx::ScrolledWindow'
-            else:
-                klass = 'Wx::Panel'
-        else:
-            klass = self.codegen.cn(panel.klass)
-
-        if style:
-            extra = ', wxDefaultPosition, wxDefaultSize, %s' % style
-        else:
-            extra = ''
+
+        extra = style and ', wxDefaultPosition, wxDefaultSize, %s'%style or ''
 
         init.append( '$self->{%s} = %s->new(%s, %s%s);\n' % (panel.name, klass, parent, id, extra) )
 
-        props_buf = self.codegen.generate_common_properties(panel)
+        init += self.codegen.generate_code_common_properties(panel)
         if scrollable and panel.check_prop("scroll_rate"):
-            props_buf.append( '$self->{%s}->SetScrollRate(%s);\n' % (panel.name, panel.scroll_rate) )
-        return init, props_buf, []
+            init.append( '$self->{%s}->SetScrollRate(%s);\n' % (panel.name, panel.scroll_rate) )
+        return init, []
 
     def get_properties_code(self, obj):
-        props_buf = self.codegen.generate_common_properties(obj)
+        # XXX check whether this can be used to unify with above code:
+        # self.format_widget_access(obj)
+        props_buf = self.codegen.generate_code_common_properties(obj)
         if obj.scrollable and obj.check_prop("scroll_rate"):
             props_buf.append('$self->SetScrollRate(%s);\n' % obj.scroll_rate)
         return props_buf
@@ -79,7 +63,5 @@
     klass = 'wxPanel'
     common.class_names['EditPanel'] = klass
     common.class_names['EditTopLevelPanel'] = klass
-    common.toplevels['EditPanel'] = 1
-    common.toplevels['EditTopLevelPanel'] = 1
     common.register('perl', klass, PerlPanelGenerator(klass))
     common.register('perl', 'wxScrolledWindow', PerlPanelGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/panel/wconfig.py wxglade-1.0.1/widgets/panel/wconfig.py
--- wxglade-0.9.6/widgets/panel/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/panel/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -17,6 +17,7 @@
                    'wxSUNKEN_BORDER', 'wxBORDER_SUNKEN',
                    'wxRAISED_BORDER', 'wxBORDER_RAISED',
                    'wxSTATIC_BORDER', 'wxBORDER_STATIC',
+                   'wxBORDER_THEME',
                    'wxNO_BORDER', 'wxBORDER_NONE',
                    'wxTAB_TRAVERSAL', 'wxWANTS_CHARS',
                    'wxFULL_REPAINT_ON_RESIZE',
diff -Nru wxglade-0.9.6/widgets/property_grid_manager/property_grid_manager.py wxglade-1.0.1/widgets/property_grid_manager/property_grid_manager.py
--- wxglade-0.9.6/widgets/property_grid_manager/property_grid_manager.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/property_grid_manager/property_grid_manager.py	2020-12-31 14:04:48.000000000 +0000
@@ -4,7 +4,7 @@
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014 Carsten Grohmann
 @copyright: 2015 Franco Bugnano
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -12,21 +12,21 @@
 from wx.propgrid import *
 import common, compat
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 
 
 class EditPropertyGridManager(ManagedBase, EditStylesMixin):
     "Class to handle wxPropertyGridManager objects"
+    WX_CLASS = 'wxPropertyGridManager'
     _PROPERTIES = ["Widget", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     recreate_on_style_change = True
 
-    def __init__(self, name, parent, id, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxPropertyGridManager', parent, id, sizer, pos)
+    def __init__(self, name, parent, index):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
     def create_widget(self):
-        self.widget = PropertyGridManager(self.parent.widget, self.id, (200,200), style=self.style)
+        self.widget = PropertyGridManager(self.parent_window.widget, wx.ID_ANY, (200,200), style=self.style)
 
         # property grid does handle left and right mouse clicks and emits these events:
         self.widget.Bind(EVT_PG_SELECTED, self.on_set_focus)
@@ -53,7 +53,7 @@
         pg.Append( wxpg.IntProperty("Int",value=123) )
         pg.Append( wxpg.FloatProperty("Float",value=123.4) )
         pg.Append( wxpg.BoolProperty("Bool",value=True) )
-        boolprop = pg.Append( wxpg.BoolProperty("Bool_with_Checkbox",value=True) )
+        pg.Append( wxpg.BoolProperty("Bool_with_Checkbox",value=True) )
         pg.SetPropertyAttribute( "Bool_with_Checkbox", "UseCheckbox", True)
         pg.Append( wxpg.PropertyCategory("2 - More Properties") )
         pg.Append( wxpg.LongStringProperty("LongString", value="This is a\nmulti-line string\nwith\ttabs\nmixed\tin."))
@@ -89,54 +89,34 @@
     def get_property_handler(self, name):
         return ManagedBase.get_property_handler(self, name)
 
-    def properties_changed(self, modified=None):
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+    def _properties_changed(self, modified, actions):
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditPropertyGridManager objects"
-    label = 'property_grid_%d' % number[0]
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = 'property_grid_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('property_grid_%d')
     with parent.frozen():
-        property_grid_manager = EditPropertyGridManager(label, parent, wx.NewId(), sizer, pos)
-        property_grid_manager.properties["style"].set_to_default()
+        editor = EditPropertyGridManager(name, parent, index)
+        editor.properties["style"].set_to_default()
         # A grid should be wx.EXPANDed and 'option' should be 1, or you can't see it.
-        property_grid_manager.properties["proportion"].set(1)
-        property_grid_manager.properties["flag"].set("wxEXPAND")
-        node = Node(property_grid_manager)
-        property_grid_manager.node = node
-        if parent.widget: property_grid_manager.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor.properties["proportion"].set(1)
+        editor.properties["flag"].set("wxEXPAND")
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditPropertyGridManager objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    property_grid_manager = EditPropertyGridManager( label, parent, wx.NewId(), sizer, pos )
-    #sizer.set_item( property_grid_manager.pos, proportion=sizeritem.proportion, flag=sizeritem.flag,
-    #                border=sizeritem.border)
-    node = Node(property_grid_manager)
-    property_grid_manager.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return property_grid_manager
+    return EditPropertyGridManager( name, parent, index )
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
+    common.widget_classes['EditPropertyGridManager'] = EditPropertyGridManager
     common.widgets['EditPropertyGridManager'] = builder
     common.widgets_from_xml['EditPropertyGridManager'] = xml_builder
 
-    return common.make_object_button('EditPropertyGridManager', 'grid.xpm')
+    return common.make_object_button('EditPropertyGridManager', 'grid.png')
 
diff -Nru wxglade-0.9.6/widgets/radio_box/radio_box.py wxglade-1.0.1/widgets/radio_box/radio_box.py
--- wxglade-0.9.6/widgets/radio_box/radio_box.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/radio_box/radio_box.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,14 +3,13 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 import common, compat
 from edit_windows import ManagedBase
-from tree import Node
 import new_properties as np
 from misc import wxGladeRadioButton
 
@@ -19,12 +18,13 @@
 
 
 class EditRadioBox(ManagedBase):
+    WX_CLASS = 'wxRadioBox'
     _PROPERTIES = ["Widget", "label", "style", "dimension", "selection", "choices"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, label, choices, major_dim, style, sizer, pos):
+    def __init__(self, name, parent, index, style, label, choices, major_dim):
         "Class to handle wxRadioBox objects"
-        ManagedBase.__init__(self, name, 'wxRadioBox', parent, id, sizer, pos)
+        ManagedBase.__init__(self, name, parent, index)
         self.static_box = None
         
         # initialise instance properties
@@ -32,7 +32,7 @@
         self.dimension = np.SpinProperty(major_dim)
         self.selection = np.SpinProperty(0, val_range=(0,len(choices)-1), immediate=True )
         self.choices   = ChoicesProperty( choices, [(_('Label'), np.GridProperty.STRING)] )
-        style = style or wx.RA_SPECIFY_ROWS
+        style = style or wx.RA_SPECIFY_COLS
         styles = [wx.RA_SPECIFY_ROWS, wx.RA_SPECIFY_COLS]
         aliases = ["wxRA_SPECIFY_ROWS","wxRA_SPECIFY_COLS"]  # labels and aliases
         self.style = np.RadioProperty(style, styles, aliases, aliases=aliases, columns=2)
@@ -41,7 +41,7 @@
 
     # widget creation / updates ########################################################################################
     def create_widget(self):
-        self.widget = wx.Panel(self.parent.widget, self.id)
+        self.widget = wx.Panel(self.parent_window.widget, wx.ID_ANY)
         self.widget.GetBestSize = self.GetBestSize
         self.widget.SetForegroundColour = self.SetForegroundColour
         self.widget.SetBackgroundColour = self.SetBackgroundColour
@@ -93,21 +93,18 @@
         for button in buttons_layout:
             w, h = button.GetBestSize()
             sizer.Add(button, 0, wx.EXPAND)
-            sizer.SetItemMinSize(button, w, h)
         self.widget.SetAutoLayout(True)
         sb_sizer = wx.StaticBoxSizer(self.static_box, wx.VERTICAL)
         self.widget.SetSizer(sb_sizer)
         sb_sizer.Add(sizer, 1, wx.EXPAND)
-        sb_sizer.SetMinSize(sizer.GetMinSize())
         sb_sizer.Fit(self.widget)
-        self.sizer.set_item_best_size(self, size=self.widget.GetBestSize())
+        self.parent.layout()
 
     def _set_label(self):
         if not self.widget or not self.static_box: return
         label = self.label
         self.static_box.SetLabel(label)
-        if not self.properties['size'].is_active():
-            self.sizer.set_item_best_size(self, size=self.widget.GetBestSize())
+        self.parent.layout()
 
     def _set_choices(self):
         if not self.widget: return
@@ -155,7 +152,7 @@
             return ChoicesHandler(self)
         return ManagedBase.get_property_handler(self, prop_name)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         # self.selection needs to be in range (0,len(self.choices)-1)
         choices = self.choices
         max_selection = len(choices)-1 if choices else 0
@@ -170,56 +167,36 @@
             if self.selection>max_selection:
                 self.properties['selection'].set(max_selection)
             set_selection = True
-        
-        if not modified or "choices" in modified or "dimension" in modified:
+
+        if not modified or "choices" in modified or "dimension" in modified or "style" in modified:
             self._set_choices()  # does also update label
         elif not modified or "label" in modified:
             self._set_label()
-            common.app_tree.refresh(self.node, refresh_label=True)
 
         if self.widget and set_selection:
             self._set_selection()
 
-        ManagedBase.properties_changed(self, modified)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditRadioBox objects"
-    label = u'radio_box_%d' % number[0]
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = u'radio_box_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('radio_box_%d')
     with parent.frozen():
-        radio_box = EditRadioBox(label, parent, wx.NewId(), label, [[u'choice 1'],], 1, 0, sizer, pos)
-        node = Node(radio_box)
-        radio_box.node = node
-        if parent.widget: radio_box.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditRadioBox(name, parent, index, 0, name, [[u'choice 1'],], 1)
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditRadioBox objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    radio_box = EditRadioBox(label, parent, wx.NewId(), '', [], 1, 0, sizer, pos)
-    #size.set_item(radio_box.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(radio_box)
-    radio_box.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return radio_box
+    return EditRadioBox(name, parent, index, 0, '', [], 1)
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
+    common.widget_classes['EditRadioBox'] = EditRadioBox
     common.widgets['EditRadioBox'] = builder
     common.widgets_from_xml['EditRadioBox'] = xml_builder
 
-    return common.make_object_button('EditRadioBox', 'radio_box.xpm')
+    return common.make_object_button('EditRadioBox', 'radio_box.png')
diff -Nru wxglade-0.9.6/widgets/radio_button/radio_button.py wxglade-1.0.1/widgets/radio_button/radio_button.py
--- wxglade-0.9.6/widgets/radio_button/radio_button.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/radio_button/radio_button.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,14 +3,13 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 import common, config
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 from misc import wxGladeRadioButton
 
@@ -19,82 +18,67 @@
     "Class to handle wxRadioButton objects"
     update_widget_style = False
 
+    WX_CLASS = 'wxRadioButton'
     _PROPERTIES = ["Widget", "label", "clicked", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, label, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxRadioButton', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, label=""):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
-        self.label   = np.TextProperty("", multiline="grow")
+        self.label   = np.TextProperty(label, multiline="grow")
         self.clicked = np.CheckBoxProperty(False, default_value=False)
 
     def create_widget(self):
-        self.widget = wxGladeRadioButton(self.parent.widget, self.id, self.label)
+        self.widget = wxGladeRadioButton(self.parent_window.widget, wx.ID_ANY, self.label)
         self.widget.SetValue(self.clicked)
         self.widget.Bind(wx.EVT_CHECKBOX, lambda e: self.widget.SetValue(self.value))
 
     def _set_label(self):
         if not self.widget: return
         self.widget.SetLabel(self.label)
-        if not self.properties['size'].is_active():  # XXX changed this: '-1, -1' is identical to not active
-            self.sizer.set_item_best_size(self, size=self.widget.GetBestSize())
-
-    def properties_changed(self, modified):
-        resize = False
 
+    def _properties_changed(self, modified, actions):
         if not modified or "label" in modified:
             self._set_label()
-            common.app_tree.refresh(self.node, refresh_label=True)
+            actions.add("layout")
 
         if not modified or "clicked" in modified and self.widget:
             self.widget.SetValue(self.clicked)
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
-
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditRadioButton objects"
-    label = u'radio_btn_%d' % number[0]
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = u'radio_btn_%d' % number[0]
+    import dialogs, misc
+    name = parent.toplevel_parent.get_next_contained_name('radio_btn_%d')
+    dlg = dialogs.WidgetStyleSelectionDialog("RadioButton", None, None, ["?Label"])
+    with misc.disable_stay_on_top(common.adding_window or parent):
+        res = dlg.ShowModal()
+    label, = dlg.get_options()
+    dlg.Destroy()
+    if res != wx.ID_OK: return
+
     with parent.frozen():
-        radio = EditRadioButton(label, parent, wx.NewId(), label, sizer, pos)
-        radio.properties["style"].set_to_default()
-        radio.check_defaults()
-        node = Node(radio)
-        radio.node = node
-        if parent.widget: radio.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditRadioButton(name, parent, index, label)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditRadioButton objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    radio = EditRadioButton(label, parent, wx.NewId(), "", sizer, pos)
-    #sizer.set_item(radio.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(radio)
-    radio.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return radio
+    return EditRadioButton(name, parent, index, "")
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
+    common.widget_classes['EditRadioButton'] = EditRadioButton
     common.widgets['EditRadioButton'] = builder
     common.widgets_from_xml['EditRadioButton'] = xml_builder
 
-    return common.make_object_button('EditRadioButton', 'radio_button.xpm')
+    return common.make_object_button('EditRadioButton', 'radio_button.png')
diff -Nru wxglade-0.9.6/widgets/radio_button/wconfig.py wxglade-1.0.1/widgets/radio_button/wconfig.py
--- wxglade-0.9.6/widgets/radio_button/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/radio_button/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -18,12 +18,8 @@
                       'button as not belonging to a group, and implement '
                       'the mutually-exclusive group behaviour yourself.'),
         },
-        'wxRB_USE_CHECKBOX': {
-            'desc': _('Use a checkbox button instead of radio button (currently supported only on PalmOS).'),
-            'supported_by': ('wx2',),
-        },
     },
-    'style_list': ['wxRB_GROUP', 'wxRB_SINGLE', 'wxRB_USE_CHECKBOX'],
+    'style_list': ['wxRB_GROUP', 'wxRB_SINGLE'],
     'events': {
         'EVT_RADIOBUTTON': {},
     },
diff -Nru wxglade-0.9.6/widgets/search_ctrl/codegen.py wxglade-1.0.1/widgets/search_ctrl/codegen.py
--- wxglade-0.9.6/widgets/search_ctrl/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/search_ctrl/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 """\
 Code generator functions for wxSearchCtrl objects
 
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/search_ctrl/lisp_codegen.py wxglade-1.0.1/widgets/search_ctrl/lisp_codegen.py
--- wxglade-0.9.6/widgets/search_ctrl/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/search_ctrl/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 """\
 Lisp generator functions for wxSearchCtrl objects
 
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/search_ctrl/perl_codegen.py wxglade-1.0.1/widgets/search_ctrl/perl_codegen.py
--- wxglade-0.9.6/widgets/search_ctrl/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/search_ctrl/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 """\
 Perl generator functions for wxSearchCtrl objects
 
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/search_ctrl/search_ctrl.py wxglade-1.0.1/widgets/search_ctrl/search_ctrl.py
--- wxglade-0.9.6/widgets/search_ctrl/search_ctrl.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/search_ctrl/search_ctrl.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -12,20 +12,20 @@
 import common, config, misc
 from edit_windows import ManagedBase, EditStylesMixin
 import new_properties as np
-from tree import Node
 
 
 class EditSearchCtrl(ManagedBase, EditStylesMixin):
     "Class to handle wxSearchCtrl objects"
 
+    WX_CLASS = 'wxSearchCtrl'
     # we want these pages: Common, Layout, Widget, Events, Code
     _PROPERTIES = ["Widget", "value", "descriptive_text", "search_button", "cancel_button", "max_length", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     #recreate_on_style_change = True
 
-    def __init__(self, name, parent, id, sizer, pos):
+    def __init__(self, name, parent, index):
         # initialize base classes
-        ManagedBase.__init__(self, name, 'wxSearchCtrl', parent, id, sizer, pos)
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialize instance properties
@@ -37,7 +37,7 @@
 
     def create_widget(self):
         value = self.value
-        self.widget = wx.SearchCtrl(self.parent.widget, self.id, value=value, style=self.style)
+        self.widget = wx.SearchCtrl(self.parent_window.widget, wx.ID_ANY, value=value, style=self.style)
         self.widget.ShowSearchButton(self.search_button)
         self.widget.ShowCancelButton(self.cancel_button)
         if self.properties["descriptive_text"].is_active():
@@ -45,13 +45,13 @@
         if self.properties["max_length"].is_active():
             self.widget.SetMaxLength(self.max_length)
 
-    def finish_widget_creation(self, sel_marker_parent=None, re_add=True):
-        ManagedBase.finish_widget_creation(self, sel_marker_parent, re_add)
+    def finish_widget_creation(self, level, sel_marker_parent=None):
+        ManagedBase.finish_widget_creation(self, sel_marker_parent)
         #self.widget.Bind(wx.EVT_SET_FOCUS, self.on_set_focus)
         self.widget.Bind(wx.EVT_CHILD_FOCUS, self.on_set_focus)
         #self.widget.Bind(wx.EVT_TEXT, self.on_set_focus)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if "value" in modified and self.widget:
             self.widget.SetValue(self.value)
         if "search_button" in modified and self.widget:
@@ -62,50 +62,31 @@
             self.widget.SetDescriptiveText(self.descriptive_text)
         if "max_length" in modified and self.widget:
             self.widget.SetMaxLength(self.max_length)
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditSearchCtrl objects"
-    name = 'text_ctrl_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'text_ctrl_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('text_ctrl_%d')
     with parent.frozen():
-        text = EditSearchCtrl(name, parent, wx.NewId(), sizer, pos)
-        text.properties["style"].set_to_default()
-        text.check_defaults()
-        node = Node(text)
-        text.node = node
-        if parent.widget: text.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditSearchCtrl(name, parent, index)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory function to build EditSearchCtrl objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    text = EditSearchCtrl(name, parent, wx.NewId(), sizer, pos)
-    #sizer.set_item(text.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(text)
-    text.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return text
+    return EditSearchCtrl(name, parent, index)
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditSearchCtrl'] = EditSearchCtrl
     common.widgets['EditSearchCtrl'] = builder
     common.widgets_from_xml['EditSearchCtrl'] = xml_builder
 
-    return common.make_object_button('EditSearchCtrl', 'search_ctrl.xpm')
+    return common.make_object_button('EditSearchCtrl', 'search_ctrl.png')
diff -Nru wxglade-0.9.6/widgets/search_ctrl/wconfig.py wxglade-1.0.1/widgets/search_ctrl/wconfig.py
--- wxglade-0.9.6/widgets/search_ctrl/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/search_ctrl/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,7 +1,7 @@
 """\
 wxSearchCtrl widget configuration
 
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/slider/slider.py wxglade-1.0.1/widgets/slider/slider.py
--- wxglade-0.9.6/widgets/slider/slider.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/slider/slider.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,15 +3,13 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
-import common, misc
-import wcodegen
+import common
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 
 
@@ -19,11 +17,12 @@
 class EditSlider(ManagedBase, EditStylesMixin):
     "Class to handle wxSlider objects"
 
+    WX_CLASS = 'wxSlider'
     _PROPERTIES = ["Widget", "range", "value", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, style, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxSlider', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, style):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -35,9 +34,9 @@
         mi,ma = self.properties["range"].get_tuple()
         value_p = self.properties["value"]
         value = value_p.get()  if value_p.is_active()  else  mi
-        self.widget = wx.Slider(self.parent.widget, self.id, value, mi, ma, style=self.style)
+        self.widget = wx.Slider(self.parent_window.widget, wx.ID_ANY, value, mi, ma, style=self.style)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "range" in modified:
             mi,ma = self.properties["range"].get_tuple()
             if self.widget:
@@ -58,26 +57,14 @@
                     value = ma
                 if self.widget: self.widget.SetValue(value)
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-
-
-editor_class = EditSlider
-editor_icon = 'slider.xpm'
-editor_name = 'EditSlider'
-editor_style = ''
-
-dlg_title = _('wxSlider')
-box_title = _('Orientation')
-choices = 'wxSL_HORIZONTAL|wxSL_VERTICAL'
-tmpl_label = 'slider'
-
-
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for editor objects from GUI"
-    dialog = wcodegen.WidgetStyleSelectionDialog( dlg_title, box_title, choices )
+    import dialogs, misc
+    dialog = dialogs.WidgetStyleSelectionDialog( _('wxSlider'), _('Orientation'), 'wxSL_HORIZONTAL|wxSL_VERTICAL' )
     with misc.disable_stay_on_top(common.adding_window or parent):
         res = dialog.ShowModal()
     style = dialog.get_selection()
@@ -85,41 +72,22 @@
     if res != wx.ID_OK:
         return
 
-    label = '%s_%d' % (tmpl_label, number[0])
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = '%s_%d' % (tmpl_label, number[0])
+    name = parent.toplevel_parent.get_next_contained_name('slider_%d')
     with parent.frozen():
-        widget = editor_class(label, parent, wx.ID_ANY, style, sizer, pos)
-        node = Node(widget)
-        widget.node = node
-        widget.properties["flag"].set("wxEXPAND")
-        if parent.widget: widget.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditSlider(name, parent, index, style)
+        editor.properties["flag"].set("wxEXPAND")
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "Factory to build editor objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    widget = editor_class(name, parent, wx.ID_ANY, editor_style, sizer, pos)
-    #sizer.set_item(widget.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(widget)
-    widget.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return widget
+    return EditSlider(name, parent, index, '')
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
-    common.widgets[editor_name] = builder
-    common.widgets_from_xml[editor_name] = xml_builder
-    return common.make_object_button(editor_name, editor_icon)
+    common.widget_classes['EditSlider'] = EditSlider
+    common.widgets['EditSlider'] = builder
+    common.widgets_from_xml['EditSlider'] = xml_builder
+    return common.make_object_button('EditSlider', 'slider.png')
diff -Nru wxglade-0.9.6/widgets/spacer/codegen.py wxglade-1.0.1/widgets/spacer/codegen.py
--- wxglade-0.9.6/widgets/spacer/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spacer/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,28 +3,60 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
+@copyright: 2019 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import common
 import wcodegen
+from . import spacer_base
 
 
-class PythonSpacerGenerator(wcodegen.PythonWidgetCodeWriter):
-    # spacers are generally handled by a hack:
-    # The the implementations of add_sizeritem() contains more details.
-    # The code generation code is already implemented in base class.
+class PythonSpacerGenerator(spacer_base.SpacerMixin, wcodegen.PythonWidgetCodeWriter):
     pass
 
+class CppSpacerGenerator(spacer_base.SpacerMixin, wcodegen.CppWidgetCodeWriter):
+    def get_code(self, obj):
+        init, final = spacer_base.SpacerMixin.get_code(self, obj)
+        return init, [], final
+
+
+def xrc_code_generator(obj):
+    xrcgen = common.code_writers['XRC']
+
+    class SpacerXrcObject(xrcgen.XrcObject):
+        "XrcObject to handle widgets"
+    
+        def __init__(self, obj):
+            xrcgen.XrcObject.__init__(self)
+            self.obj = obj
+    
+        def write(self, output, ntabs):
+            obj = self.obj
+    
+            tabs = self.tabs(ntabs)
+            tabs1 = self.tabs(ntabs + 1)
+    
+            if obj is None or obj.name == "spacer":
+                output.append( tabs + '<object class="spacer">\n' )
+            else:
+                output.append( tabs + '<object class="spacer" name=%s>\n'%quoteattr(obj.name) )
+            if obj is not None:
+                # a real spacer
+                output.append( tabs1 + '<size>%s, %s</size>\n' % (obj.width, obj.height) )
+                if obj.proportion:
+                    output.append(tabs1 + '<option>%s</option>\n' % obj.proportion)
+                if obj.flag:
+                    flag = obj.properties["flag"].get_string_value()
+                    output.append(tabs1 + '<flag>%s</flag>\n' % self.cn_f(flag))
+                if obj.border:
+                    output.append(tabs1 + '<border>%s</border>\n' % obj.border)
+            else:
+                # just an empty sizer slot
+                output.append( tabs1 + '<size>0, 0</size>\n' )
+            output.append(tabs + '</object>\n')
 
-
-class CppSpacerGenerator(wcodegen.CppWidgetCodeWriter):
-
-    # spacers are generally handled by a hack:
-    # The the implementations of add_sizeritem() contains more details.
-    # The code generation code is already implemented in base class.
-    pass
-
+    return SpacerXrcObject(obj)
 
 
 def initialize():
@@ -32,3 +64,8 @@
     common.class_names['EditSpacer'] = klass
     common.register('python', klass, PythonSpacerGenerator(klass))
     common.register('C++',    klass, CppSpacerGenerator(klass))
+
+    xrcgen = common.code_writers.get("XRC")
+    if xrcgen:
+        xrcgen.register_widget_code_generator( 'spacer', xrc_code_generator )
+
diff -Nru wxglade-0.9.6/widgets/spacer/lisp_codegen.py wxglade-1.0.1/widgets/spacer/lisp_codegen.py
--- wxglade-0.9.6/widgets/spacer/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spacer/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -8,12 +8,10 @@
 
 import common
 import wcodegen
+from . import spacer_base
 
 
-class LispSpacerGenerator(wcodegen.LispWidgetCodeWriter):
-    # spacers are generally handled by a hack:
-    # The the implementations of add_sizeritem() contains more details.
-    # The code generation code is already implemented in base class.
+class LispSpacerGenerator(spacer_base.SpacerMixin, wcodegen.LispWidgetCodeWriter):
     pass
 
 
diff -Nru wxglade-0.9.6/widgets/spacer/perl_codegen.py wxglade-1.0.1/widgets/spacer/perl_codegen.py
--- wxglade-0.9.6/widgets/spacer/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spacer/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,17 +3,16 @@
 
 @copyright: 2002-2004 D. H. aka crazyinsomniac on sourceforge
 @copyright: 2014-2016 Carsten Grohmann
+@copyright: 2019 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import common
 import wcodegen
+from . import spacer_base
 
 
-class PerlSpacerGenerator(wcodegen.PerlWidgetCodeWriter):
-    # spacers are generally handled by a hack:
-    # The the implementations of add_sizeritem() contains more details.
-    # The code generation code is already implemented in base class.
+class PerlSpacerGenerator(spacer_base.SpacerMixin, wcodegen.PerlWidgetCodeWriter):
     pass
 
 
diff -Nru wxglade-0.9.6/widgets/spacer/spacer_base.py wxglade-1.0.1/widgets/spacer/spacer_base.py
--- wxglade-0.9.6/widgets/spacer/spacer_base.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/widgets/spacer/spacer_base.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,24 @@
+"""\
+Code generator functions for spacers
+
+@copyright: 2019 Dietmar Schwertberger
+@license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
+"""
+
+
+class SpacerMixin(object):
+    "Generic code to handle spacer code in all language code generators"
+
+    def get_code(self, obj):
+        sizer = obj.parent  # parent is always a sizer
+        sizer_name = self.codegen._format_classattr(sizer)
+        size = (obj.width, obj.height)
+        flag = self.cn_f(obj.properties["flag"].get_string_value()) or '0'
+        if sizer.WX_CLASS!="wxGridBagSizer":
+            size = self.codegen.tmpl_spacersize%size
+            stmt = self.codegen.tmpl_sizeritem % ( sizer_name, size, obj.proportion, flag, obj.border )
+        else:
+            # GridBagSizer
+            index = sizer._get_row_col(obj.index)
+            stmt = self.codegen.tmpl_gridbagsizerspacer % ( sizer_name, size[0], size[1], index, obj.span, flag, obj.border )
+        return [stmt], []
diff -Nru wxglade-0.9.6/widgets/spacer/spacer.py wxglade-1.0.1/widgets/spacer/spacer.py
--- wxglade-0.9.6/widgets/spacer/spacer.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spacer/spacer.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,24 +3,25 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 import common, misc
-from tree import Node
 import new_properties as np
 from edit_windows import ManagedBase
 
 
 class EditSpacer(ManagedBase):
     "Class to handle spacers for sizers"
-    _PROPERTIES = ["Layout", "width", "height", "pos", "proportion", "border", "flag"]
+    WX_CLASS = 'spacer'
+    IS_NAMED = False
+    _PROPERTIES = ["Layout", "width", "height", "proportion", "border", "flag"]
     PROPERTIES = _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, width, height, sizer, pos):
-        ManagedBase.__init__(self, name, 'spacer', parent, id, sizer, pos)
+    def __init__(self, parent, index, width, height):
+        ManagedBase.__init__(self, 'spacer', parent, index)
 
         # initialise instance properties
         self.width  = np.SpinProperty(width,  immediate=True)
@@ -28,7 +29,7 @@
 
     def create_widget(self):
         style = wx.SIMPLE_BORDER | wx.FULL_REPAINT_ON_RESIZE
-        self.widget = wx.Window(self.parent.widget, self.id, size=(self.width, self.height), style=style)
+        self.widget = wx.Window(self.parent_window.widget, wx.ID_ANY, size=(self.width, self.height), style=style)
         self.widget.GetBestSize = self.widget.GetSize
         self.widget.Bind(wx.EVT_PAINT, self.on_paint)
 
@@ -50,18 +51,18 @@
         dc.DrawRectangle(x-1, y-1, tw+2, th+2)
         dc.DrawText(text, x, y)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "width" in modified or "height" in modified:
             size = (self.width, self.height)
             if self.widget: self.widget.SetSize(size)
-            self.sizer.set_item_best_size(self, size=size)
-        ManagedBase.properties_changed(self, modified)
+            self.parent.set_item_best_size(self, size=size)
+            actions.add("layout")
+        ManagedBase._properties_changed(self, modified, actions)
 
 
 class _Dialog(wx.Dialog):
-    def __init__(self, parent):
-        pos = wx.GetMousePosition()
-        wx.Dialog.__init__(self, misc.get_toplevel_parent(parent), -1, _("Enter size"), pos)
+    def __init__(self):
+        wx.Dialog.__init__(self, common.main, -1, _("Enter size"), wx.GetMousePosition())
         # the controls
         self.width  = wx.SpinCtrl(self, -1, "20")
         self.height = wx.SpinCtrl(self, -1, "20")
@@ -82,16 +83,15 @@
         btn = wx.Button(self, wx.ID_OK, _('OK') )
         btn.SetDefault()
         hsizer.Add(btn, 1, wx.ALL, 5)
-        sizer.Add(hsizer, 0, wx.EXPAND|wx.ALIGN_CENTER )
+        sizer.Add(hsizer, 0, wx.EXPAND)
 
         self.SetAutoLayout(True)
         self.SetSizer(sizer)
         sizer.Fit(self)
 
-
-def builder(parent, sizer, pos):
+def builder(parent, index):
     "factory function for EditSpacer objects"
-    dialog = _Dialog(parent)
+    dialog = _Dialog()
     with misc.disable_stay_on_top(common.adding_window or parent):
         res = dialog.ShowModal()
     width  = dialog.width.GetValue()
@@ -100,34 +100,21 @@
     if res != wx.ID_OK:
         return
 
-    name = 'spacer'
     with parent.frozen():
-        spacer = EditSpacer( name, parent, wx.NewId(), width, height, sizer, pos )
-        node = Node(spacer)
-        spacer.node = node
-        if parent.widget: spacer.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditSpacer( parent, index, width, height )
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditSpacer objects from a XML file"
-    from xml_parse import XmlParsingError
-    if not sizer or not sizeritem:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    spacer = EditSpacer('spacer', parent, wx.NewId(), 1, 1, sizer, pos)
-    #sizer.set_item(spacer.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(spacer)
-    spacer.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return spacer
+    return EditSpacer(parent, index, 1, 1)
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
+    common.widget_classes['EditSpacer'] = EditSpacer
     common.widgets['EditSpacer'] = builder
     common.widgets_from_xml['EditSpacer'] = xml_builder
 
-    return common.make_object_button('EditSpacer', 'spacer.xpm')
+    return common.make_object_button('EditSpacer', 'spacer.png')
diff -Nru wxglade-0.9.6/widgets/spin_button/spin_button.py wxglade-1.0.1/widgets/spin_button/spin_button.py
--- wxglade-0.9.6/widgets/spin_button/spin_button.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spin_button/spin_button.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,13 +5,12 @@
 
 @copyright: 2004 D.H. aka crazyinsomniac at users.sourceforge.net
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2017 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import common, config
 import new_properties as np
 
@@ -19,12 +18,13 @@
 class EditSpinButton(ManagedBase, EditStylesMixin):
     "Class to handle wxSpinButton objects"
     # XXX unify with EditSpinCtrl?
+    WX_CLASS = 'wxSpinButton'
     _PROPERTIES = ["Widget", "range", "value", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     recreate_on_style_change = True
 
-    def __init__(self, name, parent, id, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxSpinButton', parent, id, sizer, pos)
+    def __init__(self, name, parent, index):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -32,11 +32,11 @@
         self.value = np.SpinPropertyA(0, val_range=(0,100), immediate=True)
 
     def create_widget(self):
-        self.widget = wx.SpinButton(self.parent.widget, self.id, style=self.style)
+        self.widget = wx.SpinButton(self.parent_window.widget, wx.ID_ANY, style=self.style)
         self.widget.SetRange( *self.properties["range"].get_tuple() )
         self.widget.SetValue( self.value )
 
-    def properties_changed(self, modified):  # from EditSlider
+    def _properties_changed(self, modified, actions):  # from EditSlider
         if not modified or "range" in modified and self.widget:
             mi,ma = self.properties["range"].get_tuple()
             self.widget.SetRange(mi, ma)
@@ -56,50 +56,30 @@
                     value = ma
                 if self.widget: self.widget.SetValue(value)
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditSpinButton objects"
-    name = 'spin_button_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'spin_button_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('spin_button_%d')
     with parent.frozen():
-        text = EditSpinButton(name, parent, wx.NewId(), sizer, pos)
-        text.properties["style"].set_to_default()
-        text.check_defaults()
-        node = Node(text)
-        text.node = node
-        if parent.widget: text.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditSpinButton(name, parent, index)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory function to build EditSpinButton objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    text = EditSpinButton(name, parent, wx.NewId(), sizer, pos)
-    #sizer.set_item(text.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(text)
-    text.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return text
+    return EditSpinButton(name, parent, index)
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditSpinButton'] = EditSpinButton
     common.widgets['EditSpinButton'] = builder
     common.widgets_from_xml['EditSpinButton'] = xml_builder
 
-    return common.make_object_button('EditSpinButton', 'spinbtn.xpm')
+    return common.make_object_button('EditSpinButton', 'spinbtn.png')
diff -Nru wxglade-0.9.6/widgets/spin_ctrl/spin_ctrl.py wxglade-1.0.1/widgets/spin_ctrl/spin_ctrl.py
--- wxglade-0.9.6/widgets/spin_ctrl/spin_ctrl.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spin_ctrl/spin_ctrl.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,25 +3,26 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
-import common, config, misc
+import time
+import common, misc
 import new_properties as np
 
 
 class EditSpinCtrl(ManagedBase, EditStylesMixin):
     "Class to handle wxSpinCtrl objects"
     # XXX unify with EditSpinButton?
+    WX_CLASS = 'wxSpinCtrl'
     _PROPERTIES = ["Widget", "range", "value", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxSpinCtrl', parent, id, sizer, pos)
+    def __init__(self, name, parent, index):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -31,23 +32,24 @@
     def create_widget(self):
         mi,ma = self.properties["range"].get_tuple()
         if self.properties["value"].is_active():
-            self.widget = wx.SpinCtrl(self.parent.widget, self.id, min=mi, max=ma, initial=self.value)
+            self.widget = wx.SpinCtrl(self.parent_window.widget, wx.ID_ANY, min=mi, max=ma, initial=self.value)
         else:
-            self.widget = wx.SpinCtrl(self.parent.widget, self.id, min=mi, max=ma)
+            self.widget = wx.SpinCtrl(self.parent_window.widget, wx.ID_ANY, min=mi, max=ma)
 
-    def finish_widget_creation(self, sel_marker_parent=None, re_add=True):
-        ManagedBase.finish_widget_creation(self, sel_marker_parent, re_add)
+    def finish_widget_creation(self, level, sel_marker_parent=None):
+        ManagedBase.finish_widget_creation(self, level, sel_marker_parent)
         self.widget.Bind(wx.EVT_CHILD_FOCUS, self._on_set_focus)
         self.widget.Bind(wx.EVT_SET_FOCUS, self._on_set_focus)
         self.widget.Bind(wx.EVT_SPIN, self.on_set_focus)
 
     def _on_set_focus(self, event):
-        # don't set focused_widget during event, as this may cause crashes
-        if not misc.focused_widget is self:
+        # within a short time window, we ignore focus events as these seem due losing focus
+        if not misc.focused_widget is self and time.time()-misc.focused_time > 0.05:
+            # don't set focused_widget during event, as this may cause crashes; use delay instead
             misc.set_focused_widget(self, delayed=True)
         event.Skip()
 
-    def properties_changed(self, modified):  # from EditSlider
+    def _properties_changed(self, modified, actions):  # from EditSlider
         if not modified or "range" in modified and self.widget:
             mi,ma = self.properties["range"].get_tuple()
             self.widget.SetRange(mi, ma)
@@ -68,50 +70,32 @@
                 if self.widget:
                     self.widget.SetValue(value)
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditSpinCtrl objects"
-    name = 'spin_ctrl_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'spin_ctrl_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('spin_ctrl_%d')
     with parent.frozen():
-        spin = EditSpinCtrl(name, parent, wx.NewId(), sizer, pos)
-        spin.properties["style"].set_to_default()
-        spin.check_defaults()
-        node = Node(spin)
-        spin.node = node
-        if parent.widget: spin.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditSpinCtrl(name, parent, index)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory function to build EditSpinCtrl objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    spin = EditSpinCtrl( name, parent, wx.NewId(), sizer, pos )
-    spin.properties["value"].set_active(False)
-    #sizer.set_item( spin.pos, proportion=sizeritem.proportion, flag=sizeritem.flag, border=sizeritem.border )
-    node = Node(spin)
-    spin.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return spin
+    editor = EditSpinCtrl( name, parent, index )
+    editor.properties["value"].set_active(False)
+    return editor
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditSpinCtrl'] = EditSpinCtrl
     common.widgets['EditSpinCtrl'] = builder
     common.widgets_from_xml['EditSpinCtrl'] = xml_builder
 
-    return common.make_object_button('EditSpinCtrl', 'spin_ctrl.xpm')
+    return common.make_object_button('EditSpinCtrl', 'spin_ctrl.png')
diff -Nru wxglade-0.9.6/widgets/spin_ctrl/wconfig.py wxglade-1.0.1/widgets/spin_ctrl/wconfig.py
--- wxglade-0.9.6/widgets/spin_ctrl/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spin_ctrl/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,7 +2,7 @@
 wxSpinCtrl widget configuration
 
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/spin_ctrl_double/codegen.py wxglade-1.0.1/widgets/spin_ctrl_double/codegen.py
--- wxglade-0.9.6/widgets/spin_ctrl_double/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spin_ctrl_double/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -12,7 +12,7 @@
 
 
 class PythonSpinCtrlDoubleGenerator(wcodegen.PythonWidgetCodeWriter):
-    tmpl = '%(name)s = %(klass)s(%(parent)s, %(id)s, "%(value)s", min=%(minValue)s, max=%(maxValue)s%(style)s)\n'
+    tmpl = '%(name)s = %(klass)s(%(parent)s, %(id)s, initial=%(value)s, min=%(minValue)s, max=%(maxValue)s%(style)s)\n'
 
     def _prepare_tmpl_content(self, obj):
         wcodegen.PythonWidgetCodeWriter._prepare_tmpl_content(self, obj)
@@ -27,9 +27,11 @@
 
     def get_more_properties_code(self, obj):
         ret = []
+        name = self.tmpl_dict['name']
         if obj.properties["increment"].is_active():
-            name = self.tmpl_dict['name']
             ret.append( '%s.SetIncrement(%s)\n'%(name, obj.increment) )
+        if obj.properties["digits"].is_active():
+            ret.append( '%s.SetDigits(%s)\n'%(name, obj.digits) )
         return ret
 
 
@@ -54,9 +56,11 @@
 
     def get_more_properties_code(self, obj):
         ret = []
+        name = self.tmpl_dict['name']
         if obj.properties["increment"].is_active():
-            name = self.tmpl_dict['name']
             ret.append( '%s.SetIncrement(%s);\n'%(name, obj.increment) )
+        if obj.properties["digits"].is_active():
+            ret.append( '%s.SetDigits(%s);\n'%(name, obj.digits) )
         return ret
 
 
diff -Nru wxglade-0.9.6/widgets/spin_ctrl_double/lisp_codegen.py wxglade-1.0.1/widgets/spin_ctrl_double/lisp_codegen.py
--- wxglade-0.9.6/widgets/spin_ctrl_double/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spin_ctrl_double/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -28,10 +28,12 @@
 
     def get_more_properties_code(self, obj):
         ret = []
+        klass = self.tmpl_dict['klass']
+        name = self.tmpl_dict['name']
         if obj.properties["increment"].is_active():
-            klass = self.tmpl_dict['klass']
-            name = self.tmpl_dict['name']
             ret.append( '(%s_SetIncrement %s %s)\n'%(klass, name, obj.increment) )
+        if obj.properties["digits"].is_active():
+            ret.append( '(%s_SetDigits %s %s)\n'%(klass, name, obj.digits) )
         return ret
 
 
diff -Nru wxglade-0.9.6/widgets/spin_ctrl_double/perl_codegen.py wxglade-1.0.1/widgets/spin_ctrl_double/perl_codegen.py
--- wxglade-0.9.6/widgets/spin_ctrl_double/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spin_ctrl_double/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -29,9 +29,11 @@
 
     def get_more_properties_code(self, obj):
         ret = []
+        name = self.tmpl_dict['name']
         if obj.properties["increment"].is_active():
-            name = self.tmpl_dict['name']
             ret.append( '%s->SetIncrement(%s);\n'%(name, obj.increment) )
+        if obj.properties["digits"].is_active():
+            ret.append( '%s->SetDigits(%s);\n'%(name, obj.digits) )
         return ret
 
 
diff -Nru wxglade-0.9.6/widgets/spin_ctrl_double/spin_ctrl_double.py wxglade-1.0.1/widgets/spin_ctrl_double/spin_ctrl_double.py
--- wxglade-0.9.6/widgets/spin_ctrl_double/spin_ctrl_double.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spin_ctrl_double/spin_ctrl_double.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,31 +3,37 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
-import common, config, misc
+import time
+import common, misc
 import new_properties as np
 
 
 class EditSpinCtrlDouble(ManagedBase, EditStylesMixin):
     "Class to handle wxSpinCtrlDouble objects"
-    # XXX unify with EditSpinButton?
-    _PROPERTIES = ["Widget", "range", "value", "increment", "style"]
+    # XXX unify with EditSpinButton or SpinCtrl?
+    WX_CLASS = 'wxSpinCtrlDouble'
+    _PROPERTIES = ["Widget", "range", "value", "increment", "digits", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
+    _PROPERTY_HELP = { "digits": "Depending on your wx version you may need to set this explicitely.\n"
+                                 "E.g. if it's undefined with wxPython >=4.1.1 you can only enter integers\n"
+                                 "while on older versions you could enter any float number in this case.\n"
+                                 "If you want to be on the safe side, leave it active." }
 
-    def __init__(self, name, parent, id, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxSpinCtrlDouble', parent, id, sizer, pos)
+    def __init__(self, name, parent, index):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
         self.range = np.FloatRangePropertyA( "0.0, 100.0" )
         self.value = np.SpinDoublePropertyA(0, val_range=(0.0,100.0), immediate=True, default_value="")
         self.increment = np.SpinDoublePropertyD(1.0, val_range=(0.0,100.0), immediate=True, default_value=1.0)
+        self.digits = np.SpinPropertyA(2, val_range=(0,20), immediate=True)
 
     def create_widget(self):
         mi,ma = self.properties["range"].get_tuple()
@@ -36,21 +42,24 @@
             kwargs["initial"] = self.value
         if self.properties["increment"].is_active():
             kwargs["inc"] = self.value
-        self.widget = wx.SpinCtrlDouble(self.parent.widget, self.id, min=mi, max=ma, **kwargs)
+        self.widget = wx.SpinCtrlDouble(self.parent_window.widget, wx.ID_ANY, min=mi, max=ma, **kwargs)
+        if self.properties["digits"].is_active():
+            self.widget.SetDigits(self.digits)
 
-    def finish_widget_creation(self, sel_marker_parent=None, re_add=True):
-        ManagedBase.finish_widget_creation(self, sel_marker_parent, re_add)
+    def finish_widget_creation(self, level, sel_marker_parent=None):
+        ManagedBase.finish_widget_creation(self, level, sel_marker_parent)
         self.widget.Bind(wx.EVT_CHILD_FOCUS, self._on_set_focus)
         self.widget.Bind(wx.EVT_SET_FOCUS, self._on_set_focus)
         self.widget.Bind(wx.EVT_SPIN, self.on_set_focus)
 
     def _on_set_focus(self, event):
-        # don't set focused_widget during event, as this may cause crashes
-        if not misc.focused_widget is self:
+        # within a short time window, we ignore focus events as these seem due losing focus
+        if not misc.focused_widget is self and time.time()-misc.focused_time > 0.05:
+            # don't set focused_widget during event, as this may cause crashes; use delay instead
             misc.set_focused_widget(self, delayed=True)
         event.Skip()
 
-    def properties_changed(self, modified):  # from EditSlider
+    def _properties_changed(self, modified, actions):  # from EditSlider
         if not modified or "range" in modified and self.widget:
             mi,ma = self.properties["range"].get_tuple()
             self.widget.SetRange(mi, ma)
@@ -60,6 +69,9 @@
         if not modified or "increment" in modified and self.widget:
             self.widget.SetIncrement(self.increment)
 
+        if not modified or "digits" in modified and self.widget:
+            self.widget.SetDigits(self.digits)
+
         if not modified or "value" in modified or "range" in modified:
             # check that value is inside range
             value_p = self.properties["value"]
@@ -75,51 +87,34 @@
                 if self.widget:
                     self.widget.SetValue(value)
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditSpinCtrl objects"
-    name = 'spin_ctrl_double_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'spin_ctrl_double_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('spin_ctrl_double_%d')
     with parent.frozen():
-        spin = EditSpinCtrlDouble(name, parent, wx.NewId(), sizer, pos)
-        spin.properties["style"].set_to_default()
-        spin.check_defaults()
-        node = Node(spin)
-        spin.node = node
-        if parent.widget: spin.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditSpinCtrlDouble(name, parent, index)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory function to build EditSpinCtrlDouble objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    spin = EditSpinCtrlDouble( name, parent, wx.NewId(), sizer, pos )
-    spin.properties["value"].set_active(False)
-    #sizer.set_item( spin.pos, proportion=sizeritem.proportion, flag=sizeritem.flag, border=sizeritem.border )
-    node = Node(spin)
-    spin.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return spin
+    editor = EditSpinCtrlDouble( name, parent, index )
+    editor.properties["value"].set_active(False)
+    editor.properties["digits"].set_active(False)
+    return editor
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
     if not hasattr(wx, "SpinCtrlDouble"): return None
+    common.widget_classes['EditSpinCtrlDouble'] = EditSpinCtrlDouble
     common.widgets['EditSpinCtrlDouble'] = builder
     common.widgets_from_xml['EditSpinCtrlDouble'] = xml_builder
 
-    return common.make_object_button('EditSpinCtrlDouble', 'spin_ctrl_double.xpm')
+    return common.make_object_button('EditSpinCtrlDouble', 'spin_ctrl_double.png')
diff -Nru wxglade-0.9.6/widgets/spin_ctrl_double/wconfig.py wxglade-1.0.1/widgets/spin_ctrl_double/wconfig.py
--- wxglade-0.9.6/widgets/spin_ctrl_double/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/spin_ctrl_double/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,7 +2,7 @@
 wxSpinCtrl widget configuration
 
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/splitter_window/codegen.py wxglade-1.0.1/widgets/splitter_window/codegen.py
--- wxglade-0.9.6/widgets/splitter_window/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/splitter_window/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -17,22 +17,23 @@
         wcodegen.PythonWidgetCodeWriter._prepare_tmpl_content(self, obj)
 
         init = []
-        layout_buf = []
-        props_buf = self.codegen.generate_common_properties(obj)
+        post = []
 
         id_name, id = self.codegen.generate_code_id(obj)
-        parent = self.format_widget_access(obj.parent)
-        if obj.is_toplevel:
+        parent = self.format_widget_access(obj.parent_window)
+
+        klass = obj.get_instantiation_class(self.cn, None, self.codegen.preview)
+
+        if obj.IS_CLASS:
             l = []
-            if id_name:
-                l.append(id_name)
-            l.append( 'self.%s = %s(%s, %s)\n' % (obj.name, self.codegen.get_class(obj.klass), parent, id) )
-            return l, [], []
-        if id_name:
-            init.append(id_name)
-        klass = obj.klass
-        if self.codegen.preview: klass = 'wxSplitterWindow'
-        init.append( 'self.%s = %s(%s, %s%s)\n' % (obj.name, self.cn(klass), parent, id, self.tmpl_dict['style']) )
+            if id_name: l.append(id_name)
+            l.append( 'self.%s = %s(%s, %s)\n' % (obj.name, klass, parent, id) )
+            l.extend( self.codegen.generate_code_common_properties(obj) )
+            return l, []
+
+        if id_name: init.append(id_name)
+        init.append('self.%s = %s(%s, %s%s)\n' % (obj.name, klass, parent, id, self.tmpl_dict['style']))
+        init.extend( self.codegen.generate_code_common_properties(obj) )
 
         win_1 = obj.window_1
         win_2 = obj.window_2
@@ -44,24 +45,25 @@
                 f_name = 'SplitVertically'
             else:
                 f_name = 'SplitHorizontally'
-            layout_buf.append( 'self.%s.%s(self.%s, self.%s%s)\n' % (obj.name, f_name, win_1, win_2, sash_pos) )
+            post.append( 'self.%s.%s(self.%s, self.%s%s)\n' % (obj.name, f_name, win_1, win_2, sash_pos) )
         else:
             def add_sub(win):
-                layout_buf.append( 'self.%s.SetSplitMode(%s)\n' % (obj.name, self.cn(orientation)) )
-                layout_buf.append( 'self.%s.Initialize(self.%s)\n' % (obj.name, win) )
+                post.append( 'self.%s.SetSplitMode(%s)\n' % (obj.name, self.cn(orientation)) )
+                post.append( 'self.%s.Initialize(self.%s)\n' % (obj.name, win) )
             if win_1:
                 add_sub(win_1)
             elif win_2:
                 add_sub(win_2)
 
         if obj.min_pane_size:
-            props_buf.append( 'self.%s.SetMinimumPaneSize(%s)\n' % (obj.name, obj.min_pane_size) )
+            init.append( 'self.%s.SetMinimumPaneSize(%s)\n' % (obj.name, obj.min_pane_size) )
         if obj.properties["sash_gravity"].is_active():
-            props_buf.append( 'self.%s.SetSashGravity(%s)\n' % (obj.name, obj.sash_gravity) )
+            init.append( 'self.%s.SetSashGravity(%s)\n' % (obj.name, obj.sash_gravity) )
 
-        return init, props_buf, layout_buf
+        return init, post
 
     def get_layout_code(self, obj):
+        # called when the splitter is a class
         win_1 = obj.window_1
         win_2 = obj.window_2
         orientation = obj.properties['orientation'].get_string_value()
@@ -101,7 +103,6 @@
 
         init = []
         layout_buf = []
-        props_buf = self.codegen.generate_common_properties(obj)
 
         id_name, id = self.codegen.generate_code_id(obj)
 
@@ -109,15 +110,19 @@
             ids = [id_name]
         else:
             ids = []
-        if not obj.parent.is_toplevel:
-            parent = '%s' % obj.parent.name
+        if not obj.parent_window.IS_CLASS:
+            parent = '%s' % obj.parent_window.name
         else:
             parent = 'this'
-        if obj.is_toplevel:
-            l = ['%s = new %s(%s, %s);\n' % (obj.name, obj.klass, parent, id)]
-            return l, ids, [], []
 
-        init.append( '%s = new %s(%s, %s%s);\n' % (obj.name, obj.klass, parent, id, self.tmpl_dict['style']) )
+        klass = obj.get_instantiation_class()
+
+        if obj.check_prop_truth("class"):
+            l = ['%s = new %s(%s, %s);\n' % (obj.name, klass, parent, id)]
+            return l, ids, []
+
+        init.append( '%s = new %s(%s, %s%s);\n' % (obj.name, klass, parent, id, self.tmpl_dict['style']) )
+        init.extend( self.codegen.generate_code_common_properties(obj) )
 
         win_1 = obj.window_1
         win_2 = obj.window_2
@@ -140,11 +145,11 @@
                 add_sub(win_2)
 
         if obj.min_pane_size:
-            props_buf.append( '%s->SetMinimumPaneSize(%s);\n' % (obj.name, obj.min_pane_size) )
+            init.append( '%s->SetMinimumPaneSize(%s);\n' % (obj.name, obj.min_pane_size) )
         if obj.properties["sash_gravity"].is_active():
-            props_buf.append( '%s->SetSashGravity(%s);\n' % (obj.name, obj.sash_gravity) )
+            init.append( '%s->SetSashGravity(%s);\n' % (obj.name, obj.sash_gravity) )
 
-        return init, ids, props_buf, layout_buf
+        return init, ids, layout_buf
 
     def get_layout_code(self, obj):
         win_1 = obj.window_1
@@ -199,8 +204,6 @@
     klass = 'wxSplitterWindow'
     common.class_names['EditSplitterWindow'] = klass
     common.class_names['SplitterPane'] = 'wxPanel'
-    common.toplevels['EditSplitterWindow'] = 1
-    common.toplevels['SplitterPane'] = 1
     common.register('python', klass, PythonSplitterWindowGenerator(klass))
     common.register('C++',    klass, CppSplitterWindowGenerator(klass))
     common.register('XRC',    klass, xrc_code_generator)
diff -Nru wxglade-0.9.6/widgets/splitter_window/lisp_codegen.py wxglade-1.0.1/widgets/splitter_window/lisp_codegen.py
--- wxglade-0.9.6/widgets/splitter_window/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/splitter_window/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -19,25 +19,26 @@
 
         init = []
         layout_buf = []
-        props_buf = self.codegen.generate_common_properties(obj)
 
         id_name, id = self.codegen.generate_code_id(obj)
         window_name = self.codegen._format_name(obj.name)
-        parent = self.format_widget_access(obj.parent)
+        parent = self.format_widget_access(obj.parent_window)
 
-        if obj.is_toplevel:
+        if obj.IS_CLASS:
             l = []
             if id_name:
                 l.append(id_name)
 
             l.append( '(setf (slot-%s obj) (wxSplitterWindow_Create %s %s))\n' % (window_name, parent, id) )
-            return l, [], []
+            l.extend( self.codegen.generate_code_common_properties(obj) )
+            return l, []
 
         if id_name:
             init.append(id_name)
 
         init.append('(setf (slot-%s obj) (wxSplitterWindow_Create %s %s -1 -1 -1 -1 %s))\n'
                     % (window_name, parent, id, self.tmpl_dict['style']))
+        init.extend( self.codegen.generate_code_common_properties(obj) )
 
         win_1 = obj.window_1
         win_2 = obj.window_2
@@ -63,11 +64,11 @@
                 add_sub(win_2)
 
         if obj.min_pane_size:
-            props_buf.append( 'wxSplitterWindow_SetMinimumPaneSize (slot-%s obj) %s)\n' % (window_name, obj.min_pane_size) )
+            init.append( 'wxSplitterWindow_SetMinimumPaneSize (slot-%s obj) %s)\n' % (window_name, obj.min_pane_size) )
         if obj.properties["sash_gravity"].is_active():
-            props_buf.append( 'wxSplitterWindow_SetSashGravity (slot-%s obj) %s)\n' % (window_name, obj.sash_gravity) )
+            init.append( 'wxSplitterWindow_SetSashGravity (slot-%s obj) %s)\n' % (window_name, obj.sash_gravity) )
 
-        return init, props_buf, layout_buf
+        return init, layout_buf
 
     def get_layout_code(self, obj):
         props_buf = []
@@ -104,6 +105,4 @@
     klass = 'wxSplitterWindow'
     common.class_names['EditSplitterWindow'] = klass
     common.class_names['SplitterPane'] = 'wxPanel'
-    common.toplevels['EditSplitterWindow'] = 1
-    common.toplevels['SplitterPane'] = 1
     common.register('lisp', klass, LispSplitterWindowGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/splitter_window/perl_codegen.py wxglade-1.0.1/widgets/splitter_window/perl_codegen.py
--- wxglade-0.9.6/widgets/splitter_window/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/splitter_window/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2004 D. H. aka crazyinsomniac on sourceforge
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2018 Dietmar Schwertberger
+@copyright: 2018-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -20,30 +20,21 @@
 
         init = []
         layout_buf = []
-        props_buf = self.codegen.generate_common_properties(obj)
 
         id_name, id = self.codegen.generate_code_id(obj)
-        parent = self.format_widget_access(obj.parent)
+        parent = self.format_widget_access(obj.parent_window)
+        klass = obj.get_instantiation_class(self.cn, self.cn_class)
 
-        if obj.is_toplevel:
+        if obj.IS_CLASS:
             l = []
-            if id_name:
-                l.append(id_name)
-
-            klass = obj.base
-            if klass != obj.klass:
-                klass = obj.klass
-            else:
-                klass = self.cn(klass)
-
-            l.append( '$self->{%s} = %s->new(%s, %s);\n' % (obj.name, self.cn(klass), parent, id) )
-            return l, [], []
-
-        if id_name:
-            init.append(id_name)
-
-        init.append( '$self->{%s} = %s->new(%s, %s%s);\n' % (
-                     obj.name, self.cn(obj.klass), parent, id, self.tmpl_dict['style']) )
+            if id_name: l.append(id_name)
+            l.append( '$self->{%s} = %s->new(%s, %s);\n' % (obj.name, klass, parent, id) )
+            l.extend( self.codegen.generate_code_common_properties(obj) )
+            return l, []
+
+        if id_name: init.append(id_name)
+        init.append( '$self->{%s} = %s->new(%s, %s%s);\n' % ( obj.name, klass, parent, id, self.tmpl_dict['style']) )
+        init.extend( self.codegen.generate_code_common_properties(obj) )
 
         win_1 = obj.window_1
         win_2 = obj.window_2
@@ -69,11 +60,11 @@
                 add_sub(win_2)
 
         if obj.min_pane_size:
-            props_buf.append( '$self->{%s}->SetMinimumPaneSize(%s);\n' % (obj.name, obj.min_pane_size) )
+            init.append( '$self->{%s}->SetMinimumPaneSize(%s);\n' % (obj.name, obj.min_pane_size) )
         if obj.properties["sash_gravity"].is_active():
-            props_buf.append( '$self->{%s}->SetSashGravity(%s);\n' % (obj.name, obj.sash_gravity) )
+            init.append( '$self->{%s}->SetSashGravity(%s);\n' % (obj.name, obj.sash_gravity) )
 
-        return init, props_buf, layout_buf
+        return init, layout_buf
 
     def get_layout_code(self, obj):
         props_buf = []
@@ -105,6 +96,4 @@
     klass = 'wxSplitterWindow'
     common.class_names['EditSplitterWindow'] = klass
     common.class_names['SplitterPane'] = 'wxPanel'
-    common.toplevels['EditSplitterWindow'] = 1
-    common.toplevels['SplitterPane'] = 1
     common.register('perl', klass, PerlSplitterWindowGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/splitter_window/splitter_window.py wxglade-1.0.1/widgets/splitter_window/splitter_window.py
--- wxglade-0.9.6/widgets/splitter_window/splitter_window.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/splitter_window/splitter_window.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,30 +3,28 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 
 import common, compat, config, misc
-import wcodegen
-from tree import Node, SlotNode, WidgetTree
 import new_properties as np
 from edit_windows import ManagedBase, EditStylesMixin
-from edit_sizers.edit_sizers import Sizer, SizerSlot
+from edit_base import Slot
 from panel import EditPanel
 
 
 class ChildWidgetNameProperty(np.Property):
-    def __init__(self, child_att_name):
-        self.child_att_name = child_att_name
+    def __init__(self, child_index):
+        self.child_index = child_index
         np.Property.__init__(self, None, default_value=None, name=None)
 
     def get(self):
-        child = getattr(self.owner, self.child_att_name)
+        child = self.owner.children[self.child_index]
         if child is None: return self.value
-        if isinstance(child, SizerSlot): return None
+        if child.IS_SLOT: return None
         return child.name
 
     def write(self, output, tabs=0):
@@ -35,95 +33,23 @@
             output.extend( common.format_xml_tag(self.name, value, tabs) )
 
 
-
-class SplitterWindowSizer(Sizer):
-    "'Virtual sizer' responsible for the management of a SplitterWindow"
-    PROPERTIES = []
-    def item_properties_modified(self, widget, modified=None, force_layout=True):
-        "Updates the layout of the item"
-        if self.window.widget and self.window.window_old:
-            if self.window.window_old.widget:
-                self.window.widget.Unsplit(self.window.window_old.widget)
-            elif self.window.widget.IsSplit(): # the child widget may have been delete meanwhile by tree remove_rec
-                self.window.widget.Unsplit()
-        self.window.window_old = None
-        if self.window._window_1 and self.window._window_2:
-            self.window.split()
-
-    def set_item_best_size(self, widget, size=None, force_layout=True):
-        pass
-
-    def add_item(self, item, pos=None, proportion=0, flag=0, border=0, size=None, force_layout=True):
-        "Adds an item to self.window"
-        if pos == 1:
-            self.window.window_old = self.window._window_1
-            self.window._window_1 = item
-            self.window.properties["window_1"].set(item.name)
-        else:
-            self.window.window_old = self.window._window_2
-            self.window._window_2 = item
-            self.window.properties["window_2"].set(item.name)
-
-    def free_slot(self, pos, force_layout=True):
-        "Replaces the element at pos with an empty slot"
-        if self.window.orientation=="wxSPLIT_VERTICAL":
-            labels = ("SLOT Left","SLOT Right")
-        else:
-            labels = ("SLOT Top","SLOT Bottom")
-        if pos == 1:
-            if self.window.widget and self.window._window_1 and self.window._window_1.widget:
-                self.window.widget.Unsplit(self.window._window_1.widget)
-            old_node = self.window._window_1.node
-            slot = SizerSlot(self.window, self, pos, labels[0]) # XXX no node, no tree visualization?
-            self.window._window_1 = slot
-            w = self.window._window_1
-        else:
-            if self.window.widget and self.window._window_2 and self.window._window_2.widget:
-                self.window.widget.Unsplit(self.window._window_1.widget)
-            old_node = self.window._window_2.node
-            slot = SizerSlot(self.window, self, pos, labels[1]) # XXX no node, no tree visualization?
-            self.window._window_2 = slot
-            w = self.window._window_2
-        w.node = node = SlotNode(w)
-        common.app_tree.change_node( old_node, w, node )
-        self.window.split()
-        return slot
-
-    def get_itempos(self, attrs):
-        "Get position of sizer item (used in xml_parse)"
-        name= attrs.get("original_name", None)
-        if name is None: name = attrs['name']
-        if name==self.window.properties["window_1"].value:
-            return 1
-        if name==self.window.properties["window_2"].value:
-            return 2
-        return None
-
-    def is_virtual(self):
-        return True
-
-    def is_fixed(self):
-        "exactly two slots"
-        return True
-
-
-
 class EditSplitterWindow(ManagedBase, EditStylesMixin):
     "Class to handle wxSplitterWindow objects; orientation: Orientation of the widget as string e.g. 'wxSPLIT_VERTICAL'"
 
-    _custom_base_classes = True
-
+    WX_CLASS = 'wxSplitterWindow'
+    IS_CONTAINER = True
     _PROPERTIES = ["Widget", "no_custom_class", "style", "sash_pos", "sash_gravity", "min_pane_size"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase._EXTRA_PROPERTIES
+    np.insert_after(PROPERTIES, "name", "class", "custom_base")
     _PROPERTY_LABELS = {'no_custom_class':"Don't generate code for this class",
                         'sash_pos':"Sash position"}
     _PROPERTY_HELP = {'no_custom_class':"Don't generate code for this class",
                       'sash_gravity':"0.0: only the bottom/right window is automatically resized\n"
                                      "0.5: both windows grow by equal size\n"
                                      "1.0: only left/top window grows"}
-
-    def __init__(self, name, parent, id, win_1, win_2, orientation, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxSplitterWindow', parent, id, sizer, pos)
+    CHILDREN = 2
+    def __init__(self, name, parent, index, orientation):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -133,24 +59,27 @@
             self.sash_gravity = np.SpinDoublePropertyD(0.5, (0.0,1.0), default_value=0.0, immediate=True)
         else:
             self.sash_gravity = np.FloatPropertyD(0.5, (0.0,1.0), default_value=0.0)
-        self.min_pane_size = np.SpinProperty(20)
+        self.min_pane_size = np.SpinPropertyA(20)
 
-        # hidden properties: orientation string, window_1, window_2
+        # hidden properties: orientation string, window names window_1, window_2
         self.orientation = np.Property(orientation)
-        self.window_1 = ChildWidgetNameProperty("_window_1")
-        self.window_2 = ChildWidgetNameProperty("_window_2")
+        self.window_1 = ChildWidgetNameProperty(0)
+        self.window_2 = ChildWidgetNameProperty(1)
 
-        self.virtual_sizer = SplitterWindowSizer(self)
-        labels = ("SLOT Left","SLOT Right") if orientation=="wxSPLIT_VERTICAL" else ("SLOT Top","SLOT Bottom")
-        self._window_1 = win_1 or SizerSlot(self, self.virtual_sizer, 1, label=labels[0])
-        self._window_2 = win_2 or SizerSlot(self, self.virtual_sizer, 2, label=labels[1])
+    def _get_label(self, index):
+        if self.orientation=="wxSPLIT_VERTICAL":
+            return ("Left","Right")[index]
+        return ("Top","Bottom")[index]
+    
+    def _get_slot_label(self, index):
+        return "SLOT %s"%self._get_label(index)
 
     def create_widget(self):
-        self.widget = wx.SplitterWindow(self.parent.widget, self.id, style=self.style)
-        self.split()
+        size = self._get_default_or_client_size()
+        self.widget = wx.SplitterWindow(self.parent_window.widget, wx.ID_ANY, size=size, style=self.style)
 
-    def finish_widget_creation(self):
-        ManagedBase.finish_widget_creation(self, sel_marker_parent=self.widget)
+    def finish_widget_creation(self, level):
+        ManagedBase.finish_widget_creation(self, level, sel_marker_parent=self.widget)
 
         sash_pos_p = self.properties['sash_pos']
         if sash_pos_p.is_active():
@@ -166,19 +95,13 @@
         if min_pane_size_p.is_active():
             self.widget.SetMinimumPaneSize( min_pane_size_p.get() )
         else:
-            min_pane_size.set_value( self.widget.GetMinimumPaneSize() )
+            min_pane_size_p.set( self.widget.GetMinimumPaneSize() )
 
         self.widget.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGED, self.on_sash_pos_changed )
-        if self._window_1 and self._window_1.widget:
-            if self.orientation=="wxSPLIT_VERTICAL":
-                compat.SetToolTip(self._window_1.widget, _("Left splitter pane:\nAdd a sizer here") )
-            else:
-                compat.SetToolTip(self._window_1.widget, _("Top splitter pane:\nAdd a sizer here") )
-        if self._window_2 and self._window_2.widget:
-            if self.orientation=="wxSPLIT_VERTICAL":
-                compat.SetToolTip(self._window_2.widget, _("Right splitter pane:\nAdd a sizer here") )
-            else:
-                compat.SetToolTip(self._window_2.widget, _("Bottom splitter pane:\nAdd a sizer here") )
+
+        if self.widget.GetTopLevelParent().IsShown():
+            # e.g. when pasting into an existing window
+            wx.CallAfter(self.widget.UpdateSize)
 
     def on_set_focus(self, event):
         misc.set_focused_widget(self)
@@ -186,10 +109,6 @@
         event.Skip()
 
     def split(self):
-        if not self.widget or not self._window_1 or not self._window_2: return
-        self._window_1.create()
-        self._window_2.create()
-        
         orientation = self.orientation
         sash_pos_p = self.properties['sash_pos']
         if sash_pos_p.is_active():
@@ -198,14 +117,14 @@
             max_pos = self.widget.GetClientSize() [0 if orientation=='wxSPLIT_VERTICAL' else 1]
             sash_pos = max_pos // 2
         if orientation == 'wxSPLIT_VERTICAL':
-            self.widget.SplitVertically  (self._window_1.widget, self._window_2.widget, sash_pos)
+            self.widget.SplitVertically  (self.children[0].widget, self.children[1].widget, sash_pos)
         else:
-            self.widget.SplitHorizontally(self._window_1.widget, self._window_2.widget, sash_pos)
+            self.widget.SplitHorizontally(self.children[0].widget, self.children[1].widget, sash_pos)
 
-        if hasattr(self._window_1, 'sel_marker'): self._window_1.sel_marker.update()
-        if hasattr(self._window_2, 'sel_marker'): self._window_2.sel_marker.update()
+        if getattr(self.children[0], 'sel_marker', None): self.children[0].sel_marker.update()
+        if getattr(self.children[1], 'sel_marker', None): self.children[1].sel_marker.update()
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if (not modified or "sash_pos" in modified) and self.widget and self.check_prop("sash_pos"):
             self.widget.SetSashPosition(self.sash_pos)
         if (not modified or "sash_gravity" in modified) and self.widget and self.check_prop("sash_gravity"):
@@ -213,19 +132,18 @@
         if (not modified or "min_pane_size" in modified) and self.widget and self.check_prop("min_pane_size"):
             self.widget.SetMinimumPaneSize(self.min_pane_size)
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
-        if modified and "orientation" in modified:
+        if modified and "orientation" in modified and common.app_tree is not None:
             # update horizontal/vertical icons
-            labels = ("SLOT Left","SLOT Right") if self.orientation=="wxSPLIT_VERTICAL" else ("SLOT Top","SLOT Bottom")
-            common.app_tree.refresh(self.node, refresh_label=False, refresh_image=True)
-            if isinstance(self._window_1, SizerSlot):
-                self._window_1.label = labels[0]
-                common.app_tree.refresh(self._window_1.node)
-            if isinstance(self._window_2, SizerSlot):
-                self._window_2.label = labels[1]
-                common.app_tree.refresh(self._window_2.node)
+            actions.add("image")
+            if self.children[0] and self.children[0].IS_SLOT:
+                self.children[0].label = self._get_slot_label(0)
+                common.app_tree.refresh(self.children[0])
+            if self.children[1] and self.children[1].IS_SLOT:
+                self.children[1].label = self._get_slot_label(1)
+                common.app_tree.refresh(self.children[1])
 
     def on_size(self, event):
         if not self.widget:
@@ -243,6 +161,10 @@
             pass
         ManagedBase.on_size(self, event)
 
+    def on_child_pasted(self):
+        if not self.widget: return
+        self.widget.UpdateSize()
+
     def on_sash_pos_changed(self, event):
         self.properties['sash_pos'].set( self.widget.GetSashPosition() )
         event.Skip()
@@ -251,23 +173,56 @@
         # resize instead of drag & drop
         event.Skip()
 
-    def check_compatibility(self, widget, typename=None, report=False):
+    def check_compatibility(self, widget, typename=None):
         return (False,"No objects can be pasted here; paste to empty slots instead.")
 
+    def check_drop_compatibility(self):
+        # checks whether a widget can be dropped here
+        return (False, "Items can only be added to empty slots, not to the splitter window itself.")
+
+    def _get_parent_tooltip(self, index):
+        return "%s splitter pane:"%self._get_label(index)
+
+    ####################################################################################################################
+    # methods moved from SplitterWindowSizer:
+    def add_item(self, child, index=None):
+        if index is not None and self.widget and self.widget.IsSplit():
+            self.widget.Unsplit(self.children[index].widget)
+        ManagedBase.add_item(self, child, index)
+
+    def _free_slot(self, index, force_layout=True):
+        "Replaces the element at pos with an empty slot"
+        slot = Slot(self, index)
+        if self.widget: slot.create()
+        return slot
+
+    def destroying_child_widget(self, child, index):
+        if self.widget.IsSplit():
+            self.widget.Unsplit(child.widget)
+
+    def child_widget_created(self, widget, level):
+        if level==0: self.split()  # a single child was added
+
+    def child_widgets_created(self, level):
+        self.split()
+
+    def get_itempos(self, attrs):
+        "Get position of sizer item (used in xml_parse)"
+        name = attrs.get("original_name", None) or attrs['name']
+        if name==self.properties["window_1"].value: return 0
+        if name==self.properties["window_2"].value: return 1
+        return None
 
-editor_class = EditSplitterWindow
-editor_name = 'EditSplitterWindow'
-editor_style = 'wxSPLIT_VERTICAL'
 
 dlg_title = _('wxSplitterWindow')
 box_title = _('Orientation')
 choices = 'wxSPLIT_VERTICAL (left/right)|wxSPLIT_HORIZONTAL (top/bottom)'
-tmpl_label = 'window'
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "Factory function for EditSplitterWindow objects"
-    dialog = wcodegen.WidgetStyleSelectionDialog( dlg_title, box_title, choices, ["Create panels"],[True])
+    import dialogs
+    dialog = dialogs.WidgetStyleSelectionDialog( dlg_title, box_title, choices, ["Create panels"], [True])
     with misc.disable_stay_on_top(common.adding_window or parent):
         res = dialog.ShowModal()
     orientation = dialog.get_selection().split(" ")[0]
@@ -276,85 +231,42 @@
     if res != wx.ID_OK:
         return
 
-    label = '%s_%d' % (tmpl_label, number[0])
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = '%s_%d' % (tmpl_label, number[0])
-
+    name = parent.toplevel_parent.get_next_contained_name('window_%d')
     with parent.frozen():
-        widget = editor_class(label, parent, -1, None, None, orientation, sizer, pos)
-        widget.properties["style"].set_to_default()
+        editor = EditSplitterWindow(name, parent, index, orientation)
+        editor.properties["style"].set_to_default()
         if create_panels:
-            widget._window_1 = pane1 = EditPanel(label + '_pane_1', widget, wx.NewId(), widget.virtual_sizer, 1)
-            widget._window_2 = pane2 = EditPanel(label + '_pane_2', widget, wx.NewId(), widget.virtual_sizer, 2)
-    
-        node = Node(widget)
-        widget.node = node
-        widget.virtual_sizer.node = node
-    
-        widget.properties["proportion"].set(1)
-        widget.properties["flag"].set("wxEXPAND")
-    
-        common.app_tree.insert(node, sizer.node, pos-1)
-
-        if create_panels:
-            node2 = Node(widget._window_1)
-            node3 = Node(widget._window_2)
+            pane1 = EditPanel(name + '_pane_1', editor, 0)
+            pane2 = EditPanel(name + '_pane_2', editor, 1)
         else:
-            node2 = SlotNode(widget._window_1)
-            node3 = SlotNode(widget._window_2)
-        widget._window_1.node = node2
-        common.app_tree.add(node2, widget.node)
-        widget._window_2.node = node3
-        common.app_tree.add(node3, widget.node)
+            editor._add_slots()  # XXX focus should be set to first slot
 
-    
-        if parent.widget: widget.create()
-        #sizer.set_item(widget.pos, 1, wx.EXPAND)
+        editor.properties["proportion"].set(1)
+        editor.properties["flag"].set("wxEXPAND")
 
+        if parent.widget: editor.create()
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
-    "Factory to build editor objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    widget = editor_class(name, parent, wx.NewId(), None, None, editor_style, sizer, pos)
-    #sizer.set_item(widget.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(widget)
-    widget.node = node
-    widget.virtual_sizer.node = node
-
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-
-    node2 = SlotNode(widget._window_1)
-    widget._window_1.node = node2
-    common.app_tree.add(node2, widget.node)
-
-    node3 = SlotNode(widget._window_2)
-    widget._window_2.node = node3
-    common.app_tree.add(node3, widget.node)
+        return editor
 
-    return widget
+
+def xml_builder(parser, base, name, parent, index):
+    "Factory to build editor objects from a XML file"
+    return EditSplitterWindow(name, parent, index, 'wxSPLIT_VERTICAL')
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
-    common.widgets[editor_name] = builder
-    common.widgets_from_xml[editor_name] = xml_builder
+    common.widget_classes['EditSplitterWindow'] = EditSplitterWindow
+    common.widgets['EditSplitterWindow'] = builder
+    common.widgets_from_xml['EditSplitterWindow'] = xml_builder
 
     import os.path
-    WidgetTree.images['EditSplitterSlot-Left']   = os.path.join( config.icons_path, 'splitter_slot-left.xpm' )
-    WidgetTree.images['EditSplitterSlot-Right']  = os.path.join( config.icons_path, 'splitter_slot-right.xpm' )
-    WidgetTree.images['EditSplitterSlot-Top']    = os.path.join( config.icons_path, 'splitter_slot-top.xpm' )
-    WidgetTree.images['EditSplitterSlot-Bottom'] = os.path.join( config.icons_path, 'splitter_slot-bottom.xpm' )
-    WidgetTree.images['EditSplitterWindow']    = os.path.join( config.icons_path, 'splitter_window.xpm' )
-    WidgetTree.images['EditSplitterWindow-h']    = os.path.join( config.icons_path, 'splitter_window-h.xpm' )
+    from tree import WidgetTree
+    WidgetTree.images['EditSplitterSlot-Left']   = os.path.join( config.icons_path, 'splitter_slot-left.png' )
+    WidgetTree.images['EditSplitterSlot-Right']  = os.path.join( config.icons_path, 'splitter_slot-right.png' )
+    WidgetTree.images['EditSplitterSlot-Top']    = os.path.join( config.icons_path, 'splitter_slot-top.png' )
+    WidgetTree.images['EditSplitterSlot-Bottom'] = os.path.join( config.icons_path, 'splitter_slot-bottom.png' )
+    WidgetTree.images['EditSplitterWindow']      = os.path.join( config.icons_path, 'splitter_window.png' )
+    WidgetTree.images['EditSplitterWindow-h']    = os.path.join( config.icons_path, 'splitter_window-h.png' )
 
-    return common.make_object_button(editor_name, 'splitter_window.xpm')
+    return common.make_object_button('EditSplitterWindow', 'splitter_window.png')
diff -Nru wxglade-0.9.6/widgets/static_bitmap/codegen.py wxglade-1.0.1/widgets/static_bitmap/codegen.py
--- wxglade-0.9.6/widgets/static_bitmap/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/static_bitmap/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/static_bitmap/static_bitmap.py wxglade-1.0.1/widgets/static_bitmap/static_bitmap.py
--- wxglade-0.9.6/widgets/static_bitmap/static_bitmap.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/static_bitmap/static_bitmap.py	2020-12-31 14:04:48.000000000 +0000
@@ -8,16 +8,16 @@
 
 import wx
 
-import common, config
+import common, misc
 from edit_windows import ManagedBase, EditStylesMixin
 from gui_mixins import BitmapMixin
-from tree import Node
 import new_properties as np
 
 
-class EditStaticBitmap(ManagedBase, EditStylesMixin, BitmapMixin):
+class EditStaticBitmap(BitmapMixin, ManagedBase, EditStylesMixin):
     "Class to handle wxStaticBitmap objects"
-    update_widget_style = False
+    recreate_on_style_change = True
+    WX_CLASS = 'wxStaticBitmap'
     _PROPERTIES = ["Widget", "bitmap", "attribute", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     ManagedBase.MOVE_PROPERTY(PROPERTIES, "attribute", "name")
@@ -25,18 +25,17 @@
     _PROPERTY_HELP = {"attribute":'Store instance as attribute of window class; e.g. self.bitmap_1 = wx.wxStaticBitmap'
                                   '(...)\nWithout this, you can not access the bitmap from your program.'}
 
-    def __init__(self, name, parent, id, bmp_file, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxStaticBitmap', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, bmp_file):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
-        filedialog_style = wx.FD_OPEN | wx.FD_FILE_MUST_EXIST  # for the following two properties
         self.bitmap    = np.BitmapProperty(bmp_file)
         self.attribute = np.CheckBoxProperty(False, default_value=False)
 
     def create_widget(self):
         bmp = self.get_preview_obj_bitmap()
-        self.widget = wx.StaticBitmap(self.parent.widget, self.id, bmp)
+        self.widget = wx.StaticBitmap(self.parent_window.widget, wx.ID_ANY, bmp, style=self.style)
         if wx.Platform == '__WXMSW__':
             def get_best_size():
                 bmp = self.widget.GetBitmap()
@@ -45,58 +44,40 @@
                 return wx.StaticBitmap.GetBestSize(self.widget)
             self.widget.GetBestSize = get_best_size
 
-    def properties_changed(self, modified=None):
+    def _properties_changed(self, modified, actions):
         "update label (and size if label/stockitem have changed)"
         if not modified or "bitmap" in modified and self.widget:
             bmp = self.get_preview_obj_bitmap(self.bitmap)
             self.widget.SetBitmap(bmp)
+            if modified: actions.add("layout")
 
-            self._set_widget_best_size()
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
 
-
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index, bitmap=None):
     "factory function for EditStaticBitmap objects"
-    name = 'bitmap_%s' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'bitmap_%s' % number[0]
-    bitmap = wx.FileSelector(_("Select the image"))
+    name = parent.toplevel_parent.get_next_contained_name('bitmap_%d')
+    if bitmap is None:
+        bitmap = misc.RelativeFileSelector("Select the image")
+        if bitmap is None: return
     with parent.frozen():
-        static_bitmap = EditStaticBitmap(name, parent, wx.NewId(), bitmap, sizer, pos)
-        static_bitmap.properties["style"].set_to_default()
-        static_bitmap.check_defaults()
-        node = Node(static_bitmap)
-        static_bitmap.node = node
-        if parent.widget: static_bitmap.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditStaticBitmap(name, parent, index, bitmap)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditStaticBitmap objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    bitmap = EditStaticBitmap(label, parent, wx.NewId(), '', sizer, pos)
-    #sizer.set_item(bitmap.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(bitmap)
-    bitmap.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return bitmap
+    return EditStaticBitmap(name, parent, index, '')
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
+    common.widget_classes['EditStaticBitmap'] = EditStaticBitmap
     common.widgets['EditStaticBitmap'] = builder
     common.widgets_from_xml['EditStaticBitmap'] = xml_builder
 
-    return common.make_object_button('EditStaticBitmap', 'static_bitmap.xpm')
+    return common.make_object_button('EditStaticBitmap', 'static_bitmap.png')
diff -Nru wxglade-0.9.6/widgets/static_bitmap/wconfig.py wxglade-1.0.1/widgets/static_bitmap/wconfig.py
--- wxglade-0.9.6/widgets/static_bitmap/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/static_bitmap/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -14,6 +14,7 @@
                    'wxSUNKEN_BORDER', 'wxBORDER_SUNKEN',
                    'wxRAISED_BORDER', 'wxBORDER_RAISED',
                    'wxSTATIC_BORDER', 'wxBORDER_STATIC',
+                   'wxBORDER_THEME',
                    'wxDOUBLE_BORDER', 'wxBORDER_DOUBLE',
                    'wxNO_BORDER',     'wxBORDER_NONE',
                    'wxTAB_TRAVERSAL', 'wxWANTS_CHARS',
diff -Nru wxglade-0.9.6/widgets/static_line/static_line.py wxglade-1.0.1/widgets/static_line/static_line.py
--- wxglade-0.9.6/widgets/static_line/static_line.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/static_line/static_line.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,20 +3,19 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
-import common, misc
-import wcodegen
+import common
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 
 
 class EditStaticLine(ManagedBase, EditStylesMixin):
     "Class to handle wxStaticLine objects"
+    WX_CLASS = 'wxStaticLine'
     _PROPERTIES = ["attribute"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     PROPERTIES.remove("font")
@@ -24,8 +23,8 @@
     _PROPERTY_LABELS = {"attribute":'Store as attribute'}
     _PROPERTY_HELP={"attribute":'Store instance as attribute of window class; e.g. self.line_1 = wx.wxStaticLine(...)\n'
                                 'Without this, you can not access the line from your program.'}
-    def __init__(self, name, parent, id, style, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxStaticLine', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, style):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -33,38 +32,27 @@
         if style: self.properties["style"].set(style)
 
     def create_widget(self):
-        self.widget = wx.StaticLine(self.parent.widget, self.id, style=self.style)
+        self.widget = wx.StaticLine(self.parent_window.widget, wx.ID_ANY, style=self.style)
         self.widget.Bind(wx.EVT_LEFT_DOWN, self.on_set_focus)
 
-    def finish_widget_creation(self):
-        ManagedBase.finish_widget_creation(self)
-        self.sel_marker.Reparent(self.parent.widget)
-        #del self.properties['font']
+    def finish_widget_creation(self, level):
+        ManagedBase.finish_widget_creation(self, level)
+        self.sel_marker.Reparent(self.parent_window.widget)
 
     def __getitem__(self, key):
         if key != 'font':
             return ManagedBase.__getitem__(self, key)
         return lambda: "", lambda v: None
 
-    def properties_changed(self, modified=None):
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+    def _properties_changed(self, modified, actions):
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-editor_class = EditStaticLine
-editor_icon = 'static_line.xpm'
-editor_name = 'EditStaticLine'
-editor_style = ''
-
-dlg_title = _('wxStaticLine')
-box_title = _('Orientation')
-choices = 'wxLI_HORIZONTAL|wxLI_VERTICAL'
-tmpl_label = 'static_line'
-
-
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for editor objects from GUI"
-    dialog = wcodegen.WidgetStyleSelectionDialog(dlg_title, box_title, choices)
+    import dialogs, misc
+    dialog = dialogs.WidgetStyleSelectionDialog(_('wxStaticLine'), _('Orientation'), 'wxLI_HORIZONTAL|wxLI_VERTICAL')
     with misc.disable_stay_on_top(common.adding_window or parent):
         res = dialog.ShowModal()
     style = dialog.get_selection()
@@ -72,45 +60,25 @@
     if res != wx.ID_OK:
         return
 
-    label = '%s_%d' % (tmpl_label, number[0])
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = '%s_%d' % (tmpl_label, number[0])
+    name = parent.toplevel_parent.get_next_contained_name('static_line_%d')
     with parent.frozen():
-        widget = editor_class(label, parent, wx.ID_ANY, style, sizer, pos)
-        import edit_sizers
-        if isinstance(sizer, edit_sizers.edit_sizers.BoxSizerBase):
-            if ( (sizer.orient & wx.VERTICAL   and style=="wxLI_HORIZONTAL") or 
-                 (sizer.orient & wx.HORIZONTAL and style=="wxLI_VERTICAL") ):
-                widget.properties["flag"].add("wxEXPAND")
-        node = Node(widget)
-        widget.node = node
-        if parent.widget: widget.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditStaticLine(name, parent, index, style)
+        if parent.IS_SIZER and "orient" in parent.properties and parent.orient:
+            if ( (parent.orient & wx.VERTICAL   and style=="wxLI_HORIZONTAL") or 
+                 (parent.orient & wx.HORIZONTAL and style=="wxLI_VERTICAL") ):
+                editor.properties["flag"].add("wxEXPAND")
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "Factory to build editor objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    widget = editor_class(name, parent, wx.ID_ANY, editor_style, sizer, pos)
-    #sizer.set_item(widget.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(widget)
-    widget.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return widget
+    return EditStaticLine(name, parent, index, '')
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
-    common.widgets[editor_name] = builder
-    common.widgets_from_xml[editor_name] = xml_builder
-    return common.make_object_button(editor_name, editor_icon)
+    common.widget_classes['EditStaticLine'] = EditStaticLine
+    common.widgets['EditStaticLine'] = builder
+    common.widgets_from_xml['EditStaticLine'] = xml_builder
+    return common.make_object_button('EditStaticLine', 'static_line.png')
diff -Nru wxglade-0.9.6/widgets/static_text/codegen.py wxglade-1.0.1/widgets/static_text/codegen.py
--- wxglade-0.9.6/widgets/static_text/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/static_text/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -24,7 +24,7 @@
     def get_more_properties_code(self, obj):
         ret = []
         if obj.wrap>0:
-            ret.append( '%s->Wrap(%d);\n'%(obj.name, obj.wrap) )
+            ret.append( '%s.Wrap(%d);\n'%(self.tmpl_dict['name'], obj.wrap) )
         return ret
 
 
diff -Nru wxglade-0.9.6/widgets/static_text/perl_codegen.py wxglade-1.0.1/widgets/static_text/perl_codegen.py
--- wxglade-0.9.6/widgets/static_text/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/static_text/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -15,7 +15,7 @@
     def get_more_properties_code(self, obj):
         ret = []
         if obj.wrap>0:
-            ret.append( '%s->Wrap(%d);\n'%(self.codegen.format_generic_access(obj), obj.wrap) )
+            ret.append( '%s->Wrap(%d);\n'%(self.tmpl_dict['name'], obj.wrap) )
         return ret
 
 
diff -Nru wxglade-0.9.6/widgets/static_text/static_text.py wxglade-1.0.1/widgets/static_text/static_text.py
--- wxglade-0.9.6/widgets/static_text/static_text.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/static_text/static_text.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,20 +3,20 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 #import wx.lib.stattext
-import common, config
+import common
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import new_properties as np
 
 
 class EditStaticText(ManagedBase, EditStylesMixin):
     "Class to handle wxStaticText objects"
+    WX_CLASS = 'wxStaticText'
     _PROPERTIES = ["Widget", "label", "style", "attribute", "wrap"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     ManagedBase.MOVE_PROPERTY(PROPERTIES, "attribute", "name")
@@ -24,8 +24,8 @@
                                  'Without this, you can not access the label from your program.',
                      "wrap":     'Wrap text to at most the given width.\nThe lines will be broken at word boundaries.'}
 
-    def __init__(self, name, parent, id, label, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxStaticText', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, label):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -35,72 +35,62 @@
 
     def create_widget(self):
         # up to 0.8 GenStaticText was used; it seems that nowadays StaticText handles mouse events on gtk as well
-        #self.widget = wx.lib.stattext.GenStaticText(self.parent.widget, self.id, self.label)
-        self.widget = wx.StaticText(self.parent.widget, self.id, self.label)
-        if self.wrap:
-            self.widget.Wrap(self.wrap)
+        #self.widget = wx.lib.stattext.GenStaticText(self.parent_window.widget, wx.ID_ANY, self.label)
+        self.widget = wx.StaticText(self.parent_window.widget, wx.ID_ANY, self.label, style=self.style)
+        # self.wrap is now handled in finish_widget_creation
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "label" in modified:
-            common.app_tree.refresh(self.node, refresh_label=True)
             if self.widget:
                 p = self.properties["label"]
                 if self.wrap!=-1 or (p.previous_value and len(p.previous_value)>len(self.label)):
                     # re-create as otherwise the size would not be reduced
-                    self.recreate_widget()
+                    actions.add("recreate2")
                     return
                 self.widget.SetLabel(self.label)
-                self._set_widget_best_size()
+                actions.add("layout")
 
         if (not modified or "wrap" in modified) and self.widget:
-            self.recreate_widget()  # calling .Wrap(self.wrap) would only work once and not set the size correctly
-
+            actions.add("recreate2")  # calling .Wrap(self.wrap) would only work once and not set the size correctly
             return
 
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        if modified and wx.Platform!="__WXMSW__":
+            if "style" in modified or "font" in modified or "foreground" in modified:
+                actions.add("recreate2")
+                return
 
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditStaticText objects"
-    label = u'label_%d' % number[0]
-    while common.app_tree.has_name(label):
-        number[0] += 1
-        label = u'label_%d' % number[0]
+    import dialogs, misc
+    name = parent.toplevel_parent.get_next_contained_name('label_%d')
+    dlg = dialogs.WidgetStyleSelectionDialog(_("Static Text / Label"), None, None, ["?Label"])
+    with misc.disable_stay_on_top(common.adding_window or parent):
+        res = dlg.ShowModal()
+    label, = dlg.get_options()
+    dlg.Destroy()
+    if res != wx.ID_OK: return
+
     with parent.frozen():
-        static_text = EditStaticText(label, parent, wx.NewId(), label, sizer, pos)
-        static_text.properties["style"].set_to_default()
-        static_text.check_defaults()
-        node = Node(static_text)
-        static_text.node = node
-        if parent.widget: static_text.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditStaticText(name, parent, index, label)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditStaticText objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        label = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    static_text = EditStaticText(label, parent, wx.NewId(), "", sizer, pos)
-    #sizer.set_item(static_text.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(static_text)
-    static_text.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return static_text
+    return EditStaticText(name, parent, index, "")
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditStaticText'] = EditStaticText
     common.widgets['EditStaticText'] = builder
     common.widgets_from_xml['EditStaticText'] = xml_builder
 
-    return common.make_object_button('EditStaticText', 'static_text.xpm')
+    return common.make_object_button('EditStaticText', 'static_text.png')
diff -Nru wxglade-0.9.6/widgets/static_text/wconfig.py wxglade-1.0.1/widgets/static_text/wconfig.py
--- wxglade-0.9.6/widgets/static_text/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/static_text/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,6 +2,7 @@
 wxStaticText widget configuration
 
 @copyright: 2014-2016 Carsten Grohmann
+@copyright: 2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -37,9 +38,10 @@
                       'uses wxControl::Ellipsize.'),
             'supported_by': ('wx3',),
         },
+        'wxALIGN_CENTRE':{'rename_to':'wxALIGN_CENTER_HORIZONTAL'},
+        'wxALIGN_CENTER':{'rename_to':'wxALIGN_CENTER_HORIZONTAL'},
     },
-    'style_list': ['wxALIGN_LEFT', 'wxALIGN_RIGHT', 'wxALIGN_CENTRE',
-                   'wxALIGN_CENTER', 'wxALIGN_CENTRE_HORIZONTAL',
+    'style_list': ['wxALIGN_LEFT', 'wxALIGN_RIGHT', 'wxALIGN_CENTER_HORIZONTAL',
                    'wxST_NO_AUTORESIZE', 'wxST_ELLIPSIZE_START',
                    'wxST_ELLIPSIZE_MIDDLE', 'wxST_ELLIPSIZE_END'],
 }
diff -Nru wxglade-0.9.6/widgets/statusbar/codegen.py wxglade-1.0.1/widgets/statusbar/codegen.py
--- wxglade-0.9.6/widgets/statusbar/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/statusbar/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -27,7 +27,6 @@
 
         append = self.tmpl_props.append
         append( '%(name)s.SetStatusWidths(%(widths)s)\n' )
-        append( '\n' )
 
         # don't add statusbar fields without labels
         if [lb for lb in labels if lb]:
@@ -93,26 +92,15 @@
     klass = 'wxStatusBar'
     cn = common.class_names
     cn['EditStatusBar'] = klass
-    common.toplevels['EditFrame'] = 1
-    common.toplevels['EditMDIChildFrame'] = 1
 
     pygen = common.code_writers.get('python')
     if pygen:
-        pygen.add_widget_handler('wxStatusBar', PythonStatusBarGenerator(klass))
-
-        #aph = pygen.add_property_handler
-        #aph('statusbar', pygen.DummyPropertyHandler)
-        #aph('fields', StatusFieldsHandler)
+        pygen.register_widget_code_generator('wxStatusBar', PythonStatusBarGenerator(klass))
 
     xrcgen = common.code_writers.get('XRC')
     if xrcgen:
-        xrcgen.add_widget_handler('wxStatusBar', xrc_statusbar_code_generator)
-        #xrcgen.add_property_handler('fields', StatusFieldsHandler)
+        xrcgen.register_widget_code_generator('wxStatusBar', xrc_statusbar_code_generator)
 
     cppgen = common.code_writers.get('C++')
     if cppgen:
-        cppgen.add_widget_handler('wxStatusBar', CppStatusBarGenerator(klass))
-
-        #aph = cppgen.add_property_handler
-        #aph('fields', StatusFieldsHandler)
-        #aph('statusbar', cppgen.DummyPropertyHandler)
+        cppgen.register_widget_code_generator('wxStatusBar', CppStatusBarGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/statusbar/lisp_codegen.py wxglade-1.0.1/widgets/statusbar/lisp_codegen.py
--- wxglade-0.9.6/widgets/statusbar/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/statusbar/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -28,8 +28,8 @@
 
         # don't add statusbar fields without labels
         if [lb for lb in labels if lb]:
-            for pos, lb in enumerate(labels):
-                stmt = '(wxStatusBar_SetStatusText %%(name)s %s %d)\n' % (self.codegen.quote_str(lb), pos)
+            for i, lb in enumerate(labels):
+                stmt = '(wxStatusBar_SetStatusText %%(name)s %s %d)\n' % (self.codegen.quote_str(lb), i)
                 self.tmpl_props.append(stmt)
 
 
@@ -40,7 +40,4 @@
 
     lispgen = common.code_writers.get('lisp')
     if lispgen:
-        lispgen.add_widget_handler('wxStatusBar', LispStatusBarCodeGenerator(klass))
-        #aph = lispgen.add_property_handler
-        #aph('fields', StatusFieldsHandler)
-        #aph('statusbar', lispgen.DummyPropertyHandler)
+        lispgen.register_widget_code_generator('wxStatusBar', LispStatusBarCodeGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/statusbar/perl_codegen.py wxglade-1.0.1/widgets/statusbar/perl_codegen.py
--- wxglade-0.9.6/widgets/statusbar/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/statusbar/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -53,9 +53,4 @@
 
     plgen = common.code_writers.get('perl')
     if plgen:
-        plgen.add_widget_handler('wxStatusBar',
-                                 PerlStatusBarCodeGenerator(klass))
-
-        #aph = plgen.add_property_handler
-        #aph('fields', StatusFieldsHandler)
-        #aph('statusbar', plgen.DummyPropertyHandler)
+        plgen.register_widget_code_generator('wxStatusBar', PerlStatusBarCodeGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/statusbar/statusbar.py wxglade-1.0.1/widgets/statusbar/statusbar.py
--- wxglade-0.9.6/widgets/statusbar/statusbar.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/statusbar/statusbar.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,13 +3,12 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 import common, misc
-from tree import Node, WidgetTree
 from wcodegen.taghandler import BaseXmlBuilderTagHandler
 import new_properties as np
 from edit_windows import EditBase, EditStylesMixin
@@ -35,8 +34,7 @@
             char_data = self.get_char_data()
             self.fields.append([char_data, self.width])
         else:  # name == 'fields'
-            self.owner.properties["fields"].set(self.fields)
-            self.owner.properties_changed(["fields"])
+            self.owner.properties["fields"].load(self.fields)
             return True
 
 
@@ -58,11 +56,13 @@
     _hidden_frame = None
     update_widget_style = False  # updating does not seem to have an effect
 
+    WX_CLASS = 'wxStatusBar'
     _PROPERTIES = ["Widget", "style", "fields"]
     PROPERTIES = EditBase.PROPERTIES + _PROPERTIES + EditBase.EXTRA_PROPERTIES
+    CHILDREN = 0
 
-    def __init__(self, name, klass, parent):
-        EditBase.__init__( self, name, klass, parent, wx.NewId(), custom_class=False )
+    def __init__(self, name, parent):
+        EditBase.__init__( self, name, parent, index="_statusbar")
         EditStylesMixin.__init__(self)
 
         # for the statusbar fields
@@ -70,9 +70,6 @@
         self.fields = FieldsProperty(fields)
         self.window_id = None  # just a dummy for code generation
 
-        self.node = Node(self)
-        common.app_tree.add(self.node, parent.node)
-
     def create_widget(self):
         self.widget = wx.StatusBar(self.parent.widget, -1)
         self.widget.Bind(wx.EVT_LEFT_DOWN, self.on_set_focus)
@@ -80,6 +77,10 @@
         if self.parent.widget:
             self.parent.widget.SetStatusBar(self.widget)
 
+    def remove(self):
+        EditBase.remove(self)
+        self.parent.properties['statusbar'].set(False)
+
     def _set_fields(self):
         if not self.widget: return
         fields = self.fields  # values is a list of lists
@@ -94,24 +95,12 @@
 
         self.widget.SetStatusWidths(widths)
 
-    def remove(self, *args, **kwds):
-        if not kwds.get('do_nothing', False):
-            self.parent.properties['statusbar'].set(False)
-            if self.parent.widget:
-                self.parent.widget.SetStatusBar(None)
-            try:
-                self.parent._statusbar = None
-            except KeyError:
-                pass
-            if self.widget:
-                self.widget.Hide()
-            EditBase.remove(self)
-        else:
-            if EditStatusBar._hidden_frame is None:
-                EditStatusBar._hidden_frame = wx.Frame(None, -1, "")
-            if self.widget is not None:
-                self.widget.Reparent(EditStatusBar._hidden_frame)
-            self.widget = None
+    def destroy_widget(self, level):
+        # if parent is being deleted, we rely on this being destroyed
+        if level==0 and not self.IS_TOPLEVEL and self.parent.widget:
+            self.parent.widget.SetStatusBar(None)
+        if level==0:
+            EditBase.destroy_widget(self, level)
 
     def popup_menu(self, *args):
         pass  # to avoid strange segfault :)
@@ -121,13 +110,13 @@
             return FieldsHandler(self)
         return None
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "fields" in modified:
             self._set_fields()
-        EditStylesMixin.properties_changed(self, modified)
-        EditBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        EditBase._properties_changed(self, modified, actions)
 
-    def check_compatibility(self, widget, typename=None, report=False):
+    def check_compatibility(self, widget, typename=None):
         return (False,"No pasting possible here.")
     def check_drop_compatibility(self):
         return (False,"Edit fields in Properties -> Widget")
@@ -138,12 +127,12 @@
 class Dialog(wx.Dialog):
     def __init__(self):
         global _NUMBER
-        wx.Dialog.__init__(self, None, -1, _('Select toolbar class'))
+        wx.Dialog.__init__(self, None, -1, _('Select statusbar class'))
         
-        if common.app_tree.app.language.lower() == 'xrc':
-            klass = 'wxToolBar'
+        if common.root.language.lower() == 'xrc':
+            klass = 'wxStatusBar'
         else:
-            klass = 'MyToolBar%s' % (_NUMBER or "")
+            klass = 'MyStatusBar%s' % (_NUMBER or "")
             _NUMBER += 1
 
         # class
@@ -161,53 +150,26 @@
         szr.Fit(self)
 
 
-def builder(parent, sizer, pos):
-    "factory function for EditToolBar objects"
-
-    dialog = Dialog()
-    with misc.disable_stay_on_top(common.adding_window or parent):
-        res = dialog.ShowModal()
-    klass = dialog.klass
-    dialog.Destroy()
-    if res != wx.ID_OK:
-        if number[0] > 0:
-            number[0] -= 1
-        return
-
-    name = 'statusbar_%d' % (number[0] or 1)
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'statusbar_%d' % number[0]
-
-    with parent.frozen():
-        widget = EditStatusBar(name, klass, parent)
-        widget.node = Node(widget)
-        common.app_tree.add(widget.node)
-        if parent.widget: widget.create()
 
+def builder(parent, index, klass):
+    # only used from Frame.menubar property
+    editor = EditStatusBar(parent.name+"_statusbar", parent)
+    if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditStatusBar objects from a XML file"
-    name = attrs.get('name')
-    if parent:
-        if name:
-            parent._statusbar.properties["name"].set(name)
-            parent._statusbar.properties_changed(["name"])
-        return parent._statusbar
-    else:
-        widget = EditStatusBar(name, attrs.get('class', 'wxStatusBar'), None)
-        widget.node = Node(widget)
-        common.app_tree.add(widget.node)
-        return widget
+    parent.properties["statusbar"].set(True)
+    return EditStatusBar(name, parent)
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette."
+    common.widget_classes['EditStatusBar'] = EditStatusBar
+    common.widgets['EditStatusBar'] = builder   # only used from Frame.menubar property
     common.widgets_from_xml['EditStatusBar'] = xml_builder
-    common.widgets['EditStatusBar'] = builder
-    #return common.make_object_button('EditStatusBar', 'statusbar.xpm')
-    # no standalone status bar any more
     import config, os
-    WidgetTree.images['EditStatusBar'] = os.path.join(config.icons_path, 'statusbar.xpm')
+    from tree import WidgetTree
+    WidgetTree.images['EditStatusBar'] = os.path.join(config.icons_path, 'statusbar.png')
     return []
diff -Nru wxglade-0.9.6/widgets/text_ctrl/text_ctrl.py wxglade-1.0.1/widgets/text_ctrl/text_ctrl.py
--- wxglade-0.9.6/widgets/text_ctrl/text_ctrl.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/text_ctrl/text_ctrl.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -12,24 +12,24 @@
 import common, config, misc
 from edit_windows import ManagedBase, EditStylesMixin
 import new_properties as np
-from tree import Node
 
 
 class EditTextCtrl(ManagedBase, EditStylesMixin):
     "Class to handle wxTextCtrl objects"
 
+    WX_CLASS = 'wxTextCtrl'
     # we want these pages: Common, Layout, Widget, Events, Code
     _PROPERTIES = ["Widget", "value", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     recreate_on_style_change = True
 
-    def __init__(self, name, parent, id, sizer, pos):
+    def __init__(self, name, parent, index):
         # initialize base classes
-        ManagedBase.__init__(self, name, 'wxTextCtrl', parent, id, sizer, pos)
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialize instance properties
-        self.value = np.TextProperty("", multiline=True)
+        self.value = np.TextProperty("", multiline="grow")
 
         #self.properties["style"].set( self.get_int_style() ) # XXX check whether this makes sense for any control
 
@@ -37,55 +37,36 @@
         value = self.value
         #if self.style & wx.TE_MULTILINE:
         #    value = value.replace('\\n', '\n') # XXX is this correct? is self.value already with newlines?
-        self.widget = wx.TextCtrl(self.parent.widget, self.id, value=value, style=self.style)
+        self.widget = wx.TextCtrl(self.parent_window.widget, wx.ID_ANY, value=value, style=self.style)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if "value" in modified and self.widget:
             self.widget.SetValue(self.value)
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditTextCtrl objects"
-    name = 'text_ctrl_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'text_ctrl_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('text_ctrl_%d')
     with parent.frozen():
-        text = EditTextCtrl(name, parent, wx.NewId(), sizer, pos)
-        text.properties["style"].set_to_default()
-        text.check_defaults()
-        node = Node(text)
-        text.node = node
-        if parent.widget: text.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditTextCtrl(name, parent, index)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory function to build EditTextCtrl objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    text = EditTextCtrl(name, parent, wx.NewId(), sizer, pos)
-    #sizer.set_item(text.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(text)
-    text.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return text
+    return EditTextCtrl(name, parent, index)
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditTextCtrl'] = EditTextCtrl
     common.widgets['EditTextCtrl'] = builder
     common.widgets_from_xml['EditTextCtrl'] = xml_builder
 
-    return common.make_object_button('EditTextCtrl', 'text_ctrl.xpm')
+    return common.make_object_button('EditTextCtrl', 'text_ctrl.png')
diff -Nru wxglade-0.9.6/widgets/text_ctrl/wconfig.py wxglade-1.0.1/widgets/text_ctrl/wconfig.py
--- wxglade-0.9.6/widgets/text_ctrl/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/text_ctrl/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -2,7 +2,7 @@
 wxTextCtrl widget configuration
 
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2017-2018 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
diff -Nru wxglade-0.9.6/widgets/toggle_button/toggle_button.py wxglade-1.0.1/widgets/toggle_button/toggle_button.py
--- wxglade-0.9.6/widgets/toggle_button/toggle_button.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/toggle_button/toggle_button.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -12,21 +12,21 @@
 import common, config
 from edit_windows import ManagedBase, EditStylesMixin
 from gui_mixins import BitmapMixin
-from tree import Node
 import new_properties as np
 
 
-class EditToggleButton(ManagedBase, EditStylesMixin, BitmapMixin):
+class EditToggleButton(BitmapMixin, ManagedBase, EditStylesMixin):
     "Class to handle wxToggleButton objects"
 
+    WX_CLASS = 'wxToggleButton'
     _PROPERTIES = ["Widget", "label", "value",
                    "bitmap", "disabled_bitmap", "pressed_bitmap", "current_bitmap", "focus_bitmap",
                    "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
     _PROPERTY_LABELS = {"value":"Clicked"}
 
-    def __init__(self, name, parent, id, label, sizer, pos):
-        ManagedBase.__init__(self, name, 'wxToggleButton', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, label):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance variable
@@ -40,66 +40,45 @@
         self.focus_bitmap    = np.BitmapPropertyD(min_version=(3,0))
 
     def create_widget(self):
-        self.widget = wx.ToggleButton(self.parent.widget, self.id, self.label)
+        self.widget = wx.ToggleButton(self.parent_window.widget, wx.ID_ANY, self.label)
         self.widget.SetValue(self.value)
-        self.widget.Bind(wx.EVT_TOGGLEBUTTON, self.on_set_focus, id=self.id)
+        self.widget.Bind(wx.EVT_TOGGLEBUTTON, self.on_set_focus, id=self.widget.GetId())
         BitmapMixin._set_preview_bitmaps(self)
 
-    def properties_changed(self, modified):
+    def _properties_changed(self, modified, actions):
         if not modified or "value" in modified and self.widget:
             self.widget.SetValue(self.value)
 
         if not modified or "label" in modified:
             if self.widget:
                 self.widget.SetLabel(self.label)
-                self._set_widget_best_size()
-            common.app_tree.refresh(self.node, refresh_label=True)
+            if modified: actions.update(("layout", "label"))
 
-        BitmapMixin._properties_changed(self, modified)
-        self._set_widget_best_size()
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+        BitmapMixin._properties_changed(self, modified, actions)
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
 
 
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditToggleButton objects"
-    name = u'button_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = u'button_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('button_%d')
     with parent.frozen():
-        button = EditToggleButton(name, parent, wx.NewId(), name, sizer, pos)
-        button.properties["style"].set_to_default()
-        button.check_defaults()
-        node = Node(button)
-        button.node = node
-        if parent.widget: button.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
+        editor = EditToggleButton(name, parent, index, name)
+        editor.properties["style"].set_to_default()
+        editor.check_defaults()
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditToggleButton objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    button = EditToggleButton(name, parent, wx.NewId(), '', sizer, pos)
-    #sizer.set_item(button.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(button)
-    button.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return button
+    return EditToggleButton(name, parent, index, '')
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditToggleButton'] = EditToggleButton
     common.widgets['EditToggleButton'] = builder
     common.widgets_from_xml['EditToggleButton'] = xml_builder
 
-    return common.make_object_button('EditToggleButton', 'toggle_button.xpm')
+    return common.make_object_button('EditToggleButton', 'toggle_button.png')
diff -Nru wxglade-0.9.6/widgets/toolbar/codegen.py wxglade-1.0.1/widgets/toolbar/codegen.py
--- wxglade-0.9.6/widgets/toolbar/codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/toolbar/codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016-2017 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -15,88 +15,107 @@
 class PythonCodeGenerator(wcodegen.PythonWidgetCodeWriter):
     def get_properties_code(self, obj):
         out = []
-        append = out.append
 
         obj_name = self.format_widget_access(obj)
         if obj.properties["bitmapsize"].is_active():
             w, h = obj.properties["bitmapsize"].get_tuple()
-            append( '%s.SetToolBitmapSize((%s, %s))\n' % (obj_name, w, h) )
+            out.append( '%s.SetToolBitmapSize((%s, %s))\n' % (obj_name, w, h) )
         if obj.properties["margins"].is_active():
             w, h = obj.properties["margins"].get_tuple()
-            append( '%s.SetMargins((%s, %s))\n' % (obj_name, w, h) )
+            out.append( '%s.SetMargins((%s, %s))\n' % (obj_name, w, h) )
         if obj.properties["packing"].is_active():
-            append( '%s.SetToolPacking(%s)\n' % (obj_name, obj.packing) )
+            out.append( '%s.SetToolPacking(%s)\n' % (obj_name, obj.packing) )
         if obj.properties["separation"].is_active():
-            append( '%s.SetToolSeparation(%s)\n' % (obj_name, obj.separation) )
-        append( '%s.Realize()\n' % obj_name )
+            out.append( '%s.SetToolSeparation(%s)\n' % (obj_name, obj.separation) )
 
         return out
 
     def get_init_code(self, obj):
         out = []
-        append = out.append
         ids = []
 
         obj_name = self.format_widget_access(obj)
 
+        bmp1 = self.generate_code_bitmap("empty:16,16")
+
         for tool in obj.tools:
             if tool.id == '---':  # item is a separator
-                append( '%s.AddSeparator()\n' % obj_name )
+                out.append( '%s.AddSeparator()\n' % obj_name )
             else:
-                name, val = self.codegen.generate_code_id(None, tool.id)
-                if self.codegen.preview or (not name and (not val or val == '-1')):
+                id_access = None  # default: access via item.GetId()
+                id_declaration, val = self.codegen.generate_code_id(None, tool.id)
+                if self.codegen.preview or (not id_declaration and (not val or val == '-1')):
                     wid = self.cn('wxNewId()')
                 else:
-                    if name:
-                        ids.append( name )
+                    if id_declaration: ids.append( id_declaration )
                     wid = val
+                    if val!='wx.ID_ANY': id_access = val
+
                 kinds = ['wxITEM_NORMAL', 'wxITEM_CHECK', 'wxITEM_RADIO']
                 try:
                     kind = kinds[int(tool.type)]
                 except (IndexError, ValueError):
                     kind = 'wxITEM_NORMAL'
-                bmp1 = self.generate_code_bitmap(tool.bitmap1)
+                if tool.bitmap1:
+                    bmp1 = self.generate_code_bitmap(tool.bitmap1, required=self.codegen.preview)
+                else:
+                    bmp1 = self.generate_code_bitmap("empty:16,16")
                 bmp2 = self.generate_code_bitmap(tool.bitmap2)
+                
+                # append and optionally assign the returned item to a temporary variable
+                if False: # tool.name:
+                    # assign to attribute
+                    name = '%s.%s' % (obj_name, item.name)
+                    assignment = '%s = '%name
+                    if not id_access:
+                        id_access = "%s.GetId()"%name
+                elif tool.handler and not id_access:
+                    # assignment to local variable to bind handler
+                    assignment = 'tool = '
+                    id_access = 'tool.GetId()'
+                else:
+                    # no assignment necessary, as no handler defined
+                    assignment = ''
+
                 method = "AddLabelTool" if compat.IS_CLASSIC else "AddTool"
-                append( '%s.%s(%s, %s, %s, %s, %s, %s, %s)\n' %
-                        (obj_name, method, wid, self.codegen.quote_str(tool.label),
-                         bmp1, bmp2, self.cn(kind),
-                         self.codegen.quote_str(tool.short_help), self.codegen.quote_str(tool.long_help)) )
+                out.append( '%s%s.%s(%s, %s, %s, %s, %s, %s, %s)\n' %
+                            (assignment, obj_name, method, wid, self.codegen.quote_str(tool.label),
+                             bmp1, bmp2, self.cn(kind),
+                             self.codegen.quote_str(tool.short_help), self.codegen.quote_str(tool.long_help)) )
+                if tool.handler:
+                    handler = tool.handler if "." in tool.handler else "self.%s"%tool.handler
+                    out.append( "self.Bind(wx.EVT_TOOL, %s, id=%s)\n"%(handler, id_access) )
 
         return ids + out
 
     def get_code(self, obj):
         "function that generates Python code for the menubar of a wxFrame"
-        #style = obj.properties.get('style')
         style = obj.properties['style'].get_string_value()
         if style:
-            style = ', style=' + self.cn_f( 'wxTB_HORIZONTAL|' + style )
-        #else:
-            #style = ''
-        klass = obj.klass
-        if klass == obj.base:
-            klass = self.cn(klass)
-        init = ['\n', '# Tool Bar\n', 'self.%s = %s(self, -1%s)\n' %
-                                                      (obj.name, klass, style), 'self.SetToolBar(self.%s)\n' % obj.name]
-        init.extend( self.get_init_code(obj) )
-        init.append( '# Tool Bar end\n' )
-        return init, self.get_properties_code(obj), []
+            style = ', style=' + self.cn_f(style)
 
-    def get_event_handlers(self, obj):
-        out = []
+        klass = obj.get_instantiation_class(self.cn, self.cn_class, self.codegen.preview)
+
+        code = ['# Tool Bar\n',
+                'self.%s = %s(self, -1%s)\n' % (obj.name, klass, style)
+                ] + self.get_init_code(obj) + self.get_properties_code(obj) + [
+                'self.SetToolBar(self.%s)\n' % obj.name,
+                'self.%s.Realize()\n' % obj.name,
+                '# Tool Bar end\n']
+        return code, []
 
-        def do_get(tool):
-            ret = []
-            name, val = self.codegen.generate_code_id(None, tool.id)
-            if not val:
-                val = '-1'  # but this is wrong anyway...
-            if tool.handler:
-                ret.append((val, 'EVT_TOOL', tool.handler, 'wxCommandEvent'))
-            return ret
+    def get_layout_code(self, obj):
+        return ['%s.Realize()\n' % self.format_widget_access(obj)]
+
+    def get_event_handlers(self, obj):
+        ret = []
 
         for tool in obj.tools:
-            out.extend(do_get(tool))
-        return out
+            if not tool.handler or tool.handler=="---": continue
+            # first item is None -> just generate stub for item.handler, do not bind again
+            ret.append( (None, 'EVT_TOOL', tool.handler, 'wxCommandEvent') )
+
+        return ret
 
 
 def xrc_code_generator(obj):
@@ -181,44 +200,49 @@
     def get_code(self, obj):
         "generates C++ code for the toolbar of a wxFrame."
         style = obj.properties['style'].get_string_value()
-        if style:
-            style = ', wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|' + style
-        else:
-            style = ''
-        init = ['%s = new %s(this, -1%s);\n' % (obj.name, obj.klass, style), 'SetToolBar(%s);\n' % obj.name]
-        init.extend(self.get_properties_code(obj))
+        style = style and (', wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|' + style) or ''
+
+        klass = obj.get_instantiation_class(self.cn, self.cn_class)
+
+        init = ['%s = new %s(this, -1%s);\n' % (obj.name, klass, style), 'SetToolBar(%s);\n' % obj.name
+                ] + self.get_properties_code(obj) + self.get_layout_code(obj)
         ids = self.get_ids_code(obj)
-        return init, ids, [], []
+        return init, ids, []
+
+    def get_layout_code(self, obj):
+        return ['%sRealize();\n' % self.codegen.format_generic_access(obj)]
 
     def get_properties_code(self, obj):
         out = []
-        append = out.append
-        prop = obj.properties
 
         obj_name = self.codegen.format_generic_access(obj)
 
         if obj.properties["bitmapsize"].is_active():
             w, h = obj.properties["bitmapsize"].get_tuple()
-            append('%sSetToolBitmapSize(wxSize(%s, %s));\n' % (obj_name, w, h))
+            out.append('%sSetToolBitmapSize(wxSize(%s, %s));\n' % (obj_name, w, h))
 
         if obj.properties["margins"].is_active():
             w, h = obj.properties["margins"].get_tuple()
-            append('%sSetMargins(wxSize(%s, %s));\n' % (obj_name, w, h))
+            out.append('%sSetMargins(wxSize(%s, %s));\n' % (obj_name, w, h))
 
         if obj.properties["packing"].is_active():
-            append('%sSetToolPacking(%s);\n' % (obj_name, obj.packing))
+            out.append('%sSetToolPacking(%s);\n' % (obj_name, obj.packing))
         if obj.properties["separation"].is_active():
-            append('%sSetToolSeparation(%s);\n' % (obj_name, obj.separation))
+            out.append('%sSetToolSeparation(%s);\n' % (obj_name, obj.separation))
+
+        need_tmp = False
 
         for tool in obj.tools:
             if tool.id == '---':  # item is a separator
-                append('%sAddSeparator();\n' % obj_name)
+                out.append('%sAddSeparator();\n' % obj_name)
             else:
+                id_access = None
                 name, val = self.codegen.generate_code_id(None, tool.id)
                 if not name and (not val or val == '-1'):
                     wid = 'wxNewId()'
                 else:
                     wid = val
+                    if val!='wxID_ANY': id_access = val
                 kinds = ['wxITEM_NORMAL', 'wxITEM_CHECK', 'wxITEM_RADIO']
                 try:
                     kind = kinds[int(tool.type)]
@@ -226,13 +250,39 @@
                     kind = 'wxITEM_NORMAL'
                 bmp1 = self.generate_code_bitmap(tool.bitmap1)
                 bmp2 = self.generate_code_bitmap(tool.bitmap2)
-                append('%sAddTool(%s, %s, %s, %s, %s, %s, %s);\n' %
-                       (obj_name, wid, self.codegen.quote_str(tool.label),
-                        bmp1, bmp2, kind,
-                        self.codegen.quote_str(tool.short_help),
-                        self.codegen.quote_str(tool.long_help)))
 
-        append('%sRealize();\n' % obj_name)
+                if False: # tool.name:
+                    # assign to attribute
+                    self.codegen.classes[obj.parent].sub_objs.append( ('wxMenuItem',item.name) )
+                    assignment = '%s = '%tool.name
+                    if not id_access:
+                        id_access = "%s->GetId()"%tool.name
+                elif tool.handler and not id_access:
+                    # assignment to local variable to bind handler
+                    assignment = 'wxglade_tmp_tool = '
+                    id_access = 'wxglade_tmp_tool->GetId()'
+                    need_tmp = True
+                else:
+                    # no assignment necessary, as no handler defined
+                    assignment = ''
+
+                out.append('%s%sAddTool(%s, %s, %s, %s, %s, %s, %s);\n' %
+                            (assignment, obj_name, wid, self.codegen.quote_str(tool.label),
+                             bmp1, bmp2, kind,
+                             self.codegen.quote_str(tool.short_help),
+                             self.codegen.quote_str(tool.long_help)))
+
+                if tool.handler:
+                    handler = tool.handler if "::" in tool.handler else '%s::%s'%(obj.parent.klass, tool.handler)
+
+                    if self.codegen.for_version==(2,8):
+                        tmpl = 'Connect(%(id)s, wxEVT_TOOL, %(handler)s);\n'
+                    else:
+                        tmpl = 'Bind(wxEVT_MENU, &%(handler)s, this, %(id)s);\n'
+                    out.append( tmpl % {"id":id_access, "handler":handler} )
+        
+        if need_tmp:
+            out.insert(0, "wxToolBarToolBase *wxglade_tmp_tool;\n" )
 
         return out
 
@@ -249,26 +299,19 @@
         return ids
 
     def get_event_handlers(self, obj):
-        out = []
-
-        def do_get(tool):
-            ret = []
-            name, val = self.codegen.generate_code_id(None, tool.id)
-            if not val: val = '-1'  # but this is wrong anyway...
-            if tool.handler:
-                ret.append((val, 'EVT_TOOL', tool.handler, 'wxCommandEvent'))
-            return ret
+        ret = []
 
         for tool in obj.tools:
-            out.extend(do_get(tool))
-        return out
+            if not tool.handler: continue
+            # first item is None -> just generate stub for item.handler, do not bind again
+            ret.append( (None, 'EVT_TOOL', tool.handler, 'wxCommandEvent') )
 
+        return ret
 
 
 def initialize():
     klass = 'wxToolBar'
     common.class_names['EditToolBar'] = klass
-    common.toplevels['EditToolBar'] = 1
-    common.register('python', klass, PythonCodeGenerator(klass), 'tools')
-    common.register('C++',    klass, CppCodeGenerator(klass),    'tools')
-    common.register('XRC',    klass, xrc_code_generator,         'tools')
+    common.register('python', klass, PythonCodeGenerator(klass))
+    common.register('C++',    klass, CppCodeGenerator(klass))
+    common.register('XRC',    klass, xrc_code_generator)
diff -Nru wxglade-0.9.6/widgets/toolbar/lisp_codegen.py wxglade-1.0.1/widgets/toolbar/lisp_codegen.py
--- wxglade-0.9.6/widgets/toolbar/lisp_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/toolbar/lisp_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -35,7 +35,6 @@
 
         if obj.properties["separation"].is_active():
             append( '(wxToolBar_SetToolSeparation %s %s)\n' % (obj_name, obj.separation) )
-        append( '(wxToolBar_Realize %s)\n' % obj_name )
 
         return out
 
@@ -82,19 +81,23 @@
             style += "|wxTB_HORIZONTAL"
             style = self.cn_f(style)
 
-        parent = self.format_widget_access(obj.parent)
+        parent = self.format_widget_access(obj.parent_window)
         obj_name = self.codegen._format_name(obj.name)
-        init = [ '\n\t;;; Tool Bar\n',
+        init = [ ';;; Tool Bar\n',
                  '(setf (slot-%s obj) (wxToolBar_Create %s -1 -1 -1 -1 -1 %s))\n' % (obj_name, parent, style),
-                      '(wxFrame_SetToolBar (slot-top-window obj) (slot-%s obj))\n' % obj_name ]
-        init.extend(self.get_init_code(obj))
-        init.append(';;; Tool Bar end\n')
-        return init, self.get_properties_code(obj), []
+                ] + self.get_init_code(obj) + self.get_properties_code(obj) + [
+                 '(wxFrame_SetToolBar (slot-top-window obj) (slot-%s obj))\n' % obj_name,
+                 '(wxToolBar_Realize %s)\n' % self.format_widget_access(obj),
+                 ';;; Tool Bar end\n']
+        return init, []
+
+    def get_layout_code(self, obj):
+        obj_name = '(slot-%s obj)' % self.codegen._format_name(obj.name)
+        return ['(wxToolBar_Realize %s)\n' % obj_name]
 
 
 
 def initialize():
     klass = 'wxToolBar'
     common.class_names['EditToolBar'] = klass
-    common.toplevels['EditToolBar'] = 1
     common.register('lisp', klass, LispCodeGenerator(klass) )#, 'tools', ToolsHandler)
diff -Nru wxglade-0.9.6/widgets/toolbar/perl_codegen.py wxglade-1.0.1/widgets/toolbar/perl_codegen.py
--- wxglade-0.9.6/widgets/toolbar/perl_codegen.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/toolbar/perl_codegen.py	2020-12-31 14:04:48.000000000 +0000
@@ -35,7 +35,6 @@
 
         if obj.properties["separation"].is_active():
             append( '%s->SetToolSeparation(%s);\n' % (obj_name, obj.separation) )
-        append( '%s->Realize();\n' % obj_name )
 
         return out
 
@@ -82,23 +81,21 @@
         else:
             extra = ''
 
-        klass = obj.base
-        if klass != obj.klass:
-            klass = obj.klass
-        else:
-            klass = self.cn(klass)
+        klass = obj.get_instantiation_class(self.cn, self.cn_class)
+
+        init = ['\n', '# Tool Bar\n',
+                '$self->{%s} = %s->new($self, -1%s);\n' % (obj.name, klass, extra)
+                ] + self.get_init_code(obj) + self.get_properties_code(obj) + [
+                '$self->SetToolBar($self->{%s});\n' % obj.name,
+                '%s->Realize();\n' % self.format_widget_access(obj),
+                '# Tool Bar end\n' ]
+        return init, []
 
-        init.append( '\n')
-        init.append( '# Tool Bar\n')
-        init.append( '$self->{%s} = %s->new($self, -1%s);\n' % (obj.name, klass, extra) )
-        init.append( '$self->SetToolBar($self->{%s});\n' % obj.name )
-        init.extend( self.get_init_code(obj) )
-        init.append( '# Tool Bar end\n' )
-        return init, self.get_properties_code(obj), []
+    def get_layout_code(self, obj):
+        return ['%s->Realize();\n' % self.format_widget_access(obj)]
 
 
 def initialize():
     klass = 'wxToolBar'
     common.class_names['EditToolBar'] = klass
-    common.toplevels['EditToolBar'] = 1
-    common.register('perl', klass, PerlCodeGenerator(klass), 'tools')#, ToolsHandler)
+    common.register('perl', klass, PerlCodeGenerator(klass))
diff -Nru wxglade-0.9.6/widgets/toolbar/toolbar.py wxglade-1.0.1/widgets/toolbar/toolbar.py
--- wxglade-0.9.6/widgets/toolbar/toolbar.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/toolbar/toolbar.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,7 +3,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2017-2019 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -13,82 +13,61 @@
 
 import common, compat, config, misc
 import os, re
-from tree import Node
 from .tool import *
 import new_properties as np
 from edit_windows import EditBase, PreviewMixin, EditStylesMixin
 from gui_mixins import BitmapMixin
 from wcodegen.taghandler import BaseXmlBuilderTagHandler
 
+if compat.IS_CLASSIC:
+    from .ToolsDialog28 import ToolsDialog as _ToolsDialog
+else:
+    from .ToolsDialog import ToolsDialog as _ToolsDialog
 
-class ToolsDialog(wx.Dialog):
-    # initially based on MenuItemDialog; with more abstraction, e.g. columns
+class ToolsDialog(_ToolsDialog):
+    # _ToolsDialog is generated from res/ToolsDialog.wxg
     columns  = ["label","bitmap1","bitmap2","short_help","long_help","type","handler","id"]
-    column_widths = [180,180,     120,       120,        180,        50,     120,           50]
-    headers = ["Label","Primary Bitmap","Disabled Bitmap","Short Help","Long Help","Type","Event Handler","Id"]
     coltypes = {"type":int}
+    # these will be copied:
     default_item = ("item","","","","",0,"","")
     separator_item = ("---","---","---","---","",0,"","---")
-    control_names = columns
-    def __init__(self, parent, owner, items=None):
-        style = wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER|wx.WANTS_CHARS
-        wx.Dialog.__init__(self, parent, -1, _("Toolbar editor"), style=style)
-        self.create_gui()
-
-        self.Bind(wx.EVT_TEXT, self.on_label_edited, self.label)
-        self.Bind(wx.EVT_TEXT, self.on_event_handler_edited, self.handler)
-        self.Bind(wx.EVT_TEXT, self.on_help_str_edited, self.short_help)
-        self.Bind(wx.EVT_TEXT, self.on_long_help_str_edited, self.long_help)
-        self.Bind(wx.EVT_TEXT, self.on_id_edited, self.id)
-        self.Bind(wx.EVT_RADIOBOX, self.on_type_edited, self.type)
-
-        self.Bind(wx.EVT_BUTTON, self.move_item_up, self.move_up)
-        self.Bind(wx.EVT_BUTTON, self.move_item_down, self.move_down)
-        self.Bind(wx.EVT_BUTTON, self.add_item, self.add)
-        self.Bind(wx.EVT_BUTTON, self.remove_item, self.remove)
-        self.Bind(wx.EVT_BUTTON, self.add_separator, self.add_sep)
-        self.Bind(wx.EVT_BUTTON, self.on_cancel, self.cancel)
-        self.Bind(wx.EVT_BUTTON, self.on_OK, self.ok)
-        self.Bind(wx.EVT_BUTTON, self.select_bitmap1, self.bitmap1_button)
-        self.Bind(wx.EVT_BUTTON, self.select_bitmap2, self.bitmap2_button)
-        self.Bind(wx.EVT_TEXT, self.on_bitmap1_edited, self.bitmap1)
-        self.Bind(wx.EVT_TEXT, self.on_bitmap2_edited, self.bitmap2)
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.show_item, self.items)
 
-        self.Bind(wx.EVT_CHAR_HOOK, self.on_char)
-        self.remove.Bind(wx.EVT_CHAR_HOOK, self.on_button_char)  # to ignore the Enter key while the focus is on Remove
+    name_re = re.compile(r'^[a-zA-Z_]+[\w-]*(\[\w*\])*$')
+    handler_re = re.compile(r'^(([a-zA-Z_]+[a-zA-Z0-9_-]*)|()|(lambda .*))$')
 
-        self.owner = owner
-
-        # ALB 2004-09-26: workaround to make the scroll wheel work...
-        self.items.Bind(wx.EVT_MOUSEWHEEL, lambda e: e.Skip())
-        for c,col in enumerate(self.columns):
-            self.items.InsertColumn(c, _(col))
-            self.items.SetColumnWidth(c, self.column_widths[c])
-
-        self.SetSize( (900, 600) )
+    def __init__(self, parent, owner, items=None):
+        _ToolsDialog.__init__(self, parent)
 
-        import re
-        self.handler_re = self.name_re = re.compile(r'^[a-zA-Z_]+[\w-]*(\[\w*\])*$')
+        self.owner = owner
 
         self.selected_index = -1  # index of the selected element in the wx.ListCtrl menu_items
         self._ignore_events = False
 
-        # track focus
-        self._last_focus = None
-        for ctrl in (self.label, self.bitmap1, self.bitmap1, self.handler, self.short_help, self.long_help, self.id):
-            ctrl.Bind(wx.EVT_SET_FOCUS, self.on_focus)
-
         if items:
             self.add_items(items)
             self._select_item(0)
         else:
             self._enable_fields(False)
 
-    def on_focus(self, event):
-        # track focus
-        self._last_focus = event.GetEventObject()
-        event.Skip()
+        self.Bind(wx.EVT_CHAR_HOOK, self.on_char)
+        self.remove.Bind(wx.EVT_CHAR_HOOK, self.on_button_char)  # to ignore the Enter key while the focus is on Remove
+        self.items.Bind(wx.EVT_MOUSEWHEEL, lambda e: e.Skip())  # workaround to make the scroll wheel work...
+
+    def on_drop_files(self, screen_xy, ctrl, filenames):
+        # as this dialog is shown modal with the main window as parent,
+        # this method is called from the main window drop target
+        if ctrl is not self.bitmap1 and ctrl is not self.bitmap2: return False
+        
+        if not wx.GetKeyState(wx.WXK_ALT) and not wx.GetKeyState(wx.WXK_CONTROL):
+            # insert relative filename, if available and the filename is under the project directory
+            filenames = [misc.get_relative_path(filename) for filename in filenames]
+
+        if os.path.sep=="\\": filenames = [filename.replace("\\", "/") for filename in filenames]
+        if len(filenames)==1:
+            ctrl.SetValue(filenames[0])
+        else:
+            other_ctrl = self.bitmap2 if ctrl is self.bitmap1 else self.bitmap1
+            other_ctrl.SetValue(filenames[1])
 
     def on_char(self, event):
         # keyboard navigation: up/down arrows and also Tab on some buttons
@@ -102,19 +81,42 @@
                 event.Skip()
             return
 
-        if k==wx.WXK_RETURN:  # ignore Enter key
+        if k in (wx.WXK_DOWN, wx.WXK_UP) and focus is self.type:
+            event.Skip()
+            return
+
+        if event.AltDown():
+            if k==wx.WXK_RETURN or k==ord("O"):
+                self.EndModal(wx.ID_OK)
+                return
+            if k==ord("C"):
+                self.EndModal(wx.ID_CANCEL)
+                return
+
+        if event.ControlDown() and k==wx.WXK_RETURN:
+            self.EndModal(wx.ID_OK)
             return
+
+        if k==wx.WXK_RETURN:  # ignore Enter key except when editing an item in the list control
+            if not (self.items.EditControl and event.GetEventObject() is self.items.EditControl):
+                return
         if k==wx.WXK_DOWN:
             if event.AltDown():
                 self.move_item_down(event)
             else:
-                self._select_item(self.selected_index+1)
+                if self.selected_index+1 < self.items.GetItemCount():
+                    self._select_item(self.selected_index+1)
+                else:
+                    wx.Bell()
             return
         if k==wx.WXK_UP:
             if event.AltDown():
                 self.move_item_up(event)
             else:
-                self._select_item(self.selected_index-1)
+                if self.selected_index>0:
+                    self._select_item(self.selected_index-1)
+                else:
+                    wx.Bell()
             return
         event.Skip()
 
@@ -123,139 +125,54 @@
         if event.GetKeyCode() != wx.WXK_RETURN:
             event.Skip()
 
-    def create_gui(self):
-
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_6 = wx.BoxSizer(wx.VERTICAL)
-        grid_sizer = wx.FlexGridSizer(7, 2, 0, 0)
-        sizer_bitmap1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_bitmap2 = wx.BoxSizer(wx.HORIZONTAL)
-
-        # tool fields
-        self.label = wx.TextCtrl(self, wx.ID_ANY, "")
-        self.label_6 = wx.StaticText(self, wx.ID_ANY, "Label:")
-        grid_sizer.Add(self.label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        grid_sizer.Add(self.label, 1, wx.EXPAND, 0)
-
-        label_11 = wx.StaticText(self, wx.ID_ANY, "Primary Bitmap:")
-        grid_sizer.Add(label_11, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.bitmap1 = wx.TextCtrl(self, wx.ID_ANY, "")
-        sizer_bitmap1.Add(self.bitmap1, 1, 0, 0)
-        self.bitmap1_button = wx.Button(self, wx.ID_ANY, "...")
-        sizer_bitmap1.Add(self.bitmap1_button, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 0)
-        grid_sizer.Add(sizer_bitmap1, 1, wx.EXPAND, 0)
-
-        label_12 = wx.StaticText(self, wx.ID_ANY, "Disabled Bitmap:")
-        grid_sizer.Add(label_12, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.bitmap2 = wx.TextCtrl(self, wx.ID_ANY, "")
-        sizer_bitmap2.Add(self.bitmap2, 1, 0, 0)
-        self.bitmap2_button = wx.Button(self, wx.ID_ANY, "...")
-        sizer_bitmap2.Add(self.bitmap2_button, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 0)
-        grid_sizer.Add(sizer_bitmap2, 1, wx.EXPAND, 0)
-
-        self.label_7 = wx.StaticText(self, wx.ID_ANY, "Event Handler:")
-        grid_sizer.Add(self.label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.handler = wx.TextCtrl(self, wx.ID_ANY, "")
-        grid_sizer.Add(self.handler, 1, wx.EXPAND, 0)
-
-        self.label_9 = wx.StaticText(self, wx.ID_ANY, "Short Help:")
-        grid_sizer.Add(self.label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.short_help = wx.TextCtrl(self, wx.ID_ANY, "")
-        grid_sizer.Add(self.short_help, 1, wx.EXPAND, 0)
-
-        self.label_9b = wx.StaticText(self, wx.ID_ANY, "Long Help:")
-        grid_sizer.Add(self.label_9b, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.long_help = wx.TextCtrl(self, wx.ID_ANY, "")
-        grid_sizer.Add(self.long_help, 1, wx.EXPAND, 0)
-
-        self.label_10 = wx.StaticText(self, wx.ID_ANY, "ID:")
-        grid_sizer.Add(self.label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
-        self.id = wx.TextCtrl(self, wx.ID_ANY, "")
-        grid_sizer.Add(self.id, 0, 0, 0)
-        grid_sizer.AddGrowableCol(1)
-
-        sizer_5.Add(grid_sizer, 2, wx.EXPAND, 0)
-
-        self.type  = wx.RadioBox(self, wx.ID_ANY, "Type", choices=["Normal", "Checkable", "Radio"],
-                                       majorDimension=1, style=wx.RA_SPECIFY_COLS)
-        sizer_5.Add(self.type, 0, wx.ALL, 4)
-
-        sizer_5.Add((20, 20), 1, 0, 0)
-
-        # editor action buttons
-        self.move_up = wx.Button(self, wx.ID_ANY, "Up")
-        self.move_down = wx.Button(self, wx.ID_ANY, "Down")
-        self.add = wx.Button(self, wx.ID_ANY, "&Add")
-        self.remove = wx.Button(self, wx.ID_ANY, "&Remove")
-        self.add_sep = wx.Button(self, wx.ID_ANY, "Add Separator")
-        # dialog action buttons; these will be handled, instead of using stock OK/Cancel buttons
-        self.ok     = wx.Button(self, wx.ID_ANY, "OK")
-        self.cancel = wx.Button(self, wx.ID_ANY, "Cancel")
-
-        sizer_6.Add(self.ok, 0, wx.ALL, 5)
-        sizer_6.Add(self.cancel, 0, wx.ALL, 5)
-        sizer_5.Add(sizer_6, 0, wx.EXPAND, 0)
-        sizer_1.Add(sizer_5, 0, wx.EXPAND, 0)
-        sizer_2.Add(self.move_up, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
-        sizer_2.Add(self.move_down, 0, wx.BOTTOM | wx.RIGHT | wx.TOP, 8)
-        sizer_2.Add((20, 20), 1, 0, 0)
-        sizer_2.Add(self.add, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
-        sizer_2.Add(self.remove, 0, wx.BOTTOM | wx.TOP, 8)
-        sizer_2.Add(self.add_sep, 0, wx.ALL, 8)
-        sizer_2.Add((20, 20), 2, 0, 0)
-        sizer_1.Add(sizer_2, 0, wx.EXPAND, 0)
-
-        self.items = wx.ListCtrl(self, wx.ID_ANY, style=wx.BORDER_DEFAULT | wx.BORDER_SUNKEN | wx.LC_EDIT_LABELS | wx.LC_REPORT | wx.LC_SINGLE_SEL)
-        sizer_1.Add(self.items, 1, wx.EXPAND, 0)
-
-        self.SetSizer(sizer_1)
-        sizer_1.Fit(self)
-        self.Layout()
-
-        # end wxGlade
-    def _set_tooltips(self):
-        # set tooltips
-        for c in (self.label_6, self.label):
-            compat.SetToolTip(c, "The menu entry text;\nenter & for access keys (using ALT key)\nappend e.g. \\tCtrl-X for keyboard shortcut")
-        for c in (self.label_7, self.handler):
-            compat.SetToolTip(c, "Enter the name of an event handler method; this will be created as stub")
-        for c in (self.label_10, self.id):
-            compat.SetToolTip(c, "optional: enter wx ID")
-        for c in (self.label_9, self.short_help):
-            compat.SetToolTip(c , "This will be displayed as tooltip" )
-        for c in (self.label_9b, self.long_help):
-            compat.SetToolTip( c, "This will be displayed in the status bar" )
-        compat.SetToolTip( self.move_up, "Move selected item up" )
-        compat.SetToolTip( self.move_down, "Move selected item down" )
-        compat.SetToolTip( self.items, "For navigation use the mouse or the up/down arrows" )
-
-    def _enable_fields(self, enable=True):
-        for name in self.control_names:
-            control = getattr(self, name)
+    def _enable_fields(self, enable=True, clear=False):
+        if clear:
+            restore = self._ignore_events
+            self._ignore_events = True
+        for name in self.columns:
+            control = getattr(self, name, None)
+            if not control: continue
             control.Enable(enable)
+            if clear and isinstance(control, wx.TextCtrl): control.SetValue("")
 
-    def add_item(self, event):
-        "Event handler called when the Add button is clicked"
-        index = self.selected_index = self.selected_index + 1
+        self.bitmap1_button.Enable(enable)
+        self.bitmap2_button.Enable(enable)
+
+        if clear: self._ignore_events = restore
+
+    def _get_item_text(self, index, col):
+        if isinstance(col, str): col = self.columns.index(col)
+        return self.items.GetItem(index, col).GetText()
+
+    def _get_all_texts(self, index):
+        return [self._get_item_text(index, j) for j in range(len(self.columns))]
+
+    def _set_item_string(self, index, col, s):
+        if not isinstance(s, compat.unicode): s = misc.wxstr(s)
+        if isinstance(col, str): col = self.columns.index(col)
+        compat.ListCtrl_SetStringItem(self.items, index, col, s)
+    
+    def _insert_item_string(self, index, s):
+        if not isinstance(s, compat.unicode): s = misc.wxstr(s)
+        return compat.ListCtrl_InsertStringItem(self.items, index, s)
+
+    def _add_new_item(self, item):
+        # helper for the next two methods
+        index = self.selected_index + 1
         if not self.items.GetItemCount():
             self._enable_fields()
         if index < 0:
             index = self.items.GetItemCount()
-        item = list(self.default_item)
         self._insert_item(index, item)
         self._select_item(index, force=True)
 
+    def add_item(self, event):
+        "Event handler called when the Add button is clicked"
+        self._add_new_item( list(self.default_item) )
+
     def add_separator(self, event):
         "Event handler called when the Add Separator button is clicked"
-        index = self.selected_index + 1
-        if not self.items.GetItemCount():
-            self._enable_fields()
-        if index < 0:
-            index = self.items.GetItemCount()
-        self._insert_item(index, self.separator_item)
-        self._select_item(index, force=True)
+        self._add_new_item( self.separator_item )
 
     def show_item(self, event):
         "Event handler called when a menu item in the list is selected"
@@ -264,16 +181,25 @@
         event.Skip()
 
     def _select_item(self, index, force=False):
-        if index >= self.items.GetItemCount() or index<0 or (index==self.selected_index and not force): return
+        item_count = self.items.GetItemCount()
+        if index == -1 and item_count: index = 0
+        if index >= item_count and item_count: index = item_count-1
+        if index==self.selected_index and not force: return
+        self.selected_index = index
+        if index == -1:
+            self._enable_fields(False, clear=True)
+            self._enable_buttons()
+            return
+
         self._ignore_events = True
         self.items.Select(index)
-        self.selected_index = index
-        if self.items.GetItem(index, 2).GetText() != '---':
+
+        if self._get_item_text(index, "label") != '---':
             # skip if the selected item is a separator
             for i,colname in enumerate(self.columns):
                 s = getattr(self, colname)
                 coltype = self.coltypes.get(colname,None)
-                value = self.items.GetItem(index, i).GetText()
+                value = self._get_item_text(index, i)
                 if coltype is None:
                     # at this point, the value should be validated already
                     s.SetBackgroundColour( compat.wx_SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW) )
@@ -282,19 +208,11 @@
                     s.SetSelection( int(value) )
             self.label.SetValue(self.label.GetValue().lstrip())
             self._enable_fields(True)
-            # set focus to text field again
-            focus = self.FindFocus()
-            if not isinstance(focus, wx.TextCtrl) and isinstance(self._last_focus, wx.TextCtrl):
-                self._last_focus.SetFocus()
-        else:
-            for c in (self.label, self.handler, self.long_help, self.short_help, self.id,
-                      self.bitmap1, self.bitmap2):
-                c.SetValue("")
-            self._enable_fields(False)
+        else:
+            self._enable_fields(False, clear=True)
         self._enable_buttons()
-        if force:
-            self.label.SetFocus()
-            self.label.SelectAll()
+        state = wx.LIST_STATE_SELECTED | wx.LIST_STATE_FOCUSED
+        self.items.SetItemState(index, state, state)  # fix bug 698071
 
     def _enable_buttons(self):
         # activate the left/right/up/down buttons
@@ -302,12 +220,13 @@
         item_count = self.items.GetItemCount()
         self.move_up.Enable( index>0 )
         self.move_down.Enable( index<item_count-1 )
+        self.remove.Enable(item_count)
         self._ignore_events = False
 
     def on_label_edited(self, event):
         if not self._ignore_events:
             value = self.label.GetValue().lstrip()
-            compat.ListCtrl_SetStringItem(self.items, self.selected_index, self.columns.index("label"), value)
+            self._set_item_string(self.selected_index, "label", value)
         event.Skip()
 
     def on_event_handler_edited(self, event):
@@ -319,14 +238,11 @@
             self.handler.SetBackgroundColour(wx.RED)
             valid = False
         self.handler.Refresh()
-        if valid and not self._ignore_events:
-            compat.ListCtrl_SetStringItem(self.items, self.selected_index, self.columns.index("handler"), value)
-        event.Skip()
+        self._on_edited(event, "handler", value, valid)
 
-    def _on_edited(self, event, colname, value):
-        if not self._ignore_events:
-            idx = self.columns.index(colname)
-            compat.ListCtrl_SetStringItem(self.items, self.selected_index, idx, value)
+    def _on_edited(self, event, colname, value, valid=True):
+        if valid and not self._ignore_events:
+            self._set_item_string(self.selected_index, colname, value)
         event.Skip()
 
     def on_type_edited(self, event):
@@ -350,30 +266,21 @@
     def remove_item(self, event):
         "Event handler called when the Remove button is clicked"
         if self.selected_index < 0: return
-        index = self.selected_index+1
-        for s in (self.label, self.bitmap1, self.bitmap2, self.id, self.label,
-                  self.short_help, self.long_help, self.handler):
-            s.SetValue("")
-        self.type.SetSelection(0)
         self.items.DeleteItem(self.selected_index)
-        if not self.items.GetItemCount():
-            self._enable_fields(False)
-        self.selected_index -= 1
-        self.items.Select(self.selected_index)
+        self._select_item(self.selected_index-1, force=True)
 
     def _insert_item(self, index, item):
-        compat.ListCtrl_InsertStringItem(self.items, index, item[0])
+        self._insert_item_string(index, item[0])
         for col, value in enumerate(item):
             if col==0: continue
-            compat.ListCtrl_SetStringItem(self.items, index, col, compat.unicode(value))
+            self._set_item_string(index, col, value)
         # fix bug 698074
         self.items.SetItemState(index, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED)
 
     def _get_item(self, index):
         ret = []
-        for c,colname in enumerate(self.columns):
-            col = self.columns.index(colname)
-            value = self.items.GetItem(index, col).GetText()
+        for colname in self.columns:
+            value = self._get_item_text(index, colname)
             if colname in self.coltypes:
                 value = self.coltypes[colname](value)
             ret.append(value)
@@ -398,33 +305,23 @@
     def move_item_up(self, event):
         "moves the selected menu item before the previous one at the same level in self.items"
         self._do_move_item(event, self.selected_index, False)
-        state = wx.LIST_STATE_SELECTED | wx.LIST_STATE_FOCUSED
-        self.items.SetItemState(self.selected_index, state, state)
 
     def _do_move_item(self, event, index, is_down):
         """internal function used by move_item_up and move_item_down.
         Returns the new index of the moved item, or None if no change occurred"""
-        self.items.SetFocus()
-        #index = self.selected_index
         i = index+1 if is_down else index-1
-        if i < 0 or i>=self.items.GetItemCount(): return None
+        if i < 0 or i>=self.items.GetItemCount():
+            wx.Bell()
+            return None
 
-        def get(i, j): return self.items.GetItem(i, j).GetText()
-        item = [get(index, j) for j in range(6)]
+        item = self._get_all_texts(index)
         self.items.DeleteItem(index)
-        compat.ListCtrl_InsertStringItem(self.items, i, item[0])
-        for col,content in enumerate(item):
-            if col==0: continue
-            compat.ListCtrl_SetStringItem(self.items, i,col, content)
+        self._insert_item(i, item)
         self._select_item(i, force=True)
 
     def move_item_down(self, event):
         "moves the selected menu item after the next one at the same level in self.items"
         self._do_move_item(event, self.selected_index, True)
-        ## fix bug 698071
-        #state = wx.LIST_STATE_SELECTED | wx.LIST_STATE_FOCUSED
-        #self.items.SetItemState(self.selected_index, state, state)
-
 
     def _select_bitmap(self, event, colname, title):
         control = getattr(self, colname)
@@ -436,16 +333,37 @@
         elif directory and os.path.isdir(directory[0]):
             current = directory[1]
             directory = directory [0]
-        elif common.app_tree.app.filename:
+        elif common.root.filename:
             #directory = self.startDirectory
-            directory = common.app_tree.app.filename
+            directory = common.root.filename
             current = ""
         else:
             directory = ""
-        value = wx.FileSelector(_(title), directory, current, wildcard="*.*", flags=wx.FD_OPEN)
+        value = misc.RelativeFileSelector(title, directory, current, wildcard="*.*", flags=wx.FD_OPEN)
         if value:
             control.SetValue(value)
 
+    def select_bitmap1_art(self, event):
+        # select wxART... standard bitmaps
+        if compat.IS_CLASSIC:
+            import _dialogs28 as _dialogs
+        else:
+            import _dialogs
+        dlg = _dialogs.SelectArtDialog(self)
+        if hasattr(self, "_last_ART_size"):
+            dlg.spin_width.SetValue(self._last_ART_size[0])
+            dlg.spin_height.SetValue(self._last_ART_size[1])
+        user = dlg.ShowModal()
+        if user!=wx.ID_OK: return
+        width, height = self._last_ART_size = dlg.spin_width.GetValue(), dlg.spin_height.GetValue()
+        art_index = dlg.listctrl.GetFirstSelected()
+        if art_index==-1: return
+        art_name = dlg.art_names[art_index]
+        self.bitmap1.SetValue("art:wxART_%s,wxART_TOOLBAR,%d,%d"%(art_name, width, height))
+        label = self.label.GetValue()
+        if not label.strip() or label=="item":
+            self.label.SetValue(art_name.replace("_"," ").capitalize())
+
     def select_bitmap1(self, event):
         self._select_bitmap(event, "bitmap1", 'Primary Bitmap')
 
@@ -455,6 +373,7 @@
     # the action buttons are not linked to ESC and Enter to avoid accidental modifications
     def on_cancel(self, event):
         self.EndModal(wx.ID_CANCEL)
+
     def on_OK(self, event):
         self.EndModal(wx.ID_OK)
 
@@ -465,7 +384,6 @@
 
     def __init__(self):
         np.Property.__init__(self, [])
-        self.tools = {}
 
     def create_editor(self, panel, sizer):
         self.edit_btn = wx.Button(panel, -1, _("Edit tools..."))
@@ -479,7 +397,7 @@
             parent = self.owner.widget.GetTopLevelParent()
         else:
             parent = None
-        dialog = ToolsDialog( parent, self.owner, items=self.value )
+        dialog = ToolsDialog( common.main, self.owner, items=self.value )
         if not self.value: dialog.add_item(None)
         with misc.disable_stay_on_top(common.adding_window or parent):
             res = dialog.ShowModal()
@@ -521,8 +439,7 @@
         if name == 'tool':
             self.tools.append(self.curr_tool)
         if name == 'tools':
-            self.owner.properties["tools"].set(self.tools)
-            self.owner.properties_changed(["tools"])
+            self.owner.properties["tools"].load(self.tools)
             return True
 
     def char_data(self, data):
@@ -536,40 +453,34 @@
 class EditToolBar(EditBase, PreviewMixin, EditStylesMixin, BitmapMixin):
     "Class to handle wxToolBar objects"
 
-    _PROPERTIES = ["Widget", "bitmapsize", "margins", "packing", "separation", "style", "tools", "preview"]
+    WX_CLASS = 'wxToolBar'
+    IS_TOPLEVEL = False
+    _PROPERTIES = ["Widget", "bitmapsize", "margins", "packing", "separation", "style", "tools"]
     PROPERTIES = EditBase.PROPERTIES + _PROPERTIES + EditBase.EXTRA_PROPERTIES
+    CHILDREN = 0
 
-    def __init__(self, name, klass, parent):
-        custom_class = parent is None
-        EditBase.__init__( self, name, 'wxToolBar', parent, wx.NewId(), custom_class=custom_class )
+    def __init__(self, name, parent):
+        EditBase.__init__( self, name, parent, "_toolbar" )
         EditStylesMixin.__init__(self)
+        self._init_properties()
+        self.parent.properties["toolbar"].set(True, notify=False)
 
-        # initialise instance properties
+    def _init_properties(self):
+        self.tools = ToolsProperty()  # incl. the Edit button
         self.bitmapsize = np.IntPairPropertyD('16, 15', default_value='16, 15')
         self.margins    = np.IntPairPropertyD('0, 0',   default_value='0, 0')
         self.packing    = np.SpinPropertyD(1, val_range=(0,100), default_value=1, immediate=True)
         self.separation = np.SpinPropertyD(5, val_range=(0,100), default_value=5, immediate=True)
-        self.tools = ToolsProperty()  # incl. the Edit button
 
         self.window_id = None  # just a dummy for code generation
 
         self.widget = self._tb = None  # a panel and the actual ToolBar
 
-        if not self.parent:
-            PreviewMixin.__init__(self)  # add a preview button
-            self._is_toplevel = True
-        else:
-            self.preview = None
-            self._is_toplevel = False
-
     def create_widget(self):
-        tb_style = wx.TB_HORIZONTAL | self.style
+        tb_style = self.style
         if wx.Platform == '__WXGTK__':
             tb_style |= wx.TB_DOCKABLE | wx.TB_FLAT
-        if self.parent:
-            self.widget = self._tb = wx.ToolBar(self.parent.widget, -1, style=tb_style)
-            self.parent.widget.SetToolBar(self.widget)
-        else:
+        if self.IS_TOPLEVEL:
             # "top-level" toolbar
             self.widget = wx.Frame(None, -1, misc.design_title(self.name))
             self.widget.SetClientSize((400, 30))
@@ -577,7 +488,7 @@
             self.widget.SetToolBar(self._tb)
             self.widget.SetBackgroundColour(self.widget.GetBackgroundColour())
             icon = compat.wx_EmptyIcon()
-            xpm = os.path.join(config.icons_path, 'toolbar.xpm')
+            xpm = os.path.join(config.icons_path, 'toolbar.png')
             icon.CopyFromBitmap(misc.get_xpm_bitmap(xpm))
             self.widget.SetIcon(icon)
             self.widget.Bind(wx.EVT_CLOSE, lambda e: self.hide_widget())
@@ -586,6 +497,11 @@
                 # MSW isn't smart enough to avoid overlapping windows, so
                 # at least move it away from the 3 wxGlade frames
                 self.widget.CenterOnScreen()
+        else:
+            # toolbar for a Frame
+            self.widget = self._tb = wx.ToolBar(self.parent.widget, -1, style=tb_style)
+            self.parent.widget.SetToolBar(self.widget)
+
         self.widget.Bind(wx.EVT_LEFT_DOWN, self.on_set_focus)
 
         # set the various property values
@@ -652,37 +568,33 @@
     def _refresh_widget(self):
         self._tb.Realize()
         self._tb.SetSize((-1, self._tb.GetBestSize()[1]))
-        if self.parent:
-            widget = self.parent.widget
-            w, h = widget.GetClientSize()
-            widget.SetClientSize((w, h+1))
-            widget.SetClientSize((w, h))
-        else:
+        if self.IS_TOPLEVEL:
             widget = self.widget
             w = widget.GetClientSize()[0]
             h = self.widget.GetSize()[1] // 2
             widget.SetClientSize((w, h))
-    ####################################################################################################################
 
-    def remove(self, *args, **kwds):
-        if self.parent is not None:
-            self.parent.properties['toolbar'].set(False)
-            self.parent._toolbar = None
-            if kwds.get('do_nothing', False):
-                # this probably leaks memory, but avoids segfaults
-                self.widget = None
-            else:
-                if self.parent.widget:
-                    self.parent.widget.SetToolBar(None)
-        else:
-            if self.widget:
-                compat.DestroyLater(self.widget)
-                self.widget = None
+    def destroy_widget(self, level):
+        # if parent is being deleted, we rely on this being destroyed
+        if level==0 and not self.IS_TOPLEVEL and self.parent.widget:
+            self.parent.widget.SetToolBar(None)
+        if level==0:
+            EditBase.destroy_widget(self, level)
+
+    def hide_widget(self, *args):
+        if self.widget and self.widget is not self._tb:
+            self.widget.Hide()
+            common.app_tree.Collapse(self.item)
+            common.app_tree.select_item(self.parent)
+
+    def remove(self):
         EditBase.remove(self)
+        if 'toolbar' in self.parent.properties:
+            self.parent.properties['toolbar'].set(False)
 
+    ####################################################################################################################
     def popup_menu(self, event, pos=None):
-        if self.parent is not None:
-            return  # do nothing in this case
+        if not self.IS_TOPLEVEL: return
         super(EditToolBar, self).popup_menu(event, pos)
 
     def _create_popup_menu(self, widget):
@@ -707,101 +619,120 @@
 
         return menu
 
-    def hide_widget(self, *args):
-        if self.widget and self.widget is not self._tb:
-            self.widget.Hide()
-            common.app_tree.expand(self.node, False)
-            common.app_tree.select_item(self.node.parent)
-            #common.app_tree.app.show_properties()
-
     def get_property_handler(self, name):
         if name == 'tools':
             return ToolsHandler(self)
         return None
-    
-    def properties_changed(self, modified):
+
+    def _properties_changed(self, modified, actions):
+        if modified and "style" in modified:
+            actions.add("recreate_parent")
+            return
+        
         if not modified or "name" in modified and self.widget is not self._tb:
             self.widget.SetTitle(misc.design_title(misc.wxstr(self.name)))
-        refresh = False
+
         if not modified or "margins" in modified and self._tb:
             self._set_margins()
-            refresh = True
+            actions.add("refresh")
         if not modified or "bitmapsize" in modified and self._tb:
             self._set_bitmapsize()
-            refresh = True
+            actions.add("refresh")
         if not modified or "packing" in modified and self._tb:
             self._set_packing()
-            refresh = True
+            actions.add("refresh")
         if not modified or "separation" in modified and self._tb:
             self._set_separation()
-            refresh = True
+            actions.add("refresh")
         if not modified or "tools" in modified and self._tb:
             self._set_tools()
-            refresh = True
+            actions.add("refresh")
 
-        EditStylesMixin.properties_changed(self, modified)
-        if refresh: self._refresh_widget()
+        EditStylesMixin._properties_changed(self, modified, actions)
+        EditBase._properties_changed(self, modified, actions)
 
-        EditBase.properties_changed(self, modified)
+    def properties_changed(self, modified):
+        actions = EditBase.properties_changed(self, modified)
+        # widget properties modified; trigger updates
+        if self.widget:
+            if config.debugging: print("Actions", actions)
+            if "recreate_parent" in actions:
+                self.parent.recreate_widget2()
+        return actions
 
-    def check_compatibility(self, widget, typename=None, report=False):
+    def check_compatibility(self, widget, typename=None):
         return (False,"No pasting possible here.")
     def check_drop_compatibility(self):
         return (False,"Use toolbar editor: Properties -> Edit tools...")
 
 
+class EditTopLevelToolBar(EditToolBar, PreviewMixin):
+    WXG_BASE = "EditToolBar"
+    IS_TOPLEVEL = True
+    PROPERTIES = EditToolBar.PROPERTIES[:]
+    np.insert_after(PROPERTIES, "name", "class")
+    np.insert_after(PROPERTIES, "tools", "preview")
+    TREE_ICON = "EditMenuBar"
 
+    def __init__(self, name, parent, klass):
+        EditBase.__init__( self, name, parent, None, klass )
+        EditStylesMixin.__init__(self)
+        self._init_properties()
+        PreviewMixin.__init__(self)  # add a preview button
 
-def builder(parent, sizer, pos):
-    "factory function for EditToolBar objects"
-    import window_dialog as wd
-    klass = 'wxToolBar' if common.app_tree.app.language.lower()=='xrc' else 'MyToolBar'
+    def show_widget(self):
+        if not self.widget: self.create()
+        self.widget.Show()
 
-    # if e.g. on a frame, suggest the user to add the tool bar to this
-    toplevel_widget = None
-    if misc.focused_widget is not None and misc.focused_widget.node.parent:
-        toplevel_widget = common.app_tree._find_toplevel(misc.focused_widget.node).widget
-        if not "toolbar" in toplevel_widget.properties:
-            toplevel_widget = None
-    if toplevel_widget is not None:
-        dialog = wd.StandaloneOrChildDialog(klass, "Select toolbar type and class", toplevel_widget, "toolbar")
+
+def builder(parent, index, klass=None):
+    "factory function for EditToolBar objects"
+    if klass is None:
+        import window_dialog as wd
+        klass = 'wxToolBar' if common.root.language.lower()=='xrc' else 'MyToolBar'
+    
+        # if e.g. on a frame, suggest the user to add the tool bar to this
+        toplevel_widget = None
+        if misc.focused_widget is not None and not misc.focused_widget.IS_ROOT:
+            toplevel_widget = misc.focused_widget.toplevel_parent
+            if not "toolbar" in toplevel_widget.properties: toplevel_widget = None
+        if toplevel_widget is not None:
+            dialog = wd.StandaloneOrChildDialog(klass, "Select toolbar type and class", toplevel_widget, "toolbar")
+        else:
+            dialog = wd.WindowDialog(klass, None, 'Select standalone toolbar class', True)
+    
+        klass = dialog.show()
+        dialog.Destroy()
+        if klass is None: return None
     else:
-        dialog = wd.WindowDialog(klass, None, 'Select standalone toolbar class', True)
+        # allow to call builder(frame, None, True)
+        toplevel_widget = parent
 
-    klass = dialog.show()
-    dialog.Destroy()
-    if klass is None: return
-    if klass is True:
-        # add to toplevel widget
-        toplevel_widget.properties["toolbar"].set(True, notify=True)
-        return
-    name = dialog.get_next_name("toolbar")
-    with parent and parent.frozen() or misc.dummy_contextmanager():
-        tb = EditToolBar(name, klass, parent)
-        tb.node = Node(tb)
-        common.app_tree.add(tb.node)
-        if parent and parent.widget: tb.create()
+    if index=="_toolbar" or klass is True:
+        # add to frame
+        editor = EditToolBar(toplevel_widget.name+"_toolbar", toplevel_widget)
+        if toplevel_widget.widget: editor.create()
+        return editor
 
+    # a standalone toolbar
+    name = dialog.get_next_name("toolbar")
+    editor = EditTopLevelToolBar(name, parent, klass)
+    editor.create()
+    editor.widget.Show()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory to build EditToolBar objects from a XML file"
-    name = attrs.get('name')
-    if parent is not None:
-        if name:
-            parent._toolbar.properties["name"].set(name)
-            parent._toolbar.properties_changed(["name"])
-        return parent._toolbar
-    else:
-        tb = EditToolBar(name, attrs.get('class', 'wxToolBar'), None)
-        tb.node = Node(tb)
-        common.app_tree.add(tb.node)
-        return tb
+    if parent.IS_ROOT:
+        return EditTopLevelToolBar(name, parent, "ToolBar")
+    return EditToolBar(name, parent)
 
 
 def initialize():
     "initialization function for the module: returns a wxBitmapButton to be added to the main palette"
+    common.widget_classes['EditToolBar'] = EditToolBar
     common.widgets_from_xml['EditToolBar'] = xml_builder
     common.widgets['EditToolBar'] = builder
 
-    return common.make_object_button('EditToolBar', 'toolbar.xpm', 1)
+    return common.make_object_button('EditToolBar', 'toolbar.png', 1)
diff -Nru wxglade-0.9.6/widgets/toolbar/ToolsDialog28.py wxglade-1.0.1/widgets/toolbar/ToolsDialog28.py
--- wxglade-0.9.6/widgets/toolbar/ToolsDialog28.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/widgets/toolbar/ToolsDialog28.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,255 @@
+# -*- coding: CP1252 -*-
+#
+# generated by wxGlade 1.0.0a8 on Sun Oct  4 20:06:14 2020
+#
+
+import wx
+
+
+
+
+class ToolsDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetSize((900, 600))
+        self.SetTitle("Toolbar Editor")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_5, 0, wx.EXPAND, 0)
+
+        grid_sizer = wx.FlexGridSizer(7, 2, 0, 0)
+        sizer_5.Add(grid_sizer, 3, wx.EXPAND, 0)
+
+        self.label_6 = wx.StaticText(self, wx.ID_ANY, "Label:")
+        self.label_6.SetToolTipString("The menu entry text;\nenter & for access keys (using ALT key)\nappend e.g. \\\\tCtrl-X for keyboard shortcut")
+        grid_sizer.Add(self.label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.label = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.label.SetToolTipString("The menu entry text;\nenter & for access keys (using ALT key)\nappend e.g. \\\\tCtrl-X for keyboard shortcut")
+        grid_sizer.Add(self.label, 1, wx.EXPAND, 0)
+
+        label_11 = wx.StaticText(self, wx.ID_ANY, "Primary Bitmap:")
+        grid_sizer.Add(label_11, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        sizer_primary_bitmap = wx.BoxSizer(wx.HORIZONTAL)
+        grid_sizer.Add(sizer_primary_bitmap, 1, wx.EXPAND, 0)
+
+        self.bitmap1 = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.bitmap1.SetToolTipString("If the bitmap should be loaded from a file, use the \"...\" button or just\ndrop a file on the text field.\nWhen dropping a file from inside the project directory, a relative path is\nentered unless you hold the ALT or CTRL key.")
+        sizer_primary_bitmap.Add(self.bitmap1, 1, 0, 0)
+
+        self.bitmap1_button_ART = wx.Button(self, wx.ID_ANY, "A")
+        self.bitmap1_button_ART.SetMinSize((20, -1))
+        self.bitmap1_button_ART.SetToolTipString("Select standard art")
+        sizer_primary_bitmap.Add(self.bitmap1_button_ART, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 0)
+
+        self.bitmap1_button = wx.Button(self, wx.ID_ANY, "...")
+        sizer_primary_bitmap.Add(self.bitmap1_button, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 0)
+
+        label_12 = wx.StaticText(self, wx.ID_ANY, "Disabled Bitmap:")
+        grid_sizer.Add(label_12, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        sizer_primary_bitmap = wx.BoxSizer(wx.HORIZONTAL)
+        grid_sizer.Add(sizer_primary_bitmap, 1, wx.EXPAND, 0)
+
+        self.bitmap2 = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.bitmap2.SetToolTipString("If the bitmap should be loaded from a file, use the \"...\" button or just\ndrop a file on the text field.\nWhen dropping a file from inside the project directory, a relative path is\nentered unless you hold the ALT or CTRL key.")
+        sizer_primary_bitmap.Add(self.bitmap2, 1, 0, 0)
+
+        self.bitmap2_button = wx.Button(self, wx.ID_ANY, "...")
+        sizer_primary_bitmap.Add(self.bitmap2_button, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 0)
+
+        self.label_7 = wx.StaticText(self, wx.ID_ANY, "Event Handler:")
+        self.label_7.SetToolTipString("Enter the name of an event handler method; this will be created as stub")
+        grid_sizer.Add(self.label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.handler = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.handler.SetToolTipString("Enter the name of an event handler method; this will be created as stub")
+        grid_sizer.Add(self.handler, 1, wx.EXPAND, 0)
+
+        self.label_9 = wx.StaticText(self, wx.ID_ANY, "Short Help:")
+        self.label_9.SetToolTipString("This will be displayed as tooltip")
+        grid_sizer.Add(self.label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.short_help = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.short_help.SetToolTipString("This will be displayed as tooltip")
+        grid_sizer.Add(self.short_help, 1, wx.EXPAND, 0)
+
+        label_13 = wx.StaticText(self, wx.ID_ANY, "Long Help:")
+        label_13.SetToolTipString("This will be displayed in the status bar")
+        grid_sizer.Add(label_13, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.long_help = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.long_help.SetToolTipString("This will be displayed in the status bar")
+        grid_sizer.Add(self.long_help, 1, wx.EXPAND, 0)
+
+        self.label_10 = wx.StaticText(self, wx.ID_ANY, "ID:")
+        self.label_10.SetToolTipString("optional: enter wx ID")
+        grid_sizer.Add(self.label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.id = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.id.SetToolTipString("optional: enter wx ID")
+        grid_sizer.Add(self.id, 0, 0, 0)
+
+        self.type = wx.RadioBox(self, wx.ID_ANY, "Type", choices=["Normal", "Checkable", "Radio"], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        self.type.SetSelection(0)
+        sizer_5.Add(self.type, 0, wx.ALL, 4)
+
+        sizer_5.Add((20, 20), 1, wx.EXPAND, 0)
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+        sizer_5.Add(sizer_6, 0, wx.EXPAND, 0)
+
+        self.ok = wx.Button(self, wx.ID_OK, "&OK")
+        self.ok.SetToolTipString("Alt+O or Alt+Enter or Ctrl+Enter")
+        sizer_6.Add(self.ok, 0, wx.ALL, 5)
+
+        self.cancel = wx.Button(self, wx.ID_CANCEL, "&Cancel")
+        self.cancel.SetToolTipString("Alt+C or Alt+F4")
+        sizer_6.Add(self.cancel, 0, wx.ALL, 5)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_2, 0, wx.EXPAND, 0)
+
+        self.move_up = wx.Button(self, wx.ID_ANY, "Up")
+        self.move_up.SetToolTipString("Move selected item up (Alt-Up)")
+        sizer_2.Add(self.move_up, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
+
+        self.move_down = wx.Button(self, wx.ID_ANY, "Down")
+        self.move_down.SetToolTipString("Move selected item down (Alt-Down)")
+        sizer_2.Add(self.move_down, 0, wx.BOTTOM | wx.RIGHT | wx.TOP, 8)
+
+        sizer_2.Add((20, 20), 1, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.add = wx.Button(self, wx.ID_ANY, "&Add")
+        self.add.SetToolTipString("Alt+A")
+        sizer_2.Add(self.add, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
+
+        self.remove = wx.Button(self, wx.ID_ANY, "&Remove")
+        self.remove.SetToolTipString("Alt+R")
+        sizer_2.Add(self.remove, 0, wx.BOTTOM | wx.TOP, 8)
+
+        self.add_sep = wx.Button(self, wx.ID_ANY, "Add &Separator")
+        self.add_sep.SetToolTipString("Alt+S")
+        sizer_2.Add(self.add_sep, 0, wx.ALL, 8)
+
+        sizer_2.Add((20, 20), 2, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.items = wx.ListCtrl(self, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_EDIT_LABELS | wx.LC_REPORT | wx.LC_SINGLE_SEL)
+        self.items.SetToolTipString("For navigation use the mouse or the up/down arrows")
+        self.items.InsertColumn(0, "Label", format=wx.LIST_FORMAT_LEFT, width=180)
+        self.items.InsertColumn(1, "Primary Bitmap", format=wx.LIST_FORMAT_LEFT, width=180)
+        self.items.InsertColumn(2, "Disabled Bitmap", format=wx.LIST_FORMAT_LEFT, width=120)
+        self.items.InsertColumn(3, "Short Help", format=wx.LIST_FORMAT_LEFT, width=120)
+        self.items.InsertColumn(4, "Long Help", format=wx.LIST_FORMAT_LEFT, width=180)
+        self.items.InsertColumn(5, "Type", format=wx.LIST_FORMAT_LEFT, width=50)
+        self.items.InsertColumn(6, "Event Handler", format=wx.LIST_FORMAT_LEFT, width=120)
+        self.items.InsertColumn(7, "Id", format=wx.LIST_FORMAT_LEFT, width=50)
+        sizer_1.Add(self.items, 1, wx.EXPAND, 0)
+
+        grid_sizer.AddGrowableCol(1)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+
+        self.Bind(wx.EVT_TEXT, self.on_label_edited, self.label)
+        self.Bind(wx.EVT_TEXT, self.on_bitmap1_edited, self.bitmap1)
+        self.Bind(wx.EVT_BUTTON, self.select_bitmap1_art, self.bitmap1_button_ART)
+        self.Bind(wx.EVT_BUTTON, self.select_bitmap1, self.bitmap1_button)
+        self.Bind(wx.EVT_TEXT, self.on_bitmap2_edited, self.bitmap2)
+        self.Bind(wx.EVT_BUTTON, self.select_bitmap2, self.bitmap2_button)
+        self.Bind(wx.EVT_TEXT, self.on_event_handler_edited, self.handler)
+        self.Bind(wx.EVT_TEXT, self.on_help_str_edited, self.short_help)
+        self.Bind(wx.EVT_TEXT, self.on_long_help_str_edited, self.long_help)
+        self.Bind(wx.EVT_TEXT, self.on_id_edited, self.id)
+        self.Bind(wx.EVT_RADIOBOX, self.on_type_edited, self.type)
+        self.Bind(wx.EVT_BUTTON, self.on_OK, self.ok)
+        self.Bind(wx.EVT_BUTTON, self.on_cancel, self.cancel)
+        self.Bind(wx.EVT_BUTTON, self.move_item_up, self.move_up)
+        self.Bind(wx.EVT_BUTTON, self.move_item_down, self.move_down)
+        self.Bind(wx.EVT_BUTTON, self.add_item, self.add)
+        self.Bind(wx.EVT_BUTTON, self.remove_item, self.remove)
+        self.Bind(wx.EVT_BUTTON, self.add_separator, self.add_sep)
+        self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.on_label_edited, self.items)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.show_item, self.items)
+
+    def on_label_edited(self, event):
+        print("Event handler 'on_label_edited' not implemented!")
+        event.Skip()
+
+    def on_bitmap1_edited(self, event):
+        print("Event handler 'on_bitmap1_edited' not implemented!")
+        event.Skip()
+
+    def select_bitmap1_art(self, event):
+        print("Event handler 'select_bitmap1_art' not implemented!")
+        event.Skip()
+
+    def select_bitmap1(self, event):
+        print("Event handler 'select_bitmap1' not implemented!")
+        event.Skip()
+
+    def on_bitmap2_edited(self, event):
+        print("Event handler 'on_bitmap2_edited' not implemented!")
+        event.Skip()
+
+    def select_bitmap2(self, event):
+        print("Event handler 'select_bitmap2' not implemented!")
+        event.Skip()
+
+    def on_event_handler_edited(self, event):
+        print("Event handler 'on_event_handler_edited' not implemented!")
+        event.Skip()
+
+    def on_help_str_edited(self, event):
+        print("Event handler 'on_help_str_edited' not implemented!")
+        event.Skip()
+
+    def on_long_help_str_edited(self, event):
+        print("Event handler 'on_long_help_str_edited' not implemented!")
+        event.Skip()
+
+    def on_id_edited(self, event):
+        print("Event handler 'on_id_edited' not implemented!")
+        event.Skip()
+
+    def on_type_edited(self, event):
+        print("Event handler 'on_type_edited' not implemented!")
+        event.Skip()
+
+    def on_OK(self, event):
+        print("Event handler 'on_OK' not implemented!")
+        event.Skip()
+
+    def on_cancel(self, event):
+        print("Event handler 'on_cancel' not implemented!")
+        event.Skip()
+
+    def move_item_up(self, event):
+        print("Event handler 'move_item_up' not implemented!")
+        event.Skip()
+
+    def move_item_down(self, event):
+        print("Event handler 'move_item_down' not implemented!")
+        event.Skip()
+
+    def add_item(self, event):
+        print("Event handler 'add_item' not implemented!")
+        event.Skip()
+
+    def remove_item(self, event):
+        print("Event handler 'remove_item' not implemented!")
+        event.Skip()
+
+    def add_separator(self, event):
+        print("Event handler 'add_separator' not implemented!")
+        event.Skip()
+
+    def show_item(self, event):
+        print("Event handler 'show_item' not implemented!")
+        event.Skip()
+
diff -Nru wxglade-0.9.6/widgets/toolbar/ToolsDialog.py wxglade-1.0.1/widgets/toolbar/ToolsDialog.py
--- wxglade-0.9.6/widgets/toolbar/ToolsDialog.py	1970-01-01 00:00:00.000000000 +0000
+++ wxglade-1.0.1/widgets/toolbar/ToolsDialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -0,0 +1,255 @@
+# -*- coding: CP1252 -*-
+#
+# generated by wxGlade 1.0.0a8 on Sun Oct  4 20:06:05 2020
+#
+
+import wx
+
+
+
+
+class ToolsDialog(wx.Dialog):
+    def __init__(self, *args, **kwds):
+        kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
+        wx.Dialog.__init__(self, *args, **kwds)
+        self.SetSize((900, 600))
+        self.SetTitle("Toolbar Editor")
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_5, 0, wx.EXPAND, 0)
+
+        grid_sizer = wx.FlexGridSizer(7, 2, 0, 0)
+        sizer_5.Add(grid_sizer, 3, wx.EXPAND, 0)
+
+        self.label_6 = wx.StaticText(self, wx.ID_ANY, "Label:")
+        self.label_6.SetToolTip("The menu entry text;\nenter & for access keys (using ALT key)\nappend e.g. \\\\tCtrl-X for keyboard shortcut")
+        grid_sizer.Add(self.label_6, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.label = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.label.SetToolTip("The menu entry text;\nenter & for access keys (using ALT key)\nappend e.g. \\\\tCtrl-X for keyboard shortcut")
+        grid_sizer.Add(self.label, 1, wx.EXPAND, 0)
+
+        label_11 = wx.StaticText(self, wx.ID_ANY, "Primary Bitmap:")
+        grid_sizer.Add(label_11, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        sizer_primary_bitmap = wx.BoxSizer(wx.HORIZONTAL)
+        grid_sizer.Add(sizer_primary_bitmap, 1, wx.EXPAND, 0)
+
+        self.bitmap1 = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.bitmap1.SetToolTip("If the bitmap should be loaded from a file, use the \"...\" button or just\ndrop a file on the text field.\nWhen dropping a file from inside the project directory, a relative path is\nentered unless you hold the ALT or CTRL key.")
+        sizer_primary_bitmap.Add(self.bitmap1, 1, 0, 0)
+
+        self.bitmap1_button_ART = wx.Button(self, wx.ID_ANY, "A")
+        self.bitmap1_button_ART.SetMinSize((20, -1))
+        self.bitmap1_button_ART.SetToolTip("Select standard art")
+        sizer_primary_bitmap.Add(self.bitmap1_button_ART, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 0)
+
+        self.bitmap1_button = wx.Button(self, wx.ID_ANY, "...")
+        sizer_primary_bitmap.Add(self.bitmap1_button, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 0)
+
+        label_12 = wx.StaticText(self, wx.ID_ANY, "Disabled Bitmap:")
+        grid_sizer.Add(label_12, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        sizer_primary_bitmap = wx.BoxSizer(wx.HORIZONTAL)
+        grid_sizer.Add(sizer_primary_bitmap, 1, wx.EXPAND, 0)
+
+        self.bitmap2 = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.bitmap2.SetToolTip("If the bitmap should be loaded from a file, use the \"...\" button or just\ndrop a file on the text field.\nWhen dropping a file from inside the project directory, a relative path is\nentered unless you hold the ALT or CTRL key.")
+        sizer_primary_bitmap.Add(self.bitmap2, 1, 0, 0)
+
+        self.bitmap2_button = wx.Button(self, wx.ID_ANY, "...")
+        sizer_primary_bitmap.Add(self.bitmap2_button, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 0)
+
+        self.label_7 = wx.StaticText(self, wx.ID_ANY, "Event Handler:")
+        self.label_7.SetToolTip("Enter the name of an event handler method; this will be created as stub")
+        grid_sizer.Add(self.label_7, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.handler = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.handler.SetToolTip("Enter the name of an event handler method; this will be created as stub")
+        grid_sizer.Add(self.handler, 1, wx.EXPAND, 0)
+
+        self.label_9 = wx.StaticText(self, wx.ID_ANY, "Short Help:")
+        self.label_9.SetToolTip("This will be displayed as tooltip")
+        grid_sizer.Add(self.label_9, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.short_help = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.short_help.SetToolTip("This will be displayed as tooltip")
+        grid_sizer.Add(self.short_help, 1, wx.EXPAND, 0)
+
+        label_13 = wx.StaticText(self, wx.ID_ANY, "Long Help:")
+        label_13.SetToolTip("This will be displayed in the status bar")
+        grid_sizer.Add(label_13, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.long_help = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.long_help.SetToolTip("This will be displayed in the status bar")
+        grid_sizer.Add(self.long_help, 1, wx.EXPAND, 0)
+
+        self.label_10 = wx.StaticText(self, wx.ID_ANY, "ID:")
+        self.label_10.SetToolTip("optional: enter wx ID")
+        grid_sizer.Add(self.label_10, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 4)
+
+        self.id = wx.TextCtrl(self, wx.ID_ANY, "")
+        self.id.SetToolTip("optional: enter wx ID")
+        grid_sizer.Add(self.id, 0, 0, 0)
+
+        self.type = wx.RadioBox(self, wx.ID_ANY, "Type", choices=["Normal", "Checkable", "Radio"], majorDimension=1, style=wx.RA_SPECIFY_COLS)
+        self.type.SetSelection(0)
+        sizer_5.Add(self.type, 0, wx.ALL, 4)
+
+        sizer_5.Add((20, 20), 1, wx.EXPAND, 0)
+
+        sizer_6 = wx.BoxSizer(wx.VERTICAL)
+        sizer_5.Add(sizer_6, 0, wx.EXPAND, 0)
+
+        self.ok = wx.Button(self, wx.ID_OK, "&OK")
+        self.ok.SetToolTip("Alt+O or Alt+Enter or Ctrl+Enter")
+        sizer_6.Add(self.ok, 0, wx.ALL, 5)
+
+        self.cancel = wx.Button(self, wx.ID_CANCEL, "&Cancel")
+        self.cancel.SetToolTip("Alt+C or Alt+F4")
+        sizer_6.Add(self.cancel, 0, wx.ALL, 5)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1.Add(sizer_2, 0, wx.EXPAND, 0)
+
+        self.move_up = wx.Button(self, wx.ID_ANY, "Up")
+        self.move_up.SetToolTip("Move selected item up (Alt-Up)")
+        sizer_2.Add(self.move_up, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
+
+        self.move_down = wx.Button(self, wx.ID_ANY, "Down")
+        self.move_down.SetToolTip("Move selected item down (Alt-Down)")
+        sizer_2.Add(self.move_down, 0, wx.BOTTOM | wx.RIGHT | wx.TOP, 8)
+
+        sizer_2.Add((20, 20), 1, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.add = wx.Button(self, wx.ID_ANY, "&Add")
+        self.add.SetToolTip("Alt+A")
+        sizer_2.Add(self.add, 0, wx.BOTTOM | wx.LEFT | wx.TOP, 8)
+
+        self.remove = wx.Button(self, wx.ID_ANY, "&Remove")
+        self.remove.SetToolTip("Alt+R")
+        sizer_2.Add(self.remove, 0, wx.BOTTOM | wx.TOP, 8)
+
+        self.add_sep = wx.Button(self, wx.ID_ANY, "Add &Separator")
+        self.add_sep.SetToolTip("Alt+S")
+        sizer_2.Add(self.add_sep, 0, wx.ALL, 8)
+
+        sizer_2.Add((20, 20), 2, wx.ALIGN_CENTER_VERTICAL, 0)
+
+        self.items = wx.ListCtrl(self, wx.ID_ANY, style=wx.BORDER_SUNKEN | wx.LC_EDIT_LABELS | wx.LC_REPORT | wx.LC_SINGLE_SEL)
+        self.items.SetToolTip("For navigation use the mouse or the up/down arrows")
+        self.items.AppendColumn("Label", format=wx.LIST_FORMAT_LEFT, width=180)
+        self.items.AppendColumn("Primary Bitmap", format=wx.LIST_FORMAT_LEFT, width=180)
+        self.items.AppendColumn("Disabled Bitmap", format=wx.LIST_FORMAT_LEFT, width=120)
+        self.items.AppendColumn("Short Help", format=wx.LIST_FORMAT_LEFT, width=120)
+        self.items.AppendColumn("Long Help", format=wx.LIST_FORMAT_LEFT, width=180)
+        self.items.AppendColumn("Type", format=wx.LIST_FORMAT_LEFT, width=50)
+        self.items.AppendColumn("Event Handler", format=wx.LIST_FORMAT_LEFT, width=120)
+        self.items.AppendColumn("Id", format=wx.LIST_FORMAT_LEFT, width=50)
+        sizer_1.Add(self.items, 1, wx.EXPAND, 0)
+
+        grid_sizer.AddGrowableCol(1)
+
+        self.SetSizer(sizer_1)
+
+        self.Layout()
+
+        self.Bind(wx.EVT_TEXT, self.on_label_edited, self.label)
+        self.Bind(wx.EVT_TEXT, self.on_bitmap1_edited, self.bitmap1)
+        self.Bind(wx.EVT_BUTTON, self.select_bitmap1_art, self.bitmap1_button_ART)
+        self.Bind(wx.EVT_BUTTON, self.select_bitmap1, self.bitmap1_button)
+        self.Bind(wx.EVT_TEXT, self.on_bitmap2_edited, self.bitmap2)
+        self.Bind(wx.EVT_BUTTON, self.select_bitmap2, self.bitmap2_button)
+        self.Bind(wx.EVT_TEXT, self.on_event_handler_edited, self.handler)
+        self.Bind(wx.EVT_TEXT, self.on_help_str_edited, self.short_help)
+        self.Bind(wx.EVT_TEXT, self.on_long_help_str_edited, self.long_help)
+        self.Bind(wx.EVT_TEXT, self.on_id_edited, self.id)
+        self.Bind(wx.EVT_RADIOBOX, self.on_type_edited, self.type)
+        self.Bind(wx.EVT_BUTTON, self.on_OK, self.ok)
+        self.Bind(wx.EVT_BUTTON, self.on_cancel, self.cancel)
+        self.Bind(wx.EVT_BUTTON, self.move_item_up, self.move_up)
+        self.Bind(wx.EVT_BUTTON, self.move_item_down, self.move_down)
+        self.Bind(wx.EVT_BUTTON, self.add_item, self.add)
+        self.Bind(wx.EVT_BUTTON, self.remove_item, self.remove)
+        self.Bind(wx.EVT_BUTTON, self.add_separator, self.add_sep)
+        self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.on_label_edited, self.items)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.show_item, self.items)
+
+    def on_label_edited(self, event):
+        print("Event handler 'on_label_edited' not implemented!")
+        event.Skip()
+
+    def on_bitmap1_edited(self, event):
+        print("Event handler 'on_bitmap1_edited' not implemented!")
+        event.Skip()
+
+    def select_bitmap1_art(self, event):
+        print("Event handler 'select_bitmap1_art' not implemented!")
+        event.Skip()
+
+    def select_bitmap1(self, event):
+        print("Event handler 'select_bitmap1' not implemented!")
+        event.Skip()
+
+    def on_bitmap2_edited(self, event):
+        print("Event handler 'on_bitmap2_edited' not implemented!")
+        event.Skip()
+
+    def select_bitmap2(self, event):
+        print("Event handler 'select_bitmap2' not implemented!")
+        event.Skip()
+
+    def on_event_handler_edited(self, event):
+        print("Event handler 'on_event_handler_edited' not implemented!")
+        event.Skip()
+
+    def on_help_str_edited(self, event):
+        print("Event handler 'on_help_str_edited' not implemented!")
+        event.Skip()
+
+    def on_long_help_str_edited(self, event):
+        print("Event handler 'on_long_help_str_edited' not implemented!")
+        event.Skip()
+
+    def on_id_edited(self, event):
+        print("Event handler 'on_id_edited' not implemented!")
+        event.Skip()
+
+    def on_type_edited(self, event):
+        print("Event handler 'on_type_edited' not implemented!")
+        event.Skip()
+
+    def on_OK(self, event):
+        print("Event handler 'on_OK' not implemented!")
+        event.Skip()
+
+    def on_cancel(self, event):
+        print("Event handler 'on_cancel' not implemented!")
+        event.Skip()
+
+    def move_item_up(self, event):
+        print("Event handler 'move_item_up' not implemented!")
+        event.Skip()
+
+    def move_item_down(self, event):
+        print("Event handler 'move_item_down' not implemented!")
+        event.Skip()
+
+    def add_item(self, event):
+        print("Event handler 'add_item' not implemented!")
+        event.Skip()
+
+    def remove_item(self, event):
+        print("Event handler 'remove_item' not implemented!")
+        event.Skip()
+
+    def add_separator(self, event):
+        print("Event handler 'add_separator' not implemented!")
+        event.Skip()
+
+    def show_item(self, event):
+        print("Event handler 'show_item' not implemented!")
+        event.Skip()
+
diff -Nru wxglade-0.9.6/widgets/toolbar/wconfig.py wxglade-1.0.1/widgets/toolbar/wconfig.py
--- wxglade-0.9.6/widgets/toolbar/wconfig.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/toolbar/wconfig.py	2020-12-31 14:04:48.000000000 +0000
@@ -10,8 +10,17 @@
     'style_defs': {
         'wxTB_FLAT':       {'desc':_('Gives the toolbar a flat look (Windows and GTK only).')},
         'wxTB_DOCKABLE':   {'desc':_('Makes the toolbar floatable and dockable (GTK only).')},
-        'wxTB_HORIZONTAL': {'desc':_('Specifies horizontal layout (default).')},
-        'wxTB_VERTICAL':   {'desc':_('Specifies vertical layout.')},
+        
+        'wxTB_HORIZONTAL': {'desc':_('Specifies horizontal layout (default).\n(alias: wxTB_TOP)'),
+                            'exclude':'wxTB_VERTICAL|wxTB_BOTTOM|wxTB_RIGHT'},
+        'wxTB_VERTICAL':   {'desc':_('Specifies vertical layout.\n(alias: wxTB_LEFT)'),
+                            'exclude':'wxTB_HORIZONTAL|wxTB_BOTTOM|wxTB_RIGHT|wxTB_DEFAULT_STYLE'},
+        'wxTB_BOTTOM':     {'desc':_('Align the toolbar at the bottom of parent window.'),
+                            'exclude':'wxTB_HORIZONTAL|wxTB_VERTICAL|wxTB_RIGHT|wxTB_DEFAULT_STYLE'
+                            },
+        'wxTB_RIGHT':      {'desc':_('Align the toolbar at the right side of parent window.'),
+                            'exclude':'wxTB_HORIZONTAL|wxTB_VERTICAL|wxTB_BOTTOM|wxTB_DEFAULT_STYLE'},
+
         'wxTB_TEXT':       {'desc':_('Shows the text in the toolbar buttons; by default only icons are shown.')},
         'wxTB_NOICONS':    {'desc':_('Specifies no icons in the toolbar buttons; by default they are shown.')},
         'wxTB_NODIVIDER':  {'desc':_('Specifies no divider (border) above the toolbar (Windows only)')},
@@ -21,16 +30,20 @@
         'wxTB_HORZ_TEXT':  {'desc':_('Combination of wxTB_HORZ_LAYOUT and wxTB_TEXT.'),
                             'combination': 'wxTB_HORZ_LAYOUT|wxTB_TEXT' },
         'wxTB_NO_TOOLTIPS':{'desc':_("Don't show the short help tooltips for the tools when the mouse hovers over them.")},
-        'wxTB_BOTTOM':     {'desc':_('Align the toolbar at the bottom of parent window.')},
-        'wxTB_RIGHT':      {'desc':_('Align the toolbar at the right side of parent window.')},
+
+        'wxTB_LEFT':       {'rename_to':'wxTB_VERTICAL'},
+        'wxTB_TOP':        {'rename_to':'wxTB_HORIZONTAL'},
+
         'wxTB_DEFAULT_STYLE': {
-            'desc': _('Combination of wxTB_HORIZONTAL and wxTB_FLAT. This style is new since wxWidgets 2.9.5.'),
-            'combination': 'wxTB_HORIZONTAL|wxTB_FLAT',
+            'desc': _('Flags that are closest to the native look. Currently identical to wxTB_HORIZONTAL.\n'
+                      'This style is new since wxWidgets 2.9.5.'),
+            'combination': 'wxTB_HORIZONTAL',
+            'exclude':'wxTB_VERTICAL|wxTB_BOTTOM|wxTB_RIGHT',
             'supported_by': ('wx3',) },
         'wxTB_3DBUTTONS':  {'desc':_('show 3D buttons (wxToolBarSimple only)')},
     },
-    'style_list': ['wxTB_FLAT', 'wxTB_DOCKABLE', 'wxTB_VERTICAL', 'wxTB_TEXT',
+    'style_list': ['wxTB_DEFAULT_STYLE', 'wxTB_FLAT', 'wxTB_DOCKABLE',
+                   'wxTB_HORIZONTAL', 'wxTB_VERTICAL', 'wxTB_BOTTOM', 'wxTB_RIGHT', 'wxTB_TEXT',
                    'wxTB_NOICONS', 'wxTB_NODIVIDER', 'wxTB_NOALIGN', 'wxTB_HORZ_LAYOUT', 'wxTB_HORZ_TEXT',
-                   'wxTB_NO_TOOLTIPS', 'wxTB_BOTTOM', 'wxTB_RIGHT', 'wxTB_DEFAULT_STYLE', 'wxTB_3DBUTTONS']
+                   'wxTB_NO_TOOLTIPS', 'wxTB_3DBUTTONS']
 }
-
diff -Nru wxglade-0.9.6/widgets/tree_ctrl/tree_ctrl.py wxglade-1.0.1/widgets/tree_ctrl/tree_ctrl.py
--- wxglade-0.9.6/widgets/tree_ctrl/tree_ctrl.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/tree_ctrl/tree_ctrl.py	2020-12-31 14:04:48.000000000 +0000
@@ -3,13 +3,12 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2016 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
 import wx
 from edit_windows import ManagedBase, EditStylesMixin
-from tree import Node
 import common, config
 
 
@@ -18,11 +17,12 @@
 
     update_widget_style = False
 
+    WX_CLASS = 'wxTreeCtrl'
     _PROPERTIES = ["Widget", "style"]
     PROPERTIES = ManagedBase.PROPERTIES + _PROPERTIES + ManagedBase.EXTRA_PROPERTIES
 
-    def __init__(self, name, parent, id, sizer, pos, style=wx.TR_HAS_BUTTONS|wx.BORDER_SUNKEN):
-        ManagedBase.__init__(self, name, 'wxTreeCtrl', parent, id, sizer, pos)
+    def __init__(self, name, parent, index, style=wx.TR_HAS_BUTTONS|wx.BORDER_SUNKEN):
+        ManagedBase.__init__(self, name, parent, index)
         EditStylesMixin.__init__(self)
 
         # initialise instance properties
@@ -30,7 +30,7 @@
         self._item_with_name = None  # a Tree item for visualization
 
     def create_widget(self):
-        self.widget = wx.TreeCtrl(self.parent.widget, self.id, style=self.style) # wx.TR_HAS_BUTTONS|wx.BORDER_SUNKEN)
+        self.widget = wx.TreeCtrl(self.parent_window.widget, wx.ID_ANY, style=self.style) # wx.TR_HAS_BUTTONS|wx.BORDER_SUNKEN)
         # add a couple of items just for a better appearance
         root = self.widget.AddRoot(_(' Tree Control:'))
         self._item_with_name = self.widget.AppendItem(root, ' ' + self.name)
@@ -38,62 +38,41 @@
         self.widget.Expand(root)
         self.widget.Expand(self._item_with_name)
 
-    def finish_widget_creation(self):
-        ManagedBase.finish_widget_creation(self, sel_marker_parent=self.widget)
+    def finish_widget_creation(self, level):
+        ManagedBase.finish_widget_creation(self, level, sel_marker_parent=self.widget)
 
     def _set_name(self):
         if not self.widget or not self._item_with_name: return
         self.widget.SetItemText(self._item_with_name, ' ' + self.name)
 
-    def properties_changed(self, modified):
-        EditStylesMixin.properties_changed(self, modified)
-        ManagedBase.properties_changed(self, modified)
+    def _properties_changed(self, modified, actions):
+        EditStylesMixin._properties_changed(self, modified, actions)
+        ManagedBase._properties_changed(self, modified, actions)
         if not modified or "name" in modified:
             self._set_name()
 
 
-
-def builder(parent, sizer, pos, number=[1]):
+def builder(parent, index):
     "factory function for EditTreeCtrl objects"
-    name = 'tree_ctrl_%d' % number[0]
-    while common.app_tree.has_name(name):
-        number[0] += 1
-        name = 'tree_ctrl_%d' % number[0]
+    name = parent.toplevel_parent.get_next_contained_name('tree_ctrl_%d')
     with parent.frozen():
-        tree_ctrl = EditTreeCtrl(name, parent, wx.NewId(), sizer, pos)
-        tree_ctrl.properties["style"].set_to_default()
-        node = Node(tree_ctrl)
-        tree_ctrl.node = node
-        tree_ctrl.properties["proportion"].set(1)
-        tree_ctrl.properties["flag"].set("wxEXPAND")
-        if parent.widget: tree_ctrl.create()
-    common.app_tree.insert(node, sizer.node, pos-1)
-    #sizer.set_item(tree_ctrl.pos, 1, wx.EXPAND)
+        editor = EditTreeCtrl(name, parent, index)
+        editor.properties["style"].set_to_default()
+        editor.properties["proportion"].set(1)
+        editor.properties["flag"].set("wxEXPAND")
+        if parent.widget: editor.create()
+    return editor
 
 
-def xml_builder(attrs, parent, sizer, sizeritem, pos=None):
+def xml_builder(parser, base, name, parent, index):
     "factory function to build EditTreeCtrl objects from a XML file"
-    from xml_parse import XmlParsingError
-    try:
-        name = attrs['name']
-    except KeyError:
-        raise XmlParsingError(_("'name' attribute missing"))
-    if sizer is None or sizeritem is None:
-        raise XmlParsingError(_("sizer or sizeritem object cannot be None"))
-    tree_ctrl = EditTreeCtrl(name, parent, wx.NewId(), sizer, pos, style=0)
-    #sizer.set_item(tree_ctrl.pos, proportion=sizeritem.proportion, span=sizeritem.span, flag=sizeritem.flag, border=sizeritem.border)
-    node = Node(tree_ctrl)
-    tree_ctrl.node = node
-    if pos is None:
-        common.app_tree.add(node, sizer.node)
-    else:
-        common.app_tree.insert(node, sizer.node, pos-1)
-    return tree_ctrl
+    return EditTreeCtrl(name, parent, index, style=0)
 
 
 def initialize():
     "initialization function for the module: returns a wx.BitmapButton to be added to the main palette"
+    common.widget_classes['EditTreeCtrl'] = EditTreeCtrl
     common.widgets['EditTreeCtrl'] = builder
     common.widgets_from_xml['EditTreeCtrl'] = xml_builder
 
-    return common.make_object_button('EditTreeCtrl', 'tree_ctrl.xpm')
+    return common.make_object_button('EditTreeCtrl', 'tree_ctrl.png')
diff -Nru wxglade-0.9.6/widgets/widgets.txt wxglade-1.0.1/widgets/widgets.txt
--- wxglade-0.9.6/widgets/widgets.txt	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/widgets/widgets.txt	2020-12-31 14:04:48.000000000 +0000
@@ -4,6 +4,7 @@
 #
 # The modules can optionally be grouped by preceding section headers.
 # A section header is the name of the section enclosed in square brackets.
+# It may be followed by :K for hotkey
 #
 # Empty lines will be ignored. Lines beginning with hash sign ('#') are
 # ignored too and may be used to provide comments.
@@ -12,22 +13,22 @@
 # ('#') preceded by a whitespace character for such cases.
 
 
-[Windows]
+[Windows]:W
 frame
 dialog
 panel
 
-[Containers]
+[Containers]:C
 notebook
 splitter_window
 
-[Buttons]
+[Buttons]:B
 button
 toggle_button
 bitmap_button
 spin_button
 
-[Inputs]
+[Inputs]:I
 text_ctrl
 choice
 combo_box
@@ -37,7 +38,7 @@
 radio_button
 radio_box
 
-[Numeric & Dates]
+[Numeric & Dates]:N
 spin_ctrl
 spin_ctrl_double
 slider
@@ -46,24 +47,24 @@
 generic_calendar_ctrl
 datepicker_ctrl
 
-[Data]
+[Data]:D
 list_ctrl
 tree_ctrl
 grid
 
-[Static]
+[Static]:T
 static_text
 hyperlink_ctrl
 static_line
 static_bitmap
 spacer
 
-[Misc]
+[Misc]:M
 property_grid_manager
 search_ctrl
 custom_widget
 
-[Menu & Bars]
+[Menu & Bars]:R
 menubar
 toolbar
 statusbar
diff -Nru wxglade-0.9.6/window_dialog.py wxglade-1.0.1/window_dialog.py
--- wxglade-0.9.6/window_dialog.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/window_dialog.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,6 +1,6 @@
 """Dialog to ask user for base class and class name
 
-@copyright: 2016-2019 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -9,10 +9,21 @@
 import common, compat
 
 
+def _get_all_class_names(item):
+    ret = []
+    for c in item.children or []:
+        name = getattr(c, "klass", None)
+        if name: ret.append(name)
+        ret += _get_all_class_names(c)
+
+    return ret
+
+
 class WindowDialog(wx.Dialog):
     # dialog for builder function
     parent = parent_property = None  # used by StandaloneOrChildDialog
-    def __init__(self, klass, base_classes=None, message="Select Class", toplevel=True):
+    def __init__(self, klass, base_classes=None, message="Select Class", toplevel=True, options=None, defaults=None,
+                 boxes=None):
         pos = wx.GetMousePosition()
         wx.Dialog.__init__(self, common.main, -1, _(message), pos)
 
@@ -22,14 +33,16 @@
             # base class
             self.base  = wx.RadioBox(self, -1, ("base class"), choices=base_classes, style=wx.RA_VERTICAL)
             self.base.SetSelection(0)
+            self.Bind(wx.EVT_RADIOBOX, self.on_base_selection)
+            self.selected_base = 0
 
         self.number = 1
-        self.class_names = set( common.app_tree.get_all_class_names() )
-        self.toplevel_names = set( common.app_tree.get_toplevel_class_names() )
+        self.class_names = set( _get_all_class_names(common.root) )
+        self.toplevel_names = set( c.name for c in common.root.children )
         self.toplevel = toplevel  # if this is True, the name must be unique, as the generated class will have it
         # class
         self._klass = klass
-        if common.app_tree.app.language.lower() != 'xrc':
+        if common.root.language.lower() != 'xrc':
             klass = self.get_next_class_name(klass)
         self.klass = wx.TextCtrl(self, -1, klass)
         self.klass.Bind(wx.EVT_TEXT, self.on_text)  # for validation
@@ -37,7 +50,7 @@
         # for frame or standalone? this is used by the derived class below and just for menu bar and tool bar
         if self.parent_property and self.parent:
             # self.parent must be set by the derived class in this case; here we check whether it is set already
-            choices = ["Add to %s '%s'"%(self.parent.base[2:], self.parent.name),
+            choices = ["Add to %s '%s'"%(self.parent.WX_CLASS[2:], self.parent.name),
                        "Standalone"]
             self.standalone  = wx.RadioBox(self, -1, ("Type"), choices=choices, style=wx.RA_VERTICAL)
             self.standalone.Bind(wx.EVT_RADIOBOX, self.on_standalone)
@@ -55,22 +68,59 @@
         hszr = wx.BoxSizer(wx.HORIZONTAL)
         hszr.Add(wx.StaticText(self, -1, _("class"),), 0, wx.EXPAND|wx.ALL, 3)
         hszr.Add(self.klass, 2)
-        szr.Add(hszr, 0, wx.EXPAND)
+        szr.Add(hszr, 0, wx.EXPAND|wx.ALL, 5)
+
+        if options:
+            #line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL)
+            #szr.Add(line, 0, wx.EXPAND|wx.ALL, 5)
+            self._create_option_controls(szr, options, defaults, boxes)
+
         # buttons
-        btnbox = wx.BoxSizer(wx.HORIZONTAL)
-        self.btnOK = btnOK = wx.Button(self, wx.ID_OK, _('OK'))
-        btnCANCEL = wx.Button(self, wx.ID_CANCEL, _('Cancel'))
-        btnbox.Add(btnOK, 0, wx.ALL, 3)
-        btnbox.Add(btnCANCEL, 0, wx.ALL, 3)
-        btnOK.SetFocus()
-        szr.Add(btnbox, 0, wx.ALL|wx.ALIGN_CENTER, 3)
+        btnbox = wx.StdDialogButtonSizer()
+        self.btnOK = btnOK = wx.Button(self, wx.ID_OK)#, _('OK'))
+        btnOK.SetDefault()
+        btnCANCEL = wx.Button(self, wx.ID_CANCEL)#, _('Cancel'))
+        btnbox.AddButton(btnOK)#, 0, wx.ALL, 3)
+        btnbox.AddButton(btnCANCEL)#, 0, wx.ALL, 3)
+        btnbox.Realize()
+        szr.Add(btnbox, 0, wx.ALL|wx.ALIGN_CENTER, 5)
         self.SetAutoLayout(True)
         self.SetSizer(szr)
         szr.Fit(self)
 
+    def _create_option_controls(self, szr, options, defaults, boxes):
+        self.option_controls = []
+        self.option_values = []
+        szr_ = szr
+        in_box = False
+        for o, option in enumerate(options):
+            if boxes and option in boxes and boxes[option]:
+                # start a static box sizer
+                box = wx.StaticBox( self, label=_(boxes[option]) )
+                szr_ = wx.StaticBoxSizer(box, wx.VERTICAL)
+                in_box = True
+            ctrl = wx.CheckBox(self, -1, _(option))
+            value = defaults and defaults[o] or False
+            ctrl.SetValue(value)
+            szr_.Add(ctrl, 0, wx.ALL, 5 if in_box else 10)
+            self.option_controls.append(ctrl)
+            self.option_values.append(value)
+            ctrl.Bind(wx.EVT_CHECKBOX, self.callback)
+            if boxes and option in boxes and boxes[option] is None:
+                # end static box sizer
+                szr.Add(szr_, 0, wx.EXPAND|wx.ALL, 5)
+                szr_ = szr
+                in_box = False
+
+        line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL)
+        szr.Add(line, 0, wx.EXPAND|wx.TOP|wx.LEFT, 5)
+
+    def on_base_selection(self, event):
+        # this can be overridden for widget specific actions
+        self.selected_base = self.base.GetStringSelection()
+        event.Skip()
+
     def get_next_class_name(self, name):
-        #names = [c.widget.klass for c in common.app_tree.root.children or []]
-        
         if not name in self.class_names: return name
         while True:
             ret = '%s%d'%(name,self.number)
@@ -78,7 +128,7 @@
             self.number += 1
 
     def get_next_name(self, name):
-        names = common.app_tree.get_all_names()
+        names = [c.name for c in common.root.children]
         names = [n for n in names if n.startswith(name)]
         if not name in names: return name
         while True:
@@ -95,7 +145,7 @@
             self.klass.SetBackgroundColour(wx.RED)
             compat.SetToolTip(self.klass, "Class name not valid")
         else:
-            #if name in [c.widget.klass for c in common.app_tree.root.children or []]:
+            #if name in [c.widget.klass for c in common.root.children or []]:
             if self.toplevel and name in self.toplevel_names:
                 self.klass.SetBackgroundColour( wx.RED )
                 compat.SetToolTip(self.klass, "Class name already in use for toplevel window")
@@ -129,6 +179,15 @@
         base = self.base.GetStringSelection()
         return klass, base
 
+    def callback(self, event):
+        # update values and enable / disable dependent options
+        ctrl = event.GetEventObject()
+        i = self.option_controls.index(ctrl)
+        self.option_values[i] = ctrl.GetValue()
+
+    def get_options(self):
+        return self.option_values
+
 
 class StandaloneOrChildDialog(WindowDialog):
     # for menu and tool bars
@@ -136,3 +195,51 @@
         self.parent = parent
         self.parent_property = parent_property
         WindowDialog.__init__(self, klass, None, message, True)
+
+
+class DialogOrPanelDialog(WindowDialog):
+    # the button types: Affirmative, Negative, Cancel, aPply, Help; on Windows wx will place them in this Order
+    all_button_types = ["A", "N", "C", "P", "H"]
+    button_names =          ["OK", "CANCEL", "YES", "NO", "SAVE", "APPLY", "CLOSE", "HELP"]
+    button_types =          ["A",  "C",      "A",   "N",   "A",   "P",     "C",     "H"]
+    default_choices = [True, True, True,     False, False, False, False,   False,   False]
+    boxes = {"OK":"Add buttons", "HELP":None}
+
+    def __init__(self, klass):
+        base_classes = ['wxDialog', 'wxPanel']
+        options = ["Add sizer"] + self.button_names
+        WindowDialog.__init__(self, klass, base_classes, 'Select widget type', True, options, self.default_choices,
+                              self.boxes)
+        self._enable_buttons()
+
+    def get_selected_buttons(self):
+        # returns names in the right ordering for Windows: Affirmative, Apply, Negative, Cancel, Help
+        if not self.option_values[0]: return [], []
+        names = [None]*len(self.all_button_types)
+        types = [None]*len(self.all_button_types)
+        for o, value in enumerate(self.option_values[1:]):
+            if value:
+                i = self.all_button_types.index( self.button_types[o] )
+                names[i] = self.button_names[o]
+                types[i] = self.button_types[o]
+        return [n for n in names if n], [t for t in types if t]
+
+    def callback(self, event):
+        i = self.option_controls.index( event.GetEventObject() ) - 1
+        WindowDialog.callback(self, event)
+        self._enable_buttons()
+
+    def _enable_buttons(self):
+        names, types = self.get_selected_buttons()
+        for b, type_ in enumerate(self.button_types):
+            if self.option_values[b+1]:
+                enable = True
+            else:
+                enable = not type_ in types
+            if not self.option_values[0] or self.selected_base=="wxPanel": enable = False
+            self.option_controls[1+b].Enable(enable)
+
+    def on_base_selection(self, event):
+        # enable button actions
+        WindowDialog.on_base_selection(self, event)
+        self._enable_buttons()
diff -Nru wxglade-0.9.6/wxglade wxglade-1.0.1/wxglade
--- wxglade-0.9.6/wxglade	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/wxglade	2020-12-31 14:04:48.000000000 +0000
@@ -14,10 +14,12 @@
 #  3. in a parallel Python module directory
 
 # Keep this up to date with version.py and sphinx/conf.py
-WXG_VERSION="0.9.6"
+WXG_VERSION="1.0.1"
+
+CURR_DIR=$(dirname "$0")
 
 # search order for Python interpreter
-INTERPRETER_LIST="python3 python2 \
+INTERPRETER_LIST="${CURR_DIR}/python python3 python2 \
                   python2.7 python27 \
                   python"
 
@@ -51,7 +53,6 @@
 
   # search wxglade.py
   # dist-packages is only used in Debian and Debian derivates
-  CURR_DIR=$(dirname "$0")
   for DIR in \
      "${CURR_DIR}" \
      "${WXG_MODULE_PATH}" \
diff -Nru wxglade-0.9.6/wxGlade.desktop wxglade-1.0.1/wxGlade.desktop
--- wxglade-0.9.6/wxGlade.desktop	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/wxGlade.desktop	2020-12-31 14:04:48.000000000 +0000
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=0.9.6
+Version=1.0.1
 Encoding=UTF-8
 Name=wxGlade
 Comment=A GUI designer written in Python with the popular GUI toolkit wxPython
diff -Nru wxglade-0.9.6/wxglade.py wxglade-1.0.1/wxglade.py
--- wxglade-0.9.6/wxglade.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/wxglade.py	2020-12-31 14:04:48.000000000 +0000
@@ -4,7 +4,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2013-2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -44,7 +44,7 @@
 sys.displayhook = my_displayhook
 
 
-import common, config, compat, log, errors
+import common, config, compat, log
 
 
 def parse_command_line():
@@ -58,7 +58,7 @@
     version = _("wxGlade version %s\n"
                 "Copyright (C) 2007-2012 Alberto Griggio\n"
                 "Copyright (C) 2011-2016 Carsten Grohmann\n"
-                "Copyright (C) 2016-2017 Dietmar Schwertberger\n"
+                "Copyright (C) 2016-2020 Dietmar Schwertberger\n"
                 "License MIT: The MIT License\n"
                 "             <http://www.opensource.org/licenses/mit-license.php>") % config.get_version()
     usage = _("Usage: wxglade <WXG File>             start the wxGlade GUI\n"
@@ -94,6 +94,7 @@
     # from '.' if it is invoked from a shell script).
     if len(args) == 1:
         filename = args[0]
+        if filename.startswith("file://"): filename = filename[7:]
         if not os.path.isabs(filename):
             filename = os.path.join(os.getcwd(), filename)
         filename = os.path.normpath(os.path.expanduser(filename))
@@ -139,7 +140,7 @@
 
     try:
         if language not in common.code_writers:
-            raise errors.WxgMissingCodeWriter(language)
+            raise ValueError('Code writer for "%s" is not available.'%language)
 
         writer = common.code_writers[language]
         CodeWriter( writer=writer, input=filename, out_path=out_path )
@@ -160,14 +161,14 @@
     Returns True if successful."""
     import time
     from xml.sax import SAXParseException
-    from xml_parse import XmlWidgetBuilder, ProgressXmlWidgetBuilder, XmlParsingError
+    from xml_parse import XmlWidgetBuilder, XmlParsingError
     error_msg = None
     infile = None
 
     start = time.time()
 
-    common.app_tree.clear()
-    common.app_tree.app.init()
+    common.root.clear()
+    common.root.init()
 
     try:
         try:
@@ -175,7 +176,7 @@
             input_file_version = None
 
             if not isinstance(filename, list):
-                common.app_tree.app.filename = filename
+                common.root.filename = filename
                 # decoding will done automatically by SAX XML library
                 if compat.PYTHON2:
                     infile = open(filename)
@@ -184,7 +185,7 @@
                 if hasattr(infile, "seek"):
                     # try to read file version number from the first few lines
                     import re
-                    version_re = re.compile("<!-- generated by wxGlade (\d+)\.(\d+)\.(\d+)(\S*)\s*")
+                    version_re = re.compile(r"<!-- generated by wxGlade (\d+)\.(\d+)\.(\d+)(\S*)\s*")
                     for n in range(3):
                         match = version_re.match( infile.readline() )
                         if match:
@@ -194,7 +195,7 @@
                     infile.seek(0)
 
             else:
-                common.app_tree.app.filename = None
+                common.root.filename = None
 
             p = XmlWidgetBuilder(filename, input_file_version)
 
@@ -222,30 +223,30 @@
             infile.close()
 
         if error_msg:
-            common.app_tree.clear()
-            common.app_tree.app.new()
-            common.app_tree.app.saved = True
+            common.root.clear()
+            common.root.new()
+            common.root.saved = True
 
             logging.error(error_msg)
 
             return False
 
-    if common.app_tree.app.is_template:
+    if common.root.is_template:
         logging.info(_("Template loaded"))
-        common.app_tree.app.template_data = template.Template(filename)
-        common.app_tree.app.filename = None
+        common.root.template_data = template.Template(filename)
+        common.root.filename = None
 
     end = time.time()
-    logging.info(_('Loading time: %.5f'), end - start)
+    logging.debug(_('Loading time: %.5f'), end - start)
 
-    common.app_tree.app.saved = True
+    common.root.saved = True
     #common.property_panel.Raise()
 
     duration = end - start
     if filename:
-        logging.info( _("Loaded %s in %.2f seconds") % (os.path.basename(filename), duration ))
+        logging.debug( _("Loaded %s in %.2f seconds") % (os.path.basename(filename), duration ))
     else:
-        logging.info( _("Loaded in %.2f seconds") % duration )
+        logging.debug( _("Loaded in %.2f seconds") % duration )
 
     return True
 
@@ -263,11 +264,7 @@
     # following lines are taken from main.wxGlade().OnInit() and
     # main.wxGladeFrame.__init__()
     common.init_preferences()
-    app = application.Application()
-    # The following lines contain code from tree.WidgetTree.__init__()
-    root_node = tree.Node(app)
-    app.node = root_node
-    common.app_tree = tree.Tree(root_node, app)
+    common.root = app = application.Application()
 
     # Now we can load the file
     if filename is not None:
@@ -276,18 +273,21 @@
             sys.exit(1)
     try:
         if language not in common.code_writers:
-            raise errors.WxgMissingCodeWriter(language)
-        common.app_tree.app.properties["language"].set(language)
-        common.app_tree.app.generate_code(out_path=out_path)
-    except errors.WxgBaseException as inst:
-        logging.error(inst)
-        sys.exit(inst)
+            raise ValueError('Code writer for "%s" is not available.'%language)
+        common.root.properties["language"].set(language)
+        common.root.generate_code(out_path=out_path)
+    #except errors.WxgBaseException as inst:
+        #if config.debugging: raise
+        #logging.error(inst)
+        #sys.exit(inst)
     except Exception:
+        if config.debugging: raise
         logging.error( _("An exception occurred while generating the code for the application.\n"
                          "If you think this is a wxGlade bug, please report it.") )
         logging.exception(_('Internal Error'))
         sys.exit(1)
-    sys.exit(0)
+    if not config.testing:
+        sys.exit(0)
 
 
 def init_stage1(options):
@@ -297,27 +297,28 @@
     common.init_paths(options)
 
     # initialise own logging extensions
-    log.init(filename=config.log_file, encoding='utf-8', level='INFO')
+    log.init(filename=config.log_file, encoding='utf-8',
+             level='DEBUG' if config.debugging else 'INFO')
     atexit.register(log.deinit)
 
     # print versions
     logging.info( _('Starting wxGlade version "%s" on Python %s'), config.version, config.py_version )
 
     # print used paths
-    logging.info(_('Base directory:             %s'), config.wxglade_path)
-    logging.info(_('Documentation directory:    %s'), config.docs_path)
-    logging.info(_('Icons directory:            %s'), config.icons_path)
-    logging.info(_('Build-in widgets directory: %s'), config.widgets_path)
-    logging.info(_('Template directory:         %s'), config.templates_path)
-    logging.info(_('Credits file:               %s'), config.credits_file)
-    logging.info(_('License file:               %s'), config.license_file)
-    logging.info(_('Manual file:                %s'), config.manual_file)
-    logging.info(_('Tutorial file:              %s'), config.tutorial_file)
-    logging.info(_('Home directory:             %s'), config.home_path)
-    logging.info(_('Application data directory: %s'), config.appdata_path)
-    logging.info(_('Configuration file:         %s'), config.rc_file)
-    logging.info(_('History file:               %s'), config.history_file)
-    logging.info(_('Log file:                   %s'), config.log_file)
+    logging.debug(_('Base directory:             %s'), config.wxglade_path)
+    logging.debug(_('Documentation directory:    %s'), config.docs_path)
+    logging.debug(_('Icons directory:            %s'), config.icons_path)
+    logging.debug(_('Build-in widgets directory: %s'), config.widgets_path)
+    logging.debug(_('Template directory:         %s'), config.templates_path)
+    logging.debug(_('Credits file:               %s'), config.credits_file)
+    logging.debug(_('License file:               %s'), config.license_file)
+    logging.debug(_('Manual file:                %s'), config.manual_file)
+    logging.debug(_('Tutorial file:              %s'), config.tutorial_file)
+    logging.debug(_('Home directory:             %s'), config.home_path)
+    logging.debug(_('Application data directory: %s'), config.appdata_path)
+    logging.debug(_('Configuration file:         %s'), config.rc_file)
+    logging.debug(_('History file:               %s'), config.history_file)
+    logging.debug(_('Log file:                   %s'), config.log_file)
 
     # adapt application search path
     sys.path.insert(0, config.wxglade_path)
@@ -356,6 +357,8 @@
             try:
                 import msw
                 msw.register_extensions(["wxg"], "wxGlade")
+                if not os.path.exists(config.rc_file):
+                    config.inform_screen_reader = msw.check_for_screen_reader()
             except ImportError:
                 pass
 
diff -Nru wxglade-0.9.6/xml_parse.py wxglade-1.0.1/xml_parse.py
--- wxglade-0.9.6/xml_parse.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/xml_parse.py	2020-12-31 14:04:48.000000000 +0000
@@ -1,11 +1,11 @@
 """
 Parsers used to load an app and to generate the code from a XML file.
 
-See L{wcodegen.taghandler} for custom tag handler base classes.
+See wcodegen.taghandler for custom tag handler base classes.
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2016 Carsten Grohmann
-@copyright: 2016-2018 Dietmar Schwertberger
+@copyright: 2016-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """
 
@@ -15,11 +15,7 @@
 
 import time
 
-import common, config, compat
-import edit_sizers
-
-if config.use_gui:
-    import wx
+import common, config
 
 
 class XmlParsingError(SAXException):
@@ -36,7 +32,6 @@
     "'abstract' base class of the parsers used to load an app and to generate the code"
 
     def __init__(self):
-        self._logger = logging.getLogger(self.__class__.__name__)
         self._objects = Stack()      # Stack of 'alive' objects
         self._curr_prop = None       # Name of the current property
         self._curr_prop_val = []     # Value of the current property; strings, to be joined
@@ -45,6 +40,7 @@
         self.parser = make_parser()
         self.parser.setContentHandler(self)
         self.locator = None # Document locator
+        self.index = None     # only used with ClipboardXmlWidgetBuilder
 
     def parse(self, source):
         ## Permanent workaround for Python bug "Sax parser crashes if given
@@ -80,7 +76,7 @@
 
         res['encoding'] = self._get_encoding(attrs)
 
-        for_version = attrs.get('for_version', '%s.%s' % config.for_version)
+        for_version = attrs.get('for_version', '%s.%s' % config.for_version_min)
         for_version_tuple = tuple([int(t) for t in for_version.split('.')[:2]])
         if for_version_tuple < (2, 8):
             logging.warning( _('The loaded wxGlade designs are created for wxWidgets "%s", '
@@ -88,8 +84,8 @@
                              for_version )
             logging.warning( _('The designs will be loaded and converted to wxWidgets "%s" partially. '
                                'Please check the designs carefully.'),
-                            '%s.%s' % config.for_version )
-            for_version = '%s.%s' % config.for_version
+                            '%s.%s' % config.for_version_min )
+            for_version = '%s.%s' % config.for_version_min
         res['for_version'] = for_version
 
         try:
@@ -166,7 +162,7 @@
             try:
                 'a'.encode(encoding)
             except LookupError:
-                self._logger.warning( _('Unknown encoding "%s", fallback to default encoding "%s"'),
+                logging.warning( _('Unknown encoding "%s", fallback to default encoding "%s"'),
                                       encoding, config.default_encoding)
                 encoding = config.default_encoding
         return encoding
@@ -181,12 +177,17 @@
         self.input_file_version = input_file_version
         XmlParser.__init__(self)
 
+    def check_input_file_version(self, version):
+        # return True if file version is older
+        if not self.input_file_version: return True
+        return self.input_file_version[:len(version)] < version
+
     def startElement(self, name, attrs):
         if name == 'application':
             # get properties of the app
             self._appl_started = True
             attrs = self._process_app_attrs(attrs)
-            app = common.app_tree.app
+            app = common.root
             p = app.properties
 
             p["encoding"].set( attrs['encoding'] )
@@ -250,7 +251,7 @@
     def endElement(self, name):
         if name == 'application':
             self._appl_started = False
-            app = common.app_tree.app
+            app = common.root
             for key, value in self._delayed_app_properties.items():
                 app.properties[key].set( value )
             app.properties_changed( sorted(self._delayed_app_properties.keys()) )
@@ -259,22 +260,30 @@
             # remove last object from Stack
             obj = self._objects.pop()
             obj.notify_owner()
-            if obj.klass in ('sizeritem', 'sizerslot'):
+            if obj.IS_SIZERITEM or obj.IS_SLOT:
                 return
-            if obj.sizeritem:
+            if obj.sizeritem and obj.obj.parent.IS_SIZER:
+                # XXX just check whether obj.obj has these properties
                 obj.obj.copy_properties( obj.sizeritem, ("option","flag","border","span") )
                 obj.obj.properties["flag"]._check_value()
             obj.obj.on_load()
         else:
             # end of a property or error
-            # case 1: set _curr_prop value
+            prop = self._curr_prop
             data = "".join(self._curr_prop_val)
+            self._curr_prop = None
+            self._curr_prop_val = []
+            if prop in ("menubar", "toolbar", "statusbar"):
+                # case 0: ignore properties: menubar, toolbar, statusbar
+                return
+
             if data:
+                # case 1: set _curr_prop value
                 try:
                     handler = self.top().prop_handlers.top()
                     if not handler or handler.char_data(data):
                         # if char_data returned False, we don't have to call add_property
-                        self.top().add_property(self._curr_prop, data)
+                        self.top().add_property(prop, data)
                 except AttributeError:
                     pass
 
@@ -288,8 +297,6 @@
                     obj.prop_handlers.pop()
             except AttributeError:
                 pass
-            self._curr_prop = None
-            self._curr_prop_val = []
 
     def characters(self, data):
         if not data or data.isspace():
@@ -302,12 +309,12 @@
 class ProgressXmlWidgetBuilder(XmlWidgetBuilder):
     "Adds support for a progress dialog to the widget builder parser"
 
-    def __init__(self, *args, **kwds):
-        self.input_file = kwds.get('input_file')
+    def __init__(self, filename, input_file_version, input_file):
+        self.input_file = input_file
         if self.input_file:
-            del kwds['input_file']
             self.size = len(self.input_file.readlines())
             self.input_file.seek(0)
+            import wx
             self.progress = wx.ProgressDialog( _("Loading..."), _("Please wait while loading the app"), 20 )
             self.step = 4
             self.i = 1
@@ -315,7 +322,7 @@
         else:
             self.size = 0
             self.progress = None
-        XmlWidgetBuilder.__init__(self)
+        XmlWidgetBuilder.__init__(self, filename, input_file_version)
 
     def endElement(self, name):
         if self.progress:
@@ -365,66 +372,65 @@
         they keep info about the destination of the hierarchy of widgets (i.e. the target of the 'paste' command)
       - The first widget built must be hidden and shown again at the end of the operation"""
 
-    def __init__(self, parent, sizer, pos, proportion, span, flag, border):
+    def __init__(self, parent, index, proportion, span, flag, border):
         XmlWidgetBuilder.__init__(self)
         self._renamed = {}
-        if parent is not None:
-            self.parent_node = parent.node
+        self._object_counter = 0
+        self.parent = parent
+        self.index = index
+        if not parent:
+            # e.g. a frame is pasted: update with the top level names
+            self.have_names = set(child.name for child in common.root.children)
         else:
-            # e.g. a frame is pasted
-            self.parent_node = None
-            self.have_names = set()
-            # update with the top level names
-            for node in common.app_tree.names.keys():
-                self.have_names.add( node.widget.name )
+            self.have_names = set(parent.toplevel_parent.names)
 
         class XmlClipboardObject(object):
             def __init__(self, **kwds):
+                self.IS_SIZER = self.IS_WINDOW = False
                 self.__dict__.update(kwds)
             def notify_owner(self):
                 pass
 
         # fake parent window object
         fake_parent = XmlClipboardObject(obj=parent, parent=parent)
-        if parent and parent.is_sizer:
-            fake_parent.in_sizers = True
-            fake_parent.in_windows = False
+        if parent and parent.IS_SIZER:
+            fake_parent.IS_SIZER = True
         else:
-            fake_parent.in_sizers = False
-            fake_parent.in_windows = True
+            fake_parent.IS_WINDOW = True
 
         self._objects.push(fake_parent)
 
         # fake sizer object
-        if sizer:
+        if parent and parent.CHILDREN!=1:
+            sizer = parent
             fake_sizer = XmlClipboardObject(obj=sizer, parent=parent)
-            fake_sizer.in_windows = False
-            fake_sizer.in_sizers = True
+            fake_sizer.IS_SIZER = True
             sizeritem = Sizeritem()
             sizeritem.properties["proportion"].set(proportion)
             sizeritem.properties["span"].set(span)
             sizeritem.properties["flag"].set(flag)
             sizeritem.properties["border"].set(border)
-            sizeritem.properties["pos"].set(pos)
+            sizeritem.index = index
             # fake sizer item
             fake_sizeritem = XmlClipboardObject(obj=sizeritem, parent=parent)
-            fake_sizeritem.in_windows = False
-            fake_sizeritem.in_sizers = False
 
             self._objects.push(fake_sizer)
             self._objects.push(fake_sizeritem)
 
-
         self.depth_level = 0
         self._appl_started = True  # no application tag when parsing from the clipboard
 
     def _get_new_name(self, oldname):
+        # when pasting, check whether the name is free and if not get a new unique one
+        if not oldname in self.have_names:
+            self.have_names.add(oldname)
+            return oldname
         if self._renamed:
             # e.g. if notebook_1 was renamed to notebook_2, try notebook_1_panel_1 -> notebook_2_panel_1 first
             for old,new in self._renamed.items():
                 if oldname.startswith(old):
                     newname = new + oldname[len(old):]
-                    if not common.app_tree.has_name(newname, node=self.parent_node):
+                    if not newname in self.have_names:
                         return newname
 
         newname = oldname
@@ -432,13 +438,13 @@
             # if the old name ends with an underscore and a number, just increase the number
             try:
                 template, i = oldname.rsplit("_", 1)
-                #i = int(i) + 1
                 i = int(i)
                 template = template + '_%s'
-                if self.parent_node is not None:
-                    while common.app_tree.has_name(newname, node=self.parent_node):
+                if self.parent is not None:
+                    while newname in self.have_names:
                         newname = template%i
                         i += 1
+                    self.have_names.add(newname)
                     return newname
                 # top level, e.g. a new frame is pasted
                 while newname in self.have_names:
@@ -449,15 +455,17 @@
             except:
                 pass
 
-        # add _copy to the old name
+        # add _copy or _copy_N to the old name
+        if oldname.endswith('_copy'): oldname = oldname[:-5]
         i = 0
-        if self.parent_node is not None:
-            while common.app_tree.has_name(newname, node=self.parent_node):
+        if self.parent is not None:
+            while newname in self.have_names:
                 if not i:
                     newname = '%s_copy' % oldname
                 else:
                     newname = '%s_copy_%s' % (oldname, i)
                 i += 1
+            self.have_names.add(newname)
             return newname
 
         # top level, e.g. a new frame is pasted
@@ -472,13 +480,10 @@
 
     def startElement(self, name, attrs):
         renamed = None
-        if name == 'object' and 'name' in attrs:
+        if name == 'object' and 'name' in attrs and common.widget_classes[attrs['base']].IS_NAMED:
             # generate a unique name for the copy
             oldname = str(attrs['name'])
-            if not common.app_tree.has_name(oldname, node=self.parent_node):
-                newname = oldname
-            else:
-                newname = self._get_new_name(oldname)
+            newname = self._get_new_name(oldname)
             attrs = _own_dict(attrs)
             attrs['name'] = newname
             if newname!=oldname:
@@ -493,8 +498,9 @@
                 try:
                     self.top_obj = self.top().obj
                 except AttributeError:
-                    self._logger.exception( _('Exception caused by obj: %s'), self.top_obj )
+                    logging.exception( _('Exception caused by obj: %s'), self.top_obj )
             self.depth_level += 1
+            self._object_counter += 1
 
     def endElement(self, name):
         if name == 'label':
@@ -512,115 +518,159 @@
         self.depth_level -= 1
 
         if not self.depth_level:
+            if self.parent:
+                self.parent.on_load(child=self.top_obj)  # e.g. a GridBagSizer needs to check overlapped slots
             common.app_tree.auto_expand = True
-            import misc
             try:
-                # show the first object and update its layout
-                #if self.top_obj.node.parent.widget.is_visible():
-                #    common.app_tree.show_widget(self.top_obj.node)
-                if self.top_obj.node.parent.widget.widget:
-                    self.top_obj.create_widgets()
+                if self.parent and self.parent.widget:
+                    self.top_obj.create()
             except AttributeError:
-                self._logger.exception( _('Exception caused by obj: %s'), self.top_obj )
-            misc.set_focused_widget(self.top_obj)
+                logging.exception( _('Exception caused by obj: %s'), self.top_obj )
+
+
+class XMLAttrs(dict):
+    # raises XmlParsingError instead of KeyError
+    def __getitem__(self, key):
+        try:
+            return dict.__getitem__(self, key)
+        except KeyError:
+            if 'name' in self:
+                raise XmlParsingError( _("attribute %s missing from object '%s'")%(key, self['name']) )
+            raise XmlParsingError( _("attribute %s missing from object")%key )
 
 
 class XmlWidgetObject(object):
     "A class to encapsulate widget attributes read from a XML file, to store them until the widget can be created"
 
     def __init__(self, attrs, parser):
-        # initialise instance logger
-        self._logger = logging.getLogger(self.__class__.__name__)
-
-        attrs.input_file_version = parser.input_file_version  # for handling backwards compatibility on loading
+        attrs = XMLAttrs(attrs)
 
         self.prop_handlers = Stack()  # a stack of custom handler functions to set properties of this object
-        self.parser = parser
-        self.in_sizers = False   # if True, the widget is     a sizer, opposite of 'in_windows'
-        self.in_windows = False  # if True, the widget is not a sizer, opposite of 'in_sizers'
 
         self._properties_added = []
-        try:
-            base = attrs.get('base', None)
-            self.klass = attrs['class']
-        except KeyError:
-            raise XmlParsingError(_("'object' items must have a 'class' attribute"))
+        base = attrs.get('base', None)
+        klass = attrs['class']
 
         # find sizeritem, sizer, parent window
         sizeritem = sizer = parent = None
-        stack = self.parser._objects[:]
+        stack = parser._objects[:]
         top = stack.pop(-1) if stack else None
 
         if top and isinstance(top.obj, Sizeritem):
             sizeritem = top.obj
             top = stack.pop(-1)
-        if top and top.in_sizers:
+
+        if top and top.IS_SIZER:
             sizer = top.obj
             top = stack.pop(-1)
-        if top and top.in_windows:
+        if top and top.IS_WINDOW:
             parent = top.obj
+
         while parent is None and stack:
             top = stack.pop()
-            if top.in_windows: parent = top.obj
+            if top.IS_WINDOW: parent = top.obj
 
+        if parent is None:
+            parent = common.root
+
+        self.IS_SIZER = self.IS_WINDOW = self.IS_SLOT = self.IS_SIZERITEM = False
         if base is not None:
             # if base is not None, the object is a widget (or sizer), and not a sizeritem
-            self.sizeritem = sizeritem
+            self.sizeritem = sizeritem  # the properties will be copied later in endElement
 
-            pos = getattr(sizeritem, 'pos', None)
-            # XXX change this: don't use pos here at all; either we're just appending to the end or filling virtual sizers acc. to pagenames
-            #if pos is None and parent and hasattr(parent, 'virtual_sizer') and parent.virtual_sizer:
-            if pos is None and parent and hasattr(parent, 'virtual_sizer') and parent.virtual_sizer:
-                # virtual sizers don't use sizeritem objects around their items in XML; the index is found from the name
-                sizer = parent.virtual_sizer
-                sizer.node = parent.node
-                sizeritem = Sizeritem()
-                pos_ = sizer.get_itempos(attrs)
-                # XXXinsert empty slots before, if required
-                if pos_: pos = pos_  # when loading from a file, the names are set already and pos_ is not None
+            index = getattr(sizeritem, 'index', None)
+            if index is None and hasattr(parent, "get_itempos"):
+                # splitters and notebooks don't use sizeritems around their items in XML; pos is found from the name
+                index = parent.get_itempos(attrs)
+            elif not sizeritem and not stack:
+                index = parser.index
 
             # build the widget
-            if pos is not None: pos = int(pos)
             builder = common.widgets_from_xml.get(base, None)
             if builder is None: raise XmlParsingError("Widget '%s' not supported."%base)
-            self.obj = builder(attrs, parent, sizer, sizeritem, pos)
-            p = self.obj.properties.get("class")
-            if p:
-                p.set(self.klass)
-                common.app_tree.refresh(self.obj.node)
+            
+            self.obj = builder(parser, base, attrs["name"], sizer or parent, index)
+            self.set_class_attributes(parser, attrs) # set 'class' and 'instance_class' properties, if applicable
 
-            if isinstance(self.obj, edit_sizers.SizerBase):
-                self.in_sizers = True
-            else:
-                self.in_windows = True
+            self.IS_SIZER = self.obj.IS_SIZER
+            self.IS_WINDOW = self.obj.IS_WINDOW
 
-        elif self.klass == 'sizeritem':
+        elif klass == 'sizeritem':
             self.obj = Sizeritem()
             self.parent = parent
+            self.IS_SIZERITEM = True
 
-        elif self.klass == 'sizerslot':
+        elif klass == 'sizerslot':
             assert sizer is not None, _("malformed wxg file: slots can only be inside sizers!")
+            self.obj = None
+            self.IS_SLOT = True
             sizer._add_slot(loading=True)
-            sizer.layout()
 
         # push the object on the _objects stack
-        self.parser._objects.push(self)
+        parser._objects.push(self)
+
+    def set_class_attributes(self, parser, attrs):
+        # old files: no 'instance_class' attribute, 'class' is 'multi purpose'
+        CLASS = self.obj.__class__
+        class_p = self.obj.properties.get("class")
+
+        class_v = attrs.get("class") or None
+        IS_BASE = class_v==CLASS.WX_CLASS or (CLASS.WX_CLASSES and class_v in CLASS.WX_CLASSES)
+
+        instance_class = attrs.get("instance_class")
+
+        if parser.check_input_file_version( (0,9,9) ):
+            # handle backwards compatibility
+            if class_p:
+                if class_p.deactivated is not None:  # i.e. 'class' property is not mandatory / ClassPropertyD
+                    if IS_BASE:
+                        class_v = None
+            elif class_v:
+                if not IS_BASE or CLASS.WX_CLASS=="CustomWidget":
+                    instance_class = class_v
+                class_v = None
+            if attrs.get("no_custom_class", None) in ('1',1):
+                if class_v:
+                    instance_class = class_v
+                    class_v = None
+        else:
+            # current file format: 'class' is always written
+            # if the object does not have a 'class' property at all, the value is the instance class
+            # if it has a 'class' property, the 'instance_class' is written if required
+            if class_p:
+                if class_p.deactivated is not None and IS_BASE:
+                    class_v = None
+            else:
+                if not IS_BASE and instance_class is None:
+                    instance_class = class_v
+                class_v = None
+
+        # update self.obj properties
+        modified = []
+        if class_v:
+            class_p.set( class_v, activate=True )
+            modified.append("class")
+        if instance_class:
+            self.obj.properties["instance_class"].set( instance_class, activate=True )
+            modified.append("instance_class")
+        if modified:
+            self.obj.properties_changed(modified)
 
     def add_property(self, name, val):
         """adds a property to this widget. This method is not called if there
         was a custom handler for this property, and its char_data method returned False"""
+        if name=="no_custom_class": return  # this was also stored as attribute
         if name == 'pos':  # sanity check, this shouldn't happen...
-            self._logger.debug('add_property(name=pos)')
+            logging.debug('add_property(name=pos)')
             return
         try:
             prop = self.obj.properties[name]
         except KeyError:
             # unknown property for this object; issue a warning and ignore the property
             if config.debugging: raise
-            self._logger.error( _("WARNING: Property '%s' not supported by this object ('%s') "), name, self.obj )
+            logging.error( _("WARNING: Property '%s' not supported by this object ('%s') "), name, self.obj )
             return
         prop.load(val, activate=True)
-        #self.obj.properties_changed([name])
         self._properties_added.append(name)
 
     def notify_owner(self):
@@ -646,11 +696,13 @@
 
 class Sizeritem(np.PropertyOwner):
     "temporarily represents a child of a sizer"
-    SIZER_PROPERTIES = ["pos","proportion","span","border","flag"]
+    SIZER_PROPERTIES = ["proportion","span","border","flag"]
     def __init__(self):
         np.PropertyOwner.__init__(self)
         self.proportion = np.LayoutProportionProperty(0)
         self.span = np.LayoutSpanProperty((1,1))
         self.border = np.SpinProperty(0)
         self.flag = np.ManagedFlags(None, name="sizeritem_flags")
-        self.pos = np.SpinProperty(None)
+
+    def on_load(self, child=None):
+        pass
\ No newline at end of file
diff -Nru wxglade-0.9.6/xrc2wxg.py wxglade-1.0.1/xrc2wxg.py
--- wxglade-0.9.6/xrc2wxg.py	2020-05-30 22:05:16.000000000 +0000
+++ wxglade-1.0.1/xrc2wxg.py	2020-12-31 14:04:48.000000000 +0000
@@ -5,7 +5,7 @@
 
 @copyright: 2002-2007 Alberto Griggio
 @copyright: 2014-2016 Carsten Grohmann
-@copyright: 2017-2018 Dietmar Schwertberger
+@copyright: 2017-2020 Dietmar Schwertberger
 @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY
 """