Commit 7bd4a1c0 authored by Olivier Teulière's avatar Olivier Teulière

Compilation fixes and cosmetic changes

parent 8d7d0c6b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* controls.h: * controls.h:
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: controls.h,v 1.1 2003/03/18 02:21:47 ipkiss Exp $ * $Id: controls.h,v 1.2 2003/03/18 04:08:45 ipkiss Exp $
* *
* Authors: Olivier Teulière <ipkiss@via.ecp.fr> * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr> * Emmanuel Puig <karibu@via.ecp.fr>
...@@ -30,4 +30,5 @@ ...@@ -30,4 +30,5 @@
#include "image.h" #include "image.h"
#include "slider.h" #include "slider.h"
#include "playlist.h" #include "playlist.h"
#include "rectangle.h"
#include "text.h" #include "text.h"
/***************************************************************************** /*****************************************************************************
* image.cpp: Image control * rectangle.cpp: Rectanglee control
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: rectangle.cpp,v 1.1 2003/03/18 02:21:47 ipkiss Exp $ * $Id: rectangle.cpp,v 1.2 2003/03/18 04:08:45 ipkiss Exp $
* *
* Authors: Olivier Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr> * Emmanuel Puig <karibu@via.ecp.fr>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Control Image // Control Rectangle
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
ControlRectangle::ControlRectangle( string id, bool visible, int x, int y, ControlRectangle::ControlRectangle( string id, bool visible, int x, int y,
int w, int h, int color, string event, string help, Window *Parent ) int w, int h, int color, string event, string help, Window *Parent )
...@@ -75,6 +75,8 @@ bool ControlRectangle::ProcessEvent( Event *evt ) ...@@ -75,6 +75,8 @@ bool ControlRectangle::ProcessEvent( Event *evt )
case CTRL_ENABLED: case CTRL_ENABLED:
Enable( (Event*)evt->GetParam1(), (bool)evt->GetParam2() ); Enable( (Event*)evt->GetParam1(), (bool)evt->GetParam2() );
break; break;
default:
break;
} }
return false; return false;
} }
...@@ -117,7 +119,6 @@ void ControlRectangle::Enable( Event *event, bool enabled ) ...@@ -117,7 +119,6 @@ void ControlRectangle::Enable( Event *event, bool enabled )
Enabled = enabled; Enabled = enabled;
ParentWindow->Refresh( Left, Top, Width, Height ); ParentWindow->Refresh( Left, Top, Width, Height );
} }
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
......
/***************************************************************************** /*****************************************************************************
* image.h: Image control * rectangle.h: Rectangle control
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: rectangle.h,v 1.1 2003/03/18 02:21:47 ipkiss Exp $ * $Id: rectangle.h,v 1.2 2003/03/18 04:08:45 ipkiss Exp $
* *
* Authors: Olivier Teulière <ipkiss@via.ecp.fr> * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr> * Emmanuel Puig <karibu@via.ecp.fr>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* wrappers.cpp: Wrappers around C++ objects * wrappers.cpp: Wrappers around C++ objects
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: wrappers.cpp,v 1.1 2003/03/18 02:21:47 ipkiss Exp $ * $Id: wrappers.cpp,v 1.2 2003/03/18 04:08:45 ipkiss Exp $
* *
* Authors: Olivier Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr> * Emmanuel Puig <karibu@via.ecp.fr>
...@@ -129,7 +129,7 @@ void AddAnchor( char *x, char *y, char *len, char *priority ) ...@@ -129,7 +129,7 @@ void AddAnchor( char *x, char *y, char *len, char *priority )
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// CONTROLS // CONTROLS
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AddImage( char *id, char *visible, char *x, char *y, char *image, void AddImage( char *id, char *visible, char *x, char *y, char *image,
char *event, char *help ) char *event, char *help )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment