Simplify PCH support. Minor source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: richtext/richtextbuffer.cpp
|
// Name: src/richtext/richtextbuffer.cpp
|
||||||
// Purpose: Buffer for wxRichTextCtrl
|
// Purpose: Buffer for wxRichTextCtrl
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -21,7 +21,8 @@
|
|||||||
#include "wx/richtext/richtextbuffer.h"
|
#include "wx/richtext/richtextbuffer.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/wx.h"
|
#include "wx/dc.h"
|
||||||
|
#include "wx/intl.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/filename.h"
|
#include "wx/filename.h"
|
||||||
@@ -3149,15 +3150,19 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
|
|||||||
int width = 0;
|
int width = 0;
|
||||||
if(stringChunk.Find(wxT('\t')) >= 0){// the string has a tab
|
if(stringChunk.Find(wxT('\t')) >= 0){// the string has a tab
|
||||||
wxArrayInt tab_array = GetAttributes().GetTabs();
|
wxArrayInt tab_array = GetAttributes().GetTabs();
|
||||||
if(tab_array.IsEmpty()){// create a default tab list at 10 mm each.
|
if(tab_array.IsEmpty())
|
||||||
for( int i = 0; i < 20; ++i){
|
{
|
||||||
|
// create a default tab list at 10 mm each.
|
||||||
|
for( int i = 0; i < 20; ++i)
|
||||||
|
{
|
||||||
tab_array.Add(i*100);
|
tab_array.Add(i*100);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int map_mode = dc.GetMapMode();
|
int map_mode = dc.GetMapMode();
|
||||||
dc.SetMapMode(wxMM_LOMETRIC );
|
dc.SetMapMode(wxMM_LOMETRIC );
|
||||||
int num_tabs = tab_array.GetCount();
|
int num_tabs = tab_array.GetCount();
|
||||||
for( int i = 0; i < num_tabs; ++i){
|
for( int i = 0; i < num_tabs; ++i)
|
||||||
|
{
|
||||||
tab_array[i] = dc.LogicalToDeviceXRel(tab_array[i]);
|
tab_array[i] = dc.LogicalToDeviceXRel(tab_array[i]);
|
||||||
}
|
}
|
||||||
dc.SetMapMode(map_mode );
|
dc.SetMapMode(map_mode );
|
||||||
|
@@ -21,8 +21,10 @@
|
|||||||
#include "wx/richtext/richtextctrl.h"
|
#include "wx/richtext/richtextctrl.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/wx.h"
|
|
||||||
#include "wx/settings.h"
|
#include "wx/settings.h"
|
||||||
|
#include "wx/menu.h"
|
||||||
|
#include "wx/intl.h"
|
||||||
|
#include "wx/stopwatch.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/textfile.h"
|
#include "wx/textfile.h"
|
||||||
|
@@ -21,7 +21,6 @@
|
|||||||
#include "wx/richtext/richtexthtml.h"
|
#include "wx/richtext/richtexthtml.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/wx.h"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/filename.h"
|
#include "wx/filename.h"
|
||||||
|
@@ -1,10 +1,10 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: richtextstyles.cpp
|
// Name: src/richtext/richtextstyles.cpp
|
||||||
// Purpose: Style management for wxRichTextCtrl
|
// Purpose: Style management for wxRichTextCtrl
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 2005-09-30
|
// Created: 2005-09-30
|
||||||
// RCS-ID:
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
#include "wx/richtext/richtextstyles.h"
|
#include "wx/richtext/richtextstyles.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/wx.h"
|
#include "wx/dcclient.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/filename.h"
|
#include "wx/filename.h"
|
||||||
@@ -308,4 +308,3 @@ wxColour wxRichTextStyleListBox::GetSelectedTextBgColour(const wxColour& colBg)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
// wxUSE_RICHTEXT
|
// wxUSE_RICHTEXT
|
||||||
|
|
||||||
|
@@ -21,7 +21,6 @@
|
|||||||
#include "wx/richtext/richtextxml.h"
|
#include "wx/richtext/richtextxml.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/wx.h"
|
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user