summaryrefslogtreecommitdiff
path: root/src/core/stdpopup
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2021-12-26 20:31:39 +0300
committerGeorge Hazan <ghazan@miranda.im>2021-12-26 20:31:39 +0300
commitcddcd7483a7c472598af098e759e5d309024f606 (patch)
treeb0a227d6e087c41958cc84d27bc323353248aae5 /src/core/stdpopup
parent1039b2829a264280493ba0fa979214fe024dc70c (diff)
DWORD -> uint32_t
Diffstat (limited to 'src/core/stdpopup')
-rw-r--r--src/core/stdpopup/src/options.cpp4
-rw-r--r--src/core/stdpopup/src/popwin.cpp4
-rw-r--r--src/core/stdpopup/src/services.cpp4
-rw-r--r--src/core/stdpopup/src/yapp_history.h2
-rw-r--r--src/core/stdpopup/src/yapp_history_dlg.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/core/stdpopup/src/options.cpp b/src/core/stdpopup/src/options.cpp
index adc8283b4e..40c51c372d 100644
--- a/src/core/stdpopup/src/options.cpp
+++ b/src/core/stdpopup/src/options.cpp
@@ -458,9 +458,9 @@ static INT_PTR CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam
mir_snprintf(setting, "%s/Timeout", pc->pszName);
g_plugin.setWord(setting, pc->iSeconds);
mir_snprintf(setting, "%s/TextCol", pc->pszName);
- g_plugin.setDword(setting, (DWORD)pc->colorText);
+ g_plugin.setDword(setting, (uint32_t)pc->colorText);
mir_snprintf(setting, "%s/BgCol", pc->pszName);
- g_plugin.setDword(setting, (DWORD)pc->colorBack);
+ g_plugin.setDword(setting, (uint32_t)pc->colorBack);
}
return TRUE;
}
diff --git a/src/core/stdpopup/src/popwin.cpp b/src/core/stdpopup/src/popwin.cpp
index a314f61730..a9fd8ee2d9 100644
--- a/src/core/stdpopup/src/popwin.cpp
+++ b/src/core/stdpopup/src/popwin.cpp
@@ -3,7 +3,7 @@
#define ID_CLOSETIMER 0x0101
#define ID_MOVETIMER 0x0102
-DWORD pop_start_x, pop_start_y;
+uint32_t pop_start_x, pop_start_y;
int global_mouse_in = 0;
void trimW(wchar_t *str)
@@ -222,7 +222,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
if (pwd->custom_col) {
pwd->bkBrush = CreateSolidBrush(pd->colorBack);
- DWORD darkBg = pd->colorBack - ((pd->colorBack >> 2) & 0x3f3f3f); // 3/4 of current individual RGB components
+ uint32_t darkBg = pd->colorBack - ((pd->colorBack >> 2) & 0x3f3f3f); // 3/4 of current individual RGB components
pwd->barBrush = CreateSolidBrush(darkBg); // make sidebar a dark version of the bg
pwd->underlineBrush = CreateSolidBrush(pd->colorBack); // make sidebar a dark version of the bg
}
diff --git a/src/core/stdpopup/src/services.cpp b/src/core/stdpopup/src/services.cpp
index e6a1be8e7b..b743e173df 100644
--- a/src/core/stdpopup/src/services.cpp
+++ b/src/core/stdpopup/src/services.cpp
@@ -306,9 +306,9 @@ static INT_PTR RegisterPopupClass(WPARAM, LPARAM lParam)
pc->iSeconds = g_plugin.getWord(setting, pc->iSeconds);
if (pc->iSeconds == (uint16_t)-1) pc->iSeconds = -1;
mir_snprintf(setting, "%s/TextCol", pc->pszName);
- pc->colorText = (COLORREF)g_plugin.getDword(setting, (DWORD)pc->colorText);
+ pc->colorText = (COLORREF)g_plugin.getDword(setting, (uint32_t)pc->colorText);
mir_snprintf(setting, "%s/BgCol", pc->pszName);
- pc->colorBack = (COLORREF)g_plugin.getDword(setting, (DWORD)pc->colorBack);
+ pc->colorBack = (COLORREF)g_plugin.getDword(setting, (uint32_t)pc->colorBack);
arClasses.insert(pc);
return (INT_PTR)pc;
diff --git a/src/core/stdpopup/src/yapp_history.h b/src/core/stdpopup/src/yapp_history.h
index 89c7957166..f824862bf7 100644
--- a/src/core/stdpopup/src/yapp_history.h
+++ b/src/core/stdpopup/src/yapp_history.h
@@ -36,7 +36,7 @@
struct PopupHistoryData
{
- DWORD flags; //PHDF_* flags
+ uint32_t flags; //PHDF_* flags
wchar_t *messageW;
wchar_t *titleW;
time_t timestamp;
diff --git a/src/core/stdpopup/src/yapp_history_dlg.cpp b/src/core/stdpopup/src/yapp_history_dlg.cpp
index 0e51efb3af..ff8fd4122b 100644
--- a/src/core/stdpopup/src/yapp_history_dlg.cpp
+++ b/src/core/stdpopup/src/yapp_history_dlg.cpp
@@ -306,7 +306,7 @@ IEVIEWEVENTDATA *CreateAndFillEventData(PopupHistoryData *popupItem)
eventData->szNick.w = popupItem->titleW;
eventData->szText.w = popupItem->messageW;
- eventData->time = (DWORD)popupItem->timestamp;
+ eventData->time = (uint32_t)popupItem->timestamp;
eventData->next = nullptr;
}