removed multiple duplicate copies (with subtly different behaviour) of SetStringSelec...

[wxWidgets.git] / wxPython / wx / lib / filebrowsebutton.py

diff --git a/wxPython/wx/lib/filebrowsebutton.py b/wxPython/wx/lib/filebrowsebutton.py
index 230551d4193ccf9e100a37b5b0593417b69cdaa6..9d7d29b567a0d9452b6c1b9f6fd273e0a854b5a0 100644 (file)
--- a/wxPython/wx/lib/filebrowsebutton.py
+++ b/wxPython/wx/lib/filebrowsebutton.py
@@ -52,7 +52,7 @@ class FileBrowseButton(wx.Panel):
         :param startDirectory: Default directory for file dialog startup
         :param fileMask:       File mask (glob pattern, such as *.*) to use in file dialog
         :param fileMode:       wx.OPEN or wx.SAVE, indicates type of file dialog to use
         :param startDirectory: Default directory for file dialog startup
         :param fileMask:       File mask (glob pattern, such as *.*) to use in file dialog
         :param fileMode:       wx.OPEN or wx.SAVE, indicates type of file dialog to use

-        :param changeCallback: callback receives all changes in value of control
+        :param changeCallback: Optional callback called for all changes in value of the control

         """
       
         # store variables
         """
       
         # store variables


@@ -86,11 +86,17 @@ class FileBrowseButton(wx.Panel):
     def createDialog( self, parent, id, pos, size, style ):
         """Setup the graphic representation of the dialog"""
         wx.Panel.__init__ (self, parent, id, pos, size, style)
     def createDialog( self, parent, id, pos, size, style ):
         """Setup the graphic representation of the dialog"""
         wx.Panel.__init__ (self, parent, id, pos, size, style)

+        self.SetMinSize(size) # play nice with sizers
+

         # try to set the background colour
         try:
         # try to set the background colour
         try:

-            self.SetBackgroundColour(self._bc)
+            #Question: is this still needed on other platforms?
+            #It should have transparent background on Mac
+            if wx.Platform != "__WXMAC__":
+                self.SetBackgroundColour(self._bc)

         except:
             pass
         except:
             pass

+

         box = wx.BoxSizer(wx.HORIZONTAL)
 
         self.label = self.createLabel( )
         box = wx.BoxSizer(wx.HORIZONTAL)
 
         self.label = self.createLabel( )