Browse Source

Added missing overrides.

woollybah 5 years ago
parent
commit
4aebd092d0

+ 7 - 7
sdl.mod/sdl.bmx

@@ -121,27 +121,27 @@ Type TSDLStream Extends TStream
 
 	Field filePtr:Byte Ptr
 
-	Method Pos:Long()
+	Method Pos:Long() Override
 		Return bmx_SDL_RWtell(filePtr)
 	End Method
 
-	Method Size:Long()
+	Method Size:Long() Override
 		Return bmx_SDL_RWsize(filePtr)
 	End Method
 
-	Method Seek:Long( pos:Long, whence:Int = SEEK_SET_ )
+	Method Seek:Long( pos:Long, whence:Int = SEEK_SET_ ) Override
 		Return bmx_SDL_RWseek(filePtr, pos, whence)
 	End Method
 
-	Method Read:Long( buf:Byte Ptr,count:Long )
+	Method Read:Long( buf:Byte Ptr,count:Long ) Override
 		Return bmx_SDL_RWread(filePtr, buf, 1, count)
 	End Method
 
-	Method Write:Long( buf:Byte Ptr,count:Long )
+	Method Write:Long( buf:Byte Ptr,count:Long ) Override
 		Return bmx_SDL_RWwrite(filePtr, buf, 1, count)
 	End Method
 
-	Method Close()
+	Method Close() Override
 		If filePtr Then
 			bmx_SDL_RWclose(filePtr)
 			filePtr = Null
@@ -191,7 +191,7 @@ End Function
 
 Type TSDLStreamFactory Extends TStreamFactory
 
-	Method CreateStream:TStream( url:Object, proto$, path$, readable:Int, writeMode:Int )
+	Method CreateStream:TStream( url:Object, proto$, path$, readable:Int, writeMode:Int ) Override
 		If proto="sdl" Then
 			Return TSDLStream.Create( path, readable, writeMode )
 		End If

+ 2 - 2
sdlfreeaudio.mod/sdlfreeaudio.bmx

@@ -62,7 +62,7 @@ Import "glue.cpp"
 
 Type TSDLFreeAudioDriver Extends TFreeAudioAudioDriver
 
-	Method Startup:Int()
+	Method Startup:Int() Override
 		Local device:Byte Ptr = OpenSDLAudioDevice()
 		Local res:Int=-1
 		If device Then
@@ -71,7 +71,7 @@ Type TSDLFreeAudioDriver Extends TFreeAudioAudioDriver
 		Return res <> -1
 	End Method
 
-	Function Create:TFreeAudioAudioDriver( name$,Mode:Int )
+	Function Create:TFreeAudioAudioDriver( name$,Mode:Int ) Override
 		Local t:TSDLFreeAudioDriver = New TSDLFreeAudioDriver
 		t._name=name
 		t._mode=Mode

+ 25 - 25
sdljoystick.mod/sdljoystick.bmx

@@ -38,128 +38,128 @@ Type TSDLJoystickDriver Extends TJoystickDriver
 	Field currentPort:Int = -1
 	Field currentJoystick:TSDLJoystick
 	
-	Method GetName:String()
+	Method GetName:String() Override
 		Return "SDL Joystick"
 	End Method
 
-	Method JoyCount:Int()
+	Method JoyCount:Int() Override
 		Return SDL_NumJoysticks()
 	End Method
 	
-	Method JoyName:String(port:Int)
+	Method JoyName:String(port:Int) Override
 		Return String.FromUTF8String(SDL_JoystickNameForIndex(port))
 	End Method
 	
-	Method JoyButtonCaps:Int(port:Int)
+	Method JoyButtonCaps:Int(port:Int) Override
 		SampleJoy port
 		Return SDL_JoystickNumButtons(currentJoystick.joystickPtr)
 	End Method
 	
-	Method JoyAxisCaps:Int(port:Int)
+	Method JoyAxisCaps:Int(port:Int) Override
 		SampleJoy port
 		Return SDL_JoystickNumAxes(currentJoystick.joystickPtr)
 	End Method
 	
-	Method JoyDown:Int( button:Int, port:Int=0 )
+	Method JoyDown:Int( button:Int, port:Int=0 ) Override
 		SampleJoy port
 		Return SDL_JoystickGetButton(currentJoystick.joystickPtr, button)
 	End Method
 	
-	Method JoyHit:Int( button:Int, port:Int=0 )
+	Method JoyHit:Int( button:Int, port:Int=0 ) Override
 	End Method
 	
-	Method JoyX#( port:Int=0 )
+	Method JoyX#( port:Int=0 ) Override
 		SampleJoy port
 		Return SDL_JoystickGetAxis(currentJoystick.joystickPtr, JOY_X)/32767.0
 	End Method
 	
-	Method JoyY#( port:Int=0 ) 
+	Method JoyY#( port:Int=0 ) Override
 		SampleJoy port
 		Return SDL_JoystickGetAxis(currentJoystick.joystickPtr, JOY_Y)/32767.0
 	End Method
 	
-	Method JoyZ#( port:Int=0 ) 
+	Method JoyZ#( port:Int=0 ) Override
 		SampleJoy port
 		Return SDL_JoystickGetAxis(currentJoystick.joystickPtr, JOY_Z)/32767.0
 	End Method
 	
-	Method JoyR#( port:Int=0 ) 
+	Method JoyR#( port:Int=0 ) Override
 		SampleJoy port
 		Return SDL_JoystickGetAxis(currentJoystick.joystickPtr, JOY_R)/32767.0
 	End Method
 	
-	Method JoyU#( port:Int=0 ) 
+	Method JoyU#( port:Int=0 ) Override
 		SampleJoy port
 		Return SDL_JoystickGetAxis(currentJoystick.joystickPtr, JOY_U)/32767.0
 	End Method
 	
-	Method JoyV#( port:Int=0 ) 
+	Method JoyV#( port:Int=0 ) Override
 		SampleJoy port
 		Return SDL_JoystickGetAxis(currentJoystick.joystickPtr, JOY_V)/32767.0
 	End Method
 	
-	Method JoyYaw#( port:Int=0 ) 
+	Method JoyYaw#( port:Int=0 ) Override
 		SampleJoy port
 		Return SDL_JoystickGetAxis(currentJoystick.joystickPtr, JOY_YAW)/32767.0
 	End Method
 	
-	Method JoyPitch#( port:Int=0 ) 
+	Method JoyPitch#( port:Int=0 ) Override
 		SampleJoy port
 		Return SDL_JoystickGetAxis(currentJoystick.joystickPtr, JOY_PITCH)/32767.0
 	End Method
 	
-	Method JoyRoll#( port:Int=0 ) 
+	Method JoyRoll#( port:Int=0 ) Override
 		SampleJoy port
 		Return SDL_JoystickGetAxis(currentJoystick.joystickPtr, JOY_ROLL)/32767.0
 	End Method
 	
-	Method JoyHat#( port:Int=0 ) 
+	Method JoyHat#( port:Int=0 ) Override
 	End Method
 	
-	Method JoyWheel#( port:Int=0 ) 
+	Method JoyWheel#( port:Int=0 ) Override
 	End Method
 	
-	Method JoyType:Int( port:Int=0 ) 
+	Method JoyType:Int( port:Int=0 ) Override
 		If port<JoyCount() Return 1
 		Return 0
 	End Method
 	
-	Method JoyXDir:Int( port:Int=0 )
+	Method JoyXDir:Int( port:Int=0 ) Override
 		Local t#=JoyX( port )
 		If t<.333333 Return -1
 		If t>.333333 Return 1
 		Return 0
 	End Method
 
-	Method JoyYDir:Int( port:Int=0 )
+	Method JoyYDir:Int( port:Int=0 ) Override
 		Local t#=JoyY( port )
 		If t<.333333 Return -1
 		If t>.333333 Return 1
 		Return 0
 	End Method
 
-	Method JoyZDir:Int( port:Int=0 )
+	Method JoyZDir:Int( port:Int=0 ) Override
 		Local t#=JoyZ( port )
 		If t<.333333 Return -1
 		If t>.333333 Return 1
 		Return 0
 	End Method
 
-	Method JoyUDir:Int( port:Int=0 )
+	Method JoyUDir:Int( port:Int=0 ) Override
 		Local t#=JoyU( port )
 		If t<.333333 Return -1
 		If t>.333333 Return 1
 		Return 0
 	End Method
 
-	Method JoyVDir:Int( port:Int=0 )
+	Method JoyVDir:Int( port:Int=0 ) Override
 		Local t#=JoyV( port )
 		If t<.333333 Return -1
 		If t>.333333 Return 1
 		Return 0
 	End Method
 	
-	Method FlushJoy( port_mask:Int=~0 )
+	Method FlushJoy( port_mask:Int=~0 ) Override
 		' TODO ?
 	End Method
 	

+ 15 - 15
sdlsystem.mod/sdlsystem.bmx

@@ -49,11 +49,11 @@ Type TSDLSystemDriver Extends TSystemDriver
 		OnEnd(SDL_Quit)
 	End Method
 
-	Method Poll()
+	Method Poll() Override
 		bmx_SDL_Poll()
 	End Method
 	
-	Method Wait()
+	Method Wait() Override
 		bmx_SDL_WaitEvent()
 	End Method
 
@@ -61,17 +61,17 @@ Type TSDLSystemDriver Extends TSystemDriver
 		' TODO
 	End Method
 
-	Method SetMouseVisible( visible:Int )
+	Method SetMouseVisible( visible:Int ) Override
 		SDL_ShowCursor(visible)
 	End Method
 
-	Method MoveMouse( x:Int,y:Int )
+	Method MoveMouse( x:Int,y:Int ) Override
 		If _sdl_WarpMouse Then
 			_sdl_WarpMouse(x, y)
 		End If
 	End Method
 
-	Method Notify( Text$,serious:Int )
+	Method Notify( Text$,serious:Int ) Override
 		Local res:Int = bmx_SDL_ShowSimpleMessageBox(Text, AppTitle, serious)
 		' failed to display message box?
 		If res Then
@@ -79,39 +79,39 @@ Type TSDLSystemDriver Extends TSystemDriver
 		End If
 	End Method
 	
-	Method Confirm:Int( Text$,serious:Int )
+	Method Confirm:Int( Text$,serious:Int ) Override
 		Return bmx_SDL_ShowMessageBox_confirm(Text, AppTitle, serious)
 	End Method
 	
-	Method Proceed:Int( Text$,serious:Int )
+	Method Proceed:Int( Text$,serious:Int ) Override
 		Return bmx_SDL_ShowMessageBox_proceed(Text, AppTitle, serious)
 	End Method
 
-	Method RequestFile$( Text$,exts$,save:Int,file$ )
+	Method RequestFile$( Text$,exts$,save:Int,file$ ) Override
 		' TODO
 	End Method
 	
-	Method RequestDir$( Text$,path$ )
+	Method RequestDir$( Text$,path$ ) Override
 		' TODO
 	End Method
 
-	Method OpenURL:Int( url$ )
+	Method OpenURL:Int( url$ ) Override
 		' TODO
 	End Method
 
-	Method DesktopWidth:Int()
+	Method DesktopWidth:Int() Override
 		Return bmx_SDL_GetDisplayWidth(0)
 	End Method
 	
-	Method DesktopHeight:Int()
+	Method DesktopHeight:Int() Override
 		Return bmx_SDL_GetDisplayHeight(0)
 	End Method
 	
-	Method DesktopDepth:Int()
+	Method DesktopDepth:Int() Override
 		Return bmx_SDL_GetDisplayDepth(0)
 	End Method
 	
-	Method DesktopHertz:Int()
+	Method DesktopHertz:Int() Override
 		Return bmx_SDL_GetDisplayhertz(0)
 	End Method
 
@@ -122,7 +122,7 @@ Type TSDLSystemDriver Extends TSystemDriver
 		Return 1
 	End Function
 
-	Method Name:String()
+	Method Name:String() Override
 		Return "SDLSystemDriver"
 	End Method
 	

+ 7 - 7
sdltimer.mod/sdltimer.bmx

@@ -95,7 +95,7 @@ Type TSDLTimer Extends TTimer
 	bbdoc: Gets timer tick counter.
 	returns: The number of times the timer has ticked over
 	End Rem
-	Method Ticks:Int()
+	Method Ticks:Int() Override
 		Return _ticks
 	End Method
 	
@@ -103,14 +103,14 @@ Type TSDLTimer Extends TTimer
 	bbdoc: Stops the timer
 	about: Once stopped, the timer can no longer be used.
 	End Rem
-	Method Stop()
+	Method Stop() Override
 		If Not _handle Return
 		bmx_sdl_timer_stop _handle,Self
 		_handle=0
 		_event=Null
 	End Method
 	
-	Method Fire()
+	Method Fire() Override
 		If Not _handle Return
 		_ticks:+1
 		If _event
@@ -124,7 +124,7 @@ Type TSDLTimer Extends TTimer
 	bbdoc: Waits until the timer ticks.
 	returns: The number of ticks since the last call to #Wait.
 	End Rem
-	Method Wait:Int()
+	Method Wait:Int() Override
 		If Not _handle Return 0
 		Local n:Int
 		Repeat
@@ -135,7 +135,7 @@ Type TSDLTimer Extends TTimer
 		Return n
 	End Method
 	
-	Function Create:TTimer( hertz#,event:TEvent=Null )
+	Function Create:TTimer( hertz#,event:TEvent=Null ) Override
 		Local t:TSDLTimer =New TSDLTimer
 		Local handle:Byte Ptr=bmx_sdl_timer_start( hertz,t )
 		If Not handle Return Null
@@ -153,11 +153,11 @@ End Type
 
 Type TSDLTimerFactory Extends TTimerFactory
 	
-	Method GetName:String()
+	Method GetName:String() Override
 		Return "SDLTimer"
 	End Method
 	
-	Method Create:TTimer(hertz#,event:TEvent=Null)
+	Method Create:TTimer(hertz#,event:TEvent=Null) Override
 		Return TSDLTimer.Create( hertz,event )
 	End Method