浏览代码

Fix: Made doc-samples superstrict, moved declaration to top (#77)

closes #49

Co-authored-by: Ronny Otto <>
Ronny Otto 10 月之前
父节点
当前提交
f7d41c95bd

+ 3 - 3
maxgui.mod/doc/canvasbeginpaint.bmx

@@ -1,9 +1,9 @@
 ' canvasbeginpaint.bmx
-
-Strict
+SuperStrict
 
 Import MaxGui.Drivers
 
+
 AppTitle = "Canvas Painter Example"
 
 Local window:TGadget = CreateWindow(AppTitle,50,50,200,200)
@@ -23,7 +23,7 @@ Repeat
 			End
 		Default
 			CanvasBeginPaint(canvas)
-			SetClsColor( 0, 255*Sin(MilliSecs()/5.0), 0 )
+			SetClsColor( 0, Int(255*Sin(MilliSecs()/5.0)), 0 )
 			Cls()
 			Flip()
 	EndSelect

+ 2 - 2
maxgui.mod/doc/createbutton.bmx

@@ -1,8 +1,8 @@
 ' createbutton.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Global window:TGadget = CreateWindow("MaxGUI Buttons",40,40,400,330,Null,WINDOW_TITLEBAR|WINDOW_CLIENTCOORDS)
 	CreateButton("Std. Button",10,10,120,30,window,BUTTON_PUSH)
@@ -35,4 +35,4 @@ Function FillPanelWithButtons( pPanel:TGadget, pStyle%, pText$ = "Button" )
 	For Local i% = 0 Until 3
 		CreateButton( pText + " " + (i+1), 5+(i*buttonwidth), 5, buttonwidth-10, 26, pPanel, pStyle )
 	Next
-EndFunction
+EndFunction

+ 6 - 6
maxgui.mod/doc/createcanvas.bmx

@@ -1,16 +1,16 @@
 ' createcanvas.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
-Global GAME_WIDTH=320
-Global GAME_HEIGHT=240
+Global GAME_WIDTH:Int=320
+Global GAME_HEIGHT:Int=240
 
 ' create a centered window with client size GAME_WIDTH,GAME_HEIGHT
 
-Local wx=(ClientWidth(Desktop())-GAME_WIDTH)/2
-Local wy=(ClientHeight(Desktop())-GAME_HEIGHT)/2
+Local wx:Int=(ClientWidth(Desktop())-GAME_WIDTH)/2
+Local wy:Int=(ClientHeight(Desktop())-GAME_HEIGHT)/2
 
 Local window:TGadget=CreateWindow("My Canvas",wx,wy,GAME_WIDTH,GAME_HEIGHT,Null,WINDOW_TITLEBAR)'|WINDOW_CLIENTCOORDS)
 
@@ -31,7 +31,7 @@ While WaitEvent()
 			SetOrigin 160,120
 			SetLineWidth 5
 			Cls
-			Local t=MilliSecs()
+			Local t:Int=MilliSecs()
 			DrawLine 0,0,120*Cos(t),120*Sin(t)
 			DrawLine 0,0,80*Cos(t/60),80*Sin(t/60)
 			Flip

+ 2 - 2
maxgui.mod/doc/createcombobox.bmx

@@ -1,9 +1,9 @@
 ' createcombobox.bmx
-
-Strict
+SuperStrict
 
 Import MaxGui.Drivers
 
+
 AppTitle = "ComboBox Style Example"
 
 Global window:TGadget = CreateWindow( AppTitle, 100, 100, 300, 200, Null, WINDOW_TITLEBAR|WINDOW_STATUS )

+ 5 - 3
maxgui.mod/doc/createhtmlview.bmx

@@ -1,8 +1,10 @@
 ' createhtmlview.bmx
+SuperStrict
 
 Import MaxGui.Drivers
-
-Strict 
+?linux
+Import MaxGui.gtk3webkit2gtk
+?
 
 Local window:TGadget
 Local htmlview:TGadget
@@ -12,7 +14,7 @@ window=CreateWindow("My Window",30,20,600,440,,15|WINDOW_ACCEPTFILES)
 htmlview=CreateHTMLView(0,0,ClientWidth(window),ClientHeight(window),window)
 SetGadgetLayout htmlview,1,1,1,1 
 
-HtmlViewGo htmlview,"www.blitzmax.com"
+HtmlViewGo htmlview,"blitzmax.org"
 
 While WaitEvent()
 	Print CurrentEvent.ToString()

+ 1 - 1
maxgui.mod/doc/createlabel.bmx

@@ -1,8 +1,8 @@
 ' createlabel.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget
 

+ 2 - 2
maxgui.mod/doc/createlistbox.bmx

@@ -1,9 +1,9 @@
 ' createlistbox.bmx
-
-Strict
+SuperStrict
 
 Import MaxGui.Drivers
 
+
 AppTitle = "ListBox Example"
 
 Global window:TGadget = CreateWindow( AppTitle, 100, 100, 200, 200, Null, WINDOW_TITLEBAR|WINDOW_STATUS|WINDOW_RESIZABLE )

+ 10 - 10
maxgui.mod/doc/createmenu.bmx

@@ -1,25 +1,25 @@
 ' createmenu.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget
 Local filemenu:TGadget
 Local editmenu:TGadget
 Local helpmenu:TGadget
 
-Const MENU_NEW=101
-Const MENU_OPEN=102
-Const MENU_SAVE=103
-Const MENU_CLOSE=104
-Const MENU_EXIT=105
+Const MENU_NEW:Int=101
+Const MENU_OPEN:Int=102
+Const MENU_SAVE:Int=103
+Const MENU_CLOSE:Int=104
+Const MENU_EXIT:Int=105
 
-Const MENU_CUT=106
-Const MENU_COPY=107
-Const MENU_PASTE=108
+Const MENU_CUT:Int=106
+Const MENU_COPY:Int=107
+Const MENU_PASTE:Int=108
 
-Const MENU_ABOUT=109
+Const MENU_ABOUT:Int=109
 
 window=CreateWindow("My Window",40,40,320,240)
 

+ 2 - 2
maxgui.mod/doc/createpanel.bmx

@@ -1,9 +1,9 @@
 ' createpanel.bmx
-
-Strict
+SuperStrict
 
 Import MaxGui.Drivers
 
+
 AppTitle = "Panel Example"
 
 Local window:TGadget = CreateWindow( AppTitle, 100, 100, 440, 240, Null, WINDOW_TITLEBAR|WINDOW_CLIENTCOORDS|WINDOW_RESIZABLE )

+ 2 - 2
maxgui.mod/doc/createprogbar.bmx

@@ -1,8 +1,8 @@
 ' createprogbar.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget=CreateWindow("My Window",50,50,240,100,,WINDOW_TITLEBAR)
 
@@ -17,7 +17,7 @@ While WaitEvent()
 		Case EVENT_WINDOWCLOSE
 			End
 		Case EVENT_TIMERTICK
-			Local t=EventData()
+			Local t:Int=EventData()
 			If t=50 End
 			UpdateProgBar progbar,t/50.0
 	End Select

+ 2 - 2
maxgui.mod/doc/createslider.bmx

@@ -1,8 +1,8 @@
 ' createslider.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget=CreateWindow("My Window",0,0,240,240,,WINDOW_TITLEBAR)
 
@@ -21,7 +21,7 @@ slider[2]=CreateSlider(30,30,100,24,window,SLIDER_HORIZONTAL|SLIDER_TRACKBAR)
 
 Local trackbar:TGadget[5]
 
-For Local i=0 To 4
+For Local i:Int=0 To 4
 	trackbar[i]=CreateSlider(30+i*20,50,16,60,window,SLIDER_VERTICAL|SLIDER_TRACKBAR)
 Next
 

+ 1 - 1
maxgui.mod/doc/createtabber.bmx

@@ -1,8 +1,8 @@
 ' createtabber.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget
 Local tabber:TGadget

+ 1 - 1
maxgui.mod/doc/createtextarea.bmx

@@ -1,8 +1,8 @@
 ' createtextarea.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Global window:TGadget = CreateWindow( "My Window", 130, 20, 400, 400 )
 

+ 1 - 1
maxgui.mod/doc/createtextfield.bmx

@@ -1,8 +1,8 @@
 ' createtextfield.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget
 Local textfield:TGadget

+ 1 - 1
maxgui.mod/doc/createtimer.bmx

@@ -1,8 +1,8 @@
 ' createtimer.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget
 Local label:TGadget

+ 2 - 2
maxgui.mod/doc/createtoolbar.bmx

@@ -1,9 +1,9 @@
 ' createtoolbar.bmx
-
-Strict
+SuperStrict
 
 Import MaxGui.Drivers
 
+
 AppTitle = "ToolBar Example"
 
 Global window:TGadget = CreateWindow( AppTitle, 100, 100, 400, 32, Null, WINDOW_TITLEBAR|WINDOW_STATUS|WINDOW_RESIZABLE|WINDOW_CLIENTCOORDS )

+ 1 - 1
maxgui.mod/doc/createtreeview.bmx

@@ -1,8 +1,8 @@
 ' createtreeview.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget=CreateWindow("My Window",50,50,240,240,Null,WINDOW_TITLEBAR|WINDOW_CLIENTCOORDS)
 Local treeview:TGadget=CreateTreeView(5,5,ClientWidth(window)-10,ClientHeight(window)-10,window)

+ 2 - 2
maxgui.mod/doc/createwindow.bmx

@@ -1,8 +1,8 @@
 ' createwindow.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 AppTitle = "CreateWindow() Example"
 
@@ -33,4 +33,4 @@ Repeat
 		Case EVENT_APPTERMINATE, EVENT_WINDOWCLOSE
 			End
 	End Select
-Forever
+Forever

+ 2 - 2
maxgui.mod/doc/gadgetclass.bmx

@@ -1,7 +1,8 @@
-Strict
+SuperStrict
 
 Import MaxGUI.Drivers
 
+
 AppTitle = "GadgetClass() Example"
 Global wndMain:TGadget = CreateWindow(AppTitle,100,100,220,200,Null,WINDOW_TITLEBAR|WINDOW_CLIENTCOORDS|WINDOW_STATUS)
 
@@ -34,4 +35,3 @@ Repeat
 	EndSelect
 	
 Forever
-	

+ 2 - 2
maxgui.mod/doc/lookupguicolor.bmx

@@ -1,9 +1,9 @@
 ' lookupguicolor.bmx
-
-Strict
+SuperStrict
 
 Import MaxGUI.Drivers
 
+
 AppTitle = "LookupGuiColor() Example"
 
 Global wndMain:TGadget = CreateWindow( AppTitle, 100, 100, 300, 200, Null, WINDOW_TITLEBAR|WINDOW_STATUS )

+ 12 - 9
maxgui.mod/doc/lookupguifont.bmx

@@ -1,16 +1,18 @@
 ' lookupguifont.bmx
-
-Strict
+SuperStrict
 
 Import MaxGUI.Drivers
 
+
 AppTitle = "LookupGuiFont() Example"
 
-Const strSampleText$ = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla eget mauris quis dolor "+..
-"ullamcorper dapibus. Duis facilisis ullamcorper metus. Pellentesque eget enim. Vivamus auctor hendrerit turpis. " + ..
-"Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vivamus tincidunt leo quis urna." 
+Const strSampleText:String = """
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla eget mauris quis dolor
+ullamcorper dapibus. Duis facilisis ullamcorper metus. Pellentesque eget enim. Vivamus auctor hendrerit turpis.
+Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vivamus tincidunt leo quis urna.
+"""
 
-Const intWindowFlags% = WINDOW_TITLEBAR|WINDOW_RESIZABLE|WINDOW_STATUS|WINDOW_CLIENTCOORDS
+Const intWindowFlags:Int = WINDOW_TITLEBAR|WINDOW_RESIZABLE|WINDOW_STATUS|WINDOW_CLIENTCOORDS
 
 Global wndMain:TGadget = CreateWindow( AppTitle, 100, 100, 500, 300, Null, intWindowFlags )
 	SetMinWindowSize( wndMain, ClientWidth(wndMain), ClientHeight(wndMain) )
@@ -26,13 +28,14 @@ Global txtPreview:TGadget = CreateTextArea(200,0,300,ClientHeight(wndMain),wndMa
 	SetGadgetLayout txtPreview,EDGE_ALIGNED,EDGE_ALIGNED,EDGE_ALIGNED,EDGE_ALIGNED
 	SetTextAreaText( txtPreview, strSampleText )
 
-Global strFontString$
+Global strFontString:String
 
 ChooseFont( LookupGuiFont() )
 
 Repeat
 	Select WaitEvent()
-		Case EVENT_APPTERMINATE, EVENT_WINDOWCLOSE;End
+		Case EVENT_APPTERMINATE, EVENT_WINDOWCLOSE
+			End
 		Case EVENT_GADGETACTION, EVENT_GADGETSELECT
 			Select EventSource()
 				Case lstFontTypes
@@ -47,4 +50,4 @@ Forever
 Function ChooseFont( pFont:TGuiFont )
 	SetGadgetFont( txtPreview, pFont )
 	strFontString$ = FontName(pFont) + ", " + Int(FontSize(pFont)) + "pt"
-EndFunction
+EndFunction

+ 2 - 1
maxgui.mod/doc/popupwindowmenu.bmx

@@ -1,7 +1,8 @@
-Strict
+SuperStrict
 
 Import MaxGui.Drivers
 
+
 Local menu:TGadget
 Local window:TGadget
 Local panel:TGadget

+ 4 - 5
maxgui.mod/doc/redrawgadget.bmx

@@ -1,10 +1,9 @@
 ' redrawgadget.bmx
-
 ' version 3 - fixed to be compatible with virtual resolutions
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict
 
 Type TApplet 
 
@@ -14,7 +13,7 @@ Type TApplet
 		AddHook EmitEventHook,eventhook,Self
 	End Method
 
-	Function eventhook:Object(id,data:Object,context:Object)
+	Function eventhook:Object(id:Int,data:Object,context:Object)
 		Local event:TEvent = TEvent(data)
 		Local app:TApplet = TApplet(context)
 		app.OnEvent( event )
@@ -65,8 +64,8 @@ Type TSpinningApplet Extends TApplet
 		
 		window = CreateWindow( name, 20, 20, 512, 512 )
 		
-		Local w = ClientWidth(window)
-		Local h = ClientHeight(window)
+		Local w:Int = ClientWidth(window)
+		Local h:Int = ClientHeight(window)
 		
 		canvas = CreateCanvas( 0, 0, w, h, window )
 		SetGadgetLayout( canvas, EDGE_ALIGNED, EDGE_ALIGNED, EDGE_ALIGNED, EDGE_ALIGNED )

+ 2 - 2
maxgui.mod/doc/requestcolor.bmx

@@ -1,12 +1,12 @@
 ' requestcolor.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget
 Local panel:TGadget
-Local red,green,blue
+Local red:Int,green:Int,blue:Int
 
 window=CreateWindow("RequestColor",40,40,320,240)
 panel=CreatePanel(20,20,32,32,window,PANEL_ACTIVE|PANEL_SUNKEN)

+ 1 - 1
maxgui.mod/doc/requestfont.bmx

@@ -1,8 +1,8 @@
 ' requestfont.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 AppTitle = "RequestFont() Example"
 

+ 2 - 2
maxgui.mod/doc/setgadgetfilter.bmx

@@ -1,8 +1,8 @@
 ' setgadgetfilter.bmx
+SuperStrict
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget
 Global textarea:TGadget
@@ -19,7 +19,7 @@ SetGadgetFilter textarea,filter
 
 Print "KEY_TAB="+KEY_TAB
 
-Function filter(event:TEvent,context:Object)
+Function filter:Int(event:TEvent,context:Object)
 	Select event.id
 		Case EVENT_KEYDOWN
 			Print "filtering keydown:"+event.data+","+event.mods

+ 1 - 1
maxgui.mod/doc/setpointer.bmx

@@ -1,8 +1,8 @@
 ' setpointer.bmx
+SuperStrict 
 
 Import MaxGui.Drivers
 
-Strict 
 
 Local window:TGadget
 Local combo:TGadget