tabs to spaces
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3992 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
ebff718526
commit
25073d7e15
1 changed files with 27 additions and 27 deletions
|
@ -64,7 +64,7 @@ void CreateToolBar()
|
||||||
tbButton[TBB_DOCS] = CreateToolBarButton(IDB_DOCS, IDM_DOCS, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
|
tbButton[TBB_DOCS] = CreateToolBarButton(IDB_DOCS, IDM_DOCS, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
|
||||||
|
|
||||||
g_toolbar.hwnd = CreateWindowEx (
|
g_toolbar.hwnd = CreateWindowEx (
|
||||||
0L,
|
0L,
|
||||||
TOOLBARCLASSNAME,
|
TOOLBARCLASSNAME,
|
||||||
"",
|
"",
|
||||||
WS_CHILD | WS_VISIBLE | TBSTYLE_TRANSPARENT | TBSTYLE_FLAT,
|
WS_CHILD | WS_VISIBLE | TBSTYLE_TRANSPARENT | TBSTYLE_FLAT,
|
||||||
|
@ -81,32 +81,32 @@ void CreateToolBar()
|
||||||
HMODULE hMod = GetModuleHandle("comctl32.dll");
|
HMODULE hMod = GetModuleHandle("comctl32.dll");
|
||||||
|
|
||||||
if (GetProcAddress(hMod, "InitCommonControlsEx")) { // Version 4.70
|
if (GetProcAddress(hMod, "InitCommonControlsEx")) { // Version 4.70
|
||||||
// Modern toolbar, 24-bit bitmaps
|
// Modern toolbar, 24-bit bitmaps
|
||||||
|
|
||||||
g_toolbar.imagelist = ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION);
|
g_toolbar.imagelist = ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION);
|
||||||
g_toolbar.imagelistd = ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24D), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION);
|
g_toolbar.imagelistd = ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24D), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION);
|
||||||
g_toolbar.imagelisth = ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24H), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION);
|
g_toolbar.imagelisth = ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24H), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION);
|
||||||
|
|
||||||
SendMessage(g_toolbar.hwnd, TB_SETIMAGELIST, 0, (LPARAM) g_toolbar.imagelist);
|
SendMessage(g_toolbar.hwnd, TB_SETIMAGELIST, 0, (LPARAM) g_toolbar.imagelist);
|
||||||
SendMessage(g_toolbar.hwnd, TB_SETDISABLEDIMAGELIST, 0, (LPARAM) g_toolbar.imagelistd);
|
SendMessage(g_toolbar.hwnd, TB_SETDISABLEDIMAGELIST, 0, (LPARAM) g_toolbar.imagelistd);
|
||||||
SendMessage(g_toolbar.hwnd, TB_SETHOTIMAGELIST, 0, (LPARAM) g_toolbar.imagelisth);
|
SendMessage(g_toolbar.hwnd, TB_SETHOTIMAGELIST, 0, (LPARAM) g_toolbar.imagelisth);
|
||||||
|
|
||||||
// Version 4.71
|
// Version 4.71
|
||||||
if (GetProcAddress(hMod, "DllGetVersion")) {
|
if (GetProcAddress(hMod, "DllGetVersion")) {
|
||||||
SendMessage(g_toolbar.hwnd, TB_SETEXTENDEDSTYLE, 0, (LPARAM) (DWORD) TBSTYLE_EX_DRAWDDARROWS);
|
SendMessage(g_toolbar.hwnd, TB_SETEXTENDEDSTYLE, 0, (LPARAM) (DWORD) TBSTYLE_EX_DRAWDDARROWS);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Old Windows 95 toolbar, 256 color bitmap with system palette
|
// Old Windows 95 toolbar, 256 color bitmap with system palette
|
||||||
|
|
||||||
TBADDBITMAP tbBitmap;
|
TBADDBITMAP tbBitmap;
|
||||||
|
|
||||||
tbBitmap.hInst = g_sdata.hInstance;
|
tbBitmap.hInst = g_sdata.hInstance;
|
||||||
tbBitmap.nID = IDB_TOOLBAR;
|
tbBitmap.nID = IDB_TOOLBAR;
|
||||||
|
|
||||||
SendMessage(g_toolbar.hwnd, TB_ADDBITMAP, IMAGECOUNT, (LONG) &tbBitmap);
|
SendMessage(g_toolbar.hwnd, TB_ADDBITMAP, IMAGECOUNT, (LONG) &tbBitmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
FreeLibrary(hMod);
|
FreeLibrary(hMod);
|
||||||
|
@ -219,10 +219,10 @@ void ShowToolbarDropdownMenu()
|
||||||
RECT rect;
|
RECT rect;
|
||||||
GetWindowRect(g_toolbar.hwnd, (LPRECT) &rect);
|
GetWindowRect(g_toolbar.hwnd, (LPRECT) &rect);
|
||||||
TrackPopupMenu(g_toolbar.dropdownmenu,
|
TrackPopupMenu(g_toolbar.dropdownmenu,
|
||||||
NULL,
|
NULL,
|
||||||
rect.left + (int)(short)g_toolbar.dropdownpoint.x,
|
rect.left + (int)(short)g_toolbar.dropdownpoint.x,
|
||||||
rect.top + (int)(short)g_toolbar.dropdownpoint.y,
|
rect.top + (int)(short)g_toolbar.dropdownpoint.y,
|
||||||
0,
|
0,
|
||||||
g_sdata.hwnd,
|
g_sdata.hwnd,
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue