From 861c5499061e32ac60dd916a83f74d8f8c17aa4e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 30 Oct 2013 16:23:56 +0000 Subject: [PATCH] Tidied up some file headers and fixed tooltip status accessors. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/richtext/richtextbackgroundpage.h | 6 +++--- include/wx/richtext/richtextborderspage.h | 3 +-- include/wx/richtext/richtextbulletspage.h | 2 +- include/wx/richtext/richtextimagedlg.h | 3 +-- include/wx/richtext/richtextindentspage.h | 2 +- include/wx/richtext/richtextliststylepage.h | 2 +- include/wx/richtext/richtextmarginspage.h | 6 ++---- include/wx/richtext/richtextsizepage.h | 5 ++--- include/wx/richtext/richtextstyledlg.h | 2 +- include/wx/richtext/richtextstylepage.h | 2 +- include/wx/richtext/richtextsymboldlg.h | 2 +- include/wx/richtext/richtexttabspage.h | 2 +- src/richtext/richtextbackgroundpage.cpp | 6 +++--- src/richtext/richtextborderspage.cpp | 1 - src/richtext/richtextbulletspage.cpp | 2 +- src/richtext/richtextindentspage.cpp | 2 +- src/richtext/richtextliststylepage.cpp | 2 +- src/richtext/richtextmarginspage.cpp | 7 +++---- src/richtext/richtextsizepage.cpp | 8 +++----- src/richtext/richtextstylepage.cpp | 2 +- src/richtext/richtexttabspage.cpp | 2 +- 21 files changed, 30 insertions(+), 39 deletions(-) diff --git a/include/wx/richtext/richtextbackgroundpage.h b/include/wx/richtext/richtextbackgroundpage.h index e73b427882..8b9a8156a4 100644 --- a/include/wx/richtext/richtextbackgroundpage.h +++ b/include/wx/richtext/richtextbackgroundpage.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextbackgroundpage.h -// Purpose: +// Purpose: Declares the rich text formatting dialog background +// properties page. // Author: Julian Smart // Modified by: // Created: 13/11/2010 11:17:25 -// RCS-ID: // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _RICHTEXTBACKGROUNDPAGE_H_ diff --git a/include/wx/richtext/richtextborderspage.h b/include/wx/richtext/richtextborderspage.h index 347f154fd2..17ec6884ae 100644 --- a/include/wx/richtext/richtextborderspage.h +++ b/include/wx/richtext/richtextborderspage.h @@ -4,9 +4,8 @@ // Author: Julian Smart // Modified by: // Created: 21/10/2010 11:34:24 -// RCS-ID: // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _RICHTEXTBORDERSPAGE_H_ diff --git a/include/wx/richtext/richtextbulletspage.h b/include/wx/richtext/richtextbulletspage.h index 4cf6b7745a..b8a6f43b37 100644 --- a/include/wx/richtext/richtextbulletspage.h +++ b/include/wx/richtext/richtextbulletspage.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextbulletspage.h -// Purpose: +// Purpose: Declares the rich text formatting dialog bullets page. // Author: Julian Smart // Modified by: // Created: 10/4/2006 10:32:31 AM diff --git a/include/wx/richtext/richtextimagedlg.h b/include/wx/richtext/richtextimagedlg.h index 96d67aecc0..81f595fb0e 100644 --- a/include/wx/richtext/richtextimagedlg.h +++ b/include/wx/richtext/richtextimagedlg.h @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextimagedlg.h -// Purpose: +// Purpose: A dialog for editing image properties. // Author: Mingquan Yang // Modified by: Julian Smart // Created: Wed 02 Jun 2010 11:27:23 CST -// RCS-ID: // Copyright: (c) Mingquan Yang, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/richtext/richtextindentspage.h b/include/wx/richtext/richtextindentspage.h index 8a5f3cb31c..6c61bf2c85 100644 --- a/include/wx/richtext/richtextindentspage.h +++ b/include/wx/richtext/richtextindentspage.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextindentspage.h -// Purpose: +// Purpose: Declares the rich text formatting dialog indent page. // Author: Julian Smart // Modified by: // Created: 10/3/2006 2:28:21 PM diff --git a/include/wx/richtext/richtextliststylepage.h b/include/wx/richtext/richtextliststylepage.h index c63b7f6dc8..1285ecd3e8 100644 --- a/include/wx/richtext/richtextliststylepage.h +++ b/include/wx/richtext/richtextliststylepage.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextliststylepage.h -// Purpose: +// Purpose: Declares the rich text formatting dialog list style page. // Author: Julian Smart // Modified by: // Created: 10/18/2006 11:36:37 AM diff --git a/include/wx/richtext/richtextmarginspage.h b/include/wx/richtext/richtextmarginspage.h index 336316c269..32259a09db 100644 --- a/include/wx/richtext/richtextmarginspage.h +++ b/include/wx/richtext/richtextmarginspage.h @@ -1,18 +1,16 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextmarginspage.h -// Purpose: +// Purpose: Declares the rich text formatting dialog margins page. // Author: Julian Smart // Modified by: // Created: 20/10/2010 10:27:34 -// RCS-ID: // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _RICHTEXTMARGINSPAGE_H_ #define _RICHTEXTMARGINSPAGE_H_ - /*! * Includes */ diff --git a/include/wx/richtext/richtextsizepage.h b/include/wx/richtext/richtextsizepage.h index dfba99fd6a..0130a8205a 100644 --- a/include/wx/richtext/richtextsizepage.h +++ b/include/wx/richtext/richtextsizepage.h @@ -1,12 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextsizepage.h -// Purpose: +// Purpose: Declares the rich text formatting dialog size page. // Author: Julian Smart // Modified by: // Created: 20/10/2010 10:23:24 -// RCS-ID: // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _RICHTEXTSIZEPAGE_H_ diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h index f3d002bae6..eeb5189c22 100644 --- a/include/wx/richtext/richtextstyledlg.h +++ b/include/wx/richtext/richtextstyledlg.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextstyledlg.h -// Purpose: +// Purpose: Declares the rich text style editor dialog. // Author: Julian Smart // Modified by: // Created: 10/5/2006 12:05:31 PM diff --git a/include/wx/richtext/richtextstylepage.h b/include/wx/richtext/richtextstylepage.h index fe45ba045b..1cd3e48bbe 100644 --- a/include/wx/richtext/richtextstylepage.h +++ b/include/wx/richtext/richtextstylepage.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextstylepage.h -// Purpose: +// Purpose: Declares the rich text formatting dialog style page. // Author: Julian Smart // Modified by: // Created: 10/5/2006 11:34:55 AM diff --git a/include/wx/richtext/richtextsymboldlg.h b/include/wx/richtext/richtextsymboldlg.h index 1dedf65960..eafdbe5801 100644 --- a/include/wx/richtext/richtextsymboldlg.h +++ b/include/wx/richtext/richtextsymboldlg.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextsymboldlg.h -// Purpose: +// Purpose: Declares the symbol picker dialog. // Author: Julian Smart // Modified by: // Created: 10/5/2006 3:11:58 PM diff --git a/include/wx/richtext/richtexttabspage.h b/include/wx/richtext/richtexttabspage.h index e1beb426f1..0be6977e09 100644 --- a/include/wx/richtext/richtexttabspage.h +++ b/include/wx/richtext/richtexttabspage.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtexttabspage.h -// Purpose: +// Purpose: Declares the rich text formatting dialog tabs page. // Author: Julian Smart // Modified by: // Created: 10/4/2006 8:03:20 AM diff --git a/src/richtext/richtextbackgroundpage.cpp b/src/richtext/richtextbackgroundpage.cpp index 0a585bd5f5..56f14cafd8 100644 --- a/src/richtext/richtextbackgroundpage.cpp +++ b/src/richtext/richtextbackgroundpage.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/richtext/richtextbackgroundpage.cpp -// Purpose: +// Purpose: Implements the rich text formatting dialog background +// properties page. // Author: Julian Smart // Modified by: // Created: 13/11/2010 11:17:25 -// RCS-ID: // Copyright: (c) Julian Smart // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -195,7 +195,7 @@ void wxRichTextBackgroundPage::OnColourSwatch(wxCommandEvent& event) bool wxRichTextBackgroundPage::ShowToolTips() { - return true; + return wxRichTextFormattingDialog::ShowToolTips(); } /*! diff --git a/src/richtext/richtextborderspage.cpp b/src/richtext/richtextborderspage.cpp index 2925b78262..66fb1659bf 100644 --- a/src/richtext/richtextborderspage.cpp +++ b/src/richtext/richtextborderspage.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 21/10/2010 11:34:24 -// RCS-ID: // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/richtext/richtextbulletspage.cpp b/src/richtext/richtextbulletspage.cpp index 3ea09c2d9e..0b04325827 100644 --- a/src/richtext/richtextbulletspage.cpp +++ b/src/richtext/richtextbulletspage.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/richtext/richtextbulletspage.cpp -// Purpose: +// Purpose: Implements the rich text formatting dialog bullets page. // Author: Julian Smart // Modified by: // Created: 10/4/2006 10:32:31 AM diff --git a/src/richtext/richtextindentspage.cpp b/src/richtext/richtextindentspage.cpp index 76eb5b1129..d51270dbd1 100644 --- a/src/richtext/richtextindentspage.cpp +++ b/src/richtext/richtextindentspage.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/richtext/richtextindentspage.cpp -// Purpose: +// Purpose: Implements the rich text formatting dialog indents page. // Author: Julian Smart // Modified by: // Created: 10/3/2006 2:28:21 PM diff --git a/src/richtext/richtextliststylepage.cpp b/src/richtext/richtextliststylepage.cpp index 3bfb404993..93c6f288e7 100644 --- a/src/richtext/richtextliststylepage.cpp +++ b/src/richtext/richtextliststylepage.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/richtext/richtextliststylepage.cpp -// Purpose: +// Purpose: Implements the rich text formatting dialog list style page. // Author: Julian Smart // Modified by: // Created: 10/18/2006 11:36:37 AM diff --git a/src/richtext/richtextmarginspage.cpp b/src/richtext/richtextmarginspage.cpp index 6bb8dcf0ef..6b896841f0 100644 --- a/src/richtext/richtextmarginspage.cpp +++ b/src/richtext/richtextmarginspage.cpp @@ -1,12 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/richtext/richtextmarginspage.cpp -// Purpose: +// Purpose: Implements the rich text formatting dialog margins page. // Author: Julian Smart // Modified by: // Created: 20/10/2010 10:27:34 -// RCS-ID: // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/richtext/richtextmarginspage.h" @@ -408,7 +407,7 @@ wxRichTextAttr* wxRichTextMarginsPage::GetAttributes() bool wxRichTextMarginsPage::ShowToolTips() { - return true; + return wxRichTextFormattingDialog::ShowToolTips(); } bool wxRichTextMarginsPage::TransferDataToWindow() diff --git a/src/richtext/richtextsizepage.cpp b/src/richtext/richtextsizepage.cpp index 8c5b7c9074..592bbf36fa 100644 --- a/src/richtext/richtextsizepage.cpp +++ b/src/richtext/richtextsizepage.cpp @@ -1,12 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/richtext/richtextsizepage.cpp -// Purpose: +// Purpose: Implements the rich text formatting dialog size page. // Author: Julian Smart // Modified by: // Created: 20/10/2010 10:23:24 -// RCS-ID: // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/richtext/richtextsizepage.h" @@ -14,7 +13,6 @@ ////@begin XPM images ////@end XPM images - /*! * wxRichTextSizePage type definition */ @@ -756,7 +754,7 @@ wxRichTextAttr* wxRichTextSizePage::GetAttributes() bool wxRichTextSizePage::ShowToolTips() { - return true; + return wxRichTextFormattingDialog::ShowToolTips(); } bool wxRichTextSizePage::TransferDataToWindow() diff --git a/src/richtext/richtextstylepage.cpp b/src/richtext/richtextstylepage.cpp index 9f15d3c8fc..0c68ed0bc7 100644 --- a/src/richtext/richtextstylepage.cpp +++ b/src/richtext/richtextstylepage.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/richtext/richtextstylepage.cpp -// Purpose: +// Purpose: Implements the rich text formatting dialog style name tab. // Author: Julian Smart // Modified by: // Created: 10/5/2006 11:34:55 AM diff --git a/src/richtext/richtexttabspage.cpp b/src/richtext/richtexttabspage.cpp index 62584f7501..954a70952a 100644 --- a/src/richtext/richtexttabspage.cpp +++ b/src/richtext/richtexttabspage.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/richtext/richtexttabspage.cpp -// Purpose: +// Purpose: Implements the rich text formatting dialog tabs page. // Author: Julian Smart // Modified by: // Created: 10/4/2006 8:03:20 AM