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
1d6a9562
Commit
1d6a9562
authored
Dec 19, 2009
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2(Win32): prepare for typified windows
parent
ce4bddf3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
modules/gui/skins2/win32/win32_factory.cpp
modules/gui/skins2/win32/win32_factory.cpp
+1
-1
modules/gui/skins2/win32/win32_window.cpp
modules/gui/skins2/win32/win32_window.cpp
+3
-2
modules/gui/skins2/win32/win32_window.hpp
modules/gui/skins2/win32/win32_window.hpp
+5
-1
No files found.
modules/gui/skins2/win32/win32_factory.cpp
View file @
1d6a9562
...
...
@@ -326,7 +326,7 @@ OSWindow *Win32Factory::createOSWindow( GenericWindow &rWindow, bool dragDrop,
GenericWindow
::
WindowType_t
type
)
{
return
new
Win32Window
(
getIntf
(),
rWindow
,
m_hInst
,
m_hParentWindow
,
dragDrop
,
playOnDrop
,
(
Win32Window
*
)
pParent
);
dragDrop
,
playOnDrop
,
(
Win32Window
*
)
pParent
,
type
);
}
...
...
modules/gui/skins2/win32/win32_window.cpp
View file @
1d6a9562
...
...
@@ -46,9 +46,10 @@
Win32Window
::
Win32Window
(
intf_thread_t
*
pIntf
,
GenericWindow
&
rWindow
,
HINSTANCE
hInst
,
HWND
hParentWindow
,
bool
dragDrop
,
bool
playOnDrop
,
Win32Window
*
pParentWindow
)
:
Win32Window
*
pParentWindow
,
GenericWindow
::
WindowType_t
type
)
:
OSWindow
(
pIntf
),
m_dragDrop
(
dragDrop
),
m_isLayered
(
false
),
m_pParent
(
pParentWindow
)
m_pParent
(
pParentWindow
)
,
m_type
(
type
)
{
// Create the window
if
(
pParentWindow
)
...
...
modules/gui/skins2/win32/win32_window.hpp
View file @
1d6a9562
...
...
@@ -25,6 +25,7 @@
#ifndef WIN32_WINDOW_HPP
#define WIN32_WINDOW_HPP
#include "../src/generic_window.hpp"
#include "../src/os_window.hpp"
#include <windows.h>
#include <ole2.h> // LPDROPTARGET
...
...
@@ -37,7 +38,7 @@ public:
Win32Window
(
intf_thread_t
*
pIntf
,
GenericWindow
&
rWindow
,
HINSTANCE
hInst
,
HWND
hParentWindow
,
bool
dragDrop
,
bool
playOnDrop
,
Win32Window
*
pParentWindow
);
Win32Window
*
pParentWindow
,
GenericWindow
::
WindowType_t
);
virtual
~
Win32Window
();
// Show the window
...
...
@@ -80,6 +81,9 @@ private:
mutable
bool
m_isLayered
;
/// Parent window
Win32Window
*
m_pParent
;
/// window type
GenericWindow
::
WindowType_t
m_type
;
};
...
...
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