[Gtk-sharp-list] 2 small patches to fix compilation problems in sample/DbClient and
sample/GtkDemo
Paul Duran
pauld@hutch.com.au
Tue, 20 Jan 2004 17:34:33 +1100
This is a multi-part message in MIME format.
--------------090804000402060807050000
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Hi,
Please find attached a couple of patches to fix the compilation errors
in the DbClient and GtkDemo
sample apps. Basically just keeping up with changes in the API.
One patch is for client.cs in the sample/DbClient directory and the
other is for DemoTextView.cs
in the sample/GtkDemo directory.
Let me know if there's any problems.
regards,
Paul
--------------090804000402060807050000
Content-Type: text/plain;
name="client.cs.compile_fix.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="client.cs.compile_fix.patch"
Index: client.cs
===================================================================
RCS file: /mono/gtk-sharp/sample/DbClient/client.cs,v
retrieving revision 1.20
diff -u -r1.20 client.cs
--- client.cs 21 Nov 2003 19:58:50 -0000 1.20
+++ client.cs 20 Jan 2004 07:06:36 -0000
@@ -237,19 +237,19 @@
table.RowSpacing = 4;
Label label = null;
- label = Label.NewWithMnemonic ("_ID");
+ label = new Label ("_ID");
table.Attach (label, 0, 1, 0, 1);
id_entry = new Entry ();
table.Attach (id_entry, 1, 2, 0, 1);
- label = Label.NewWithMnemonic ("_Name");
+ label = new Label ("_Name");
table.Attach (label, 0, 1, 1, 2);
name_entry = new Entry ();
if (type == DialogType.Delete)
name_entry.Sensitive = false;
table.Attach (name_entry, 1, 2, 1, 2);
- label = Label.NewWithMnemonic ("_Address");
+ label = new Label ("_Address");
table.Attach (label, 0, 1, 2, 3);
address_entry = new Entry ();
if (type == DialogType.Delete)
--------------090804000402060807050000
Content-Type: text/plain;
name="DemoTextView.cs.compile_fix.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline;
filename="DemoTextView.cs.compile_fix.patch"
Index: DemoTextView.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /mono/gtk-sharp/sample/GtkDemo/DemoTextView.cs,v
retrieving revision 1.4
diff -u -r1.4 DemoTextView.cs
--- DemoTextView.cs 12 Dec 2003 16:45:51 -0000 1.4
+++ DemoTextView.cs 20 Jan 2004 05:55:57 -0000
@@ -328,11 +328,11 @@
InsertWithTagsByName (buffer, "Images. ", new string[] {"heading"});
Insert (buffer,"The buffer can have images in it: ");
=09
- buffer.GetIterAtMark (out insertIter, buffer.InsertMark);
+ insertIter =3D buffer.GetIterAtMark (buffer.InsertMark);
buffer.InsertPixbuf (insertIter, pixbuf);
- buffer.GetIterAtMark (out insertIter, buffer.InsertMark);
+ insertIter =3D buffer.GetIterAtMark (buffer.InsertMark);
buffer.InsertPixbuf (insertIter, pixbuf);
- buffer.GetIterAtMark (out insertIter, buffer.InsertMark);
+ insertIter =3D buffer.GetIterAtMark (buffer.InsertMark);
buffer.InsertPixbuf (insertIter, pixbuf);
=20
Insert (buffer, " for example.\n\n");
@@ -359,23 +359,23 @@
//InsertWithTagsByName (buffer, "\331\210\331\202\330\257 \330\250\3=
30\257\330\243 \330\253\331\204\330\247\330\253 \331\205\331\206 \330\243=
\331\203\330\253\330\261 \330\247\331\204\331\205\330\244\330\263\330\263=
\330\247\330\252 \330\252\331\202\330\257\331\205\330\247 \331\201\331\21=
2 \330\264\330\250\331\203\330\251 \330\247\331\203\330\263\331\212\331\2=
10\331\206 \330\250\330\261\330\247\331\205\330\254\331\207\330\247 \331\=
203\331\205\331\206\330\270\331\205\330\247\330\252 \331\204\330\247 \330=
\252\330\263\330\271\331\211 \331\204\331\204\330\261\330\250\330\255\330=
\214 \330\253\331\205 \330\252\330\255\331\210\331\204\330\252 \331\201\3=
31\212 \330\247\331\204\330\263\331\206\331\210\330\247\330\252 \330\247\=
331\204\330\256\331\205\330\263 \330\247\331\204\331\205\330\247\330\266\=
331\212\330\251 \330\245\331\204\331\211 \331\205\330\244\330\263\330\263=
\330\247\330\252 \331\205\330\247\331\204\331\212\330\251 \331\205\331\20=
6\330\270\331\205\330\251\330\214 \331\210\330\250\330\247\330\252\330\25=
2 \330\254\330\262\330\241\330\247 \331\205\331\206 \330\247\331\204\331\=
206\330\270\330\247\331\205 \330\247\331\204\331\205\330\247\331\204\331\=
212 \331\201\331\212 \330\250\331\204\330\257\330\247\331\206\331\207\330=
\247\330\214 \331\210\331\204\331\203\331\206\331\207\330\247 \330\252\33=
0\252\330\256\330\265\330\265 \331\201\331\212 \330\256\330\257\331\205\3=
30\251 \331\202\330\267\330\247\330\271 \330\247\331\204\331\205\330\264\=
330\261\331\210\330\271\330\247\330\252 \330\247\331\204\330\265\330\272\=
331\212\330\261\330\251. \331\210\330\243\330\255\330\257 \330\243\331\20=
3\330\253\330\261 \331\207\330\260\331\207 \330\247\331\204\331\205\330\2=
44\330\263\330\263\330\247\330\252 \331\206\330\254\330\247\330\255\330\2=
47 \331\207\331\210 \302\273\330\250\330\247\331\206\331\203\331\210\330\=
263\331\210\331\204\302\253 \331\201\331\212 \330\250\331\210\331\204\331=
\212\331\201\331\212\330\247.\n\n", new string[] {"rtl_quote"});
//InsertWithTagsByName (buffer, "\x2", new string[] {"rtl_quote"});
Insert (buffer, "You can put widgets in the buffer: Here's a button: =
");
- buffer.GetIterAtMark(out insertIter, buffer.InsertMark);
+ insertIter =3D buffer.GetIterAtMark(buffer.InsertMark);
buttonAnchor =3D buffer.CreateChildAnchor (insertIter);
=20
Insert (buffer, "and a menu");
- buffer.GetIterAtMark(out insertIter, buffer.InsertMark);
+ insertIter =3D buffer.GetIterAtMark(buffer.InsertMark);
menuAnchor =3D buffer.CreateChildAnchor (insertIter);
=20
Insert (buffer, "and a scale");
- buffer.GetIterAtMark(out insertIter, buffer.InsertMark);
+ insertIter =3D buffer.GetIterAtMark(buffer.InsertMark);
scaleAnchor =3D buffer.CreateChildAnchor (insertIter);
=20
Insert (buffer, "and an animation");
- buffer.GetIterAtMark(out insertIter, buffer.InsertMark);
+ insertIter =3D buffer.GetIterAtMark(buffer.InsertMark);
animationAnchor =3D buffer.CreateChildAnchor (insertIter);
=20
Insert (buffer, " finally a text entry: ");
- buffer.GetIterAtMark(out insertIter, buffer.InsertMark);
+ insertIter =3D buffer.GetIterAtMark(buffer.InsertMark);
entryAnchor =3D buffer.CreateChildAnchor (insertIter);
=20
Insert (buffer, "\n");
@@ -395,12 +395,12 @@
=20
=20
begin =3D buffer.CharCount;
- buffer.GetIterAtMark(out insertIter, buffer.InsertMark);
+ insertIter =3D buffer.GetIterAtMark(buffer.InsertMark);
buffer.Insert (insertIter, insertText);
end =3D buffer.CharCount;
foreach (string fontItem in fontName){
- buffer.GetIterAtOffset (out endIter, end);
- buffer.GetIterAtOffset (out beginIter, begin);
+ endIter =3D buffer.GetIterAtOffset (end);
+ beginIter =3D buffer.GetIterAtOffset (begin);
buffer.ApplyTag (fontItem, beginIter, endIter);} =09
}
=20
@@ -408,7 +408,7 @@
{
TextIter insertIter;
=20
- buffer.GetIterAtMark(out insertIter, buffer.InsertMark);
+ insertIter =3D buffer.GetIterAtMark(buffer.InsertMark);
buffer.Insert (insertIter, insertText);
}
=20
@@ -447,7 +447,7 @@
=20
TextBuffer bufferCB =3D new TextBuffer (null);
Insert(bufferCB, "This buffer is shared by a set of nested text views=
=2E\n Nested view:\n");
- bufferCB.GetIterAtMark(out insertIter, bufferCB.InsertMark);
+ insertIter =3D bufferCB.GetIterAtMark(bufferCB.InsertMark);
TextChildAnchor anchor =3D bufferCB.CreateChildAnchor (insertIter);
Insert(bufferCB, "\nDon't do this in real applications, please.\n");
TextView viewCB =3D new TextView (bufferCB);
--------------090804000402060807050000--