[ZooLib-checkins] SF.net SVN: zoolib:[2646] trunk/zoolib/source/cxx/more/zoolib/netscape

[<ag...@us...>]

Revision: 2646
          http://zoolib.svn.sourceforge.net/zoolib/?rev=2646&view=rev
Author:   agreen
Date:     2011-12-14 20:52:46 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Use ZLOGPF.

Modified Paths:
--------------
    trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.cpp
    trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp

Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.cpp	2011-12-14 20:49:18 UTC (rev 2645)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.cpp	2011-12-14 20:52:46 UTC (rev 2646)
@@ -60,7 +60,7 @@
 	s	<< "what: " << ZUtil_CarbonEvents::sEventTypeAsString(iER.what)
 		<< ", message: " << iER.message
 		<< ", when: " << iER.when
-		<< ", where: (" << iER.where.h << ", " << iER.where.v
+		<< ", where: (" << iER.where.h << ", " << iER.where.v << ")"
 		<< ", modifiers: " << iER.modifiers;
 	}
 
@@ -143,7 +143,7 @@
 		#if defined(XP_MACOSX)
 		case NPPVpluginDrawingModel:
 			{
-			if (ZLOG(s, eDebug, "Host_Mac"))
+			if (ZLOGPF(s, eDebug))
 				s << "Host_SetValue, NPPVpluginDrawingModel";
 			if (reinterpret_cast<intptr_t>(value) == NPDrawingModelCoreGraphics)
 				fUseCoreGraphics = true;
@@ -214,7 +214,7 @@
 	EventRecord theER = iEvent;
 	if (theER.what != nullEvent)
 		{
-		if (ZLOG(s, eDebug + 1, "Host_Mac"))
+		if (ZLOGPF(s, eDebug+1))
 			{
 			s << "DoEvent, ";
 			spWriteEvent(s, theER);
@@ -231,7 +231,7 @@
 
 void Host_Mac::DoSetWindow(int iX, int iY, int iWidth, int iHeight)
 	{
-	if (ZLOG(s, eDebug + 1, "Host_Mac"))
+	if (ZLOGPF(s, eDebug + 1))
 		s.Writef("DoSetWindow, (%d, %d, %d, %d)", iX, iY, iX + iWidth, iY + iHeight);
 
 	#if !defined(NP_NO_QUICKDRAW)
@@ -464,7 +464,7 @@
 					ZGRectf winFrame(winFrameRect.right - winFrameRect.left,
 						winFrameRect.bottom - winFrameRect.top);
 
-					if (ZLOG(s, eDebug + 1, "Host_WindowRef"))
+					if (ZLOGPF(s, eDebug + 1))
 						{
 						s << "kEventWindowDrawContent: " << winFrame;
 						}
@@ -543,7 +543,7 @@
 						ZGRectf newFrame = sGetParam_T<Rect>(iEventRef,
 							kEventParamCurrentBounds, typeQDRectangle);
 
-						if (ZLOG(s, eDebug + 1, "Host_WindowRef"))
+						if (ZLOGPF(s, eDebug + 1))
 							s << "kEventWindowBoundsChanged"
 							<< ", newFrame: " << newFrame;
 
@@ -683,7 +683,7 @@
 
 OSStatus Host_HIViewRef::EventHandler_View(EventHandlerCallRef iCallRef, EventRef iEventRef)
 	{
-	if (ZLOG(s, eDebug + 1, "Host_HIViewRef"))
+	if (ZLOGPF(s, eDebug + 1))
 		{
 		s << ZUtil_CarbonEvents::sEventAsString
 			(::GetEventClass(iEventRef), ::GetEventKind(iEventRef));
@@ -705,12 +705,12 @@
 				{
 				case kEventControlActivate:
 					{
-					this->DoActivate(true);
+					Host_Mac::DoActivate(true);
 					break;
 					}
 				case kEventControlDeactivate:
 					{
-					this->DoActivate(false);
+					Host_Mac::DoActivate(false);
 					break;
 					}
 				case kEventControlSetFocusPart:
@@ -748,7 +748,7 @@
 					theER.modifiers = sGetParam_T<UInt32>(iEventRef,
 						kEventParamKeyModifiers, typeUInt32);
 
-					if (ZLOG(s, eDebug + 1, "Host_ViewRef"))
+					if (ZLOGPF(s, eDebug + 1))
 						{
 						spWriteEvent(s, theER);
 						}
@@ -761,7 +761,7 @@
 						::TrackMouseLocationWithOptions
 							((CGrafPtr)-1, 0, 0.02, &theER.where, &theModifiers, &theResult);
 						theER.when = ::EventTimeToTicks(::GetCurrentEventTime());
-						ZLOG(s, eDebug + 1, "Host_ViewRef");
+						ZLOGPF(s, eDebug + 1);
 						if (theResult == kMouseTrackingMouseReleased)
 							{
 							theER.what = mouseUp;
@@ -797,7 +797,7 @@
 
 					ZGRectf winFrame = theFrame;
 
-					if (ZLOG(s, eDebug + 1, "Host_HIViewRef"))
+					if (ZLOGPF(s, eDebug + 1))
 						s << "draw, winFrame: " << winFrame;
 
 					if (fUseCoreGraphics)
@@ -836,7 +836,7 @@
 					ZGRectf newFrame = sGetParam_T<Rect>(iEventRef,
 						kEventParamCurrentBounds, typeQDRectangle);
 
-					if (ZLOG(s, eDebug + 1, "Host_HIViewRef"))
+					if (ZLOGPF(s, eDebug + 1))
 						s << "kEventControlBoundsChanged"
 						<< ", newFrame1: " << newFrame;
 
@@ -848,7 +848,7 @@
 					this->pApplyInsets(newFrame);
 
 
-					if (ZLOG(s, eDebug + 1, "Host_HIViewRef"))
+					if (ZLOGPF(s, eDebug + 1))
 						s << "kEventControlBoundsChanged, newFrame2: " << newFrame;
 
 					this->DoSetWindow(newFrame);

Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp	2011-12-14 20:49:18 UTC (rev 2645)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp	2011-12-14 20:52:46 UTC (rev 2646)
@@ -1074,7 +1074,7 @@
 
 				if (countWritten < 0)
 					{
-					if (ZLOG(s, eDebug, "Host"))
+					if (ZLOGPF(s, eDebug))
 						s << "write failure";
 					keepGoing = false;
 					break;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.