Maintenance SVN /SourceSafe

1 files changed, 8 insertions, 7 deletions

diff --git a/IvyCursor/IvyCursor.cpp b/IvyCursor/IvyCursor.cpp
index 8b5e48e..558d074 100644
--- a/IvyCursor/IvyCursor.cpp
+++ b/IvyCursor/IvyCursor.cpp
@@ -2,10 +2,11 @@
 //

 

 #include "stdafx.h"

+#include "Ivy.h"

 #include <winuser.h>

 #include <crtdbg.h>

 #include <shellapi.h>

-#include "Ivy.h"

+

 #include "IvyCursor.h"

 #define MAX_LOADSTRING 100

 

@@ -18,7 +19,7 @@ HMENU hMenu;									// handle menu icontray
 HMENU hmenuTrackPopup;

 

 // Ivy 

-Ivy* ivy;

+Ivy* bus;

 

 // Pré-déclarations des fonctions incluses dans ce module de code :

 ATOM				MyRegisterClass(HINSTANCE hInstance);

@@ -102,10 +103,10 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 		return FALSE;

 	}

 	// Initoiailize ivy

-	ivy = new Ivy("IvyCursor", "IvyCursor Ready", 0, FALSE );

-	ivy->BindMsg(BUS_CALLBACK(ivyCursorMouve,0),"Cigale SetCursorPosition x=([0-9.]+) y=([0-9.]+)");

-	ivy->BindMsg(BUS_CALLBACK(ivyCursorClick,0),"Cigale CursorSelectEvent x=([0-9.]+) y=([0-9.]+)");

-	ivy->start( 0 );

+	bus = new Ivy("IvyCursor", "IvyCursor Ready", 0, FALSE );

+	bus->BindMsg(BUS_CALLBACK(ivyCursorMouve,0),"^Cigale SetCursorPosition x=([0-9.]+) y=([0-9.]+)");

+	bus->BindMsg(BUS_CALLBACK(ivyCursorClick,0),"^Cigale CursorSelectEvent x=([0-9.]+) y=([0-9.]+)");

+	bus->start( 0 );

 

 	// Boucle de messages principale :

 	while (GetMessage(&msg, NULL, 0, 0)) 

@@ -235,7 +236,7 @@ void Quitting( HWND hWnd )
 	RemoveTrayIcon(hWnd);

 	DestroyMenu(hMenu);

 	DestroyWindow(hWnd);

-	ivy->stop();

+	bus->stop();

 }

 //

 //  FONCTION : WndProc(HWND, unsigned, WORD, LONG)