Skip to content

Commit

Permalink
skins2: add OS/2 support
Browse files Browse the repository at this point in the history
Signed-off-by: Rafaël Carré <[email protected]>
  • Loading branch information
komh authored and funman committed May 22, 2013
1 parent 6092237 commit bf7670f
Show file tree
Hide file tree
Showing 24 changed files with 2,526 additions and 7 deletions.
3 changes: 3 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3758,6 +3758,9 @@ AS_IF([test "${enable_skins2}" != "no"], [
], [test "${SYS}" = "darwin"], [
VLC_ADD_CPPFLAGS([skins2],[ -DMACOSX_SKINS])
VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon])
dnl OS/2
], [test "${SYS}" = "os2"], [
VLC_ADD_CPPFLAGS([skins2],[ -DOS2_SKINS])
dnl Linux/Unix
], [
PKG_CHECK_MODULES([XPM], [xpm],, [have_skins_deps="no"])
Expand Down
2 changes: 1 addition & 1 deletion extras/package/os2/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ OPTIONS="
--enable-kva
--enable-kai
--enable-qt
--disable-skins2
--enable-skins2
--enable-libxml2
--enable-libgcrypt
--enable-vlc
Expand Down
21 changes: 21 additions & 0 deletions modules/gui/skins2/Modules.am
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,26 @@ SOURCES_skins2 += \
macosx/macosx_tooltip.hpp \
$(NULL)
else
if HAVE_OS2
SOURCES_skins2 += \
os2/os2_dragdrop.cpp \
os2/os2_dragdrop.hpp \
os2/os2_factory.cpp \
os2/os2_factory.hpp \
os2/os2_graphics.cpp \
os2/os2_graphics.hpp \
os2/os2_loop.cpp \
os2/os2_loop.hpp \
os2/os2_popup.cpp \
os2/os2_popup.hpp \
os2/os2_timer.cpp \
os2/os2_timer.hpp \
os2/os2_tooltip.cpp \
os2/os2_tooltip.hpp \
os2/os2_window.cpp \
os2/os2_window.hpp \
$(NULL)
else
SOURCES_skins2 += \
x11/x11_display.cpp \
x11/x11_display.hpp \
Expand All @@ -257,3 +277,4 @@ SOURCES_skins2 += \
$(NULL)
endif
endif
endif
40 changes: 40 additions & 0 deletions modules/gui/skins2/os2/os2_dragdrop.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*****************************************************************************
* os2_dragdrop.cpp
*****************************************************************************
* Copyright (C) 2003, 2013 the VideoLAN team
*
* Authors: Cyril Deguet <[email protected]>
* Olivier Teulière <[email protected]>
* KO Myung-Hun <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/

#ifdef OS2_SKINS

#include "os2/os2_dragdrop.hpp"
#include "../commands/cmd_add_item.hpp"
#include "../events/evt_dragndrop.hpp"
#include <list>


OS2DragDrop::OS2DragDrop( intf_thread_t *pIntf,
bool playOnDrop, GenericWindow* pWin )
: SkinObject( pIntf ), m_playOnDrop( playOnDrop ), m_pWin( pWin)
{
}


#endif
50 changes: 50 additions & 0 deletions modules/gui/skins2/os2/os2_dragdrop.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*****************************************************************************
* os2_dragdrop.hpp
*****************************************************************************
* Copyright (C) 2003, 2013 the VideoLAN team
*
* Authors: Cyril Deguet <[email protected]>
* Olivier Teulière <[email protected]>
* KO Myung-Hun <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/

#ifndef OS2_DRAGDROP_HPP
#define OS2_DRAGDROP_HPP

#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

#include "../src/skin_common.hpp"
#include "../src/generic_window.hpp"


class OS2DragDrop: public SkinObject
{
public:
OS2DragDrop( intf_thread_t *pIntf, bool playOnDrop, GenericWindow* pWin );
virtual ~OS2DragDrop() { }

private:
/// Indicates whether the file(s) must be played immediately
bool m_playOnDrop;
///
GenericWindow* m_pWin;
};


#endif
Loading

0 comments on commit bf7670f

Please sign in to comment.