Przeglądaj źródła

2003-11-13 Pedro Mart�nez Juli� <[email protected]>

    * LoginDialog.cs
    * SqlEditorSharp.cs
    * sqlsharpgtk.cs: Updated to the new changes in gtk-sharp
    library.

svn path=/trunk/mcs/; revision=19926
Pedro Martínez Juliá 22 lat temu
rodzic
commit
fc5a41fb88

+ 7 - 0
mcs/tools/SqlSharp/gui/gtk-sharp/ChangeLog

@@ -1,3 +1,10 @@
+2003-11-13  Pedro Martínez Juliá  <[email protected]>
+
+	* LoginDialog.cs
+	* SqlEditorSharp.cs
+	* sqlsharpgtk.cs: Updated to the new changes in gtk-sharp
+	library.
+
 2003-10-16  Daniel Morgan <[email protected]>
 
 	* Makefile

+ 2 - 2
mcs/tools/SqlSharp/gui/gtk-sharp/LoginDialog.cs

@@ -74,13 +74,13 @@ namespace Mono.Data.SqlSharp.Gui.GtkSharp
 			dialog.VBox.PackStart (frame, true, true, 0);
 
 			Button button = null;
-			button = Button.NewFromStock (Stock.Ok);
+			button = new Button(Stock.Ok);
 			button.Clicked += new EventHandler (Connect_Action);
 			button.CanDefault = true;
 			dialog.ActionArea.PackStart (button, true, true, 0);
 			button.GrabDefault ();
 
-			button = Button.NewFromStock (Stock.Cancel);
+			button = new Button(Stock.Cancel);
 			button.Clicked += new EventHandler (Dialog_Cancel);
 			dialog.ActionArea.PackStart (button, true, true, 0);
 			dialog.Modal = true;

+ 5 - 4
mcs/tools/SqlSharp/gui/gtk-sharp/SqlEditorSharp.cs

@@ -172,8 +172,9 @@ namespace SqlEditorSharp
 
 			SqlSharpGtk.DebugWriteLine ("[[[[[ Syntax Hi-Light Text BEGIN ]]]]]");
 
-			if (use_hi_lighting == true)
+			if (use_hi_lighting == true) {
 				SyntaxHiLightText ();
+			}
 			
 			SqlSharpGtk.DebugWriteLine ("[[[[[ Syntax Hi-Light Text END   ]]]]]\n");
 		}
@@ -250,7 +251,7 @@ namespace SqlEditorSharp
 			match_start2 = start_iter; // dummy
 			match_end2 = end_iter; // dummy
 
-			while (start_iter.IsEnd() == false) {
+			while (start_iter.IsEnd == false) {
 				// FIXME: match_start1, match_end1, end_iter
 				//        need to be set to have ref in front
 				//        Problem with TextIter's ForwardSearch()
@@ -376,7 +377,7 @@ namespace SqlEditorSharp
 				// look for singled quoted constants 
 				// and keywords
 				if (hyphen < 2) {
-					if (start_iter.IsEnd() == true)
+					if (start_iter.IsEnd == true)
 						break; // break out of for loop
 
 					start_word = -1;
@@ -414,7 +415,7 @@ namespace SqlEditorSharp
 				match_start1 = start_iter;
 				match_end1 = start_iter;
 						
-				if (match_end1.IsEnd () == true)
+				if (match_end1.IsEnd == true)
 					break;
 
 				if (CharHasTag (start_iter, 

+ 1 - 0
mcs/tools/SqlSharp/gui/gtk-sharp/sqlsharpgtk.cs

@@ -154,6 +154,7 @@ namespace Mono.Data.SqlSharp.Gui.GtkSharp
 		{
 			SqlEditorSharp editor;
 			editor = new SqlEditorSharp ();
+			editor.UseSyntaxHiLighting = true;
 			editor.View.Show ();
 			editor.View.KeyPressEvent +=
 				new GtkSharp.KeyPressEventHandler(OnKeyPressEventKey);