Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
3f0d1dbf
Commit
3f0d1dbf
authored
Jun 06, 2003
by
Cyril Deguet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* got rid of this useless error message
parent
5d71559d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
23 deletions
+17
-23
modules/gui/skins/src/skin_main.cpp
modules/gui/skins/src/skin_main.cpp
+2
-2
modules/gui/skins/x11/x11_font.cpp
modules/gui/skins/x11/x11_font.cpp
+2
-2
modules/gui/skins/x11/x11_window.cpp
modules/gui/skins/x11/x11_window.cpp
+13
-19
No files found.
modules/gui/skins/src/skin_main.cpp
View file @
3f0d1dbf
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* skin-main.cpp: skins plugin for VLC
* skin-main.cpp: skins plugin for VLC
*****************************************************************************
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* Copyright (C) 2003 VideoLAN
* $Id: skin_main.cpp,v 1.3
2 2003/06/04 16:03:33 gbazin
Exp $
* $Id: skin_main.cpp,v 1.3
3 2003/06/06 23:34:35 asmax
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>
...
@@ -278,7 +278,7 @@ static void Run( intf_thread_t *p_intf )
...
@@ -278,7 +278,7 @@ static void Run( intf_thread_t *p_intf )
delete
Loader
;
delete
Loader
;
msg_
Err
(
p_intf
,
"Load theme time : %i ms"
,
OSAPI_GetTime
()
-
a
);
msg_
Dbg
(
p_intf
,
"Load theme time : %i ms"
,
OSAPI_GetTime
()
-
a
);
// Refresh the whole interface
// Refresh the whole interface
OSAPI_PostMessage
(
NULL
,
VLC_INTF_REFRESH
,
0
,
(
int
)
true
);
OSAPI_PostMessage
(
NULL
,
VLC_INTF_REFRESH
,
0
,
(
int
)
true
);
...
...
modules/gui/skins/x11/x11_font.cpp
View file @
3f0d1dbf
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* x11_font.cpp: X11 implementation of the Font class
* x11_font.cpp: X11 implementation of the Font class
*****************************************************************************
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* Copyright (C) 2003 VideoLAN
* $Id: x11_font.cpp,v 1.
6 2003/06/06 21:47:18
asmax Exp $
* $Id: x11_font.cpp,v 1.
7 2003/06/06 23:34:35
asmax Exp $
*
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Authors: Cyril Deguet <asmax@videolan.org>
*
*
...
@@ -55,7 +55,7 @@ X11Font::X11Font( intf_thread_t *_p_intf, string fontname, int size,
...
@@ -55,7 +55,7 @@ X11Font::X11Font( intf_thread_t *_p_intf, string fontname, int size,
size
=
(
size
<
10
?
8
:
12
);
size
=
(
size
<
10
?
8
:
12
);
snprintf
(
name
,
256
,
"-*-helvetica-bold-%c-*-*-*-%i-*-*-*-*-*-*"
,
snprintf
(
name
,
256
,
"-*-helvetica-bold-%c-*-*-*-%i-*-*-*-*-*-*"
,
slant
,
10
*
size
);
slant
,
10
*
size
);
msg_
Warn
(
_p_intf
,
"loading font %s"
,
name
);
msg_
Dbg
(
_p_intf
,
"loading font %s"
,
name
);
XLOCK
;
XLOCK
;
font
=
XLoadFont
(
display
,
name
);
font
=
XLoadFont
(
display
,
name
);
...
...
modules/gui/skins/x11/x11_window.cpp
View file @
3f0d1dbf
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* x11_window.cpp: X11 implementation of the Window class
* x11_window.cpp: X11 implementation of the Window class
*****************************************************************************
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* Copyright (C) 2003 VideoLAN
* $Id: x11_window.cpp,v 1.
9 2003/06/01 22:11:24
asmax Exp $
* $Id: x11_window.cpp,v 1.
10 2003/06/06 23:34:35
asmax Exp $
*
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Authors: Cyril Deguet <asmax@videolan.org>
*
*
...
@@ -97,6 +97,8 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
...
@@ -97,6 +97,8 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
SendMessage( ToolTipWindow, TTM_ADDTOOL, 0,
SendMessage( ToolTipWindow, TTM_ADDTOOL, 0,
(LPARAM)(LPTOOLINFO) &ToolTipInfo );
(LPARAM)(LPTOOLINFO) &ToolTipInfo );
*/
*/
if
(
DragDrop
)
if
(
DragDrop
)
{
{
// register the listview as a drop target
// register the listview as a drop target
...
@@ -105,14 +107,7 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
...
@@ -105,14 +107,7 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
}
}
// Create Tool Tip window
// Create Tool Tip window
/* GdkWindowAttr attr;
ToolTipWindow
=
XCreateSimpleWindow
(
display
,
wnd
,
0
,
0
,
1
,
1
,
0
,
0
,
0
);
attr.event_mask = GDK_ALL_EVENTS_MASK;
attr.width = 100;
attr.height = 100;
attr.window_type = GDK_WINDOW_CHILD;
attr.wclass = GDK_INPUT_OUTPUT;
gint mask = 0;
ToolTipWindow = gdk_window_new( gwnd, &attr, mask);*/
}
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
X11Window
::~
X11Window
()
X11Window
::~
X11Window
()
...
@@ -123,11 +118,11 @@ X11Window::~X11Window()
...
@@ -123,11 +118,11 @@ X11Window::~X11Window()
if( hWnd != NULL )
if( hWnd != NULL )
{
{
DestroyWindow( hWnd );
DestroyWindow( hWnd );
}
}
*/
if
(
ToolTipWindow
!=
NULL
)
if
(
ToolTipWindow
!=
NULL
)
{
{
DestroyWindow(
ToolTipWindow );
XDestroyWindow
(
display
,
ToolTipWindow
);
}
}
/*
if( DragDrop )
if( DragDrop )
{
{
// Remove the listview from the list of drop targets
// Remove the listview from the list of drop targets
...
@@ -358,13 +353,13 @@ void X11Window::Size( int width, int height )
...
@@ -358,13 +353,13 @@ void X11Window::Size( int width, int height )
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
void
X11Window
::
ChangeToolTipText
(
string
text
)
void
X11Window
::
ChangeToolTipText
(
string
text
)
{
{
/*
if( text == "none" )
if
(
text
==
"none"
)
{
{
if
(
ToolTipText
!=
"none"
)
if
(
ToolTipText
!=
"none"
)
{
{
ToolTipText
=
"none"
;
ToolTipText
=
"none"
;
ToolTipInfo.lpszText = NULL;
//
ToolTipInfo.lpszText = NULL;
SendMessage( ToolTipWindow, TTM_ACTIVATE, 0 , 0 );
//
SendMessage( ToolTipWindow, TTM_ACTIVATE, 0 , 0 );
}
}
}
}
else
else
...
@@ -372,13 +367,12 @@ void X11Window::ChangeToolTipText( string text )
...
@@ -372,13 +367,12 @@ void X11Window::ChangeToolTipText( string text )
if
(
text
!=
ToolTipText
)
if
(
text
!=
ToolTipText
)
{
{
ToolTipText
=
text
;
ToolTipText
=
text
;
ToolTipInfo.lpszText = (char *)ToolTipText.c_str();
//
ToolTipInfo.lpszText = (char *)ToolTipText.c_str();
SendMessage( ToolTipWindow, TTM_ACTIVATE, 1 , 0 );
/*
SendMessage( ToolTipWindow, TTM_ACTIVATE, 1 , 0 );
SendMessage( ToolTipWindow, TTM_UPDATETIPTEXT, 0,
SendMessage( ToolTipWindow, TTM_UPDATETIPTEXT, 0,
(LPARAM)(LPTOOLINFO)&ToolTipInfo );
(LPARAM)(LPTOOLINFO)&ToolTipInfo );
*/
}
}
}
}
*/
}
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
...
...
Write
Preview
Markdown
is supported
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