skins2(Win32): prepare for typified windows

diff --git a/modules/gui/skins2/win32/win32_factory.cpp b/modules/gui/skins2/win32/win32_factory.cpp
index e7bbf66952b11dc9873c403ed1b44ac65653e829..0a1cba57c250be05cc8380a6e61a06558411ca69 100644 (file)
--- 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 7102f96b1bbc31af2fbf5f23254caa1a90591ed2..413168dc676729ca71998f8a981f10104bf42531 100644 (file)
--- 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 0cad495a5c8254eeafa1c53a93928d5bf2760f38..6717cd7276e71d136540681284693121cc024708 100644 (file)
--- 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;
+
 };