Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
e86c4fef
Commit
e86c4fef
authored
Mar 01, 2010
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2(Win32): no need to manage a two window classes
parent
4ad06d10
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
30 deletions
+2
-30
modules/gui/skins2/win32/win32_factory.cpp
modules/gui/skins2/win32/win32_factory.cpp
+1
-29
modules/gui/skins2/win32/win32_window.cpp
modules/gui/skins2/win32/win32_window.cpp
+1
-1
No files found.
modules/gui/skins2/win32/win32_factory.cpp
View file @
e86c4fef
...
@@ -125,7 +125,7 @@ bool Win32Factory::init()
...
@@ -125,7 +125,7 @@ bool Win32Factory::init()
// Create window class
// Create window class
WNDCLASS
skinWindowClass
;
WNDCLASS
skinWindowClass
;
skinWindowClass
.
style
=
CS_
VREDRAW
|
CS_HREDRAW
|
CS_
DBLCLKS
;
skinWindowClass
.
style
=
CS_DBLCLKS
;
skinWindowClass
.
lpfnWndProc
=
(
WNDPROC
)
Win32Proc
;
skinWindowClass
.
lpfnWndProc
=
(
WNDPROC
)
Win32Proc
;
skinWindowClass
.
lpszClassName
=
_T
(
"SkinWindowClass"
);
skinWindowClass
.
lpszClassName
=
_T
(
"SkinWindowClass"
);
skinWindowClass
.
lpszMenuName
=
NULL
;
skinWindowClass
.
lpszMenuName
=
NULL
;
...
@@ -150,34 +150,6 @@ bool Win32Factory::init()
...
@@ -150,34 +150,6 @@ bool Win32Factory::init()
}
}
}
}
// Create window class for window of VoutWindow type
WNDCLASS
voutWindowClass
;
voutWindowClass
.
style
=
CS_OWNDC
|
CS_DBLCLKS
;
voutWindowClass
.
lpfnWndProc
=
(
WNDPROC
)
Win32Proc
;
voutWindowClass
.
lpszClassName
=
_T
(
"VoutWindowClass"
);
voutWindowClass
.
lpszMenuName
=
NULL
;
voutWindowClass
.
cbClsExtra
=
0
;
voutWindowClass
.
cbWndExtra
=
0
;
voutWindowClass
.
hbrBackground
=
(
HBRUSH__
*
)
GetStockObject
(
BLACK_BRUSH
);
voutWindowClass
.
hCursor
=
LoadCursor
(
NULL
,
IDC_ARROW
);
voutWindowClass
.
hIcon
=
LoadIcon
(
m_hInst
,
_T
(
"VLC_ICON"
)
);
voutWindowClass
.
hInstance
=
m_hInst
;
// Register class and check it
if
(
!
RegisterClass
(
&
voutWindowClass
)
)
{
WNDCLASS
wndclass
;
// Check why it failed. If it's because the class already exists
// then fine, otherwise return with an error.
if
(
!
GetClassInfo
(
m_hInst
,
_T
(
"VoutWindowClass"
),
&
wndclass
)
)
{
msg_Err
(
getIntf
(),
"cannot register voutWindow window class"
);
return
false
;
}
}
// Create Window
// Create Window
m_hParentWindow
=
CreateWindowEx
(
WS_EX_TOOLWINDOW
,
_T
(
"SkinWindowClass"
),
m_hParentWindow
=
CreateWindowEx
(
WS_EX_TOOLWINDOW
,
_T
(
"SkinWindowClass"
),
_T
(
"VLC media player"
),
WS_POPUP
|
WS_SYSMENU
|
WS_MINIMIZEBOX
,
_T
(
"VLC media player"
),
WS_POPUP
|
WS_SYSMENU
|
WS_MINIMIZEBOX
,
...
...
modules/gui/skins2/win32/win32_window.cpp
View file @
e86c4fef
...
@@ -59,7 +59,7 @@ Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow,
...
@@ -59,7 +59,7 @@ Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow,
// Child window (for vout)
// Child window (for vout)
m_hWnd_parent
=
pParentWindow
->
getHandle
();
m_hWnd_parent
=
pParentWindow
->
getHandle
();
m_hWnd
=
CreateWindowEx
(
WS_EX_TOOLWINDOW
|
WS_EX_NOPARENTNOTIFY
,
m_hWnd
=
CreateWindowEx
(
WS_EX_TOOLWINDOW
|
WS_EX_NOPARENTNOTIFY
,
"
Vout
WindowClass"
,
"default name"
,
"
Skin
WindowClass"
,
"default name"
,
WS_CHILD
|
WS_CLIPCHILDREN
|
WS_CLIPSIBLINGS
,
WS_CHILD
|
WS_CLIPCHILDREN
|
WS_CLIPSIBLINGS
,
0
,
0
,
0
,
0
,
m_hWnd_parent
,
0
,
hInst
,
NULL
);
0
,
0
,
0
,
0
,
m_hWnd_parent
,
0
,
hInst
,
NULL
);
}
}
...
...
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