BoxSizer to Sizer

This commit is contained in:
2018-08-15 22:04:06 -04:00
parent 353dc21750
commit bd3c111fa1
67 changed files with 369 additions and 308 deletions
@@ -70,13 +70,13 @@ cEvent::cEvent()
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnKeyDown(SDL_Keycode sym, Uint16 mod)//, Uint16 unicode)
/*virtual*/ void cEvent::OnKeyDown( SDL_Keycode sym, Uint16 mod )//, Uint16 unicode)
{
sym, mod;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnKeyUp(SDL_Keycode sym, Uint16 mod)//, Uint16 unicode)
/*virtual*/ void cEvent::OnKeyUp( SDL_Keycode sym, Uint16 mod )//, Uint16 unicode)
{
sym, mod;
//Pure virtual, do nothing
@@ -92,79 +92,79 @@ cEvent::cEvent()
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnMouseMove(int mX, int mY, int relX, int relY, bool Left, bool Right, bool Middle)
/*virtual*/ void cEvent::OnMouseMove( int mX, int mY, int relX, int relY, bool Left, bool Right, bool Middle )
{
mX, mY, relX, relY, Left, Right, Middle;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnMouseWheel(bool Up, bool Down)
/*virtual*/ void cEvent::OnMouseWheel( bool Up, bool Down )
{
Up, Down;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnLButtonDown(int mX, int mY)
/*virtual*/ void cEvent::OnLButtonDown( int mX, int mY )
{
mX, mY;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnLButtonUp(int mX, int mY)
/*virtual*/ void cEvent::OnLButtonUp( int mX, int mY )
{
mX, mY;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnRButtonDown(int mX, int mY)
/*virtual*/ void cEvent::OnRButtonDown( int mX, int mY )
{
mX, mY;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnRButtonUp(int mX, int mY)
/*virtual*/ void cEvent::OnRButtonUp( int mX, int mY )
{
mX, mY;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnMButtonDown(int mX, int mY)
/*virtual*/ void cEvent::OnMButtonDown( int mX, int mY )
{
mX, mY;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnMButtonUp(int mX, int mY)
/*virtual*/ void cEvent::OnMButtonUp( int mX, int mY )
{
mX, mY;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnJoyAxis(SDL_JoystickID which, Uint8 axis, Sint16 value)
/*virtual*/ void cEvent::OnJoyAxis( SDL_JoystickID which, Uint8 axis, Sint16 value )
{
which, axis, value;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnJoyButtonDown(SDL_JoystickID which, Uint8 button)
/*virtual*/ void cEvent::OnJoyButtonDown( SDL_JoystickID which, Uint8 button )
{
which, button;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnJoyButtonUp(SDL_JoystickID which, Uint8 button)
/*virtual*/ void cEvent::OnJoyButtonUp( SDL_JoystickID which, Uint8 button )
{
which, button;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnJoyHat(SDL_JoystickID which, Uint8 hat, Uint8 value)
/*virtual*/ void cEvent::OnJoyHat( SDL_JoystickID which, Uint8 hat, Uint8 value )
{
which, hat, value;
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnJoyBall(SDL_JoystickID which, Uint8 ball, Sint16 xrel, Sint16 yrel)
/*virtual*/ void cEvent::OnJoyBall( SDL_JoystickID which, Uint8 ball, Sint16 xrel, Sint16 yrel )
{
which, ball, xrel, yrel;
//Pure virtual, do nothing
@@ -180,7 +180,7 @@ cEvent::cEvent()
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnResize(int w, int h)
/*virtual*/ void cEvent::OnResize( int w, int h )
{
w, h;
//Pure virtual, do nothing
@@ -196,7 +196,7 @@ cEvent::cEvent()
//Pure virtual, do nothing
}
/*virtual*/ void cEvent::OnUser(Uint32 type, int code, void* data1, void* data2)
/*virtual*/ void cEvent::OnUser( Uint32 type, int code, void* data1, void* data2 )
{
type, code, data1, data2;
//Pure virtual, do nothing
@@ -22,51 +22,51 @@ namespace EventEngine {
virtual void OnInputBlur();
virtual void OnKeyDown(SDL_Keycode sym, Uint16 mod);//, Uint16 unicode);
virtual void OnKeyDown( SDL_Keycode sym, Uint16 mod );//, Uint16 unicode);
virtual void OnKeyUp(SDL_Keycode sym, Uint16 mod);//, Uint16 unicode);
virtual void OnKeyUp( SDL_Keycode sym, Uint16 mod );//, Uint16 unicode);
virtual void OnMouseFocus();
virtual void OnMouseBlur();
virtual void OnMouseMove(int mX, int mY, int relX, int relY, bool Left, bool Right, bool Middle);
virtual void OnMouseMove( int mX, int mY, int relX, int relY, bool Left, bool Right, bool Middle );
virtual void OnMouseWheel(bool Up, bool Down); //Not implemented
virtual void OnMouseWheel( bool Up, bool Down ); //Not implemented
virtual void OnLButtonDown(int mX, int mY);
virtual void OnLButtonDown( int mX, int mY );
virtual void OnLButtonUp(int mX, int mY);
virtual void OnLButtonUp( int mX, int mY );
virtual void OnRButtonDown(int mX, int mY);
virtual void OnRButtonDown( int mX, int mY );
virtual void OnRButtonUp(int mX, int mY);
virtual void OnRButtonUp( int mX, int mY );
virtual void OnMButtonDown(int mX, int mY);
virtual void OnMButtonDown( int mX, int mY );
virtual void OnMButtonUp(int mX, int mY);
virtual void OnMButtonUp( int mX, int mY );
virtual void OnJoyAxis(SDL_JoystickID which, Uint8 axis, Sint16 value);
virtual void OnJoyAxis( SDL_JoystickID which, Uint8 axis, Sint16 value );
virtual void OnJoyButtonDown(SDL_JoystickID which, Uint8 button);
virtual void OnJoyButtonDown( SDL_JoystickID which, Uint8 button );
virtual void OnJoyButtonUp(SDL_JoystickID which, Uint8 button);
virtual void OnJoyButtonUp( SDL_JoystickID which, Uint8 button );
virtual void OnJoyHat(SDL_JoystickID which, Uint8 hat, Uint8 value);
virtual void OnJoyHat( SDL_JoystickID which, Uint8 hat, Uint8 value );
virtual void OnJoyBall(SDL_JoystickID which, Uint8 ball, Sint16 xrel, Sint16 yrel);
virtual void OnJoyBall( SDL_JoystickID which, Uint8 ball, Sint16 xrel, Sint16 yrel );
virtual void OnMinimize();
virtual void OnRestore();
virtual void OnResize(int w, int h);
virtual void OnResize( int w, int h );
virtual void OnExpose();
virtual void OnExit();
virtual void OnUser(Uint32 type, int code, void* data1, void* data2);
virtual void OnUser( Uint32 type, int code, void* data1, void* data2 );
private:
void OnWindowsEvent( const SDL_Event& event );
void OnMouseButtonDown( const SDL_Event& event );
@@ -86,12 +86,12 @@ void cEventControl::CheckEvents()
}
}
void cEventControl::AddEvent(EventEngine::cEvent* event)
void cEventControl::AddEvent( EventEngine::cEvent* event )
{
m_children.push_back(event);
}
const bool cEventControl::RemoveEvent(EventEngine::cEvent* event)
const bool cEventControl::RemoveEvent( EventEngine::cEvent* event )
{
bool rtn = false;
std::vector<EventEngine::cEvent*>::iterator it;
@@ -33,8 +33,8 @@ namespace EventEngine {
/* Checks for Events */
void CheckEvents();
void AddEvent(EventEngine::cEvent* event);
const bool RemoveEvent(EventEngine::cEvent* event);
void AddEvent( EventEngine::cEvent* event );
const bool RemoveEvent( EventEngine::cEvent* event );
std::vector<EventEngine::cEvent*>& GetEvents();