//
//
// $Log: BindingManagerBase.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/08/11 21:22:27 pbartok
// - Was checked in with wrong filename
//
#endregion // Protected Instance Methods
#region Events
- public EventHandler CurrentChanged;
- public EventHandler PositionChanged;
+ public event EventHandler CurrentChanged;
+ public event EventHandler PositionChanged;
#endregion // Events
}
}
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: BindingMemberInfo.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
// COMPLETE
namespace System.Windows.Forms {
- public class BindingMemberInfo {
+ public struct BindingMemberInfo {
private string data_member;
private string data_field;
private string data_path;
#region Public Instance Methods
public override bool Equals(object otherObject) {
if (otherObject is BindingMemberInfo) {
- return (this == (BindingMemberInfo)otherObject);
+ return ((this.data_field == ((BindingMemberInfo)otherObject).data_field) &&\r
+ (this.data_path == ((BindingMemberInfo)otherObject).data_path) &&\r
+ (this.data_member == ((BindingMemberInfo)otherObject).data_member));\r
} else {
return false;
}
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: ContainerControl.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
throw new NotImplementedException();
}
- public bool ActivateControl(Control control) {
+ bool IContainerControl.ActivateControl(Control control) {
throw new NotImplementedException();
}
#endregion // Public Instance Methods
// Jaak Simm jaaksimm@firm.ee
// John Sohn jsohn@columbus.rr.com
//
-// $Revision: 1.22 $
+// $Revision: 1.23 $
// $Modtime: $
// $Log: Control.cs,v $
+// Revision 1.23 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.22 2004/08/11 19:19:44 pbartok
// - We had SetWindowPos and MoveWindow to set window positions and size,
// removed MoveWindow. We have GetWindowPos, so it made sense to keep
get {
return this.has_focus;
}
-
- set {
- throw new NotImplementedException();
- }
}
public virtual Font Font {
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: ControlEventArgs.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
// COMPLETE
namespace System.Windows.Forms {
- public class ControlEventArgs {
+ public class ControlEventArgs : EventArgs {
private Control control;
#region Public Constructors
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.2 $
-// $Modtime: $
// $Log: ControlPaint.cs,v $
+// Revision 1.3 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.2 2004/07/26 17:42:03 jordi
// Theme support
//
#region Private Enumerations
+ #region Constructor
+ // Prevent a public constructor from being created
+ private ControlPaint() {
+ }
+ #endregion // Constructor
+
#endregion // Private Enumerations
ThemeEngine.Current.DrawRadioButton (graphics, rectangle, state);
}
- [MonoTODO]
+ [MonoTODO("Figure out a good System.Drawing way for XOR drawing")]
public static void DrawReversibleFrame(Rectangle rectangle, Color backColor, FrameStyle style) {
- //FIXME:
+ throw new NotImplementedException();
}
- [MonoTODO]
+ [MonoTODO("Figure out a good System.Drawing way for XOR drawing")]
public static void DrawReversibleLine(Point start, Point end, Color backColor) {
- //FIXME:
+ throw new NotImplementedException();
}
- [MonoTODO]
+ [MonoTODO("Figure out a good System.Drawing way for XOR drawing")]
public static void FillReversibleRectangle(Rectangle rectangle, Color backColor) {
- //FIXME:
+ throw new NotImplementedException();
}
- public static void DrawScrollButton (Graphics graphics, Rectangle rectangle, ScrollButton button, ButtonState state) {
+ public static void DrawScrollButton (Graphics graphics, int x, int y, int width, int height, ScrollButton button, ButtonState state) {
+ ThemeEngine.Current.DrawScrollButton (graphics, new Rectangle(x, y, width, height), button, state);
+ }
+ public static void DrawScrollButton (Graphics graphics, Rectangle rectangle, ScrollButton button, ButtonState state) {
ThemeEngine.Current.DrawScrollButton (graphics, rectangle, button, state);
}
+ [MonoTODO]
+ public static void DrawSelectionFrame(Graphics graphics, bool active, Rectangle outsideRect, Rectangle insideRect, Color backColor) {
+ throw new NotImplementedException();
+ }
+
public static void DrawSizeGrip (Graphics graphics, Color backColor, Rectangle bounds)
{
ThemeEngine.Current.DrawSizeGrip (graphics, backColor, bounds);
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.3 $
+// $Revision: 1.4 $
// $Modtime: $
// $Log: Form.cs,v $
+// Revision 1.4 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.3 2004/08/04 21:13:47 pbartok
// - Added AutoScale properties
//
}
}
- protected virtual void OnClosed(System.ComponentModel.CancelEventArgs e) {
+ protected virtual void OnClosing(System.ComponentModel.CancelEventArgs e) {
if (Closing != null) {
Closing(this, e);
}
// Peter Bartok (pbartok@novell.com)
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: ImageListStreamer.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/15 20:05:28 pbartok
// - Implemented ImageList and ImageList.ImageCollection classes
// - Added ColorDepth enumeration
using System.Runtime.Serialization;
namespace System.Windows.Forms {
+ [Serializable]
public sealed class ImageListStreamer : ISerializable {
+ #region Constructor
+ private ImageListStreamer() {
+ }
+ #endregion // Constructor
+
#region Public Instance Methods
[MonoTODO("Need to learn about streaming first - Peter")]
public void GetObjectData(SerializationInfo si, StreamingContext context) {
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: InputLanguage.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
}
}
- public static InputLanguageCollection InstalledInputLanguage {
+ public static InputLanguageCollection InstalledInputLanguages {
get {
return all;
}
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: InputLanguageChangedEventArgs.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
using System.Globalization;
namespace System.Windows.Forms {
- public class InputLanguageChangedEventArgs {
+ public class InputLanguageChangedEventArgs : EventArgs {
private CultureInfo culture;
private byte charset;
private InputLanguage input_language;
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: InputLanguageChangingEventArgs.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
using System.Globalization;
namespace System.Windows.Forms {
- public class InputLanguageChangingEventArgs {
+ public class InputLanguageChangingEventArgs : EventArgs {
private CultureInfo culture;
private bool system_charset;
private InputLanguage input_language;
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: Keys.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
LineFeed = 0x0000000A,
Clear = 0x0000000C,
Return = 0x0000000D,
+ Enter = 0x0000000D,
ShiftKey = 0x00000010,
ControlKey = 0x00000011,
Menu = 0x00000012,
Pause = 0x00000013,
CapsLock = 0x00000014,
- Captial = 0x00000014,
+ Capital = 0x00000014,
KanaMode = 0x00000015,
HanguelMode = 0x00000015,
HangulMode = 0x00000015,
HanjaMode = 0x00000019,
Escape = 0x0000001B,
IMEConvert = 0x0000001C,
- IMENonConvert = 0x0000001D,
+ IMENonconvert = 0x0000001D,
IMEAceept = 0x0000001E,
- IMEAccept = 0x0000001E,
IMEModeChange = 0x0000001F,
Space = 0x00000020,
PageUp = 0x00000021,
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: LayoutEventArgs.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
// COMPLETE
namespace System.Windows.Forms {
- public class LayoutEventArgs : EventArgs {
+ public sealed class LayoutEventArgs : EventArgs {
private Control affected_control;
private string affected_property;
// Andreas Nahr, ClassDevelopment@A-SoftTech.com
// Jordi Mas i Hernandez, jordi@ximian.com
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: LinkArea.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/21 16:19:17 jordi
// LinkLabel control implementation
//
namespace System.Windows.Forms
{
+ [Serializable]
public struct LinkArea
{
private int start;
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
-// $Modtime: $
// $Log: Message.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
private IntPtr result;
#region Public Instance Properties
- public IntPtr Hwnd {
+ public IntPtr HWnd {
get { return hwnd; }
set { hwnd=value; }
}
return false;
}
- return (this == (Message)o);
- }
-
- public static bool operator == (Message msg_a, Message msg_b) {
- return ((msg_a.msg == msg_b.msg) &&
- (msg_a.hwnd == msg_b.hwnd) &&
- (msg_a.lParam == msg_b.lParam) &&
- (msg_a.wParam == msg_b.wParam) &&
- (msg_a.result == msg_b.result));
- }
-
- public static bool operator != (Message msg_a, Message msg_b) {
- return ((msg_a.msg != msg_b.msg) ||
- (msg_a.hwnd != msg_b.hwnd) ||
- (msg_a.lParam != msg_b.lParam) ||
- (msg_a.wParam != msg_b.wParam) ||
- (msg_a.result != msg_b.result));
+ return ((this.msg == ((Message)o).msg) &&
+ (this.hwnd == ((Message)o).hwnd) &&
+ (this.lParam == ((Message)o).lParam) &&
+ (this.wParam == ((Message)o).wParam) &&
+ (this.result == ((Message)o).result));
}
public override int GetHashCode() {
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: MouseEventArgs.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
// COMPLETE
namespace System.Windows.Forms {
- public class MouseEventArgs {
+ public class MouseEventArgs : EventArgs {
private MouseButtons buttons;
private int clicks;
private int delta;
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: NativeWindow.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
return window_handle;
}
}
-
- public bool IsHandleCreated {
- get {
- return (window_handle != IntPtr.Zero);
- }
- }
#endregion // Public Instance Properties
#region Public Static Methods
internal static IntPtr WndProc(IntPtr hWnd, Msg msg, IntPtr wParam, IntPtr lParam) {
Message m = new Message();
NativeWindow window = null;
-
try {
window = (NativeWindow)window_collection[hWnd];
- m.Hwnd=hWnd;
+ m.HWnd=hWnd;
m.Msg=(int)msg;
m.WParam=wParam;
m.LParam=lParam;
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: ScrollEventArgs.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
// COMPLETE
namespace System.Windows.Forms {
- public class ScrollEventArgs {
+ public class ScrollEventArgs : EventArgs {
#region Local Variables
private ScrollEventType type;
private int new_value;
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
// $Modtime: $
// $Log: ScrollableControl.cs,v $
+// Revision 1.2 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.1 2004/07/09 05:21:25 pbartok
// - Initial check-in
//
#region Subclass DockPaddingEdges
public class DockPaddingEdges : ICloneable {
- // Local Variables;
+ #region DockPaddingEdges Local Variables
private int all;
private int left;
private int right;
private int top;
private int bottom;
+ #endregion // DockPaddingEdges Local Variables
+
+ #region DockPaddingEdges Constructor
+ private DockPaddingEdges() {
+ }
+ #endregion // DockPaddingEdges Constructor
- // Public Instance Properties
+ #region DockPaddingEdges Public Instance Properties
public int All {
get {
return all;
}
}
- public static bool operator == (DockPaddingEdges obj_a, DockPaddingEdges obj_b) {
- if ( (obj_a.all == obj_b.all) && (obj_a.left == obj_b.left) &&
- (obj_a.right == obj_b.right) && (obj_a.top == obj_b.top) &&
- (obj_a.bottom == obj_b.bottom)) {
- return true;
- }
-
- return false;
- }
-
- public static bool operator != (DockPaddingEdges obj_a, DockPaddingEdges obj_b) {
- return !(obj_a==obj_b);
- }
+ #endregion // DockPaddingEdges Public Instance Properties
// Public Instance Methods
public override bool Equals(object other) {
return false;
}
- return (this==(DockPaddingEdges)other);
+ if ( (this.all == ((DockPaddingEdges)other).all) && (this.left == ((DockPaddingEdges)other).left) &&
+ (this.right == ((DockPaddingEdges)other).right) && (this.top == ((DockPaddingEdges)other).top) &&
+ (this.bottom == ((DockPaddingEdges)other).bottom)) {
+ return true;
+ }
+
+ return false;
}
public override int GetHashCode() {
public override Rectangle DisplayRectangle {
get {
+ return base.DisplayRectangle;
throw new NotImplementedException();
}
}
}
protected override void OnLayout(LayoutEventArgs levent) {
+ base.OnLayout(levent);
+ return;
throw new NotImplementedException();
}
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.9 $
+// $Revision: 1.10 $
// $Modtime: $
// $Log: XplatUI.cs,v $
+// Revision 1.10 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.9 2004/08/11 19:19:44 pbartok
// - We had SetWindowPos and MoveWindow to set window positions and size,
// removed MoveWindow. We have GetWindowPos, so it made sense to keep
/// X11 Version
namespace System.Windows.Forms {
- public class XplatUI {
+ internal class XplatUI {
#region Local Variables
static XplatUIDriver driver;
static String default_class_name;
driver.Exit();
}
+ internal static void EnableThemes() {
+ driver.EnableThemes();
+ }
+
internal static bool Text(IntPtr hWnd, string text) {
return driver.Text(hWnd, text);
}
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.9 $
+// $Revision: 1.10 $
// $Modtime: $
// $Log: XplatUIDriver.cs,v $
+// Revision 1.10 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.9 2004/08/11 19:19:44 pbartok
// - We had SetWindowPos and MoveWindow to set window positions and size,
// removed MoveWindow. We have GetWindowPos, so it made sense to keep
using System.Drawing;
namespace System.Windows.Forms {
- public abstract class XplatUIDriver {
+ internal abstract class XplatUIDriver {
internal abstract IntPtr InitializeDriver();
internal abstract void ShutdownDriver(IntPtr token);
internal delegate IntPtr WndProc(IntPtr hwnd, Msg msg, IntPtr wParam, IntPtr lParam);
#region XplatUI Driver Methods
internal abstract void Exit();
+
+ internal abstract void EnableThemes();
+
internal abstract IntPtr CreateWindow(CreateParams cp);
internal abstract IntPtr CreateWindow(IntPtr Parent, int X, int Y, int Width, int Height);
internal abstract void DestroyWindow(IntPtr handle);
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.12 $
+// $Revision: 1.13 $
// $Modtime: $
// $Log: XplatUIWin32.cs,v $
+// Revision 1.13 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.12 2004/08/11 19:41:38 jordi
// Fixes ClientRect
//
/// Win32 Version
namespace System.Windows.Forms {
- public class XplatUIWin32 : XplatUIDriver {
+ internal class XplatUIWin32 : XplatUIDriver {
#region Local Variables
private static XplatUIWin32 instance;
private static int ref_count;
internal static MouseButtons mouse_state;
internal static Point mouse_position;
internal static WndProc wnd_proc;
+
+ internal static bool themes_enabled;
#endregion // Local Variables
#region Private Structs
ref_count=0;
// Now regular initialization
- key_state=Keys.None;
- mouse_state=MouseButtons.None;
- mouse_position=Point.Empty;
+ key_state = Keys.None;
+ mouse_state = MouseButtons.None;
+ mouse_position = Point.Empty;
+
+ themes_enabled = false;
// Prepare 'our' window class
wnd_proc = new WndProc(NativeWindow.WndProc);
Win32PostQuitMessage(0);
}
+ internal override void EnableThemes() {
+ themes_enabled=true;
+ }
+
internal override IntPtr CreateWindow(CreateParams cp) {
IntPtr WindowHandle;
IntPtr ParentHandle;
}
internal override IntPtr DefWndProc(ref Message msg) {
- msg.Result=Win32DefWindowProc(msg.Hwnd, (Msg)msg.Msg, msg.WParam, msg.LParam);
+ msg.Result=Win32DefWindowProc(msg.HWnd, (Msg)msg.Msg, msg.WParam, msg.LParam);
return msg.Result;
}
// Peter Bartok pbartok@novell.com
//
//
-// $Revision: 1.18 $
+// $Revision: 1.19 $
// $Modtime: $
// $Log: XplatUIX11.cs,v $
+// Revision 1.19 2004/08/11 22:20:59 pbartok
+// - Signature fixes
+//
// Revision 1.18 2004/08/11 19:19:44 pbartok
// - We had SetWindowPos and MoveWindow to set window positions and size,
// removed MoveWindow. We have GetWindowPos, so it made sense to keep
/// X11 Version
namespace System.Windows.Forms {
- public class XplatUIX11 : XplatUIDriver {
+ internal class XplatUIX11 : XplatUIDriver {
#region Local Variables
private static XplatUIX11 instance;
private static int ref_count;
+ private static bool themes_enabled;
private static IntPtr DisplayHandle; // X11 handle to display
private static IntPtr FosterParent; // Container to hold child windows until their parent exists
Console.WriteLine("XplatUIX11.Exit");
}
+ internal override void EnableThemes() {
+ themes_enabled=true;
+ }
+
internal override IntPtr CreateWindow(CreateParams cp) {
IntPtr WindowHandle;
IntPtr ParentHandle;
projects / mono.git / commitdiff