[haiku-commits] r36315 - haiku/trunk/src/kits/interface

From: mmlr@xxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Thu, 15 Apr 2010 20:54:30 +0200 (CEST)
Author: mmlr
Date: 2010-04-15 20:54:30 +0200 (Thu, 15 Apr 2010)
New Revision: 36315
Changeset: http://dev.haiku-os.org/changeset/36315/haiku

Modified:
   haiku/trunk/src/kits/interface/MenuItem.cpp
Log:
Automatic whitespace cleanup, no functional change.


Modified: haiku/trunk/src/kits/interface/MenuItem.cpp
===================================================================
--- haiku/trunk/src/kits/interface/MenuItem.cpp 2010-04-15 18:52:20 UTC (rev 
36314)
+++ haiku/trunk/src/kits/interface/MenuItem.cpp 2010-04-15 18:54:30 UTC (rev 
36315)
@@ -32,9 +32,9 @@
 // map control key shortcuts to drawable Unicode characters
 // cf. http://unicode.org/charts/PDF/U2190.pdf
 const char *kUTF8ControlMap[] = {
-       NULL, 
+       NULL,
        "\xe2\x86\xb8", /* B_HOME U+21B8 */
-       NULL, NULL, 
+       NULL, NULL,
        NULL, /* B_END */
        NULL, /* B_INSERT */
        NULL, NULL,
@@ -46,7 +46,7 @@
        NULL, /* B_PAGE_DOWN */
        NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-       NULL, NULL, NULL, NULL, 
+       NULL, NULL, NULL, NULL,
        "\xe2\x86\x90", /* B_LEFT_ARROW */
        "\xe2\x86\x92", /* B_RIGHT_ARROW */
        "\xe2\x86\x91", /* B_UP_ARROW */
@@ -61,7 +61,7 @@
        _InitData();
        if (label != NULL)
                fLabel = strdup(label);
-               
+
        SetMessage(message);
 
        fShortcutChar = shortcut;
@@ -178,7 +178,7 @@
 
 
 BMenuItem::~BMenuItem()
-{      
+{
        free(fLabel);
        delete fSubmenu;
 }
@@ -191,7 +191,7 @@
                free(fLabel);
                fLabel = NULL;
        }
-       
+
        if (string != NULL)
                fLabel = strdup(string);
 
@@ -433,7 +433,7 @@
                lineEnd.x += escapements[fTriggerIndex] * font.Size();
 
                fSuper->StrokeLine(lineStart, lineEnd);
-       }       
+       }
 }
 
 
@@ -516,9 +516,9 @@
 
 BPoint
 BMenuItem::ContentLocation() const
-{      
+{
        const BRect &padding = MenuPrivate(fSuper).Padding();
-       
+
        return BPoint(fBounds.left + padding.left,
                fBounds.top + padding.top);
 }
@@ -565,7 +565,7 @@
 BMenuItem::_InitMenuData(BMenu *menu)
 {
        fSubmenu = menu;
-       
+
        MenuPrivate(fSubmenu).SetSuperItem(this);
 
        BMenuItem *item = menu->FindMarked();
@@ -583,7 +583,7 @@
        if (fSubmenu) {
                MenuPrivate(fSubmenu).Install(window);
        }
-       
+
        fWindow = window;
 
        if (fShortcutChar != 0 && (fModifiers & B_COMMAND_KEY) && fWindow)
@@ -639,7 +639,7 @@
        if (fSubmenu != NULL) {
                MenuPrivate(fSubmenu).Uninstall();
        }
-       
+
        if (Target() == fWindow)
                SetTarget(BMessenger());
 
@@ -674,7 +674,7 @@
        if (Submenu() || IsEnabled()) {
                fSelected = selected;
                Highlight(selected);
-       }       
+       }
 }
 
 
@@ -726,8 +726,8 @@
        menu->GetFont(&font);
        BPoint where = ContentLocation();
        where.x = fBounds.right - font.Size();
-       
-       if (fSubmenu)   
+
+       if (fSubmenu)
                where.x -= fBounds.Height() - 3;
 
        const float ascent = MenuPrivate(fSuper).Ascent();
@@ -737,8 +737,8 @@
                fSuper->DrawChar(fShortcutChar, where + BPoint(0, ascent));
 
        where.y += (fBounds.Height() - 11) / 2 - 1;
-       where.x -= 4;   
-       
+       where.x -= 4;
+
        if (fModifiers & B_COMMAND_KEY) {
                const BBitmap *command = MenuPrivate::MenuItemCommand();
                const BRect &rect = command->Bounds();
@@ -759,9 +759,9 @@
                where.x -= rect.Width() + 1;
                fSuper->DrawBitmap(option, where);
        }
-       
+
        if (fModifiers & B_SHIFT_KEY) {
-               const BBitmap *shift = MenuPrivate::MenuItemShift();            
+               const BBitmap *shift = MenuPrivate::MenuItemShift();
                const BRect &rect = shift->Bounds();
                where.x -= rect.Width() + 1;
                fSuper->DrawBitmap(shift, where);
[haiku-commits] r36315 - haiku/trunk/src/kits/interface

Other related posts:
