Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs
===================================================================
--- Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs	(revision 1011)
+++ Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs	(revision 1027)
@@ -655,8 +655,8 @@
             this.tvSchedules.Sorted = true;
             this.tvSchedules.TabIndex = 1;
+            this.tvSchedules.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.tvSchedules_BeforeSelect);
+            this.tvSchedules.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvSchedules_AfterSelect);
+            this.tvSchedules.Click += new System.EventHandler(this.tvSchedules_Click);
             this.tvSchedules.DoubleClick += new System.EventHandler(this.tvSchedules_DoubleClick);
-            this.tvSchedules.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvSchedules_AfterSelect);
-            this.tvSchedules.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.tvSchedules_BeforeSelect);
-            this.tvSchedules.Click += new System.EventHandler(this.tvSchedules_Click);
             // 
             // contextMenu1
@@ -722,11 +722,11 @@
             this.lstClip.Location = new System.Drawing.Point(0, 32);
             this.lstClip.Name = "lstClip";
-            this.lstClip.Size = new System.Drawing.Size(128, 407);
+            this.lstClip.Size = new System.Drawing.Size(128, 416);
             this.lstClip.TabIndex = 0;
             this.lstClip.SelectedIndexChanged += new System.EventHandler(this.lstClip_SelectedIndexChanged);
             this.lstClip.DragDrop += new System.Windows.Forms.DragEventHandler(this.lstClip_DragDrop);
+            this.lstClip.DragEnter += new System.Windows.Forms.DragEventHandler(this.lstClip_DragEnter);
+            this.lstClip.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lstClip_MouseDown);
             this.lstClip.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lstClip_MouseMove);
-            this.lstClip.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lstClip_MouseDown);
-            this.lstClip.DragEnter += new System.Windows.Forms.DragEventHandler(this.lstClip_DragEnter);
             // 
             // ctxApptClipMenu
@@ -822,8 +822,8 @@
             this.calendarGrid1.TabIndex = 0;
             this.calendarGrid1.TimeScale = 20;
+            this.calendarGrid1.CGAppointmentAdded += new IndianHealthService.ClinicalScheduling.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentAdded);
+            this.calendarGrid1.CGAppointmentChanged += new IndianHealthService.ClinicalScheduling.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentChanged);
+            this.calendarGrid1.CGSelectionChanged += new IndianHealthService.ClinicalScheduling.CGSelectionChangedHandler(this.calendarGrid1_CGSelectionChanged);
             this.calendarGrid1.DoubleClick += new System.EventHandler(this.calendarGrid1_DoubleClick);
-            this.calendarGrid1.CGSelectionChanged += new IndianHealthService.ClinicalScheduling.CGSelectionChangedHandler(this.calendarGrid1_CGSelectionChanged);
-            this.calendarGrid1.CGAppointmentChanged += new IndianHealthService.ClinicalScheduling.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentChanged);
-            this.calendarGrid1.CGAppointmentAdded += new IndianHealthService.ClinicalScheduling.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentAdded);
             // 
             // ctxCalendarGrid
@@ -962,8 +962,8 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "CGView";
-            this.CursorChanged += new System.EventHandler(this.CGView_CursorChanged);
-            this.Load += new System.EventHandler(this.CGView_Load);
             this.Activated += new System.EventHandler(this.CGView_Activated);
             this.Closing += new System.ComponentModel.CancelEventHandler(this.CGView_Closing);
+            this.Load += new System.EventHandler(this.CGView_Load);
+            this.CursorChanged += new System.EventHandler(this.CGView_CursorChanged);
             this.panelRight.ResumeLayout(false);
             this.panelClip.ResumeLayout(false);
Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/CalendarGrid.cs
===================================================================
--- Scheduling/trunk/cs/bsdx0200GUISourceCode/CalendarGrid.cs	(revision 1011)
+++ Scheduling/trunk/cs/bsdx0200GUISourceCode/CalendarGrid.cs	(revision 1027)
@@ -13,5 +13,5 @@
     /// This class is reponsible for rendering the Calendar Grid.
     /// </summary>
-    public class CalendarGrid : Panel
+    public class CalendarGrid : ScrollableControl
     {
         private IContainer components;