Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
3f0d1dbf
Commit
3f0d1dbf
authored
Jun 06, 2003
by
Cyril Deguet
Browse files
* got rid of this useless error message
parent
5d71559d
Changes
3
Hide whitespace changes
Inline
Side-by-side
modules/gui/skins/src/skin_main.cpp
View file @
3f0d1dbf
...
...
@@ -2,7 +2,7 @@
* skin-main.cpp: skins plugin for VLC
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: skin_main.cpp,v 1.3
2
2003/06/0
4 16:03:33 gbazin
Exp $
* $Id: skin_main.cpp,v 1.3
3
2003/06/0
6 23:34:35 asmax
Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -278,7 +278,7 @@ static void Run( intf_thread_t *p_intf )
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
OSAPI_PostMessage
(
NULL
,
VLC_INTF_REFRESH
,
0
,
(
int
)
true
);
...
...
modules/gui/skins/x11/x11_font.cpp
View file @
3f0d1dbf
...
...
@@ -2,7 +2,7 @@
* x11_font.cpp: X11 implementation of the Font class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: x11_font.cpp,v 1.
6
2003/06/06 2
1:47:18
asmax Exp $
* $Id: x11_font.cpp,v 1.
7
2003/06/06 2
3:34:35
asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
...
...
@@ -55,7 +55,7 @@ X11Font::X11Font( intf_thread_t *_p_intf, string fontname, int size,
size
=
(
size
<
10
?
8
:
12
);
snprintf
(
name
,
256
,
"-*-helvetica-bold-%c-*-*-*-%i-*-*-*-*-*-*"
,
slant
,
10
*
size
);
msg_
Warn
(
_p_intf
,
"loading font %s"
,
name
);
msg_
Dbg
(
_p_intf
,
"loading font %s"
,
name
);
XLOCK
;
font
=
XLoadFont
(
display
,
name
);
...
...
modules/gui/skins/x11/x11_window.cpp
View file @
3f0d1dbf
...
...
@@ -2,7 +2,7 @@
* x11_window.cpp: X11 implementation of the Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: x11_window.cpp,v 1.
9
2003/06/0
1
2
2:11:24
asmax Exp $
* $Id: x11_window.cpp,v 1.
10
2003/06/0
6
2
3:34:35
asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
...
...
@@ -97,6 +97,8 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
SendMessage( ToolTipWindow, TTM_ADDTOOL, 0,
(LPARAM)(LPTOOLINFO) &ToolTipInfo );
*/
if
(
DragDrop
)
{
// register the listview as a drop target
...
...
@@ -105,14 +107,7 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
}
// Create Tool Tip window
/* GdkWindowAttr attr;
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);*/
ToolTipWindow
=
XCreateSimpleWindow
(
display
,
wnd
,
0
,
0
,
1
,
1
,
0
,
0
,
0
);
}
//---------------------------------------------------------------------------
X11Window
::~
X11Window
()
...
...
@@ -123,11 +118,11 @@ X11Window::~X11Window()
if( hWnd != NULL )
{
DestroyWindow( hWnd );
}
}
*/
if
(
ToolTipWindow
!=
NULL
)
{
DestroyWindow( ToolTipWindow );
}
X
DestroyWindow
(
display
,
ToolTipWindow
);
}
/*
if( DragDrop )
{
// Remove the listview from the list of drop targets
...
...
@@ -358,13 +353,13 @@ void X11Window::Size( int width, int height )
//---------------------------------------------------------------------------
void
X11Window
::
ChangeToolTipText
(
string
text
)
{
/*
if( text == "none" )
if
(
text
==
"none"
)
{
if
(
ToolTipText
!=
"none"
)
{
ToolTipText
=
"none"
;
ToolTipInfo.lpszText = NULL;
SendMessage( ToolTipWindow, TTM_ACTIVATE, 0 , 0 );
//
ToolTipInfo.lpszText = NULL;
//
SendMessage( ToolTipWindow, TTM_ACTIVATE, 0 , 0 );
}
}
else
...
...
@@ -372,13 +367,12 @@ void X11Window::ChangeToolTipText( string text )
if
(
text
!=
ToolTipText
)
{
ToolTipText
=
text
;
ToolTipInfo.lpszText = (char *)ToolTipText.c_str();
SendMessage( ToolTipWindow, TTM_ACTIVATE, 1 , 0 );
//
ToolTipInfo.lpszText = (char *)ToolTipText.c_str();
/*
SendMessage( ToolTipWindow, TTM_ACTIVATE, 1 , 0 );
SendMessage( ToolTipWindow, TTM_UPDATETIPTEXT, 0,
(LPARAM)(LPTOOLINFO)&ToolTipInfo );
(LPARAM)(LPTOOLINFO)&ToolTipInfo );
*/
}
}
*/
}
//---------------------------------------------------------------------------
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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