[mapguide-commits] r6767 - trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Jun 14 08:54:46 PDT 2012


Author: jng
Date: 2012-06-14 08:54:45 -0700 (Thu, 14 Jun 2012)
New Revision: 6767

Modified:
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
Log:
More mono compatibility fixes

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs	2012-06-14 15:44:46 UTC (rev 6766)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs	2012-06-14 15:54:45 UTC (rev 6767)
@@ -717,6 +717,8 @@
 
 		private void propertyCombo_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
+            if (m_inUpdate || m_item == null)
+                return;
             if (propertyCombo.SelectedIndex == propertyCombo.Items.Count - 1)
             {
                 string current = m_item.Text;
@@ -731,8 +733,8 @@
 
 		private void fontCombo_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
-			if (m_inUpdate)
-				return;
+            if (m_inUpdate || m_item == null)
+                return;
 			m_item.FontName = (string)fontCombo.Text;
 			previewPicture.Refresh();
 
@@ -742,8 +744,8 @@
 
 		private void sizeContextCombo_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
-			if (m_inUpdate)
-				return;
+            if (m_inUpdate || m_item == null)
+                return;
 			m_item.SizeContext = (SizeContextType)Enum.Parse(typeof(SizeContextType), (string)sizeContextCombo.SelectedValue);
 			previewPicture.Refresh();
 
@@ -753,8 +755,8 @@
 
 		private void unitsCombo_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
-			if (m_inUpdate)
-				return;
+            if (m_inUpdate || m_item == null)
+                return;
 			m_item.Unit = (LengthUnitType)Enum.Parse(typeof(LengthUnitType), (string)unitsCombo.SelectedValue);
 			previewPicture.Refresh();
 
@@ -764,6 +766,8 @@
 
 		private void sizeCombo_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
+            if (m_inUpdate || m_item == null)
+                return;
             if (sizeCombo.SelectedIndex == sizeCombo.Items.Count - 1)
             {
                 string current = m_item.SizeX;
@@ -778,8 +782,8 @@
 
 		private void boldCheck_CheckedChanged(object sender, System.EventArgs e)
 		{
-			if (m_inUpdate)
-				return;
+            if (m_inUpdate || m_item == null)
+                return;
 			m_item.Bold = boldCheck.Checked ? "true" : null;
 			previewPicture.Refresh();
 
@@ -789,8 +793,8 @@
 
 		private void italicCheck_CheckedChanged(object sender, System.EventArgs e)
 		{
-			if (m_inUpdate)
-				return;
+            if (m_inUpdate || m_item == null)
+                return;
 			m_item.Italic = italicCheck.Checked ? "true" : null;
 			previewPicture.Refresh();
 
@@ -800,8 +804,8 @@
 
 		private void underlineCheck_CheckedChanged(object sender, System.EventArgs e)
 		{
-			if (m_inUpdate)
-				return;
+            if (m_inUpdate || m_item == null)
+                return;
 			m_item.Underlined = underlineCheck.Checked ? "true" : null;
 			previewPicture.Refresh();
 
@@ -811,7 +815,7 @@
 
 		private void textColor_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
-			if (m_inUpdate)
+            if (m_inUpdate || m_item == null)
 				return;
             m_item.ForegroundColor = textColor.ColorExpression;
 			previewPicture.Refresh();
@@ -822,7 +826,7 @@
 
 		private void backgroundColor_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
-			if (m_inUpdate)
+			if (m_inUpdate || m_item == null)
 				return;
             m_item.BackgroundColor = backgroundColor.ColorExpression;
 			previewPicture.Refresh();
@@ -833,7 +837,7 @@
 
 		private void backgroundTypeCombo_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
-			if (m_inUpdate)
+            if (m_inUpdate || m_item == null)
 				return;
 			m_item.BackgroundStyle = (BackgroundStyleType)Enum.Parse(typeof(BackgroundStyleType), (string)backgroundTypeCombo.SelectedValue);
 			previewPicture.Refresh();
@@ -844,7 +848,7 @@
 
 		private void horizontalCombo_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
-            if (m_inUpdate)
+            if (m_inUpdate || m_item == null)
                 return;
 
             if (horizontalCombo.SelectedIndex == horizontalCombo.Items.Count - 1)
@@ -865,6 +869,9 @@
 
 		private void verticalCombo_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
+            if (m_inUpdate || m_item == null)
+                return;
+
             if (verticalCombo.SelectedIndex == verticalCombo.Items.Count - 1)
             {
                 string current = m_item.VerticalAlignment;
@@ -883,6 +890,9 @@
 
 		private void rotationCombo_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
+            if (m_inUpdate || m_item == null)
+                return;
+
             if (rotationCombo.SelectedIndex == rotationCombo.Items.Count - 1)
             {
                 string current = m_item.Rotation;
@@ -919,7 +929,7 @@
 
 		private void propertyCombo_TextChanged(object sender, System.EventArgs e)
 		{
-            if (m_inUpdate || propertyCombo.SelectedIndex == propertyCombo.Items.Count - 1)
+            if (m_inUpdate || m_item == null || propertyCombo.SelectedIndex == propertyCombo.Items.Count - 1)
                 return;
 
             m_item.Text = propertyCombo.Text;
@@ -964,7 +974,7 @@
 
         private void sizeCombo_TextChanged(object sender, EventArgs e)
         {
-            if (m_inUpdate || sizeCombo.SelectedIndex != -1)
+            if (m_inUpdate || m_item == null || sizeCombo.SelectedIndex != -1)
                 return;
 
             //TODO: Validate
@@ -1006,7 +1016,7 @@
 
         private void horizontalCombo_TextChanged(object sender, EventArgs e)
         {
-            if (m_inUpdate || horizontalCombo.SelectedIndex != -1)
+            if (m_inUpdate || m_item == null || horizontalCombo.SelectedIndex != -1)
                 return;
 
             m_item.HorizontalAlignment = (string)horizontalCombo.Text;
@@ -1018,7 +1028,7 @@
 
         private void verticalCombo_TextChanged(object sender, EventArgs e)
         {
-            if (m_inUpdate || verticalCombo.SelectedIndex != -1)
+            if (m_inUpdate || m_item == null || verticalCombo.SelectedIndex != -1)
                 return;
 
             m_item.VerticalAlignment = (string)verticalCombo.Text;



More information about the mapguide-commits mailing list