X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8eca4fef106b8327e2e55636de3f68a511a4c392..02161c7c81e12685d04a1f73e714ca52ad858f6c:/wxPython/demo/MimeTypesManager.py

diff --git a/wxPython/demo/MimeTypesManager.py b/wxPython/demo/MimeTypesManager.py
index 9689030c24..30e852d5aa 100644
--- a/wxPython/demo/MimeTypesManager.py
+++ b/wxPython/demo/MimeTypesManager.py
@@ -43,7 +43,7 @@ class MimeTypesDemoPanel(wx.Panel):
         # Text control for ext / type entry plus label.
         t = wx.StaticText(self, -1, 'Extension / MIME type: ', style = wx.ALIGN_RIGHT )
         t.SetFont(bfont)
-        usizer.Add(t, 0, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER | wx.ALIGN_CENTER_VERTICAL, 2)
+        usizer.Add(t, 0, wx.ALL | wx.ALIGN_CENTER | wx.ALIGN_CENTER_VERTICAL, 2)
 
         self.ext = wx.TextCtrl(self, -1, value="wav", style = wx.TE_PROCESS_ENTER )
         usizer.Add(self.ext, 0, wx.ALL | wx.ALIGN_TOP, 4)
@@ -85,13 +85,13 @@ class MimeTypesDemoPanel(wx.Panel):
         llsizer.Add(t, (0, 0), (1, 1), wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 2)
 
         self.icon = wx.StaticBitmap(self, -1, images.getNoIconBitmap())
-        llsizer.Add(self.icon, (0, 1), (1, 1), wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 2)
+        llsizer.Add(self.icon, (0, 1), (1, 1), wx.ALL | wx.ALIGN_CENTER, 2)
 
-        self.iconsource = wx.TextCtrl(self, -1, value="", style = wx.TE_READONLY )
-        llsizer.Add(self.iconsource, (0, 2), (1, 1), wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 2)
+        self.iconsource = wx.TextCtrl(self, -1, value="", size=(125, -1), style = wx.TE_READONLY )
+        llsizer.Add(self.iconsource, (0, 2), (1, 1), wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 2)
 
-        self.iconoffset = wx.TextCtrl(self, -1, value="", style = wx.TE_READONLY )
-        llsizer.Add(self.iconoffset, (0, 3), (1, 1), wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 2)
+        self.iconoffset = wx.TextCtrl(self, -1, value="", size=(25,-1), style = wx.TE_READONLY )
+        llsizer.Add(self.iconoffset, (0, 3), (1, 1), wx.ALL | wx.ALIGN_CENTER_VERTICAL, 2)
 
         #------- MIME Type
 
@@ -176,7 +176,7 @@ class MimeTypesDemoPanel(wx.Panel):
         lrsizer.Add(t, 0, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 4)
 
         self.mimelist = wx.ListBox(self, -1, choices=[], style = wx.LB_SINGLE | wx.LB_SORT)
-        lrsizer.Add(self.mimelist, 1, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 4)
+        lrsizer.Add(self.mimelist, 1, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER | wx.FIXED_MINSIZE, 4)
         self.Bind(wx.EVT_LISTBOX, self.OnListbox, self.mimelist)
 
         #----------------------------------------------------------------------------
@@ -195,7 +195,10 @@ class MimeTypesDemoPanel(wx.Panel):
         tsizer.Fit(self)
         
         # Populate the Known MIME types list with what is in the database
-        mtypes = wx.TheMimeTypesManager.EnumAllFileTypes()
+        try:
+            mtypes = wx.TheMimeTypesManager.EnumAllFileTypes()
+        except wx.PyAssertionError:
+            mtypes = []
         for mt in mtypes:
             self.mimelist.Append(mt)