From 9b2f9754ede1d785708d6e81303f640414d36d8c Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Fri, 29 Feb 2008 22:22:19 +0000
Subject: [PATCH] 2008-02-29 Mike Kestner <mkestner@novell.com>
* sample/Action.cs: qualify Action usage.
* sample/GtkDemo/DemoApplicationWindow.cs: qualify Action usage.
* sample/GtkDemo/DemoUIManager.cs: qualify Action usage.
svn path=/trunk/gtk-sharp/; revision=97023
---
ChangeLog | 12 ++++++++++++
sample/Actions.cs | 8 ++++----
sample/GtkDemo/DemoApplicationWindow.cs | 2 +-
sample/GtkDemo/DemoUIManager.cs | 2 +-
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d8fc317b2..614250e01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-02-29 Mike Kestner <mkestner@novell.com>
+
+ * sample/Action.cs: qualify Action usage.
+ * sample/GtkDemo/DemoApplicationWindow.cs: qualify Action usage.
+ * sample/GtkDemo/DemoUIManager.cs: qualify Action usage.
+
+2008-02-29 Mike Kestner <mkestner@novell.com>
+
+ * configure.in.in: atk checks and SUBSTs.
+ * atk/Util.custom: custom properties for overriding class methods.
+ * atk/glue/util.c: glue to override class methods.
+
2008-02-26 Mike Kestner <mkestner@novell.com>
* generator/ByRefGen.cs: fix mismatched alloc/free.
diff --git a/sample/Actions.cs b/sample/Actions.cs
index 7feade6d1..00df98071 100644
--- a/sample/Actions.cs
+++ b/sample/Actions.cs
@@ -189,7 +189,7 @@ namespace GtkSamples {
static void OnActivate (object obj, EventArgs args)
{
- Action action = (Action)obj;
+ Gtk.Action action = (Gtk.Action)obj;
Console.WriteLine ("Action {0} (type={1}) activated",
action.Name, action.GetType ().FullName);
}
@@ -218,7 +218,7 @@ namespace GtkSamples {
static void OnToggleCnp (object obj, EventArgs args)
{
- Action action = (ToggleAction)obj;
+ Gtk.Action action = (ToggleAction)obj;
bool sensitive = ((ToggleAction)action).Active;
action = group.GetAction ("cut");
action.Sensitive = sensitive;
@@ -262,7 +262,7 @@ namespace GtkSamples {
for (int i = 0; i < num; i++) {
string name = "DynAction" + i;
string label = "Dynamic Action " + i;
- Action action = new Action (name, label);
+ Gtk.Action action = new Gtk.Action (name, label);
dynGroup.Add (action);
uim.AddUi (mergeId, "/menubar/DynamicMenu", name,
name, UIManagerItemType.Menuitem, false);
@@ -299,7 +299,7 @@ namespace GtkSamples {
static void OnSelect (object obj, EventArgs args)
{
- Action action = (Action) actions[obj];
+ Gtk.Action action = (Gtk.Action) actions[obj];
if (action.Tooltip != null)
statusbar.Push (0, action.Tooltip);
}
diff --git a/sample/GtkDemo/DemoApplicationWindow.cs b/sample/GtkDemo/DemoApplicationWindow.cs
index 690206d9a..bc4df60aa 100644
--- a/sample/GtkDemo/DemoApplicationWindow.cs
+++ b/sample/GtkDemo/DemoApplicationWindow.cs
@@ -156,7 +156,7 @@ namespace GtkDemo
private void ActionActivated (object sender, EventArgs a)
{
- Action action = sender as Action;
+ Gtk.Action action = sender as Gtk.Action;
MessageDialog md;
md = new MessageDialog (this, DialogFlags.DestroyWithParent,
diff --git a/sample/GtkDemo/DemoUIManager.cs b/sample/GtkDemo/DemoUIManager.cs
index 4486bd637..5687470d7 100644
--- a/sample/GtkDemo/DemoUIManager.cs
+++ b/sample/GtkDemo/DemoUIManager.cs
@@ -132,7 +132,7 @@ namespace GtkDemo
private void ActionActivated (object sender, EventArgs a)
{
- Action action = sender as Action;
+ Gtk.Action action = sender as Gtk.Action;
Console.WriteLine ("Action \"{0}\" activated", action.Name);
}