From 6230a84fdc327322f7bc6073b92cf34a8f92c47b Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 13 Nov 1999 07:33:29 +0000 Subject: [PATCH] more tweaks for release git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/demo/Threads.py | 46 +++++++++++++----- .../demo/{Calbmp => bitmaps}/Calend.bmp | Bin .../demo/{Calbmp => bitmaps}/DbDec.bmp | Bin .../demo/{Calbmp => bitmaps}/DbInc.bmp | Bin .../wxPython/demo/{Calbmp => bitmaps}/Dec.bmp | Bin .../wxPython/demo/{Calbmp => bitmaps}/Inc.bmp | Bin .../wxPython/demo/{Calbmp => bitmaps}/Pt.bmp | Bin utils/wxPython/demo/wxCalendar.py | 6 +-- utils/wxPython/modules/glcanvas/.cvsignore | 1 + utils/wxPython/src/build.cfg | 4 +- 10 files changed, 40 insertions(+), 17 deletions(-) rename utils/wxPython/demo/{Calbmp => bitmaps}/Calend.bmp (100%) rename utils/wxPython/demo/{Calbmp => bitmaps}/DbDec.bmp (100%) rename utils/wxPython/demo/{Calbmp => bitmaps}/DbInc.bmp (100%) rename utils/wxPython/demo/{Calbmp => bitmaps}/Dec.bmp (100%) rename utils/wxPython/demo/{Calbmp => bitmaps}/Inc.bmp (100%) rename utils/wxPython/demo/{Calbmp => bitmaps}/Pt.bmp (100%) diff --git a/utils/wxPython/demo/Threads.py b/utils/wxPython/demo/Threads.py index 75a96e7869..0aa4c91320 100644 --- a/utils/wxPython/demo/Threads.py +++ b/utils/wxPython/demo/Threads.py @@ -74,7 +74,8 @@ class GraphWindow(wxWindow): self.font = wxFont(12, wxSWISS, wxNORMAL, wxBOLD) self.SetFont(self.font) - self.colors = [ wxRED, wxGREEN, wxBLUE, wxCYAN] #, wxNamedColour("Yellow") ] + self.colors = [ wxRED, wxGREEN, wxBLUE, wxCYAN, + wxNamedColour("Yellow"), wxNamedColor("Navy") ] def SetValue(self, index, value): @@ -94,12 +95,11 @@ class GraphWindow(wxWindow): self.barHeight = hmax - def OnPaint(self, evt): - size = self.GetSize() - dc = wxPaintDC(self) - dc.BeginDrawing() + def Draw(self, dc, size): dc.SetFont(self.font) dc.SetTextForeground(wxBLUE) + dc.SetBackground(wxBrush(self.GetBackgroundColour())) + dc.Clear() dc.SetPen(wxPen(wxBLACK, 3, wxSOLID)) dc.DrawLine(self.linePos, 0, self.linePos, size.height-10) @@ -118,7 +118,24 @@ class GraphWindow(wxWindow): if ypos > size.height-10: break - dc.EndDrawing() + + def OnPaint(self, evt): + size = self.GetSize() + bmp = wxEmptyBitmap(size.width, size.height) + dc = wxMemoryDC() + dc.SelectObject(bmp) + self.Draw(dc, size) + + wdc = wxPaintDC(self) + wdc.BeginDrawing() + wdc.Blit(0,0, size.width, size.height, dc, 0,0) + wdc.EndDrawing() + + + def OnEraseBackground(self, evt): + pass + + #---------------------------------------------------------------------- @@ -137,7 +154,8 @@ class TestFrame(wxFrame): "window by sending events to it.", wxPoint(5,5)) panel.Fit() - self.graph = GraphWindow(self, ['Zero', 'One', 'Two', 'Three']) + self.graph = GraphWindow(self, ['Zero', 'One', 'Two', 'Three', 'Four', + 'Five', 'Six', 'Seven']) sizer = wxBoxSizer(wxVERTICAL) sizer.Add(panel, 0, wxEXPAND) @@ -153,10 +171,14 @@ class TestFrame(wxFrame): EVT_UPDATE_BARGRAPH(self, self.OnUpdate) self.threads = [] - self.threads.append(CalcBarThread(self, 0, 25)) - self.threads.append(CalcBarThread(self, 1, 50)) - self.threads.append(CalcBarThread(self, 2, 75)) - self.threads.append(CalcBarThread(self, 3, 100)) + self.threads.append(CalcBarThread(self, 0, 50)) + self.threads.append(CalcBarThread(self, 1, 75)) + self.threads.append(CalcBarThread(self, 2, 100)) + self.threads.append(CalcBarThread(self, 3, 150)) + self.threads.append(CalcBarThread(self, 4, 225)) + self.threads.append(CalcBarThread(self, 5, 300)) + self.threads.append(CalcBarThread(self, 6, 250)) + self.threads.append(CalcBarThread(self, 7, 175)) for t in self.threads: t.Start() @@ -165,7 +187,7 @@ class TestFrame(wxFrame): def OnUpdate(self, evt): self.graph.SetValue(evt.barNum, evt.value) - self.graph.Refresh() + self.graph.Refresh(false) def OnCloseWindow(self, evt): diff --git a/utils/wxPython/demo/Calbmp/Calend.bmp b/utils/wxPython/demo/bitmaps/Calend.bmp similarity index 100% rename from utils/wxPython/demo/Calbmp/Calend.bmp rename to utils/wxPython/demo/bitmaps/Calend.bmp diff --git a/utils/wxPython/demo/Calbmp/DbDec.bmp b/utils/wxPython/demo/bitmaps/DbDec.bmp similarity index 100% rename from utils/wxPython/demo/Calbmp/DbDec.bmp rename to utils/wxPython/demo/bitmaps/DbDec.bmp diff --git a/utils/wxPython/demo/Calbmp/DbInc.bmp b/utils/wxPython/demo/bitmaps/DbInc.bmp similarity index 100% rename from utils/wxPython/demo/Calbmp/DbInc.bmp rename to utils/wxPython/demo/bitmaps/DbInc.bmp diff --git a/utils/wxPython/demo/Calbmp/Dec.bmp b/utils/wxPython/demo/bitmaps/Dec.bmp similarity index 100% rename from utils/wxPython/demo/Calbmp/Dec.bmp rename to utils/wxPython/demo/bitmaps/Dec.bmp diff --git a/utils/wxPython/demo/Calbmp/Inc.bmp b/utils/wxPython/demo/bitmaps/Inc.bmp similarity index 100% rename from utils/wxPython/demo/Calbmp/Inc.bmp rename to utils/wxPython/demo/bitmaps/Inc.bmp diff --git a/utils/wxPython/demo/Calbmp/Pt.bmp b/utils/wxPython/demo/bitmaps/Pt.bmp similarity index 100% rename from utils/wxPython/demo/Calbmp/Pt.bmp rename to utils/wxPython/demo/bitmaps/Pt.bmp diff --git a/utils/wxPython/demo/wxCalendar.py b/utils/wxPython/demo/wxCalendar.py index 7648a7fbe8..6ef4e745d2 100644 --- a/utils/wxPython/demo/wxCalendar.py +++ b/utils/wxPython/demo/wxCalendar.py @@ -100,7 +100,7 @@ class TestPanel(wxPanel): wxStaticText(self, -1, "Test Calendar Dialog", wxPoint(350, 50)).SetBackgroundColour(wxNamedColour('Red')) - bmp = wxBitmap('Calbmp/Calend.bmp', wxBITMAP_TYPE_BMP) + bmp = wxBitmap('bitmaps/Calend.bmp', wxBITMAP_TYPE_BMP) self.but = wxBitmapButton(self, 60, bmp, wxPoint(380, 80))#, wxSize(30, 30)) EVT_BUTTON(self, 60, self.TestDlg) @@ -108,7 +108,7 @@ class TestPanel(wxPanel): wxStaticText(self, -1, "Test Calendar Window", wxPoint(350, 150)).SetBackgroundColour(wxNamedColour('Blue')) - bmp = wxBitmap('Calbmp/Calend.bmp', wxBITMAP_TYPE_BMP) + bmp = wxBitmap('bitmaps/Calend.bmp', wxBITMAP_TYPE_BMP) self.but = wxBitmapButton(self, 160, bmp, wxPoint(380, 180))#, wxSize(30, 30)) EVT_BUTTON(self, 160, self.TestFrame) @@ -374,7 +374,7 @@ class CalendFrame(wxFrame): def MakeToolMenu(self): tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER) - bmp_path = 'Calbmp/' + bmp_path = 'bitmaps/' SetToolPath(self, tb, 10, bmp_path + 'DbDec.bmp', 'Dec Year') EVT_TOOL(self, 10, self.OnDecYear) diff --git a/utils/wxPython/modules/glcanvas/.cvsignore b/utils/wxPython/modules/glcanvas/.cvsignore index e8f0a7bd7a..82c04024fd 100644 --- a/utils/wxPython/modules/glcanvas/.cvsignore +++ b/utils/wxPython/modules/glcanvas/.cvsignore @@ -8,6 +8,7 @@ Makefile.pre Setup build.local config.c +glcanvas.h glcanvasc.ilk glcanvasc.pyd sedscript diff --git a/utils/wxPython/src/build.cfg b/utils/wxPython/src/build.cfg index 5c48af31bc..e0cd0cd43b 100644 --- a/utils/wxPython/src/build.cfg +++ b/utils/wxPython/src/build.cfg @@ -64,8 +64,8 @@ installLibDemo: cp ../lib/*.txt $(TARGETDIR)/lib; \\ cp ../lib/sizers/*.txt $(TARGETDIR)/lib/sizers; \\ cp ../demo/*.txt $(TARGETDIR)/demo; \\ - cp ../demo/bitmaps/[a-z]* $(TARGETDIR)/demo/bitmaps; \\ - cp ../demo/data/[a-z]* $(TARGETDIR)/demo/data; \\ + cp ../demo/bitmaps/* $(TARGETDIR)/demo/bitmaps; \\ + cp ../demo/data/* $(TARGETDIR)/demo/data; \\ $(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR); \\ $(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR); \\ fi -- 2.45.2