diff options
Diffstat (limited to 'include/swdisprtf.h')
| -rw-r--r-- | include/swdisprtf.h | 48 |
1 files changed, 5 insertions, 43 deletions
diff --git a/include/swdisprtf.h b/include/swdisprtf.h index 170a674..f8b78e7 100644 --- a/include/swdisprtf.h +++ b/include/swdisprtf.h @@ -2,7 +2,7 @@ * swdisprtf.h - definition of Class SWDispRTF-- an SWDisplay used to display * a verse in Rich Text Format. * - * $Id: swdisprtf.h,v 1.8 2001/08/15 02:40:12 dtrotzjr Exp $ + * $Id: swdisprtf.h,v 1.10 2002/07/30 11:33:17 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -31,9 +31,7 @@ #include <vcl\ComCtrls.hpp> #include <vcl\StdCtrls.hpp> #include <swtext.h> -#ifndef USEOLDRTF -#include <RxRichEdit.hpp> -#endif +#include "RxRichEditX.h" //--------------------------------------------------------------------------- #define defRTFHeader "{\\rtf1\\ansi{\\fonttbl{\\f0\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f1\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f2\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f3\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f4\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f7\\froman\\fcharset2\\fprq2 Symbol;}{\\f8\\froman\\fcharset2\\fprq2 Symbol;}}{\\colortbl;\\red0\\green0\\blue255;\\red0\\green200\\blue50;\\red0\\green0\\blue255;\\red0\\green200\\blue50;\\red0\\green0\\blue255;\\red255\\green0\\blue0;} " @@ -49,23 +47,9 @@ #define defRTFVersePre "{\\fs%d" // 24 #define defRTFVersePost " }" -#ifndef USEOLDRTF -class SWDispRTF:public TRxRichEdit -#else -class SWDispRTF:public TRichEdit -#endif -{ +class SWDispRTF : public TRxRichEditX { protected: - System::AnsiString FRTFHeader; - System::AnsiString FRTFHeadMargin; - System::AnsiString FRTFTrailer; - System::AnsiString FRTFChapterMarkPre; - System::AnsiString FRTFChapterMarkPost; - System::AnsiString FRTFVerseMarkPre; - System::AnsiString FRTFVerseMarkPost; - System::AnsiString FRTFVersePre; - System::AnsiString FRTFVersePost; bool FExpandNewLine; CHARRANGE FCharRange; int fontSize; @@ -74,38 +58,16 @@ protected: void __fastcall SetMySelStart (int iselstart); int __fastcall getFontSize (); void __fastcall setFontSize (int iFontSize); - void recalcHeaders (); protected: TMemoryStream * RTFStream; virtual void __fastcall Loaded (void); public: - __fastcall SWDispRTF (TComponent * Owner); + __fastcall SWDispRTF (TWinControl *Owner); __fastcall ~ SWDispRTF (); virtual char Display (SWModule & imodule); - __published:__property System::AnsiString RTFHeader = - { - read = FRTFHeader, write = FRTFHeader}; - __property System::AnsiString RTFHeadMargin = { read = - FRTFHeadMargin, write = FRTFHeadMargin }; - __property System::AnsiString RTFChapterMarkPre = { read = - FRTFChapterMarkPre, write = FRTFChapterMarkPre }; - __property System::AnsiString RTFChapterMarkPost = { read = - FRTFChapterMarkPost, write = FRTFChapterMarkPost }; - __property System::AnsiString RTFVerseMarkPre = { read = - FRTFVerseMarkPre, write = FRTFVerseMarkPre }; - __property System::AnsiString RTFVerseMarkPost = { read = - FRTFVerseMarkPost, write = FRTFVerseMarkPost }; - __property System::AnsiString RTFVersePre = { read = FRTFVersePre, write = - FRTFVersePre }; - __property System::AnsiString RTFVersePost = { read = FRTFVersePost, write = - FRTFVersePost }; - __property System::AnsiString RTFTrailer = { read = FRTFTrailer, write = - FRTFTrailer }; - __property bool ExpandNewLine = { read = FExpandNewLine, write = - FExpandNewLine }; - __property int FontSize = { read = getFontSize, write = setFontSize }; + __property bool ExpandNewLine = { read = FExpandNewLine, write = FExpandNewLine }; }; //--------------------------------------------------------------------------- |