diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-07-15 12:19:46 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-07-15 12:19:46 +0000 |
| commit | d153381b8458578025aa95c64f10608d110e9513 (patch) | |
| tree | 45004e4f4a87a14f1cb9e6e264bfd562d9371518 | |
| parent | f92563fa59cd21d339f98288c60b81a51109fa01 (diff) | |
compilation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@5361 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | include/m_button_int.h | 4 | ||||
| -rw-r--r-- | plugins/BASS_interface/src/Main.cpp | 6 | ||||
| -rw-r--r-- | plugins/FileAsMessage/src/dialog.cpp | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/include/m_button_int.h b/include/m_button_int.h index a118c3d33b..f40a83ced7 100644 --- a/include/m_button_int.h +++ b/include/m_button_int.h @@ -56,8 +56,4 @@ struct MButtonCtrl IAccPropServices* pAccPropServices;
};
-/////////////////////////////////////////////////////////////////
-
-typedef void (__cdecl *pfnPainterFunc)(MButtonCtrl*, HDC);
-
#endif // M_BUTTON_INT_H__
diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 56dcb80d01..4933159ad3 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -346,10 +346,8 @@ static LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR hwndMute = CreateWindow(MIRANDABUTTONCLASS, _T(""), WS_CHILD | WS_VISIBLE, 1, 1, 16, 16, hwnd,
0, (HINSTANCE)GetWindowLongPtr(hwnd, GWLP_HINSTANCE), NULL);
SendMessage(hwndMute, BUTTONSETASFLATBTN, 1, 0);
- {
- MButtonCustomize tmp = { sizeof(MButtonCtrl), 0, &fnPainter };
- SendMessage(hwndMute, BUTTONSETCUSTOM, 0, (LPARAM)&tmp);
- }
+ SendMessage(hwndMute, BUTTONSETCUSTOMPAINT, 0, (LPARAM)&fnPainter);
+
EnableFrameIcon( db_get_b(NULL, "Skin", "UseSound", 0) != 0);
hwndSlider = CreateWindow(TRACKBAR_CLASS, _T(""), WS_CHILD | WS_VISIBLE | TBS_NOTICKS | TBS_TOOLTIPS, 21, 1, 100, 20,
diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp index 412790a4b0..eb76c67fea 100644 --- a/plugins/FileAsMessage/src/dialog.cpp +++ b/plugins/FileAsMessage/src/dialog.cpp @@ -701,7 +701,7 @@ void FILEECHO::cmdDATA(char *param) {
unsigned bufLen;
mir_ptr<BYTE> buf((BYTE*)mir_base64_decode(param, &bufLen));
- memcpy(data, buf, min(bufLen, data_end - data));
+ memcpy(data, buf, min(bufLen, unsigned(data_end - data)));
data += bufLen;
}
//
|