зеркало из https://github.com/mozilla/gecko-dev.git
MOZ_DARK build fix
This commit is contained in:
Родитель
517c85766e
Коммит
52848f2ee4
|
@ -975,10 +975,8 @@ int CFilterDialog::OnInitDialog()
|
||||||
|
|
||||||
CComboBox *combo;
|
CComboBox *combo;
|
||||||
|
|
||||||
#if defined (B3_SEARCH_API)
|
|
||||||
MSG_FolderInfo *pInbox = NULL;
|
MSG_FolderInfo *pInbox = NULL;
|
||||||
MSG_GetFoldersWithFlag (WFE_MSGGetMaster(), MSG_FOLDER_FLAG_INBOX, &pInbox, 1);
|
MSG_GetFoldersWithFlag (WFE_MSGGetMaster(), MSG_FOLDER_FLAG_INBOX, &pInbox, 1);
|
||||||
#endif
|
|
||||||
|
|
||||||
uint16 numItems;
|
uint16 numItems;
|
||||||
|
|
||||||
|
@ -990,11 +988,7 @@ int CFilterDialog::OnInitDialog()
|
||||||
if (!HeaderItems)
|
if (!HeaderItems)
|
||||||
return FALSE; //something bad happened here!!
|
return FALSE; //something bad happened here!!
|
||||||
|
|
||||||
#if defined (B3_SEARCH_API)
|
|
||||||
MSG_GetAttributesForFilterScopes (WFE_MSGGetMaster(), scopeAttrib, (void**)&m_pFolderInfoScope, 1, HeaderItems, &numItems);
|
MSG_GetAttributesForFilterScopes (WFE_MSGGetMaster(), scopeAttrib, (void**)&m_pFolderInfoScope, 1, HeaderItems, &numItems);
|
||||||
#else
|
|
||||||
MSG_GetAttributesForScope(scopeAttrib, HeaderItems, &numItems);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (i = 0; i < 5; i++) {
|
for (i = 0; i < 5; i++) {
|
||||||
combo = (CComboBox *) GetDlgItem( RuleMatrix[i][COL_ATTRIB] );
|
combo = (CComboBox *) GetDlgItem( RuleMatrix[i][COL_ATTRIB] );
|
||||||
|
@ -1201,13 +1195,9 @@ void CFilterDialog::UpdateOpList(int iRow)
|
||||||
combo = (CComboBox *) GetDlgItem( RuleMatrix[iRow][COL_OP] );
|
combo = (CComboBox *) GetDlgItem( RuleMatrix[iRow][COL_OP] );
|
||||||
combo->ResetContent();
|
combo->ResetContent();
|
||||||
|
|
||||||
MSG_ScopeAttribute scopeAttrib = GetFolderScopeAttribute();
|
MSG_ScopeAttribute scopeAttrib = GetFolderScopeAttribute();
|
||||||
|
|
||||||
#if defined (B3_SEARCH_API)
|
|
||||||
MSG_GetOperatorsForFilterScopes (WFE_MSGGetMaster(), scopeAttrib, (void**) &m_pFolderInfoScope, 1, attrib, items, &maxItems);
|
MSG_GetOperatorsForFilterScopes (WFE_MSGGetMaster(), scopeAttrib, (void**) &m_pFolderInfoScope, 1, attrib, items, &maxItems);
|
||||||
#else
|
|
||||||
MSG_GetOperatorsForAttribute(scopeAttrib, attrib, items, &maxItems);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (j = 0; j < maxItems; j++) {
|
for (j = 0; j < maxItems; j++) {
|
||||||
combo->AddString(items[j].name);
|
combo->AddString(items[j].name);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче