Added: Add Procedure Form

src/EditControl.bas

@@ -2519,7 +2519,7 @@ Namespace My.Sys.Forms
 		Return sTemp
 	End Function
 
-	Sub EditControl.PaintControlPriv
+	Sub EditControl.PaintControlPriv(bFull As Boolean = False)
 		'	On Error Goto ErrHandler
 		#ifdef __USE_GTK__
 			If cr = 0 Then Exit Sub
@@ -2689,7 +2689,7 @@ Namespace My.Sys.Forms
 				'			SelectObject(bufDC, This.Canvas.Font.Handle)
 				'			SelectObject(bufDC, This.Canvas.Pen.Handle)
 				'			SetROP2 bufDC, This.Canvas.Pen.Mode
-				If OlddwClientX <> dwClientX OrElse OlddwClientY <> dwClientY OrElse OldPaintedVScrollPos(zz) <> VScrollPos OrElse OldPaintedHScrollPos(zz) <> HScrollPos OrElse iOldDivideY <> iDivideY OrElse iOldDividedY <> iDividedY OrElse iOldDivideX <> iDivideX OrElse iOldDividedX <> iDividedX OrElse CInt(bOldDividedX <> bDividedX) OrElse CInt(bOldDividedY <> bDividedY) Then
+				If bFull OrElse OlddwClientX <> dwClientX OrElse OlddwClientY <> dwClientY OrElse OldPaintedVScrollPos(zz) <> VScrollPos OrElse OldPaintedHScrollPos(zz) <> HScrollPos OrElse iOldDivideY <> iDivideY OrElse iOldDividedY <> iDividedY OrElse iOldDivideX <> iDivideX OrElse iOldDividedX <> iDividedX OrElse CInt(bOldDividedX <> bDividedX) OrElse CInt(bOldDividedY <> bDividedY) Then
 					FillRect bufDC, @rc, This.Canvas.Brush.Handle
 				End If
 			#endif
@@ -2718,7 +2718,7 @@ Namespace My.Sys.Forms
 				If i < VScrollPos Then OldCollapseIndex = CollapseIndex: iC = FECLine->CommentIndex: Continue For
 				If i - VScrollPos > vlc1 - 1 Then Exit For
 				#ifdef __USE_WINAPI__
-					If OlddwClientX = dwClientX AndAlso OlddwClientY = dwClientY AndAlso OldPaintedVScrollPos(zz) = VScrollPos AndAlso OldPaintedHScrollPos(zz) = HScrollPos AndAlso iOldDivideY = iDivideY AndAlso iOldDividedY = iDividedY AndAlso iOldDivideX = iDivideX AndAlso iOldDividedX = iDividedX AndAlso Cint(bOldDividedX = bDividedX) AndAlso CInt(bOldDividedY = bDividedY) Then
+					If bFull = False AndAlso OlddwClientX = dwClientX AndAlso OlddwClientY = dwClientY AndAlso OldPaintedVScrollPos(zz) = VScrollPos AndAlso OldPaintedHScrollPos(zz) = HScrollPos AndAlso iOldDivideY = iDivideY AndAlso iOldDividedY = iDividedY AndAlso iOldDivideX = iDivideX AndAlso iOldDividedX = iDividedX AndAlso Cint(bOldDividedX = bDividedX) AndAlso CInt(bOldDividedY = bDividedY) Then
 						If (z < iSelStartLine OrElse z > iSelEndLine) AndAlso (z < iOldSelStartLine OrElse z > iOldSelEndLine) AndAlso (z <> FSelEndLine + 1) AndAlso BracketsStartLine <> z AndAlso BracketsEndLine <> z AndAlso OldBracketsStartLine <> z AndAlso OldBracketsEndLine <> z Then
 							If CurWord <> "" OrElse OldCurWord <> "" Then
 								If (CurWord = "" OrElse CurWord <> "" AndAlso InStr(LCase(*FECLine->Text), LCase(CurWord)) = 0) AndAlso (OldCurWord = "" OrElse OldCurWord <> "" AndAlso InStr(LCase(*FECLine->Text), LCase(OldCurWord)) = 0) Then
@@ -3668,13 +3668,13 @@ Namespace My.Sys.Forms
 		"in line " & Erl()
 	End Sub
 
-	Sub EditControl.PaintControl
+	Sub EditControl.PaintControl(bFull As Boolean = False)
 		#ifdef __USE_GTK__
 			'PaintControlPriv
 			bChanged = True
 			If GTK_IS_WIDGET(widget) Then gtk_widget_queue_draw(widget)
 		#else
-			PaintControlPriv
+			PaintControlPriv(bFull)
 		#endif
 	End Sub
 

src/EditControl.bi

@@ -397,8 +397,8 @@ Namespace My.Sys.Forms
 		Declare Sub UnformatCode(WithoutUpdate As Boolean = False)
 		Declare Function GetTabbedLength(ByRef SourceText As WString) As Integer
 		Declare Function GetTabbedText(ByRef SourceText As WString, ByRef PosText As Integer = 0, ForPrint As Boolean = False) ByRef As WString
-		Declare Sub PaintControl()
-		Declare Sub PaintControlPriv()
+		Declare Sub PaintControl(bFull As Boolean = False)
+		Declare Sub PaintControlPriv(bFull As Boolean = False)
 		Declare Function GetWordAt(LineIndex As Integer, CharIndex As Integer, WithDot As Boolean = False, WithQuestion As Boolean = False, ByRef StartChar As Integer = 0) As String
 		Declare Function GetWordAtCursor(WithDot As Boolean = False) As String
 		Declare Function GetWordAtPoint(X As Integer, Y As Integer, WithDot As Boolean = False) As String

src/Main.bas

@@ -5194,6 +5194,8 @@ Sub CreateMenusAndToolBars
 	mnuRestart->Enabled = False
 
 	miXizmat = mnuMain.Add(ML("Servi&ce"), "", "Service")
+	miXizmat->Add(ML("Add &Procedure") & "..." & HK("AddProcedure"), "", "AddProcedure", @mClick)
+	miXizmat->Add("-")
 	miXizmat->Add(ML("&Add-Ins") & "..." & HK("AddIns"), "", "AddIns", @mClick)
 	miXizmat->Add("-")
 	miXizmat->Add(ML("&Tools") & "..." & HK("Tools"), "", "Tools", @mClick)

src/TabWindow.bas

@@ -2323,7 +2323,7 @@ Sub PropertyChanged(ByRef Sender As Control, ByRef Sender_Text As WString, IsCom
 					pApp->DoEvents
 				#endif
 				Dim As Integer iLeft2, iTop2, iWidth2, iHeight2
-				If st AndAlso st->IsComponentFunc AndAlso Cint(st->IsComponentFunc(pSelectedControls->Item(i))) Then
+				If st AndAlso st->IsComponentFunc AndAlso CInt(st->IsComponentFunc(pSelectedControls->Item(i))) Then
 					If st->ComponentGetBoundsSub Then st->ComponentGetBoundsSub(pSelectedControls->Item(i), iLeft2, iTop2, iWidth2, iHeight2)
 					If iLeft <> iLeft2 OrElse iTop <> iTop2 OrElse iWidth <> iWidth2 OrElse iHeight <> iHeight2 Then tb->Des->MoveDots pSelectedControls->Item(i), False
 				End If
@@ -2380,6 +2380,7 @@ Sub PropertyChanged(ByRef Sender As Control, ByRef Sender_Text As WString, IsCom
 			.Changed "Unsurni o`zgartirish"
 			pfrmMain->UpdateUnLock
 		End If
+		.PaintControl(True)
 	End With
 End Sub
 

src/VisualFBEditor.bas

@@ -30,6 +30,7 @@ Declare Sub DebugPrint_(ByRef MSG As WString)
 #include once "Main.bi"
 #include once "Debug.bi"
 #include once "Designer.bi"
+#include once "frmAddProcedure.frm"
 #include once "frmOptions.bi"
 #include once "frmGoto.bi"
 #include once "frmFind.bi"
@@ -408,14 +409,14 @@ Sub mClick(Sender As My.Sys.Object)
 				#ifndef __USE_GTK__
 					procin = procsk
 					runtype = RTFRUN
-					CurrentTimer = SetTimer(0, 0, 1, @TimerProc)
+					CurrentTimer = SetTimer(0, 0, 1, @TIMERPROC)
 				#endif
 				ThreadCounter(ThreadCreate_(@StartDebugging))
 			End If
 		End If
 	Case "SaveAs", "Close", "SyntaxCheck", "Compile", "CompileAndRun", "Run", "RunToCursor", "SplitHorizontally", "SplitVertically", _
 		"Start", "Stop", "StepOut", "FindNext", "FindPrev", "Goto", "SetNextStatement", "SortLines", "SplitUp", "SplitDown", "SplitLeft", "SplitRight", _
-		"AddWatch", "ShowVar", "NextBookmark", "PreviousBookmark", "ClearAllBookmarks", "Code", "Form", "CodeAndForm" '
+		"AddWatch", "ShowVar", "NextBookmark", "PreviousBookmark", "ClearAllBookmarks", "Code", "Form", "CodeAndForm", "AddProcedure" '
 		Dim tb As TabWindow Ptr = Cast(TabWindow Ptr, ptabCode->SelectedTab)
 		If tb = 0 Then Exit Sub
 		Select Case Sender.ToString
@@ -556,6 +557,7 @@ Sub mClick(Sender As My.Sys.Object)
 		Case "Code":                        tb->tbrTop.Buttons.Item("Code")->Checked = True: tbrTop_ButtonClick tb->tbrTop, *tb->tbrTop.Buttons.Item("Code")
 		Case "Form":                        tb->tbrTop.Buttons.Item("Form")->Checked = True: tbrTop_ButtonClick tb->tbrTop, *tb->tbrTop.Buttons.Item("Form")
 		Case "CodeAndForm":                 tb->tbrTop.Buttons.Item("CodeAndForm")->Checked = True: tbrTop_ButtonClick tb->tbrTop, *tb->tbrTop.Buttons.Item("CodeAndForm")
+		Case "AddProcedure":                frmAddProcedure.ShowModal frmMain
 		End Select
 	Case "SaveAll":                         SaveAll
 	Case "CloseAll":                        CloseAllTabs