Port to new AM classes of security button.

cmd/macfe/gui/CBrowserSecurityButton.cp

@@ -19,7 +19,7 @@
 #include "CBrowserSecurityButton.h"
 
 CBrowserSecurityButton::CBrowserSecurityButton(LStream* inStream)
-:	CPatternButton(inStream)
+:	CToolbarBevelButton(inStream)
 {
 }
 
@@ -34,10 +34,13 @@ ResIDT CBrowserSecurityButton::GetIconID(ESecurityState inSecurityState)
 void CBrowserSecurityButton::NoteSecurityState(ESecurityState inSecurityState)
 {
 	ResIDT wantedIconID = GetIconID(inSecurityState);
+	ControlButtonContentInfo currInfo;
+	GetContentInfo ( currInfo );
 
-	if (wantedIconID != GetGraphicID())
+	if (wantedIconID != currInfo.u.resID)
 	{
-		SetGraphicID(wantedIconID);
-		Draw(NULL);
+		// set the new icon
+		currInfo.u.resID = wantedIconID;
+		SetContentInfo ( currInfo );
 	}
 }

cmd/macfe/gui/CBrowserSecurityButton.h

@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include "CPatternButton.h"
+#include "CToolbarBevelButton.h"
 #include "CSecurityStateListener.h"
 
-class CBrowserSecurityButton : public CPatternButton, public CSecurityStateListener
+class CBrowserSecurityButton : public CToolbarBevelButton, public CSecurityStateListener
 {
 	public:
 		enum {	class_ID = 'BrSB'	};

cmd/macfe/gui/CMiniSecurityButton.cp

@@ -30,30 +30,4 @@ ResIDT CMiniSecurityButton::GetIconID(ESecurityState inSecurityState)
 	if (inSecurityState == eSecureState)
 		result = ResID_SecureIcon;
 	return result;
-}
-
-
-// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
-//	¥	DrawButtonContent
-// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
-	
-void CMiniSecurityButton::DrawButtonContent(void)
-{
-	CGrafPtr thePort;
-	::GetPort(&(GrafPtr)thePort);
-	
-	Rect theFrame = mCachedButtonFrame;
-	Point theAlignment;
-	
-	CalcOrientationPoint(theAlignment);
-	mPatternWorld->Fill(thePort, theFrame, theAlignment);
-}
-
-// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
-//	¥	DrawButtonGraphic
-// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
-
-void CMiniSecurityButton::DrawButtonGraphic(void)
-{
-	CToolbarButton::DrawButtonGraphic();
-}
+}

cmd/macfe/gui/CMiniSecurityButton.h

@@ -36,6 +36,4 @@ class CMiniSecurityButton : public CBrowserSecurityButton
 
 	protected:
 
-		virtual void		DrawButtonContent(void);
-		virtual	void		DrawButtonGraphic(void);
 };