From d3ed67d76c81d27f03c3da683f8447d1d73ea3d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 29 Oct 2002 18:41:51 +0000 Subject: [PATCH] Removed BStringItem class from ListItem.h. Fixed the StringItem.h header to be compatible with BeOS. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1758 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/interface/ListItem.h | 33 ------------------------------- headers/os/interface/StringItem.h | 11 +++++++---- 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/headers/os/interface/ListItem.h b/headers/os/interface/ListItem.h index 8d23e89afd..793c751608 100644 --- a/headers/os/interface/ListItem.h +++ b/headers/os/interface/ListItem.h @@ -80,39 +80,6 @@ virtual void _ReservedListItem2(); }; -/*----------------------------------------------------------------*/ -/*----- BStringItem class ----------------------------------------*/ - -class BStringItem : public BListItem { -public: - BStringItem(const char *text, - uint32 outlineLevel = 0, bool expanded = true); -virtual ~BStringItem(); - BStringItem(BMessage *data); -static BArchivable *Instantiate(BMessage *data); -virtual status_t Archive(BMessage *data, bool deep = true) const; - -virtual void DrawItem(BView *owner, BRect frame, bool complete = false); -virtual void SetText(const char *text); - const char *Text() const; -virtual void Update(BView *owner, const BFont *font); - -virtual status_t Perform(perform_code d, void *arg); - -private: - -virtual void _ReservedStringItem1(); -virtual void _ReservedStringItem2(); - - BStringItem(const BStringItem &); - BStringItem &operator=(const BStringItem &); - - char *fText; - float fBaselineOffset; - uint32 _reserved[2]; -}; - -/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/ #endif /* _LIST_ITEM_H */ diff --git a/headers/os/interface/StringItem.h b/headers/os/interface/StringItem.h index 8d9db5c6f6..4fdf4a1f42 100644 --- a/headers/os/interface/StringItem.h +++ b/headers/os/interface/StringItem.h @@ -15,12 +15,11 @@ #ifdef USE_OPENBEOS_NAMESPACE -namespace OpenBeOS -{ +namespace OpenBeOS { #endif -/*----------------------------------------------------------------*/ -/*----- BStringItem class ----------------------------------------*/ + +//----- BStringItem class ---------------------------------------- class BStringItem : public BListItem { @@ -41,11 +40,15 @@ public: virtual status_t Perform(perform_code code, void *arg); private: + virtual void _ReservedStringItem1(); + virtual void _ReservedStringItem2(); + BStringItem(const BStringItem &); BStringItem& operator=(const BStringItem &); char *fText; float fBaselineOffset; + uint32 _reserved[2]; }; #ifdef USE_OPENBEOS_NAMESPACE