From: Robin Dunn Date: Fri, 5 Apr 2002 20:55:53 +0000 (+0000) Subject: A few little cleanups, etc. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f60765b0fc0d8e38caebada76a89365335c99ae8 A few little cleanups, etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 868b98d79f..71c7faaddf 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -122,6 +122,7 @@ Source: "demo\data\*.txt"; DestDir: "{app}\wxPython\demo\data"; Source: "demo\data\*.wav"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.wdr"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.xrc"; DestDir: "{app}\wxPython\demo\data"; Components: demo +Source: "demo\data\*.gif"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\dllwidget\*.cpp"; DestDir: "{app}\wxPython\demo\dllwidget"; Components: demo Source: "demo\dllwidget\*.py"; DestDir: "{app}\wxPython\demo\dllwidget"; Components: demo diff --git a/wxPython/src/fonts.i b/wxPython/src/fonts.i index 6f00cd0b0c..454e4af1bc 100644 --- a/wxPython/src/fonts.i +++ b/wxPython/src/fonts.i @@ -854,6 +854,9 @@ public: // or output encoding is not supported.) bool Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method = wxCONVERT_STRICT); + + // TODO: Need to do something about unicode mode... + // Convert input string according to settings passed to Init. // Note that you must call Init before using Convert! wxString Convert(const wxString& input); @@ -868,6 +871,7 @@ public: // #endif + // Return equivalent(s) for given font that are used // under given platform. wxPLATFORM_CURRENT means the plaform // this binary was compiled for diff --git a/wxPython/tools/XRCed/xrced.py b/wxPython/tools/XRCed/xrced.py index 1bacff33c9..503c1b1b0f 100644 --- a/wxPython/tools/XRCed/xrced.py +++ b/wxPython/tools/XRCed/xrced.py @@ -1058,18 +1058,18 @@ class Frame(wxFrame): # Create toolbar tb = self.CreateToolBar(wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT) tb.SetToolBitmapSize((24, 23)) - tb.AddSimpleTool(wxID_NEW, '', images.getNewBitmap(), 'New', 'New file') - tb.AddSimpleTool(wxID_OPEN, '', images.getOpenBitmap(), 'Open', 'Open file') - tb.AddSimpleTool(wxID_SAVE, '', images.getSaveBitmap(), 'Save', 'Save file') + tb.AddSimpleTool(wxID_NEW, images.getNewBitmap(), 'New', 'New file') + tb.AddSimpleTool(wxID_OPEN, images.getOpenBitmap(), 'Open', 'Open file') + tb.AddSimpleTool(wxID_SAVE, images.getSaveBitmap(), 'Save', 'Save file') tb.AddControl(wxStaticLine(tb, -1, size=(-1,23), style=wxLI_VERTICAL)) - tb.AddSimpleTool(wxID_CUT, '', images.getCutBitmap(), 'Cut', 'Cut') - tb.AddSimpleTool(wxID_COPY, '', images.getCopyBitmap(), 'Copy', 'Copy') - tb.AddSimpleTool(wxID_PASTE, '', images.getPasteBitmap(), 'Paste', 'Paste') + tb.AddSimpleTool(wxID_CUT, images.getCutBitmap(), 'Cut', 'Cut') + tb.AddSimpleTool(wxID_COPY, images.getCopyBitmap(), 'Copy', 'Copy') + tb.AddSimpleTool(wxID_PASTE, images.getPasteBitmap(), 'Paste', 'Paste') tb.AddControl(wxStaticLine(tb, -1, size=(-1,23), style=wxLI_VERTICAL)) - tb.AddSimpleTool(self.ID_TEST, '', images.getTestBitmap(), 'Test', 'Test window') - tb.AddSimpleTool(self.ID_REFRESH, '', images.getRefreshBitmap(), + tb.AddSimpleTool(self.ID_TEST, images.getTestBitmap(), 'Test', 'Test window') + tb.AddSimpleTool(self.ID_REFRESH, images.getRefreshBitmap(), 'Refresh', 'Refresh view') - tb.AddSimpleTool(self.ID_AUTO_REFRESH, '', images.getAutoRefreshBitmap(), + tb.AddSimpleTool(self.ID_AUTO_REFRESH, images.getAutoRefreshBitmap(), 'Auto-refresh', 'Toggle auto-refresh mode', true) if wxGetOsVersion()[0] == wxGTK: tb.AddSeparator() # otherwise auto-refresh sticks in status line @@ -1910,7 +1910,7 @@ class App(wxApp): wc.Flush() def main(): - app = App(0) + app = App() app.MainLoop() app.OnExit() diff --git a/wxPython/wxPython/lib/PyCrust/shell.py b/wxPython/wxPython/lib/PyCrust/shell.py index 556b144a9f..5927c0723b 100644 --- a/wxPython/wxPython/lib/PyCrust/shell.py +++ b/wxPython/wxPython/lib/PyCrust/shell.py @@ -48,12 +48,12 @@ else: # GTK class ShellFacade: """Simplified interface to all shell-related functionality. - This is a semi-transparent facade, in that all attributes of other are + This is a semi-transparent facade, in that all attributes of other are still accessible, even though only some are visible to the user.""" - + name = 'PyCrust Shell Interface' revision = __version__ - + def __init__(self, other): """Create a ShellFacade instance.""" methods = ['ask', @@ -126,10 +126,10 @@ F8 Command-completion of History item. class Shell(wxStyledTextCtrl): """PyCrust Shell based on wxStyledTextCtrl.""" - + name = 'PyCrust Shell' revision = __version__ - + def __init__(self, parent, id=-1, pos=wxDefaultPosition, \ size=wxDefaultSize, style=wxCLIP_CHILDREN, introText='', \ locals=None, InterpClass=None, *args, **kwds): @@ -147,7 +147,7 @@ class Shell(wxStyledTextCtrl): else: Interpreter = InterpClass # Create default locals so we have something interesting. - shellLocals = {'__name__': 'PyCrust-Shell', + shellLocals = {'__name__': 'PyCrust-Shell', '__doc__': 'PyCrust-Shell, The PyCrust Python Shell.', '__version__': VERSION, } @@ -194,12 +194,12 @@ class Shell(wxStyledTextCtrl): def destroy(self): del self.interp - + def config(self): """Configure shell based on user preferences.""" self.SetMarginType(1, wxSTC_MARGIN_NUMBER) self.SetMarginWidth(1, 40) - + self.SetLexer(wxSTC_LEX_PYTHON) self.SetKeyWords(0, ' '.join(keyword.kwlist)) @@ -227,11 +227,11 @@ class Shell(wxStyledTextCtrl): self.write(self.interp.introText) except AttributeError: pass - + def setBuiltinKeywords(self): """Create pseudo keywords as part of builtins. - - This is a rather clever hack that sets "close", "exit" and "quit" + + This is a rather clever hack that sets "close", "exit" and "quit" to a PseudoKeyword object so that we can make them do what we want. In this case what we want is to call our self.quit() method. The user can type "close", "exit" or "quit" without the final parens. @@ -248,19 +248,19 @@ class Shell(wxStyledTextCtrl): def quit(self): """Quit the application.""" - + # XXX Good enough for now but later we want to send a close event. - + # In the close event handler we can make sure they want to quit. # Other applications, like PythonCard, may choose to hide rather than # quit so we should just post the event and let the surrounding app # decide what it wants to do. self.write('Click on the close button to leave the application.') - + def setLocalShell(self): """Add 'shell' to locals as reference to ShellFacade instance.""" self.interp.locals['shell'] = ShellFacade(other=self) - + def execStartupScript(self, startupScript): """Execute the user's PYTHONSTARTUP script if they have one.""" if startupScript and os.path.isfile(startupScript): @@ -269,10 +269,10 @@ class Shell(wxStyledTextCtrl): (`startupText`, `startupScript`)) else: self.push('') - + def setStyles(self, faces): """Configure font size, typeface and color for lexer.""" - + # Default style self.StyleSetSpec(wxSTC_STYLE_DEFAULT, "face:%(mono)s,size:%(size)d,back:%(backcol)s" % faces) @@ -508,7 +508,7 @@ class Shell(wxStyledTextCtrl): def setStatusText(self, text): """Display status information.""" - + # This method will most likely be replaced by the enclosing app # to do something more interesting, like write to a status bar. print text @@ -522,11 +522,11 @@ class Shell(wxStyledTextCtrl): def processLine(self): """Process the line of text at which the user hit Enter.""" - + # The user hit ENTER and we need to decide what to do. They could be # sitting on any line in the shell. - thepos = self.GetCurrentPos() + thepos = self.GetCurrentPos() startpos = self.promptPosEnd endpos = self.GetTextLength() # If they hit RETURN inside the current command, execute the command. @@ -552,7 +552,7 @@ class Shell(wxStyledTextCtrl): def getMultilineCommand(self, rstrip=1): """Extract a multi-line command from the editor. - + The command may not necessarily be valid Python syntax.""" # XXX Need to extract real prompts here. Need to keep track of the # prompt every time a command is issued. @@ -586,10 +586,10 @@ class Shell(wxStyledTextCtrl): if rstrip: command = command.rstrip() return command - + def getCommand(self, text=None, rstrip=1): """Extract a command from text which may include a shell prompt. - + The command may not necessarily be valid Python syntax.""" if not text: text = self.GetCurLine()[0] @@ -613,7 +613,7 @@ class Shell(wxStyledTextCtrl): elif text[:ps2size] == ps2: text = text[ps2size:] return text - + def push(self, command): """Send command to the interpreter for execution.""" self.write(os.linesep) @@ -653,7 +653,7 @@ class Shell(wxStyledTextCtrl): def prompt(self): """Display appropriate prompt for the context, either ps1 or ps2. - + If this is a continuation line, autoindent as necessary.""" if self.more: prompt = str(sys.ps2) @@ -703,25 +703,25 @@ class Shell(wxStyledTextCtrl): def ask(self, prompt='Please enter your response:'): """Get response from the user.""" return raw_input(prompt=prompt) - + def pause(self): """Halt execution pending a response from the user.""" self.ask('Press enter to continue:') - + def clear(self): """Delete all text from the shell.""" self.ClearAll() - + def run(self, command, prompt=1, verbose=1): """Execute command within the shell as if it was typed in directly. >>> shell.run('print "this"') >>> print "this" this - >>> + >>> """ # Go to the very bottom of the text. endpos = self.GetTextLength() - self.SetCurrentPos(endpos) + self.SetCurrentPos(endpos) command = command.rstrip() if prompt: self.prompt() if verbose: self.write(command) @@ -739,7 +739,7 @@ class Shell(wxStyledTextCtrl): self.run(command, prompt=0, verbose=1) finally: file.close() - + def autoCompleteShow(self, command): """Display auto-completion popup list.""" list = self.interp.getAutoCompleteList(command, \ @@ -771,11 +771,11 @@ class Shell(wxStyledTextCtrl): def writeOut(self, text): """Replacement for stdout.""" self.write(text) - + def writeErr(self, text): """Replacement for stderr.""" self.write(text) - + def redirectStdin(self, redirect=1): """If redirect is true then sys.stdin will come from the shell.""" if redirect: @@ -805,7 +805,7 @@ class Shell(wxStyledTextCtrl): return 1 else: return 0 - + def CanCopy(self): """Return true if text is selected and can be copied.""" return self.GetSelectionStart() != self.GetSelectionEnd() @@ -901,7 +901,7 @@ class Shell(wxStyledTextCtrl): command += '\n' command += line commands.append(command) - for command in commands: + for command in commands: command = command.replace('\n', os.linesep + sys.ps2) self.write(command) self.processLine() @@ -920,7 +920,7 @@ ID_CALLTIPS_SHOW = NewId() class ShellMenu: """Mixin class to add standard menu items.""" - + def createMenus(self): m = self.fileMenu = wxMenu() m.AppendSeparator() @@ -940,20 +940,20 @@ class ShellMenu: m = self.autocompMenu = wxMenu() m.Append(ID_AUTOCOMP_SHOW, 'Show Auto Completion', \ 'Show auto completion during dot syntax', \ - checkable=1) + kind=wxITEM_CHECK) m.Append(ID_AUTOCOMP_INCLUDE_MAGIC, 'Include Magic Attributes', \ 'Include attributes visible to __getattr__ and __setattr__', \ - checkable=1) + kind=wxITEM_CHECK) m.Append(ID_AUTOCOMP_INCLUDE_SINGLE, 'Include Single Underscores', \ 'Include attibutes prefixed by a single underscore', \ - checkable=1) + kind=wxITEM_CHECK) m.Append(ID_AUTOCOMP_INCLUDE_DOUBLE, 'Include Double Underscores', \ 'Include attibutes prefixed by a double underscore', \ - checkable=1) + kind=wxITEM_CHECK) m = self.calltipsMenu = wxMenu() m.Append(ID_CALLTIPS_SHOW, 'Show Call Tips', \ - 'Show call tips with argument specifications', checkable=1) + 'Show call tips with argument specifications', kind=wxITEM_CHECK) m = self.optionsMenu = wxMenu() m.AppendMenu(ID_AUTOCOMP, '&Auto Completion', self.autocompMenu, \ @@ -1085,14 +1085,14 @@ class ShellMenu: event.Check(self.shell.autoCompleteIncludeDouble) elif id == ID_CALLTIPS_SHOW: event.Check(self.shell.autoCallTip) - + class ShellFrame(wxFrame, ShellMenu): """Frame containing the PyCrust shell component.""" - + name = 'PyCrust Shell Frame' revision = __version__ - + def __init__(self, parent=None, id=-1, title='PyShell', \ pos=wxDefaultPosition, size=wxDefaultSize, \ style=wxDEFAULT_FRAME_STYLE, locals=None, \ @@ -1116,5 +1116,5 @@ class ShellFrame(wxFrame, ShellMenu): self.createMenus() - - + +