Merge remote-tracking branch 'origin/master'

Louis'-Pharmacy_CNSA212-FP/frmRefill.Designer.cs

@@ -29,7 +29,6 @@ namespace Louis__Pharmacy_CNSA212_FP
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmRefill));
             this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
@@ -44,17 +43,12 @@ namespace Louis__Pharmacy_CNSA212_FP
             this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.rEFILLSBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton();
-            this.cmuRefill = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.cmuAdd = new System.Windows.Forms.ToolStripMenuItem();
-            this.cmuUpdate = new System.Windows.Forms.ToolStripMenuItem();
-            this.cmuDelete = new System.Windows.Forms.ToolStripMenuItem();
             this.dgvRefills = new System.Windows.Forms.DataGridView();
             this.refillid = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.refilldate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.patientid = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.medicationid = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.rxnumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cmuRefill.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvRefills)).BeginInit();
             this.SuspendLayout();
             // 
@@ -119,36 +113,6 @@ namespace Louis__Pharmacy_CNSA212_FP
             this.rEFILLSBindingNavigatorSaveItem.Name = "rEFILLSBindingNavigatorSaveItem";
             this.rEFILLSBindingNavigatorSaveItem.Size = new System.Drawing.Size(23, 23);
             // 
-            // cmuRefill
-            // 
-            this.cmuRefill.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.cmuAdd,
-            this.cmuUpdate,
-            this.cmuDelete});
-            this.cmuRefill.Name = "contextMenuStrip1";
-            this.cmuRefill.Size = new System.Drawing.Size(113, 70);
-            // 
-            // cmuAdd
-            // 
-            this.cmuAdd.Name = "cmuAdd";
-            this.cmuAdd.Size = new System.Drawing.Size(112, 22);
-            this.cmuAdd.Text = "Add";
-            //this.cmuAdd.Click += new System.EventHandler(this.cmuAdd_Click);
-            // 
-            // cmuUpdate
-            // 
-            this.cmuUpdate.Name = "cmuUpdate";
-            this.cmuUpdate.Size = new System.Drawing.Size(112, 22);
-            this.cmuUpdate.Text = "Update";
-            //this.cmuUpdate.Click += new System.EventHandler(this.cmuUpdate_Click);
-            // 
-            // cmuDelete
-            // 
-            this.cmuDelete.Name = "cmuDelete";
-            this.cmuDelete.Size = new System.Drawing.Size(112, 22);
-            this.cmuDelete.Text = "Delete";
-            //this.cmuDelete.Click += new System.EventHandler(this.cmuDelete_Click);
-            // 
             // dgvRefills
             // 
             this.dgvRefills.AllowUserToAddRows = false;
@@ -160,7 +124,6 @@ namespace Louis__Pharmacy_CNSA212_FP
             this.patientid,
             this.medicationid,
             this.rxnumber});
-            this.dgvRefills.ContextMenuStrip = this.cmuRefill;
             this.dgvRefills.Location = new System.Drawing.Point(12, 12);
             this.dgvRefills.Name = "dgvRefills";
             this.dgvRefills.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
@@ -210,8 +173,6 @@ namespace Louis__Pharmacy_CNSA212_FP
             this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "frmRefill";
             this.Text = "Louis\' Pharmacy - Prescription Refill";
-            //this.Load += new System.EventHandler(this.frmRefill_Load);
-            this.cmuRefill.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvRefills)).EndInit();
             this.ResumeLayout(false);
 
@@ -245,10 +206,6 @@ namespace Louis__Pharmacy_CNSA212_FP
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15;
-        private System.Windows.Forms.ContextMenuStrip cmuRefill;
-        private System.Windows.Forms.ToolStripMenuItem cmuAdd;
-        private System.Windows.Forms.ToolStripMenuItem cmuUpdate;
-        private System.Windows.Forms.ToolStripMenuItem cmuDelete;
         private System.Windows.Forms.DataGridView dgvRefills;
         private System.Windows.Forms.DataGridViewTextBoxColumn refillid;
         private System.Windows.Forms.DataGridViewTextBoxColumn refilldate;

Louis'-Pharmacy_CNSA212-FP/frmRefill.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="cmuRefill.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="refillid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>