Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 1339882 ] richtext misc cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-10-28 14:24:04 +00:00
parent bb0d2f0379
commit b01ca8b6a9
8 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/richtext/richtextbuffer.h
View File

@@ -9,6 +9,9 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_RICHTEXTBUFFER_H_
#define _WX_RICHTEXTBUFFER_H_
/* /*
Data structures Data structures
@@ -84,17 +87,17 @@
*/ */
#ifndef _WX_RICHTEXTBUFFER_H_
#define _WX_RICHTEXTBUFFER_H_
/*! /*!
* Includes * Includes
*/ */
#include "wx/list.h" #include "wx/defs.h"
#if wxUSE_RICHTEXT #if wxUSE_RICHTEXT
#include "wx/list.h"
#include "wx/textctrl.h"
#include "wx/bitmap.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/cmdproc.h" #include "wx/cmdproc.h"
#include "wx/txtstrm.h" #include "wx/txtstrm.h"
@@ -489,13 +492,13 @@ private:
wxString m_paragraphStyleName; wxString m_paragraphStyleName;
}; };
#define wxTEXT_ATTR_CHARACTER (wxTEXT_ATTR_FONT) | wxTEXT_ATTR_BACKGROUND_COLOUR | wxTEXT_ATTR_TEXT_COLOUR #define wxTEXT_ATTR_CHARACTER (wxTEXT_ATTR_FONT | wxTEXT_ATTR_BACKGROUND_COLOUR | wxTEXT_ATTR_TEXT_COLOUR)
#define wxTEXT_ATTR_PARAGRAPH wxTEXT_ATTR_ALIGNMENT|wxTEXT_ATTR_LEFT_INDENT|wxTEXT_ATTR_RIGHT_INDENT|wxTEXT_ATTR_TABS|\ #define wxTEXT_ATTR_PARAGRAPH (wxTEXT_ATTR_ALIGNMENT|wxTEXT_ATTR_LEFT_INDENT|wxTEXT_ATTR_RIGHT_INDENT|wxTEXT_ATTR_TABS|\
wxTEXT_ATTR_PARA_SPACING_BEFORE|wxTEXT_ATTR_PARA_SPACING_AFTER|wxTEXT_ATTR_LINE_SPACING|\ wxTEXT_ATTR_PARA_SPACING_BEFORE|wxTEXT_ATTR_PARA_SPACING_AFTER|wxTEXT_ATTR_LINE_SPACING|\
wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_SYMBOL wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_SYMBOL)
#define wxTEXT_ATTR_ALL wxTEXT_ATTR_CHARACTER|wxTEXT_ATTR_PARAGRAPH #define wxTEXT_ATTR_ALL (wxTEXT_ATTR_CHARACTER|wxTEXT_ATTR_PARAGRAPH)
/*! /*!
* wxRichTextObject class declaration * wxRichTextObject class declaration

8
include/wx/richtext/richtextctrl.h
View File

@@ -12,21 +12,23 @@
#ifndef _WX_RICHTEXTCTRL_H_ #ifndef _WX_RICHTEXTCTRL_H_
#define _WX_RICHTEXTCTRL_H_ #define _WX_RICHTEXTCTRL_H_
#include "wx/textctrl.h" #include "wx/richtext/richtextbuffer.h"
#if wxUSE_RICHTEXT #if wxUSE_RICHTEXT
#include "wx/scrolwin.h" #include "wx/scrolwin.h"
#include "wx/caret.h" #include "wx/caret.h"
#include "wx/richtext/richtextbuffer.h"
#if wxCHECK_VERSION(2,7,0) #if wxCHECK_VERSION(2,7,0)
#define wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE 0 #define wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE 0
#else #else
#define wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE 0 #define wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE 0
#endif #endif
#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
#include "wx/textctrl.h"
#endif
/*! /*!
* Styles and flags * Styles and flags
*/ */

4
include/wx/richtext/richtextstyles.h
View File

@@ -16,12 +16,10 @@
* Includes * Includes
*/ */
#include "wx/defs.h" #include "wx/richtext/richtextbuffer.h"
#if wxUSE_RICHTEXT #if wxUSE_RICHTEXT
#include "wx/richtext/richtextbuffer.h"
#if wxUSE_HTML #if wxUSE_HTML
#include "wx/htmllbox.h" #include "wx/htmllbox.h"
#endif #endif

4
include/wx/richtext/richtextxml.h
View File

@@ -16,12 +16,10 @@
* Includes * Includes
*/ */
#include "wx/defs.h" #include "wx/richtext/richtextbuffer.h"
#if wxUSE_RICHTEXT #if wxUSE_RICHTEXT
#include "wx/richtext/richtextbuffer.h"
/*! /*!
* wxRichTextXMLHandler * wxRichTextXMLHandler
*/ */

12
src/richtext/richtextbuffer.cpp
View File

@@ -16,14 +16,14 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_RICHTEXT
#include "wx/richtext/richtextbuffer.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#include "wx/image.h"
#if wxUSE_RICHTEXT
#include "wx/filename.h" #include "wx/filename.h"
#include "wx/clipbrd.h" #include "wx/clipbrd.h"
#include "wx/dataobj.h" #include "wx/dataobj.h"
@@ -32,7 +32,6 @@
#include "wx/mstream.h" #include "wx/mstream.h"
#include "wx/sstream.h" #include "wx/sstream.h"
#include "wx/richtext/richtextbuffer.h"
#include "wx/richtext/richtextctrl.h" #include "wx/richtext/richtextctrl.h"
#include "wx/richtext/richtextstyles.h" #include "wx/richtext/richtextstyles.h"
@@ -4980,8 +4979,7 @@ void wxRichTextImageBlock::Init()
void wxRichTextImageBlock::Clear() void wxRichTextImageBlock::Clear()
{ {
if (m_data) delete[] m_data;
delete m_data;
m_data = NULL; m_data = NULL;
m_dataSize = 0; m_dataSize = 0;
m_imageType = -1; m_imageType = -1;

10
src/richtext/richtextctrl.cpp
View File

@@ -16,21 +16,19 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_RICHTEXT
#include "wx/richtext/richtextctrl.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#include "wx/image.h"
#if wxUSE_RICHTEXT
#include "wx/textfile.h" #include "wx/textfile.h"
#include "wx/ffile.h" #include "wx/ffile.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/filename.h" #include "wx/filename.h"
#include "wx/dcbuffer.h" #include "wx/dcbuffer.h"
#include "wx/richtext/richtextctrl.h"
#include "wx/arrimpl.cpp" #include "wx/arrimpl.cpp"
DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED)

9
src/richtext/richtextstyles.cpp
View File

@@ -16,20 +16,19 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_RICHTEXT
#include "wx/richtext/richtextstyles.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#include "wx/image.h"
#if wxUSE_RICHTEXT
#include "wx/filename.h" #include "wx/filename.h"
#include "wx/clipbrd.h" #include "wx/clipbrd.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/richtext/richtextstyles.h"
#include "wx/richtext/richtextctrl.h" #include "wx/richtext/richtextctrl.h"
IMPLEMENT_CLASS(wxRichTextStyleDefinition, wxObject) IMPLEMENT_CLASS(wxRichTextStyleDefinition, wxObject)

10
src/richtext/richtextxml.cpp
View File

@@ -16,14 +16,14 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_RICHTEXT
#include "wx/richtext/richtextxml.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#include "wx/image.h"
#if wxUSE_RICHTEXT
#include "wx/filename.h" #include "wx/filename.h"
#include "wx/clipbrd.h" #include "wx/clipbrd.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"
@@ -32,8 +32,6 @@
#include "wx/txtstrm.h" #include "wx/txtstrm.h"
#include "wx/xml/xml.h" #include "wx/xml/xml.h"
#include "wx/richtext/richtextxml.h"
IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler) IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler)
#if wxUSE_STREAMS #if wxUSE_STREAMS