Author: gnorton
Date: 2008-01-23 13:42:54 -0500 (Wed, 23 Jan 2008)
New Revision: 93686
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ControlHandler.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUICarbon.cs
Log:
In System.Windows.Forms:
* XplatUICarbon.cs: Remove some dead code that was causing warnings.
2008-01-23 Geoff Norton <[EMAIL PROTECTED]>
In System.Windows.Forms.CarbonInternal:
2008-01-23 Geoff Norton <[EMAIL PROTECTED]>
* ControlHandler.cs: Remove some dead code that was causing warnings.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-23 18:38:27 UTC (rev 93685)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-23 18:42:54 UTC (rev 93686)
@@ -1,5 +1,9 @@
2008-01-23 Geoff Norton <[EMAIL PROTECTED]>
+
+ * XplatUICarbon.cs: Remove some dead code that was causing warnings.
+2008-01-23 Geoff Norton <[EMAIL PROTECTED]>
+
* XplatUICarbon.cs: Re-enabled Carets in QuickDraw as a overlay window.
2008-01-23 Everaldo Canuto <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUICarbon.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUICarbon.cs
2008-01-23 18:38:27 UTC (rev 93685)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUICarbon.cs
2008-01-23 18:42:54 UTC (rev 93686)
@@ -53,7 +53,6 @@
internal static Hwnd MouseHwnd;
- internal static Hashtable WindowBackgrounds;
internal static MouseButtons MouseState;
internal static Carbon.Hover Hover;
@@ -229,7 +228,6 @@
// Initialize the Carbon Specific stuff
WindowMapping = new Hashtable ();
HandleMapping = new Hashtable ();
- WindowBackgrounds = new Hashtable ();
UtilityWindows = new ArrayList ();
// Initialize the FosterParent
@@ -520,10 +518,6 @@
} while (!done);
}
- //TODO: The old implementation does QD drawing where we cannot
do that anymore
- private void InvertCaret () {
- }
-
private void SendParentNotify(IntPtr child, Msg cause, int x,
int y) {
Hwnd hwnd;
@@ -725,7 +719,6 @@
height = hwnd.height - y;
}
- Carbon.HIRect region = new Carbon.HIRect (x, y, width,
height);
if (client) {
hwnd.AddInvalidArea(x, y, width, height);
if (!hwnd.expose_pending) {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog
2008-01-23 18:38:27 UTC (rev 93685)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog
2008-01-23 18:42:54 UTC (rev 93686)
@@ -1,3 +1,7 @@
+2008-01-23 Geoff Norton <[EMAIL PROTECTED]>
+
+ * ControlHandler.cs: Remove some dead code that was causing warnings.
+
2008-01-22 Geoff Norton <[EMAIL PROTECTED]>
* EventHandler.cs: Subscribe to the MouseWheel and MouseScroll events.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ControlHandler.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ControlHandler.cs
2008-01-23 18:38:27 UTC (rev 93685)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ControlHandler.cs
2008-01-23 18:42:54 UTC (rev 93686)
@@ -187,18 +187,6 @@
return false;
}
- private void DrawBackground (Hwnd hwnd, IntPtr eventref, HIRect
bounds) {
- if (XplatUICarbon.WindowBackgrounds [hwnd] != null) {
- IntPtr context = IntPtr.Zero;
- Color color = (Color)
XplatUICarbon.WindowBackgrounds [hwnd];
-
- GetEventParameter (eventref,
kEventParamCGContextRef, typeCGContextRef, IntPtr.Zero, (uint) Marshal.SizeOf
(typeof (IntPtr)), IntPtr.Zero, ref context);
-
- CGContextSetRGBFillColor (context, (float)
color.R / 255, (float) color.G / 255, (float) color.B / 255, (float) color.A /
255);
- CGContextFillRect (context, bounds);
- }
- }
-
private void DrawBorders (Hwnd hwnd) {
switch (hwnd.border_style) {
case FormBorderStyle.Fixed3D: {
@@ -237,10 +225,5 @@
static extern int HIViewGetFrame (IntPtr handle, ref HIRect
rect);
[DllImport("/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon")]
extern static bool HIViewIsVisible (IntPtr vHnd);
-
- [DllImport
("/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon")]
- static extern int CGContextSetRGBFillColor (IntPtr cgContext,
float r, float g, float b, float alpha);
- [DllImport
("/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon")]
- static extern int CGContextFillRect (IntPtr context, HIRect
rect);
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
