Incorporated TimWs current source tree and make it compile

1 files changed, 7 insertions, 10 deletions

diff --git a/noncore/apps/opie-reader/CDrawBuffer.h b/noncore/apps/opie-reader/CDrawBuffer.h
index 0d8968c..9ec0ed9 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.h
+++ b/noncore/apps/opie-reader/CDrawBuffer.h
@@ -6,2 +6,3 @@
 #include "my_list.h"
+#include "linktype.h"
 
@@ -9,9 +10,2 @@ class QPainter;
 
-enum linkType
-{
-    eNone,
-    eLink,
-    ePicture
-};
-
 struct textsegment
@@ -35,2 +29,3 @@ class CDrawBuffer : public CBuffer
     bool m_bEof;
+    bool m_bSop, m_bEop;
     CDrawBuffer(const CDrawBuffer&);
@@ -38,2 +33,4 @@ class CDrawBuffer : public CBuffer
  public:
+    void setstartpara() { m_bSop = true; }
+    void setendpara() { m_bEop = true; }
     int leftMargin();
@@ -58,5 +55,5 @@ class CDrawBuffer : public CBuffer
 */
-    int width(int numchars = -1);
-    int offset(int);
-    void render(QPainter* _p, int _y, bool _bMono, int _charWidth, int scw);
+    int width(int numchars = -1, bool onscreen = false, int scwidth = 0, unsigned char _border = 0);
+    int offset(int, unsigned char);
+    void render(QPainter* _p, int _y, bool _bMono, int _charWidth, int scw, unsigned char);
     void empty();