Added .emacs tip to coding standards; fixed doc bugs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/filedlg.tex b/docs/latex/wx/filedlg.tex
index 8ec3aa2b91016934278f2f6357d1f108884570e1..f110e1271985cd971aab8a7f2f4323c4a3628959 100644 (file)
--- a/docs/latex/wx/filedlg.tex
+++ b/docs/latex/wx/filedlg.tex
@@ -58,7 +58,7 @@ Constructor. Use \helpref{wxFileDialog::ShowModal}{wxfiledialogshowmodal} to sho
 
 \docparam{defaultFile}{The default filename, or the empty string.}
 
 
 \docparam{defaultFile}{The default filename, or the empty string.}
 

-\docparam{wildcard}{A wildcard, such as ``*.*".}
+\docparam{wildcard}{A wildcard, such as ``*.*" or ``BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif".}

 
 \docparam{style}{A dialog style. A bitlist of:
 
 
 \docparam{style}{A dialog style. A bitlist of:
 


@@ -189,7 +189,9 @@ Sets the dialog style. See \helpref{wxFileDialog::wxFileDialog}{wxfiledialogcons
 
 \func{void}{SetWildcard}{\param{const wxString\& }{wildCard}}
 
 
 \func{void}{SetWildcard}{\param{const wxString\& }{wildCard}}
 

-Sets the wildcard, which in Windows can contain multiple file types.
+Sets the wildcard, which can contain multiple file types, for example:
+
+``BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"

 
 \membersection{wxFileDialog::ShowModal}\label{wxfiledialogshowmodal}
 
 
 \membersection{wxFileDialog::ShowModal}\label{wxfiledialogshowmodal}
 

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 23e39caeab3f5813db981bca1b046db543268b42..6c5548a3d34490d5d5fe314228c47b186aeaa695 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -868,7 +868,8 @@ wxYES\_NO or wxOK.}
 \twocolitem{wxOK}{Puts an Ok button on the message box. May be combined with wxCANCEL.}
 \twocolitem{wxCENTRE}{Centres the text.}
 \twocolitem{wxICON\_EXCLAMATION}{Displays an exclamation mark symbol.}
 \twocolitem{wxOK}{Puts an Ok button on the message box. May be combined with wxCANCEL.}
 \twocolitem{wxCENTRE}{Centres the text.}
 \twocolitem{wxICON\_EXCLAMATION}{Displays an exclamation mark symbol.}

-\twocolitem{wxICON\_HAND}{Displays a hand symbol.}
+\twocolitem{wxICON\_HAND}{Displays an error symbol.}
+\twocolitem{wxICON\_ERROR}{Displays an error symbol - the same as wxICON\_HAND.}

 \twocolitem{wxICON\_QUESTION}{Displays a question mark symbol.}
 \twocolitem{wxICON\_INFORMATION}{Displays an information symbol.}
 \end{twocollist}
 \twocolitem{wxICON\_QUESTION}{Displays a question mark symbol.}
 \twocolitem{wxICON\_INFORMATION}{Displays an information symbol.}
 \end{twocollist}

diff --git a/docs/latex/wx/msgdlg.tex b/docs/latex/wx/msgdlg.tex
index ec0b16e61eb531092ad02cef5dc5501291a2133c..3caf92f46af655d693a7668c9568fd4eed01ed86 100644 (file)
--- a/docs/latex/wx/msgdlg.tex
+++ b/docs/latex/wx/msgdlg.tex
@@ -47,7 +47,8 @@ Constructor. Use \helpref{wxMessageDialog::ShowModal}{wxmessagedialogshowmodal}
 \twocolitem{{\bf wxNO\_DEFAULT}}{Used with {\bf wxYES\_NO}, makes {\bf No} button the default.}
 \twocolitem{{\bf wxCENTRE}}{Centre the message. Not Windows.}
 \twocolitem{{\bf wxICON\_EXCLAMATION}}{Shows an exclamation mark icon.}
 \twocolitem{{\bf wxNO\_DEFAULT}}{Used with {\bf wxYES\_NO}, makes {\bf No} button the default.}
 \twocolitem{{\bf wxCENTRE}}{Centre the message. Not Windows.}
 \twocolitem{{\bf wxICON\_EXCLAMATION}}{Shows an exclamation mark icon.}

-\twocolitem{{\bf wxICON\_HAND}}{Shows a hand icon.}
+\twocolitem{{\bf wxICON\_HAND}}{Shows an error icon.}
+\twocolitem{{\bf wxICON\_ERROR}}{Shows an error icon - the same as wxICON\_HAND.}

 \twocolitem{{\bf wxICON\_QUESTION}}{Shows a question mark icon.}
 \twocolitem{{\bf wxICON\_INFORMATION}}{Shows an information (i) icon.}
 \end{twocollist}
 \twocolitem{{\bf wxICON\_QUESTION}}{Shows a question mark icon.}
 \twocolitem{{\bf wxICON\_INFORMATION}}{Shows an information (i) icon.}
 \end{twocollist}

diff --git a/docs/latex/wx/progdlg.tex b/docs/latex/wx/progdlg.tex
index 39689596e36b270b2f41094f5f7df28c647451bf..5cf893f2be755cbaec4f5b2ed61a1f049a4dbce3 100644 (file)
--- a/docs/latex/wx/progdlg.tex
+++ b/docs/latex/wx/progdlg.tex
@@ -48,18 +48,17 @@ bitmask constants defined in wx/defs.h:
 \twocolitem{{\bf wxPD\_APP\_MODAL}}{Make the progress dialog modal. If this flag is
 not given, it is only "locally" modal - that is the input to the parent
 window is disabled, but not to the other ones.}
 \twocolitem{{\bf wxPD\_APP\_MODAL}}{Make the progress dialog modal. If this flag is
 not given, it is only "locally" modal - that is the input to the parent
 window is disabled, but not to the other ones.}

-\twocolitem{{\bf wxPD\_AUTO\_HIDE}}{By default, the progress dialog will disappear
+\twocolitem{{\bf wxPD\_AUTO\_HIDE}}{Causes the progress dialog to disappear

 from screen as soon as the maximum value of the progress meter has been
 from screen as soon as the maximum value of the progress meter has been

-reached. This flag prevents it from doing it - instead the dialog will wait
-until the user closes it.}
+reached.}

 \twocolitem{{\bf wxPD\_CAN\_ABORT}}{This flag tells the dialog that it should have a
 "Cancel" button which the user may press. If this happens, the next call to 
  \helpref{Update()}{wxprogressdialogupdate} will return FALSE.}
 \twocolitem{{\bf wxPD\_ELAPSED\_TIME}}{This flag tells the dialog that it should show elapsed time (since creating the dialog).}
 \twocolitem{{\bf wxPD\_ESTIMATED\_TIME}}{This flag tells the dialog that it should show estimated time.}
 \twocolitem{{\bf wxPD\_REMAINING\_TIME}}{This flag tells the dialog that it should show remaining time.}
 \twocolitem{{\bf wxPD\_CAN\_ABORT}}{This flag tells the dialog that it should have a
 "Cancel" button which the user may press. If this happens, the next call to 
  \helpref{Update()}{wxprogressdialogupdate} will return FALSE.}
 \twocolitem{{\bf wxPD\_ELAPSED\_TIME}}{This flag tells the dialog that it should show elapsed time (since creating the dialog).}
 \twocolitem{{\bf wxPD\_ESTIMATED\_TIME}}{This flag tells the dialog that it should show estimated time.}
 \twocolitem{{\bf wxPD\_REMAINING\_TIME}}{This flag tells the dialog that it should show remaining time.}

-\twocolitem{{\bf wxPD\_SMOOTH}}{This flag tells the dialog that it should use
-smooth gauge (has effect only under 32bit Windows).}
+%\twocolitem{{\bf wxPD\_SMOOTH}}{This flag tells the dialog that it should use
+%smooth gauge (has effect only under 32bit Windows).}

 \end{twocollist}%
 }
 
 \end{twocollist}%
 }