applied patch 430963 (fix for wxRegConfig::SetPath("//foo")

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index faf7da613622f04c03e2c26453530bbee27c28d0..fb93646628c802b691625b186f58fbf2f217bb73 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -84,7 +84,7 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#ifndef __GNUWIN32_OLD__
+#if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)

     #include <shellapi.h>
     #include <mmsystem.h>
 #endif
     #include <shellapi.h>
     #include <mmsystem.h>
 #endif


@@ -93,7 +93,7 @@
     #include <windowsx.h>
 #endif
 
     #include <windowsx.h>
 #endif
 

-#if !defined(__GNUWIN32_OLD__) && !defined(__TWIN32__)
+#if (!defined(__GNUWIN32_OLD__) && !defined(__TWIN32__)) || defined(__CYGWIN10__)

     #ifdef __WIN95__
         #include <commctrl.h>
     #endif
     #ifdef __WIN95__
         #include <commctrl.h>
     #endif


@@ -288,7 +288,7 @@ wxWindow::~wxWindow()
     m_isBeingDeleted = TRUE;
 
     MSWDetachWindowMenu();
     m_isBeingDeleted = TRUE;
 
     MSWDetachWindowMenu();

-    
+

     // VS: make sure there's no wxFrame with last focus set to us:
     for (wxWindow *win = GetParent(); win; win = win->GetParent())
     {
     // VS: make sure there's no wxFrame with last focus set to us:
     for (wxWindow *win = GetParent(); win; win = win->GetParent())
     {


@@ -446,7 +446,11 @@ bool wxWindow::Show(bool show)
 // Raise the window to the top of the Z order
 void wxWindow::Raise()
 {
 // Raise the window to the top of the Z order
 void wxWindow::Raise()
 {

+#ifdef __WIN16__

     ::BringWindowToTop(GetHwnd());
     ::BringWindowToTop(GetHwnd());

+#else // Win32
+    ::SetForegroundWindow(GetHwnd());
+#endif

 }
 
 // Lower the window to the bottom of the Z order
 }
 
 // Lower the window to the bottom of the Z order


@@ -3461,6 +3465,9 @@ bool wxWindow::HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam)
     return GetEventHandler()->ProcessEvent(event);
 
 #else
     return GetEventHandler()->ProcessEvent(event);
 
 #else

+    (void) wParam;
+    (void) lParam;
+

     return FALSE;
 #endif
 }
     return FALSE;
 #endif
 }