Move WidthBuffer and TextGapBuffer into BPrivate and use them from there in BPoseView and BTextView. This (correctly) fixes the previous gcc4 build issues.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27675 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent
2008-09-21 20:47:16 +00:00
parent 5cb80a0cd8
commit 90b7764dc3
9 changed files with 56 additions and 42 deletions
+8 -3
View File
@@ -41,6 +41,10 @@ class BFont;
// as fonts can be classified also by spacing mode and other attributes.
#define USE_DANO_WIDTHBUFFER 0
namespace BPrivate {
class TextGapBuffer;
struct _width_table_ {
#if USE_DANO_WIDTHBUFFER
BFont font; // corresponding font
@@ -53,15 +57,14 @@ struct _width_table_ {
void *widths; // width table
};
class BTextView::WidthBuffer : public _BTextViewSupportBuffer_<_width_table_> {
class WidthBuffer : public _BTextViewSupportBuffer_<_width_table_> {
public:
WidthBuffer();
virtual ~WidthBuffer();
float StringWidth(const char *inText, int32 fromOffset, int32 length,
const BFont *inStyle);
float StringWidth(BTextView::TextGapBuffer &gapBuffer, int32 fromOffset,
float StringWidth(TextGapBuffer &gapBuffer, int32 fromOffset,
int32 length, const BFont *inStyle);
private:
@@ -75,4 +78,6 @@ private:
static uint32 Hash(uint32);
};
} // namespace BPrivate
#endif // __WIDTHBUFFER_H