diff --git a/headers/os/interface/MenuItem.h b/headers/os/interface/MenuItem.h index 8fc6436178..a77bb36b58 100644 --- a/headers/os/interface/MenuItem.h +++ b/headers/os/interface/MenuItem.h @@ -114,35 +114,11 @@ private: uint32 _reserved[4]; }; -/*----------------------------------------------------------------*/ -/*----- BSeparatorItem class -------------------------------------*/ - -class BSeparatorItem : public BMenuItem -{ -public: - BSeparatorItem(); - BSeparatorItem(BMessage *data); -virtual ~BSeparatorItem(); -virtual status_t Archive(BMessage *data, bool deep = true) const; -static BArchivable *Instantiate(BMessage *data); -virtual void SetEnabled(bool state); - -protected: - -virtual void GetContentSize(float *width, float *height); -virtual void Draw(); - -/*----- Private or reserved -----------------------------------------*/ -private: -virtual void _ReservedSeparatorItem1(); -virtual void _ReservedSeparatorItem2(); - - BSeparatorItem &operator=(const BSeparatorItem &); - - uint32 _reserved[1]; -}; - /*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/ +// We moved BSeparatorItem's declaration to its own file, but for source +// compatibility we have to export that class from here too. +#include + #endif /* _MENU_ITEM_H */ diff --git a/headers/os/interface/SeparatorItem.h b/headers/os/interface/SeparatorItem.h new file mode 100644 index 0000000000..636492a54d --- /dev/null +++ b/headers/os/interface/SeparatorItem.h @@ -0,0 +1,32 @@ +#ifndef _SEPARATOR_ITEM_H +#define _SEPARATOR_ITEM_H + +#include + +class BMessage; +class BSeparatorItem : public BMenuItem { +public: + BSeparatorItem(); + BSeparatorItem(BMessage *data); + + virtual ~BSeparatorItem(); + virtual status_t Archive(BMessage *data, bool deep = true) const; + + static BArchivable *Instantiate(BMessage *data); + virtual void SetEnabled(bool state); + +protected: + virtual void GetContentSize(float *width, float *height); + virtual void Draw(); + +private: + virtual void _ReservedSeparatorItem1(); + virtual void _ReservedSeparatorItem2(); + + BSeparatorItem &operator=(const BSeparatorItem &); + + uint32 _reserved[1]; +}; + + +#endif /* _SEPARATOR_ITEM_H */