From fef862eb200d34bc932e0775887e844a48bd2730 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Wed, 23 Jul 2014 19:58:13 -0400 Subject: [PATCH] TextView.h rearrage virtual methods for FBC The order is updated so the virtual methods appear in the same order that they did in BeOS R5 with methods new to Haiku added to the bottom. Perform() moves up, all other methods move below GetDragParameters(), the last virtual method in BeOS R5's TextView.h. --- headers/os/interface/TextView.h | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/headers/os/interface/TextView.h b/headers/os/interface/TextView.h index 10366a50df..907151ece1 100644 --- a/headers/os/interface/TextView.h +++ b/headers/os/interface/TextView.h @@ -86,6 +86,7 @@ public: int32 index, BMessage* specifier, int32 form, const char* property); virtual status_t GetSupportedSuites(BMessage* data); + virtual status_t Perform(perform_code code, void* data); void SetText(const char* text, const text_run_array* runs = NULL); @@ -210,19 +211,6 @@ public: virtual void ResizeToPreferred(); virtual void GetPreferredSize(float* _width, float* _height); - virtual BSize MinSize(); - virtual BSize MaxSize(); - virtual BSize PreferredSize(); - - virtual bool HasHeightForWidth(); - virtual void GetHeightForWidth(float width, float* min, - float* max, float* preferred); - -protected: - virtual void LayoutInvalidated(bool descendants); - virtual void DoLayout(); - -public: virtual void AllAttached(); virtual void AllDetached(); @@ -250,11 +238,20 @@ protected: BBitmap** _bitmap, BPoint* point, BHandler** _handler); - // FBC padding and forbidden methods + virtual void LayoutInvalidated(bool descendants); + virtual void DoLayout(); + public: - virtual status_t Perform(perform_code code, void* data); + virtual BSize MinSize(); + virtual BSize MaxSize(); + virtual BSize PreferredSize(); + + virtual bool HasHeightForWidth(); + virtual void GetHeightForWidth(float width, float* min, + float* max, float* preferred); private: + // FBC padding and forbidden methods virtual void _ReservedTextView3(); virtual void _ReservedTextView4(); virtual void _ReservedTextView5();