Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lots of bup fixes, API updates, etc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-11-21 07:39:05 +00:00
parent fbd5dd1dfa
commit 7722248d75
36 changed files with 462 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/wx/lib/colourchooser/canvas.py
View File

@@ -103,7 +103,7 @@ class Canvas(wxWindow):
"""Performs the blit of the buffer contents on-screen."""
width, height = self.buffer.GetSize()
dc.BeginDrawing()
dc.Blit(0, 0, width, height, self.buffer, 0, 0)
dc.Blit((0, 0), (width, height), self.buffer, (0, 0))
dc.EndDrawing()
def GetBoundingRect(self):

22
wxPython/wx/lib/colourchooser/pycolourchooser.py
View File

@@ -134,15 +134,15 @@ class wxPyColourChooser(wxPanel):
self.custom_boxs.append(custom)
csizer = wxBoxSizer(wxVERTICAL)
csizer.Add(1, 25)
csizer.Add((1, 25))
csizer.Add(self.basic_label, 0, wxEXPAND)
csizer.Add(1, 5)
csizer.Add((1, 5))
csizer.Add(colour_grid, 0, wxEXPAND)
csizer.Add(1, 25)
csizer.Add((1, 25))
csizer.Add(self.custom_label, 0, wxEXPAND)
csizer.Add(1, 5)
csizer.Add((1, 5))
csizer.Add(custom_grid, 0, wxEXPAND)
csizer.Add(1, 5)
csizer.Add((1, 5))
csizer.Add(self.add_button, 0, wxEXPAND)
self.palette = pypalette.PyPalette(self, -1)
@@ -152,7 +152,7 @@ class wxPyColourChooser(wxPanel):
EVT_COMMAND_SCROLL(self, self.idSCROLL, self.onScroll)
psizer = wxBoxSizer(wxHORIZONTAL)
psizer.Add(self.palette, 0, 0)
psizer.Add(10, 1)
psizer.Add((10, 1))
psizer.Add(self.colour_slider, 0, wxALIGN_CENTER_VERTICAL)
psizer.Add(self.slider, 0, wxALIGN_CENTER_VERTICAL)
@@ -166,7 +166,7 @@ class wxPyColourChooser(wxPanel):
slabel = wxStaticText(self, -1, _("Solid Colour"))
ssizer = wxBoxSizer(wxVERTICAL)
ssizer.Add(self.solid, 0, 0)
ssizer.Add(1, 2)
ssizer.Add((1, 2))
ssizer.Add(slabel, 0, wxALIGN_CENTER_HORIZONTAL)
hlabel = wxStaticText(self, -1, _("H:"))
@@ -212,15 +212,15 @@ class wxPyColourChooser(wxPanel):
hsizer.Add(gsizer, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_CENTER_HORIZONTAL)
vsizer = wxBoxSizer(wxVERTICAL)
vsizer.Add(1, 5)
vsizer.Add((1, 5))
vsizer.Add(psizer, 0, 0)
vsizer.Add(1, 15)
vsizer.Add((1, 15))
vsizer.Add(hsizer, 0, wxEXPAND)
sizer = wxBoxSizer(wxHORIZONTAL)
sizer.Add(5, 1)
sizer.Add((5, 1))
sizer.Add(csizer, 0, wxEXPAND)
sizer.Add(10, 1)
sizer.Add((10, 1))
sizer.Add(vsizer, 0, wxEXPAND)
self.SetAutoLayout(True)
self.SetSizer(sizer)

4
wxPython/wx/lib/colourchooser/pycolourslider.py
View File

@@ -58,7 +58,7 @@ class PyColourSlider(canvas.Canvas):
"""Returns the colour value for a position on the slider. The position
must be within the valid height of the slider, or results can be
unpredictable."""
return self.buffer.GetPixel(0, pos)
return self.buffer.GetPixel((0, pos))
def DrawBuffer(self):
"""Actual implementation of the widget's drawing. We simply draw
@@ -78,5 +78,5 @@ class PyColourSlider(canvas.Canvas):
r,g,b = [c * 255.0 for c in colorsys.hsv_to_rgb(h,s,v)]
colour = wxColour(int(r), int(g), int(b))
self.buffer.SetPen(wxPen(colour, 1, wxSOLID))
self.buffer.DrawRectangle(0, y_pos, 15, 1)
self.buffer.DrawRectangle((0, y_pos), (15, 1))
v = v - vstep

11
wxPython/wx/lib/colourchooser/pypalette.py
View File

@@ -163,12 +163,12 @@ class PyPalette(canvas.Canvas):
"""Returns a colour value at a specific x, y coordinate pair. This
is useful for determining the colour found a specific mouse click
in an external event handler."""
return self.buffer.GetPixel(x, y)
return self.buffer.GetPixel((x, y))
def DrawBuffer(self):
"""Draws the palette XPM into the memory buffer."""
#self.GeneratePaletteBMP ("foo.bmp")
self.buffer.DrawBitmap(self.palette, 0, 0, 0)
self.buffer.DrawBitmap(self.palette, (0, 0), 0)
def HighlightPoint(self, x, y):
"""Highlights an area of the palette with a little circle around
@@ -176,7 +176,7 @@ class PyPalette(canvas.Canvas):
colour = wxColour(0, 0, 0)
self.buffer.SetPen(wxPen(colour, 1, wxSOLID))
self.buffer.SetBrush(wxBrush(colour, wxTRANSPARENT))
self.buffer.DrawCircle(x, y, 3)
self.buffer.DrawCircle((x, y), 3)
self.Refresh()
def GeneratePaletteBMP(self, file_name, granularity=1):
@@ -204,9 +204,8 @@ class PyPalette(canvas.Canvas):
colour = wxColour(int(r * 255.0), int(g * 255.0), int(b * 255.0))
self.buffer.SetPen(wxPen(colour, 1, wxSOLID))
self.buffer.SetBrush(wxBrush(colour, wxSOLID))
self.buffer.DrawRectangle(x, y,
self.HORIZONTAL_STEP,
self.vertical_step)
self.buffer.DrawRectangle((x, y),
(self.HORIZONTAL_STEP, self.vertical_step))
# this code is now simpler (and works)
bitmap = self.buffer.GetBitmap()