X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/622a19f0ea01cda30f3e2c3cb968089db2e77127..2abd8d78a69cbe726f957de91929feeeac21cfb0:/wxPython/wx/lib/imagebrowser.py?ds=sidebyside diff --git a/wxPython/wx/lib/imagebrowser.py b/wxPython/wx/lib/imagebrowser.py index da40ffc340..d284562058 100644 --- a/wxPython/wx/lib/imagebrowser.py +++ b/wxPython/wx/lib/imagebrowser.py @@ -82,7 +82,7 @@ class ImageView(wx.Window): brush = wx.Brush(wx.NamedColour(self.back_color), wx.SOLID) dc.SetBrush(brush) dc.SetPen(wx.Pen(wx.NamedColour(self.border_color), 1)) - dc.DrawRectangle((0, 0), (self.image_sizex, self.image_sizey)) + dc.DrawRectangle(0, 0, self.image_sizex, self.image_sizey) def DrawImage(self, dc): try: @@ -113,7 +113,7 @@ class ImageView(wx.Window): image.Rescale(iwidth, iheight) # rescale to fit the window image.ConvertToBitmap() bmp = image.ConvertToBitmap() - dc.DrawBitmap(bmp, (diffx, diffy)) # draw the image to window + dc.DrawBitmap(bmp, diffx, diffy) # draw the image to window class ImageDialog(wx.Dialog): @@ -135,11 +135,11 @@ class ImageDialog(wx.Dialog): self.dir_x = self.x_pos self.dir_y = self.y_pos - self.DisplayDir() # display the directory value + self.dir = wx.StaticText(self, -1, self.set_dir, (self.dir_x, self.dir_y), (250, -1)) self.y_pos = self.y_pos + self.delta - btn = wx.Button(self, 12331, ' Set Directory ', (self.x_pos, self.y_pos), size) + btn = wx.Button(self, 12331, ' Set Directory ', (self.x_pos, self.y_pos)) self.Bind(wx.EVT_BUTTON, self.SetDirect, btn) self.type_posy = self.y_pos # save the y position for the image type combo @@ -148,7 +148,6 @@ class ImageDialog(wx.Dialog): self.GetFiles() # get the file list self.y_pos = self.y_pos + self.delta + 10 - self.list_height = 150 # List of Labels @@ -223,7 +222,8 @@ class ImageDialog(wx.Dialog): self.fl_list.sort() # sort the file list def DisplayDir(self): # display the working directory - wx.StaticText(self, -1, self.set_dir, (self.dir_x, self.dir_y), (250, -1)) + if self.dir: + self.dir.SetLabel(self.set_dir) def OnSetType(self, event): val = event.GetString() # get file type value