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
This commit is contained in:
parent
3193b86f29
commit
5778b3c800
@ -9,20 +9,10 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
|
||||||
#include "wx/wxprec.h"
|
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
|
||||||
#pragma hdrstop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if wxUSE_RICHTEXT
|
#if wxUSE_RICHTEXT
|
||||||
|
|
||||||
#include "wx/richtext/richtextbulletspage.h"
|
#include "wx/richtext/richtextbulletspage.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "wx/richtext/richtextsymboldlg.h"
|
#include "wx/richtext/richtextsymboldlg.h"
|
||||||
#include "wx/fontenum.h"
|
#include "wx/fontenum.h"
|
||||||
|
|
||||||
@ -90,7 +80,7 @@ wxRichTextBulletsPage::wxRichTextBulletsPage( wxWindow* parent, wxWindowID id, c
|
|||||||
/*!
|
/*!
|
||||||
* Initialise members
|
* Initialise members
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void wxRichTextBulletsPage::Init()
|
void wxRichTextBulletsPage::Init()
|
||||||
{
|
{
|
||||||
m_hasBulletStyle = false;
|
m_hasBulletStyle = false;
|
||||||
@ -252,12 +242,12 @@ void wxRichTextBulletsPage::CreateControls()
|
|||||||
m_symbolCtrl->Append(_(">"));
|
m_symbolCtrl->Append(_(">"));
|
||||||
m_symbolCtrl->Append(_("+"));
|
m_symbolCtrl->Append(_("+"));
|
||||||
m_symbolCtrl->Append(_("~"));
|
m_symbolCtrl->Append(_("~"));
|
||||||
|
|
||||||
wxFontEnumerator enumerator;
|
wxFontEnumerator enumerator;
|
||||||
enumerator.EnumerateFacenames();
|
enumerator.EnumerateFacenames();
|
||||||
wxArrayString facenames = enumerator.GetFacenames();
|
wxArrayString facenames = enumerator.GetFacenames();
|
||||||
facenames.Sort();
|
facenames.Sort();
|
||||||
|
|
||||||
m_symbolFontCtrl->Append(facenames);
|
m_symbolFontCtrl->Append(facenames);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -347,7 +337,7 @@ bool wxRichTextBulletsPage::TransferDataToWindow()
|
|||||||
if (attr->GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD)
|
if (attr->GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD)
|
||||||
m_periodCtrl->SetValue(true);
|
m_periodCtrl->SetValue(true);
|
||||||
else
|
else
|
||||||
m_periodCtrl->SetValue(false);
|
m_periodCtrl->SetValue(false);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
m_styleListBox->SetSelection(-1);
|
m_styleListBox->SetSelection(-1);
|
||||||
@ -625,10 +615,10 @@ void wxRichTextBulletsPage::OnChooseSymbolClick( wxCommandEvent& WXUNUSED(event)
|
|||||||
if (dlg.ShowModal() == wxID_OK)
|
if (dlg.ShowModal() == wxID_OK)
|
||||||
{
|
{
|
||||||
m_dontUpdate = true;
|
m_dontUpdate = true;
|
||||||
|
|
||||||
m_symbolCtrl->SetValue(dlg.GetSymbol());
|
m_symbolCtrl->SetValue(dlg.GetSymbol());
|
||||||
m_symbolFontCtrl->SetValue(dlg.GetFontName());
|
m_symbolFontCtrl->SetValue(dlg.GetFontName());
|
||||||
|
|
||||||
UpdatePreview();
|
UpdatePreview();
|
||||||
|
|
||||||
m_dontUpdate = false;
|
m_dontUpdate = false;
|
||||||
|
@ -9,14 +9,8 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
////@begin includes
|
|
||||||
////@end includes
|
|
||||||
|
|
||||||
#include "../../include/wx/richtext/richtextfontpage.h"
|
#include "../../include/wx/richtext/richtextfontpage.h"
|
||||||
|
|
||||||
////@begin XPM images
|
|
||||||
////@end XPM images
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* wxRichTextFontPage type definition
|
* wxRichTextFontPage type definition
|
||||||
*/
|
*/
|
||||||
@ -66,7 +60,7 @@ wxRichTextFontPage::wxRichTextFontPage( wxWindow* parent, wxWindowID id, const w
|
|||||||
/*!
|
/*!
|
||||||
* Initialise members
|
* Initialise members
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void wxRichTextFontPage::Init()
|
void wxRichTextFontPage::Init()
|
||||||
{
|
{
|
||||||
m_dontUpdate = false;
|
m_dontUpdate = false;
|
||||||
|
@ -9,20 +9,10 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
|
||||||
#include "wx/wxprec.h"
|
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
|
||||||
#pragma hdrstop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if wxUSE_RICHTEXT
|
#if wxUSE_RICHTEXT
|
||||||
|
|
||||||
#include "wx/richtext/richtextindentspage.h"
|
#include "wx/richtext/richtextindentspage.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* wxRichTextIndentsSpacingPage type definition
|
* wxRichTextIndentsSpacingPage type definition
|
||||||
*/
|
*/
|
||||||
@ -80,7 +70,7 @@ wxRichTextIndentsSpacingPage::wxRichTextIndentsSpacingPage( wxWindow* parent, wx
|
|||||||
/*!
|
/*!
|
||||||
* Initialise members
|
* Initialise members
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void wxRichTextIndentsSpacingPage::Init()
|
void wxRichTextIndentsSpacingPage::Init()
|
||||||
{
|
{
|
||||||
m_dontUpdate = false;
|
m_dontUpdate = false;
|
||||||
|
@ -1,28 +1,18 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: src/richtext/richtextstylepage.cpp
|
// Name: src/richtext/richtextstylepage.cpp
|
||||||
// Purpose:
|
// Purpose:
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 10/5/2006 11:34:55 AM
|
// Created: 10/5/2006 11:34:55 AM
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
|
||||||
#include "wx/wxprec.h"
|
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
|
||||||
#pragma hdrstop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if wxUSE_RICHTEXT
|
#if wxUSE_RICHTEXT
|
||||||
|
|
||||||
#include "wx/richtext/richtextstylepage.h"
|
#include "wx/richtext/richtextstylepage.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* wxRichTextStylePage type definition
|
* wxRichTextStylePage type definition
|
||||||
*/
|
*/
|
||||||
@ -60,7 +50,7 @@ wxRichTextStylePage::wxRichTextStylePage( wxWindow* parent, wxWindowID id, const
|
|||||||
/*!
|
/*!
|
||||||
* Initialise members
|
* Initialise members
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void wxRichTextStylePage::Init()
|
void wxRichTextStylePage::Init()
|
||||||
{
|
{
|
||||||
////@begin wxRichTextStylePage member initialisation
|
////@begin wxRichTextStylePage member initialisation
|
||||||
@ -94,7 +84,7 @@ bool wxRichTextStylePage::Create( wxWindow* parent, wxWindowID id, const wxPoint
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
void wxRichTextStylePage::CreateControls()
|
void wxRichTextStylePage::CreateControls()
|
||||||
{
|
{
|
||||||
////@begin wxRichTextStylePage content construction
|
////@begin wxRichTextStylePage content construction
|
||||||
wxRichTextStylePage* itemPanel1 = this;
|
wxRichTextStylePage* itemPanel1 = this;
|
||||||
|
|
||||||
@ -197,7 +187,7 @@ bool wxRichTextStylePage::TransferDataToWindow()
|
|||||||
}
|
}
|
||||||
m_nextStyle->SetValue(paraDef->GetNextStyle());
|
m_nextStyle->SetValue(paraDef->GetNextStyle());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_basedOn->GetCount() == 0)
|
if (m_basedOn->GetCount() == 0)
|
||||||
{
|
{
|
||||||
if (sheet)
|
if (sheet)
|
||||||
@ -224,7 +214,7 @@ bool wxRichTextStylePage::TransferDataToWindow()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_basedOn->SetValue(def->GetBaseStyle());
|
m_basedOn->SetValue(def->GetBaseStyle());
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -9,20 +9,10 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
|
||||||
#include "wx/wxprec.h"
|
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
|
||||||
#pragma hdrstop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if wxUSE_RICHTEXT
|
#if wxUSE_RICHTEXT
|
||||||
|
|
||||||
#include "wx/richtext/richtexttabspage.h"
|
#include "wx/richtext/richtexttabspage.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* wxRichTextTabsPage type definition
|
* wxRichTextTabsPage type definition
|
||||||
*/
|
*/
|
||||||
@ -69,7 +59,7 @@ wxRichTextTabsPage::wxRichTextTabsPage( wxWindow* parent, wxWindowID id, const w
|
|||||||
/*!
|
/*!
|
||||||
* Initialise members
|
* Initialise members
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void wxRichTextTabsPage::Init()
|
void wxRichTextTabsPage::Init()
|
||||||
{
|
{
|
||||||
m_tabsPresent = false;
|
m_tabsPresent = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user