Ticket #1022: uiwxdPageFrameMixin.2.patch

I:\python\test\dabo\ui\uiwx\dPageFrameMixin.py

@@ -98 +98 @@
-        il = self.GetImageList()
-        if not il:
-            il = wx.ImageList(16, 16, initialCount=0)
+            try:
-            self.AssignImageList(il)
+            except:
+                self.SetImageList(il)
-        idx = il.Add(img)
-        self._imageList[key] = idx
-
@@ -174 +177 @@
-            caption = pg._caption
-        if imgKey:
-            idx = self._imageList[imgKey]
+            try:
+                self.InsertPage(pos, pg, caption, imageId=idx)
+            except:
-            self.InsertPage(pos, pg, text=caption, imageId=idx)
-        else:
+            try:
+                self.InsertPage(pos, pg, caption)
+            except:
-            self.InsertPage(pos, pg, text=caption)
-        return self.Pages[pos]
-    def _insertPageOverride(self, pos, pgCls, caption, imgKey): pass
@@ -222 +231 @@
-        if newPos == pos:
-            # No change
-            return
+
+        try:
+            self.GetPage(pos).MoveTabPage(pos, newPos)
+        except:
-        cap = pg.Caption
-        self.RemovePage(pos)
-        self.InsertPage(newPos, pg, cap)
+
-        if selecting:
-            self.SelectedPage = pg
-        self.Parent.unlockDisplay()
@@ -251 +265 @@
-            self.Sizer.layout()
-        except:
-            pass
+
-        for pg in self.Pages:
-            pg.layout()
+
-        if self.Application.Platform == "Win":
-            self.refresh()
-
@@ -265 +281 @@
-        if isinstance(pg, int):
-            ret = pg
-        else:
+            try:
+                self.GetPageIndex(pg)
+            except:
-            # Most likely a page instance was passed. Find its index
-            for i in range(self.PageCount):
-                if self.GetPage(i) == pg:
@@ -319 +338 @@
-        ##      (such as in the AppWizard), resulting in self.PageCount > len(self.Pages)
-        ##      if using the commented code below.
-        #return [pg for pg in self.Children if isinstance(pg, dabo.ui.dPage) ]
+        try:
+            return self._windows
+        except:
-        return [self.GetPage(pg) for pg in range(self.PageCount)]
-
-
@@ -334 +356 @@
-
-    def _getSelectedPage(self):
-        try:
+            ret = self.GetCurrentPage()
+        except:
+            try:
-            sel = self.GetSelection()
-            if sel < 0:
-                ret = None