Removed header guards
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
parent
5219cf0588
commit
8c636fd789
@ -9,96 +9,6 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef _WX_RICHTEXTBUFFER_H_
|
|
||||||
#define _WX_RICHTEXTBUFFER_H_
|
|
||||||
|
|
||||||
/*
|
|
||||||
|
|
||||||
Data structures
|
|
||||||
===============
|
|
||||||
|
|
||||||
Data is represented by a hierarchy of objects, all derived from
|
|
||||||
wxRichTextObject.
|
|
||||||
|
|
||||||
The top of the hierarchy is the buffer, a kind of wxRichTextParagraphLayoutBox.
|
|
||||||
These boxes will allow flexible placement of text boxes on a page, but
|
|
||||||
for now there is a single box representing the document, and this box is
|
|
||||||
a wxRichTextParagraphLayoutBox which contains further wxRichTextParagraph
|
|
||||||
objects, each of which can include text and images.
|
|
||||||
|
|
||||||
Each object maintains a range (start and end position) measured
|
|
||||||
from the start of the main parent box.
|
|
||||||
A paragraph object knows its range, and a text fragment knows its range
|
|
||||||
too. So, a character or image in a page has a position relative to the
|
|
||||||
start of the document, and a character in an embedded text box has
|
|
||||||
a position relative to that text box. For now, we will not be dealing with
|
|
||||||
embedded objects but it's something to bear in mind for later.
|
|
||||||
|
|
||||||
Note that internally, a range (5,5) represents a range of one character.
|
|
||||||
In the public wx[Rich]TextCtrl API, this would be passed to e.g. SetSelection
|
|
||||||
as (5,6). A paragraph with one character might have an internal range of (0, 1)
|
|
||||||
since the end of the paragraph takes up one position.
|
|
||||||
|
|
||||||
Layout
|
|
||||||
======
|
|
||||||
|
|
||||||
When Layout is called on an object, it is given a size which the object
|
|
||||||
must limit itself to, or one or more flexible directions (vertical
|
|
||||||
or horizontal). So for example a centered paragraph is given the page
|
|
||||||
width to play with (minus any margins), but can extend indefinitely
|
|
||||||
in the vertical direction. The implementation of Layout can then
|
|
||||||
cache the calculated size and position within the parent.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Includes
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "wx/defs.h"
|
|
||||||
|
|
||||||
#if wxUSE_RICHTEXT
|
|
||||||
|
|
||||||
#include "wx/list.h"
|
|
||||||
#include "wx/textctrl.h"
|
|
||||||
#include "wx/bitmap.h"
|
|
||||||
#include "wx/image.h"
|
|
||||||
#include "wx/cmdproc.h"
|
|
||||||
#include "wx/txtstrm.h"
|
|
||||||
#include "wx/variant.h"
|
|
||||||
|
|
||||||
#if wxUSE_DATAOBJ
|
|
||||||
#include "wx/dataobj.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Compatibility
|
|
||||||
//#define wxRichTextAttr wxTextAttr
|
|
||||||
#define wxTextAttrEx wxTextAttr
|
|
||||||
|
|
||||||
// Setting wxRICHTEXT_USE_OWN_CARET to 1 implements a
|
|
||||||
// caret reliably without using wxClientDC in case there
|
|
||||||
// are platform-specific problems with the generic caret.
|
|
||||||
#if defined(__WXGTK__) || defined(__WXMAC__)
|
|
||||||
#define wxRICHTEXT_USE_OWN_CARET 1
|
|
||||||
#else
|
|
||||||
#define wxRICHTEXT_USE_OWN_CARET 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Switch off for binary compatibility, on for faster drawing
|
|
||||||
// Note: this seems to be buggy (overzealous use of extents) so
|
|
||||||
// don't use for now
|
|
||||||
#define wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING 0
|
|
||||||
|
|
||||||
// The following two symbols determine whether an output implementation
|
|
||||||
// is present. To switch the relevant one on, set wxRICHTEXT_USE_XMLDOCUMENT_OUTPUT in
|
|
||||||
// richtextxml.cpp. By default, the faster direct output implementation is used.
|
|
||||||
|
|
||||||
// Include the wxXmlDocument implementation for output
|
|
||||||
#define wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT 1
|
|
||||||
|
|
||||||
// Include the faster, direct implementation for output
|
|
||||||
#define wxRICHTEXT_HAVE_DIRECT_OUTPUT 1
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
The line break character that can be embedded in content.
|
The line break character that can be embedded in content.
|
||||||
*/
|
*/
|
||||||
@ -118,31 +28,6 @@ enum wxRichTextFileType
|
|||||||
wxRICHTEXT_TYPE_PDF
|
wxRICHTEXT_TYPE_PDF
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
|
||||||
* Forward declarations
|
|
||||||
*/
|
|
||||||
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCtrl;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextObject;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextImage;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCacheObject;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextObjectList;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextLine;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextParagraph;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFileHandler;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextStyleSheet;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextListStyleDefinition;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextEvent;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextRenderer;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextBuffer;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextXMLHandler;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextParagraphLayoutBox;
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextImageBlock;
|
|
||||||
class WXDLLIMPEXP_FWD_XML wxXmlNode;
|
|
||||||
class wxRichTextFloatCollector;
|
|
||||||
class WXDLLIMPEXP_FWD_BASE wxDataInputStream;
|
|
||||||
class WXDLLIMPEXP_FWD_BASE wxDataOutputStream;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Flags determining the available space, passed to Layout.
|
Flags determining the available space, passed to Layout.
|
||||||
*/
|
*/
|
||||||
@ -5553,10 +5438,3 @@ WXDLLIMPEXP_RICHTEXT wxString wxRichTextDecimalToRoman(long n);
|
|||||||
WXDLLIMPEXP_RICHTEXT void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAttr& attr, wxTextAttr& clashingAttr, wxTextAttr& absentAttr);
|
WXDLLIMPEXP_RICHTEXT void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAttr& attr, wxTextAttr& clashingAttr, wxTextAttr& absentAttr);
|
||||||
|
|
||||||
WXDLLIMPEXP_RICHTEXT void wxRichTextModuleInit();
|
WXDLLIMPEXP_RICHTEXT void wxRichTextModuleInit();
|
||||||
|
|
||||||
#endif
|
|
||||||
// wxUSE_RICHTEXT
|
|
||||||
|
|
||||||
#endif
|
|
||||||
// _WX_RICHTEXTBUFFER_H_
|
|
||||||
|
|
||||||
|
|||||||
@ -9,26 +9,6 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef _WX_RICHTEXTCTRL_H_
|
|
||||||
#define _WX_RICHTEXTCTRL_H_
|
|
||||||
|
|
||||||
#include "wx/richtext/richtextbuffer.h"
|
|
||||||
|
|
||||||
#if wxUSE_RICHTEXT
|
|
||||||
|
|
||||||
#include "wx/scrolwin.h"
|
|
||||||
#include "wx/caret.h"
|
|
||||||
|
|
||||||
#include "wx/textctrl.h"
|
|
||||||
|
|
||||||
#if !defined(__WXGTK__) && !defined(__WXMAC__)
|
|
||||||
#define wxRICHTEXT_BUFFERED_PAINTING 1
|
|
||||||
#else
|
|
||||||
#define wxRICHTEXT_BUFFERED_PAINTING 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextStyleDefinition;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Styles and flags
|
* Styles and flags
|
||||||
*/
|
*/
|
||||||
@ -2257,56 +2237,3 @@ protected:
|
|||||||
private:
|
private:
|
||||||
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRichTextEvent)
|
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRichTextEvent)
|
||||||
};
|
};
|
||||||
|
|
||||||
/*!
|
|
||||||
* wxRichTextCtrl events
|
|
||||||
*/
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_RETURN, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_CHARACTER, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_DELETE, wxRichTextEvent );
|
|
||||||
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED, wxRichTextEvent );
|
|
||||||
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, wxRichTextEvent );
|
|
||||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED, wxRichTextEvent );
|
|
||||||
|
|
||||||
typedef void (wxEvtHandler::*wxRichTextEventFunction)(wxRichTextEvent&);
|
|
||||||
|
|
||||||
#define wxRichTextEventHandler(func) \
|
|
||||||
wxEVENT_HANDLER_CAST(wxRichTextEventFunction, func)
|
|
||||||
|
|
||||||
#define EVT_RICHTEXT_LEFT_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_RIGHT_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_MIDDLE_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_LEFT_DCLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_RETURN(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_RETURN, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_CHARACTER(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_CHARACTER, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_DELETE(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_DELETE, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
|
|
||||||
#define EVT_RICHTEXT_STYLESHEET_CHANGING(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_STYLESHEET_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_STYLESHEET_REPLACING(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_STYLESHEET_REPLACED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
|
|
||||||
#define EVT_RICHTEXT_CONTENT_INSERTED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_CONTENT_DELETED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_STYLE_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_SELECTION_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
#define EVT_RICHTEXT_BUFFER_RESET(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, id, -1, wxRichTextEventHandler( fn ), NULL ),
|
|
||||||
|
|
||||||
#endif
|
|
||||||
// wxUSE_RICHTEXT
|
|
||||||
|
|
||||||
#endif
|
|
||||||
// _WX_RICHTEXTCTRL_H_
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user