NewAwaySys, NewEventNotify, NewXstatusNotify, NoHistory, NotesReminders, NotifyAnything, Nudge => CMPlugin

1 files changed, 10 insertions, 7 deletions

diff --git a/plugins/NotesAndReminders/src/globals.h b/plugins/NotesAndReminders/src/globals.h
index c67ece2043..90c0003964 100644
--- a/plugins/NotesAndReminders/src/globals.h
+++ b/plugins/NotesAndReminders/src/globals.h
@@ -7,7 +7,6 @@
 #include <time.h>

 #include <richedit.h>

 

-#define __NO_CMPLUGIN_NEEDED

 #include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

@@ -29,6 +28,13 @@
 #define MODULENAME	"StickyNotes"

 #define SECTIONNAME	LPGEN("Notes & Reminders")

 

+struct CMPlugin : public PLUGIN<CMPlugin>

+{

+	CMPlugin() :

+		PLUGIN<CMPlugin>(MODULENAME)

+	{}

+};

+

 // normal timer interval for reminder update processing

 #define REMINDER_UPDATE_INTERVAL		10000

 // short timer interval for reminder updates used as long as there are pending alarams in the event queue

@@ -40,7 +46,6 @@
 #define NR_FONTID_BODY			1

 #define NR_FONTID_MAX			NR_FONTID_BODY

 

-

 typedef struct {

 	HFONT hFont;

     char  size;

@@ -77,8 +82,8 @@ typedef struct {
 extern void CreateMsgWindow(void);

 extern void DestroyMsgWindow(void);

 

-extern STICKYNOTE* NewNote(int Ax,int Ay,int Aw,int Ah,char *Data,

-						   ULARGE_INTEGER *ID,BOOL Visible,BOOL bOnTop,int scrollV);

+extern STICKYNOTE* NewNote(int Ax,int Ay,int Aw,int Ah,char *Data, ULARGE_INTEGER *ID,BOOL Visible,BOOL bOnTop,int scrollV);

+

 extern void LoadNotes(BOOL bIsStartup);

 extern void SaveNotes(void);

 extern void DeleteNotes(void);

@@ -94,8 +99,7 @@ extern BOOL CheckRemindersAndStart(void);
 

 extern void InitSettings(void);

 extern void TermSettings(void);

-extern INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,

-								   WPARAM wParam,LPARAM lParam);

+extern INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message, WPARAM wParam,LPARAM lParam);

 extern void LoadNRFont(int i, LOGFONT *lf, COLORREF *colour);

 

 extern BOOL WS_Init();

@@ -104,7 +108,6 @@ extern void WS_CleanUp();
 extern LPCSTR GetDateFormatStr();

 extern LPCSTR GetTimeFormatStr();

 

-extern HINSTANCE hinstance;

 extern HINSTANCE hmiranda;

 

 extern BOOL g_CloseAfterAddReminder, g_UseDefaultPlaySound;