Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
4e2943d8
Commit
4e2943d8
authored
May 13, 2003
by
Cyril Deguet
Browse files
* changed OSGraphics constructor (needed for X11)
parent
3dae4454
Changes
5
Hide whitespace changes
Inline
Side-by-side
modules/gui/skins/gtk2/gtk2_graphics.cpp
View file @
4e2943d8
...
...
@@ -2,7 +2,7 @@
* gtk2_graphics.cpp: GTK2 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: gtk2_graphics.cpp,v 1.1
7
2003/0
4/28
1
2
:25:
34
asmax Exp $
* $Id: gtk2_graphics.cpp,v 1.1
8
2003/0
5/13
1
9
:25:
59
asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -40,7 +40,7 @@
//---------------------------------------------------------------------------
// GTK2 GRAPHICS
//---------------------------------------------------------------------------
GTK2Graphics
::
GTK2Graphics
(
int
w
,
int
h
,
SkinWindow
*
from
)
:
Graphics
(
w
,
h
)
GTK2Graphics
::
GTK2Graphics
(
intf_thread_t
*
p_intf
,
int
w
,
int
h
,
SkinWindow
*
from
)
:
Graphics
(
w
,
h
)
{
if
(
from
!=
NULL
)
{
...
...
modules/gui/skins/gtk2/gtk2_graphics.h
View file @
4e2943d8
...
...
@@ -2,7 +2,7 @@
* gtk2_graphics.h: GTK2 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: gtk2_graphics.h,v 1.
6
2003/0
4/28
1
2
:25:
34
asmax Exp $
* $Id: gtk2_graphics.h,v 1.
7
2003/0
5/13
1
9
:25:
59
asmax Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -43,7 +43,7 @@ class GTK2Graphics : public Graphics
public:
// Constructor
GTK2Graphics
(
int
w
,
int
h
,
SkinWindow
*
from
=
NULL
);
GTK2Graphics
(
intf_thread_t
*
p_intf
,
int
w
,
int
h
,
SkinWindow
*
from
=
NULL
);
// Destructor
virtual
~
GTK2Graphics
();
// Drawing methods
...
...
modules/gui/skins/src/window.cpp
View file @
4e2943d8
...
...
@@ -2,7 +2,7 @@
* window.cpp: Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: window.cpp,v 1.2
2
2003/0
4/30 21:16:24
asmax Exp $
* $Id: window.cpp,v 1.2
3
2003/0
5/13 19:25:59
asmax Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -290,8 +290,8 @@ void SkinWindow::RefreshImage( int x, int y, int w, int h )
unsigned
int
i
;
// Create Bitmap Buffer
//
Graphics *Buffer = (Graphics *)new OSGraphics( p_intf, w, h, this );
Graphics
*
Buffer
=
(
Graphics
*
)
new
OSGraphics
(
w
,
h
,
this
);
Graphics
*
Buffer
=
(
Graphics
*
)
new
OSGraphics
(
p_intf
,
w
,
h
,
this
);
//
Graphics *Buffer = (Graphics *)new OSGraphics( w, h, this );
// Draw every control
for
(
i
=
0
;
i
<
ControlList
.
size
();
i
++
)
...
...
@@ -491,8 +491,8 @@ void SkinWindow::ReSize()
// Change image buffer
if
(
Image
!=
NULL
)
delete
(
OSGraphics
*
)
Image
;
//
Image = (Graphics *)new OSGraphics( p_intf, w, h, this );
Image
=
(
Graphics
*
)
new
OSGraphics
(
w
,
h
,
this
);
Image
=
(
Graphics
*
)
new
OSGraphics
(
p_intf
,
w
,
h
,
this
);
//
Image = (Graphics *)new OSGraphics( w, h, this );
Size
(
w
,
h
);
}
...
...
modules/gui/skins/win32/win32_graphics.cpp
View file @
4e2943d8
...
...
@@ -2,7 +2,7 @@
* win32_graphics.cpp: Win32 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: win32_graphics.cpp,v 1.
6
2003/0
4/28
1
2
:25:
34
asmax Exp $
* $Id: win32_graphics.cpp,v 1.
7
2003/0
5/13
1
9
:25:
59
asmax Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -39,7 +39,7 @@
//---------------------------------------------------------------------------
// WIN32 GRAPHICS
//---------------------------------------------------------------------------
Win32Graphics
::
Win32Graphics
(
int
w
,
int
h
,
SkinWindow
*
from
)
:
Graphics
(
w
,
h
)
Win32Graphics
::
Win32Graphics
(
intf_thread_t
*
p_intf
,
int
w
,
int
h
,
SkinWindow
*
from
)
:
Graphics
(
w
,
h
)
{
HBITMAP
HImage
;
Image
=
CreateCompatibleDC
(
NULL
);
...
...
modules/gui/skins/win32/win32_graphics.h
View file @
4e2943d8
...
...
@@ -2,7 +2,7 @@
* win32_graphics.h: Win32 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: win32_graphics.h,v 1.
5
2003/0
4/28
1
2
:25:
34
asmax Exp $
* $Id: win32_graphics.h,v 1.
6
2003/0
5/13
1
9
:25:
59
asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -40,7 +40,7 @@ class Win32Graphics : public Graphics
public:
// Constructor
Win32Graphics
(
int
w
,
int
h
,
SkinWindow
*
from
=
NULL
);
Win32Graphics
(
intf_thread_t
*
p_intf
,
int
w
,
int
h
,
SkinWindow
*
from
=
NULL
);
// Destructor
virtual
~
Win32Graphics
();
// Drawing methods
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment