Exploited better syntax for class constants; delay hooking up HT_FEData until creating the HT_Pane to hook it up to; fixed formatting

cmd/macfe/gui/CRDFToolbarContainer.cp

@@ -20,46 +20,41 @@
 #include "CRDFToolbar.h"
 
 
+const ClassIDT CRDFToolbarContainer::class_ID;
+
+
 
 CRDFToolbarContainer::CRDFToolbarContainer( LStream* inStream )
-		: CDragBarContainer(inStream),
+		: CDragBarContainer(inStream)
-//			_ht_root( HT_NewToolbarPane(CreateNotificationStruct()) )
-			_ht_root( NULL )
 	{
+		/*
+			We don't want to actually create the toolbar |HT_Pane| until everything else exists,
+			i.e., after we've done everything needed in |FinishCreateSelf()|.
+		*/
+	}
+
+
+void
+CRDFToolbarContainer::FinishCreateSelf()
+	{
+		CDragBarContainer::FinishCreateSelf();
+		
+			// Everything we need to create the |HT_Pane| now exists...
+		_ht_root = auto_ptr<_HT_PaneStruct>(HT_NewToolbarPane(CreateNotificationStruct()));
 		HT_SetPaneFEData(_ht_root.get(), this);
 	}
 
 
 void
-CRDFToolbarContainer :: FinishCreateSelf ( )
+CRDFToolbarContainer::BuildToolbarsPresentAtStartup()
-{
+	{
-	CDragBarContainer::FinishCreateSelf();
+	}
-	
-	// defer creation of the toolbar pane until everything is created because
-	// we need to have the dock around when we pull in the toolbars
-	_ht_root = auto_ptr<_HT_PaneStruct>(HT_NewToolbarPane(CreateNotificationStruct()));
-	
-} // FinishCreateSelf
-
-
-//
-// BuildToolbarsPresentAtStartup
-//
-// Nothing for now.
-void
-CRDFToolbarContainer :: BuildToolbarsPresentAtStartup ( )
-{
-
-
-
-} // BuildToolbarsPresentAtStartup
 
 
 void 
-CRDFToolbarContainer :: RestorePlace(LStream *inPlace)
+CRDFToolbarContainer::RestorePlace( LStream *inPlace )
-{
+ {
-
+ }
-} // RestorePlace
 
 
 void

cmd/macfe/gui/CRDFToolbarContainer.h

@@ -41,10 +41,7 @@ class CRDFToolbarContainer
 	{
 		public:
 
-			enum
+			static const ClassIDT class_ID = 'RTCt';
-				{
-					class_ID = 'RTCt'
-				};
 
 			CRDFToolbarContainer( LStream* );
 			// virtual ~CRDFToolbarContainer(); -- already virtual from bases, |auto_ptr| member means no destructor needed
@@ -59,8 +56,8 @@ class CRDFToolbarContainer
 			virtual void HandleNotification( HT_Notification, HT_Resource, HT_Event, void*, uint32 );
 
 				// overriding the appropriate methods of |CDragBarContainer|
-			virtual void BuildToolbarsPresentAtStartup ( ) ;
+			virtual void BuildToolbarsPresentAtStartup() ;
-			virtual void RestorePlace(LStream *inPlace);
+			virtual void RestorePlace( LStream* );
 			virtual void FinishCreateSelf();
 
 		private: