The line break character that can be embedded in content.
*/
-extern WXDLLIMPEXP_RICHTEXT const wxChar wxRichTextLineBreakChar;
+extern const wxChar wxRichTextLineBreakChar;
/**
File types in wxRichText context.
@see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimensions
*/
-class WXDLLIMPEXP_RICHTEXT wxTextAttrDimension
+class wxTextAttrDimension
{
public:
/**
@see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimension
*/
-class WXDLLIMPEXP_RICHTEXT wxTextAttrDimensions
+class wxTextAttrDimensions
{
public:
/**
@see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimension
*/
-class WXDLLIMPEXP_RICHTEXT wxTextAttrSize
+class wxTextAttrSize
{
public:
/**
@see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimension
*/
-class WXDLLIMPEXP_RICHTEXT wxTextAttrDimensionConverter
+class wxTextAttrDimensionConverter
{
public:
/**
@see wxRichTextAttr, wxRichTextCtrl, wxRichTextAttrBorders
*/
-class WXDLLIMPEXP_RICHTEXT wxTextAttrBorder
+class wxTextAttrBorder
{
public:
/**
@see wxRichTextAttr, wxRichTextCtrl, wxRichTextAttrBorder
*/
-class WXDLLIMPEXP_RICHTEXT wxTextAttrBorders
+class wxTextAttrBorders
{
public:
/**
@see wxRichTextAttr, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxTextBoxAttr
+class wxTextBoxAttr
{
public:
/**
@see wxRichTextAttr, wxTextBoxAttr, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextAttr: public wxTextAttr
+class wxRichTextAttr: public wxTextAttr
{
public:
/**
wxTextBoxAttr m_textBoxAttr;
};
-WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRichTextAttr, wxRichTextAttrArray, WXDLLIMPEXP_RICHTEXT);
-
-WX_DECLARE_USER_EXPORTED_OBJARRAY(wxVariant, wxRichTextVariantArray, WXDLLIMPEXP_RICHTEXT);
+class wxRichTextAttrArray;
+class wxRichTextVariantArray;
/**
@class wxRichTextProperties
@see wxRichTextBuffer, wxRichTextObject, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextProperties: public wxObject
+class wxRichTextProperties: public wxObject
{
-DECLARE_DYNAMIC_CLASS(wxRichTextProperties)
public:
/**
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextFontTable: public wxObject
+class wxRichTextFontTable: public wxObject
{
public:
/**
protected:
double m_fontScale;
-
- DECLARE_DYNAMIC_CLASS(wxRichTextFontTable)
};
/**
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextRange
+class wxRichTextRange
{
public:
// Constructors
long m_end;
};
-WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRichTextRange, wxRichTextRangeArray, WXDLLIMPEXP_RICHTEXT);
+class wxRichTextRangeArray;
#define wxRICHTEXT_ALL wxRichTextRange(-2, -2)
#define wxRICHTEXT_NONE wxRichTextRange(-1, -1)
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextSelection
+class wxRichTextSelection
{
public:
/**
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextDrawingContext: public wxObject
+class wxRichTextDrawingContext: public wxObject
{
- DECLARE_CLASS(wxRichTextDrawingContext)
public:
/**
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextObject: public wxObject
+class wxRichTextObject: public wxObject
{
- DECLARE_CLASS(wxRichTextObject)
public:
/**
Constructor, taking an optional parent pointer.
/**
Finds the absolute position and row height for the given character position.
*/
- virtual bool FindPosition(wxDC& WXUNUSED(dc), wxRichTextDrawingContext& WXUNUSED(context), long WXUNUSED(index), wxPoint& WXUNUSED(pt), int* WXUNUSED(height), bool WXUNUSED(forceLineStart)) { return false; }
+ virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart);
/**
Returns the best size, i.e. the ideal starting size for this object irrespective
Do a split from @a pos, returning an object containing the second part, and setting
the first part in 'this'.
*/
- virtual wxRichTextObject* DoSplit(long WXUNUSED(pos)) { return NULL; }
+ virtual wxRichTextObject* DoSplit(long pos);
/**
Calculates the range of the object. By default, guess that the object is 1 unit long.
*/
- virtual void CalculateRange(long start, long& end) { end = start ; m_range.SetRange(start, end); }
+ virtual void CalculateRange(long start, long& end);
/**
Deletes the given range.
*/
- virtual bool DeleteRange(const wxRichTextRange& WXUNUSED(range)) { return false; }
+ virtual bool DeleteRange(const wxRichTextRange& range);
/**
Returns @true if the object is empty.
/**
Returns any text in this object for the given range.
*/
- virtual wxString GetTextForRange(const wxRichTextRange& WXUNUSED(range)) const { return wxEmptyString; }
+ virtual wxString GetTextForRange(const wxRichTextRange& range) const { return wxEmptyString; }
/**
Returns @true if this object can merge itself with the given one.
/**
Edits the object's properties via a GUI.
*/
- virtual bool EditProperties(wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) { return false; }
+ virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) { return false; }
/**
Returns the label to be used for the properties context menu item.
*/
virtual bool AcceptsFocus() const { return false; }
-#if wxUSE_XML
/**
Imports this object from XML.
*/
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
-#endif
#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
/**
Returns a selection object specifying the selections between start and end character positions.
For example, a table would deduce what cells (of range length 1) are selected when dragging across the table.
*/
- virtual wxRichTextSelection GetSelection(long WXUNUSED(start), long WXUNUSED(end)) const { return wxRichTextSelection(); }
+ virtual wxRichTextSelection GetSelection(long start, long end) const { return wxRichTextSelection(); }
// Accessors
wxRichTextProperties m_properties;
};
-WX_DECLARE_LIST_WITH_DECL( wxRichTextObject, wxRichTextObjectList, class WXDLLIMPEXP_RICHTEXT );
+class wxRichTextObjectList;
/**
@class wxRichTextCompositeObject
@see wxRichTextObject, wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextCompositeObject: public wxRichTextObject
+class wxRichTextCompositeObject: public wxRichTextObject
{
- DECLARE_CLASS(wxRichTextCompositeObject)
public:
// Constructors
@see wxRichTextCompositeObject, wxRichTextObject, wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextParagraphLayoutBox: public wxRichTextCompositeObject
+class wxRichTextParagraphLayoutBox: public wxRichTextCompositeObject
{
- DECLARE_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox)
public:
// Constructors
virtual wxString GetTextForRange(const wxRichTextRange& range) const;
-#if wxUSE_XML
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
-#endif
#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
@see wxRichTextParagraphLayoutBox, wxRichTextObject, wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextBox: public wxRichTextParagraphLayoutBox
+class wxRichTextBox: public wxRichTextParagraphLayoutBox
{
- DECLARE_DYNAMIC_CLASS(wxRichTextBox)
public:
// Constructors
@see wxRichTextFieldTypeStandard, wxRichTextFieldType, wxRichTextParagraphLayoutBox, wxRichTextProperties, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextField: public wxRichTextParagraphLayoutBox
+class wxRichTextField: public wxRichTextParagraphLayoutBox
{
- DECLARE_DYNAMIC_CLASS(wxRichTextField)
public:
// Constructors
@see wxRichTextFieldTypeStandard, wxRichTextField, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextFieldType: public wxObject
+class wxRichTextFieldType: public wxObject
{
- DECLARE_CLASS(wxRichTextFieldType)
public:
/**
Creates a field type definition.
/**
Returns @true if we can edit the object's properties via a GUI.
*/
- virtual bool CanEditProperties(wxRichTextField* WXUNUSED(obj)) const { return false; }
+ virtual bool CanEditProperties(wxRichTextField* obj) const { return false; }
/**
Edits the object's properties via a GUI.
*/
- virtual bool EditProperties(wxRichTextField* WXUNUSED(obj), wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) { return false; }
+ virtual bool EditProperties(wxRichTextField* obj, wxWindow* parent, wxRichTextBuffer* buffer) { return false; }
/**
Returns the label to be used for the properties context menu item.
*/
- virtual wxString GetPropertiesMenuLabel(wxRichTextField* WXUNUSED(obj)) const { return wxEmptyString; }
+ virtual wxString GetPropertiesMenuLabel(wxRichTextField* obj) const { return wxEmptyString; }
/**
Update the field. This would typically expand the field to its value,
/**
Returns @true if this object is top-level, i.e. contains its own paragraphs, such as a text box.
*/
- virtual bool IsTopLevel(wxRichTextField* WXUNUSED(obj)) const { return true; }
+ virtual bool IsTopLevel(wxRichTextField* obj) const { return true; }
/**
Sets the field type name. There should be a unique name per field type object.
wxString m_name;
};
-WX_DECLARE_STRING_HASH_MAP(wxRichTextFieldType*, wxRichTextFieldTypeHashMap);
+class wxRichTextFieldTypeHashMap;
/**
@class wxRichTextFieldTypeStandard
@see wxRichTextFieldType, wxRichTextField, wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextFieldTypeStandard: public wxRichTextFieldType
+class wxRichTextFieldTypeStandard: public wxRichTextFieldType
{
- DECLARE_CLASS(wxRichTextFieldTypeStandard)
public:
// Display style types
/**
Returns @true if the display type is wxRICHTEXT_FIELD_STYLE_COMPOSITE, @false otherwise.
*/
- virtual bool IsTopLevel(wxRichTextField* WXUNUSED(obj)) const { return (GetDisplayStyle() & wxRICHTEXT_FIELD_STYLE_COMPOSITE) != 0; }
+ virtual bool IsTopLevel(wxRichTextField* obj) const { return (GetDisplayStyle() & wxRICHTEXT_FIELD_STYLE_COMPOSITE) != 0; }
/**
Sets the text label for fields of this type.
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextLine
+class wxRichTextLine
{
public:
// Constructors
#endif
};
-WX_DECLARE_LIST_WITH_DECL( wxRichTextLine, wxRichTextLineList , class WXDLLIMPEXP_RICHTEXT );
+class wxRichTextLineList;
/**
@class wxRichTextParagraph
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextParagraph: public wxRichTextCompositeObject
+class wxRichTextParagraph: public wxRichTextCompositeObject
{
- DECLARE_DYNAMIC_CLASS(wxRichTextParagraph)
public:
// Constructors
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextPlainText: public wxRichTextObject
+class wxRichTextPlainText: public wxRichTextObject
{
- DECLARE_DYNAMIC_CLASS(wxRichTextPlainText)
public:
// Constructors
/// Does this object take note of paragraph attributes? Text and image objects don't.
virtual bool UsesParagraphAttributes() const { return false; }
-#if wxUSE_XML
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
-#endif
#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextImageBlock: public wxObject
+class wxRichTextImageBlock: public wxObject
{
public:
/**
@see wxRichTextBuffer, wxRichTextCtrl, wxRichTextImageBlock
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextImage: public wxRichTextObject
+class wxRichTextImage: public wxRichTextObject
{
- DECLARE_DYNAMIC_CLASS(wxRichTextImage)
public:
// Constructors
virtual bool UsesParagraphAttributes() const { return false; }
-#if wxUSE_XML
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
-#endif
#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
wxBitmap m_imageCache;
};
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCommand;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction;
+class wxRichTextCommand;
+class wxRichTextAction;
/**
@class wxRichTextBuffer
@see wxRichTextParagraphLayoutBox, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer: public wxRichTextParagraphLayoutBox
+class wxRichTextBuffer: public wxRichTextParagraphLayoutBox
{
- DECLARE_DYNAMIC_CLASS(wxRichTextBuffer)
public:
// Constructors
wxRichTextCell is the cell in a table.
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextCell: public wxRichTextBox
+class wxRichTextCell: public wxRichTextBox
{
- DECLARE_DYNAMIC_CLASS(wxRichTextCell)
public:
// Constructors
wxRichTextTable represents a table with arbitrary columns and rows.
*/
-WX_DEFINE_ARRAY_PTR(wxRichTextObject*, wxRichTextObjectPtrArray);
-WX_DECLARE_OBJARRAY(wxRichTextObjectPtrArray, wxRichTextObjectPtrArrayArray);
+class wxRichTextObjectPtrArray;
+class wxRichTextObjectPtrArrayArray;
-class WXDLLIMPEXP_RICHTEXT wxRichTextTable: public wxRichTextBox
+class wxRichTextTable: public wxRichTextBox
{
- DECLARE_DYNAMIC_CLASS(wxRichTextTable)
public:
// Constructors
virtual wxString GetTextForRange(const wxRichTextRange& range) const;
-#if wxUSE_XML
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
-#endif
#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
@see wxRichTextCommand
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextObjectAddress
+class wxRichTextObjectAddress
{
public:
/**
wxArrayInt m_address;
};
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction;
+class wxRichTextAction;
/**
@class wxRichTextCommand
@see wxRichTextAction
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextCommand: public wxCommand
+class wxRichTextCommand: public wxCommand
{
public:
/**
@see wxRichTextCommand
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextAction: public wxObject
+class wxRichTextAction: public wxObject
{
public:
/**
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextFileHandler: public wxObject
+class wxRichTextFileHandler: public wxObject
{
- DECLARE_CLASS(wxRichTextFileHandler)
public:
/**
Creates a file handler object.
: m_name(name), m_extension(ext), m_type(type), m_flags(0), m_visible(true)
{ }
-#if wxUSE_STREAMS
/**
Loads the buffer from a stream.
Not all handlers will implement file loading.
*/
bool SaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
{ return DoSaveFile(buffer, stream); }
-#endif
-#if wxUSE_FFILE && wxUSE_STREAMS
/**
Loads the buffer from a file.
*/
Saves the buffer to a file.
*/
virtual bool SaveFile(wxRichTextBuffer *buffer, const wxString& filename);
-#endif // wxUSE_STREAMS && wxUSE_STREAMS
/**
Returns @true if we handle this filename (if using files). By default, checks the extension.
protected:
-#if wxUSE_STREAMS
/**
Override to load content from @a stream into @a buffer.
*/
Override to save content to @a stream from @a buffer.
*/
virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) = 0;
-#endif
wxString m_name;
wxString m_encoding;
@see wxRichTextFileHandler, wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextPlainTextHandler: public wxRichTextFileHandler
+class wxRichTextPlainTextHandler: public wxRichTextFileHandler
{
- DECLARE_CLASS(wxRichTextPlainTextHandler)
public:
wxRichTextPlainTextHandler(const wxString& name = wxT("Text"),
const wxString& ext = wxT("txt"),
protected:
-#if wxUSE_STREAMS
virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
-#endif
};
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextDrawingHandler: public wxObject
+class wxRichTextDrawingHandler: public wxObject
{
- DECLARE_CLASS(wxRichTextDrawingHandler)
public:
/**
Creates a drawing handler object.
wxString m_name;
};
-#if wxUSE_DATAOBJ
/**
@class wxRichTextBufferDataObject
@see wxDataObjectSimple, wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextBufferDataObject: public wxDataObjectSimple
+class wxRichTextBufferDataObject: public wxDataObjectSimple
{
public:
/**
static const wxChar* ms_richTextBufferFormatId; // our format id
};
-#endif
/**
@class wxRichTextRenderer
@see wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextRenderer: public wxObject
+class wxRichTextRenderer: public wxObject
{
public:
/**
@see wxRichTextRenderer, wxRichTextBuffer, wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextStdRenderer: public wxRichTextRenderer
+class wxRichTextStdRenderer: public wxRichTextRenderer
{
public:
/**
}
/// Compare two attribute objects
-WXDLLIMPEXP_RICHTEXT bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2);
-WXDLLIMPEXP_RICHTEXT bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2);
+bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2);
+bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2);
/// Apply one style to another
-WXDLLIMPEXP_RICHTEXT bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith = NULL);
+bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith = NULL);
// Remove attributes
-WXDLLIMPEXP_RICHTEXT bool wxRichTextRemoveStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style);
+bool wxRichTextRemoveStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style);
/// Combine two bitlists
-WXDLLIMPEXP_RICHTEXT bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB);
+bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB);
/// Compare two bitlists
-WXDLLIMPEXP_RICHTEXT bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags);
+bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags);
/// Split into paragraph and character styles
-WXDLLIMPEXP_RICHTEXT bool wxRichTextSplitParaCharStyles(const wxRichTextAttr& style, wxRichTextAttr& parStyle, wxRichTextAttr& charStyle);
+bool wxRichTextSplitParaCharStyles(const wxRichTextAttr& style, wxRichTextAttr& parStyle, wxRichTextAttr& charStyle);
/// Compare tabs
-WXDLLIMPEXP_RICHTEXT bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2);
+bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2);
/// Convert a decimal to Roman numerals
-WXDLLIMPEXP_RICHTEXT wxString wxRichTextDecimalToRoman(long n);
+wxString wxRichTextDecimalToRoman(long n);
// Collects the attributes that are common to a range of content, building up a note of
// which attributes are absent in some objects and which clash in some objects.
-WXDLLIMPEXP_RICHTEXT void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAttr& attr, wxTextAttr& clashingAttr, wxTextAttr& absentAttr);
+void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAttr& attr, wxTextAttr& clashingAttr, wxTextAttr& absentAttr);
-WXDLLIMPEXP_RICHTEXT void wxRichTextModuleInit();
+void wxRichTextModuleInit();
projects / wxWidgets.git / commitdiff
