FreeLists / haiku-development / [haiku-development] StyledEdit

[HOST <HOST.HAIKU@xxxxxx>]

Hi,

attached is the patch for StyledEdit that should fix at least the things
introduced yesterday.

* BMessenger typo
* added virtual where needed
* use if() statement instead of ternary operator

Regards,
Julun

Index: src/apps/stylededit/StyledEditWindow.cpp
===================================================================
--- src/apps/stylededit/StyledEditWindow.cpp    (Revision 22170)
+++ src/apps/stylededit/StyledEditWindow.cpp    (Arbeitskopie)
@@ -29,11 +29,11 @@
 #include <MenuItem.h>
 #include <PrintJob.h>
 #include <Rect.h>
+#include <Roster.h>
 #include <ScrollView.h>
 #include <TextControl.h>
 #include <TextView.h>
 #include <TranslationUtils.h>
-#include <Roster.h>
 
 #include <stdlib.h>
 
Index: src/apps/stylededit/ReplaceWindow.cpp
===================================================================
--- src/apps/stylededit/ReplaceWindow.cpp       (Revision 22170)
+++ src/apps/stylededit/ReplaceWindow.cpp       (Arbeitskopie)
@@ -116,8 +116,10 @@
        fBackSearchBox->SetEnabled(fUIchange);
 
        fReplaceButton->SetEnabled(fUIchange);
-       fUIchange ? fReplaceButton->MakeDefault(true)
-               : fReplaceAllButton->MakeDefault(true);
+       if (fUIchange)
+               fReplaceButton->MakeDefault(true);
+       else
+               fReplaceAllButton->MakeDefault(true);
 
        fUIchange = !fUIchange;
 }
Index: src/apps/stylededit/StyledEditWindow.h
===================================================================
--- src/apps/stylededit/StyledEditWindow.h      (Revision 22170)
+++ src/apps/stylededit/StyledEditWindow.h      (Arbeitskopie)
@@ -30,12 +30,12 @@
        public:
                                                StyledEditWindow(BRect frame, 
int32 id, uint32 encoding = 0);
                                                StyledEditWindow(BRect frame, 
entry_ref *ref, uint32 encoding = 0);
-                                               ~StyledEditWindow();
+               virtual                 ~StyledEditWindow();
        
-               void                    Quit();
-               bool                    QuitRequested();
-               void                    MessageReceived(BMessage *message);
-               void                    MenusBeginning();
+               virtual void    Quit();
+               virtual bool    QuitRequested();
+               virtual void    MessageReceived(BMessage *message);
+               virtual void    MenusBeginning();
 
                status_t                Save(BMessage *message = 0);
                status_t                SaveAs(BMessage *message = 0);
Index: src/apps/stylededit/ReplaceWindow.h
===================================================================
--- src/apps/stylededit/ReplaceWindow.h (Revision 22170)
+++ src/apps/stylededit/ReplaceWindow.h (Arbeitskopie)
@@ -24,12 +24,12 @@
 
 class ReplaceWindow : public BWindow {
        public:
-                                       ReplaceWindow(BRect frame, BHandler 
*_handler,
-                                               BString *searchString, BString 
*replaceString,
-                                               bool caseState, bool wrapState, 
bool backState);
+                                               ReplaceWindow(BRect frame, 
BHandler *_handler,
+                                                       BString *searchString, 
BString *replaceString,
+                                                       bool caseState, bool 
wrapState, bool backState);
 
-               void                    MessageReceived(BMessage* message);
-               void                    DispatchMessage(BMessage* message, 
BHandler *handler);
+               virtual void    MessageReceived(BMessage* message);
+               virtual void    DispatchMessage(BMessage* message, BHandler 
*handler);
 
        private:
                void                    _SendMessage(uint32 what);
Index: src/apps/stylededit/StyledEditView.h
===================================================================
--- src/apps/stylededit/StyledEditView.h        (Revision 22170)
+++ src/apps/stylededit/StyledEditView.h        (Arbeitskopie)
@@ -17,16 +17,20 @@
 
 class BFile;
 class BHandler;
-class BMessanger;
+class BMessenger;
 
 
 class StyledEditView : public BTextView {
        public:
-                                       StyledEditView(BRect viewframe, BRect 
textframe, 
-                                               BHandler *handler);
-                                       ~StyledEditView();
+                                               StyledEditView(BRect viewframe, 
BRect textframe, 
+                                                       BHandler *handler);
+               virtual                 ~StyledEditView();
 
-               void            Select(int32 start, int32 finish);
+               virtual void    Select(int32 start, int32 finish);
+               virtual void    DeleteText(int32 start, int32 finish);
+               virtual void    FrameResized(float width, float height);
+               virtual void    InsertText(const char *text, int32 length, 
int32 offset, 
+                                                       const text_run_array 
*runs = NULL);
        
                void            Reset();
                status_t        GetStyledText(BPositionIO * stream);
@@ -36,11 +40,6 @@
                uint32          GetEncoding() const;
 
        private:
-               void            DeleteText(int32 start, int32 finish);
-               void            FrameResized(float width, float height);
-               void            InsertText(const char *text, int32 length, 
int32 offset, 
-                                       const text_run_array *runs = NULL);
-
                BMessenger      *fMessenger;
                bool            fSuppressChanges;
                BString         fEncoding;
Index: src/apps/stylededit/StyledEditApp.cpp
===================================================================
--- src/apps/stylededit/StyledEditApp.cpp       (Revision 22170)
+++ src/apps/stylededit/StyledEditApp.cpp       (Arbeitskopie)
@@ -79,8 +79,8 @@
 
 
 StyledEditApp::StyledEditApp()
-       : BApplication(APP_SIGNATURE)
-       , fOpenPanel(NULL)
+       : BApplication(APP_SIGNATURE),
+       fOpenPanel(NULL)
 {
        fOpenPanel = new BFilePanel();
        BMenuBar *menuBar =
Index: src/apps/stylededit/FindWindow.h
===================================================================
--- src/apps/stylededit/FindWindow.h    (Revision 22170)
+++ src/apps/stylededit/FindWindow.h    (Arbeitskopie)
@@ -24,8 +24,8 @@
                                                FindWindow(BRect frame, 
BHandler* handler, BString *searchString,
                                                        bool caseState, bool 
wrapState, bool backState);
 
-               void                    MessageReceived(BMessage* message);
-               void                    DispatchMessage(BMessage* message, 
BHandler* handler);
+               virtual void    MessageReceived(BMessage* message);
+               virtual void    DispatchMessage(BMessage* message, BHandler* 
handler);
 
        private:
                void                    _SendMessage();
Index: src/apps/stylededit/StyledEditApp.h
===================================================================
--- src/apps/stylededit/StyledEditApp.h (Revision 22170)
+++ src/apps/stylededit/StyledEditApp.h (Arbeitskopie)
@@ -24,29 +24,29 @@
 
 class StyledEditApp : public BApplication {
        public:
-                                       StyledEditApp();
-                                       ~StyledEditApp();
+                                               StyledEditApp();
+               virtual                 ~StyledEditApp();
 
-               void            MessageReceived(BMessage *message);
-               void            RefsReceived(BMessage *message);
-               void            ReadyToRun();
+               virtual void    MessageReceived(BMessage *message);
+               virtual void    RefsReceived(BMessage *message);
+               virtual void    ReadyToRun();
 
-               void            DispatchMessage(BMessage *an_event, BHandler 
*handler);
+               virtual void    DispatchMessage(BMessage *an_event, BHandler 
*handler);
 
-               int32           NumberOfWindows();
-               void            OpenDocument();
-               void            OpenDocument(entry_ref * ref);
-               void            CloseDocument();
+               int32                   NumberOfWindows();
+               void                    OpenDocument();
+               void                    OpenDocument(entry_ref *ref);
+               void                    CloseDocument();
 
        private:
-               void            ArgvReceivedEx(int32 argc, const char *argv[], 
const char * cwd);
+               void                    ArgvReceivedEx(int32 argc, const char 
*argv[], const char * cwd);
 
        private:
-               BFilePanel      *fOpenPanel;
-               BMenu           *fOpenPanelEncodingMenu;
-               uint32          fOpenAsEncoding;
-               int32           fWindowCount;
-               int32           fNextUntitledWindow;
+               BFilePanel              *fOpenPanel;
+               BMenu                   *fOpenPanelEncodingMenu;
+               uint32                  fOpenAsEncoding;
+               int32                   fWindowCount;
+               int32                   fNextUntitledWindow;
                
 };
 
Index: src/apps/stylededit/ColorMenuItem.cpp
===================================================================
--- src/apps/stylededit/ColorMenuItem.cpp       (Revision 22170)
+++ src/apps/stylededit/ColorMenuItem.cpp       (Arbeitskopie)
@@ -12,8 +12,8 @@
 #include <Message.h>
 
 ColorMenuItem::ColorMenuItem(const char        *label, rgb_color color, 
BMessage *message)
-       : BMenuItem(label, message, 0, 0)
-       , fItemColor(color)
+       : BMenuItem(label, message, 0, 0),
+       fItemColor(color)
 {
 }
 
Index: src/apps/stylededit/ColorMenuItem.h
===================================================================
--- src/apps/stylededit/ColorMenuItem.h (Revision 22170)
+++ src/apps/stylededit/ColorMenuItem.h (Arbeitskopie)
@@ -18,11 +18,14 @@
 
 class ColorMenuItem: public BMenuItem {
        public:
-                                       ColorMenuItem(const char *label, 
rgb_color color, BMessage *message);
-                                       void DrawContent();
+                                               ColorMenuItem(const char 
*label, rgb_color color, 
+                                                       BMessage *message);
 
+       protected:
+               virtual void    DrawContent();
+
        private:
-               rgb_color       fItemColor;
+               rgb_color               fItemColor;
 };
 
 #endif // COLOR_MENU_ITEM_H