[ros-diffs] [dquintana] 66016: [STOBJECT] * Disable compiling the resource dialog for ro-RO also.

Author: dquintana
Date: Fri Jan  9 16:29:46 2015
New Revision: 66016

URL: http://svn.reactos.org/svn/reactos?rev=66016&view=rev
Log:
[STOBJECT]
* Disable compiling the resource dialog for ro-RO also.

Modified:
    trunk/reactos/base/shell/explorer/trayntfy.cpp
    trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp
    trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc

Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt…
==============================================================================
--- trunk/reactos/base/shell/explorer/trayntfy.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/trayntfy.cpp	[iso-8859-1] Fri Jan  9 16:29:46 2015
@@ -82,7 +82,7 @@
         return -1;
     }
 
-    VOID AddButton(IN CONST NOTIFYICONDATA *iconData)
+    BOOL AddButton(IN CONST NOTIFYICONDATA *iconData)
     {
         TBBUTTON tbBtn;
         NOTIFYICONDATA * notifyItem;
@@ -91,8 +91,7 @@
         int index = FindItemByIconData(iconData, &notifyItem);
         if (index >= 0)
         {
-            UpdateButton(iconData);
-            return;
+            return UpdateButton(iconData);
         }
 
         notifyItem = new NOTIFYICONDATA();
@@ -138,9 +137,11 @@
 
         CToolbar::AddButton(&tbBtn);
         SetButtonSize(ICON_SIZE, ICON_SIZE);
-    }
-
-    VOID UpdateButton(IN CONST NOTIFYICONDATA *iconData)
+
+        return TRUE;
+    }
+
+    BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData)
     {
         NOTIFYICONDATA * notifyItem;
         TBBUTTONINFO tbbi = { 0 };
@@ -148,8 +149,7 @@
         int index = FindItemByIconData(iconData, &notifyItem);
         if (index < 0)
         {
-            AddButton(iconData);
-            return;
+            return AddButton(iconData);
         }
 
         tbbi.cbSize = sizeof(tbbi);
@@ -197,15 +197,17 @@
         /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */
 
         SetButtonInfo(index, &tbbi);
-    }
-
-    VOID RemoveButton(IN CONST NOTIFYICONDATA *iconData)
+
+        return TRUE;
+    }
+
+    BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData)
     {
         NOTIFYICONDATA * notifyItem;
 
         int index = FindItemByIconData(iconData, &notifyItem);
         if (index < 0)
-            return;
+            return FALSE;
 
         DeleteButton(index);
 
@@ -215,6 +217,8 @@
         }
 
         delete notifyItem;
+
+        return TRUE;
     }
 
     VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip)
@@ -432,20 +436,11 @@
             switch (data->notify_code)
             {
             case NIM_ADD:
-            {
-                Toolbar.AddButton(iconData);
-                break;
-            }
+                return Toolbar.AddButton(iconData);
             case NIM_MODIFY:
-            {
-                Toolbar.UpdateButton(iconData);
-                break;
-            }
+                return Toolbar.UpdateButton(iconData);
             case NIM_DELETE:
-            {
-                Toolbar.RemoveButton(iconData);
-                break;
-            }
+                return Toolbar.RemoveButton(iconData);
             default:
                 TRACE("NotifyMessage received with unknown code %d.\n",
data->notify_code);
                 break;

Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes…
==============================================================================
--- trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp	[iso-8859-1] Fri Jan  9 16:29:46
2015
@@ -338,6 +338,8 @@
         x = ppt->x + rc.left;
         y = ppt->y + rc.top;
         break;
+    case MPPF_TOP:
+        break;
     case MPPF_TOP | MPPF_ALIGN_LEFT:
         x = ppt->x - rc.right;
         y = ppt->y + rc.top;

Modified: trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang…
==============================================================================
--- trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc	[iso-8859-1] Fri Jan  9 16:29:46
2015
@@ -1,6 +1,7 @@
 /* Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
+#if 0
 IDD_POWER_METER DIALOGEX 0, 0, 252, 218
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
@@ -12,6 +13,7 @@
     CONTROL "Afișează detalii pentru fiecare &baterie.", 1003, BUTTON,
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 
     CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 
 END
+#endif
 
 STRINGTABLE
 BEGIN