From 8bbf210610804623aa581f3a547fc782fed9c118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Sun, 19 May 2013 12:36:06 +0000 Subject: "PopUp" everywhere was replaced to "Popup" git-svn-id: http://svn.miranda-ng.org/main/trunk@4730 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SendScreenshotPlus/src/Main.cpp | 4 ++-- plugins/SendScreenshotPlus/src/Utils.h | 2 +- plugins/SendScreenshotPlus/src/dlg_msgbox.cpp | 6 +++--- plugins/SendScreenshotPlus/src/global.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/SendScreenshotPlus') diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 7048794d81..0ecd0a691f 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -109,8 +109,8 @@ extern "C" int __declspec(dllexport) Load(void) int hook_ModulesLoaded(WPARAM, LPARAM) { - myGlobals.PopUpExist = ServiceExists(MS_POPUP_ADDPOPUP); - myGlobals.PopUpActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS); + myGlobals.PopupExist = ServiceExists(MS_POPUP_ADDPOPUP); + myGlobals.PopupActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS); myGlobals.PluginHTTPExist = ServiceExists(MS_HTTP_ACCEPT_CONNECTIONS); myGlobals.PluginFTPExist = ServiceExists(MS_FTPFILE_SHAREFILE); diff --git a/plugins/SendScreenshotPlus/src/Utils.h b/plugins/SendScreenshotPlus/src/Utils.h index f82c0142a2..4b539bb896 100644 --- a/plugins/SendScreenshotPlus/src/Utils.h +++ b/plugins/SendScreenshotPlus/src/Utils.h @@ -65,7 +65,7 @@ INT_PTR SaveTIF(HBITMAP hBmp, LPTSTR szFilename); //--------------------------------------------------------------------------- /* Old stuff from Borland C++ -//void ShowPopUp(char *title, char *text); +//void ShowPopup(char *title, char *text); */ #endif diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp index 7f618368c8..de6d03b297 100644 --- a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp +++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp @@ -695,7 +695,7 @@ INT_PTR CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) EndDialog(pmpd->hDialog, IDCANCEL); } } - PUDeletePopUp(hDlg); + PUDeletePopup(hDlg); } break; @@ -728,8 +728,8 @@ INT_PTR MsgBoxService(WPARAM wParam, LPARAM lParam) // Shall the MessageBox displayed as popup? if (!(pMsgBox->uType & (MB_INFOBAR|MB_NOPOPUP)) && // message box can be a popup? ServiceExists(MS_POPUP_ADDPOPUPT) && // popups exist? - myGlobals.PopUpActionsExist == 1 && // popup support ext stuct? - (db_get_dw(NULL, "PopUp","Actions", 0) & 1) && // popup++ actions on? + myGlobals.PopupActionsExist == 1 && // popup support ext stuct? + (db_get_dw(NULL, "Popup","Actions", 0) & 1) && // popup++ actions on? db_get_b(NULL, MODNAME, SET_POPUPMSGBOX, DEFVAL_POPUPMSGBOX) // user likes popups? ) { diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h index c10e8c56f5..cb1a374d0e 100644 --- a/plugins/SendScreenshotPlus/src/global.h +++ b/plugins/SendScreenshotPlus/src/global.h @@ -101,8 +101,8 @@ using namespace std; typedef struct _MGLOBAL { DWORD mirandaVersion; // mirandaVersion - BOOLEAN PopUpExist : 1; // Popup or MS_POPUP_ADDPOPUP exist - BOOLEAN PopUpActionsExist : 1; // Popup++ or MS_POPUP_REGISTERACTIONS exist + BOOLEAN PopupExist : 1; // Popup or MS_POPUP_ADDPOPUP exist + BOOLEAN PopupActionsExist : 1; // Popup++ or MS_POPUP_REGISTERACTIONS exist BOOLEAN PluginHTTPExist : 1; // HTTPServer or MS_HTTP_ACCEPT_CONNECTIONS exist BOOLEAN PluginFTPExist : 1; // FTPFile or MS_FTPFILE_SHAREFILE exist -- cgit v1.2.3