mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-08-30 04:13:33 +00:00
moved plugin source from taskbar directory to winefile/plugins
svn path=/trunk/; revision=5822
This commit is contained in:
@@ -158,7 +158,7 @@ int QuickLaunchBar::Command(int id, int code)
|
||||
int QuickLaunchBar::Notify(int id, NMHDR* pnmh)
|
||||
{
|
||||
switch(pnmh->code) {
|
||||
case TTN_GETDISPINFO: {
|
||||
case TTN_GETDISPINFO: { //TODO: TTN_GETDISPINFO is only received, if desktop bar window has the focus?!
|
||||
NMTTDISPINFO* ttdi = (NMTTDISPINFO*) pnmh;
|
||||
|
||||
int id = ttdi->hdr.idFrom;
|
||||
|
||||
@@ -77,6 +77,7 @@ Window::CREATORFUNC StartMenu::s_def_creator = STARTMENU_CREATOR(StartMenu);
|
||||
|
||||
HWND StartMenu::Create(int x, int y, const StartMenuFolders& folders, HWND hwndParent, CREATORFUNC creator)
|
||||
{
|
||||
//TODO: check, if coordinates x/y are visible on the screen
|
||||
return Window::Create(creator, &folders, 0, s_wcStartMenu, NULL,
|
||||
WS_POPUP|WS_THICKFRAME|WS_CLIPCHILDREN|WS_VISIBLE, x, y, STARTMENU_WIDTH_MIN, 4/*start height*/, hwndParent);
|
||||
}
|
||||
@@ -181,7 +182,7 @@ LRESULT StartMenu::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
|
||||
case WM_SETFOCUS:
|
||||
break; // don't post WM_CANCELMODE in Window::WndProc when focusing the startmenu
|
||||
|
||||
case PM_STARTENTRY_FOCUSED: {
|
||||
case PM_STARTENTRY_FOCUSED: { //TODO: use TrackMouseEvent() and WM_MOUSEHOVER to wait a bit before opening submenus
|
||||
BOOL hasSubmenu = wparam;
|
||||
HWND hctrl = (HWND)lparam;
|
||||
|
||||
@@ -423,7 +424,7 @@ void StartMenu::ActivateEntry(int id, ShellEntry* entry)
|
||||
|
||||
CreateSubmenu(id, new_folders);
|
||||
} else {
|
||||
entry->launch_entry(_hwnd); //TODO: launch in the background
|
||||
entry->launch_entry(_hwnd); //TODO: launch in the background; specify correct HWND for error message box titles
|
||||
|
||||
// close start menus after launching the selected entry
|
||||
CloseStartMenu(id);
|
||||
|
||||
@@ -132,7 +132,7 @@ struct StartMenu : public OwnerDrawParent<Dialog>
|
||||
StartMenu(HWND hwnd, const StartMenuFolders& info);
|
||||
~StartMenu();
|
||||
|
||||
static HWND Create(int x, int y, HWND hwndParent=0);
|
||||
// static HWND Create(int x, int y, HWND hwndParent=0);
|
||||
static HWND Create(int x, int y, const StartMenuFolders&, HWND hwndParent=0, CREATORFUNC creator=s_def_creator);
|
||||
static CREATORFUNC s_def_creator;
|
||||
|
||||
|
||||
@@ -220,7 +220,7 @@ void NotifyArea::Refresh()
|
||||
|
||||
void NotifyArea::Paint()
|
||||
{
|
||||
PaintCanvas canvas(_hwnd);
|
||||
BufferedPaintCanvas canvas(_hwnd);
|
||||
|
||||
// first fill with the background color
|
||||
FillRect(canvas, &canvas.rcPaint, GetSysColorBrush(COLOR_BTNFACE));
|
||||
|
||||
@@ -24,7 +24,7 @@ endif
|
||||
|
||||
VPATH += ../utility
|
||||
VPATH += ../shell
|
||||
VPATH += ../taskbar
|
||||
VPATH += plugins
|
||||
|
||||
WINE_MODE = yes
|
||||
|
||||
|
||||
@@ -288,23 +288,23 @@ SOURCE=.\winefile.rc
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\taskbar\ex_bar.c
|
||||
SOURCE=.\plugins\ex_bar.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\taskbar\ex_bar.h
|
||||
SOURCE=.\plugins\ex_bar.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\taskbar\ex_clock.c
|
||||
SOURCE=.\plugins\ex_clock.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\taskbar\ex_menu.c
|
||||
SOURCE=.\plugins\ex_menu.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\taskbar\ex_shutdwn.c
|
||||
SOURCE=.\plugins\ex_shutdwn.c
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Source File
|
||||
|
||||
Reference in New Issue
Block a user