diff options
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/cluiservices.cpp | 12 | ||||
| -rw-r--r-- | src/mir_app/src/extraicons.cpp | 11 |
2 files changed, 2 insertions, 21 deletions
diff --git a/src/mir_app/src/cluiservices.cpp b/src/mir_app/src/cluiservices.cpp index 2dfe87b2be..416dbdfb13 100644 --- a/src/mir_app/src/cluiservices.cpp +++ b/src/mir_app/src/cluiservices.cpp @@ -85,23 +85,11 @@ static INT_PTR ListEndRebuild(WPARAM, LPARAM) return 0;
}
-static INT_PTR GetCaps(WPARAM wParam, LPARAM)
-{
- switch (wParam) {
- case CLUICAPS_FLAGS1:
- return CLUIF_HIDEEMPTYGROUPS | CLUIF_DISABLEGROUPS | CLUIF_HASONTOPOPTION | CLUIF_HASAUTOHIDEOPTION;
- case CLUICAPS_FLAGS2:
- return MAKELONG(EXTRA_ICON_COUNT,1);
- }
- return 0;
-}
-
void LoadCluiServices(void)
{
CreateServiceFunction(MS_CLUI_GROUPADDED, GroupAdded);
CreateServiceFunction(MS_CLUI_LISTBEGINREBUILD, ListBeginRebuild);
CreateServiceFunction(MS_CLUI_LISTENDREBUILD, ListEndRebuild);
- CreateServiceFunction(MS_CLUI_GETCAPS, GetCaps);
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/mir_app/src/extraicons.cpp b/src/mir_app/src/extraicons.cpp index d033358426..f6ef9ac916 100644 --- a/src/mir_app/src/extraicons.cpp +++ b/src/mir_app/src/extraicons.cpp @@ -46,9 +46,6 @@ LIST<BaseExtraIcon> registeredExtraIcons(10); BOOL clistRebuildAlreadyCalled = FALSE;
BOOL clistApplyAlreadyCalled = FALSE;
-int clistFirstSlot = 0;
-int clistSlotCount = 0;
-
// Functions ////////////////////////////////////////////////////////////////////////////
int InitOptionsCallback(WPARAM wParam, LPARAM lParam);
@@ -62,7 +59,7 @@ int ModulesLoaded(WPARAM, LPARAM) int GetNumberOfSlots()
{
- return clistSlotCount;
+ return EXTRA_ICON_COUNT;
}
int ConvertToClistSlot(int slot)
@@ -70,7 +67,7 @@ int ConvertToClistSlot(int slot) if (slot < 0)
return slot;
- return clistFirstSlot + slot;
+ return slot+1;
}
int ExtraImage_ExtraIDToColumnNum(int extra)
@@ -508,10 +505,6 @@ static IconItem iconList[] = void LoadExtraIconsModule()
{
- DWORD ret = CallService(MS_CLUI_GETCAPS, CLUICAPS_FLAGS2, 0);
- clistFirstSlot = HIWORD(ret);
- clistSlotCount = LOWORD(ret);
-
// Services
CreateServiceFunction(MS_CLIST_EXTRA_ADD_ICON, svcExtraIcon_Add);
|