Some minor bugs fixed, some spit and polish, especially in the demo,
and some fixes in the build and distrib stuff. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
*.pyc
|
||||
.emacs.desktop
|
||||
b.bat
|
||||
hangman_dict.txt
|
||||
setup.bat
|
||||
test.out
|
||||
|
@@ -37,7 +37,7 @@ class TestPanel(wxWindow):
|
||||
wxWindow.__init__(self, parent, -1)#, style=wxCLIP_CHILDREN)
|
||||
self.ie = None
|
||||
self.log = log
|
||||
self.current = "http://alldunn.com/"
|
||||
self.current = "http://wxPython.org/"
|
||||
self.frame = frame
|
||||
if frame:
|
||||
self.titleBase = frame.GetTitle()
|
||||
|
@@ -50,13 +50,15 @@ _treeList = [
|
||||
'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
|
||||
'PythonEvents', 'Threads',
|
||||
'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
|
||||
'wxDragImage', 'PyShellWindow',
|
||||
'wxDragImage',
|
||||
]),
|
||||
|
||||
('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
|
||||
'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
|
||||
'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
|
||||
'FileBrowseButton', 'GenericButtons', 'wxEditor']),
|
||||
'FileBrowseButton', 'GenericButtons', 'wxEditor',
|
||||
'PyShellWindow',
|
||||
]),
|
||||
|
||||
('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
|
||||
|
||||
|
@@ -23,3 +23,5 @@ while line:
|
||||
line = sys.stdin.readline()
|
||||
|
||||
|
||||
sys.stdout.write('\nExiting...\n')
|
||||
sys.stdout.flush()
|
||||
|
@@ -1565,7 +1565,8 @@ public:
|
||||
void SelectRow( int row, bool addToSelected = FALSE );
|
||||
void SelectCol( int col, bool addToSelected = FALSE );
|
||||
|
||||
void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol );
|
||||
void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
|
||||
bool addToSelected = FALSE );
|
||||
// TODO: ??? void SelectBlock( const wxGridCellCoords& topLeft,
|
||||
// TODO: ??? const wxGridCellCoords& bottomRight )
|
||||
|
||||
|
@@ -1,5 +1,7 @@
|
||||
|
||||
|
||||
import sys, string
|
||||
|
||||
from wxPython.wx import *
|
||||
from wxPython.html import *
|
||||
|
||||
@@ -41,7 +43,10 @@ class TestHtmlPanel(wxPanel):
|
||||
import About
|
||||
wxPanel.__init__(self, parent, id, size=size)
|
||||
self.html = wxHtmlWindow(self, -1, wxPoint(5,5), wxSize(400, 350))
|
||||
self.html.SetPage(About.MyAboutBox.text % wx.__version__)
|
||||
py_version = string.split(sys.version)[0]
|
||||
self.html.SetPage(About.MyAboutBox.text % (wx.__version__, py_version))
|
||||
ir = self.html.GetInternalRepresentation()
|
||||
self.html.SetSize( (ir.GetWidth()+5, ir.GetHeight()+5) )
|
||||
self.Fit()
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
@@ -43,7 +43,7 @@ class TestFloatBar(wxFrame):
|
||||
|
||||
tb.AddTool(60, wxBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
|
||||
wxBitmap('bitmaps/tog2.bmp', wxBITMAP_TYPE_BMP),
|
||||
shortHelpString="Toggle with 2 bitmaps", toggle=true)
|
||||
shortHelpString="Toggle with 2 bitmaps", isToggle=true)
|
||||
EVT_TOOL(self, 60, self.OnToolClick)
|
||||
EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
|
||||
tb.Realize()
|
||||
|
@@ -94,15 +94,26 @@ class TestPanel(wxPanel):
|
||||
|
||||
def OnIdle(self, evt):
|
||||
if self.process is not None:
|
||||
st = self.process.GetInputStream()
|
||||
if not st.eof():
|
||||
text = st.read()
|
||||
stream = self.process.GetInputStream()
|
||||
|
||||
# Yes, this is weird. For this particular stream, EOF
|
||||
# simply means that there is no data available to be read,
|
||||
# not truly the end of file. Also, read() just reads all
|
||||
# the currently available data, not until the real EOF...
|
||||
if not stream.eof():
|
||||
text = stream.read()
|
||||
self.out.AppendText(text)
|
||||
|
||||
|
||||
def OnProcessEnded(self, evt):
|
||||
self.log.write('OnProcessEnded, pid:%s, exitCode: %s\n' %
|
||||
(evt.GetPid(), evt.GetExitCode()))
|
||||
|
||||
stream = self.process.GetInputStream()
|
||||
if not stream.eof():
|
||||
text = stream.read()
|
||||
self.out.AppendText(text)
|
||||
|
||||
self.process.Destroy()
|
||||
self.process = None
|
||||
self.inp.Enable(false)
|
||||
@@ -126,7 +137,19 @@ overview = """\
|
||||
<html><body>
|
||||
<h2>wxProcess</h2>
|
||||
|
||||
blah blah blah...
|
||||
wxProcess lets you get notified when an asyncronous child process
|
||||
started by wxExecute terminates, and also to get input/output streams
|
||||
for the child process's stdout, stderr and stdin.
|
||||
|
||||
<p>
|
||||
This demo launches a simple python script that echos back on stdout
|
||||
lines that it reads from stdin. You can send text to the echo
|
||||
process' stdin by typing in the lower textctrl and clicking Send.
|
||||
|
||||
<p>
|
||||
Clicking the Close Stream button will close the demo's end of the
|
||||
stdin pipe to the child process. In our case that will cause the
|
||||
child process to exit its main loop.
|
||||
|
||||
</body><html>
|
||||
"""
|
||||
|
@@ -126,9 +126,17 @@ class PythonSTC(wxStyledTextCtrl):
|
||||
self.CallTipShow(pos, 'param1, param2')
|
||||
# Code completion
|
||||
else:
|
||||
self.AutoCompShow('I love wxPython a b c')
|
||||
self.AutoCompSelect('wx')
|
||||
|
||||
#lst = []
|
||||
#for x in range(50000):
|
||||
# lst.append('%05d' % x)
|
||||
#st = string.join(lst)
|
||||
#print len(st)
|
||||
#self.AutoCompShow(0, st)
|
||||
self.AutoCompSetIgnoreCase(true)
|
||||
self.AutoCompShow(0, string.join(keyword.kwlist))
|
||||
self.AutoCompSelect('br')
|
||||
else:
|
||||
event.Skip()
|
||||
|
||||
|
||||
def OnUpdateUI(self, evt):
|
||||
|
@@ -39,13 +39,13 @@ class TestToolBar(wxFrame):
|
||||
tb.AddSeparator()
|
||||
|
||||
tool = tb.AddTool(50, wxBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
|
||||
shortHelpString="Toggle this", toggle=true)
|
||||
shortHelpString="Toggle this", isToggle=true)
|
||||
EVT_TOOL(self, 50, self.OnToolClick)
|
||||
EVT_TOOL_RCLICKED(self, 50, self.OnToolRClick)
|
||||
|
||||
tb.AddTool(60, wxBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
|
||||
wxBitmap('bitmaps/tog2.bmp', wxBITMAP_TYPE_BMP),
|
||||
shortHelpString="Toggle with 2 bitmaps", toggle=true)
|
||||
shortHelpString="Toggle with 2 bitmaps", isToggle=true)
|
||||
EVT_TOOL(self, 60, self.OnToolClick)
|
||||
EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
|
||||
|
||||
|
Reference in New Issue
Block a user