diff options
Diffstat (limited to 'plugins/Popup')
| -rw-r--r-- | plugins/Popup/src/main.cpp | 1 | ||||
| -rw-r--r-- | plugins/Popup/src/popup_wnd2.cpp | 30 | ||||
| -rw-r--r-- | plugins/Popup/src/popup_wnd2.h | 2 | ||||
| -rw-r--r-- | plugins/Popup/src/services.cpp | 37 | ||||
| -rw-r--r-- | plugins/Popup/src/services.h | 3 |
5 files changed, 2 insertions, 71 deletions
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 6e959b438b..4de24b0646 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -389,7 +389,6 @@ MIRAPI int Load(void) //Service Functions
CreateServiceFunction(MS_POPUP_ADDPOPUP, PopUp_AddPopUp);
- CreateServiceFunction(MS_POPUP_ADDPOPUPEX, PopUp_AddPopUpEx);
CreateServiceFunction(MS_POPUP_ADDPOPUPW, PopUp_AddPopUpW);
CreateServiceFunction(MS_POPUP_ADDPOPUP2, PopUp_AddPopUp2);
diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index d862b88d2b..cc4a55d55b 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -749,35 +749,6 @@ void PopupWnd2::setIcon(HICON hNewIcon) }
}
-void PopupWnd2::updateData(POPUPDATA *ppd)
-{
- m_hContact = ppd->lchContact;
-
- m_clBack = ppd->colorBack;
- m_clClock = m_clTitle = m_clText = ppd->colorText;
- m_iTimeout = m_options->DisplayTime;
-
- mir_free(m_lpzText); mir_free(m_lpzTitle);
- mir_free(m_lpwzText); mir_free(m_lpwzTitle);
- if (m_textType == TT_NONE)
- m_textType = TT_ANSI;
- m_lpzTitle = mir_strdup(ppd->lpzContactName);
- m_lpzText = mir_strdup(ppd->lpzText);
- m_lpwzTitle = m_lpwzText = NULL;
- setIcon(ppd->lchIcon);
-
- m_PluginData = ppd->PluginData;
- m_PluginWindowProc = ppd->PluginWindowProc;
-
- if (m_options->DisplayTime)
- GetTimeFormatA(LOCALE_USER_DEFAULT, 0, NULL,"HH':'mm", m_time, SIZEOF(m_time));
- else m_time[0] = 0;
-
- fixDefaults();
-
- if (m_textType == TT_MTEXT) buildMText();
-}
-
void PopupWnd2::updateData(POPUPDATAEX_V2 *ppd)
{
m_hContact = ppd->lchContact;
@@ -1447,7 +1418,6 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara case CPT_TEXTW: updateText((WCHAR *)lParam); mir_free((void *)lParam); break;
case CPT_TITLE: updateTitle((char *)lParam); mir_free((void *)lParam); break;
case CPT_TITLEW: updateTitle((WCHAR *)lParam); mir_free((void *)lParam); break;
- case CPT_DATA: updateData((POPUPDATA *)lParam); mir_free((void *)lParam); break;
case CPT_DATAEX: updateData((POPUPDATAEX_V2 *)lParam); mir_free((void *)lParam); break;
case CPT_DATAW: updateData((POPUPDATAW_V2 *)lParam); mir_free((void *)lParam); break;
}
diff --git a/plugins/Popup/src/popup_wnd2.h b/plugins/Popup/src/popup_wnd2.h index 0091afe1c0..6fcd148707 100644 --- a/plugins/Popup/src/popup_wnd2.h +++ b/plugins/Popup/src/popup_wnd2.h @@ -130,7 +130,6 @@ public: void setIcon(HICON);
- void updateData(POPUPDATA *ppd);
void updateData(POPUPDATAEX_V2 *ppd);
void updateData(POPUPDATAW_V2 *ppd);
void updateData(POPUPDATA2 *ppd);
@@ -216,7 +215,6 @@ public: SendMessage(m_hwnd, UM_CALLMETHOD, (WPARAM)method_copy, (LPARAM)lParam);
}
- LRESULT m_updateData_POPUPDATA(LPARAM arg) { updateData((POPUPDATA *)arg); update(); return 0; }
LRESULT m_updateData_POPUPDATAEX_V2(LPARAM arg) { updateData((POPUPDATAEX_V2 *)arg); update(); return 0; }
LRESULT m_updateData_POPUPDATAW_V2(LPARAM arg) { updateData((POPUPDATAW_V2 *)arg); update(); return 0; }
LRESULT m_updateData_POPUPDATA2(LPARAM arg) { updateData((POPUPDATA2 *)arg); update(); return 0; }
diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp index 6e693b8ec8..74301c89bb 100644 --- a/plugins/Popup/src/services.cpp +++ b/plugins/Popup/src/services.cpp @@ -89,45 +89,10 @@ INT_PTR PopUp_AddPopUp(WPARAM wParam, LPARAM lParam) {
if (!gbPopupLoaded) return -1;
- POPUPDATA *ppd = (POPUPDATA*)wParam;
- if (!ppd) return -1;
-
- POPUPDATA2 ppd2 = {0};
- ppd2.cbSize = sizeof(ppd2);
- ppd2.flags = PU2_ANSI;
- ppd2.lchContact = ppd->lchContact;
- ppd2.lchIcon = ppd->lchIcon;
- ppd2.lpzTitle = ppd->lpzContactName;
- ppd2.lpzText = ppd->lpzText;
- ppd2.colorBack = ppd->colorBack;
- ppd2.colorText = ppd->colorText;
- ppd2.PluginWindowProc = ppd->PluginWindowProc;
- ppd2.PluginData = ppd->PluginData;
- ppd2.iSeconds = PopUpOptions.Seconds;
- return PopUp_AddPopUp2((WPARAM)&ppd2, lParam);
-/*
- PopupWnd2 *wnd = new PopupWnd2(ppd);
-
- if (lParam & APF_RETURN_HWND)
- {
- while (!wnd->bWindowCreated) Sleep(1);
- return (int)wnd->getHwnd();
- }
-
- return 1;
-*/
-}
-
-//===== PopUp/AddPopUpEx
-INT_PTR PopUp_AddPopUpEx(WPARAM wParam, LPARAM lParam)
-{
- if (!gbPopupLoaded) return -1;
-
POPUPDATAEX_V2 *ppd = (POPUPDATAEX_V2*)wParam;
if (!ppd) return -1;
- POPUPDATA2 ppd2 = {0};
- ppd2.cbSize = sizeof(ppd2);
+ POPUPDATA2 ppd2 = { sizeof(ppd2) };
ppd2.flags = PU2_ANSI;
ppd2.lchContact = ppd->lchContact;
ppd2.lchIcon = ppd->lchIcon;
diff --git a/plugins/Popup/src/services.h b/plugins/Popup/src/services.h index 16828b36b9..ab0f0ddb43 100644 --- a/plugins/Popup/src/services.h +++ b/plugins/Popup/src/services.h @@ -26,10 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern int num_classes; //for core class api support
-INT_PTR PopUp_AddPopUp(WPARAM, LPARAM);
INT_PTR PopUp_AddPopUpW(WPARAM, LPARAM);
-INT_PTR PopUp_AddPopUpEx(WPARAM, LPARAM);
+INT_PTR PopUp_AddPopUp(WPARAM, LPARAM);
INT_PTR PopUp_AddPopUp2(WPARAM, LPARAM);
INT_PTR PopUp_GetContact(WPARAM, LPARAM);
|