Author: martinf Date: Sun Jan 25 05:54:31 2009 New Revision: 39088
URL: http://svn.reactos.org/svn/reactos?rev=39088&view=rev Log: code beautification
Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.h
Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar... ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sun Jan 25 05:54:31 2009 @@ -170,7 +170,7 @@
// prepare Startmenu, but hide it for now _startMenuRoot = GET_WINDOW(StartMenuRoot, StartMenuRoot::Create(_hwndStartButton, STARTMENUROOT_ICON_SIZE)); - _startMenuRoot->_hwndParent = _hwndStartButton; + _startMenuRoot->_hwndStartButton = _hwndStartButton;
return 0; }
Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar... ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Sun Jan 25 05:54:31 2009 @@ -1557,7 +1557,8 @@
StartMenuRoot::StartMenuRoot(HWND hwnd, const StartMenuRootCreateInfo& info) - : super(hwnd, info._icon_size) + : super(hwnd, info._icon_size), + _hwndStartButton(0) { #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCOMMONGROUPS)) @@ -1637,7 +1638,7 @@ // recalculate start menu root position RECT rect;
- CalculateStartPos(_hwndParent, rect, _icon_size); + CalculateStartPos(_hwndStartButton, rect, _icon_size);
SetWindowPos(hwnd, 0, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, 0);
Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar... ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.h [iso-8859-1] Sun Jan 25 05:54:31 2009 @@ -366,9 +366,11 @@ typedef StartMenuHandler super;
StartMenuRoot(HWND hwnd, const StartMenuRootCreateInfo& info); - HWND _hwndParent; + static HWND Create(HWND hwndDesktopBar, int icon_size); void TrackStartmenu(); + + HWND _hwndStartButton;
protected: LRESULT Init(LPCREATESTRUCT pcs);