From 1d6a9562095e15f5d474320712de5abc15719813 Mon Sep 17 00:00:00 2001
From: Erwan Tulou <erwan10@videolan.org>
Date: Sat, 19 Dec 2009 19:30:23 +0100
Subject: [PATCH] skins2(Win32): prepare for typified windows
---
modules/gui/skins2/win32/win32_factory.cpp | 2 +-
modules/gui/skins2/win32/win32_window.cpp | 5 +++--
modules/gui/skins2/win32/win32_window.hpp | 6 +++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/modules/gui/skins2/win32/win32_factory.cpp b/modules/gui/skins2/win32/win32_factory.cpp
index e7bbf66952b1..0a1cba57c250 100644
--- a/modules/gui/skins2/win32/win32_factory.cpp
+++ b/modules/gui/skins2/win32/win32_factory.cpp
@@ -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 );
}
diff --git a/modules/gui/skins2/win32/win32_window.cpp b/modules/gui/skins2/win32/win32_window.cpp
index 7102f96b1bbc..413168dc6767 100644
--- a/modules/gui/skins2/win32/win32_window.cpp
+++ b/modules/gui/skins2/win32/win32_window.cpp
@@ -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 )
diff --git a/modules/gui/skins2/win32/win32_window.hpp b/modules/gui/skins2/win32/win32_window.hpp
index 0cad495a5c82..6717cd7276e7 100644
--- a/modules/gui/skins2/win32/win32_window.hpp
+++ b/modules/gui/skins2/win32/win32_window.hpp
@@ -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;
+
};
--
GitLab