diff -Nru wxglade-0.9.5/bugdialog_ui.py wxglade-0.9.6/bugdialog_ui.py --- wxglade-0.9.5/bugdialog_ui.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/bugdialog_ui.py 2020-05-30 22:05:16.000000000 +0000 @@ -72,8 +72,8 @@ self.notebook_1.AddPage(self.notebook_1_pane_1, _("How to Report a Bug")) grid_sizer_1.Add(self.notebook_1, 1, wx.ALL | wx.EXPAND, 5) grid_sizer_1.Add(self.static_line_1, 0, wx.ALL | wx.EXPAND, 5) - sizer_2.Add(self.btn_copy, 0, wx.ALIGN_RIGHT | wx.ALL, 5) - sizer_2.Add(self.btn_ok, 0, wx.ALIGN_RIGHT | wx.ALL, 5) + sizer_2.Add(self.btn_copy, 0, wx.ALL, 5) + sizer_2.Add(self.btn_ok, 0, wx.ALL, 5) grid_sizer_1.Add(sizer_2, 1, wx.ALIGN_RIGHT, 0) self.SetSizer(grid_sizer_1) grid_sizer_1.AddGrowableRow(0) diff -Nru wxglade-0.9.5/codegen/__init__.py wxglade-0.9.6/codegen/__init__.py --- wxglade-0.9.5/codegen/__init__.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/codegen/__init__.py 2020-05-30 22:05:16.000000000 +0000 @@ -888,6 +888,8 @@ # 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 if prev_src: # if this is a new class, add its code to the new_classes list of the SourceFileContent instance if is_new: @@ -897,8 +899,6 @@ return else: # write the class body onto the single source file - for dep in self.classes[klass].dependencies: - self._current_extra_modules[dep] = 1 if self.classes[klass].extra_code: self._current_extra_code.extend(self.classes[klass].extra_code[::-1]) for line in obuffer: diff -Nru wxglade-0.9.5/common.py wxglade-0.9.6/common.py --- wxglade-0.9.5/common.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/common.py 2020-05-30 22:05:16.000000000 +0000 @@ -372,6 +372,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 need_backup: backup_name = filename + config.preferences.backup_suffix if os.path.isfile(backup_name): @@ -386,7 +392,7 @@ outfile = open(filename, 'wb') for line in content: - if sys.platform.startswith("win"): + if win_line_ending: line = line.replace(b"\n", b"\r\n") outfile.write(line) outfile.close() diff -Nru wxglade-0.9.5/compat.py wxglade-0.9.6/compat.py --- wxglade-0.9.5/compat.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/compat.py 2020-05-30 22:05:16.000000000 +0000 @@ -27,7 +27,7 @@ version = wx.VERSION_STRING[:3] # Version string of major dot minor version number -if version == "4.0": version = "3.0" +if version.startswith("4."): version = "3." + version[2:] version = (int(version[0]), int(version[2]) ) # major,minor @@ -244,6 +244,7 @@ c.SetToolTipString(s) wx_EmptyBitmap = wx.EmptyBitmap wx_EmptyIcon = wx.EmptyIcon + wx_NamedColour = wx.NamedColour def ConvertPixelsToDialog(widget, size): return widget.ConvertPixelSizeToDialog(size) @@ -273,6 +274,7 @@ c.SetToolTip(s) wx_EmptyBitmap = wx.Bitmap wx_EmptyIcon = wx.Icon + wx_NamedColour = wx.Colour def ConvertPixelsToDialog(widget, size): return widget.ConvertPixelsToDialog(size) diff -Nru wxglade-0.9.5/debian/changelog wxglade-0.9.6/debian/changelog --- wxglade-0.9.5/debian/changelog 2020-03-13 17:03:58.000000000 +0000 +++ wxglade-0.9.6/debian/changelog 2020-06-14 15:58:01.000000000 +0000 @@ -1,7 +1,14 @@ +wxglade (0.9.6-1) unstable; urgency=medium + + * New upstream version 0.9.6 + * updated debian patches + + -- Georges Khaznadar Sun, 14 Jun 2020 17:58:01 +0200 + wxglade (0.9.5-1) unstable; urgency=medium * New upstream version 0.9.5 - * updated debain patches + * updated debian patches -- Georges Khaznadar Fri, 13 Mar 2020 18:03:58 +0100 diff -Nru wxglade-0.9.5/debian/patches/wxglade.patch wxglade-0.9.6/debian/patches/wxglade.patch --- wxglade-0.9.5/debian/patches/wxglade.patch 2020-03-13 17:03:58.000000000 +0000 +++ wxglade-0.9.6/debian/patches/wxglade.patch 2020-06-14 15:58:01.000000000 +0000 @@ -5,7 +5,7 @@ +++ wxglade/wxglade @@ -16,70 +16,5 @@ # Keep this up to date with version.py and sphinx/conf.py - WXG_VERSION="0.9.5" + WXG_VERSION="0.9.6" -# search order for Python interpreter -INTERPRETER_LIST="python3 python2 \ diff -Nru wxglade-0.9.5/edit_sizers/edit_sizers.py wxglade-0.9.6/edit_sizers/edit_sizers.py --- wxglade-0.9.5/edit_sizers/edit_sizers.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/edit_sizers/edit_sizers.py 2020-05-30 22:05:16.000000000 +0000 @@ -130,7 +130,7 @@ "Set sizer specific properties and generate the code" result = self.get_code_wxGridSizer(obj) - if self.codegen.preview and obj.klass=="wxGridBagSizer": + if obj.klass=="wxGridBagSizer": max_row, max_col = obj._get_max_row_col() else: max_row = max_col = None @@ -459,15 +459,15 @@ misc.currently_under_mouse = None if self.widget: self.widget.Hide() - - # 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 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 @@ -572,6 +572,7 @@ 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 @@ -810,6 +811,9 @@ def properties_changed(self, modified): # "class" and "orient" will only display; "class_orient" + if modified and "flag" in modified and self.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) @@ -1004,6 +1008,7 @@ item._size = size item.sizer = self + item.properties["flag"]._check_value() item.properties["pos"].set(pos) ################################################################################################################ @@ -1441,6 +1446,49 @@ 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() + msg = 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: + msg = "Vertical alignment flags are ignored in vertical sizers" + remove.add("wxALIGN_CENTER_VERTICAL") + + # 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"}) + + 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 + msg = "Horizontal alignment flags are ignored in horizontal sizers" + remove.add("wxALIGN_CENTER_HORIZONTAL") + + 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 @@ -1707,6 +1755,7 @@ 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) @@ -1924,6 +1973,21 @@ self.layout(True) #################################################################################################################### + def _check_flags(self, flags, added=None): + remove = set() + 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"} + else: + remove = {"wxEXPAND"} + msg = "wxEXPAND flag would be overridden by alignment flags" + return set(), remove, msg + @_frozen def properties_changed(self, modified): rows, cols = self._get_actual_rows_cols() @@ -2056,10 +2120,11 @@ def _set_converter(self, value): # used by set() if isinstance(value, compat.basestring): + if not value: return [] try: value = sorted( [int(n) for n in value.split(",") ] ) except: - return None + return [] return value def _convert_from_text(self, text=None): @@ -2234,8 +2299,9 @@ "get pos for all slots that are SizerSlots only, but are occupied by other items spanning over rows/cols" pos = 0 occupied = [] - for row in range(self.rows): - for col in range(self.cols): + 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] @@ -2528,7 +2594,7 @@ btn = wx.Button(self, wx.ID_OK, _('OK')) btn.SetDefault() hsizer.Add(btn, 1, wx.ALL, 5) - szr.Add(hsizer, 0, wx.EXPAND|wx.ALIGN_CENTER ) + szr.Add(hsizer, 0, wx.EXPAND ) self.SetAutoLayout(1) self.SetSizer(szr) szr.Fit(self) @@ -2644,7 +2710,7 @@ # static box sizer around the grid sizer boxsizer = wx.StaticBoxSizer(wx.StaticBox(self, -1, _("Layout")), wx.VERTICAL) boxsizer.Add(gsizer) - sizer.Add(boxsizer, 0, wx.ALL, 3) + sizer.Add(boxsizer, 0, wx.EXPAND | wx.ALL, 3) # horizontal sizer for action buttons hsizer = wx.BoxSizer(wx.HORIZONTAL) @@ -2652,7 +2718,7 @@ 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) diff -Nru wxglade-0.9.5/edit_windows.py wxglade-0.9.6/edit_windows.py --- wxglade-0.9.5/edit_windows.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/edit_windows.py 2020-05-30 22:05:16.000000000 +0000 @@ -580,14 +580,15 @@ # inside the sizer (proportion, borders, alignment...) self._has_layout = not sizer.is_virtual() + self.sizer = sizer + # attributes to keep the values of the sizer properties self.pos = np.LayoutPosProperty(pos) # position within the sizer, 1-based 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(wx.ADJUST_MINSIZE) # alignment, border; expansion in other dir. + self.flag = np.ManagedFlags(0) # alignment, border; expansion in other dir. - self.sizer = sizer sizer.add_item(self, pos) def check_defaults(self): @@ -628,6 +629,9 @@ def properties_changed(self, modified): WindowBase.properties_changed(self, modified) p = self.properties["flag"] + 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: self.properties["proportion"].set(0, notify=False) elif "option" in modified and self.proportion and "wxSHAPED" in p.value_set: @@ -1040,14 +1044,15 @@ self.sel_marker = None old_widget = self.widget old_widget.Hide() - si = self.sizer.widget.GetItem(old_widget) + inside_sizer = self.sizer and not self.sizer.is_virtual() + if inside_sizer: si = self.sizer.widget.GetItem(old_widget) self.create_widget() - compat.SizerItem_SetWindow(si, self.widget) + if inside_sizer: compat.SizerItem_SetWindow(si, self.widget) compat.DestroyLater(old_widget) - self.sizer.item_properties_modified(self) # will call toplevel Refresh as well + if inside_sizer: self.sizer.item_properties_modified(self) # will call toplevel Refresh as well self.finish_widget_creation(re_add=False) - self.sizer.layout() + if inside_sizer: self.sizer.layout() if focused: misc.focused_widget = self if self.sel_marker: self.sel_marker.Show(True) diff -Nru wxglade-0.9.5/examples/matplotlib3/matplotlib_example.py wxglade-0.9.6/examples/matplotlib3/matplotlib_example.py --- wxglade-0.9.5/examples/matplotlib3/matplotlib_example.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/examples/matplotlib3/matplotlib_example.py 2020-05-30 22:05:16.000000000 +0000 @@ -105,8 +105,11 @@ # register a handler for all canvas events except 'motion_notify_event', which would cause too much traffic for event in ('button_press_event', 'button_release_event', 'key_press_event', 'key_release_event', 'draw_event', 'pick_event', 'resize_event', 'scroll_event', - 'figure_enter_event', 'figure_leave_event', 'axes_enter_event', 'axes_leave_event'): + 'figure_enter_event', 'figure_leave_event'): self.canvas.mpl_connect(event, self.on_canvas_event) + # a separate handler for these as str(event) would fail + for event in ('axes_enter_event', 'axes_leave_event'): + self.canvas.mpl_connect(event, self.on_canvas_axes_event) # in addition, there are events from the axes: 'xlim_changed', 'ylim_changed' (see self.get_axes()) ################################################################################################################### @@ -114,6 +117,9 @@ def on_canvas_event(self, event): print("canvas event:", event) + def on_canvas_axes_event(self, event): + print("canvas axes event:", f"{event.name}: xy=({event.x}, {event.y}) xydata=({event.xdata}, {event.ydata})") + ################################################################################################################### # global actions: add plot or clear plots or all def get_axes(self): @@ -360,7 +366,11 @@ except (ValueError, OverflowError): pass else: - artists = [a for a in event.inaxes.mouseover_set if a.contains(event) and a.get_visible()] + if hasattr(event.inaxes, "_mouseover_set"): + artists = [a for a in event.inaxes._mouseover_set if a.contains(event) and a.get_visible()] + else: + # old matplotlib versions + artists = [a for a in event.inaxes.mouseover_set if a.contains(event) and a.get_visible()] if artists: a = cbook._topmost_artist(artists) diff -Nru wxglade-0.9.5/examples/matplotlib3/matplotlib_GUI.py wxglade-0.9.6/examples/matplotlib3/matplotlib_GUI.py --- wxglade-0.9.5/examples/matplotlib3/matplotlib_GUI.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/examples/matplotlib3/matplotlib_GUI.py 2020-05-30 22:05:16.000000000 +0000 @@ -258,7 +258,7 @@ 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.ALIGN_CENTER_VERTICAL | wx.EXPAND, 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) @@ -285,7 +285,7 @@ sizer_12.Add(self.button_clear_plots, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 30) sizer_12.Add(self.button_clear_figures, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 8) sizer_12.Add(self.button_clear_all, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 8) - sizer_12.Add((20, 20), 1, wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 0) + sizer_12.Add((20, 20), 1, wx.EXPAND, 0) sizer_12.Add(self.button_multicursor, 0, 0, 0) sizer_19.Add(sizer_12, 0, wx.ALL | wx.EXPAND, 3) label_4 = wx.StaticText(self.notebook_3_pane_1, wx.ID_ANY, "f(x) = ") diff -Nru wxglade-0.9.5/examples/matplotlib3/matplotlib_GUI.wxg wxglade-0.9.6/examples/matplotlib3/matplotlib_GUI.wxg --- wxglade-0.9.5/examples/matplotlib3/matplotlib_GUI.wxg 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/examples/matplotlib3/matplotlib_GUI.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -89,7 +89,7 @@ 0 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 20 20 @@ -310,7 +310,7 @@ 0 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 20 20 diff -Nru wxglade-0.9.5/examples/simplebook/simplebook.py wxglade-0.9.6/examples/simplebook/simplebook.py --- wxglade-0.9.5/examples/simplebook/simplebook.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/examples/simplebook/simplebook.py 2020-05-30 22:05:16.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: UTF-8 -*- # -# generated by wxGlade 0.8.0b1 on Sat Dec 23 21:27:06 2017 +# generated by wxGlade 0.9.5 on Wed Apr 29 21:00:24 2020 # import wx @@ -16,6 +16,7 @@ class MySimplebook(wx.Simplebook): def __init__(self, *args, **kwds): # 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") @@ -33,8 +34,8 @@ # 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.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.button_2.SetFont(wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + 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): @@ -42,14 +43,14 @@ 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.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + 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) - sizer_2.Add(self.button_1, 1, wx.ALIGN_BOTTOM | wx.ALL | wx.EXPAND, 20) + sizer_2.Add(self.button_1, 1, wx.ALL | wx.EXPAND, 20) self.notebook_1_pane_1.SetSizer(sizer_2) 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.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + 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) - sizer_3.Add(self.button_2, 1, wx.ALIGN_BOTTOM | wx.ALL | wx.EXPAND, 20) + sizer_3.Add(self.button_2, 1, wx.ALL | wx.EXPAND, 20) self.notebook_1_notebook_1_pane_2.SetSizer(sizer_3) # end wxGlade @@ -60,6 +61,7 @@ # 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.simplebook_1 = MySimplebook(self, wx.ID_ANY) self.__set_properties() @@ -77,7 +79,6 @@ sizer_1.Add(self.simplebook_1, 1, wx.EXPAND, 0) self.SetSizer(sizer_1) self.Layout() - self.SetSize((400, 300)) # end wxGlade # end of class MyFrame diff -Nru wxglade-0.9.5/examples/simplebook/simplebook.wxg wxglade-0.9.6/examples/simplebook/simplebook.wxg --- wxglade-0.9.5/examples/simplebook/simplebook.wxg 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/examples/simplebook/simplebook.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -1,7 +1,7 @@ - + - + 400, 300 frame @@ -42,7 +42,7 @@ 20 - wxALL|wxEXPAND|wxALIGN_BOTTOM + wxALL|wxEXPAND lambda event: self.ChangeSelection(1) @@ -83,7 +83,7 @@ 20 - wxALL|wxEXPAND|wxALIGN_BOTTOM + wxALL|wxEXPAND lambda event: self.ChangeSelection(0) diff -Nru wxglade-0.9.5/font_dialog.py wxglade-0.9.6/font_dialog.py --- wxglade-0.9.5/font_dialog.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/font_dialog.py 2020-05-30 22:05:16.000000000 +0000 @@ -13,18 +13,19 @@ class wxGladeFontDialog(wx.Dialog): - font_families_to = { 'default': wx.DEFAULT, 'decorative': wx.DECORATIVE, - 'roman': wx.ROMAN, 'swiss': wx.SWISS, - 'script':wx.SCRIPT, 'modern': wx.MODERN } + 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 } font_families_from = _reverse_dict(font_families_to) - font_styles_to = { 'normal': wx.NORMAL, 'slant': wx.SLANT, - 'italic': wx.ITALIC } + font_styles_to = { 'normal': wx.FONTSTYLE_NORMAL, 'slant': wx.FONTSTYLE_SLANT, + 'italic': wx.FONTSTYLE_ITALIC } font_styles_from = _reverse_dict(font_styles_to) - font_weights_to = {'normal': wx.NORMAL, 'light': wx.LIGHT, 'bold': wx.BOLD } + font_weights_to = {'normal': wx.FONTWEIGHT_NORMAL, 'light': wx.FONTWEIGHT_LIGHT, + 'bold': wx.FONTWEIGHT_BOLD, 'max':wx.FONTWEIGHT_MAX } font_weights_from = _reverse_dict(font_weights_to) - font_families_to['teletype'] = wx.TELETYPE - font_families_from[wx.TELETYPE] = 'teletype' + font_families_to['teletype'] = wx.FONTFAMILY_TELETYPE + font_families_from[wx.FONTFAMILY_TELETYPE] = 'teletype' def __init__(self, *args, **kwds): self._logger = logging.getLogger(self.__class__.__name__) diff -Nru wxglade-0.9.5/main.py wxglade-0.9.6/main.py --- wxglade-0.9.5/main.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/main.py 2020-05-30 22:05:16.000000000 +0000 @@ -1331,7 +1331,7 @@ common.init_preferences() self.locale = wx.Locale(wx.LANGUAGE_DEFAULT) # avoid PyAssertionErrors - compat.wx_ArtProviderPush(wxGladeArtProvider()) + #compat.wx_ArtProviderPush(wxGladeArtProvider()) causes crashes on Cent OS 7 frame = wxGladeFrame() self.SetTopWindow(frame) diff -Nru wxglade-0.9.5/new_properties.py wxglade-0.9.6/new_properties.py --- wxglade-0.9.5/new_properties.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/new_properties.py 2020-05-30 22:05:16.000000000 +0000 @@ -56,6 +56,7 @@ 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 + def __init__(self, value, default_value=_DefaultArgument, name=None):#, write_always=False): self._logger = logging.getLogger(self.__class__.__name__) self.value = value @@ -70,10 +71,12 @@ self.default_value = default_value self.controls = None self.editing = False + def set_owner(self, owner, attributename=None): self.owner = owner self.attributename = attributename if self.name is None: self.name = attributename + #################################################################################################################### # the interface from owner and application def get(self): @@ -583,9 +586,9 @@ self.colspin.Enable(max_cols!=1) # layout of the controls / sizers - hsizer.Add(wx.StaticText(panel, -1, _("Rows:")), 1, wx.LEFT | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 3) + 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) - hsizer.Add(wx.StaticText(panel, -1, _("Cols:")), 1, wx.LEFT | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 3) + 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) sizer.Add(hsizer, 0, wx.EXPAND) @@ -749,7 +752,7 @@ class _CheckListProperty(Property): # common base class for Flags and WidgetStyleFlags; keeps self.value_set as a set of strings CONTROLNAMES = ["enabler", "_choices"] - EXCLUDES = None + EXCLUDES = EXCLUDES2 = None # EXCLUDES2 will be set dynamically def __init__(self, value, default_value=_DefaultArgument, name=None, names=None, values=None): self._names = names @@ -866,6 +869,10 @@ self.on_focus() self._change_value(value, checked) + def _check_value(self, added=None): + # e.g. used by ManagedFlags + pass + def _change_value(self, value, checked): "user has clicked checkbox or History is setting" if checked: @@ -895,6 +902,8 @@ self.value_set.difference_update( combination ) self.value_set.add(name) + self._check_value(checked and value or None) # e.g. used by ManagedFlags + self.value = None # to be calculated on demand self._notify() common.history.set_property_changed(self, value, checked) @@ -928,6 +937,11 @@ checkbox.SetForegroundColour(wx.BLUE) else: checkbox.SetForegroundColour(default_color) + if self.EXCLUDES2 and name in self.EXCLUDES2: + checkbox.SetForegroundColour(wx.RED) + checkbox.Disable() + elif self.EXCLUDES2 is not None: + checkbox.Enable() checkbox.Refresh() #################################################################################################################### @@ -1031,6 +1045,15 @@ _CheckListProperty.__init__(self, value, default_value, name, self.FLAG_NAMES, self.FLAG_VALUES) self.style_defs = config.widget_config['generic_styles'] + 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) + self.value = None # calculate value from value_set on demand + self.EXCLUDES2 = excludes + def _decode_value(self, value): # handle obsolete and renamed flags new_value = _CheckListProperty._decode_value(self, value) @@ -2071,7 +2094,7 @@ return compat.wx_SystemSettings_GetColour(self.str_to_colors[color]) elif color.startswith("#"): return misc.string_to_color(color) - ret = wx.NamedColour(color) + ret = compat.wx_NamedColour(color) if ret.IsOk(): return ret return None @@ -2095,17 +2118,17 @@ deactivated = True class FontProperty(DialogProperty): - font_families_to = {'default': wx.DEFAULT, - 'decorative': wx.DECORATIVE, 'roman': wx.ROMAN, - 'swiss': wx.SWISS, 'script': wx.SCRIPT, 'modern': wx.MODERN } + 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 } font_families_from = misc._reverse_dict(font_families_to) - font_styles_to = {'normal': wx.NORMAL, 'slant': wx.SLANT, 'italic': wx.ITALIC } + font_styles_to = {'normal': wx.FONTSTYLE_NORMAL, 'slant': wx.FONTSTYLE_SLANT, 'italic': wx.FONTSTYLE_ITALIC } font_styles_from = misc._reverse_dict(font_styles_to) - font_weights_to = {'normal': wx.NORMAL, 'light': wx.LIGHT, 'bold': wx.BOLD } + font_weights_to = {'normal': wx.FONTWEIGHT_NORMAL, 'light': wx.FONTWEIGHT_LIGHT, 'bold': wx.FONTWEIGHT_BOLD } font_weights_from = misc._reverse_dict(font_weights_to) - font_families_to['teletype'] = wx.TELETYPE - font_families_from[wx.TELETYPE] = 'teletype' + 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 _]*)'] *") @@ -2759,11 +2782,12 @@ return values = self._ensure_editing_copy() if values: - self.grid.DeleteRows(self.cur_row) - del values[self.cur_row] + cur_row = self.cur_row + self.grid.DeleteRows(self.cur_row) # self.cur_row will change due to selection change + del values[cur_row] if self.with_index: - del self.indices[self.cur_row] - if self.cur_row>=len(values): + del self.indices[cur_row] + if self.cur_row>=len(values) and self.cur_row>0: self.cur_row -= 1 self._update_remove_button() diff -Nru wxglade-0.9.5/README.rst wxglade-0.9.6/README.rst --- wxglade-0.9.5/README.rst 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/README.rst 2020-05-30 22:05:16.000000000 +0000 @@ -5,12 +5,12 @@ .. image:: docs/html/_images/wxglade_large.png :align: center -Version: 0.9.5 +Version: 0.9.6 License: MIT (see LICENSE.txt) THIS PROGRAM COMES WITH NO WARRANTY - + Introduction ------------ @@ -25,21 +25,42 @@ * wxPython (http://www.wxpython.org) >= 2.8 (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. +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. diff -Nru wxglade-0.9.5/README.txt wxglade-0.9.6/README.txt --- wxglade-0.9.5/README.txt 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/README.txt 2020-05-30 22:05:16.000000000 +0000 @@ -1,7 +1,7 @@ wxGlade: A GUI builder for wxPython/wxWidgets ============================================= -Version: 0.9.5 +Version: 0.9.6 License: MIT (see LICENSE.txt) THIS PROGRAM COMES WITH NO WARRANTY diff -Nru wxglade-0.9.5/sphinx/conf.py wxglade-0.9.6/sphinx/conf.py --- wxglade-0.9.5/sphinx/conf.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/sphinx/conf.py 2020-05-30 22:05:16.000000000 +0000 @@ -57,7 +57,7 @@ # The short X.Y version. version = '0.9' # The full version, including alpha/beta/rc tags. -release = '0.9.5' +release = '0.9.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff -Nru wxglade-0.9.5/templates_ui.py wxglade-0.9.6/templates_ui.py --- wxglade-0.9.5/templates_ui.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/templates_ui.py 2020-05-30 22:05:16.000000000 +0000 @@ -114,7 +114,7 @@ sizer_3 = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Available templates")), wx.VERTICAL) sizer_3.Add(self.template_names, 1, wx.ALL | wx.EXPAND, 3) sizer_2.Add(sizer_3, 1, wx.ALL | wx.EXPAND, 5) - sizer_4.Add(self.template_name, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 7) + sizer_4.Add(self.template_name, 0, wx.ALL, 7) sizer_5.Add(self.author, 1, 0, 0) sizer_4.Add(sizer_5, 0, wx.ALL | wx.EXPAND, 5) sizer_6.Add(self.description, 1, wx.EXPAND, 0) diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_28_Classic.py wxglade-0.9.6/tests/casefiles/AllWidgets_28_Classic.py --- wxglade-0.9.5/tests/casefiles/AllWidgets_28_Classic.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_28_Classic.py 2020-05-30 22:05:16.000000000 +0000 @@ -323,10 +323,10 @@ 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.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_file, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_nofile, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_art, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) + 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) diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_28.cpp wxglade-0.9.6/tests/casefiles/AllWidgets_28.cpp --- wxglade-0.9.5/tests/casefiles/AllWidgets_28.cpp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_28.cpp 2020-05-30 22:05:16.000000000 +0000 @@ -353,10 +353,10 @@ 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, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - sizer_11->Add(bitmap_file, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - sizer_11->Add(bitmap_nofile, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - sizer_11->Add(bitmap_art, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); + 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); 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); diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_28.lisp wxglade-0.9.6/tests/casefiles/AllWidgets_28.lisp --- wxglade-0.9.5/tests/casefiles/AllWidgets_28.lisp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_28.lisp 2020-05-30 22:05:16.000000000 +0000 @@ -499,10 +499,10 @@ (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 wxALIGN_CENTER wxALL wxEXPAND) 5 nil) - (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-file obj) 1 (logior wxALIGN_CENTER wxALL wxEXPAND) 5 nil) - (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-nofile obj) 1 (logior wxALIGN_CENTER wxALL wxEXPAND) 5 nil) - (wxSizer_AddWindow (slot-sizer-11 obj) (slot-bitmap-art obj) 1 (logior wxALIGN_CENTER wxALL wxEXPAND) 5 nil) + (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) diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_28_Phoenix.py wxglade-0.9.6/tests/casefiles/AllWidgets_28_Phoenix.py --- wxglade-0.9.5/tests/casefiles/AllWidgets_28_Phoenix.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_28_Phoenix.py 2020-05-30 22:05:16.000000000 +0000 @@ -323,10 +323,10 @@ 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.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_file, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_nofile, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_art, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) + 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) diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_28.pl wxglade-0.9.6/tests/casefiles/AllWidgets_28.pl --- wxglade-0.9.5/tests/casefiles/AllWidgets_28.pl 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_28.pl 2020-05-30 22:05:16.000000000 +0000 @@ -360,10 +360,10 @@ $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, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - $self->{sizer_11}->Add($self->{bitmap_file}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - $self->{sizer_11}->Add($self->{bitmap_nofile}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - $self->{sizer_11}->Add($self->{bitmap_art}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); + $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); diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_28_Saved.wxg wxglade-0.9.6/tests/casefiles/AllWidgets_28_Saved.wxg --- wxglade-0.9.5/tests/casefiles/AllWidgets_28_Saved.wxg 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_28_Saved.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -786,7 +786,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND empty:32,32 1 @@ -795,7 +795,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND icon.xpm 1 @@ -804,7 +804,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND non-existing.bmp 1 @@ -813,7 +813,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND art:wxART_PRINT,wxART_OTHER,32,32 1 diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_28.xrc wxglade-0.9.6/tests/casefiles/AllWidgets_28.xrc --- wxglade-0.9.5/tests/casefiles/AllWidgets_28.xrc 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_28.xrc 2020-05-30 22:05:16.000000000 +0000 @@ -728,14 +728,14 @@ wxVERTICAL - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 icon.xpm @@ -743,7 +743,7 @@ - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 non-existing.bmp @@ -751,7 +751,7 @@ - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_30_Classic.py wxglade-0.9.6/tests/casefiles/AllWidgets_30_Classic.py --- wxglade-0.9.5/tests/casefiles/AllWidgets_30_Classic.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_30_Classic.py 2020-05-30 22:05:16.000000000 +0000 @@ -339,12 +339,12 @@ 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.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_file, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_nofile, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_art, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_null, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_null_sized, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) + 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) diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_30.cpp wxglade-0.9.6/tests/casefiles/AllWidgets_30.cpp --- wxglade-0.9.5/tests/casefiles/AllWidgets_30.cpp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_30.cpp 2020-05-30 22:05:16.000000000 +0000 @@ -367,12 +367,12 @@ 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, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - sizer_11->Add(bitmap_file, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - sizer_11->Add(bitmap_nofile, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - sizer_11->Add(bitmap_art, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - sizer_11->Add(bitmap_null, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - sizer_11->Add(bitmap_null_sized, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); + 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); diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_30_Phoenix.py wxglade-0.9.6/tests/casefiles/AllWidgets_30_Phoenix.py --- wxglade-0.9.5/tests/casefiles/AllWidgets_30_Phoenix.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_30_Phoenix.py 2020-05-30 22:05:16.000000000 +0000 @@ -339,12 +339,12 @@ 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.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_file, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_nofile, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_art, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_null, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) - sizer_11.Add(self.bitmap_null_sized, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) + 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) diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_30.pl wxglade-0.9.6/tests/casefiles/AllWidgets_30.pl --- wxglade-0.9.5/tests/casefiles/AllWidgets_30.pl 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_30.pl 2020-05-30 22:05:16.000000000 +0000 @@ -377,12 +377,12 @@ $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, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - $self->{sizer_11}->Add($self->{bitmap_file}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - $self->{sizer_11}->Add($self->{bitmap_nofile}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - $self->{sizer_11}->Add($self->{bitmap_art}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - $self->{sizer_11}->Add($self->{bitmap_null}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); - $self->{sizer_11}->Add($self->{bitmap_null_sized}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); + $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); diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_30_Saved.wxg wxglade-0.9.6/tests/casefiles/AllWidgets_30_Saved.wxg --- wxglade-0.9.5/tests/casefiles/AllWidgets_30_Saved.wxg 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_30_Saved.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -814,7 +814,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND empty:32,32 1 @@ -823,7 +823,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND icon.xpm 1 @@ -832,7 +832,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND non-existing.bmp 1 @@ -841,7 +841,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND art:wxART_PRINT,wxART_OTHER,32,32 1 @@ -850,7 +850,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND 1 @@ -858,7 +858,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND 50, 50 1 diff -Nru wxglade-0.9.5/tests/casefiles/AllWidgets_30.xrc wxglade-0.9.6/tests/casefiles/AllWidgets_30.xrc --- wxglade-0.9.5/tests/casefiles/AllWidgets_30.xrc 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/AllWidgets_30.xrc 2020-05-30 22:05:16.000000000 +0000 @@ -761,14 +761,14 @@ wxVERTICAL - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 icon.xpm @@ -776,7 +776,7 @@ - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 non-existing.bmp @@ -784,7 +784,7 @@ - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 @@ -792,14 +792,14 @@ - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 50, 50 diff -Nru wxglade-0.9.5/tests/casefiles/app_wo_attrs_gui_new.wxg wxglade-0.9.6/tests/casefiles/app_wo_attrs_gui_new.wxg --- wxglade-0.9.5/tests/casefiles/app_wo_attrs_gui_new.wxg 1970-01-01 00:00:00.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/app_wo_attrs_gui_new.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + Stock Action + 150,150 + + diff -Nru wxglade-0.9.5/tests/casefiles/bars_wo_parent.cpp wxglade-0.9.6/tests/casefiles/bars_wo_parent.cpp --- wxglade-0.9.5/tests/casefiles/bars_wo_parent.cpp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bars_wo_parent.cpp 2020-05-30 22:05:16.000000000 +0000 @@ -95,7 +95,7 @@ { // begin wxGlade: MyFrame::do_layout wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL); - sizer_1->Add(label_1, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 0); + sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 0); SetSizer(sizer_1); Layout(); // end wxGlade diff -Nru wxglade-0.9.5/tests/casefiles/bars_wo_parent.lisp wxglade-0.9.6/tests/casefiles/bars_wo_parent.lisp --- wxglade-0.9.5/tests/casefiles/bars_wo_parent.lisp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bars_wo_parent.lisp 2020-05-30 22:05:16.000000000 +0000 @@ -120,7 +120,7 @@ (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 (logior wxALIGN_CENTER wxALL wxEXPAND) 0 nil) + (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.5/tests/casefiles/bars_wo_parent.pl wxglade-0.9.6/tests/casefiles/bars_wo_parent.pl --- wxglade-0.9.5/tests/casefiles/bars_wo_parent.pl 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bars_wo_parent.pl 2020-05-30 22:05:16.000000000 +0000 @@ -133,7 +133,7 @@ my $self = shift; # begin wxGlade: MyFrame::__do_layout $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL); - $self->{sizer_1}->Add($self->{label_1}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 0); + $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 0); $self->SetSizer($self->{sizer_1}); $self->Layout(); # end wxGlade diff -Nru wxglade-0.9.5/tests/casefiles/bars_wo_parent.py wxglade-0.9.6/tests/casefiles/bars_wo_parent.py --- wxglade-0.9.5/tests/casefiles/bars_wo_parent.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bars_wo_parent.py 2020-05-30 22:05:16.000000000 +0000 @@ -78,7 +78,7 @@ def __do_layout(self): # begin wxGlade: MyFrame.__do_layout sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_1.Add(self.label_1, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 0) + 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.5/tests/casefiles/bars_wo_parent_Saved.wxg wxglade-0.9.6/tests/casefiles/bars_wo_parent_Saved.wxg --- wxglade-0.9.5/tests/casefiles/bars_wo_parent_Saved.wxg 1970-01-01 00:00:00.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bars_wo_parent_Saved.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + 200, 200 + frame_1 + + wxVERTICAL + + + 0 + wxALL|wxEXPAND + + + + 1 + + + + + diff -Nru wxglade-0.9.5/tests/casefiles/bars_wo_parent.xrc wxglade-0.9.6/tests/casefiles/bars_wo_parent.xrc --- wxglade-0.9.5/tests/casefiles/bars_wo_parent.xrc 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bars_wo_parent.xrc 2020-05-30 22:05:16.000000000 +0000 @@ -16,7 +16,7 @@ wxVERTICAL - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND diff -Nru wxglade-0.9.5/tests/casefiles/bug183.cpp wxglade-0.9.6/tests/casefiles/bug183.cpp --- wxglade-0.9.5/tests/casefiles/bug183.cpp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug183.cpp 2020-05-30 22:05:16.000000000 +0000 @@ -40,7 +40,7 @@ { // begin wxGlade: Bug183_UI_Frame::do_layout wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL); - sizer_1->Add(label_1, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); + sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 5); SetSizer(sizer_1); sizer_1->Fit(this); Layout(); diff -Nru wxglade-0.9.5/tests/casefiles/bug183.lisp wxglade-0.9.6/tests/casefiles/bug183.lisp --- wxglade-0.9.5/tests/casefiles/bug183.lisp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug183.lisp 2020-05-30 22:05:16.000000000 +0000 @@ -53,7 +53,7 @@ (defmethod do-layout ((obj Bug183::UI::Frame)) ;;; begin wxGlade: Bug183::UI::Frame.__do_layout (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL)) - (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 1 (logior wxALIGN_CENTER wxALL wxEXPAND) 5 nil) + (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)) diff -Nru wxglade-0.9.5/tests/casefiles/bug183.pl wxglade-0.9.6/tests/casefiles/bug183.pl --- wxglade-0.9.5/tests/casefiles/bug183.pl 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug183.pl 2020-05-30 22:05:16.000000000 +0000 @@ -54,7 +54,7 @@ my $self = shift; # begin wxGlade: Bug183::UI::Frame::__do_layout $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL); - $self->{sizer_1}->Add($self->{label_1}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); + $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5); $self->SetSizer($self->{sizer_1}); $self->{sizer_1}->Fit($self); $self->Layout(); diff -Nru wxglade-0.9.5/tests/casefiles/bug183.py wxglade-0.9.6/tests/casefiles/bug183.py --- wxglade-0.9.5/tests/casefiles/bug183.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug183.py 2020-05-30 22:05:16.000000000 +0000 @@ -33,7 +33,7 @@ def __do_layout(self): # begin wxGlade: Bug183_UI_Frame.__do_layout sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_1.Add(self.label_1, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) + sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5) self.SetSizer(sizer_1) sizer_1.Fit(self) self.Layout() diff -Nru wxglade-0.9.5/tests/casefiles/bug183.wxg wxglade-0.9.6/tests/casefiles/bug183.wxg --- wxglade-0.9.5/tests/casefiles/bug183.wxg 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug183.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -9,7 +9,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER + wxALL|wxEXPAND 1 diff -Nru wxglade-0.9.5/tests/casefiles/bug183.xrc wxglade-0.9.6/tests/casefiles/bug183.xrc --- wxglade-0.9.5/tests/casefiles/bug183.xrc 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug183.xrc 2020-05-30 22:05:16.000000000 +0000 @@ -8,7 +8,7 @@ wxVERTICAL - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 diff -Nru wxglade-0.9.5/tests/casefiles/bug184.cpp wxglade-0.9.6/tests/casefiles/bug184.cpp --- wxglade-0.9.5/tests/casefiles/bug184.cpp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug184.cpp 2020-05-30 22:05:16.000000000 +0000 @@ -41,7 +41,7 @@ { // begin wxGlade: Bug184_Frame::do_layout wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL); - sizer_1->Add(label_1, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); + sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 5); SetSizer(sizer_1); sizer_1->Fit(this); Layout(); diff -Nru wxglade-0.9.5/tests/casefiles/bug184.lisp wxglade-0.9.6/tests/casefiles/bug184.lisp --- wxglade-0.9.5/tests/casefiles/bug184.lisp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug184.lisp 2020-05-30 22:05:16.000000000 +0000 @@ -54,7 +54,7 @@ (defmethod do-layout ((obj Bug184_Frame)) ;;; begin wxGlade: Bug184_Frame.__do_layout (setf (slot-sizer-1 obj) (wxBoxSizer_Create wxVERTICAL)) - (wxSizer_AddWindow (slot-sizer-1 obj) (slot-label-1 obj) 1 (logior wxALIGN_CENTER wxALL wxEXPAND) 5 nil) + (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)) diff -Nru wxglade-0.9.5/tests/casefiles/bug184_Phoenix.py wxglade-0.9.6/tests/casefiles/bug184_Phoenix.py --- wxglade-0.9.5/tests/casefiles/bug184_Phoenix.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug184_Phoenix.py 2020-05-30 22:05:16.000000000 +0000 @@ -34,7 +34,7 @@ def __do_layout(self): # begin wxGlade: Bug184_Frame.__do_layout sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_1.Add(self.label_1, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) + sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5) self.SetSizer(sizer_1) sizer_1.Fit(self) self.Layout() diff -Nru wxglade-0.9.5/tests/casefiles/bug184.pl wxglade-0.9.6/tests/casefiles/bug184.pl --- wxglade-0.9.5/tests/casefiles/bug184.pl 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug184.pl 2020-05-30 22:05:16.000000000 +0000 @@ -55,7 +55,7 @@ my $self = shift; # begin wxGlade: Bug184_Frame::__do_layout $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL); - $self->{sizer_1}->Add($self->{label_1}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5); + $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 5); $self->SetSizer($self->{sizer_1}); $self->{sizer_1}->Fit($self); $self->Layout(); diff -Nru wxglade-0.9.5/tests/casefiles/bug184.py wxglade-0.9.6/tests/casefiles/bug184.py --- wxglade-0.9.5/tests/casefiles/bug184.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug184.py 2020-05-30 22:05:16.000000000 +0000 @@ -34,7 +34,7 @@ def __do_layout(self): # begin wxGlade: Bug184_Frame.__do_layout sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_1.Add(self.label_1, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 5) + sizer_1.Add(self.label_1, 1, wx.ALL | wx.EXPAND, 5) self.SetSizer(sizer_1) sizer_1.Fit(self) self.Layout() diff -Nru wxglade-0.9.5/tests/casefiles/bug184_Saved.wxg wxglade-0.9.6/tests/casefiles/bug184_Saved.wxg --- wxglade-0.9.5/tests/casefiles/bug184_Saved.wxg 1970-01-01 00:00:00.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug184_Saved.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -0,0 +1,21 @@ + + + + + + wxSYS_COLOUR_BACKGROUND + frame_1 + + wxVERTICAL + + + 5 + wxALL|wxEXPAND + + + 1 + + + + + diff -Nru wxglade-0.9.5/tests/casefiles/bug184.xrc wxglade-0.9.6/tests/casefiles/bug184.xrc --- wxglade-0.9.5/tests/casefiles/bug184.xrc 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug184.xrc 2020-05-30 22:05:16.000000000 +0000 @@ -8,7 +8,7 @@ wxVERTICAL - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 5 diff -Nru wxglade-0.9.5/tests/casefiles/bug188_included_toolbar.cpp wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.cpp --- wxglade-0.9.5/tests/casefiles/bug188_included_toolbar.cpp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.cpp 2020-05-30 22:05:16.000000000 +0000 @@ -45,7 +45,7 @@ { // begin wxGlade: MyFrame::do_layout wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL); - sizer_1->Add(label_1, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 0); + sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 0); SetSizer(sizer_1); Layout(); // end wxGlade diff -Nru wxglade-0.9.5/tests/casefiles/bug188_included_toolbar.lisp wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.lisp --- wxglade-0.9.5/tests/casefiles/bug188_included_toolbar.lisp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.lisp 2020-05-30 22:05:16.000000000 +0000 @@ -63,7 +63,7 @@ (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 (logior wxALIGN_CENTER wxALL wxEXPAND) 0 nil) + (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.5/tests/casefiles/bug188_included_toolbar_Phoenix.py wxglade-0.9.6/tests/casefiles/bug188_included_toolbar_Phoenix.py --- wxglade-0.9.5/tests/casefiles/bug188_included_toolbar_Phoenix.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_included_toolbar_Phoenix.py 2020-05-30 22:05:16.000000000 +0000 @@ -40,7 +40,7 @@ def __do_layout(self): # begin wxGlade: MyFrame.__do_layout sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_1.Add(self.label_1, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 0) + 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.5/tests/casefiles/bug188_included_toolbar.pl wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.pl --- wxglade-0.9.5/tests/casefiles/bug188_included_toolbar.pl 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.pl 2020-05-30 22:05:16.000000000 +0000 @@ -61,7 +61,7 @@ my $self = shift; # begin wxGlade: MyFrame::__do_layout $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL); - $self->{sizer_1}->Add($self->{label_1}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 0); + $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 0); $self->SetSizer($self->{sizer_1}); $self->Layout(); # end wxGlade diff -Nru wxglade-0.9.5/tests/casefiles/bug188_included_toolbar.py wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.py --- wxglade-0.9.5/tests/casefiles/bug188_included_toolbar.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.py 2020-05-30 22:05:16.000000000 +0000 @@ -40,7 +40,7 @@ def __do_layout(self): # begin wxGlade: MyFrame.__do_layout sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_1.Add(self.label_1, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 0) + 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.5/tests/casefiles/bug188_included_toolbar_Saved.wxg wxglade-0.9.6/tests/casefiles/bug188_included_toolbar_Saved.wxg --- wxglade-0.9.5/tests/casefiles/bug188_included_toolbar_Saved.wxg 1970-01-01 00:00:00.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_included_toolbar_Saved.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -0,0 +1,36 @@ + + + + + + 200, 200 + frame_1 + 1 + + + + wxID_UP + + 1 + Up or Down + Up or Down + art:wxART_GO_UP,wxART_OTHER,32,32 + art:wxART_GO_DOWN,wxART_OTHER,32,32 + + + + + wxVERTICAL + + + 0 + wxALL|wxEXPAND + + + + 1 + + + + + diff -Nru wxglade-0.9.5/tests/casefiles/bug188_included_toolbar.xrc wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.xrc --- wxglade-0.9.5/tests/casefiles/bug188_included_toolbar.xrc 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_included_toolbar.xrc 2020-05-30 22:05:16.000000000 +0000 @@ -19,7 +19,7 @@ wxVERTICAL - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND diff -Nru wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar.cpp wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.cpp --- wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar.cpp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.cpp 2020-05-30 22:05:16.000000000 +0000 @@ -68,7 +68,7 @@ { // begin wxGlade: MyFrame::do_layout wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL); - sizer_1->Add(label_1, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 0); + sizer_1->Add(label_1, 1, wxALL|wxEXPAND, 0); SetSizer(sizer_1); Layout(); // end wxGlade diff -Nru wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar.lisp wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.lisp --- wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar.lisp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.lisp 2020-05-30 22:05:16.000000000 +0000 @@ -87,7 +87,7 @@ (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 (logior wxALIGN_CENTER wxALL wxEXPAND) 0 nil) + (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.5/tests/casefiles/bug188_standalone_toolbar_Phoenix.py wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar_Phoenix.py --- wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar_Phoenix.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar_Phoenix.py 2020-05-30 22:05:16.000000000 +0000 @@ -56,7 +56,7 @@ def __do_layout(self): # begin wxGlade: MyFrame.__do_layout sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_1.Add(self.label_1, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 0) + 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.5/tests/casefiles/bug188_standalone_toolbar.pl wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.pl --- wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar.pl 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.pl 2020-05-30 22:05:16.000000000 +0000 @@ -93,7 +93,7 @@ my $self = shift; # begin wxGlade: MyFrame::__do_layout $self->{sizer_1} = Wx::BoxSizer->new(wxVERTICAL); - $self->{sizer_1}->Add($self->{label_1}, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 0); + $self->{sizer_1}->Add($self->{label_1}, 1, wxALL|wxEXPAND, 0); $self->SetSizer($self->{sizer_1}); $self->Layout(); # end wxGlade diff -Nru wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar.py wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.py --- wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.py 2020-05-30 22:05:16.000000000 +0000 @@ -56,7 +56,7 @@ def __do_layout(self): # begin wxGlade: MyFrame.__do_layout sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_1.Add(self.label_1, 1, wx.ALIGN_CENTER | wx.ALL | wx.EXPAND, 0) + 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.5/tests/casefiles/bug188_standalone_toolbar_Saved.wxg wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar_Saved.wxg --- wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar_Saved.wxg 1970-01-01 00:00:00.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar_Saved.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -0,0 +1,35 @@ + + + + + + + + wxID_UP + + 1 + Up or Down + Up or Down + art:wxART_GO_UP,wxART_OTHER,32,32 + art:wxART_GO_DOWN,wxART_OTHER,32,32 + + + + + 200, 200 + frame_1 + + wxVERTICAL + + + 0 + wxALL|wxEXPAND + + + + 1 + + + + + diff -Nru wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar.xrc wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.xrc --- wxglade-0.9.5/tests/casefiles/bug188_standalone_toolbar.xrc 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/bug188_standalone_toolbar.xrc 2020-05-30 22:05:16.000000000 +0000 @@ -19,7 +19,7 @@ wxVERTICAL - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_classattr.cpp wxglade-0.9.6/tests/casefiles/Sizers_classattr.cpp --- wxglade-0.9.5/tests/casefiles/Sizers_classattr.cpp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_classattr.cpp 2020-05-30 22:05:16.000000000 +0000 @@ -61,7 +61,7 @@ sizer_4->Add(20, 20, 0, wxEXPAND, 0); sizer_4->AddGrowableRow(0); sizer_4->AddGrowableRow(3); - grid_sizer_2->Add(sizer_4, 1, wxALIGN_CENTER|wxEXPAND, 0); + 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); diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_classattr.lisp wxglade-0.9.6/tests/casefiles/Sizers_classattr.lisp --- wxglade-0.9.5/tests/casefiles/Sizers_classattr.lisp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_classattr.lisp 2020-05-30 22:05:16.000000000 +0000 @@ -86,7 +86,7 @@ (wxSizer_AddWindow (slot-sizer-4 obj) ((20, 20) obj) 0 wxEXPAND 0 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 (logior wxALIGN_CENTER wxEXPAND) 0 nil) + (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) diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_classattr.pl wxglade-0.9.6/tests/casefiles/Sizers_classattr.pl --- wxglade-0.9.5/tests/casefiles/Sizers_classattr.pl 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_classattr.pl 2020-05-30 22:05:16.000000000 +0000 @@ -76,7 +76,7 @@ $self->{sizer_4}->Add(20, 20, 0, wxEXPAND, 0); $self->{sizer_4}->AddGrowableRow(0); $self->{sizer_4}->AddGrowableRow(3); - $self->{grid_sizer_2}->Add($self->{sizer_4}, 1, wxALIGN_CENTER|wxEXPAND, 0); + $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); diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_classattr.py wxglade-0.9.6/tests/casefiles/Sizers_classattr.py --- wxglade-0.9.5/tests/casefiles/Sizers_classattr.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_classattr.py 2020-05-30 22:05:16.000000000 +0000 @@ -52,7 +52,7 @@ self.sizer_4.Add((20, 20), 0, wx.EXPAND, 0) self.sizer_4.AddGrowableRow(0) self.sizer_4.AddGrowableRow(3) - self.grid_sizer_2.Add(self.sizer_4, 1, wx.ALIGN_CENTER | wx.EXPAND, 0) + 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) diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_classattr_Saved.wxg wxglade-0.9.6/tests/casefiles/Sizers_classattr_Saved.wxg --- wxglade-0.9.5/tests/casefiles/Sizers_classattr_Saved.wxg 1970-01-01 00:00:00.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_classattr_Saved.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -0,0 +1,157 @@ + + + + + + dialog_1 + + + 1 + 3 + 1 + 0 + 0 + 0 + 0 + + + 0 + wxEXPAND + + 1 + 1 + 3 + 0 + 0 + 0 + 0,2 + + + 0 + wxEXPAND + + wxHORIZONTAL + 1 + + + + 5 + wxALL|wxEXPAND + + -1 + + + + + + + + + 0 + wxEXPAND + + 1 + 4 + 1 + 0 + 0 + 0,3 + + + 0 + wxEXPAND + + 20 + 20 + + + + + 5 + wxALL + + + ADD + + + + + 5 + wxALL + + + REMOVE + + + + + 0 + wxEXPAND + + 20 + 20 + + + + + + + 0 + wxEXPAND + + wxHORIZONTAL + 1 + + + + 5 + wxALL|wxEXPAND + + -1 + + + + + + + + + + + 5 + wxALL|wxEXPAND + + + 1 + + + + + 0 + wxEXPAND|wxALIGN_RIGHT + + wxHORIZONTAL + 1 + + + 5 + wxALL + + + OK + + + + + 5 + wxALL + + + CANCEL + + + + + + + diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_classattr.xrc wxglade-0.9.6/tests/casefiles/Sizers_classattr.xrc --- wxglade-0.9.5/tests/casefiles/Sizers_classattr.xrc 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_classattr.xrc 2020-05-30 22:05:16.000000000 +0000 @@ -44,7 +44,7 @@ - wxALIGN_CENTER|wxEXPAND + wxEXPAND 1 1 diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_no_classattr.cpp wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.cpp --- wxglade-0.9.5/tests/casefiles/Sizers_no_classattr.cpp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.cpp 2020-05-30 22:05:16.000000000 +0000 @@ -61,7 +61,7 @@ sizer_4->Add(20, 20, 0, wxEXPAND, 0); sizer_4->AddGrowableRow(0); sizer_4->AddGrowableRow(3); - grid_sizer_2->Add(sizer_4, 1, wxALIGN_CENTER|wxEXPAND, 0); + 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); diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_no_classattr.lisp wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.lisp --- wxglade-0.9.5/tests/casefiles/Sizers_no_classattr.lisp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.lisp 2020-05-30 22:05:16.000000000 +0000 @@ -86,7 +86,7 @@ (wxSizer_AddWindow (slot-sizer-4 obj) ((20, 20) obj) 0 wxEXPAND 0 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 (logior wxALIGN_CENTER wxEXPAND) 0 nil) + (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) diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_no_classattr.pl wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.pl --- wxglade-0.9.5/tests/casefiles/Sizers_no_classattr.pl 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.pl 2020-05-30 22:05:16.000000000 +0000 @@ -76,7 +76,7 @@ $self->{sizer_4}->Add(20, 20, 0, wxEXPAND, 0); $self->{sizer_4}->AddGrowableRow(0); $self->{sizer_4}->AddGrowableRow(3); - $self->{grid_sizer_2}->Add($self->{sizer_4}, 1, wxALIGN_CENTER|wxEXPAND, 0); + $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); diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_no_classattr.py wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.py --- wxglade-0.9.5/tests/casefiles/Sizers_no_classattr.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.py 2020-05-30 22:05:16.000000000 +0000 @@ -52,7 +52,7 @@ sizer_4.Add((20, 20), 0, wx.EXPAND, 0) sizer_4.AddGrowableRow(0) sizer_4.AddGrowableRow(3) - grid_sizer_2.Add(sizer_4, 1, wx.ALIGN_CENTER | wx.EXPAND, 0) + 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) diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_no_classattr_Saved.wxg wxglade-0.9.6/tests/casefiles/Sizers_no_classattr_Saved.wxg --- wxglade-0.9.5/tests/casefiles/Sizers_no_classattr_Saved.wxg 1970-01-01 00:00:00.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_no_classattr_Saved.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -0,0 +1,149 @@ + + + + + + dialog_1 + + + 3 + 1 + 0 + 0 + 0 + 0 + + + 0 + wxEXPAND + + 1 + 3 + 0 + 0 + 0 + 0,2 + + + 0 + wxEXPAND + + wxHORIZONTAL + + + + 5 + wxALL|wxEXPAND + + -1 + + + + + + + + + 0 + wxEXPAND + + 4 + 1 + 0 + 0 + 0,3 + + + 0 + wxEXPAND + + 20 + 20 + + + + + 5 + wxALL + + ADD + + + + + 5 + wxALL + + REMOVE + + + + + 0 + wxEXPAND + + 20 + 20 + + + + + + + 0 + wxEXPAND + + wxHORIZONTAL + + + + 5 + wxALL|wxEXPAND + + -1 + + + + + + + + + + + 5 + wxALL|wxEXPAND + + + 1 + + + + + 0 + wxEXPAND|wxALIGN_RIGHT + + wxHORIZONTAL + + + 5 + wxALL + + + OK + + + + + 5 + wxALL + + + CANCEL + + + + + + + diff -Nru wxglade-0.9.5/tests/casefiles/Sizers_no_classattr.xrc wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.xrc --- wxglade-0.9.5/tests/casefiles/Sizers_no_classattr.xrc 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/Sizers_no_classattr.xrc 2020-05-30 22:05:16.000000000 +0000 @@ -41,7 +41,7 @@ - wxALIGN_CENTER|wxEXPAND + wxEXPAND 1 0,3 diff -Nru wxglade-0.9.5/tests/casefiles/SizersSizeTests_Classic.py wxglade-0.9.6/tests/casefiles/SizersSizeTests_Classic.py --- wxglade-0.9.5/tests/casefiles/SizersSizeTests_Classic.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/SizersSizeTests_Classic.py 2020-05-30 22:05:16.000000000 +0000 @@ -1079,7 +1079,7 @@ sizer_border_5_LEFTRIGHT.Add(self._0_N_N_copy_31, 0, 0, 0) 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) - sizer_7.Add(sizer_border_15_BOTTOM, 1, wx.ALIGN_RIGHT, 15) + sizer_7.Add(sizer_border_15_BOTTOM, 1, 0, 15) self.notebook_1_BorderTest.SetSizer(sizer_7) 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) @@ -1088,7 +1088,6 @@ grid_sizer_1.AddGrowableRow(0) grid_sizer_1.AddGrowableRow(2) grid_sizer_1.AddGrowableCol(0) - grid_sizer_1.AddGrowableCol(2) 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")) diff -Nru wxglade-0.9.5/tests/casefiles/SizersSizeTests.cpp wxglade-0.9.6/tests/casefiles/SizersSizeTests.cpp --- wxglade-0.9.5/tests/casefiles/SizersSizeTests.cpp 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/SizersSizeTests.cpp 2020-05-30 22:05:16.000000000 +0000 @@ -1086,7 +1086,7 @@ sizer_border_5_LEFTRIGHT->Add(_0_N_N_copy_31, 0, 0, 0); sizer_7->Add(sizer_border_5_LEFTRIGHT, 1, wxLEFT|wxRIGHT, 5); sizer_border_15_BOTTOM->Add(_0_N_N_copy_32, 0, 0, 0); - sizer_7->Add(sizer_border_15_BOTTOM, 1, wxALIGN_RIGHT, 15); + sizer_7->Add(sizer_border_15_BOTTOM, 1, 0, 15); notebook_1_BorderTest->SetSizer(sizer_7); 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); @@ -1095,7 +1095,6 @@ grid_sizer_1->AddGrowableRow(0); grid_sizer_1->AddGrowableRow(2); grid_sizer_1->AddGrowableCol(0); - grid_sizer_1->AddGrowableCol(2); notebook_1->AddPage(notebook_1_pane_1, _("BoxSizer")); notebook_1->AddPage(notebook_1_WrapSizer, _("WrapSizer")); notebook_1->AddPage(notebook_1_StaticBoxSizer, _("StaticBoxSizer")); diff -Nru wxglade-0.9.5/tests/casefiles/SizersSizeTests_nowrap.py wxglade-0.9.6/tests/casefiles/SizersSizeTests_nowrap.py --- wxglade-0.9.5/tests/casefiles/SizersSizeTests_nowrap.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/SizersSizeTests_nowrap.py 2020-05-30 22:05:16.000000000 +0000 @@ -901,7 +901,7 @@ sizer_border_5_LEFTRIGHT.Add(self._0_N_N_copy_31, 0, 0, 0) 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) - sizer_7.Add(sizer_border_15_BOTTOM, 1, wx.ALIGN_RIGHT, 15) + sizer_7.Add(sizer_border_15_BOTTOM, 1, 0, 15) 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")) diff -Nru wxglade-0.9.5/tests/casefiles/SizersSizeTests_nowrap.wxg wxglade-0.9.6/tests/casefiles/SizersSizeTests_nowrap.wxg --- wxglade-0.9.5/tests/casefiles/SizersSizeTests_nowrap.wxg 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/SizersSizeTests_nowrap.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -2320,7 +2320,6 @@ 15 - wxALIGN_RIGHT wxVERTICAL diff -Nru wxglade-0.9.5/tests/casefiles/SizersSizeTests_Phoenix.py wxglade-0.9.6/tests/casefiles/SizersSizeTests_Phoenix.py --- wxglade-0.9.5/tests/casefiles/SizersSizeTests_Phoenix.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/SizersSizeTests_Phoenix.py 2020-05-30 22:05:16.000000000 +0000 @@ -1079,7 +1079,7 @@ sizer_border_5_LEFTRIGHT.Add(self._0_N_N_copy_31, 0, 0, 0) 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) - sizer_7.Add(sizer_border_15_BOTTOM, 1, wx.ALIGN_RIGHT, 15) + sizer_7.Add(sizer_border_15_BOTTOM, 1, 0, 15) self.notebook_1_BorderTest.SetSizer(sizer_7) 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) @@ -1088,7 +1088,6 @@ grid_sizer_1.AddGrowableRow(0) grid_sizer_1.AddGrowableRow(2) grid_sizer_1.AddGrowableCol(0) - grid_sizer_1.AddGrowableCol(2) 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")) diff -Nru wxglade-0.9.5/tests/casefiles/SizersSizeTests.pl wxglade-0.9.6/tests/casefiles/SizersSizeTests.pl --- wxglade-0.9.5/tests/casefiles/SizersSizeTests.pl 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/SizersSizeTests.pl 2020-05-30 22:05:16.000000000 +0000 @@ -1103,7 +1103,7 @@ $self->{sizer_border_5_LEFTRIGHT}->Add($self->{_0_N_N_copy_31}, 0, 0, 0); $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->{sizer_7}->Add($self->{sizer_border_15_BOTTOM}, 1, wxALIGN_RIGHT, 15); + $self->{sizer_7}->Add($self->{sizer_border_15_BOTTOM}, 1, 0, 15); $self->{notebook_1_BorderTest}->SetSizer($self->{sizer_7}); $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); @@ -1112,7 +1112,6 @@ $self->{grid_sizer_1}->AddGrowableRow(0); $self->{grid_sizer_1}->AddGrowableRow(2); $self->{grid_sizer_1}->AddGrowableCol(0); - $self->{grid_sizer_1}->AddGrowableCol(2); $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")); diff -Nru wxglade-0.9.5/tests/casefiles/SizersSizeTests_Saved.wxg wxglade-0.9.6/tests/casefiles/SizersSizeTests_Saved.wxg --- wxglade-0.9.5/tests/casefiles/SizersSizeTests_Saved.wxg 1970-01-01 00:00:00.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/SizersSizeTests_Saved.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -0,0 +1,2867 @@ + + + + + + 600, 400 + frame + + + wxVERTICAL + + + 0 + wxEXPAND + + + + BoxSizer + WrapSizer + StaticBoxSizer + GridSizer + FlexGridSizer + GridBagSizer + BorderTest + GridBagSizer_Spacers + + + + + wxHORIZONTAL + + + 0 + wxEXPAND + + wxVERTICAL + + + 0 + + + + + + 0 + + + + + + 0 + wxEXPAND + + + + + + 0 + wxEXPAND + + + + + + 0 + wxFIXED_MINSIZE + + + + + + 0 + wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + 0 + + 100, 21 + + + + + 0 + + 100, 21 + + + + + 0 + wxEXPAND + + 100, 21 + + + + + 0 + wxEXPAND + + 100, 21 + + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + 0 + + 100, 21d + + + + + 0 + + 100, 21d + + + + + 0 + wxEXPAND + + 100, 21d + + + + + 0 + wxEXPAND + + 100, 21d + + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + 0 + + -1, 21 + + + + + 0 + + -1, 21 + + + + + 0 + wxEXPAND + + -1, 21 + + + + + 0 + wxEXPAND + + -1, 21 + + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + 0 + + 100, -1 + + + + + 0 + + 100, -1 + + + + + 0 + wxEXPAND + + 100, -1 + + + + + 0 + wxEXPAND + + 100, -1 + + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + 0 + + -1, 100d + + + + + 0 + + -1, 100d + + + + + 0 + wxEXPAND + + -1, 100d + + + + + 0 + wxEXPAND + + -1, 100d + + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + 0 + + 100, -1d + + + + + 0 + + 100, -1d + + + + + 0 + wxEXPAND + + 100, -1d + + + + + 0 + wxEXPAND + + 100, -1d + + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + + + + + + wxHORIZONTAL + + + 0 + wxEXPAND + + wxHORIZONTAL + + + 0 + + + + + + 0 + + + + + + 0 + wxEXPAND + + + + + + 0 + wxEXPAND + + + + + + 0 + wxFIXED_MINSIZE + + + + + + 0 + wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + + + 0 + wxEXPAND + + wxHORIZONTAL + + + 0 + + 100, 21 + + + + + 0 + + 100, 21 + + + + + 0 + wxEXPAND + + 100, 21 + + + + + 0 + wxEXPAND + + 100, 21 + + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + + + + 0 + wxEXPAND + + wxHORIZONTAL + + + 0 + + 100, 21d + + + + + 0 + + 100, 21d + + + + + 0 + wxEXPAND + + 100, 21d + + + + + 0 + wxEXPAND + + 100, 21d + + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + + + + 0 + wxEXPAND + + wxHORIZONTAL + + + 0 + + -1, 21 + + + + + 0 + + -1, 21 + + + + + 0 + wxEXPAND + + -1, 21 + + + + + 0 + wxEXPAND + + -1, 21 + + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + + + + 0 + wxEXPAND + + wxHORIZONTAL + + + 0 + + 100, -1 + + + + + 0 + + 100, -1 + + + + + 0 + wxEXPAND + + 100, -1 + + + + + 0 + wxEXPAND + + 100, -1 + + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + + + + 0 + wxEXPAND + + wxHORIZONTAL + + + 0 + + -1, 100d + + + + + 0 + + -1, 100d + + + + + 0 + wxEXPAND + + -1, 100d + + + + + 0 + wxEXPAND + + -1, 100d + + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + + + 0 + wxEXPAND + + wxHORIZONTAL + + + 0 + + 100, -1d + + + + + 0 + + 100, -1d + + + + + 0 + wxEXPAND + + 100, -1d + + + + + 0 + wxEXPAND + + 100, -1d + + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + + + + + + wxHORIZONTAL + + + 0 + wxEXPAND + + wxVERTICAL + + + + 0 + + + + + + 0 + + + + + + 0 + wxEXPAND + + + + + + 0 + wxEXPAND + + + + + + 0 + wxFIXED_MINSIZE + + + + + + 0 + wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + + 0 + + 100, 21 + + + + + 0 + + 100, 21 + + + + + 0 + wxEXPAND + + 100, 21 + + + + + 0 + wxEXPAND + + 100, 21 + + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + + 0 + + 100, 21d + + + + + 0 + + 100, 21d + + + + + 0 + wxEXPAND + + 100, 21d + + + + + 0 + wxEXPAND + + 100, 21d + + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + + 0 + + -1, 21 + + + + + 0 + + -1, 21 + + + + + 0 + wxEXPAND + + -1, 21 + + + + + 0 + wxEXPAND + + -1, 21 + + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + + 0 + + 100, -1 + + + + + 0 + + 100, -1 + + + + + 0 + wxEXPAND + + 100, -1 + + + + + 0 + wxEXPAND + + 100, -1 + + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + + 0 + + -1, 100d + + + + + 0 + + -1, 100d + + + + + 0 + wxEXPAND + + -1, 100d + + + + + 0 + wxEXPAND + + -1, 100d + + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + + 0 + + 100, -1d + + + + + 0 + + 100, -1d + + + + + 0 + wxEXPAND + + 100, -1d + + + + + 0 + wxEXPAND + + 100, -1d + + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + + + + + + 7 + 8 + 0 + 0 + + + 0 + + + + + + 0 + + + + + + 0 + wxEXPAND + + + + + + 0 + wxEXPAND + + + + + + 0 + wxFIXED_MINSIZE + + + + + + 0 + wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + + 100, 21 + + + + + 0 + + 100, 21 + + + + + 0 + wxEXPAND + + 100, 21 + + + + + 0 + wxEXPAND + + 100, 21 + + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + + 100, 21d + + + + + 0 + + 100, 21d + + + + + 0 + wxEXPAND + + 100, 21d + + + + + 0 + wxEXPAND + + 100, 21d + + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + + -1, 21 + + + + + 0 + + -1, 21 + + + + + 0 + wxEXPAND + + -1, 21 + + + + + 0 + wxEXPAND + + -1, 21 + + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + + 100, -1 + + + + + 0 + + 100, -1 + + + + + 0 + wxEXPAND + + 100, -1 + + + + + 0 + wxEXPAND + + 100, -1 + + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + + -1, 100d + + + + + 0 + + -1, 100d + + + + + 0 + wxEXPAND + + -1, 100d + + + + + 0 + wxEXPAND + + -1, 100d + + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + + 100, -1d + + + + + 0 + + 100, -1d + + + + + 0 + wxEXPAND + + 100, -1d + + + + + 0 + wxEXPAND + + 100, -1d + + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + + + + 7 + 8 + 1 + 1 + 2,5 + 1,7 + + + 0 + + + + + + 0 + + + + + + 0 + wxEXPAND + + + + + + 0 + wxEXPAND + + + + + + 0 + wxFIXED_MINSIZE + + + + + + 0 + wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + + 100, 21 + + + + + 0 + + 100, 21 + + + + + 0 + wxEXPAND + + 100, 21 + + + + + 0 + wxEXPAND + + 100, 21 + + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + + 0 + + 100, 21d + + + + + 0 + + 100, 21d + + + + + 0 + wxEXPAND + + 100, 21d + + + + + 0 + wxEXPAND + + 100, 21d + + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + + 0 + + -1, 21 + + + + + 0 + + -1, 21 + + + + + 0 + wxEXPAND + + -1, 21 + + + + + 0 + wxEXPAND + + -1, 21 + + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + + 0 + + 100, -1 + + + + + 0 + + 100, -1 + + + + + 0 + wxEXPAND + + 100, -1 + + + + + 0 + wxEXPAND + + 100, -1 + + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + + 0 + + -1, 100d + + + + + 0 + + -1, 100d + + + + + 0 + wxEXPAND + + -1, 100d + + + + + 0 + wxEXPAND + + -1, 100d + + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + + 0 + + 100, -1d + + + + + 0 + + 100, -1d + + + + + 0 + wxEXPAND + + 100, -1d + + + + + 0 + wxEXPAND + + 100, -1d + + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + + + + 7 + 8 + 1 + 1 + 2,5 + 1,7 + + 0 + + + + + 0 + + + + + 0 + wxEXPAND + + + + + 0 + wxEXPAND + + + + + 0 + wxFIXED_MINSIZE + + + + + 0 + wxFIXED_MINSIZE + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + 0 + + 100, 21 + + + + 0 + + 100, 21 + + + + 0 + wxEXPAND + + 100, 21 + + + + 0 + wxEXPAND + + 100, 21 + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + 0 + wxFIXED_MINSIZE + + 100, 21 + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21 + + + + 0 + + 100, 21d + + + + 0 + + 100, 21d + + + + 0 + wxEXPAND + + 100, 21d + + + + 0 + wxEXPAND + + 100, 21d + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + 0 + wxFIXED_MINSIZE + + 100, 21d + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, 21d + + + + 0 + + -1, 21 + + + + 0 + + -1, 21 + + + + 0 + wxEXPAND + + -1, 21 + + + + 0 + wxEXPAND + + -1, 21 + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + 0 + wxFIXED_MINSIZE + + -1, 21 + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + -1, 21 + + + + 0 + + 100, -1 + + + + 0 + + 100, -1 + + + + 0 + wxEXPAND + + 100, -1 + + + + 0 + wxEXPAND + + 100, -1 + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + 0 + wxFIXED_MINSIZE + + 100, -1 + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1 + + + + 0 + + -1, 100d + + + + 0 + + -1, 100d + + + + 0 + wxEXPAND + + -1, 100d + + + + 0 + wxEXPAND + + -1, 100d + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + 0 + wxFIXED_MINSIZE + + -1, 100d + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + + + + 0 + + 100, -1d + + + + 0 + + 100, -1d + + + + 0 + wxEXPAND + + 100, -1d + + + + 0 + wxEXPAND + + 100, -1d + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + 0 + wxFIXED_MINSIZE + + 100, -1d + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + 0 + wxEXPAND|wxFIXED_MINSIZE + + 100, -1d + + + + + + + + wxHORIZONTAL + + + 10 + wxEXPAND + + wxVERTICAL + + + 10 + + + + + + 0 + wxALL + + + + + + 5 + wxLEFT|wxRIGHT|wxEXPAND + + + + + + 15 + wxBOTTOM|wxEXPAND + + + + + + + + 0 + wxALL|wxEXPAND + + wxVERTICAL + + + 0 + + 100, 21 + + + + + + + 5 + wxLEFT|wxRIGHT + + wxVERTICAL + + + 0 + + 100, 21d + + + + + + + 15 + + wxVERTICAL + + + 0 + + -1, 21 + + + + + + + + + + 3 + 3 + 0 + 0 + 0,2 + 0,2 + + 0 + + + + + + + + + + + 0 + wxEXPAND + + 20 + 20 + + + + 0 + wxEXPAND + + 20 + 20 + + + + + + + + + + diff -Nru wxglade-0.9.5/tests/casefiles/SizersSizeTests.wxg wxglade-0.9.6/tests/casefiles/SizersSizeTests.wxg --- wxglade-0.9.5/tests/casefiles/SizersSizeTests.wxg 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/SizersSizeTests.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -2808,7 +2808,6 @@ 15 - wxALIGN_RIGHT wxVERTICAL diff -Nru wxglade-0.9.5/tests/casefiles/SizersSizeTests.xrc wxglade-0.9.6/tests/casefiles/SizersSizeTests.xrc --- wxglade-0.9.5/tests/casefiles/SizersSizeTests.xrc 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/SizersSizeTests.xrc 2020-05-30 22:05:16.000000000 +0000 @@ -2312,7 +2312,6 @@ - wxALIGN_RIGHT 15 wxVERTICAL diff -Nru wxglade-0.9.5/tests/casefiles/toplevels_no_size_Classic.py wxglade-0.9.6/tests/casefiles/toplevels_no_size_Classic.py --- wxglade-0.9.5/tests/casefiles/toplevels_no_size_Classic.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/toplevels_no_size_Classic.py 2020-05-30 22:05:16.000000000 +0000 @@ -108,7 +108,7 @@ __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.ALIGN_CENTER_VERTICAL | wx.EXPAND, 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) @@ -172,7 +172,7 @@ __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.ALIGN_CENTER_VERTICAL | wx.EXPAND, 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) diff -Nru wxglade-0.9.5/tests/casefiles/toplevels_no_size_Phoenix.py wxglade-0.9.6/tests/casefiles/toplevels_no_size_Phoenix.py --- wxglade-0.9.5/tests/casefiles/toplevels_no_size_Phoenix.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/toplevels_no_size_Phoenix.py 2020-05-30 22:05:16.000000000 +0000 @@ -108,7 +108,7 @@ __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.ALIGN_CENTER_VERTICAL | wx.EXPAND, 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) @@ -172,7 +172,7 @@ __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.ALIGN_CENTER_VERTICAL | wx.EXPAND, 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) diff -Nru wxglade-0.9.5/tests/casefiles/toplevels_no_size_Saved.wxg wxglade-0.9.6/tests/casefiles/toplevels_no_size_Saved.wxg --- wxglade-0.9.5/tests/casefiles/toplevels_no_size_Saved.wxg 1970-01-01 00:00:00.000000000 +0000 +++ wxglade-0.9.6/tests/casefiles/toplevels_no_size_Saved.wxg 2020-05-30 22:05:16.000000000 +0000 @@ -0,0 +1,263 @@ + + + + + + frame + + + wxVERTICAL + + + 0 + + + + + + + + dialog + + + wxHORIZONTAL + + + 0 + + + + + + + + from Gnumed.wxpython.gmListWidgets import cReportListCtrl + + + wxHORIZONTAL + + + 5 + wxRIGHT|wxEXPAND + + + _on_day_selected + + 100, 100 + + + + + + 5 + wxRIGHT|wxEXPAND + + + _on_result_selected + + 100, 100 + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + 0 + wxEXPAND + + 255, 102 + wxSYS_COLOUR_BACKGROUND + + + + + + 0 + wxEXPAND + + wxHORIZONTAL + + + 3 + wxRIGHT|wxALIGN_CENTER_VERTICAL + + 100, 100 + 1 + + + + + 0 + wxALIGN_CENTER_VERTICAL + + + _on_show_docs_button_pressed + + 100, 100 + Show lab related documents for the episode of the selected measurement. + 1 + + + + + + 0 + wxEXPAND + + 100, 100 + 20 + 20 + + + + + + + + + + from Gnumed.wxpython.gmListWidgets import cReportListCtrl + + + wxHORIZONTAL + + + 5 + wxRIGHT|wxEXPAND + + + _on_day_selected + + 100, 100 + + + + + + 5 + wxRIGHT|wxEXPAND + + + _on_day_selected + + 100, 100 + + + + + + + from Gnumed.wxpython.gmListWidgets import cReportListCtrl + + + wxHORIZONTAL + + + 0 + + + + + + 0 + + + + + + + frame_1 + + + wxHORIZONTAL + + + 5 + wxRIGHT|wxEXPAND + + + _on_day_selected + + 100, 100 + + + + + + 5 + wxRIGHT|wxEXPAND + + + _on_result_selected + + 100, 100 + + + + + + 0 + wxEXPAND + + wxVERTICAL + + + 0 + wxEXPAND + + 255, 102 + wxSYS_COLOUR_BACKGROUND + + + + + + 0 + wxEXPAND + + wxHORIZONTAL + + + 3 + wxRIGHT|wxALIGN_CENTER_VERTICAL + + 100, 100 + 1 + + + + + 0 + wxALIGN_CENTER_VERTICAL + + + _on_show_docs_button_pressed + + 100, 100 + Show lab related documents for the episode of the selected measurement. + 1 + + + + + + 0 + wxEXPAND + + 100, 100 + 20 + 20 + + + + + + + + + diff -Nru wxglade-0.9.5/tests/test_gui_new.py wxglade-0.9.6/tests/test_gui_new.py --- wxglade-0.9.5/tests/test_gui_new.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/tests/test_gui_new.py 2020-05-30 22:05:16.000000000 +0000 @@ -461,7 +461,11 @@ generated_filename = self._get_outputfile_path('app_wo_attrs_gui.wxg') xrc2wxg.convert(infilename, generated_filename) # compare - expected_filename = self._get_casefile_path('app_wo_attrs_gui.wxg') + 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') self._compare_files(expected_filename, generated_filename) # open the .wxg file; there should be no problem self._messageBox = None diff -Nru wxglade-0.9.5/version.py wxglade-0.9.6/version.py --- wxglade-0.9.5/version.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/version.py 2020-05-30 22:05:16.000000000 +0000 @@ -1 +1 @@ -__version__ = "0.9.5" # don't forget to update also the wxglade shell script, sphinx/conf.py and wxglade.desktop \ No newline at end of file +__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 diff -Nru wxglade-0.9.5/widgets/menubar/menubar.py wxglade-0.9.6/widgets/menubar/menubar.py --- wxglade-0.9.5/widgets/menubar/menubar.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/widgets/menubar/menubar.py 2020-05-30 22:05:16.000000000 +0000 @@ -21,32 +21,7 @@ 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) - - # menu item fields - self.label = wx.TextCtrl(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, "") - # 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) - # 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") - # 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") - 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) - self.SetTitle("Menu Editor") - self.__do_layout() + 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) @@ -94,22 +69,34 @@ 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() def on_char(self, event): # keyboard navigation: up/down arrows focus = self.FindFocus() - if focus is self.check_radio: - event.Skip() - return - if isinstance(focus, wx.Button): - self.label.SetFocus() - elif isinstance(focus, wx.TextCtrl): - self._last_focus = focus k = event.GetKeyCode() + if k==wx.WXK_TAB: + if focus is self.check_radio: + self.label.SetFocus() + else: + event.Skip() + return + if k==wx.WXK_RETURN: # ignore Enter key return if k==wx.WXK_DOWN: @@ -137,31 +124,65 @@ if event.GetKeyCode() != wx.WXK_RETURN: event.Skip() - def __do_layout(self): + 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, wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 0) + + 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) @@ -170,12 +191,15 @@ 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, wx.ALIGN_CENTER_VERTICAL, 0) + 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, wx.ALIGN_CENTER_VERTICAL, 0) + 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) @@ -558,7 +582,6 @@ self.EndModal(wx.ID_OK) - class MenuProperty(np.Property): "Property to edit the menus of an EditMenuBar instance" diff -Nru wxglade-0.9.5/widgets/toolbar/toolbar.py wxglade-0.9.6/widgets/toolbar/toolbar.py --- wxglade-0.9.5/widgets/toolbar/toolbar.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/widgets/toolbar/toolbar.py 2020-05-30 22:05:16.000000000 +0000 @@ -33,33 +33,7 @@ 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) - - # menu item fields - self.label = wx.TextCtrl(self, wx.ID_ANY, "") - self.bitmap1 = wx.TextCtrl(self, wx.ID_ANY, "") - self.bitmap2 = wx.TextCtrl(self, wx.ID_ANY, "") - self.handler = wx.TextCtrl(self, wx.ID_ANY, "") - self.short_help = wx.TextCtrl(self, wx.ID_ANY, "") - self.long_help = wx.TextCtrl(self, wx.ID_ANY, "") - self.id = wx.TextCtrl(self, wx.ID_ANY, "") - self.type = wx.RadioBox(self, wx.ID_ANY, "Type", choices=["Normal", "Checkable", "Radio"], majorDimension=1, style=wx.RA_SPECIFY_COLS) - # 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") - # 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") - - self.bitmap1_button = wx.Button(self, wx.ID_ANY, "...") - self.bitmap2_button = wx.Button(self, wx.ID_ANY, "...") - - 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.__do_layout() - self._set_tooltips() + 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) @@ -99,22 +73,35 @@ 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() def on_char(self, event): - # keyboard navigation: up/down arrows + # keyboard navigation: up/down arrows and also Tab on some buttons focus = self.FindFocus() - if focus is self.type: - event.Skip() - return - if isinstance(focus, wx.Button): - self.label.SetFocus() - elif isinstance(focus, wx.TextCtrl): - self._last_focus = focus k = event.GetKeyCode() + + if k==wx.WXK_TAB: + if focus is self.type: + self.label.SetFocus() + else: + event.Skip() + return + if k==wx.WXK_RETURN: # ignore Enter key return if k==wx.WXK_DOWN: @@ -136,8 +123,8 @@ if event.GetKeyCode() != wx.WXK_RETURN: event.Skip() - def __do_layout(self): - # begin wxGlade: ToolsDialog.__do_layout + def create_gui(self): + sizer_1 = wx.BoxSizer(wx.VERTICAL) sizer_2 = wx.BoxSizer(wx.HORIZONTAL) sizer_5 = wx.BoxSizer(wx.HORIZONTAL) @@ -145,36 +132,68 @@ 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) @@ -187,10 +206,14 @@ 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 @@ -450,13 +473,14 @@ self.edit_btn.Bind(wx.EVT_BUTTON, self.edit_tools) def edit_tools(self, event=None): - if hasattr(self, "edit_btn"): + if hasattr(self, "edit_btn") and self.edit_btn: parent = self.edit_btn.GetTopLevelParent() elif self.owner.widget: parent = self.owner.widget.GetTopLevelParent() else: parent = None dialog = ToolsDialog( parent, 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() if res == wx.ID_OK: diff -Nru wxglade-0.9.5/window_dialog.py wxglade-0.9.6/window_dialog.py --- wxglade-0.9.5/window_dialog.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/window_dialog.py 2020-05-30 22:05:16.000000000 +0000 @@ -53,7 +53,7 @@ if self.standalone: szr.Add(self.standalone, 0, wx.ALL|wx.EXPAND, 5) if self.base: szr.Add(self.base, 0, wx.ALL|wx.EXPAND, 5) hszr = wx.BoxSizer(wx.HORIZONTAL) - hszr.Add(wx.StaticText(self, -1, _("class"),), 0, wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_RIGHT|wx.EXPAND|wx.ALL, 3) + hszr.Add(wx.StaticText(self, -1, _("class"),), 0, wx.EXPAND|wx.ALL, 3) hszr.Add(self.klass, 2) szr.Add(hszr, 0, wx.EXPAND) # buttons diff -Nru wxglade-0.9.5/wxglade wxglade-0.9.6/wxglade --- wxglade-0.9.5/wxglade 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/wxglade 2020-05-30 22:05:16.000000000 +0000 @@ -14,7 +14,7 @@ # 3. in a parallel Python module directory # Keep this up to date with version.py and sphinx/conf.py -WXG_VERSION="0.9.5" +WXG_VERSION="0.9.6" # search order for Python interpreter INTERPRETER_LIST="python3 python2 \ diff -Nru wxglade-0.9.5/wxGlade.desktop wxglade-0.9.6/wxGlade.desktop --- wxglade-0.9.5/wxGlade.desktop 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/wxGlade.desktop 2020-05-30 22:05:16.000000000 +0000 @@ -1,5 +1,5 @@ [Desktop Entry] -Version=0.9.5 +Version=0.9.6 Encoding=UTF-8 Name=wxGlade Comment=A GUI designer written in Python with the popular GUI toolkit wxPython diff -Nru wxglade-0.9.5/wxglade.pyw wxglade-0.9.6/wxglade.pyw --- wxglade-0.9.5/wxglade.pyw 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/wxglade.pyw 2020-05-30 22:05:16.000000000 +0000 @@ -9,7 +9,7 @@ @license: MIT (see LICENSE.txt) - THIS PROGRAM COMES WITH NO WARRANTY """ -import sys, traceback, types +import sys, traceback import gettext t = gettext.translation(domain="wxglade", localedir="locale", fallback=True) t.install("wxglade") @@ -44,7 +44,7 @@ except SystemExit as details: code = details.code title = u'Abnormal Termination of wxGlade' - if isinstance(code, types.IntType) and code != 0: + if isinstance(code, int) and code != 0: msg = u"""\ wxGlade is terminating abnormally with an error. @@ -52,7 +52,7 @@ The exit code is: %d The log file is : %s""" % (code, config.log_file) - elif isinstance(code, types.StringTypes): + elif isinstance(code, basestring): msg = u"""\ wxGlade is terminating abnormally with an error. diff -Nru wxglade-0.9.5/xml_parse.py wxglade-0.9.6/xml_parse.py --- wxglade-0.9.5/xml_parse.py 2020-01-25 16:45:03.000000000 +0000 +++ wxglade-0.9.6/xml_parse.py 2020-05-30 22:05:16.000000000 +0000 @@ -263,6 +263,7 @@ return if obj.sizeritem: 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 @@ -496,22 +497,6 @@ self.depth_level += 1 def endElement(self, name): - if name == 'object': - obj = self.top() - self.depth_level -= 1 - if not self.depth_level: - 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() - except AttributeError: - self._logger.exception( _('Exception caused by obj: %s'), self.top_obj ) - misc.set_focused_widget(self.top_obj) - if name == 'label': # if e.g. a button_1 is copied to button_2, also change the label if it was "button_1" obj = self.top() @@ -523,6 +508,22 @@ XmlWidgetBuilder.endElement(self, name) + if name!="object": return + self.depth_level -= 1 + + if not self.depth_level: + 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() + except AttributeError: + self._logger.exception( _('Exception caused by obj: %s'), self.top_obj ) + misc.set_focused_widget(self.top_obj) + class XmlWidgetObject(object): "A class to encapsulate widget attributes read from a XML file, to store them until the widget can be created" @@ -651,5 +652,5 @@ self.proportion = np.LayoutProportionProperty(0) self.span = np.LayoutSpanProperty((1,1)) self.border = np.SpinProperty(0) - self.flag = np.ManagedFlags(None) + self.flag = np.ManagedFlags(None, name="sizeritem_flags") self.pos = np.SpinProperty(None)