diff --git a/wx/lib/filebrowsebutton.py b/wx/lib/filebrowsebutton.py
index 2e2023a3..51542834 100644
--- a/wx/lib/filebrowsebutton.py
+++ b/wx/lib/filebrowsebutton.py
@@ -57,7 +57,7 @@ class FileBrowseButton(wx.Panel):
         :param changeCallback: Optional callback called for all changes in value of the control
         :param labelWidth:     Width of the label
         """
-      
+
         # store variables
         self.labelText = labelText
         self.buttonText = buttonText
@@ -129,7 +129,7 @@ class FileBrowseButton(wx.Panel):
     def createTextControl( self):
         """Create the text control"""
         textControl = wx.TextCtrl(self, -1)
-        textControl.SetToolTipString( self.toolTip )
+        textControl.SetToolTip( self.toolTip )
         if self.changeCallback:
             textControl.Bind(wx.EVT_TEXT, self.OnChanged)
             textControl.Bind(wx.EVT_COMBOBOX, self.OnChanged)
@@ -142,7 +142,7 @@ class FileBrowseButton(wx.Panel):
     def createBrowseButton( self):
         """Create the browse-button control"""
         button =wx.Button(self, -1, self.buttonText)
-        button.SetToolTipString( self.toolTip )
+        button.SetToolTip( self.toolTip )
         button.Bind(wx.EVT_BUTTON, self.OnBrowse)
         return button
 
@@ -212,18 +212,18 @@ class FileBrowseButtonWithHistory( FileBrowseButton ):
                 selection. If you discover this condition, please report it!
 
             As for a FileBrowseButton.__init__ otherwise.
-            
+
         GetHistoryControl()
             Return reference to the control which implements interfaces
             required for manipulating the history list.  See GetHistoryControl
             documentation for description of what that interface is.
-            
+
         GetHistory()
             Return current history list
-            
+
         SetHistory( value=(), selectionIndex = None )
             Set current history list, if selectionIndex is not None, select that index
-            
+
         """
     def __init__( self, *arguments, **namedarguments):
         self.history = namedarguments.get( "history" )
@@ -242,7 +242,7 @@ class FileBrowseButtonWithHistory( FileBrowseButton ):
     def createTextControl( self):
         """Create the text control"""
         textControl = wx.ComboBox(self, -1, style = wx.CB_DROPDOWN )
-        textControl.SetToolTipString( self.toolTip )
+        textControl.SetToolTip( self.toolTip )
         textControl.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus)
         if self.changeCallback:
             textControl.Bind(wx.EVT_TEXT, self.OnChanged)
@@ -258,12 +258,12 @@ class FileBrowseButtonWithHistory( FileBrowseButton ):
         """
         Return a pointer to the control which provides (at least)
         the following methods for manipulating the history list:
-        
+
             Append( item ) -- add item
             Clear() -- clear all items
             Delete( index ) -- 0-based index to delete from list
             SetSelection( index ) -- 0-based index to select in list
-            
+
         Semantics of the methods follow those for the wxComboBox control
         """
         return self.textControl