Commit 1d6a9562 authored by Erwan Tulou's avatar Erwan Tulou
Browse files

skins2(Win32): prepare for typified windows

parent ce4bddf3
...@@ -326,7 +326,7 @@ OSWindow *Win32Factory::createOSWindow( GenericWindow &rWindow, bool dragDrop, ...@@ -326,7 +326,7 @@ OSWindow *Win32Factory::createOSWindow( GenericWindow &rWindow, bool dragDrop,
GenericWindow::WindowType_t type ) GenericWindow::WindowType_t type )
{ {
return new Win32Window( getIntf(), rWindow, m_hInst, m_hParentWindow, return new Win32Window( getIntf(), rWindow, m_hInst, m_hParentWindow,
dragDrop, playOnDrop, (Win32Window*)pParent ); dragDrop, playOnDrop, (Win32Window*)pParent, type );
} }
......
...@@ -46,9 +46,10 @@ ...@@ -46,9 +46,10 @@
Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow, Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow,
HINSTANCE hInst, HWND hParentWindow, HINSTANCE hInst, HWND hParentWindow,
bool dragDrop, bool playOnDrop, bool dragDrop, bool playOnDrop,
Win32Window *pParentWindow ): Win32Window *pParentWindow,
GenericWindow::WindowType_t type ):
OSWindow( pIntf ), m_dragDrop( dragDrop ), m_isLayered( false ), OSWindow( pIntf ), m_dragDrop( dragDrop ), m_isLayered( false ),
m_pParent( pParentWindow ) m_pParent( pParentWindow ), m_type ( type )
{ {
// Create the window // Create the window
if( pParentWindow ) if( pParentWindow )
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#ifndef WIN32_WINDOW_HPP #ifndef WIN32_WINDOW_HPP
#define WIN32_WINDOW_HPP #define WIN32_WINDOW_HPP
#include "../src/generic_window.hpp"
#include "../src/os_window.hpp" #include "../src/os_window.hpp"
#include <windows.h> #include <windows.h>
#include <ole2.h> // LPDROPTARGET #include <ole2.h> // LPDROPTARGET
...@@ -37,7 +38,7 @@ public: ...@@ -37,7 +38,7 @@ public:
Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow, Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow,
HINSTANCE hInst, HWND hParentWindow, HINSTANCE hInst, HWND hParentWindow,
bool dragDrop, bool playOnDrop, bool dragDrop, bool playOnDrop,
Win32Window *pParentWindow ); Win32Window *pParentWindow, GenericWindow::WindowType_t );
virtual ~Win32Window(); virtual ~Win32Window();
// Show the window // Show the window
...@@ -80,6 +81,9 @@ private: ...@@ -80,6 +81,9 @@ private:
mutable bool m_isLayered; mutable bool m_isLayered;
/// Parent window /// Parent window
Win32Window *m_pParent; Win32Window *m_pParent;
/// window type
GenericWindow::WindowType_t m_type;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment