From: Julian Smart Date: Mon, 9 Oct 2006 17:10:58 +0000 (+0000) Subject: Don't use precompiled header directives in included files X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5778b3c800f3efe773103430706b6a4e728da50a Don't use precompiled header directives in included files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/richtext/richtextbulletspage.cpp b/src/richtext/richtextbulletspage.cpp index 632fd213ec..e71094592f 100644 --- a/src/richtext/richtextbulletspage.cpp +++ b/src/richtext/richtextbulletspage.cpp @@ -9,20 +9,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - #if wxUSE_RICHTEXT #include "wx/richtext/richtextbulletspage.h" -#ifndef WX_PRECOMP -#endif - #include "wx/richtext/richtextsymboldlg.h" #include "wx/fontenum.h" @@ -90,7 +80,7 @@ wxRichTextBulletsPage::wxRichTextBulletsPage( wxWindow* parent, wxWindowID id, c /*! * Initialise members */ - + void wxRichTextBulletsPage::Init() { m_hasBulletStyle = false; @@ -252,12 +242,12 @@ void wxRichTextBulletsPage::CreateControls() m_symbolCtrl->Append(_(">")); m_symbolCtrl->Append(_("+")); m_symbolCtrl->Append(_("~")); - + wxFontEnumerator enumerator; enumerator.EnumerateFacenames(); wxArrayString facenames = enumerator.GetFacenames(); facenames.Sort(); - + m_symbolFontCtrl->Append(facenames); } @@ -347,7 +337,7 @@ bool wxRichTextBulletsPage::TransferDataToWindow() if (attr->GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD) m_periodCtrl->SetValue(true); else - m_periodCtrl->SetValue(false); + m_periodCtrl->SetValue(false); } else m_styleListBox->SetSelection(-1); @@ -625,10 +615,10 @@ void wxRichTextBulletsPage::OnChooseSymbolClick( wxCommandEvent& WXUNUSED(event) if (dlg.ShowModal() == wxID_OK) { m_dontUpdate = true; - + m_symbolCtrl->SetValue(dlg.GetSymbol()); m_symbolFontCtrl->SetValue(dlg.GetFontName()); - + UpdatePreview(); m_dontUpdate = false; diff --git a/src/richtext/richtextfontpage.cpp b/src/richtext/richtextfontpage.cpp index 316b599b2a..4e94e39fd2 100644 --- a/src/richtext/richtextfontpage.cpp +++ b/src/richtext/richtextfontpage.cpp @@ -9,14 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -////@begin includes -////@end includes - #include "../../include/wx/richtext/richtextfontpage.h" -////@begin XPM images -////@end XPM images - /*! * wxRichTextFontPage type definition */ @@ -66,7 +60,7 @@ wxRichTextFontPage::wxRichTextFontPage( wxWindow* parent, wxWindowID id, const w /*! * Initialise members */ - + void wxRichTextFontPage::Init() { m_dontUpdate = false; diff --git a/src/richtext/richtextindentspage.cpp b/src/richtext/richtextindentspage.cpp index 39910835fe..6401bf4b14 100644 --- a/src/richtext/richtextindentspage.cpp +++ b/src/richtext/richtextindentspage.cpp @@ -9,20 +9,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - #if wxUSE_RICHTEXT #include "wx/richtext/richtextindentspage.h" -#ifndef WX_PRECOMP -#endif - /*! * wxRichTextIndentsSpacingPage type definition */ @@ -80,7 +70,7 @@ wxRichTextIndentsSpacingPage::wxRichTextIndentsSpacingPage( wxWindow* parent, wx /*! * Initialise members */ - + void wxRichTextIndentsSpacingPage::Init() { m_dontUpdate = false; diff --git a/src/richtext/richtextstylepage.cpp b/src/richtext/richtextstylepage.cpp index ab55e26708..bc1caa440f 100644 --- a/src/richtext/richtextstylepage.cpp +++ b/src/richtext/richtextstylepage.cpp @@ -1,28 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/richtext/richtextstylepage.cpp -// Purpose: +// Purpose: // Author: Julian Smart -// Modified by: +// Modified by: // Created: 10/5/2006 11:34:55 AM // RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - #if wxUSE_RICHTEXT #include "wx/richtext/richtextstylepage.h" -#ifndef WX_PRECOMP -#endif - /*! * wxRichTextStylePage type definition */ @@ -60,7 +50,7 @@ wxRichTextStylePage::wxRichTextStylePage( wxWindow* parent, wxWindowID id, const /*! * Initialise members */ - + void wxRichTextStylePage::Init() { ////@begin wxRichTextStylePage member initialisation @@ -94,7 +84,7 @@ bool wxRichTextStylePage::Create( wxWindow* parent, wxWindowID id, const wxPoint */ void wxRichTextStylePage::CreateControls() -{ +{ ////@begin wxRichTextStylePage content construction wxRichTextStylePage* itemPanel1 = this; @@ -197,7 +187,7 @@ bool wxRichTextStylePage::TransferDataToWindow() } m_nextStyle->SetValue(paraDef->GetNextStyle()); } - + if (m_basedOn->GetCount() == 0) { if (sheet) @@ -224,7 +214,7 @@ bool wxRichTextStylePage::TransferDataToWindow() } } } - + m_basedOn->SetValue(def->GetBaseStyle()); return true; diff --git a/src/richtext/richtexttabspage.cpp b/src/richtext/richtexttabspage.cpp index f26a8dde2b..9c7c68ca76 100644 --- a/src/richtext/richtexttabspage.cpp +++ b/src/richtext/richtexttabspage.cpp @@ -9,20 +9,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - #if wxUSE_RICHTEXT #include "wx/richtext/richtexttabspage.h" -#ifndef WX_PRECOMP -#endif - /*! * wxRichTextTabsPage type definition */ @@ -69,7 +59,7 @@ wxRichTextTabsPage::wxRichTextTabsPage( wxWindow* parent, wxWindowID id, const w /*! * Initialise members */ - + void wxRichTextTabsPage::Init() { m_tabsPresent = false;