Fixing MWLite demo project

mathijs-dumon · mathijs-dumon · commit 80281ea95e66 · 2019-10-15T13:43:30.000+02:00
diff --git a/demo/MWLite.Symbology/Controls/ImageCombo.cs b/demo/MWLite.Symbology/Controls/ImageCombo.cs
@@ -449,7 +449,7 @@ public void RefreshImageList()
                         }
                         
                         IntPtr ptr = g.GetHdc();
-                        sdo.DrawPoint(ptr, 0.0f, 0.0f, _imgWidth, _imgHeight, Colors.ColorToUInteger(this.BackColor));
+                        sdo.DrawPoint(ptr.ToInt32(), 0.0f, 0.0f, _imgWidth, _imgHeight, Colors.ColorToUInteger(this.BackColor));
                         g.ReleaseHdc(ptr);
                         break;
                     }
diff --git a/demo/MWLite.Symbology/Controls/ListControls/LinePatternControl.cs b/demo/MWLite.Symbology/Controls/ListControls/LinePatternControl.cs
@@ -244,7 +244,7 @@ void Control_OnDrawItem(Graphics graphics, RectangleF rect, int itemIndex, bool
         {
             IntPtr ptr = graphics.GetHdc();
             MapWinGIS.LinePattern pattern = _patterns[itemIndex];
-            pattern.Draw(ptr, rect.X + 1.0f, rect.Y + 1.0f, (int)rect.Width - 2, (int)rect.Height - 2, Colors.ColorToUInteger(this.BackColor));
+            pattern.Draw(ptr.ToInt32(), rect.X + 1.0f, rect.Y + 1.0f, (int)rect.Width - 2, (int)rect.Height - 2, Colors.ColorToUInteger(this.BackColor));
             graphics.ReleaseHdc();
         }
         #endregion
diff --git a/demo/MWLite.Symbology/Controls/ListControls/SymbolControl.cs b/demo/MWLite.Symbology/Controls/ListControls/SymbolControl.cs
@@ -75,7 +75,7 @@ void PointSymbolControl_OnDrawItem(System.Drawing.Graphics graphics, System.Draw
         {
             IntPtr ptr = graphics.GetHdc();
             MapWinGIS.ShapeDrawingOptions sdo = _icons[itemIndex];
-            sdo.DrawPoint(ptr, rect.X + 1.0f, rect.Y +1.0f, (int)rect.Width -2, (int)rect.Height -2, Colors.ColorToUInteger(this.BackColor));
+            sdo.DrawPoint(ptr.ToInt32(), rect.X + 1.0f, rect.Y +1.0f, (int)rect.Width -2, (int)rect.Height -2, Colors.ColorToUInteger(this.BackColor));
             graphics.ReleaseHdc();
        }
     }
diff --git a/demo/MWLite.Symbology/Forms/Categories/CategoriesForm.cs b/demo/MWLite.Symbology/Forms/Categories/CategoriesForm.cs
@@ -736,15 +736,15 @@ private void dgvCategories_CellFormatting(object sender, DataGridViewCellFormatt
 
                         if (type == ShpfileType.SHP_POLYGON)
                         {
-                            sdo.DrawRectangle(g.GetHdc(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
+                            sdo.DrawRectangle(g.GetHdc().ToInt32(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
                         }
                         else if (type == ShpfileType.SHP_POLYLINE)
                         {
-                            sdo.DrawLine(g.GetHdc(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
+                            sdo.DrawLine(g.GetHdc().ToInt32(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
                         }
                         else if (type == ShpfileType.SHP_POINT)
                         {
-                            sdo.DrawPoint(g.GetHdc(), 0.0f, 0.0f, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
+                            sdo.DrawPoint(g.GetHdc().ToInt32(), 0.0f, 0.0f, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
                         }
                         g.ReleaseHdc();
                         g.Dispose();
diff --git a/demo/MWLite.Symbology/Forms/Charts/ChartStyleForm.cs b/demo/MWLite.Symbology/Forms/Charts/ChartStyleForm.cs
@@ -378,9 +378,9 @@ private void Draw()
             if (_charts.Visible)
             {
                 if (_charts.ChartType == MapWinGIS.tkChartType.chtPieChart)
-                    _charts.DrawChart(hdc, (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2,  false, backColor);
+                    _charts.DrawChart(hdc.ToInt32(), (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2,  false, backColor);
                 else
-                    _charts.DrawChart(hdc, (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2, false, backColor);
+                    _charts.DrawChart(hdc.ToInt32(), (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2, false, backColor);
             }
             g.ReleaseHdc();
             pictureBox1.Image = bmp;
diff --git a/demo/MWLite.Symbology/Forms/Symbology/LinesForm.cs b/demo/MWLite.Symbology/Forms/Symbology/LinesForm.cs
@@ -312,7 +312,7 @@ private void DrawPreview()
             IntPtr ptr = g.GetHdc();
 
             uint backColor = Colors.ColorToUInteger(this.BackColor);
-            _options.LinePattern.Draw(ptr, 20, 0, rect.Width - 40, rect.Height, backColor);
+            _options.LinePattern.Draw(ptr.ToInt32(), 20, 0, rect.Width - 40, rect.Height, backColor);
 
             g.ReleaseHdc();
             
@@ -371,7 +371,7 @@ private void dgv_CellFormatting(object sender, DataGridViewCellFormattingEventAr
                             
                             IntPtr ptr = g.GetHdc();
                             uint backColor = Colors.ColorToUInteger(this.BackColor);
-                            line.Draw(ptr, 0, 0, img.Width, img.Height, backColor);
+                            line.Draw(ptr.ToInt32(), 0, 0, img.Width, img.Height, backColor);
                             g.ReleaseHdc();
                             g.Dispose();
 
diff --git a/demo/MWLite.Symbology/Forms/Symbology/PointsForm.cs b/demo/MWLite.Symbology/Forms/Symbology/PointsForm.cs
@@ -488,7 +488,7 @@ private void DrawPreview()
             IntPtr ptr = g.GetHdc();
 
             // creating shape to draw
-            _options.DrawPoint(ptr, 0.0f, 0.0f, rect.Width, rect.Height, Colors.ColorToUInteger(this.BackColor));
+            _options.DrawPoint(ptr.ToInt32(), 0.0f, 0.0f, rect.Width, rect.Height, Colors.ColorToUInteger(this.BackColor));
 
             g.ReleaseHdc();
             pctPreview.Image = bmp;
diff --git a/demo/MWLite.Symbology/Forms/Symbology/PolygonsForm.cs b/demo/MWLite.Symbology/Forms/Symbology/PolygonsForm.cs
@@ -388,7 +388,7 @@ private void DrawPreview()
             IntPtr ptr = g.GetHdc();
 
             // creating shape to draw
-            _options.DrawRectangle(ptr, 40.0f, 40.0f, rect.Width - 80, rect.Height - 80, true, rect.Width, rect.Height, Colors.ColorToUInteger(this.BackColor));
+            _options.DrawRectangle(ptr.ToInt32(), 40.0f, 40.0f, rect.Width - 80, rect.Height - 80, true, rect.Width, rect.Height, Colors.ColorToUInteger(this.BackColor));
 
             g.ReleaseHdc();
             pctPreview.Image = bmp;
diff --git a/demo/MWLite.Symbology/Forms/frmSymbologyAppearance.Designer.cs b/demo/MWLite.Symbology/Forms/frmSymbologyAppearance.Designer.cs
diff --git a/demo/MWLite.Symbology/Forms/frmSymbologyCategories.Designer.cs b/demo/MWLite.Symbology/Forms/frmSymbologyCategories.Designer.cs
diff --git a/demo/MWLite.Symbology/Forms/frmSymbologyCharts.Designer.cs b/demo/MWLite.Symbology/Forms/frmSymbologyCharts.Designer.cs
diff --git a/demo/MWLite.Symbology/LegendControl/Legend.cs b/demo/MWLite.Symbology/LegendControl/Legend.cs
@@ -2126,11 +2126,11 @@ protected internal void DrawLayer(Graphics DrawTool, Layer lyr, Rectangle bounds
                         var sf = m_Map.GetObject[lyr.Handle] as Shapefile;
 
                         if (lyr.Type == eLayerType.PointShapefile)
-                            sf.DefaultDrawingOptions.DrawPoint(hdc, left, top, Constants.ICON_SIZE, Constants.ICON_SIZE, backColor);
+                            sf.DefaultDrawingOptions.DrawPoint(hdc.ToInt32(), left, top, Constants.ICON_SIZE, Constants.ICON_SIZE, backColor);
                         else if (lyr.Type == eLayerType.LineShapefile)
-                            sf.DefaultDrawingOptions.DrawLine(hdc, left, top, Constants.ICON_SIZE - 1, Constants.ICON_SIZE - 1, false, Constants.ICON_SIZE, Constants.ICON_SIZE, backColor);
+                            sf.DefaultDrawingOptions.DrawLine(hdc.ToInt32(), left, top, Constants.ICON_SIZE - 1, Constants.ICON_SIZE - 1, false, Constants.ICON_SIZE, Constants.ICON_SIZE, backColor);
                         else if (lyr.Type == eLayerType.PolygonShapefile)
-                            sf.DefaultDrawingOptions.DrawRectangle(hdc, left, top, Constants.ICON_SIZE - 1, Constants.ICON_SIZE - 1, false, Constants.ICON_SIZE, Constants.ICON_SIZE, backColor);
+                            sf.DefaultDrawingOptions.DrawRectangle(hdc.ToInt32(), left, top, Constants.ICON_SIZE - 1, Constants.ICON_SIZE - 1, false, Constants.ICON_SIZE, Constants.ICON_SIZE, backColor);
 
                         DrawTool.ReleaseHdc(hdc);
                     }
@@ -2362,7 +2362,7 @@ private void DrawShapefileCategories(Graphics DrawTool, Layer layer, Rectangle b
                 uint backColor = Convert.ToUInt32(ColorTranslator.ToOle(this.BackColor));
 
                 left = bounds.Left + Constants.TEXT_LEFT_PAD;
-                sf.Charts.DrawChart(hdc, left, top, true, backColor);
+                sf.Charts.DrawChart(hdc.ToInt32(), left, top, true, backColor);
                 top += sf.Charts.IconHeight + 2;
                 DrawTool.ReleaseHdc(hdc);
 
@@ -2421,11 +2421,11 @@ private void DrawShapefileCategory(Graphics DrawTool, MapWinGIS.ShapeDrawingOpti
             }
 
             if (layer.Type == eLayerType.PointShapefile)
-                options.DrawPoint(hdc, left, top, categoryWidth + 1, categoryHeight + 1, backColor);
+                options.DrawPoint(hdc.ToInt32(), left, top, categoryWidth + 1, categoryHeight + 1, backColor);
             else if (layer.Type == eLayerType.LineShapefile)
-                options.DrawLine(hdc, left, top, categoryWidth - 1, Constants.ICON_HEIGHT - 1, false, categoryWidth, categoryHeight, backColor);
+                options.DrawLine(hdc.ToInt32(), left, top, categoryWidth - 1, Constants.ICON_HEIGHT - 1, false, categoryWidth, categoryHeight, backColor);
             else if (layer.Type == eLayerType.PolygonShapefile)
-                options.DrawRectangle(hdc, left, top, categoryWidth - 1, Constants.ICON_HEIGHT - 1, false, categoryWidth, categoryHeight, backColor);
+                options.DrawRectangle(hdc.ToInt32(), left, top, categoryWidth - 1, Constants.ICON_HEIGHT - 1, false, categoryWidth, categoryHeight, backColor);
 
             DrawTool.ReleaseHdc(hdc);
 
@@ -2457,11 +2457,11 @@ private void DrawShapefileCategorySymbology(Graphics DrawTool, MapWinGIS.ShapeDr
             }
 
             if (layer.Type == eLayerType.PointShapefile)
-                options.DrawPoint(hdc, left, top, categoryWidth + 1, categoryHeight + 1, backColor);
+                options.DrawPoint(hdc.ToInt32(), left, top, categoryWidth + 1, categoryHeight + 1, backColor);
             else if (layer.Type == eLayerType.LineShapefile)
-                options.DrawLine(hdc, left, top, categoryWidth - 1, Constants.ICON_HEIGHT - 1, false, categoryWidth, categoryHeight, backColor);
+                options.DrawLine(hdc.ToInt32(), left, top, categoryWidth - 1, Constants.ICON_HEIGHT - 1, false, categoryWidth, categoryHeight, backColor);
             else if (layer.Type == eLayerType.PolygonShapefile)
-                options.DrawRectangle(hdc, left, top, categoryWidth - 1, Constants.ICON_HEIGHT - 1, false, categoryWidth, categoryHeight, backColor);
+                options.DrawRectangle(hdc.ToInt32(), left, top, categoryWidth - 1, Constants.ICON_HEIGHT - 1, false, categoryWidth, categoryHeight, backColor);
 
             if (categoryHeight > Constants.CS_ITEM_HEIGHT)
                 top += (categoryHeight - Constants.CS_ITEM_HEIGHT) / 2;
@@ -2527,11 +2527,11 @@ private void DrawLayerSymbolNew(Graphics DrawTool, Layer layer, int TopPos, int
                         uint backColor = Convert.ToUInt32(ColorTranslator.ToOle(this.BackColor));
 
                         if (layer.Type == eLayerType.PointShapefile)
-                            sf.DefaultDrawingOptions.DrawPoint(hdc, LeftPos, TopPos, Constants.ICON_WIDTH, Constants.ICON_HEIGHT, backColor);
+                            sf.DefaultDrawingOptions.DrawPoint(hdc.ToInt32(), LeftPos, TopPos, Constants.ICON_WIDTH, Constants.ICON_HEIGHT, backColor);
                         else if (layer.Type == eLayerType.LineShapefile)
-                            sf.DefaultDrawingOptions.DrawLine(hdc, LeftPos, TopPos, Constants.ICON_WIDTH - 1, Constants.ICON_SIZE - 1, false, Constants.ICON_WIDTH, Constants.ICON_HEIGHT, backColor);
+                            sf.DefaultDrawingOptions.DrawLine(hdc.ToInt32(), LeftPos, TopPos, Constants.ICON_WIDTH - 1, Constants.ICON_SIZE - 1, false, Constants.ICON_WIDTH, Constants.ICON_HEIGHT, backColor);
                         else if (layer.Type == eLayerType.PolygonShapefile)
-                            sf.DefaultDrawingOptions.DrawRectangle(hdc, LeftPos, TopPos, Constants.ICON_WIDTH - 1, Constants.ICON_SIZE - 1, false, Constants.ICON_WIDTH, Constants.ICON_HEIGHT, backColor);
+                            sf.DefaultDrawingOptions.DrawRectangle(hdc.ToInt32(), LeftPos, TopPos, Constants.ICON_WIDTH - 1, Constants.ICON_SIZE - 1, false, Constants.ICON_WIDTH, Constants.ICON_HEIGHT, backColor);
 
                         DrawTool.ReleaseHdc(hdc);
                         break;

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ public void RefreshImageList()`
`449`	`449`	`}`
`450`	`450`
`451`	`451`	`IntPtr ptr = g.GetHdc();`
`452`		`- sdo.DrawPoint(ptr, 0.0f, 0.0f, _imgWidth, _imgHeight, Colors.ColorToUInteger(this.BackColor));`
	`452`	`+ sdo.DrawPoint(ptr.ToInt32(), 0.0f, 0.0f, _imgWidth, _imgHeight, Colors.ColorToUInteger(this.BackColor));`
`453`	`453`	`g.ReleaseHdc(ptr);`
`454`	`454`	`break;`
`455`	`455`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ void Control_OnDrawItem(Graphics graphics, RectangleF rect, int itemIndex, bool`
`244`	`244`	`{`
`245`	`245`	`IntPtr ptr = graphics.GetHdc();`
`246`	`246`	`MapWinGIS.LinePattern pattern = _patterns[itemIndex];`
`247`		`- pattern.Draw(ptr, rect.X + 1.0f, rect.Y + 1.0f, (int)rect.Width - 2, (int)rect.Height - 2, Colors.ColorToUInteger(this.BackColor));`
	`247`	`+ pattern.Draw(ptr.ToInt32(), rect.X + 1.0f, rect.Y + 1.0f, (int)rect.Width - 2, (int)rect.Height - 2, Colors.ColorToUInteger(this.BackColor));`
`248`	`248`	`graphics.ReleaseHdc();`
`249`	`249`	`}`
`250`	`250`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ void PointSymbolControl_OnDrawItem(System.Drawing.Graphics graphics, System.Draw`
`75`	`75`	`{`
`76`	`76`	`IntPtr ptr = graphics.GetHdc();`
`77`	`77`	`MapWinGIS.ShapeDrawingOptions sdo = _icons[itemIndex];`
`78`		`- sdo.DrawPoint(ptr, rect.X + 1.0f, rect.Y +1.0f, (int)rect.Width -2, (int)rect.Height -2, Colors.ColorToUInteger(this.BackColor));`
	`78`	`+ sdo.DrawPoint(ptr.ToInt32(), rect.X + 1.0f, rect.Y +1.0f, (int)rect.Width -2, (int)rect.Height -2, Colors.ColorToUInteger(this.BackColor));`
`79`	`79`	`graphics.ReleaseHdc();`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -736,15 +736,15 @@ private void dgvCategories_CellFormatting(object sender, DataGridViewCellFormatt`
`736`	`736`
`737`	`737`	`if (type == ShpfileType.SHP_POLYGON)`
`738`	`738`	`{`
`739`		`- sdo.DrawRectangle(g.GetHdc(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));`
	`739`	`+ sdo.DrawRectangle(g.GetHdc().ToInt32(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));`
`740`	`740`	`}`
`741`	`741`	`else if (type == ShpfileType.SHP_POLYLINE)`
`742`	`742`	`{`
`743`		`- sdo.DrawLine(g.GetHdc(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));`
	`743`	`+ sdo.DrawLine(g.GetHdc().ToInt32(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));`
`744`	`744`	`}`
`745`	`745`	`else if (type == ShpfileType.SHP_POINT)`
`746`	`746`	`{`
`747`		`- sdo.DrawPoint(g.GetHdc(), 0.0f, 0.0f, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));`
	`747`	`+ sdo.DrawPoint(g.GetHdc().ToInt32(), 0.0f, 0.0f, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));`
`748`	`748`	`}`
`749`	`749`	`g.ReleaseHdc();`
`750`	`750`	`g.Dispose();`
Original file line number	Diff line number	Diff line change
`@@ -378,9 +378,9 @@ private void Draw()`
`378`	`378`	`if (_charts.Visible)`
`379`	`379`	`{`
`380`	`380`	`if (_charts.ChartType == MapWinGIS.tkChartType.chtPieChart)`
`381`		`- _charts.DrawChart(hdc, (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2, false, backColor);`
	`381`	`+ _charts.DrawChart(hdc.ToInt32(), (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2, false, backColor);`
`382`	`382`	`else`
`383`		`- _charts.DrawChart(hdc, (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2, false, backColor);`
	`383`	`+ _charts.DrawChart(hdc.ToInt32(), (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2, false, backColor);`
`384`	`384`	`}`
`385`	`385`	`g.ReleaseHdc();`
`386`	`386`	`pictureBox1.Image = bmp;`