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

Added accelerators to Undo/Redo menu items

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-12-03 18:25:13 +00:00
parent b6a3d6ad88
commit 5e0e6ceb8f
7 changed files with 191 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

264
distrib/msw/zipdist.sh
View File

@@ -1,37 +1,41 @@
#! /bin/sh #!/bin/sh
# Zip up an external, generic + Windows distribution of wxWindows 2 # Zip up an external, generic + Windows distribution of wxWindows 2
src=`cygpath -u $WXWIN` SRC=`cygpath -u $WXWIN`
dest=$src/deliver DEST=$SRC/deliver
wise=0 WISE=0
wiseonly=0 WISEONLY=0
# If your zip accepts Cygwin-style paths, then
# use cygpath, else substitute echo
CYGPATHPROG=cygpath
#CYGPATHPROG=echo
# Set this to the required version # Set this to the required version
version=2.3.0 VERSION=2.3.0
dowise() dowise()
{ {
cd $dest cd $DEST
# Unzip the Windows files into 'wx' # Unzip the Windows files into 'wx'
mkdir $dest/wx mkdir $DEST/wx
# After this change of directory, we're in the # After this change of directory, we're in the
# temporary 'wx' directory and not acting on # temporary 'wx' directory and not acting on
# the source wxWindows directory. # the source wxWindows directory.
cd $dest/wx cd $DEST/wx
unzip -o ../wxWindows-$version-msw.zip unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-msw.zip`
unzip -o ../wxWindows-$version-gen.zip unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-gen.zip`
unzip -o ../wxWindows-$version-vc.zip unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-vc.zip`
unzip -o ../wxWindows-$version-bc.zip unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-bc.zip`
unzip -o ../wxWindows-$version-HTMLHelp.zip unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-HTMLHelp.zip`
unzip -o ../extradoc.zip unzip -o `$CYGPATHPROG -w ../extradoc.zip`
# Need Word file, for Remstar DB classes # Need Word file, for Remstar DB classes
unzip -o ../wxWindows-$version-Word.zip unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-Word.zip`
unzip -o ../ogl3.zip unzip -o `$CYGPATHPROG -w ../ogl3.zip`
unzip -o ../jpeg.zip unzip -o `$CYGPATHPROG -w ../jpeg.zip`
unzip -o ../tiff.zip unzip -o `$CYGPATHPROG -w ../tiff.zip`
unzip -o ../tex2rtf2.zip unzip -o `$CYGPATHPROG -w ../tex2rtf2.zip`
# Now delete a few files that are unnecessary # Now delete a few files that are unnecessary
# attrib -R * # attrib -R *
@@ -46,20 +50,20 @@ dowise()
rm -f contrib/docs/htmlhelp/stc.* rm -f contrib/docs/htmlhelp/stc.*
rm -f contrib/docs/pdf/*.* rm -f contrib/docs/pdf/*.*
rm -f -r contrib/docs/latex/ogl rm -f -r contrib/docs/latex/ogl
rm -f src/mingegcs.bat rm -f SRC/mingegcs.bat
rm -f distrib rm -f distrib
# Now copy some binary files to 'bin' # Now copy some binary files to 'bin'
mkdir bin mkdir bin
cp $src/bin/dialoged.exe bin cp $SRC/bin/dialoged.exe bin
cp $src/bin/tex2rtf.exe bin cp $SRC/bin/tex2rtf.exe bin
cp $src/bin/dbgview.* bin cp $SRC/bin/dbgview.* bin
cp $src/bin/life.exe bin cp $SRC/bin/life.exe bin
cp $src/docs/winhelp/dialoged.hlp $src/docs/winhelp/dialoged.cnt bin cp $SRC/docs/winhelp/dialoged.hlp $SRC/docs/winhelp/dialoged.cnt bin
cp $src/docs/winhelp/tex2rtf.hlp $src/docs/winhelp/tex2rtf.cnt bin cp $SRC/docs/winhelp/tex2rtf.hlp $SRC/docs/winhelp/tex2rtf.cnt bin
# Make wxMSW-xxx.zip # Make wxMSW-xxx.zip
zip -r ../wxMSW-$version.zip * zip -r `$CYGPATHPROG -w ../wxMSW-$VERSION.zip` *
# Time to regenerate the WISE install script, wxwin2.wse. # Time to regenerate the WISE install script, wxwin2.wse.
# NB: if you've changed wxwin2.wse using WISE, call splitwise.exe # NB: if you've changed wxwin2.wse using WISE, call splitwise.exe
@@ -68,7 +72,7 @@ dowise()
sh $WXWIN/distrib/msw/makewise.sh sh $WXWIN/distrib/msw/makewise.sh
rm -f $dest/setup.* rm -f $DEST/setup.*
# Now invoke WISE install on the new wxwin2.wse # Now invoke WISE install on the new wxwin2.wse
echo Invoking WISE... echo Invoking WISE...
@@ -76,7 +80,7 @@ dowise()
echo Press return to continue with the wxWindows distribution... echo Press return to continue with the wxWindows distribution...
read dummy read dummy
cd $dest cd $DEST
# tidy up capitalisation of filenames # tidy up capitalisation of filenames
mv setup.EXE s mv setup.EXE s
@@ -107,7 +111,7 @@ dowise()
mv s setup.w09 mv s setup.w09
# Put all the setup files into a single zip archive. # Put all the setup files into a single zip archive.
zip wxMSW-$version-setup.zip readme.txt setup.* zip wxMSW-$VERSION-setup.zip readme.txt setup.*
} }
expandlines() expandlines()
@@ -127,8 +131,8 @@ expandlines()
# Process command line options. # Process command line options.
for i in "$@"; do for i in "$@"; do
case "$i" in case "$i" in
--wise) wise=1 ;; --wise) WISE=1 ;;
--wiseonly) wiseonly=1 ;; --wiseonly) WISEONLY=1 ;;
*) *)
echo Usage: $0 "[ options ]" 1>&2 echo Usage: $0 "[ options ]" 1>&2
echo Options: echo Options:
@@ -139,178 +143,178 @@ for i in "$@"; do
esac esac
done done
if [ ! -d "$src" ]; then if [ ! -d "$SRC" ]; then
echo $src not found. echo $SRC not found.
exit 1 exit 1
fi fi
if [ ! -d "$dest" ]; then if [ ! -d "$DEST" ]; then
echo $dest not found. echo $DEST not found.
exit 1 exit 1
fi fi
echo Creating distribution in $dest. Press return to continue. echo Creating distribution in $DEST. Press return to continue.
read dummy read dummy
if [ "$wiseonly" != "0" ]; then if [ "$WISEONLY" != "0" ]; then
dowise dowise
exit 0 exit 0
fi fi
# Remove all existing files # Remove all existing files
rm -f $dest/wx*.zip rm -f $DEST/wx*.zip
rm -f $dest/*.htb rm -f $DEST/*.htb
rm -f $dest/ogl3.zip rm -f $DEST/ogl3.zip
rm -f $dest/tex2rtf2.zip rm -f $DEST/tex2rtf2.zip
rm -f $dest/jpeg.zip rm -f $DEST/jpeg.zip
rm -f $dest/tiff.zip rm -f $DEST/tiff.zip
rm -f $dest/dialoged.zip rm -f $DEST/dialoged.zip
rm -f $dest/utils.zip rm -f $DEST/utils.zip
rm -f $dest/extradoc.zip rm -f $DEST/extradoc.zip
rm -f $dest/*-win32.zip rm -f $DEST/*-win32.zip
if [ ! -d "$dest/wx" ]; then if [ ! -d "$DEST/wx" ]; then
rm -f -r $dest/wx rm -f -r $DEST/wx
fi fi
cd $src cd $SRC
echo Zipping... echo Zipping...
# Below is the old-style separated-out format. This is retained only # Below is the old-style separated-out format. This is retained only
# for local use, and for creating wxMSW-xxx.zip. # for local use, and for creating wxMSW-xxx.zip.
# We can't use e.g. this: # We can't use e.g. this:
# ls `cat $src/distrib/msw/makefile.rsp` zip -@ -u $dest/wxWindows-$version-gen.zip # ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
# because there's not enough space on the command line, plus we need to ignore the # because there's not enough space on the command line, plus we need to ignore the
# blank lines. # blank lines.
expandlines $src/distrib/msw/generic.rsp temp.txt expandlines $SRC/distrib/msw/generic.rsp temp.txt
zip -@ $dest/wxWindows-$version-gen.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gen.zip` < temp.txt
expandlines $src/distrib/msw/makefile.rsp temp.txt expandlines $SRC/distrib/msw/makefile.rsp temp.txt
zip -@ -u $dest/wxWindows-$version-gen.zip < temp.txt zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gen.zip` < temp.txt
expandlines $src/distrib/msw/msw.rsp temp.txt expandlines $SRC/distrib/msw/msw.rsp temp.txt
zip -@ $dest/wxWindows-$version-msw.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-msw.zip` < temp.txt
expandlines $src/distrib/msw/makefile.rsp temp.txt expandlines $SRC/distrib/msw/makefile.rsp temp.txt
zip -@ -u $dest/wxWindows-$version-msw.zip < temp.txt zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-msw.zip` < temp.txt
expandlines $src/distrib/msw/gtk.rsp temp.txt expandlines $SRC/distrib/msw/gtk.rsp temp.txt
zip -@ $dest/wxWindows-$version-gtk.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gtk.zip` < temp.txt
expandlines $src/distrib/msw/makefile.rsp temp.txt expandlines $SRC/distrib/msw/makefile.rsp temp.txt
zip -@ -u $dest/wxWindows-$version-gtk.zip < temp.txt zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gtk.zip` < temp.txt
expandlines $src/distrib/msw/stubs.rsp temp.txt expandlines $SRC/distrib/msw/stubs.rsp temp.txt
zip -@ $dest/wxWindows-$version-stubs.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-stubs.zip` < temp.txt
expandlines $src/distrib/msw/motif.rsp temp.txt expandlines $SRC/distrib/msw/motif.rsp temp.txt
zip -@ $dest/wxWindows-$version-mot.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-mot.zip` < temp.txt
expandlines $src/distrib/msw/makefile.rsp temp.txt expandlines $SRC/distrib/msw/makefile.rsp temp.txt
zip -@ -u $dest/wxWindows-$version-mot.zip < temp.txt zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-mot.zip` < temp.txt
expandlines $src/distrib/msw/docsrc.rsp temp.txt expandlines $SRC/distrib/msw/docsrc.rsp temp.txt
zip -@ $dest/wxWindows-$version-DocSource.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-DocSource.zip` < temp.txt
expandlines $src/distrib/msw/wx_hlp.rsp temp.txt expandlines $SRC/distrib/msw/wx_hlp.rsp temp.txt
zip -@ $dest/wxWindows-$version-WinHelp.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-WinHelp.zip` < temp.txt
expandlines $src/distrib/msw/wx_html.rsp temp.txt expandlines $SRC/distrib/msw/wx_html.rsp temp.txt
zip -@ $dest/wxWindows-$version-HTML.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTML.zip` < temp.txt
expandlines $src/distrib/msw/wx_pdf.rsp temp.txt expandlines $SRC/distrib/msw/wx_pdf.rsp temp.txt
zip -@ $dest/wxWindows-$version-PDF.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-PDF.zip` < temp.txt
expandlines $src/distrib/msw/wx_word.rsp temp.txt expandlines $SRC/distrib/msw/wx_word.rsp temp.txt
zip -@ $dest/wxWindows-$version-Word.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-Word.zip` < temp.txt
expandlines $src/distrib/msw/wx_htb.rsp temp.txt expandlines $SRC/distrib/msw/wx_htb.rsp temp.txt
zip -@ $dest/wxWindows-$version-HTB.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTB.zip` < temp.txt
expandlines $src/distrib/msw/wx_chm.rsp temp.txt expandlines $SRC/distrib/msw/wx_chm.rsp temp.txt
zip -@ $dest/wxWindows-$version-HTMLHelp.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTMLHelp.zip` < temp.txt
# PDF/HTML docs that should go into the Windows setup because # PDF/HTML docs that should go into the Windows setup because
# there are no WinHelp equivalents # there are no WinHelp equivalents
expandlines $src/distrib/msw/extradoc.rsp temp.txt expandlines $SRC/distrib/msw/extradoc.rsp temp.txt
zip -@ $dest/extradoc.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/extradoc.zip` < temp.txt
# VC++ project files # VC++ project files
expandlines $src/distrib/msw/vc.rsp temp.txt expandlines $SRC/distrib/msw/vc.rsp temp.txt
zip -@ $dest/wxWindows-$version-vc.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-vc.zip` < temp.txt
# BC++ project files # BC++ project files
expandlines $src/distrib/msw/bc.rsp temp.txt expandlines $SRC/distrib/msw/bc.rsp temp.txt
zip -@ $dest/wxWindows-$version-bc.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-bc.zip` < temp.txt
# CodeWarrior project files # CodeWarrior project files
expandlines $src/distrib/msw/cw.rsp temp.txt expandlines $SRC/distrib/msw/cw.rsp temp.txt
zip -@ $dest/wxWindows-$version-cw.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-cw.zip` < temp.txt
# OGL 3 # OGL 3
expandlines $src/distrib/msw/ogl.rsp temp.txt expandlines $SRC/distrib/msw/ogl.rsp temp.txt
zip -@ $dest/ogl3.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/ogl3.zip` < temp.txt
# MMedia # MMedia
expandlines $src/distrib/msw/mmedia.rsp temp.txt expandlines $SRC/distrib/msw/mmedia.rsp temp.txt
zip -@ $dest/mmedia.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/mmedia.zip` < temp.txt
# STC (Scintilla widget) # STC (Scintilla widget)
expandlines $src/distrib/msw/stc.rsp temp.txt expandlines $SRC/distrib/msw/stc.rsp temp.txt
zip -@ $dest/stc.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/stc.zip` < temp.txt
# Tex2RTF # Tex2RTF
expandlines $src/distrib/msw/tex2rtf.rsp temp.txt expandlines $SRC/distrib/msw/tex2rtf.rsp temp.txt
zip -@ $dest/tex2rtf2.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/tex2rtf2.zip` < temp.txt
# JPEG source # JPEG source
expandlines $src/distrib/msw/jpeg.rsp temp.txt expandlines $SRC/distrib/msw/jpeg.rsp temp.txt
zip -@ $dest/jpeg.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/jpeg.zip` < temp.txt
# TIFF source # TIFF source
expandlines $src/distrib/msw/tiff.rsp temp.txt expandlines $SRC/distrib/msw/tiff.rsp temp.txt
zip -@ $dest/tiff.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/tiff.zip` < temp.txt
# Dialog Editor source and binary # Dialog Editor source and binary
rm -f $dest/dialoged_source.zip rm -f $DEST/dialoged_source.zip
expandlines $src/distrib/msw/dialoged.rsp temp.txt expandlines $SRC/distrib/msw/dialoged.rsp temp.txt
zip -@ $dest/dialoged_source.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/dialoged_source.zip` < temp.txt
zip -j $dest/dialoged.zip $dest/dialoged_source.zip $src/bin/dialoged.exe $src/docs/winhelp/dialoged.hlp $src/docs/winhelp/dialoged.cnt zip -j `$CYGPATHPROG -w $DEST/dialoged.zip` $DEST/dialoged_source.zip $SRC/bin/dialoged.exe $SRC/docs/winhelp/dialoged.hlp $SRC/docs/winhelp/dialoged.cnt
rm -f $dest/dialoged_source.zip rm -f $DEST/dialoged_source.zip
# Misc. utils not in the main distribution # Misc. utils not in the main distribution
expandlines $src/distrib/msw/utils.rsp temp.txt expandlines $SRC/distrib/msw/utils.rsp temp.txt
zip -@ $dest/utils.zip < temp.txt zip -@ `$CYGPATHPROG -w $DEST/utils.zip` < temp.txt
expandlines $src/distrib/msw/utilmake.rsp temp.txt expandlines $SRC/distrib/msw/utilmake.rsp temp.txt
zip -@ -u $dest/utilmake.zip < temp.txt zip -@ -u `$CYGPATHPROG -w $DEST/utilmake.zip` < temp.txt
rm -f temp.txt rm -f temp.txt
# Make dialoged-win32.zip and tex2rtf-win32.zip # Make dialoged-win32.zip and tex2rtf-win32.zip
cd $src/bin cd $SRC/bin
zip $dest/dialoged-win32.zip dialoged.* zip `$CYGPATHPROG -w $DEST/dialoged-win32.zip` dialoged.*
zip $dest/tex2rtf-win32.zip tex2rtf.* zip `$CYGPATHPROG -w $DEST/tex2rtf-win32.zip` tex2rtf.*
cp $src/docs/changes.txt $dest cp $SRC/docs/changes.txt $DEST
cp $src/docs/msw/install.txt $dest/install_msw.txt cp $SRC/docs/msw/install.txt $DEST/install_msw.txt
cp $src/docs/motif/install.txt $dest/install_motif.txt cp $SRC/docs/motif/install.txt $DEST/install_motif.txt
cp $src/docs/gtk/install.txt $dest/install_gtk.txt cp $SRC/docs/gtk/install.txt $DEST/install_gtk.txt
cp $src/docs/readme.txt $dest cp $SRC/docs/readme.txt $DEST
cp $src/docs/motif/readme.txt $dest/readme_motif.txt cp $SRC/docs/motif/readme.txt $DEST/readme_motif.txt
cp $src/docs/gtk/readme.txt $dest/readme_gtk.txt cp $SRC/docs/gtk/readme.txt $DEST/readme_gtk.txt
cp $src/docs/msw/readme.txt $dest/readme_msw.txt cp $SRC/docs/msw/readme.txt $DEST/readme_msw.txt
cp $src/docs/readme_vms.txt $dest cp $SRC/docs/readme_vms.txt $DEST
cp $src/docs/motif/makewxmotif $dest cp $SRC/docs/motif/makewxmotif $DEST
cp $src/docs/gtk/makewxgtk $dest cp $SRC/docs/gtk/makewxgtk $DEST
# Skip WISE setup if wise is 0. # Skip WISE setup if WISE is 0.
if [ "$wise" = "1" ]; then if [ "$WISE" = "1" ]; then
dowise dowise
fi fi

18
docs/latex/wx/cmdlpars.tex
View File

@@ -14,7 +14,8 @@
wxCmdLineParser is a class for parsing command line. wxCmdLineParser is a class for parsing command line.
It has the following features: It has the following features:
\begin{enumerate}
\begin{enumerate}\itemsep=0pt
\item distinguishes options, switches and parameters; allows option grouping \item distinguishes options, switches and parameters; allows option grouping
\item allows both short and long options \item allows both short and long options
\item automatically generates the usage message from the command line description \item automatically generates the usage message from the command line description
@@ -22,7 +23,8 @@ It has the following features:
\end{enumerate} \end{enumerate}
To use it you should follow these steps: To use it you should follow these steps:
\begin{enumerate}
\begin{enumerate}\itemsep=0pt
\item \helpref{construct}{wxcmdlineparserconstruction} an object of this class \item \helpref{construct}{wxcmdlineparserconstruction} an object of this class
giving it the command line to parse and optionally its description or use giving it the command line to parse and optionally its description or use
{\tt AddXXX()} functions later {\tt AddXXX()} functions later
@@ -73,7 +75,9 @@ struct wxCmdLineEntryDesc
The type of a command line entity is in the {\tt kind} field and may be one of The type of a command line entity is in the {\tt kind} field and may be one of
the following constants: the following constants:
{\small \begin{verbatim}
{\small%
\begin{verbatim}
enum wxCmdLineEntryType enum wxCmdLineEntryType
{ {
wxCMD\_LINE\_SWITCH, wxCMD\_LINE\_SWITCH,
@@ -93,7 +97,9 @@ to construct a help message explaining the syntax of the program.
The possible values of {\tt type} which specifies the type of the value accepted The possible values of {\tt type} which specifies the type of the value accepted
by an option or parameter are: by an option or parameter are:
{\small \begin{verbatim}
{\small%
\begin{verbatim}
enum wxCmdLineParamType enum wxCmdLineParamType
{ {
wxCMD\_LINE\_VAL\_STRING, // default wxCMD\_LINE\_VAL\_STRING, // default
@@ -104,7 +110,9 @@ enum wxCmdLineParamType
\end{verbatim}} \end{verbatim}}
Finally, the {\tt flags} field is a combination of the following bit masks: Finally, the {\tt flags} field is a combination of the following bit masks:
{\small \begin{verbatim}
{\small%
\begin{verbatim}
enum enum
{ {
wxCMD\_LINE\_OPTION\_MANDATORY = 0x01, // this option must be given wxCMD\_LINE\_OPTION\_MANDATORY = 0x01, // this option must be given

24
docs/latex/wx/cmdproc.tex
View File

@@ -70,6 +70,18 @@ Returns the maximum number of commands that the command processor stores.
Returns the edit menu associated with the command processor. Returns the edit menu associated with the command processor.
\membersection{wxCommandProcessor::GetRedoAccelerator}\label{wxcommandprocessorgetredoaccelerator}
\constfunc{const wxString\&}{GetRedoAccelerator}{\void}
Returns the string that will be appended to the Redo menu item.
\membersection{wxCommandProcessor::GetUndoAccelerator}\label{wxcommandprocessorgetundoaccelerator}
\constfunc{const wxString\&}{GetUndoAccelerator}{\void}
Returns the string that will be appended to the Undo menu item.
\membersection{wxCommandProcessor::Initialize} \membersection{wxCommandProcessor::Initialize}
\func{virtual void}{Initialize}{\void} \func{virtual void}{Initialize}{\void}
@@ -87,6 +99,18 @@ menu as appropriate. Set this to NULL if the menu is about to be
destroyed and command operations may still be performed, or the command destroyed and command operations may still be performed, or the command
processor may try to access an invalid pointer. processor may try to access an invalid pointer.
\membersection{wxCommandProcessor::SetRedoAccelerator}\label{wxcommandprocessorsetredoaccelerator}
\func{void}{SetRedoAccelerator}{\param{const wxString\&}{accel}}
Sets the string that will be appended to the Redo menu item.
\membersection{wxCommandProcessor::SetUndoAccelerator}\label{wxcommandprocessorsetundoaccelerator}
\func{void}{SetUndoAccelerator}{\param{const wxString\&}{accel}}
Sets the string that will be appended to the Undo menu item.
\membersection{wxCommandProcessor::Submit} \membersection{wxCommandProcessor::Submit}
\func{virtual bool}{Submit}{\param{wxCommand *}{command}, \param{bool}{ storeIt = TRUE}} \func{virtual bool}{Submit}{\param{wxCommand *}{command}, \param{bool}{ storeIt = TRUE}}

9
include/wx/docview.h
View File

@@ -565,11 +565,20 @@ public:
int GetMaxCommands() const { return m_maxNoCommands; } int GetMaxCommands() const { return m_maxNoCommands; }
virtual void ClearCommands(); virtual void ClearCommands();
// By default, the accelerators are "\tCtrl+Z" and "\tCtrl+Y"
const wxString& GetUndoAccelerator() const { return m_undoAccelerator; }
const wxString& GetRedoAccelerator() const { return m_redoAccelerator; }
void SetUndoAccelerator(const wxString& accel) { m_undoAccelerator = accel; }
void SetRedoAccelerator(const wxString& accel) { m_redoAccelerator = accel; }
protected: protected:
int m_maxNoCommands; int m_maxNoCommands;
wxList m_commands; wxList m_commands;
wxNode* m_currentCommand; wxNode* m_currentCommand;
wxMenu* m_commandEditMenu; wxMenu* m_commandEditMenu;
wxString m_undoAccelerator;
wxString m_redoAccelerator;
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
include/wx/textfile.h
View File

@@ -98,7 +98,7 @@ public:
// you're using "direct access" i.e. GetLine() // you're using "direct access" i.e. GetLine()
size_t GetCurrentLine() const { return m_nCurLine; } size_t GetCurrentLine() const { return m_nCurLine; }
void GoToLine(size_t n) { m_nCurLine = n; } void GoToLine(size_t n) { m_nCurLine = n; }
bool Eof() const { return m_nCurLine == m_aLines.Count() - 1; } bool Eof() const { return (m_aLines.Count() == 0 || m_nCurLine == m_aLines.Count() - 1); }
// these methods allow more "iterator-like" traversal of the list of // these methods allow more "iterator-like" traversal of the list of
// lines, i.e. you may write something like: // lines, i.e. you may write something like:

2
include/wx/treebase.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: treectrl.h // Name: treebase.h
// Purpose: wxTreeCtrl base classes and types // Purpose: wxTreeCtrl base classes and types
// Author: Julian Smart et al // Author: Julian Smart et al
// Modified by: // Modified by:

16
src/common/docview.cpp
View File

@@ -1819,6 +1819,8 @@ wxCommandProcessor::wxCommandProcessor(int maxCommands)
m_maxNoCommands = maxCommands; m_maxNoCommands = maxCommands;
m_currentCommand = (wxNode *) NULL; m_currentCommand = (wxNode *) NULL;
m_commandEditMenu = (wxMenu *) NULL; m_commandEditMenu = (wxMenu *) NULL;
m_undoAccelerator = wxT("\tCtrl+Z");
m_redoAccelerator = wxT("\tCtrl+Y");
} }
wxCommandProcessor::~wxCommandProcessor() wxCommandProcessor::~wxCommandProcessor()
@@ -1954,9 +1956,9 @@ void wxCommandProcessor::SetMenuStrings()
if (commandName == wxT("")) commandName = _("Unnamed command"); if (commandName == wxT("")) commandName = _("Unnamed command");
bool canUndo = command->CanUndo(); bool canUndo = command->CanUndo();
if (canUndo) if (canUndo)
buf = wxString(_("&Undo ")) + commandName; buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator;
else else
buf = wxString(_("Can't &Undo ")) + commandName; buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator;
m_commandEditMenu->SetLabel(wxID_UNDO, buf); m_commandEditMenu->SetLabel(wxID_UNDO, buf);
m_commandEditMenu->Enable(wxID_UNDO, canUndo); m_commandEditMenu->Enable(wxID_UNDO, canUndo);
@@ -1967,24 +1969,24 @@ void wxCommandProcessor::SetMenuStrings()
wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data(); wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
wxString redoCommandName(redoCommand->GetName()); wxString redoCommandName(redoCommand->GetName());
if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command"); if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
buf = wxString(_("&Redo ")) + redoCommandName; buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
m_commandEditMenu->SetLabel(wxID_REDO, buf); m_commandEditMenu->SetLabel(wxID_REDO, buf);
m_commandEditMenu->Enable(wxID_REDO, TRUE); m_commandEditMenu->Enable(wxID_REDO, TRUE);
} }
else else
{ {
m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo")); m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator);
m_commandEditMenu->Enable(wxID_REDO, FALSE); m_commandEditMenu->Enable(wxID_REDO, FALSE);
} }
} }
else else
{ {
m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo")); m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo") + m_undoAccelerator);
m_commandEditMenu->Enable(wxID_UNDO, FALSE); m_commandEditMenu->Enable(wxID_UNDO, FALSE);
if (m_commands.Number() == 0) if (m_commands.Number() == 0)
{ {
m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo")); m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator);
m_commandEditMenu->Enable(wxID_REDO, FALSE); m_commandEditMenu->Enable(wxID_REDO, FALSE);
} }
else else
@@ -1994,7 +1996,7 @@ void wxCommandProcessor::SetMenuStrings()
wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data(); wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
wxString redoCommandName(redoCommand->GetName()); wxString redoCommandName(redoCommand->GetName());
if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command"); if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
buf = wxString(_("&Redo ")) + redoCommandName; buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
m_commandEditMenu->SetLabel(wxID_REDO, buf); m_commandEditMenu->SetLabel(wxID_REDO, buf);
m_commandEditMenu->Enable(wxID_REDO, TRUE); m_commandEditMenu->Enable(wxID_REDO, TRUE);
} }