فهرست منبع

Added overrides.

woollybah 6 سال پیش
والد
کامیت
6544a47a65
44فایلهای تغییر یافته به همراه353 افزوده شده و 353 حذف شده
  1. 6 6
      bankstream.mod/bankstream.bmx
  2. 6 6
      blitz.mod/blitz.bmx
  3. 1 1
      bmploader.mod/bmploader.bmx
  4. 4 4
      collections.mod/errors.bmx
  5. 24 24
      d3d9max2d.mod/d3d9max2d.bmx
  6. 14 14
      directsoundaudio.mod/directsoundaudio.bmx
  7. 8 8
      dxgraphics.mod/d3d9graphics.bmx
  8. 11 11
      endianstream.mod/endianstream.bmx
  9. 1 1
      event.mod/event.bmx
  10. 14 14
      freeaudioaudio.mod/freeaudioaudio.bmx
  11. 9 9
      freetypefont.mod/freetypefont.bmx
  12. 11 11
      glgraphics.mod/source.bmx
  13. 24 24
      glmax2d.mod/glmax2d.bmx
  14. 1 1
      graphics.mod/graphics.bmx
  15. 1 1
      httpstream.mod/httpstream.bmx
  16. 1 1
      jpgloader.mod/jpgloader.bmx
  17. 3 3
      map.mod/intmap.bmx
  18. 4 4
      map.mod/map.bmx
  19. 3 3
      map.mod/objectmap.bmx
  20. 3 3
      map.mod/ptrmap.bmx
  21. 3 3
      map.mod/stringmap.bmx
  22. 7 7
      max2d.mod/max2d.bmx
  23. 2 2
      oggloader.mod/oggloader.bmx
  24. 15 15
      openalaudio.mod/openalaudio.bmx
  25. 1 1
      pngloader.mod/pngloader.bmx
  26. 6 6
      ramstream.mod/ramstream.bmx
  27. 5 5
      socket.mod/socket.bmx
  28. 5 5
      socketstream.mod/socketstream.bmx
  29. 4 4
      standardio.mod/standardio.bmx
  30. 1 1
      stbimageloader.mod/stbimageloader.bmx
  31. 34 34
      stream.mod/stream.bmx
  32. 1 1
      stringbuilder.mod/stringbuilder.bmx
  33. 1 1
      system.mod/driver.bmx
  34. 18 18
      systemdefault.mod/system.linux.bmx
  35. 20 20
      systemdefault.mod/system.macos.bmx
  36. 20 20
      systemdefault.mod/system.win32.bmx
  37. 19 19
      textstream.mod/textstream.bmx
  38. 1 1
      threadpool.mod/threadpool.bmx
  39. 7 7
      timerdefault.mod/timerdefault.bmx
  40. 11 11
      volumes.mod/vol_linux.bmx
  41. 11 11
      volumes.mod/vol_mac.bmx
  42. 10 10
      volumes.mod/vol_win.bmx
  43. 1 1
      wavloader.mod/wavloader.bmx
  44. 1 1
      xml.mod/xml.bmx

+ 6 - 6
bankstream.mod/bankstream.bmx

@@ -27,15 +27,15 @@ Type TBankStream Extends TStream
 
 	Field _pos:Long,_bank:TBank
 
-	Method Pos:Long()
+	Method Pos:Long() Override
 		Return _pos
 	End Method
 
-	Method Size:Long()
+	Method Size:Long() Override
 		Return _bank.Size()
 	End Method
 
-	Method Seek:Long( pos:Long, whence:Int = SEEK_SET_ )
+	Method Seek:Long( pos:Long, whence:Int = SEEK_SET_ ) Override
 		If whence = SEEK_SET_ Then
 			If pos<0 pos=0 Else If pos>_bank.Size() pos=_bank.Size()
 		ElseIf whence = SEEK_END_ Then
@@ -52,7 +52,7 @@ Type TBankStream Extends TStream
 		Return _pos
 	End Method
 	
-	Method Read:Long( buf:Byte Ptr,count:Long )
+	Method Read:Long( buf:Byte Ptr,count:Long ) Override
 		If count<=0 Or _pos>=_bank.Size() Return 0
 		If _pos+count>_bank.Size() count=_bank.Size()-_pos
 		MemCopy buf,_bank.Buf()+_pos,Size_T(count)
@@ -60,7 +60,7 @@ Type TBankStream Extends TStream
 		Return count
 	End Method
 
-	Method Write:Long( buf:Byte Ptr,count:Long )
+	Method Write:Long( buf:Byte Ptr,count:Long ) Override
 		If count<=0 Or _pos>_bank.Size() Return 0
 		If _pos+count>_bank.Size() _bank.Resize Size_T(_pos+count)
 		MemCopy _bank.Buf()+_pos,buf,Size_T(count)
@@ -97,7 +97,7 @@ End Function
 
 Type TBankStreamFactory Extends TStreamFactory
 
-	Method CreateStream:TBankStream( url:Object,proto$,path$,readable:Int,writeable:Int )
+	Method CreateStream:TBankStream( url:Object,proto$,path$,readable:Int,writeable:Int ) Override
 		Local bank:TBank=TBank(url)
 		If bank Return CreateBankStream( bank )
 	End Method

+ 6 - 6
blitz.mod/blitz.bmx

@@ -174,7 +174,7 @@ bbdoc: Null object exception
 about: Thrown when a field or method of a Null object is accessed. (only in debug mode)
 End Rem
 Type TNullObjectException Extends TBlitzException
-	Method ToString$()
+	Method ToString$() Override
 		Return "Attempt to access field or method of Null object"
 	End Method
 End Type
@@ -184,7 +184,7 @@ bbdoc: Null method exception
 about: Thrown when an abstract method is called.
 End Rem
 Type TNullMethodException Extends TBlitzException
-	Method ToString$()
+	Method ToString$() Override
 		Return "Attempt to call abstract method"
 	End Method
 End Type
@@ -194,7 +194,7 @@ bbdoc: Null function exception
 about: Thrown when an uninitialized function pointer is called.
 End Rem
 Type TNullFunctionException Extends TBlitzException
-	Method ToString$()
+	Method ToString$() Override
 		Return "Attempt to call uninitialized function pointer"
 	End Method
 End Type
@@ -204,7 +204,7 @@ bbdoc: Null method exception
 about: Thrown when an array element with an index outside the valid range of the array (0 to array.length-1) is accessed. (only in debug mode)
 End Rem
 Type TArrayBoundsException Extends TBlitzException
-	Method ToString$()
+	Method ToString$() Override
 		Return "Attempt to index array element beyond array length"
 	End Method
 End Type
@@ -214,7 +214,7 @@ bbdoc: Out of data exception
 about: Thrown when #ReadData is used but not enough data is left to read. (only in debug mode)
 End Rem
 Type TOutOfDataException Extends TBlitzException
-	Method ToString$()
+	Method ToString$() Override
 		Return "Attempt to read beyond end of data"
 	End Method
 End Type
@@ -225,7 +225,7 @@ about: Thrown by #RuntimeError.
 End Rem
 Type TRuntimeException Extends TBlitzException
 	Field error$
-	Method ToString$()
+	Method ToString$() Override
 		Return error
 	End Method
 	Function Create:TRuntimeException( error$ )

+ 1 - 1
bmploader.mod/bmploader.bmx

@@ -28,7 +28,7 @@ Import BRL.EndianStream
 
 Type TPixmapLoaderBMP Extends TPixmapLoader
 
-	Method LoadPixmap:TPixmap( stream:TStream )
+	Method LoadPixmap:TPixmap( stream:TStream ) Override
 
 		stream=LittleEndianStream( stream )
 				

+ 4 - 4
collections.mod/errors.bmx

@@ -2,7 +2,7 @@ SuperStrict
 
 Type TIndexOutOfBoundsException Extends TBlitzException
 
-	Method ToString:String()
+	Method ToString:String() Override
 		Return "Attempt to index element out of bounds."
 	End Method
 
@@ -10,7 +10,7 @@ End Type
 
 Type TNoSuchElementException Extends TBlitzException
 
-	Method ToString:String()
+	Method ToString:String() Override
 		Return "No such Element."
 	End Method
 
@@ -18,7 +18,7 @@ End Type
 
 Type TUnsupportedOperationException Extends TBlitzException
 
-	Method ToString:String()
+	Method ToString:String() Override
 		Return "Unsupported operation."
 	End Method
 
@@ -32,7 +32,7 @@ Type TIllegalStateException Extends TBlitzException
 		Self.message = message
 	End Method
 
-	Method ToString:String()
+	Method ToString:String() Override
 		If message Then
 			Return message
 		End If

+ 24 - 24
d3d9max2d.mod/d3d9max2d.bmx

@@ -184,7 +184,7 @@ Type TD3D9ImageFrame Extends TImageFrame
 		Return Self
 	End Method
 	
-	Method Draw( x0#,y0#,x1#,y1#,tx#,ty#,sx#,sy#,sw#,sh# )
+	Method Draw( x0#,y0#,x1#,y1#,tx#,ty#,sx#,sy#,sw#,sh# ) Override
 		Local u0#=sx * _uscale
 		Local v0#=sy * _vscale
 		Local u1#=(sx+sw) * _uscale
@@ -241,7 +241,7 @@ End Type
 
 Type TD3D9Max2DDriver Extends TMax2dDriver
 
-	Method ToString$()
+	Method ToString$() Override
 		Return "DirectX9"
 	End Method
 
@@ -259,22 +259,22 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 	End Method
 
 	'***** TGraphicsDriver *****
-	Method GraphicsModes:TGraphicsMode[]()
+	Method GraphicsModes:TGraphicsMode[]() Override
 		Return D3D9GraphicsDriver().GraphicsModes()
 	End Method
 	
-	Method AttachGraphics:TGraphics( widget:Byte Ptr,flags )
+	Method AttachGraphics:TGraphics( widget:Byte Ptr,flags ) Override
 		Local g:TD3D9Graphics=D3D9GraphicsDriver().AttachGraphics( widget,flags )
 		If g Return TMax2DGraphics.Create( g,Self )
 	End Method
 	
-	Method CreateGraphics:TGraphics( width,height,depth,hertz,flags )
+	Method CreateGraphics:TGraphics( width,height,depth,hertz,flags ) Override
 		Local g:TD3D9Graphics=D3D9GraphicsDriver().CreateGraphics( width,height,depth,hertz,flags )
 		If Not g Return Null
 		Return TMax2DGraphics.Create( g,Self )
 	End Method
 	
-	Method SetGraphics( g:TGraphics )
+	Method SetGraphics( g:TGraphics ) Override
 
 		If Not g
 			If _d3dDev
@@ -308,7 +308,7 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 		
 	End Method
 	
-	Method Flip( sync )
+	Method Flip( sync ) Override
 		_d3dDev.EndScene
 		If D3D9GraphicsDriver().Flip( sync )
 			_d3dDev.BeginScene
@@ -366,11 +366,11 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 	End Method
 
 	'***** TMax2DDriver *****
-	Method CreateFrameFromPixmap:TImageFrame( pixmap:TPixmap,flags )
+	Method CreateFrameFromPixmap:TImageFrame( pixmap:TPixmap,flags ) Override
 		Return New TD3D9ImageFrame.Create( pixmap,flags )
 	End Method
 	
-	Method SetBlend( blend )
+	Method SetBlend( blend ) Override
 		If blend=_active_blend Return
 		Select blend
 		Case SOLIDBLEND
@@ -398,7 +398,7 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 		_active_blend=blend
 	End Method
 	
-	Method SetAlpha( alpha# )
+	Method SetAlpha( alpha# ) Override
 		alpha=Max(Min(alpha,1),0)
 		_color=(Int(255*alpha) Shl 24)|(_color&$ffffff)
 		_iverts[3]=_color
@@ -407,7 +407,7 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 		_iverts[21]=_color
 	End Method
 	
-	Method SetColor( red,green,blue )
+	Method SetColor( red,green,blue ) Override
 		red=Max(Min(red,255),0)
 		green=Max(Min(green,255),0)
 		blue=Max(Min(blue,255),0)
@@ -418,14 +418,14 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 		_iverts[21]=_color
 	End Method
 	
-	Method SetClsColor( red,green,blue )
+	Method SetClsColor( red,green,blue ) Override
 		red=Max(Min(red,255),0)
 		green=Max(Min(green,255),0)
 		blue=Max(Min(blue,255),0)
 		_clscolor=$ff000000|(red Shl 16)|(green Shl 8)|blue
 	End Method
 	
-	Method SetViewport( x,y,width,height )
+	Method SetViewport( x,y,width,height ) Override
 		If x=0 And y=0 And width=_gw And height=_gh 'GraphicsWidth() And height=GraphicsHeight()
 			_d3dDev.SetRenderState D3DRS_SCISSORTESTENABLE,False
 		Else
@@ -435,29 +435,29 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 		EndIf
 	End Method
 	
-	Method SetTransform( xx#,xy#,yx#,yy# )
+	Method SetTransform( xx#,xy#,yx#,yy# ) Override
 		_ix=xx
 		_iy=xy
 		_jx=yx
 		_jy=yy		
 	End Method
 	
-	Method SetLineWidth( width# )
+	Method SetLineWidth( width# ) Override
 		_lineWidth=width
 	End Method
 	
-	Method Cls()
+	Method Cls() Override
 		_d3dDev.Clear 0,Null,D3DCLEAR_TARGET,_clscolor,0,0
 	End Method
 	
-	Method Plot( x#,y# )
+	Method Plot( x#,y# ) Override
 		_fverts[0]=x+.5
 		_fverts[1]=y+.5
 		DisableTex
 		_d3dDev.DrawPrimitiveUP D3DPT_POINTLIST,1,_fverts,24
 	End Method
 	
-	Method DrawLine( x0#,y0#,x1#,y1#,tx#,ty# )
+	Method DrawLine( x0#,y0#,x1#,y1#,tx#,ty# ) Override
 		Local lx0# = x0*_ix + y0*_iy + tx
 		Local ly0# = x0*_jx + y0*_jy + ty
 		Local lx1# = x1*_ix + y1*_iy + tx
@@ -495,7 +495,7 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 		_d3dDev.DrawPrimitiveUP D3DPT_TRIANGLESTRIP,2,_fverts,24
 	End Method
 	
-	Method DrawRect( x0#,y0#,x1#,y1#,tx#,ty# )
+	Method DrawRect( x0#,y0#,x1#,y1#,tx#,ty# ) Override
 		_fverts[0]  = x0*_ix + y0*_iy + tx
 		_fverts[1]  = x0*_jx + y0*_jy + ty
 		_fverts[6]  = x1*_ix + y0*_iy + tx
@@ -508,7 +508,7 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 		_d3dDev.DrawPrimitiveUP D3DPT_TRIANGLESTRIP,2,_fverts,24
 	End Method
 	
-	Method DrawOval( x0#,y0#,x1#,y1#,tx#,ty# )
+	Method DrawOval( x0#,y0#,x1#,y1#,tx#,ty# ) Override
 		Local xr#=(x1-x0)*.5
 		Local yr#=(y1-y0)*.5
 		Local segs=Abs(xr)+Abs(yr)
@@ -529,7 +529,7 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 		_d3dDev.DrawPrimitiveUP D3DPT_TRIANGLEFAN,segs-2,fverts,24
 	End Method
 	
-	Method DrawPoly( verts#[],handlex#,handley#,tx#,ty# )
+	Method DrawPoly( verts#[],handlex#,handley#,tx#,ty# ) Override
 		If verts.length<6 Or (verts.length&1) Return
 		Local segs=verts.length/2
 		Local fverts#[segs*6]
@@ -546,7 +546,7 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 	End Method
 		
 	'GetDC/BitBlt MUCH faster than locking backbuffer!	
-	Method DrawPixmap( pixmap:TPixmap,x,y )
+	Method DrawPixmap( pixmap:TPixmap,x,y ) Override
 		Local width=pixmap.width,height=pixmap.height
 	
 		Local dstsurf:IDirect3DSurface9' = New IDirect3DSurface9
@@ -577,7 +577,7 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 	End Method
 
 	'GetDC/BitBlt MUCH faster than locking backbuffer!	
-	Method GrabPixmap:TPixmap( x,y,width,height )
+	Method GrabPixmap:TPixmap( x,y,width,height ) Override
 	
 		Local srcsurf:IDirect3DSurface9
 		If _d3dDev.GetRenderTarget( 0,srcsurf )<0
@@ -626,7 +626,7 @@ Type TD3D9Max2DDriver Extends TMax2dDriver
 		Return pixmap
 	End Method
 	
-	Method SetResolution( width#,height# )
+	Method SetResolution( width#,height# ) Override
 		Local matrix#[]=[..
 		2.0/width,0.0,0.0,0.0,..
 		 0.0,-2.0/height,0.0,0.0,..

+ 14 - 14
directsoundaudio.mod/directsoundaudio.bmx

@@ -69,13 +69,13 @@ Type TDirectSoundSound Extends TSound
 		EndIf
 	End Method
 
-	Method Play:TDirectSoundChannel( alloced_channel:TChannel=Null )
+	Method Play:TDirectSoundChannel( alloced_channel:TChannel=Null ) Override
 		Local t:TDirectSoundChannel=Cue( alloced_channel )
 		t.SetPaused False
 		Return t
 	End Method
 
-	Method Cue:TDirectSoundChannel( alloced_channel:TChannel=Null )
+	Method Cue:TDirectSoundChannel( alloced_channel:TChannel=Null ) Override
 		Local t:TDirectSoundChannel=TDirectSoundChannel( alloced_channel )
 		If t
 			Assert t._static
@@ -139,7 +139,7 @@ Type TDirectSoundChannel Extends TChannel
 		If _buf._paused Stop
 	End Method
 
-	Method Stop()
+	Method Stop() Override
 		If Not _buf Or _seq<>_buf._seq Return
 		bmx_directsound_IDirectSoundBuffer_stop(_buf._buffer)
 		'_buf._buffer.Stop
@@ -148,7 +148,7 @@ Type TDirectSoundChannel Extends TChannel
 		_buf=Null
 	End Method
 	
-	Method SetPaused( paused:Int )
+	Method SetPaused( paused:Int ) Override
 		If Not _buf Or _seq<>_buf._seq Return
 		If Not _buf.Active()
 			_buf._seq:+1
@@ -163,14 +163,14 @@ Type TDirectSoundChannel Extends TChannel
 		_buf._paused=paused
 	End Method
 	
-	Method SetVolume( volume# )
+	Method SetVolume( volume# ) Override
 		volume=Min(Max(volume,0),1)^.1
 		_volume=volume
 		If Not _buf Or _seq<>_buf._seq Return
 		bmx_directsound_IDirectSoundBuffer_setvolume(_buf._buffer, Int((1-volume)*-10000))
 	End Method
 	
-	Method SetPan( pan# )
+	Method SetPan( pan# ) Override
 		pan=Min(Max(pan,-1),1)
 		pan=Sgn(pan) * (1-(1-Abs(pan))^.1)		
 		_pan=pan
@@ -178,17 +178,17 @@ Type TDirectSoundChannel Extends TChannel
 		bmx_directsound_IDirectSoundBuffer_setpan(_buf._buffer, Int(pan*10000))
 	End Method
 	
-	Method SetDepth( depth# )
+	Method SetDepth( depth# ) Override
 		If Not _buf Or _seq<>_buf._seq Return
 	End Method
 	
-	Method SetRate( rate# )
+	Method SetRate( rate# ) Override
 		_rate=rate
 		If Not _buf Or _seq<>_buf._seq Return
 		bmx_directsound_IDirectSoundBuffer_setfrequency(_buf._buffer, Int(_hertz * rate))
 	End Method
 	
-	Method Playing:Int()
+	Method Playing:Int() Override
 		If Not _buf Or _seq<>_buf._seq Return False
 		Return _buf.Playing()
 	End Method
@@ -239,11 +239,11 @@ End Type
 
 Type TDirectSoundAudioDriver Extends TAudioDriver
 
-	Method Name$()
+	Method Name$() Override
 		Return _name
 	End Method
 	
-	Method Startup:Int()
+	Method Startup:Int() Override
 		If bmx_directsound_IDirectSound_create(Varptr _dsound)>=0
 			If bmx_directsound_IDirectSound_setcooperativeLevel(_dsound, GetDesktopWindow(),DSSCL_PRIORITY )>=0
 				Rem
@@ -273,18 +273,18 @@ Type TDirectSoundAudioDriver Extends TAudioDriver
 		EndIf
 	End Method
 	
-	Method Shutdown()
+	Method Shutdown() Override
 		_seq:+1
 		_driver=Null
 		_lonely=Null
 		bmx_directsound_IDirectSound_release(_dsound)
 	End Method
 
-	Method CreateSound:TDirectSoundSound( sample:TAudioSample,flags:Int )
+	Method CreateSound:TDirectSoundSound( sample:TAudioSample,flags:Int ) Override
 		Return TDirectSoundSound.Create( sample,flags )
 	End Method
 	
-	Method AllocChannel:TDirectSoundChannel()
+	Method AllocChannel:TDirectSoundChannel() Override
 		Return TDirectSoundChannel.Create( True )
 	End Method
 	

+ 8 - 8
dxgraphics.mod/d3d9graphics.bmx

@@ -278,11 +278,11 @@ Type TD3D9Graphics Extends TGraphics
 		
 	End Method
 
-	Method Driver:TGraphicsDriver()
+	Method Driver:TGraphicsDriver() Override
 		Return _driver
 	End Method
 	
-	Method GetSettings:Int( width:Int Var,height:Int Var,depth:Int Var,hertz:Int Var,flags:Int Var )
+	Method GetSettings:Int( width:Int Var,height:Int Var,depth:Int Var,hertz:Int Var,flags:Int Var ) Override
 		'
 		ValidateSize
 		'
@@ -293,7 +293,7 @@ Type TD3D9Graphics Extends TGraphics
 		flags=_flags
 	End Method
 
-	Method Close:Int()
+	Method Close:Int() Override
 		If Not _hwnd Return False
 		CloseD3DDevice
 		If Not _attached DestroyWindow( _hwnd )
@@ -380,15 +380,15 @@ Type TD3D9GraphicsDriver Extends TGraphicsDriver
 		Return Self
 	End Method
 	
-	Method GraphicsModes:TGraphicsMode[]()
+	Method GraphicsModes:TGraphicsMode[]() Override
 		Return _modes
 	End Method
 	
-	Method AttachGraphics:TD3D9Graphics( widget:Byte Ptr,flags:Int )
+	Method AttachGraphics:TD3D9Graphics( widget:Byte Ptr,flags:Int ) Override
 		Return New TD3D9Graphics.Attach( widget:Byte Ptr,flags:Int )
 	End Method
 	
-	Method CreateGraphics:TD3D9Graphics( width:Int,height:Int,depth:Int,hertz:Int,flags:Int)
+	Method CreateGraphics:TD3D9Graphics( width:Int,height:Int,depth:Int,hertz:Int,flags:Int) Override
 		Return New TD3D9Graphics.Create( width,height,depth,hertz,flags )
 	End Method
 
@@ -396,11 +396,11 @@ Type TD3D9GraphicsDriver Extends TGraphicsDriver
 		Return _graphics
 	End Method
 		
-	Method SetGraphics( g:TGraphics )
+	Method SetGraphics( g:TGraphics ) Override
 		_graphics=TD3D9Graphics( g )
 	End Method
 	
-	Method Flip( sync:Int )
+	Method Flip( sync:Int ) Override
 		Local present:Int = _graphics.Flip(sync)
 		If UseDX9RenderLagFix Then
 			Local pixelsdrawn:Int

+ 11 - 11
endianstream.mod/endianstream.bmx

@@ -38,66 +38,66 @@ Type TXEndianStream Extends TStreamWrapper
 		t=buf[3];buf[3]=buf[4];buf[4]=t
 	End Method
 
-	Method ReadShort:Int()
+	Method ReadShort:Int() Override
 		Local q:Short
 		ReadBytes Varptr q,2
 		Swap2 Varptr q
 		Return q
 	End Method
 
-	Method WriteShort( n:Int )
+	Method WriteShort( n:Int ) Override
 		Local q:Short=n
 		Swap2 Varptr q
 		WriteBytes Varptr q,2
 	End Method
 
-	Method ReadInt:Int()
+	Method ReadInt:Int() Override
 		Local q:Int
 		ReadBytes Varptr q,4
 		Swap4 Varptr q
 		Return q
 	End Method
 
-	Method WriteInt( n:Int )
+	Method WriteInt( n:Int ) Override
 		Local q:Int=n
 		Swap4 Varptr q
 		WriteBytes Varptr q,4
 	End Method
 
-	Method ReadLong:Long()
+	Method ReadLong:Long() Override
 		Local q:Long
 		ReadBytes Varptr q,8
 		Swap8 Varptr q
 		Return q
 	End Method
 
-	Method WriteLong( n:Long )
+	Method WriteLong( n:Long ) Override
 		Local q:Long=n
 		Swap8 Varptr q
 		WriteBytes Varptr q,8
 	End Method
 	
-	Method ReadFloat#()
+	Method ReadFloat#() Override
 		Local q:Float
 		ReadBytes Varptr q,4
 		Swap4 Varptr q
 		Return q
 	End Method
 
-	Method WriteFloat( n# )
+	Method WriteFloat( n# ) Override
 		Local q:Float=n
 		Swap4 Varptr q
 		WriteBytes Varptr q,4
 	End Method
 
-	Method ReadDouble!()
+	Method ReadDouble!() Override
 		Local q:Double
 		ReadBytes Varptr q,8
 		Swap8 Varptr q
 		Return q
 	End Method
 
-	Method WriteDouble( n! )
+	Method WriteDouble( n! ) Override
 		Local q:Double=n
 		Swap8 Varptr q
 		WriteBytes Varptr q,8
@@ -145,7 +145,7 @@ Function LittleEndianStream:TStream( stream:TStream )
 End Function
 
 Type TXEndianStreamFactory Extends TStreamFactory
-	Method CreateStream:TStream( url:Object,proto$,path$,readable:Int,writeable:Int )
+	Method CreateStream:TStream( url:Object,proto$,path$,readable:Int,writeable:Int ) Override
 		Select proto$
 		Case "bigendian"
 			Return TXEndianStream.BigEndian( OpenStream(path,readable,writeable) )

+ 1 - 1
event.mod/event.bmx

@@ -96,7 +96,7 @@ Type TEvent
 	about:
 	This method is mainly useful for debugging purposes.
 	End Rem	
-	Method ToString$()
+	Method ToString$() Override
 		Local t$=DescriptionForId( id )
 		If Not t
 			If id & EVENT_USEREVENTMASK

+ 14 - 14
freeaudioaudio.mod/freeaudioaudio.bmx

@@ -53,7 +53,7 @@ Type TFreeAudioSound Extends TSound
 		If CLOG WriteStdout "Deleted FreeAudio sound "+Long(fa_sound)+"~n"
 	End Method
 
-	Method Play:TFreeAudioChannel( alloced_channel:TChannel )
+	Method Play:TFreeAudioChannel( alloced_channel:TChannel ) Override
 		Local channel:TFreeAudioChannel,fa_channel:Int
 		If alloced_channel
 			channel=TFreeAudioChannel( alloced_channel )
@@ -66,7 +66,7 @@ Type TFreeAudioSound Extends TSound
 		Return TFreeAudioChannel.CreateWithChannel( fa_channel )
 	End Method
 	
-	Method Cue:TFreeAudioChannel( alloced_channel:TChannel )
+	Method Cue:TFreeAudioChannel( alloced_channel:TChannel ) Override
 		Local channel:TFreeAudioChannel,fa_channel:Int
 		If alloced_channel
 			channel=TFreeAudioChannel( alloced_channel )
@@ -96,32 +96,32 @@ Type TFreeAudioChannel Extends TChannel
 		If fa_channel fa_FreeChannel fa_channel
 	End Method
 
-	Method Stop()
+	Method Stop() Override
 		fa_StopChannel fa_channel
 		fa_channel=0
 	End Method
 	
-	Method SetPaused( paused:Int )
+	Method SetPaused( paused:Int ) Override
 		fa_SetChannelPaused fa_channel,paused
 	End Method
 	
-	Method SetVolume( volume# )
+	Method SetVolume( volume# ) Override
 		fa_SetChannelVolume fa_channel,volume
 	End Method
 	
-	Method SetPan( pan# )
+	Method SetPan( pan# ) Override
 		fa_SetChannelPan fa_channel,pan
 	End Method
 	
-	Method SetDepth( depth# )
+	Method SetDepth( depth# ) Override
 		fa_SetChannelDepth fa_channel,depth
 	End Method
 	
-	Method SetRate( rate# )
+	Method SetRate( rate# ) Override
 		fa_SetChannelRate fa_channel,rate
 	End Method
 	
-	Method Playing:Int()
+	Method Playing:Int() Override
 		Local status:Int=fa_ChannelStatus( fa_channel ) 
 		If status=FA_CHANNELSTATUS_FREE Return False
 		If status&FA_CHANNELSTATUS_STOPPED Return False
@@ -143,11 +143,11 @@ End Type
 
 Type TFreeAudioAudioDriver Extends TAudioDriver
 
-	Method Name$()
+	Method Name$() Override
 		Return _name
 	End Method
 	
-	Method Startup:Int()
+	Method Startup:Int() Override
 		If _mode<>-1 Return fa_Init( _mode )<>-1
 		If fa_Init( 0 )<>-1 Return True
 ?Not MacOS
@@ -155,11 +155,11 @@ Type TFreeAudioAudioDriver Extends TAudioDriver
 ?
 	End Method
 	
-	Method Shutdown()
+	Method Shutdown() Override
 		fa_Close
 	End Method
 
-	Method CreateSound:TFreeAudioSound( sample:TAudioSample,flags:Int )
+	Method CreateSound:TFreeAudioSound( sample:TAudioSample,flags:Int ) Override
 		Local channels:Int,bits:Int
 
 		Select sample.format
@@ -185,7 +185,7 @@ Type TFreeAudioAudioDriver Extends TAudioDriver
 		Return TFreeAudioSound.CreateWithSound( fa_sound,sample )
 	End Method
 	
-	Method AllocChannel:TFreeAudioChannel()
+	Method AllocChannel:TFreeAudioChannel() Override
 		Local fa_channel:Int=fa_AllocChannel()
 		If fa_channel Return TFreeAudioChannel.CreateWithChannel( fa_channel )
 	End Method

+ 9 - 9
freetypefont.mod/freetypefont.bmx

@@ -45,17 +45,17 @@ Type TFreeTypeGlyph Extends TGlyph
 	Field _pixmap:TPixmap
 	Field _advance#,_x:Int,_y:Int,_w:Int,_h:Int
 	
-	Method Pixels:TPixmap()
+	Method Pixels:TPixmap() Override
 		If _pixmap Return _pixmap
 		
 		Return _pixmap
 	End Method
 	
-	Method Advance#()
+	Method Advance#() Override
 		Return _advance
 	End Method
 	
-	Method GetRect( x:Int Var,y:Int Var,w:Int Var,h:Int Var )
+	Method GetRect( x:Int Var,y:Int Var,w:Int Var,h:Int Var ) Override
 		x=_x
 		y=_y
 		w=_w
@@ -78,23 +78,23 @@ Type TFreeTypeFont Extends BRL.Font.TFont
 		MemFree _buf
 	End Method
 
-	Method Style:Int()
+	Method Style:Int() Override
 		Return _style
 	End Method
 
-	Method Height:Int()
+	Method Height:Int() Override
 		Return _height
 	End Method
 	
-	Method CountGlyphs:Int()
+	Method CountGlyphs:Int() Override
 		Return _glyphs.length
 	End Method
 	
-	Method CharToGlyph:Int( char:Int )
+	Method CharToGlyph:Int( char:Int ) Override
 		Return FT_Get_Char_Index( _ft_face,char )-1
 	End Method
 	
-	Method LoadGlyph:TFreeTypeGlyph( index:Int )
+	Method LoadGlyph:TFreeTypeGlyph( index:Int ) Override
 	
 		Local glyph:TFreeTypeGlyph=_glyphs[index]
 		If glyph Return glyph
@@ -215,7 +215,7 @@ End Type
 
 Type TFreeTypeFontLoader Extends TFontLoader
 
-	Method LoadFont:TFreeTypeFont( url:Object,size:Int,style:Int )
+	Method LoadFont:TFreeTypeFont( url:Object,size:Int,style:Int ) Override
 	
 		Local src$=String( url )
 		

+ 11 - 11
glgraphics.mod/source.bmx

@@ -25,12 +25,12 @@ Public
 
 Type TGLGraphics Extends TGraphics
 
-	Method Driver:TGLGraphicsDriver()
+	Method Driver:TGLGraphicsDriver() Override
 		Assert _context
 		Return GLGraphicsDriver()
 	End Method
 	
-	Method GetSettings( width Var,height Var,depth Var,hertz Var,flags Var )
+	Method GetSettings( width Var,height Var,depth Var,hertz Var,flags Var ) Override
 		Assert _context
 		Local w,h,d,r,f
 		bbGLGraphicsGetSettings _context,w,h,d,r,f
@@ -41,7 +41,7 @@ Type TGLGraphics Extends TGraphics
 		flags=f
 	End Method
 	
-	Method Close()
+	Method Close() Override
 		If Not _context Return
 		bbGLGraphicsClose( _context )
 		_context=0
@@ -53,7 +53,7 @@ End Type
 
 Type TGLGraphicsDriver Extends TGraphicsDriver
 
-	Method GraphicsModes:TGraphicsMode[]()
+	Method GraphicsModes:TGraphicsMode[]() Override
 		Local buf[1024*4]
 		Local count=bbGLGraphicsGraphicsModes( buf,1024 )
 		Local modes:TGraphicsMode[count],p:Int Ptr=buf
@@ -69,26 +69,26 @@ Type TGLGraphicsDriver Extends TGraphicsDriver
 		Return modes
 	End Method
 	
-	Method AttachGraphics:TGLGraphics( widget:Byte Ptr,flags )
+	Method AttachGraphics:TGLGraphics( widget:Byte Ptr,flags ) Override
 		Local t:TGLGraphics=New TGLGraphics
 		t._context=bbGLGraphicsAttachGraphics( widget,flags )
 		Return t
 	End Method
 	
-	Method CreateGraphics:TGLGraphics( width,height,depth,hertz,flags )
+	Method CreateGraphics:TGLGraphics( width,height,depth,hertz,flags ) Override
 		Local t:TGLGraphics=New TGLGraphics
 		t._context=bbGLGraphicsCreateGraphics( width,height,depth,hertz,flags )
 		Return t
 	End Method
 	
-	Method SetGraphics( g:TGraphics )
+	Method SetGraphics( g:TGraphics ) Override
 		Local context:Byte Ptr
 		Local t:TGLGraphics=TGLGraphics( g )
 		If t context=t._context
 		bbGLGraphicsSetGraphics context
 	End Method
 	
-	Method Flip( sync )
+	Method Flip( sync ) Override
 		bbGLGraphicsFlip sync
 	End Method
 	
@@ -245,7 +245,7 @@ The font used is an internal fixed point 8x16 font.<br>
 <br>
 This function is intended for debugging purposes only - performance is unlikely to be stellar.
 End Rem
-Function GLDrawText( text$,x,y )
+Function GLDrawText( Text$,x,y )
 '	If fontSeq<>graphicsSeq
 	If Not fontTex
 		Local pixmap:TPixmap=TPixmap.Create( 1024,16,PF_RGBA8888 )
@@ -272,8 +272,8 @@ Function GLDrawText( text$,x,y )
 	glEnable GL_TEXTURE_2D
 	glBindTexture GL_TEXTURE_2D,fontTex
 	
-	For Local i=0 Until text.length
-		Local c=text[i]-32
+	For Local i=0 Until Text.length
+		Local c=Text[i]-32
 		If c>=0 And c<96
 			Const adv#=8/1024.0
 			Local t#=c*adv;

+ 24 - 24
glmax2d.mod/glmax2d.bmx

@@ -258,7 +258,7 @@ Type TGLImageFrame Extends TImageFrame
 		seq=0
 	End Method
 	
-	Method Draw( x0#,y0#,x1#,y1#,tx#,ty#,sx#,sy#,sw#,sh# )
+	Method Draw( x0#,y0#,x1#,y1#,tx#,ty#,sx#,sy#,sw#,sh# ) Override
 		Assert seq=GraphicsSeq Else "Image does not exist"
 
 		Local u0#=sx * uscale
@@ -338,21 +338,21 @@ Type TGLMax2DDriver Extends TMax2DDriver
 	End Method
 
 	'graphics driver overrides
-	Method GraphicsModes:TGraphicsMode[]()
+	Method GraphicsModes:TGraphicsMode[]() Override
 		Return GLGraphicsDriver().GraphicsModes()
 	End Method
 	
-	Method AttachGraphics:TMax2DGraphics( widget:Byte Ptr,flags )
+	Method AttachGraphics:TMax2DGraphics( widget:Byte Ptr,flags ) Override
 		Local g:TGLGraphics=GLGraphicsDriver().AttachGraphics( widget,flags )
 		If g Return TMax2DGraphics.Create( g,Self )
 	End Method
 	
-	Method CreateGraphics:TMax2DGraphics( width,height,depth,hertz,flags )
+	Method CreateGraphics:TMax2DGraphics( width,height,depth,hertz,flags ) Override
 		Local g:TGLGraphics=GLGraphicsDriver().CreateGraphics( width,height,depth,hertz,flags )
 		If g Return TMax2DGraphics.Create( g,Self )
 	End Method
 	
-	Method SetGraphics( g:TGraphics )
+	Method SetGraphics( g:TGraphics ) Override
 		If Not g
 			TMax2DGraphics.ClearCurrent
 			GLGraphicsDriver().SetGraphics Null
@@ -385,21 +385,21 @@ Type TGLMax2DDriver Extends TMax2DDriver
 		glViewport 0,0,gw,gh
 	End Method
 	
-	Method Flip( sync )
+	Method Flip( sync ) Override
 		GLGraphicsDriver().Flip sync
 	End Method
 	
-	Method ToString$()
+	Method ToString$() Override
 		Return "OpenGL"
 	End Method
 
-	Method CreateFrameFromPixmap:TGLImageFrame( pixmap:TPixmap,flags )
+	Method CreateFrameFromPixmap:TGLImageFrame( pixmap:TPixmap,flags ) Override
 		Local frame:TGLImageFrame
 		frame=TGLImageFrame.CreateFromPixmap( pixmap,flags )
 		Return frame
 	End Method
 
-	Method SetBlend( blend )
+	Method SetBlend( blend ) Override
 		If blend=state_blend Return
 		state_blend=blend
 		Select blend
@@ -428,32 +428,32 @@ Type TGLMax2DDriver Extends TMax2DDriver
 		End Select
 	End Method
 
-	Method SetAlpha( alpha# )
+	Method SetAlpha( alpha# ) Override
 		If alpha>1.0 alpha=1.0
 		If alpha<0.0 alpha=0.0
 		color4ub[3]=alpha*255
 		glColor4ubv color4ub
 	End Method
 
-	Method SetLineWidth( width# )
+	Method SetLineWidth( width# ) Override
 		glLineWidth width
 	End Method
 	
-	Method SetColor( red,green,blue )
+	Method SetColor( red,green,blue ) Override
 		color4ub[0]=Min(Max(red,0),255)
 		color4ub[1]=Min(Max(green,0),255)
 		color4ub[2]=Min(Max(blue,0),255)
 		glColor4ubv color4ub
 	End Method
 
-	Method SetClsColor( red,green,blue )
+	Method SetClsColor( red,green,blue ) Override
 		red=Min(Max(red,0),255)
 		green=Min(Max(green,0),255)
 		blue=Min(Max(blue,0),255)
 		glClearColor red/255.0,green/255.0,blue/255.0,1.0
 	End Method
 	
-	Method SetViewport( x,y,w,h )
+	Method SetViewport( x,y,w,h ) Override
 		If x=0 And y=0 And w=GraphicsWidth() And h=GraphicsHeight()
 			glDisable GL_SCISSOR_TEST
 		Else
@@ -462,25 +462,25 @@ Type TGLMax2DDriver Extends TMax2DDriver
 		EndIf
 	End Method
 
-	Method SetTransform( xx#,xy#,yx#,yy# )
+	Method SetTransform( xx#,xy#,yx#,yy# ) Override
 		ix=xx
 		iy=xy
 		jx=yx
 		jy=yy
 	End Method
 
-	Method Cls()
+	Method Cls() Override
 		glClear GL_COLOR_BUFFER_BIT
 	End Method
 
-	Method Plot( x#,y# )
+	Method Plot( x#,y# ) Override
 		DisableTex
 		glBegin GL_POINTS
 		glVertex2f x+.5,y+.5
 		glEnd
 	End Method
 
-	Method DrawLine( x0#,y0#,x1#,y1#,tx#,ty# )
+	Method DrawLine( x0#,y0#,x1#,y1#,tx#,ty# ) Override
 		DisableTex
 		glBegin GL_LINES
 		glVertex2f x0*ix+y0*iy+tx+.5,x0*jx+y0*jy+ty+.5
@@ -488,7 +488,7 @@ Type TGLMax2DDriver Extends TMax2DDriver
 		glEnd
 	End Method
 
-	Method DrawRect( x0#,y0#,x1#,y1#,tx#,ty# )
+	Method DrawRect( x0#,y0#,x1#,y1#,tx#,ty# ) Override
 		DisableTex
 		glBegin GL_QUADS
 		glVertex2f x0*ix+y0*iy+tx,x0*jx+y0*jy+ty
@@ -498,7 +498,7 @@ Type TGLMax2DDriver Extends TMax2DDriver
 		glEnd
 	End Method
 	
-	Method DrawOval( x0#,y0#,x1#,y1#,tx#,ty# )
+	Method DrawOval( x0#,y0#,x1#,y1#,tx#,ty# ) Override
 	
 		Local xr#=(x1-x0)*.5
 		Local yr#=(y1-y0)*.5
@@ -521,7 +521,7 @@ Type TGLMax2DDriver Extends TMax2DDriver
 		
 	End Method
 	
-	Method DrawPoly( xy#[],handle_x#,handle_y#,origin_x#,origin_y# )
+	Method DrawPoly( xy#[],handle_x#,handle_y#,origin_x#,origin_y# ) Override
 		If xy.length<6 Or (xy.length&1) Return
 		
 		DisableTex
@@ -534,7 +534,7 @@ Type TGLMax2DDriver Extends TMax2DDriver
 		glEnd
 	End Method
 		
-	Method DrawPixmap( p:TPixmap,x,y )
+	Method DrawPixmap( p:TPixmap,x,y ) Override
 		Local blend=state_blend
 		DisableTex
 		SetBlend SOLIDBLEND
@@ -553,7 +553,7 @@ Type TGLMax2DDriver Extends TMax2DDriver
 		SetBlend blend
 	End Method
 
-	Method GrabPixmap:TPixmap( x,y,w,h )
+	Method GrabPixmap:TPixmap( x,y,w,h ) Override
 		Local blend=state_blend
 		SetBlend SOLIDBLEND
 		Local p:TPixmap=CreatePixmap( w,h,PF_RGBA8888 )
@@ -563,7 +563,7 @@ Type TGLMax2DDriver Extends TMax2DDriver
 		Return p
 	End Method
 	
-	Method SetResolution( width#,height# )
+	Method SetResolution( width#,height# ) Override
 		glMatrixMode GL_PROJECTION
 		glLoadIdentity
 		glOrtho 0,width,height,0,-1,1

+ 1 - 1
graphics.mod/graphics.bmx

@@ -69,7 +69,7 @@ Type TGraphicsMode
 
 	Field width,height,depth,hertz
 	
-	Method ToString$()
+	Method ToString$() Override
 		Return width+","+height+","+depth+" "+hertz+"Hz"
 	End Method
 

+ 1 - 1
httpstream.mod/httpstream.bmx

@@ -17,7 +17,7 @@ Import BRL.SocketStream
 
 Type THTTPStreamFactory Extends TStreamFactory
 
-	Method CreateStream:TStream( url:Object,proto$,path$,readable:Int,writeable:Int )
+	Method CreateStream:TStream( url:Object,proto$,path$,readable:Int,writeable:Int ) Override
 		If proto="http"
 
 			Local i:Int=path.Find( "/",0 ),server$,file$

+ 1 - 1
jpgloader.mod/jpgloader.bmx

@@ -112,7 +112,7 @@ End Function
 Private
 
 Type TPixmapLoaderJPG Extends TPixmapLoader
-	Method LoadPixmap:TPixmap( stream:TStream )
+	Method LoadPixmap:TPixmap( stream:TStream ) Override
 		Return LoadPixmapJPeg( stream )
 	End Method
 End Type

+ 3 - 3
map.mod/intmap.bmx

@@ -258,7 +258,7 @@ End Type
 
 Type TIntKeyEnumerator Extends TIntNodeEnumerator
 	Field _key:TIntKey = New TIntKey
-	Method NextObject:Object()
+	Method NextObject:Object() Override
 ?ngcmod
 		Assert _expectedModCount = _map._modCount, "TIntMap Concurrent Modification"
 ?
@@ -270,7 +270,7 @@ Type TIntKeyEnumerator Extends TIntNodeEnumerator
 End Type
 
 Type TIntValueEnumerator Extends TIntNodeEnumerator
-	Method NextObject:Object()
+	Method NextObject:Object() Override
 ?ngcmod
 		Assert _expectedModCount = _map._modCount, "TIntMap Concurrent Modification"
 ?
@@ -288,7 +288,7 @@ Type TIntMapEnumerator
 End Type
 
 Type TIntEmptyEnumerator Extends TIntNodeEnumerator
-	Method HasNext()
+	Method HasNext() Override
 		_map = Null
 		Return False
 	End Method

+ 4 - 4
map.mod/map.bmx

@@ -117,11 +117,11 @@ Type TNode Extends TKeyValue
 		Return t
 	End Method
 	
-	Method Key:Object()
+	Method Key:Object() Override
 		Return _key
 	End Method
 	
-	Method Value:Object()
+	Method Value:Object() Override
 		Return _value
 	End Method
 
@@ -158,7 +158,7 @@ Type TNodeEnumerator
 End Type
 
 Type TKeyEnumerator Extends TNodeEnumerator
-	Method NextObject:Object()
+	Method NextObject:Object() Override
 ?ngcmod
 		Assert _expectedModCount = _map._modCount, "TMap Concurrent Modification"
 ?
@@ -169,7 +169,7 @@ Type TKeyEnumerator Extends TNodeEnumerator
 End Type
 
 Type TValueEnumerator Extends TNodeEnumerator
-	Method NextObject:Object()
+	Method NextObject:Object() Override
 ?ngcmod
 		Assert _expectedModCount = _map._modCount, "TMap Concurrent Modification"
 ?

+ 3 - 3
map.mod/objectmap.bmx

@@ -184,7 +184,7 @@ Type TObjectNodeEnumerator
 End Type
 
 Type TObjectKeyEnumerator Extends TObjectNodeEnumerator
-	Method NextObject:Object()
+	Method NextObject:Object() Override
 ?ngcmod
 		Assert _expectedModCount = _map._modCount, "TObjectMap Concurrent Modification"
 ?
@@ -195,7 +195,7 @@ Type TObjectKeyEnumerator Extends TObjectNodeEnumerator
 End Type
 
 Type TObjectValueEnumerator Extends TObjectNodeEnumerator
-	Method NextObject:Object()
+	Method NextObject:Object() Override
 ?ngcmod
 		Assert _expectedModCount = _map._modCount, "TObjectMap Concurrent Modification"
 ?
@@ -213,7 +213,7 @@ Type TObjectMapEnumerator
 End Type
 
 Type TObjectEmptyEnumerator Extends TObjectNodeEnumerator
-	Method HasNext()
+	Method HasNext() Override
 		_map = Null
 		Return False
 	End Method

+ 3 - 3
map.mod/ptrmap.bmx

@@ -258,7 +258,7 @@ End Type
 
 Type TPtrKeyEnumerator Extends TPtrNodeEnumerator
 	Field _key:TPtrKey = New TPtrKey
-	Method NextObject:Object()
+	Method NextObject:Object() Override
 ?ngcmod
 		Assert _expectedModCount = _map._modCount, "TPtrMap Concurrent Modification"
 ?
@@ -270,7 +270,7 @@ Type TPtrKeyEnumerator Extends TPtrNodeEnumerator
 End Type
 
 Type TPtrValueEnumerator Extends TPtrNodeEnumerator
-	Method NextObject:Object()
+	Method NextObject:Object() Override
 ?ngcmod
 		Assert _expectedModCount = _map._modCount, "TPtrMap Concurrent Modification"
 ?
@@ -288,7 +288,7 @@ Type TPtrMapEnumerator
 End Type
 
 Type TPtrEmptyEnumerator Extends TPtrNodeEnumerator
-	Method HasNext()
+	Method HasNext() Override
 		_map = Null
 		Return False
 	End Method

+ 3 - 3
map.mod/stringmap.bmx

@@ -246,7 +246,7 @@ Type TStringNodeEnumerator
 End Type
 
 Type TStringKeyEnumerator Extends TStringNodeEnumerator
-	Method NextObject:Object()
+	Method NextObject:Object() Override
 ?ngcmod
 		Assert _expectedModCount = _map._modCount, "TStringMap Concurrent Modification"
 ?
@@ -257,7 +257,7 @@ Type TStringKeyEnumerator Extends TStringNodeEnumerator
 End Type
 
 Type TStringValueEnumerator Extends TStringNodeEnumerator
-	Method NextObject:Object()
+	Method NextObject:Object() Override
 ?ngcmod
 		Assert _expectedModCount = _map._modCount, "TStringMap Concurrent Modification"
 ?
@@ -275,7 +275,7 @@ Type TStringMapEnumerator
 End Type
 
 Type TStringEmptyEnumerator Extends TStringNodeEnumerator
-	Method HasNext()
+	Method HasNext() Override
 		_map = Null
 		Return False
 	End Method

+ 7 - 7
max2d.mod/max2d.bmx

@@ -106,11 +106,11 @@ Type TMax2DGraphics Extends TGraphics
 
 	Field _graphics:TGraphics,_driver:TMax2DDriver,_setup
 	
-	Method Driver:TMax2DDriver()
+	Method Driver:TMax2DDriver() Override
 		Return _driver
 	End Method
 	
-	Method GetSettings( width Var,height Var,depth Var,hertz Var,flags Var )
+	Method GetSettings( width Var,height Var,depth Var,hertz Var,flags Var ) Override
 		Local w,h,d,r,f
 		_graphics.GetSettings w,h,d,r,f
 		width=w
@@ -120,7 +120,7 @@ Type TMax2DGraphics Extends TGraphics
 		flags=f
 	End Method
 	
-	Method Close()
+	Method Close() Override
 		If Not _graphics Return
 		_graphics.Close
 		_graphics=Null
@@ -708,8 +708,8 @@ bbdoc: Set current rotation
 about:
 @rotation is given in degrees and should be in the range 0 to 360.
 End Rem
-Function SetRotation( rotation# )
-	gc.tform_rot=rotation
+Function SetRotation( Rotation# )
+	gc.tform_rot=Rotation
 	UpdateTransform
 End Function
 
@@ -749,8 +749,8 @@ about:
 SetTransform is a shortcut for setting both the rotation and
 scale parameters in Max2D with a single function call.
 End Rem
-Function SetTransform( rotation#=0,scale_x#=1,scale_y#=1 )
-	gc.tform_rot=rotation
+Function SetTransform( Rotation#=0,scale_x#=1,scale_y#=1 )
+	gc.tform_rot=Rotation
 	gc.tform_scale_x=scale_x
 	gc.tform_scale_y=scale_y
 	UpdateTransform

+ 2 - 2
oggloader.mod/oggloader.bmx

@@ -45,7 +45,7 @@ End Function
 
 Type TAudioSampleLoaderOGG Extends TAudioSampleLoader
 
-	Method LoadAudioSample:TAudioSample( stream:TStream )
+	Method LoadAudioSample:TAudioSample( stream:TStream ) Override
 
 		Local samples,channels,freq
 		Local ogg:Byte Ptr=Decode_Ogg(stream,readfunc,seekfunc,closefunc,tellfunc,samples,channels,freq)
@@ -62,7 +62,7 @@ Type TAudioSampleLoaderOGG Extends TAudioSampleLoader
 		Local sample:TAudioSample=TAudioSample.Create( samples,freq,format )
 
 		'negative amounts indicate an error, 0 = EOF, >0 = amount of bytes
-		Local bytesRead:int = Read_Ogg( ogg,sample.samples,size )
+		Local bytesRead:Int = Read_Ogg( ogg,sample.samples,size )
 		Read_Ogg( ogg,Null,0 )
 		If bytesRead <= 0 Return
 

+ 15 - 15
openalaudio.mod/openalaudio.bmx

@@ -120,13 +120,13 @@ Type TOpenALSound Extends TSound
 		If CLOG WriteStdout "Deleted OpenAL buffer "+_buffer+"~n"
 	End Method
 
-	Method Play:TOpenALChannel( alloced_channel:TChannel=Null )
+	Method Play:TOpenALChannel( alloced_channel:TChannel=Null ) Override
 		Local t:TOpenALChannel=Cue( alloced_channel )
 		t.SetPaused False
 		Return t
 	End Method
 
-	Method Cue:TOpenALChannel( alloced_channel:TChannel=Null )
+	Method Cue:TOpenALChannel( alloced_channel:TChannel=Null ) Override
 		Local t:TOpenALChannel=TOpenALChannel( alloced_channel )
 		If t
 			Assert t._static
@@ -203,7 +203,7 @@ Type TOpenALChannel Extends TChannel
 
 	End Method
 
-	Method Stop()
+	Method Stop() Override
 		If _seq<>_source._seq Return
 	
 		_source._seq:+1
@@ -219,7 +219,7 @@ Type TOpenALChannel Extends TChannel
 		EndIf
 	End Method
 	
-	Method SetPaused( paused:Int )
+	Method SetPaused( paused:Int ) Override
 		If _seq<>_source._seq Return
 
 		If paused
@@ -229,36 +229,36 @@ Type TOpenALChannel Extends TChannel
 		EndIf
 	End Method
 	
-	Method SetVolume( volume# )
+	Method SetVolume( volume# ) Override
 		If _seq<>_source._seq Return
 
 		alSourcef _source._id,AL_GAIN,volume
 	End Method
 	
-	Method SetPan( pan# )
+	Method SetPan( pan# ) Override
 		If _seq<>_source._seq Return
 
 		pan:*90
 		alSource3f _source._id,AL_POSITION,Float(Sin(pan)),0,Float(-Cos(pan))
 	End Method
 	
-	Method SetDepth( depth# )
+	Method SetDepth( depth# ) Override
 		If _seq<>_source._seq Return
 	End Method
 	
-	Method SetRate( rate# )
+	Method SetRate( rate# ) Override
 		If _seq<>_source._seq Return
 
 		alSourcef _source._id,AL_PITCH,rate
 	End Method
 	
-	Method Playing:Int()
+	Method Playing:Int() Override
 		If _seq<>_source._seq Return False
 
 		Return _source.Playing()
 	End Method
 
-	Method Cue( sound:TOpenALSound )	
+	Method Cue( sound:TOpenALSound )
 		If _seq<>_source._seq Return
 
 		_source._sound=sound
@@ -325,11 +325,11 @@ End Type
 
 Type TOpenALAudioDriver Extends TAudioDriver
 
-	Method Name$()
+	Method Name$() Override
 		Return _name
 	End Method
 	
-	Method Startup:Int()
+	Method Startup:Int() Override
 		_device=0
 		If _devname
 			_device=alcOpenDevice( _devname )
@@ -353,17 +353,17 @@ Type TOpenALAudioDriver Extends TAudioDriver
 		EndIf
 	End Method
 	
-	Method Shutdown()
+	Method Shutdown() Override
 		_sources=Null
 		alcDestroyContext _context
 		alcCloseDevice _device
 	End Method
 
-	Method CreateSound:TOpenALSound( sample:TAudioSample,flags:Int )
+	Method CreateSound:TOpenALSound( sample:TAudioSample,flags:Int ) Override
 		Return TOpenALSound.Create( sample,flags )
 	End Method
 	
-	Method AllocChannel:TOpenALChannel()
+	Method AllocChannel:TOpenALChannel() Override
 		Return TOpenALChannel.Create( True )
 	End Method
 	

+ 1 - 1
pngloader.mod/pngloader.bmx

@@ -225,7 +225,7 @@ Private
 
 Type TPixmapLoaderPNG Extends TPixmapLoader
 
-	Method LoadPixmap:TPixmap( stream:TStream )
+	Method LoadPixmap:TPixmap( stream:TStream ) Override
 	
 		Return LoadPixmapPNG( stream )
 	

+ 6 - 6
ramstream.mod/ramstream.bmx

@@ -18,15 +18,15 @@ Type TRamStream Extends TStream
 
 	Field _pos:Long,_size:Long,_buf:Byte Ptr,_read,_write
 
-	Method Pos:Long()
+	Method Pos:Long() Override
 		Return _pos
 	End Method
 
-	Method Size:Long()
+	Method Size:Long() Override
 		Return _size
 	End Method
 
-	Method Seek:Long( pos:Long, whence:Int = SEEK_SET_ )
+	Method Seek:Long( pos:Long, whence:Int = SEEK_SET_ ) Override
 		If whence = SEEK_SET_ Then
 			If pos<0 pos=0 Else If pos>_size pos=_size
 		ElseIf whence = SEEK_END_ Then
@@ -43,7 +43,7 @@ Type TRamStream Extends TStream
 		Return _pos
 	End Method
 
-	Method Read:Long( buf:Byte Ptr,count:Long )
+	Method Read:Long( buf:Byte Ptr,count:Long ) Override
 		If count<=0 Or _read=False Return 0
 		If _pos+count>_size count=_size-_pos
 		MemCopy buf,_buf+_pos,Size_T(count)
@@ -51,7 +51,7 @@ Type TRamStream Extends TStream
 		Return count
 	End Method
 
-	Method Write:Long( buf:Byte Ptr,count:Long )
+	Method Write:Long( buf:Byte Ptr,count:Long ) Override
 		If count<=0 Or _write=False Return 0
 		If _pos+count>_size count=_size-_pos
 		MemCopy _buf+_pos,buf,Size_T(count)
@@ -85,7 +85,7 @@ Function CreateRamStream:TRamStream( ram:Byte Ptr,size:Long,readable,writeable )
 End Function
 
 Type TRamStreamFactory Extends TStreamFactory
-	Method CreateStream:TRamStream( url:Object,proto$,path$,readable,writeable )
+	Method CreateStream:TRamStream( url:Object,proto$,path$,readable,writeable ) Override
 		If proto="incbin" And writeable=False
 			Local buf:Byte Ptr=IncbinPtr( path )
 			If Not buf Return

+ 5 - 5
socket.mod/socket.bmx

@@ -43,7 +43,7 @@ End Extern
 Public
 
 Type TSocketException
-	Method ToString$()
+	Method ToString$() Override
 		Return "Internal socket error"
 	End Method
 End Type
@@ -74,8 +74,8 @@ Type TSocket
 	
 	Method Connected()
 		If _socket<0 Return False
-		Local read=_socket
-		If select_( 1,Varptr read,0,Null,0,Null,0 )<>1 Or ReadAvail()<>0 Return True
+		Local Read=_socket
+		If select_( 1,Varptr Read,0,Null,0,Null,0 )<>1 Or ReadAvail()<>0 Return True
 		Close
 		Return False
 	End Method		
@@ -107,8 +107,8 @@ Type TSocket
 	
 	Method Accept:TSocket( timeout:Int = -1, storage:TSockaddrStorage = Null )
 		If timeout >= 0 Then
-			Local read:Int = _socket
-			If select_( 1,Varptr read,0,Null,0,Null,timeout )<>1 Then
+			Local Read:Int = _socket
+			If select_( 1,Varptr Read,0,Null,0,Null,timeout )<>1 Then
 				Return
 			End If
 		End If

+ 5 - 5
socketstream.mod/socketstream.bmx

@@ -26,22 +26,22 @@ Import BRL.Stream
 
 Type TSocketStream Extends TStream
 
-	Method Read:Long( buf:Byte Ptr,count:Long )
+	Method Read:Long( buf:Byte Ptr,count:Long ) Override
 		Return _socket.Recv( buf,Size_T(count) )
 	End Method
 
-	Method Write:Long( buf:Byte Ptr,count:Long )
+	Method Write:Long( buf:Byte Ptr,count:Long ) Override
 		Return _socket.Send( buf,Size_T(count) )
 	End Method
 
-	Method Eof:Int()
+	Method Eof:Int() Override
 		If Not _socket Return True
 		If _socket.Connected() Return False
 		Close
 		Return True
 	End Method
 
-	Method Close()
+	Method Close() Override
 		If Not _socket Return
 		If _autoClose _socket.Close
 		_socket=Null
@@ -77,7 +77,7 @@ Type TSocketStream Extends TStream
 End Type
 
 Type TSocketStreamFactory Extends TStreamFactory
-	Method CreateStream:TSocketStream( url:Object,proto$,path$,readable:Int,writeable:Int )
+	Method CreateStream:TSocketStream( url:Object,proto$,path$,readable:Int,writeable:Int ) Override
 		If proto$="tcp"
 			Local i:Int=path.Find( ":",0 ),server$,port:Int
 			If i>=0 Return TSocketStream.CreateClient( path[..i],Int(path[i+1..]) )

+ 4 - 4
standardio.mod/standardio.bmx

@@ -24,19 +24,19 @@ Import BRL.TextStream
 
 Type TCStandardIO Extends TStream
 
-	Method Eof:Int()
+	Method Eof:Int() Override
 		Return feof_( stdin_ )
 	End Method
 	
-	Method Flush()
+	Method Flush() Override
 		fflush_ stdout_
 	End Method
 
-	Method Read:Long( buf:Byte Ptr,count:Long )
+	Method Read:Long( buf:Byte Ptr,count:Long ) Override
 		Return fread_( buf,1,count,stdin_ )
 	End Method
 
-	Method Write:Long( buf:Byte Ptr,count:Long )
+	Method Write:Long( buf:Byte Ptr,count:Long ) Override
 		Return fwrite_( buf,1,count,stdout_ )
 	End Method
 

+ 1 - 1
stbimageloader.mod/stbimageloader.bmx

@@ -31,7 +31,7 @@ End Extern
 
 Type TPixmapLoaderSTB Extends TPixmapLoader
 
-	Method LoadPixmap:TPixmap( stream:TStream )
+	Method LoadPixmap:TPixmap( stream:TStream ) Override
 	
 		Local pixmap:TPixmap
 	

+ 34 - 34
stream.mod/stream.bmx

@@ -49,7 +49,7 @@ bytes. For example, if the stream ReadInt method fails to read 4 bytes, it will
 a #TStreamReadException.
 End Rem
 Type TStreamReadException Extends TStreamException
-	Method ToString$()
+	Method ToString$() Override
 		Return "Error reading from stream"
 	End Method
 End Type
@@ -62,7 +62,7 @@ bytes. For example, if the stream WriteInt method fails to write 4 bytes, it wil
 a #TStreamWriteException.
 End Rem
 Type TStreamWriteException Extends TStreamException
-	Method ToString$()
+	Method ToString$() Override
 		Return "Error writing to stream"
 	End Method
 End Type
@@ -464,99 +464,99 @@ Type TStreamWrapper Extends TStream
 		_stream=stream
 	End Method
 
-	Method Eof:Int()
+	Method Eof:Int() Override
 		Return _stream.Eof()
 	End Method
 
-	Method Pos:Long()
+	Method Pos:Long() Override
 		Return _stream.Pos()
 	End Method
 
-	Method Size:Long()
+	Method Size:Long() Override
 		Return _stream.Size()
 	End Method
 	
-	Method Seek:Long( pos:Long, whence:Int = SEEK_SET_ )
+	Method Seek:Long( pos:Long, whence:Int = SEEK_SET_ ) Override
 		Return _stream.Seek( pos, whence )
 	End Method
 
-	Method Flush()
+	Method Flush() Override
 		_stream.Flush
 	End Method
 
-	Method Close()
+	Method Close() Override
 		_stream.Close
 	End Method
 
-	Method Read:Long( buf:Byte Ptr,count:Long )
+	Method Read:Long( buf:Byte Ptr,count:Long ) Override
 		Return _stream.Read( buf,count )
 	End Method
 
-	Method Write:Long( buf:Byte Ptr,count:Long )
+	Method Write:Long( buf:Byte Ptr,count:Long ) Override
 		Return _stream.Write( buf,count )
 	End Method
 	
-	Method ReadByte:Int()
+	Method ReadByte:Int() Override
 		Return _stream.ReadByte()
 	End Method
 	
-	Method WriteByte( n:Int )
+	Method WriteByte( n:Int ) Override
 		_stream.WriteByte n
 	End Method
 	
-	Method ReadShort:Int()
+	Method ReadShort:Int() Override
 		Return _stream.ReadShort()
 	End Method
 	
-	Method WriteShort( n:Int )
+	Method WriteShort( n:Int ) Override
 		_stream.WriteShort n
 	End Method
 	
-	Method ReadInt:Int()
+	Method ReadInt:Int() Override
 		Return _stream.ReadInt()
 	End Method
 	
-	Method WriteInt( n:Int )
+	Method WriteInt( n:Int ) Override
 		_stream.WriteInt n
 	End Method
 	
-	Method ReadFloat:Float()
+	Method ReadFloat:Float() Override
 		Return _stream.ReadFloat()
 	End Method
 	
-	Method WriteFloat( n:Float )
+	Method WriteFloat( n:Float ) Override
 		_stream.WriteFloat n
 	End Method
 	
-	Method ReadDouble:Double()
+	Method ReadDouble:Double() Override
 		Return _stream.ReadDouble()
 	End Method
 	
-	Method WriteDouble( n:Double )
+	Method WriteDouble( n:Double ) Override
 		_stream.WriteDouble n
 	End Method
 	
-	Method ReadLine$()
+	Method ReadLine$() Override
 		Return _stream.ReadLine()
 	End Method
 	
-	Method WriteLine:Int( t$ )
+	Method WriteLine:Int( t$ ) Override
 		Return _stream.WriteLine( t )
 	End Method
 	
-	Method ReadString$( n:Int )
+	Method ReadString$( n:Int ) Override
 		Return _stream.ReadString( n )
 	End Method
 	
-	Method WriteString( t$ )
+	Method WriteString( t$ ) Override
 		_stream.WriteString t
 	End Method
 	
-	Method ReadObject:Object()
+	Method ReadObject:Object() Override
 		Return _stream.ReadObject()
 	End Method
 	
-	Method WriteObject( obj:Object )
+	Method WriteObject( obj:Object ) Override
 		_stream.WriteObject obj
 	End Method
 	
@@ -564,7 +564,7 @@ End Type
 
 Type TStreamStream Extends TStreamWrapper
 
-	Method Close()
+	Method Close() Override
 		SetStream Null
 	End Method
 
@@ -588,22 +588,22 @@ Type TCStream Extends TStream
 	Field _pos:Long,_size:Long,_mode:Int
 	Field _cstream:Byte Ptr
 
-	Method Pos:Long()
+	Method Pos:Long() Override
 		Return _pos
 	End Method
 
-	Method Size:Long()
+	Method Size:Long() Override
 		Return _size
 	End Method
 
-	Method Seek:Long( pos:Long, whence:Int = SEEK_SET_ )
+	Method Seek:Long( pos:Long, whence:Int = SEEK_SET_ ) Override
 		Assert _cstream Else "Attempt to seek closed stream"
 		fseek_ _cstream,pos,whence
 		_pos=ftell_( _cstream )
 		Return _pos
 	End Method
 
-	Method Read:Long( buf:Byte Ptr,count:Long )
+	Method Read:Long( buf:Byte Ptr,count:Long ) Override
 		Assert _cstream Else "Attempt to read from closed stream"
 		Assert _mode & MODE_READ Else "Attempt to read from write-only stream"
 		count=fread_( buf,1,count,_cstream )	
@@ -611,7 +611,7 @@ Type TCStream Extends TStream
 		Return count
 	End Method
 
-	Method Write:Long( buf:Byte Ptr,count:Long )
+	Method Write:Long( buf:Byte Ptr,count:Long ) Override
 		Assert _cstream Else "Attempt to write to closed stream"
 		Assert _mode & MODE_WRITE Else "Attempt to write to read-only stream"
 		count=fwrite_( buf,1,count,_cstream )
@@ -620,11 +620,11 @@ Type TCStream Extends TStream
 		Return count
 	End Method
 
-	Method Flush()
+	Method Flush() Override
 		If _cstream fflush_ _cstream
 	End Method
 
-	Method Close()
+	Method Close() Override
 		If Not _cstream Return
 		Flush
 		fclose_ _cstream

+ 1 - 1
stringbuilder.mod/stringbuilder.bmx

@@ -448,7 +448,7 @@ Public
 	Rem
 	bbdoc: Converts the string builder to a String.
 	End Rem	
-	Method ToString:String()
+	Method ToString:String() Override
 		Return bmx_stringbuilder_tostring(buffer)
 	End Method
 

+ 1 - 1
system.mod/driver.bmx

@@ -24,7 +24,7 @@ Type TSystemDriver
 	Method DesktopDepth:Int() Abstract
 	Method DesktopHertz:Int() Abstract
 
-	Method ToString:String()
+	Method ToString:String() Override
 		Return Name()
 	End Method
 

+ 18 - 18
systemdefault.mod/system.linux.bmx

@@ -48,11 +48,11 @@ Type TLinuxSystemDriver Extends TSystemDriver
 		bbSystemStartup
 	End Method
 
-	Method Poll()
+	Method Poll() Override
 		bbSystemPoll()
 	End Method
 	
-	Method Wait()
+	Method Wait() Override
 		bbSystemWait()
 	End Method
 
@@ -60,44 +60,44 @@ Type TLinuxSystemDriver Extends TSystemDriver
 		Throw "simon come here"
 	End Method
 
-	Method SetMouseVisible( visible:Int )
+	Method SetMouseVisible( visible:Int ) Override
 		bbSetMouseVisible(visible)
 	End Method
 
-	Method MoveMouse( x:Int,y:Int )
+	Method MoveMouse( x:Int,y:Int ) Override
 		bbMoveMouse x,y
 	End Method
 
-	Method Notify( text$,serious:Int )
-		WriteStdout text+"~r~n"
+	Method Notify( Text$,serious:Int ) Override
+		WriteStdout Text+"~r~n"
 	End Method
 	
-	Method Confirm:Int( text$,serious:Int )
-		WriteStdout text+" (Yes/No)?"
+	Method Confirm:Int( Text$,serious:Int ) Override
+		WriteStdout Text+" (Yes/No)?"
 		Local t$=ReadStdin().ToLower()
 		If t[..1]="y" Return 1
 		Return 0
 	End Method
 	
-	Method Proceed:Int( text$,serious:Int )
-		WriteStdout text+" (Yes/No/Cancel)?"
+	Method Proceed:Int( Text$,serious:Int ) Override
+		WriteStdout Text+" (Yes/No/Cancel)?"
 		Local t$=ReadStdin().ToLower()
 		If t[..1]="y" Return 1
 		If t[..1]="n" Return 0
 		Return -1
 	End Method
 
-	Method RequestFile$( text$,exts$,save:Int,file$ )
+	Method RequestFile$( Text$,exts$,save:Int,file$ ) Override
 		WriteStdout "Enter a filename:"
 		Return ReadStdin()
 	End Method
 	
-	Method RequestDir$( text$,path$ )
+	Method RequestDir$( Text$,path$ ) Override
 		WriteStdout "Enter a directory name:"
 		Return ReadStdin()
 	End Method
 
-	Method OpenURL:Int( url$ )
+	Method OpenURL:Int( url$ ) Override
 		If getenv_("KDE_FULL_DESKTOP")
 			system_ "kfmclient exec ~q"+url+"~q"
 		ElseIf getenv_("GNOME_DESKTOP_SESSION_ID")
@@ -105,23 +105,23 @@ Type TLinuxSystemDriver Extends TSystemDriver
 		EndIf
 	End Method
 
-	Method DesktopWidth:Int()
+	Method DesktopWidth:Int() Override
 		Return bbSystemDesktopWidth()
 	End Method
 	
-	Method DesktopHeight:Int()
+	Method DesktopHeight:Int() Override
 		Return bbSystemDesktopHeight()
 	End Method
 	
-	Method DesktopDepth:Int()
+	Method DesktopDepth:Int() Override
 		Return bbSystemDesktopDepth()
 	End Method
 	
-	Method DesktopHertz:Int()
+	Method DesktopHertz:Int() Override
 		Return bbSystemDesktopHertz()
 	End Method
 
-	Method Name:String()
+	Method Name:String() Override
 		Return "LinuxSystemDriver"
 	End Method
 	

+ 20 - 20
systemdefault.mod/system.macos.bmx

@@ -47,35 +47,35 @@ Type TMacOSSystemDriver Extends TSystemDriver
 		bbSystemStartup
 	End Method
 
-	Method Poll()
+	Method Poll() Override
 		bbSystemPoll()
 	End Method
 	
-	Method Wait()
+	Method Wait() Override
 		bbSystemWait()
 	End Method
 	
-	Method MoveMouse( x:Int,y:Int )
+	Method MoveMouse( x:Int,y:Int ) Override
 		bbSystemMoveMouse x,y
 	End Method
 	
-	Method SetMouseVisible( visible:Int )
+	Method SetMouseVisible( visible:Int ) Override
 		bbSystemSetMouseVisible visible
 	End Method
 	
-	Method Notify( text$,serious:Int )
-		bbSystemNotify text,serious
+	Method Notify( Text$,serious:Int ) Override
+		bbSystemNotify Text,serious
 	End Method
 	
-	Method Confirm:Int( text$,serious:Int )
-		Return bbSystemConfirm( text,serious)
+	Method Confirm:Int( Text$,serious:Int ) Override
+		Return bbSystemConfirm( Text,serious)
 	End Method
 	
-	Method Proceed:Int( text$,serious:Int )
-		Return bbSystemProceed( text,serious )
+	Method Proceed:Int( Text$,serious:Int ) Override
+		Return bbSystemProceed( Text,serious )
 	End Method
 
-	Method RequestFile$( text$,exts$,save:Int,path$ )
+	Method RequestFile$( Text$,exts$,save:Int,path$ ) Override
 		Local file$,dir$,filter$
 		
 		path=path.Replace( "\","/" )
@@ -98,36 +98,36 @@ Type TMacOSSystemDriver Extends TSystemDriver
 		Wend
 		If filter.find("*")>-1 filter=""
 		
-		Return bbSystemRequestFile( text,filter,save,file,dir )
+		Return bbSystemRequestFile( Text,filter,save,file,dir )
 	End Method
 
-	Method RequestDir$( text$,dir$ )
+	Method RequestDir$( Text$,dir$ ) Override
 		dir=dir.Replace( "\","/" )
-		Return bbSystemRequestDir( text,dir )
+		Return bbSystemRequestDir( Text,dir )
 	End Method
 	
-	Method OpenURL:Int( url$ )
+	Method OpenURL:Int( url$ ) Override
 '		Return system_( "open "" + url.Replace("~q","") + "~q" )
 		Return bbOpenURL( url )
 	End Method
 
-	Method DesktopWidth:Int()
+	Method DesktopWidth:Int() Override
 		Return bbSystemDesktopWidth()
 	End Method
 	
-	Method DesktopHeight:Int()
+	Method DesktopHeight:Int() Override
 		Return bbSystemDesktopHeight()
 	End Method
 	
-	Method DesktopDepth:Int()
+	Method DesktopDepth:Int() Override
 		Return bbSystemDesktopDepth()
 	End Method
 	
-	Method DesktopHertz:Int()
+	Method DesktopHertz:Int() Override
 		Return bbSystemDesktopHertz()
 	End Method
 
-	Method Name:String()
+	Method Name:String() Override
 		Return "MacOSSystemDriver "
 	End Method
 

+ 20 - 20
systemdefault.mod/system.win32.bmx

@@ -42,35 +42,35 @@ Type TWin32SystemDriver Extends TSystemDriver
 		bbSystemStartup
 	End Method
 
-	Method Poll()
+	Method Poll() Override
 		bbSystemPoll()
 	End Method
 	
-	Method Wait()
+	Method Wait() Override
 		bbSystemWait()
 	End Method
 	
-	Method MoveMouse( x:Int,y:Int )
+	Method MoveMouse( x:Int,y:Int ) Override
 		bbSystemMoveMouse x,y
 	End Method
 	
-	Method SetMouseVisible( visible:Int )
+	Method SetMouseVisible( visible:Int ) Override
 		bbSystemSetMouseVisible visible
 	End Method
 
-	Method Notify( text$,serious:Int )
-		bbSystemNotify text,serious
+	Method Notify( Text$,serious:Int ) Override
+		bbSystemNotify Text,serious
 	End Method
 	
-	Method Confirm:Int( text$,serious:Int )
-		Return bbSystemConfirm( text,serious )
+	Method Confirm:Int( Text$,serious:Int ) Override
+		Return bbSystemConfirm( Text,serious )
 	End Method
 	
-	Method Proceed:Int( text$,serious:Int )
-		Return bbSystemProceed( text,serious )
+	Method Proceed:Int( Text$,serious:Int ) Override
+		Return bbSystemProceed( Text,serious )
 	End Method
 
-	Method RequestFile$( text$,exts$,save:Int,path$ )
+	Method RequestFile$( Text$,exts$,save:Int,path$ ) Override
 		Local file$,dir$
 		
 		path=path.Replace( "/","\" )
@@ -115,39 +115,39 @@ Type TWin32SystemDriver Extends TSystemDriver
 			exts=exts.Replace(",",";*.")+"~0"
 		EndIf
 		
-		Return bbSystemRequestFile( text,exts,defext,save,file,dir )
+		Return bbSystemRequestFile( Text,exts,defext,save,file,dir )
 
 	End Method
 
-	Method RequestDir$( text$,dir$ )
+	Method RequestDir$( Text$,dir$ ) Override
 	
 		dir=dir.Replace( "/","\" )
 		
-		Return bbSystemRequestDir( text,dir )
+		Return bbSystemRequestDir( Text,dir )
 	
 	End Method
 	
-	Method OpenURL:Int( url$ )
+	Method OpenURL:Int( url$ ) Override
 		Return bbOpenURL( url )
 	End Method
 
-	Method DesktopWidth:Int()
+	Method DesktopWidth:Int() Override
 		Return bbSystemDesktopWidth()
 	End Method
 	
-	Method DesktopHeight:Int()
+	Method DesktopHeight:Int() Override
 		Return bbSystemDesktopHeight()
 	End Method
 	
-	Method DesktopDepth:Int()
+	Method DesktopDepth:Int() Override
 		Return bbSystemDesktopDepth()
 	End Method
 	
-	Method DesktopHertz:Int()
+	Method DesktopHertz:Int() Override
 		Return bbSystemDesktopHertz()
 	End Method
 
-	Method Name:String()
+	Method Name:String() Override
 		Return "Win32SystemDriver"
 	End Method
 	

+ 19 - 19
textstream.mod/textstream.bmx

@@ -44,7 +44,7 @@ Type TTextStream Extends TStreamWrapper
 	Const UTF16BE:Int=3
 	Const UTF16LE:Int=4
 
-	Method Read:Long( buf:Byte Ptr,count:Long )
+	Method Read:Long( buf:Byte Ptr,count:Long ) Override
 		For Local i:Long=0 Until count
 			If _bufcount=32 _FlushRead
 			Local hi:Int=_ReadByte()
@@ -57,7 +57,7 @@ Type TTextStream Extends TStreamWrapper
 		Return count
 	End Method
 	
-	Method Write:Long( buf:Byte Ptr,count:Long )
+	Method Write:Long( buf:Byte Ptr,count:Long ) Override
 		For Local i:Long=0 Until count
 			Local hi:Int=buf[i] Shr 4
 			Local lo:Int=buf[i] & $f
@@ -71,67 +71,67 @@ Type TTextStream Extends TStreamWrapper
 		Return count
 	End Method
 	
-	Method ReadByte:Int()
+	Method ReadByte:Int() Override
 		_FlushRead
 		Return Int( ReadLine() )
 	End Method
 	
-	Method WriteByte( n:Int )
+	Method WriteByte( n:Int ) Override
 		_FlushWrite
 		WriteLine n
 	End Method
 	
-	Method ReadShort:Int()
+	Method ReadShort:Int() Override
 		_FlushRead
 		Return Int( ReadLine() )
 	End Method
 	
-	Method WriteShort( n:Int )
+	Method WriteShort( n:Int ) Override
 		_FlushWrite
 		WriteLine n
 	End Method
 	
-	Method ReadInt:Int()
+	Method ReadInt:Int() Override
 		_FlushRead
 		Return Int( ReadLine() )
 	End Method
 	
-	Method WriteInt( n:Int )
+	Method WriteInt( n:Int ) Override
 		_FlushWrite
 		WriteLine n
 	End Method
 	
-	Method ReadLong:Long()
+	Method ReadLong:Long() Override
 		_FlushRead
 		Return Long( ReadLine() )
 	End Method
 	
-	Method WriteLong( n:Long )
+	Method WriteLong( n:Long ) Override
 		_FlushWrite
 		WriteLine n
 	End Method
 	
-	Method ReadFloat:Float()
+	Method ReadFloat:Float() Override
 		_FlushRead
 		Return Float( ReadLine() )
 	End Method
 	
-	Method WriteFloat( n:Float )
+	Method WriteFloat( n:Float ) Override
 		_FlushWrite
 		WriteLine n
 	End Method
 	
-	Method ReadDouble:Double()
+	Method ReadDouble:Double() Override
 		_FlushRead
 		Return Double( ReadLine() )
 	End Method
 	
-	Method WriteDouble( n:Double )
+	Method WriteDouble( n:Double ) Override
 		_FlushWrite
 		WriteLine n
 	End Method
 	
-	Method ReadLine$()
+	Method ReadLine$() Override
 		_FlushRead
 		Local buf:Short[1024],i:Int
 		While Not Eof()
@@ -158,13 +158,13 @@ Type TTextStream Extends TStreamWrapper
 		Return String.FromShorts( buf,i )
 	End Method
 	
-	Method WriteLine:Int( str$ )
+	Method WriteLine:Int( str$ ) Override
 		_FlushWrite
 		WriteString str
 		WriteString "~r~n"
 	End Method
 	
-	Method ReadString$( length:Int )
+	Method ReadString$( length:Int ) Override
 		_FlushRead
 		Local buf:Short[length]
 		For Local i:Int=0 Until length
@@ -173,7 +173,7 @@ Type TTextStream Extends TStreamWrapper
 		Return String.FromShorts(buf,length)
 	End Method
 	
-	Method WriteString( str$ )
+	Method WriteString( str$ ) Override
 		_FlushWrite
 		For Local i:Int=0 Until str.length
 			WriteChar str[i]
@@ -263,7 +263,7 @@ End Type
 	
 Type TTextStreamFactory Extends TStreamFactory
 
-	Method CreateStream:TStream( url:Object,proto$,path$,readable:Int,writeable:Int )
+	Method CreateStream:TStream( url:Object,proto$,path$,readable:Int,writeable:Int ) Override
 		Local encoding:Int
 		Select proto$
 		Case "latin1"

+ 1 - 1
threadpool.mod/threadpool.bmx

@@ -162,7 +162,7 @@ Type TThreadPoolExecutor Extends TExecutor
 	Rem
 	bbdoc: Executes the given command at some time in the future.
 	End Rem
-	Method execute(command:TRunnable)
+	Method execute(command:TRunnable) Override
 		If Not isShutdown Then
 			jobQueue.Lock()
 			jobQueue.Add(command)

+ 7 - 7
timerdefault.mod/timerdefault.bmx

@@ -35,18 +35,18 @@ End Function
 
 Type TDefaultTimer Extends TTimer
 
-	Method Ticks:Int()
+	Method Ticks:Int() Override
 		Return _ticks
 	End Method
 	
-	Method Stop()
+	Method Stop() Override
 		If Not _handle Return
 		bbTimerStop _handle,Self
 		_handle=0
 		_event=Null
 	End Method
 	
-	Method Fire()
+	Method Fire() Override
 		If Not _handle Return
 		_ticks:+1
 		If _event
@@ -56,7 +56,7 @@ Type TDefaultTimer Extends TTimer
 		EndIf
 	End Method
 
-	Method Wait:Int()
+	Method Wait:Int() Override
 		If Not _handle Return 0
 		Local n:Int
 		Repeat
@@ -67,7 +67,7 @@ Type TDefaultTimer Extends TTimer
 		Return n
 	End Method
 	
-	Function Create:TTimer( hertz#,event:TEvent=Null )
+	Function Create:TTimer( hertz#,event:TEvent=Null ) Override
 		Local t:TDefaultTimer =New TDefaultTimer
 		Local handle:Byte Ptr=bbTimerStart( hertz,t )
 		If Not handle Return Null
@@ -86,11 +86,11 @@ End Type
 
 Type TDefaultTimerFactory Extends TTimerFactory
 	
-	Method GetName:String()
+	Method GetName:String() Override
 		Return "DefaultTimer"
 	End Method
 	
-	Method Create:TTimer(hertz#,event:TEvent=Null)
+	Method Create:TTimer(hertz#,event:TEvent=Null) Override
 		Return TDefaultTimer.Create( hertz,event )
 	End Method
 		

+ 11 - 11
volumes.mod/vol_linux.bmx

@@ -95,7 +95,7 @@ Type TLinuxVolume Extends TVolume
 
 
 	
-	Method ListVolumes:TList()
+	Method ListVolumes:TList() Override
 		Local volumes:TList
 		
 		Local fp:Int = _setmntent("/etc/mtab", "r")
@@ -137,7 +137,7 @@ Type TLinuxVolume Extends TVolume
 		Return volumes
 	End Method
 	
-	Method GetVolumeFreeSpace:Long(vol:String)
+	Method GetVolumeFreeSpace:Long(vol:String) Override
 	
 		Local _vs:TVolSpace = TVolSpace.GetDiskSpace(vol)
 		
@@ -148,7 +148,7 @@ Type TLinuxVolume Extends TVolume
 		Return 0
 	End Method
 	
-	Method GetVolumeSize:Long(vol:String)
+	Method GetVolumeSize:Long(vol:String) Override
 	
 		Local _vs:TVolSpace = TVolSpace.GetDiskSpace(vol)
 
@@ -159,7 +159,7 @@ Type TLinuxVolume Extends TVolume
 		Return 0
 	End Method
 
-	Method GetVolumeInfo:TVolume(vol:String)
+	Method GetVolumeInfo:TVolume(vol:String) Override
 		Local volume:TLinuxVolume = New TLinuxVolume
 		
 		volume.volumeDevice = vol
@@ -175,7 +175,7 @@ Type TLinuxVolume Extends TVolume
 		Return volume
 	End Method
 	
-	Method Refresh()
+	Method Refresh() Override
 		If Not vs Then
 			Return
 		End If
@@ -192,7 +192,7 @@ Type TLinuxVolume Extends TVolume
 
 	End Method
 	
-	Method getHome:String()
+	Method getHome:String() Override
 		Local dir:String = String.FromUTF8String(getenv_("HOME"))
 		
 		' HOME not set?
@@ -214,23 +214,23 @@ Type TLinuxVolume Extends TVolume
 		Return dir
 	End Method
 
-	Method GetUserHomeDir:String()
+	Method GetUserHomeDir:String() Override
 		Return getHome()
 	End Method
 	
-	Method GetUserDesktopDir:String()
+	Method GetUserDesktopDir:String() Override
 		Return bmx_userdirlookup("DESKTOP")
 	End Method
 	
-	Method GetUserAppDir:String()
+	Method GetUserAppDir:String() Override
 		Return getHome()
 	End Method
 	
-	Method GetUserDocumentsDir:String()
+	Method GetUserDocumentsDir:String() Override
 		Return bmx_userdirlookup("DOCUMENTS")
 	End Method
 
-	Method GetCustomDir:String(dirType:Int, flags:Int = 0)
+	Method GetCustomDir:String(dirType:Int, flags:Int = 0) Override
 
 		Select dirType
 			Case DT_SHAREDUSERDATA

+ 11 - 11
volumes.mod/vol_mac.bmx

@@ -194,7 +194,7 @@ Type TMacVolume Extends TVolume
 	End Function
 
 
-	Method Refresh()
+	Method Refresh() Override
 	
 		If Not vs Then
 			Return
@@ -212,7 +212,7 @@ Type TMacVolume Extends TVolume
 
 	End Method
 
-	Method ListVolumes:TList()
+	Method ListVolumes:TList() Override
 		Local volumes:TList
 
 		' temp buffer for array of structs
@@ -249,7 +249,7 @@ Type TMacVolume Extends TVolume
 		Return volumes
 	End Method
 	
-	Method GetVolumeFreeSpace:Long(vol:String)
+	Method GetVolumeFreeSpace:Long(vol:String) Override
 	
 		Local _vs:TVolSpace = TVolSpace.GetDiskSpace(vol)
 		
@@ -260,7 +260,7 @@ Type TMacVolume Extends TVolume
 		Return 0
 	End Method
 	
-	Method GetVolumeSize:Long(vol:String)
+	Method GetVolumeSize:Long(vol:String) Override
 	
 		Local _vs:TVolSpace = TVolSpace.GetDiskSpace(vol)
 
@@ -271,7 +271,7 @@ Type TMacVolume Extends TVolume
 		Return 0
 	End Method
 
-	Method GetVolumeInfo:TVolume(vol:String)
+	Method GetVolumeInfo:TVolume(vol:String) Override
 		Local volume:TMacVolume = New TMacVolume
 
 
@@ -291,7 +291,7 @@ Type TMacVolume Extends TVolume
 		Return volume
 	End Method
 	
-	Method GetPath:String(folderType:Int, flags:Int = 0)
+	Method GetPath:String(folderType:Int, flags:Int = 0) Override
 		Local buf:Byte[1024],ref:Byte[80]
 		
 		If flags Then
@@ -304,23 +304,23 @@ Type TMacVolume Extends TVolume
 		Return String.FromUTF8String( buf )
 	End Method
 
-	Method GetUserHomeDir:String()
+	Method GetUserHomeDir:String() Override
 		Return GetPath(kCurrentUserFolderType)
 	End Method
 	
-	Method GetUserDesktopDir:String()
+	Method GetUserDesktopDir:String() Override
 		Return GetPath(kDesktopFolderType)
 	End Method
 	
-	Method GetUserAppDir:String()
+	Method GetUserAppDir:String() Override
 		Return GetPath(kApplicationSupportFolderType)
 	End Method
 	
-	Method GetUserDocumentsDir:String()
+	Method GetUserDocumentsDir:String() Override
 		Return GetPath(kDocumentsFolderType)
 	End Method
 
-	Method GetCustomDir:String(dirType:Int, flags:Int = 0)
+	Method GetCustomDir:String(dirType:Int, flags:Int = 0) Override
 		If dirType < 0 And dirType > -10 Then
 			Select dirType
 				Case DT_SHAREDUSERDATA

+ 10 - 10
volumes.mod/vol_win.bmx

@@ -235,7 +235,7 @@ Type TWinVolume Extends TVolume
 		Return this
 	End Function
 
-	Method ListVolumes:TList()
+	Method ListVolumes:TList() Override
 		Local volumes:TMap
 
 		' create buffer
@@ -321,21 +321,21 @@ Type TWinVolume Extends TVolume
 
 	End Method
 	
-	Method GetVolumeFreeSpace:Long(vol:String)
+	Method GetVolumeFreeSpace:Long(vol:String) Override
 
 		Local _vs:TVolSpace = TVolSpace.GetDiskSpace(vol)
 		
 		Return _vs.fb
 	End Method
 
-	Method GetVolumeSize:Long(vol:String)
+	Method GetVolumeSize:Long(vol:String) Override
 
 		Local _vs:TVolSpace = TVolSpace.GetDiskSpace(vol)
 		
 		Return _vs.tb
 	End Method
 	
-	Method GetVolumeInfo:TVolume(vol:String)
+	Method GetVolumeInfo:TVolume(vol:String) Override
 
 		Local Mode:Int = SetErrorMode(SEM_FAILCRITICALERRORS)
 
@@ -368,7 +368,7 @@ Type TWinVolume Extends TVolume
 		Return volume
 	End Method
 
-	Method Refresh()
+	Method Refresh() Override
 		If Not vs Then
 			Return
 		End If
@@ -386,23 +386,23 @@ Type TWinVolume Extends TVolume
 		
 	End Method
 
-	Method GetUserHomeDir:String()
+	Method GetUserHomeDir:String() Override
 		Return _getFolderPath(CSIDL_PROFILE)
 	End Method
 	
-	Method GetUserDesktopDir:String()
+	Method GetUserDesktopDir:String() Override
 		Return _getFolderPath(CSIDL_DESKTOPDIRECTORY)
 	End Method
 	
-	Method GetUserAppDir:String()
+	Method GetUserAppDir:String() Override
 		Return _getFolderPath(CSIDL_APPDATA)
 	End Method
 	
-	Method GetUserDocumentsDir:String()
+	Method GetUserDocumentsDir:String() Override
 		Return _getFolderPath(CSIDL_PERSONAL)
 	End Method
 
-	Method GetCustomDir:String(dirType:Int, flags:Int = 0)
+	Method GetCustomDir:String(dirType:Int, flags:Int = 0) Override
 		If dirType < 0 Then
 			Select dirType
 				Case DT_USERPICTURES

+ 1 - 1
wavloader.mod/wavloader.bmx

@@ -28,7 +28,7 @@ Public
 
 Type TAudioSampleLoaderWAV Extends TAudioSampleLoader
 
-	Method LoadAudioSample:TAudioSample( stream:TStream )
+	Method LoadAudioSample:TAudioSample( stream:TStream ) Override
 	
 		stream=LittleEndianStream(stream)
 		

+ 1 - 1
xml.mod/xml.bmx

@@ -48,7 +48,7 @@ Type TxmlBase Abstract
 	Rem
 	bbdoc: Returns a string representation of the element.
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return bmx_mxmlSaveString(nodePtr, False)
 	End Method