Changed name to wxFIXED_MINSIZE since that is more descriptive of what

[wxWidgets.git] / wxPython / demo / MimeTypesManager.py

diff --git a/wxPython/demo/MimeTypesManager.py b/wxPython/demo/MimeTypesManager.py
index 4dc89e25710f24b1de6c2aeca862a855707052d8..94922d5c3b20e208dda683d62e54b8e99153a0bf 100644 (file)
--- a/wxPython/demo/MimeTypesManager.py
+++ b/wxPython/demo/MimeTypesManager.py
@@ -43,10 +43,10 @@ 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)
         # 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 )
 
         self.ext = wx.TextCtrl(self, -1, value="wav", style = wx.TE_PROCESS_ENTER )

-        usizer.Add(self.ext, 0, wx.ALL | wx.ALIGN_TOP, 4)
+        usizer.Add(self.ext, 0, wx.FIXED_MINSIZE | wx.ALL | wx.ALIGN_TOP, 4)

         self.Bind(wx.EVT_TEXT_ENTER, self.OnLookup, self.ext)
 
         # Select how to look it up
         self.Bind(wx.EVT_TEXT_ENTER, self.OnLookup, self.ext)
 
         # Select how to look it up


@@ -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(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.FIXED_MINSIZE | 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.FIXED_MINSIZE | wx.ALL | wx.ALIGN_CENTER_VERTICAL, 2)

 
         #------- MIME Type
 
 
         #------- MIME Type
 


@@ -195,7 +195,10 @@ class MimeTypesDemoPanel(wx.Panel):
         tsizer.Fit(self)
         
         # Populate the Known MIME types list with what is in the database
         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)
 
         for mt in mtypes:
             self.mimelist.Append(mt)
 


@@ -339,4 +342,4 @@ For further information please consult the wxWindows documentation for
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])