Don't try to typedef off_t twice (eVC++)

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

diff --git a/wxPython/wx/lib/throbber.py b/wxPython/wx/lib/throbber.py
index 46a4c4405ae6d08026a79994e1dc8f2e828738f4..5a5b073f3f28a12e1b1f9907e636b0a22b278131 100644 (file)
--- a/wxPython/wx/lib/throbber.py
+++ b/wxPython/wx/lib/throbber.py
@@ -37,7 +37,7 @@ class UpdateThrobberEvent(wx.PyEvent):
 
 # ------------------------------------------------------------------------------
 
 
 # ------------------------------------------------------------------------------
 

-class Throbber(wx.Panel):
+class Throbber(wx.PyPanel):

     """
     The first argument is either the name of a file that will be split into frames
     (a composite image) or a list of  strings of image names that will be treated
     """
     The first argument is either the name of a file that will be split into frames
     (a composite image) or a list of  strings of image names that will be treated


@@ -60,7 +60,7 @@ class Throbber(wx.Panel):
                  reverse = 0,     # reverse direction at end of animation
                  style = 0,       # window style
                  name = "throbber"):
                  reverse = 0,     # reverse direction at end of animation
                  style = 0,       # window style
                  name = "throbber"):

-        wx.Panel.__init__(self, parent, id, pos, size, style, name)
+        wx.PyPanel.__init__(self, parent, id, pos, size, style, name)

         self.name = name
         self.label = label
         self.running = (1 != 1)
         self.name = name
         self.label = label
         self.running = (1 != 1)


@@ -127,7 +127,11 @@ class Throbber(wx.Panel):
         self.Bind(wx.EVT_PAINT, self.OnPaint)
         self.Bind(wx.EVT_TIMER, self.OnTimer, self.timer)
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroyWindow)
         self.Bind(wx.EVT_PAINT, self.OnPaint)
         self.Bind(wx.EVT_TIMER, self.OnTimer, self.timer)
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroyWindow)

-            
+
+
+    def DoGetBestSize(self):
+        return (self.width, self.height)
+    

 
     def OnTimer(self, event):
         wx.PostEvent(self, UpdateThrobberEvent())
 
     def OnTimer(self, event):
         wx.PostEvent(self, UpdateThrobberEvent())


@@ -139,13 +143,13 @@ class Throbber(wx.Panel):
 
 
     def Draw(self, dc):
 
 
     def Draw(self, dc):

-        dc.DrawBitmap(self.submaps[self.sequence[self.current]], (0, 0), True)
+        dc.DrawBitmap(self.submaps[self.sequence[self.current]], 0, 0, True)

         if self.overlay and self.showOverlay:
         if self.overlay and self.showOverlay:

-            dc.DrawBitmap(self.overlay, (self.overlayX, self.overlayY), True)
+            dc.DrawBitmap(self.overlay, self.overlayX, self.overlayY, True)

         if self.label and self.showLabel:
         if self.label and self.showLabel:

-            dc.DrawText(self.label, (self.labelX, self.labelY))
+            dc.DrawText(self.label, self.labelX, self.labelY)

             dc.SetTextForeground(wx.WHITE)
             dc.SetTextForeground(wx.WHITE)

-            dc.DrawText(self.label, (self.labelX-1, self.labelY-1))
+            dc.DrawText(self.label, self.labelX-1, self.labelY-1)

 
 
     def OnPaint(self, event):
 
 
     def OnPaint(self, event):