Compilation fixes and cosmetic changes

diff --git a/modules/gui/skins/controls/controls.h b/modules/gui/skins/controls/controls.h
index b71b2d6a0b46273cab7441d092ba590e099b142b..334b0c992e4763d1e5bfe681776aab675450a89b 100644 (file)
--- a/modules/gui/skins/controls/controls.h
+++ b/modules/gui/skins/controls/controls.h
@@ -2,7 +2,7 @@
  * controls.h:
  *****************************************************************************
  * 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>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -30,4 +30,5 @@
 #include "image.h"
 #include "slider.h"
 #include "playlist.h"
+#include "rectangle.h"
 #include "text.h"

diff --git a/modules/gui/skins/controls/rectangle.cpp b/modules/gui/skins/controls/rectangle.cpp
index c144ded1b2998a5e5fc6c90f770473f02173eb7c..70726e0d8acb45757329b3523df1bc157ac756cd 100644 (file)
--- a/modules/gui/skins/controls/rectangle.cpp
+++ b/modules/gui/skins/controls/rectangle.cpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * image.cpp: Image control
+ * rectangle.cpp: Rectanglee control
  *****************************************************************************
  * 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 Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -42,7 +42,7 @@
 
 
 //---------------------------------------------------------------------------
-// Control Image
+// Control Rectangle
 //---------------------------------------------------------------------------
 ControlRectangle::ControlRectangle( string id, bool visible, int x, int y,
     int w, int h, int color, string event, string help, Window *Parent )
@@ -75,6 +75,8 @@ bool ControlRectangle::ProcessEvent( Event *evt  )
         case CTRL_ENABLED:
             Enable( (Event*)evt->GetParam1(), (bool)evt->GetParam2() );
             break;
+        default:
+            break;
     }
     return false;
 }
@@ -117,7 +119,6 @@ void ControlRectangle::Enable( Event *event, bool enabled )
         Enabled = enabled;
         ParentWindow->Refresh( Left, Top, Width, Height );
     }
-
 }
 //---------------------------------------------------------------------------
 

diff --git a/modules/gui/skins/controls/rectangle.h b/modules/gui/skins/controls/rectangle.h
index 9b6d49a278da693c5eecab9541ee991160f72613..052a29f179d24aa7231134f9a06e1cacf36fbf2c 100644 (file)
--- a/modules/gui/skins/controls/rectangle.h
+++ b/modules/gui/skins/controls/rectangle.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * image.h: Image control
+ * rectangle.h: Rectangle control
  *****************************************************************************
  * 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>
  *          Emmanuel Puig    <karibu@via.ecp.fr>

diff --git a/modules/gui/skins/parser/wrappers.cpp b/modules/gui/skins/parser/wrappers.cpp
index 1d8d9c4a7e15c270f71194d4d52d9f564458e812..0aec6a6330951014e11ef07fb48ba012b1c3abf9 100644 (file)
--- a/modules/gui/skins/parser/wrappers.cpp
+++ b/modules/gui/skins/parser/wrappers.cpp
@@ -2,7 +2,7 @@
  * wrappers.cpp: Wrappers around C++ objects
  *****************************************************************************
  * 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 Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -129,7 +129,7 @@ void AddAnchor( char *x, char *y, char *len, char *priority )
 
 
 //---------------------------------------------------------------------------
-// CONTROLS\r
+// CONTROLS
 //---------------------------------------------------------------------------
 void AddImage( char *id, char *visible, char *x, char *y, char *image,
     char *event, char *help )