Commit cc7c7f9c authored by Olivier Teulière's avatar Olivier Teulière

* ./modules/gui/skins/gtk2/gtk2_run.cpp: fixed compilation of the

   basic-skins plugin with GTK2
 * modules/gui/skins/parser/skin.*: small compilation fix, but i don't
   really understand why it is necessary :)
parent 8403fa0b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk2_run.cpp: * gtk2_run.cpp:
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: gtk2_run.cpp,v 1.22 2003/04/30 21:16:24 asmax Exp $ * $Id: gtk2_run.cpp,v 1.23 2003/05/01 13:51:03 ipkiss Exp $
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
#include "../os_theme.h" #include "../os_theme.h"
#include "../src/skin_common.h" #include "../src/skin_common.h"
#include "../src/vlcproc.h" #include "../src/vlcproc.h"
#ifndef BASIC_SKINS #ifndef BASIC_SKINS
#include "../src/wxdialogs.h" #include "../src/wxdialogs.h"
#include "share/vlc32x32.xpm" // include the icon graphic
#endif #endif
// include the icon graphic
#include "share/vlc32x32.xpm"
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
class CallBackObjects class CallBackObjects
...@@ -156,7 +156,9 @@ void GTK2Proc( GdkEvent *event, gpointer data ) ...@@ -156,7 +156,9 @@ void GTK2Proc( GdkEvent *event, gpointer data )
{ {
if( !proc->EventProc( evt ) ) if( !proc->EventProc( evt ) )
{ {
#ifndef BASIC_SKINS
wxExit(); wxExit();
#endif
return; // Exit VLC ! return; // Exit VLC !
} }
} }
......
/* A lexical scanner generated by flex */ /* A lexical scanner generated by flex */
/* Scanner skeleton version: /* Scanner skeleton version:
* $Header: /root/vlc-cvs/modules/gui/skins/parser/flex.c,v 1.6 2003/04/20 20:28:39 ipkiss Exp $ * $Header: /root/vlc-cvs/modules/gui/skins/parser/flex.c,v 1.7 2003/05/01 13:51:03 ipkiss Exp $
*/ */
#define FLEX_SCANNER #define FLEX_SCANNER
...@@ -3045,8 +3045,8 @@ static char *yy_last_accepting_cpos; ...@@ -3045,8 +3045,8 @@ static char *yy_last_accepting_cpos;
#define YY_RESTORE_YY_MORE_OFFSET #define YY_RESTORE_YY_MORE_OFFSET
char *yytext; char *yytext;
#define INITIAL 0 #define INITIAL 0
/* Validating XML processor for skin.dtd (Id: skin.dtd,v 1.3 2003/03/19 17:14:50 karibu Exp). /* Validating XML processor for skin.dtd (Id: skin.dtd,v 1.4 2003/04/20 20:28:39 ipkiss Exp).
* Generated 2003/04/20 20:23:13. * Generated 2003/05/01 15:30:24.
* *
* This program was generated with the FleXML XML processor generator, * This program was generated with the FleXML XML processor generator,
* (Id: flexml.pl,v 1.24 1999/12/13 16:18:30 krisrose Exp). * (Id: flexml.pl,v 1.24 1999/12/13 16:18:30 krisrose Exp).
...@@ -3074,7 +3074,7 @@ const char rcs_flexml_skeleton[] = ...@@ -3074,7 +3074,7 @@ const char rcs_flexml_skeleton[] =
const char rcs_flexml[] = const char rcs_flexml[] =
"$" "Id: flexml.pl,v 1.24 1999/12/13 16:18:30 krisrose Exp $"; "$" "Id: flexml.pl,v 1.24 1999/12/13 16:18:30 krisrose Exp $";
const char rcs_skin_dtd[] = const char rcs_skin_dtd[] =
"$" "Id: skin.dtd,v 1.3 2003/03/19 17:14:50 karibu Exp $"; "$" "Id: skin.dtd,v 1.4 2003/04/20 20:28:39 ipkiss Exp $";
/* ANSI headers. */ /* ANSI headers. */
#include <unistd.h> #include <unistd.h>
...@@ -3833,7 +3833,7 @@ FAIL("EOF in prolog."); ...@@ -3833,7 +3833,7 @@ FAIL("EOF in prolog.");
* * skin.dtd: DTD for the VLC skins * * skin.dtd: DTD for the VLC skins
* ***************************************************************************** * *****************************************************************************
* * Copyright (C) 2003 VideoLAN * * Copyright (C) 2003 VideoLAN
* * $Id: flex.c,v 1.6 2003/04/20 20:28:39 ipkiss Exp $ * * $Id: flex.c,v 1.7 2003/05/01 13:51:03 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>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* skin.act: FleXML actions file * skin.act: FleXML actions file
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: skin.act,v 1.4 2003/04/20 20:28:39 ipkiss Exp $ * $Id: skin.act,v 1.5 2003/05/01 13:51:03 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>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<actions> <actions>
<top> <top>
<![CDATA[ <![CDATA[
#include "wrappers.h" #include "parser/wrappers.h"
]]> ]]>
</top> </top>
<start tag="Bitmap"> <start tag="Bitmap">
......
/* XML application for skin.dtd (Id: skin.dtd,v 1.3 2003/03/19 17:14:50 karibu Exp). /* XML application for skin.dtd (Id: skin.dtd,v 1.4 2003/04/20 20:28:39 ipkiss Exp).
* Includes actions from skin.act. * Includes actions from skin.act.
* Generated 2003/04/20 20:23:13. * Generated 2003/05/01 15:30:24.
* *
* This program was generated with the FleXML XML processor generator, * This program was generated with the FleXML XML processor generator,
* (Id: flexml.pl,v 1.24 1999/12/13 16:18:30 krisrose Exp). * (Id: flexml.pl,v 1.24 1999/12/13 16:18:30 krisrose Exp).
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#line 31 "skin.act" #line 31 "skin.act"
#include "wrappers.h" #include "parser/wrappers.h"
void STag_Bitmap(void) void STag_Bitmap(void)
......
/* XML processor/application API for skin.dtd (Id: skin.dtd,v 1.3 2003/03/19 17:14:50 karibu Exp). /* XML processor/application API for skin.dtd (Id: skin.dtd,v 1.4 2003/04/20 20:28:39 ipkiss Exp).
* Generated 2003/04/20 20:23:13. * Generated 2003/05/01 15:30:24.
* *
* This program was generated with the FleXML XML processor generator, * This program was generated with the FleXML XML processor generator,
* (Id: flexml.pl,v 1.24 1999/12/13 16:18:30 krisrose Exp). * (Id: flexml.pl,v 1.24 1999/12/13 16:18:30 krisrose Exp).
......
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