Changeset 07541e2ef1b5a33992883049d83171781cfcd125

Show
Ignore:
Timestamp:
12/08/02 20:56:04 (6 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1039377364 +0000
git-parent:

[caf200f5e94783c777e0a859e92bddc6608a01c0]

git-author:
Gildas Bazin <gbazin@videolan.org> 1039377364 +0000
Message:

* modules/gui/wxwindows/*: compilation fixes for wxX11 (it doesn't support drag and drop
yet). Compilation fix for MacOSX as well (wxEntry() not declared).
* src/misc/variables.c: added a FreeMutex?() function.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/wxwindows/interface.cpp

    r2c208e6 r07541e2  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: interface.cpp,v 1.9 2002/11/23 18:42:59 gbazin Exp $ 
     5 * $Id: interface.cpp,v 1.10 2002/12/08 19:56:04 gbazin Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    165165    frame_sizer->Fit(this); 
    166166 
     167#if !defined(__WXX11__) 
    167168    /* Associate drop targets with the main interface */ 
    168169    SetDropTarget( new DragAndDrop( p_intf ) ); 
     170#endif 
    169171} 
    170172 
    …… 
    233235    SetMenuBar( menubar ); 
    234236 
     237#if !defined(__WXX11__) 
    235238    /* Associate drop targets with the menubar */ 
    236239    menubar->SetDropTarget( new DragAndDrop( p_intf ) ); 
     240#endif 
    237241} 
    238242 
    …… 
    286290    frame_sizer->SetMinSize( toolbar_sizer->GetMinSize().GetWidth(), -1 ); 
    287291 
     292#if !defined(__WXX11__) 
    288293    /* Associate drop targets with the toolbar */ 
    289294    toolbar->SetDropTarget( new DragAndDrop( p_intf ) ); 
     295#endif 
    290296} 
    291297 
    …… 
    452458} 
    453459 
     460#if !defined(__WXX11__) 
    454461/***************************************************************************** 
    455462 * Definition of DragAndDrop class. 
    …… 
    486493    return TRUE; 
    487494} 
     495#endif 

  • modules/gui/wxwindows/playlist.cpp

    r2c208e6 r07541e2  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: playlist.cpp,v 1.4 2002/11/23 18:42:59 gbazin Exp $ 
     5 * $Id: playlist.cpp,v 1.5 2002/12/08 19:56:04 gbazin Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    156156    SetSizerAndFit( main_sizer ); 
    157157 
     158#if !defined(__WXX11__) 
    158159    /* Associate drop targets with the playlist */ 
    159160    SetDropTarget( new DragAndDrop( p_intf ) ); 
     161#endif 
    160162 
    161163    /* Update the playlist */ 

  • modules/gui/wxwindows/wxwindows.cpp

    rc7cf1f0 r07541e2  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: wxwindows.cpp,v 1.6 2002/11/23 16:17:12 gbazin Exp $ 
     5 * $Id: wxwindows.cpp,v 1.7 2002/12/08 19:56:04 gbazin Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    4747#include "wxwindows.h" 
    4848 
     49/* Temporary hack */ 
     50#ifdef __DARWIN__ 
     51int wxEntry( int argc, char *argv[] , bool enterLoop = TRUE ); 
     52#endif 
     53 
    4954/***************************************************************************** 
    5055 * Local prototypes. 

  • modules/gui/wxwindows/wxwindows.h

    r434b232 r07541e2  
    33 ***************************************************************************** 
    44 * Copyright (C) 1999, 2000 VideoLAN 
    5  * $Id: wxwindows.h,v 1.3 2002/11/23 14:28:51 gbazin Exp $ 
     5 * $Id: wxwindows.h,v 1.4 2002/12/08 19:56:04 gbazin Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    167167}; 
    168168 
     169#if !defined(__WXX11__) 
    169170/* Drag and Drop class */ 
    170171class DragAndDrop: public wxFileDropTarget 
    …… 
    179180    intf_thread_t *p_intf; 
    180181}; 
     182#endif 

  • src/misc/variables.c

    r0d62cd7 r07541e2  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002 VideoLAN 
    5  * $Id: variables.c,v 1.15 2002/12/07 15:25:27 gbazin Exp $ 
     5 * $Id: variables.c,v 1.16 2002/12/08 19:56:04 gbazin Exp $ 
    66 * 
    77 * Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    5757static void FreeDummy( vlc_value_t *p_val ) { (void)p_val; /* unused */ } 
    5858static void FreeString( vlc_value_t *p_val ) { free( p_val->psz_string ); } 
     59static void FreeMutex( vlc_value_t *p_val ) { vlc_mutex_destroy( (vlc_mutex_t*)p_val->p_address ); free( p_val->p_address ); } 
    5960 
    6061/***************************************************************************** 
    …… 
    173174        case VLC_VAR_MUTEX: 
    174175            p_var->pf_cmp = CmpAddress; 
     176            p_var->pf_free = FreeMutex; 
    175177            p_var->val.p_address = malloc( sizeof(vlc_mutex_t) ); 
    176178            vlc_mutex_init( p_this, (vlc_mutex_t*)p_var->val.p_address ); 
    …… 
    217219    /* Free value if needed */ 
    218220    p_var->pf_free( &p_var->val ); 
    219  
    220     switch( p_var->i_type & VLC_VAR_TYPE ) 
    221     { 
    222         /* XXX: find a way to put this in pf_free */ 
    223         case VLC_VAR_MUTEX: 
    224             vlc_mutex_destroy( (vlc_mutex_t*)p_var->val.p_address ); 
    225             free( p_var->val.p_address ); 
    226             break; 
    227     } 
    228221 
    229222    /* Free choice list if needed */