really show the window after creation (calling Show(TRUE) doesn't do it any more)

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 5873b253703d814bf2265a9bc39f3b8fbc8d62b2..0296aac6ce94c317c3d1e6c7d6e95e3f63dfe874 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "toplevel.h"
 #endif
 
     #pragma implementation "toplevel.h"
 #endif
 


@@ -41,8 +41,25 @@
 #include "wx/module.h"
 
 #include "wx/msw/private.h"
 #include "wx/module.h"
 
 #include "wx/msw/private.h"

+#if defined(__WXWINCE__)
+  #include <ole2.h>
+  #include <shellapi.h>
+  #if _WIN32_WCE < 400
+    #include <aygshell.h>
+  #endif
+#include "wx/msw/wince/missing.h"
+#endif
+
+#include "wx/msw/missing.h"
+#include "wx/msw/winundef.h"
+
+// This can't be undefed in winundef.h or
+// there are further errors
+#if defined(__WXWINCE__) && defined(CreateDialog)
+#undef CreateDialog
+#endif

 
 

-#include "wx/popupwin.h"
+#include "wx/display.h"

 
 #ifndef ICON_BIG
     #define ICON_BIG 1
 
 #ifndef ICON_BIG
     #define ICON_BIG 1


@@ -122,9 +139,6 @@ void wxTopLevelWindowMSW::Init()
     m_iconized =
     m_maximizeOnShow = FALSE;
 
     m_iconized =
     m_maximizeOnShow = FALSE;
 

-    // unlike (almost?) all other windows, frames are created hidden
-    m_isShown = FALSE;
-

     // Data to save/restore when calling ShowFullScreen
     m_fsStyle = 0;
     m_fsOldWindowStyle = 0;
     // Data to save/restore when calling ShowFullScreen
     m_fsStyle = 0;
     m_fsOldWindowStyle = 0;


@@ -141,7 +155,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     WXDWORD msflags = wxWindow::MSWGetStyle
                       (
                         (style & ~wxBORDER_MASK) | wxBORDER_NONE, exflags
     WXDWORD msflags = wxWindow::MSWGetStyle
                       (
                         (style & ~wxBORDER_MASK) | wxBORDER_NONE, exflags

-                      ) & ~WS_CHILD;
+                      ) & ~WS_CHILD & ~WS_VISIBLE;

 
     // first select the kind of window being created
     //
 
     // first select the kind of window being created
     //


@@ -151,20 +165,35 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     if ( style & wxFRAME_TOOL_WINDOW )
         msflags |= WS_POPUP;
     else
     if ( style & wxFRAME_TOOL_WINDOW )
         msflags |= WS_POPUP;
     else

-        msflags |= WS_OVERLAPPED;
+    {
+#ifdef __WXWINCE__
+        if (msflags & WS_BORDER)
+#endif
+            msflags |= WS_OVERLAPPED;
+    }

 
     // border and caption styles
     if ( style & wxRESIZE_BORDER )
 
     // border and caption styles
     if ( style & wxRESIZE_BORDER )

+    {
+#ifndef __WXWINCE__

         msflags |= WS_THICKFRAME;
         msflags |= WS_THICKFRAME;

+#endif
+    }
+    else if ( exflags && ((style & wxBORDER_DOUBLE) || (style & wxBORDER_RAISED)) )
+        *exflags |= WS_EX_DLGMODALFRAME;

     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;

+#ifndef __WXWINCE__

     else
         msflags |= WS_POPUP;
     else
         msflags |= WS_POPUP;

+#endif

 
     if ( style & wxCAPTION )
         msflags |= WS_CAPTION;
 
     if ( style & wxCAPTION )
         msflags |= WS_CAPTION;

+#ifndef __WXWINCE__

     else
         msflags |= WS_POPUP;
     else
         msflags |= WS_POPUP;

+#endif

 
     // next translate the individual flags
     if ( style & wxMINIMIZE_BOX )
 
     // next translate the individual flags
     if ( style & wxMINIMIZE_BOX )


@@ -173,10 +202,12 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
         msflags |= WS_MAXIMIZEBOX;
     if ( style & wxSYSTEM_MENU )
         msflags |= WS_SYSMENU;
         msflags |= WS_MAXIMIZEBOX;
     if ( style & wxSYSTEM_MENU )
         msflags |= WS_SYSMENU;

+#ifndef __WXWINCE__

     if ( style & wxMINIMIZE )
         msflags |= WS_MINIMIZE;
     if ( style & wxMAXIMIZE )
         msflags |= WS_MAXIMIZE;
     if ( style & wxMINIMIZE )
         msflags |= WS_MINIMIZE;
     if ( style & wxMAXIMIZE )
         msflags |= WS_MAXIMIZE;

+#endif

 
     // Keep this here because it saves recoding this function in wxTinyFrame
 #if wxUSE_ITSY_BITSY && !defined(__WIN32__)
 
     // Keep this here because it saves recoding this function in wxTinyFrame
 #if wxUSE_ITSY_BITSY && !defined(__WIN32__)


@@ -191,13 +222,15 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
 
     if ( exflags )
     {
 
     if ( exflags )
     {

-#if !defined(__WIN16__) && !defined(__SC__)

         if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
         {
             if ( style & wxFRAME_TOOL_WINDOW )
             {
                 // create the palette-like window
                 *exflags |= WS_EX_TOOLWINDOW;
         if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
         {
             if ( style & wxFRAME_TOOL_WINDOW )
             {
                 // create the palette-like window
                 *exflags |= WS_EX_TOOLWINDOW;

+
+                // tool windows shouldn't appear on the taskbar (as documented)
+                style |= wxFRAME_NO_TASKBAR;

             }
 
             // We have to solve 2 different problems here:
             }
 
             // We have to solve 2 different problems here:


@@ -212,14 +245,15 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
             // The second one is solved here by using WS_EX_APPWINDOW flag, the
             // first one is dealt with in our MSWGetParent() method
             // implementation
             // The second one is solved here by using WS_EX_APPWINDOW flag, the
             // first one is dealt with in our MSWGetParent() method
             // implementation

+#ifndef __WXWINCE__

             if ( !(style & wxFRAME_NO_TASKBAR) && GetParent() )
             {
                 // need to force the frame to appear in the taskbar
                 *exflags |= WS_EX_APPWINDOW;
             }
             if ( !(style & wxFRAME_NO_TASKBAR) && GetParent() )
             {
                 // need to force the frame to appear in the taskbar
                 *exflags |= WS_EX_APPWINDOW;
             }

+#endif

             //else: nothing to do [here]
         }
             //else: nothing to do [here]
         }

-#endif // !Win16

 
         if ( style & wxSTAY_ON_TOP )
             *exflags |= WS_EX_TOPMOST;
 
         if ( style & wxSTAY_ON_TOP )
             *exflags |= WS_EX_TOPMOST;


@@ -323,10 +357,12 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
     if ( exflags )
     {
         ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exflags);
     if ( exflags )
     {
         ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exflags);

-        ::SetWindowPos(GetHwnd(), NULL, 0, 0, 0, 0,
+        ::SetWindowPos(GetHwnd(),
+                       exflags & WS_EX_TOPMOST ? HWND_TOPMOST : 0,
+                       0, 0, 0, 0,

                        SWP_NOSIZE |
                        SWP_NOMOVE |
                        SWP_NOSIZE |
                        SWP_NOMOVE |

-                       SWP_NOZORDER |
+                       (exflags & WS_EX_TOPMOST ? 0 : SWP_NOZORDER) |

                        SWP_NOACTIVATE);
     }
 
                        SWP_NOACTIVATE);
     }
 


@@ -351,25 +387,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
 
     // move the dialog to its initial position without forcing repainting
     int x, y, w, h;
 
     // move the dialog to its initial position without forcing repainting
     int x, y, w, h;

-    if ( !MSWGetCreateWindowCoords(pos, size, x, y, w, h) )
-    {
-        x =
-        w = (int)CW_USEDEFAULT;
-    }
-
-    // we can't use CW_USEDEFAULT here as we're not calling CreateWindow()
-    // and passing CW_USEDEFAULT to MoveWindow() results in resizing the
-    // window to (0, 0) size which breaks quite a lot of things, e.g. the
-    // sizer calculation in wxSizer::Fit()
-    if ( w == (int)CW_USEDEFAULT )
-    {
-        // the exact number doesn't matter, the dialog will be resized
-        // again soon anyhow but it should be big enough to allow
-        // calculation relying on "totalSize - clientSize > 0" work, i.e.
-        // at least greater than the title bar height
-        w =
-        h = 100;
-    }
+    (void)MSWGetCreateWindowCoords(pos, size, x, y, w, h);

 
     if ( x == (int)CW_USEDEFAULT )
     {
 
     if ( x == (int)CW_USEDEFAULT )
     {


@@ -414,8 +432,13 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
                                  long style,
                                  const wxString& name)
 {
                                  long style,
                                  const wxString& name)
 {

+    bool ret wxDUMMY_INITIALIZE(false);
+    int w, h;
+    

     // init our fields
     Init();
     // init our fields
     Init();

+    w = WidthDefault(size.x);
+    h = HeightDefault(size.y);

 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 


@@ -458,15 +481,37 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         if ( style & (wxRESIZE_BORDER | wxCAPTION) )
             dlgTemplate->style |= DS_MODALFRAME;
 
         if ( style & (wxRESIZE_BORDER | wxCAPTION) )
             dlgTemplate->style |= DS_MODALFRAME;
 

-        bool ret = CreateDialog(dlgTemplate, title, pos, size);
+        ret = CreateDialog(dlgTemplate, title, pos, wxSize(w,h));

         free(dlgTemplate);
         free(dlgTemplate);

-
-        return ret;

     }
     else // !dialog
     {
     }
     else // !dialog
     {

-        return CreateFrame(title, pos, size);
+        ret = CreateFrame(title, pos, wxSize(w,h));
+    }
+
+    if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) )
+    {
+        EnableCloseButton(false);
+    }
+
+    // for some reason we need to manually send ourselves this message as
+    // otherwise the mnemonics are always shown -- even if they're configured
+    // to be hidden until "Alt" is pressed in the control panel
+    //
+    // this could indicate a bug somewhere else but for now this is the only
+    // fix we have
+    if ( ret )
+    {
+        SendMessage
+        (
+            GetHwnd(),
+            WM_UPDATEUISTATE,
+            MAKEWPARAM(UIS_INITIALIZE, UISF_HIDEFOCUS | UISF_HIDEACCEL),
+            0
+        );

     }
     }

+
+    return ret;

 }
 
 wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
 }
 
 wxTopLevelWindowMSW::~wxTopLevelWindowMSW()


@@ -567,13 +612,17 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
     {
         // we can't maximize the hidden frame because it shows it as well, so
         // just remember that we should do it later in this case
     {
         // we can't maximize the hidden frame because it shows it as well, so
         // just remember that we should do it later in this case

-        m_maximizeOnShow = TRUE;
+        m_maximizeOnShow = maximize;

     }
 }
 
 bool wxTopLevelWindowMSW::IsMaximized() const
 {
     }
 }
 
 bool wxTopLevelWindowMSW::IsMaximized() const
 {

+#ifdef __WXWINCE__
+    return FALSE;
+#else

     return ::IsZoomed(GetHwnd()) != 0;
     return ::IsZoomed(GetHwnd()) != 0;

+#endif

 }
 
 void wxTopLevelWindowMSW::Iconize(bool iconize)
 }
 
 void wxTopLevelWindowMSW::Iconize(bool iconize)


@@ -583,10 +632,14 @@ void wxTopLevelWindowMSW::Iconize(bool iconize)
 
 bool wxTopLevelWindowMSW::IsIconized() const
 {
 
 bool wxTopLevelWindowMSW::IsIconized() const
 {

+#ifdef __WXWINCE__
+    return FALSE;
+#else

     // also update the current state
     ((wxTopLevelWindowMSW *)this)->m_iconized = ::IsIconic(GetHwnd()) != 0;
 
     return m_iconized;
     // also update the current state
     ((wxTopLevelWindowMSW *)this)->m_iconized = ::IsIconic(GetHwnd()) != 0;
 
     return m_iconized;

+#endif

 }
 
 void wxTopLevelWindowMSW::Restore()
 }
 
 void wxTopLevelWindowMSW::Restore()


@@ -600,18 +653,22 @@ void wxTopLevelWindowMSW::Restore()
 
 bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
 {
 
 bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
 {

-    if (show)
+    if ( show == IsFullScreen() )

     {
     {

-        if (IsFullScreen())
-            return FALSE;
+        // nothing to do
+        return TRUE;
+    }
+
+    m_fsIsShowing = show;

 
 

-        m_fsIsShowing = TRUE;
+    if ( show )
+    {

         m_fsStyle = style;
 
         // zap the frame borders
 
         // save the 'normal' window style
         m_fsStyle = style;
 
         // zap the frame borders
 
         // save the 'normal' window style

-        m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE);
+        m_fsOldWindowStyle = GetWindowLong(GetHwnd(), GWL_STYLE);

 
         // save the old position, width & height, maximize state
         m_fsOldSize = GetRect();
 
         // save the old position, width & height, maximize state
         m_fsOldSize = GetRect();


@@ -622,46 +679,84 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
         LONG offFlags = 0;
 
         if (style & wxFULLSCREEN_NOBORDER)
         LONG offFlags = 0;
 
         if (style & wxFULLSCREEN_NOBORDER)

-            offFlags |= WS_BORDER | WS_THICKFRAME;
+        {
+            offFlags |= WS_BORDER;
+#ifndef __WXWINCE__
+            offFlags |= WS_THICKFRAME;
+#endif
+        }

         if (style & wxFULLSCREEN_NOCAPTION)
         if (style & wxFULLSCREEN_NOCAPTION)

-            offFlags |= (WS_CAPTION | WS_SYSMENU);
+            offFlags |= WS_CAPTION | WS_SYSMENU;

 
 

-        newStyle &= (~offFlags);
+        newStyle &= ~offFlags;

 
         // change our window style to be compatible with full-screen mode
 
         // change our window style to be compatible with full-screen mode

-        ::SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle);
-
-        // resize to the size of the desktop
-        int width, height;
+        ::SetWindowLong(GetHwnd(), GWL_STYLE, newStyle);

 
 

-        RECT rect = wxGetWindowRect(::GetDesktopWindow());
-        width = rect.right - rect.left;
-        height = rect.bottom - rect.top;
+        wxRect rect;
+#if wxUSE_DISPLAY
+        // resize to the size of the display containing us
+        int dpy = wxDisplay::GetFromWindow(this);
+        if ( dpy != wxNOT_FOUND )
+        {
+            rect = wxDisplay(dpy).GetGeometry();
+        }
+        else // fall back to the main desktop
+#else // wxUSE_DISPLAY
+        {
+            // resize to the size of the desktop
+            wxCopyRECTToRect(wxGetWindowRect(::GetDesktopWindow()), rect);
+#ifdef __WXWINCE__
+            // FIXME: size of the bottom menu (toolbar)
+            // should be taken in account
+            rect.height += rect.y;
+            rect.y       = 0;
+#endif
+        }
+#endif // wxUSE_DISPLAY

 
 

-        SetSize(width, height);
+        SetSize(rect);

 
         // now flush the window style cache and actually go full-screen
 
         // now flush the window style cache and actually go full-screen

-        SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED);
+        long flags = SWP_FRAMECHANGED;

 
 

-        wxSizeEvent event(wxSize(width, height), GetId());
-        GetEventHandler()->ProcessEvent(event);
+        // showing the frame full screen should also show it if it's still
+        // hidden
+        if ( !IsShown() )
+        {
+            // don't call wxWindow version to avoid flicker from calling
+            // ::ShowWindow() -- we're going to show the window at the correct
+            // location directly below -- but do call the wxWindowBase version
+            // to sync the internal m_isShown flag
+            wxWindowBase::Show();

 
 

-        return TRUE;
-    }
-    else
-    {
-        if (!IsFullScreen())
-            return FALSE;
+            flags |= SWP_SHOWWINDOW;
+        }

 
 

-        m_fsIsShowing = FALSE;
+        SetWindowPos(GetHwnd(), HWND_TOP,
+                     rect.x, rect.y, rect.width, rect.height,
+                     flags);

 
 

+#if defined(__WXWINCE__) && _WIN32_WCE < 400
+        ::SHFullScreen(GetHwnd(), SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON);
+#endif
+
+        // finally send an event allowing the window to relayout itself &c
+        wxSizeEvent event(rect.GetSize(), GetId());
+        GetEventHandler()->ProcessEvent(event);
+    }
+    else // stop showing full screen
+    {
+#if defined(__WXWINCE__) && _WIN32_WCE < 400
+        ::SHFullScreen(GetHwnd(), SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON);
+#endif

         Maximize(m_fsIsMaximized);
         Maximize(m_fsIsMaximized);

-        SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);
-        SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y,
+        SetWindowLong(GetHwnd(),GWL_STYLE, m_fsOldWindowStyle);
+        SetWindowPos(GetHwnd(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y,

             m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
             m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);

-
-        return TRUE;

     }
     }

+
+    return TRUE;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -696,14 +791,14 @@ void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons)
 
 bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
 {
 
 bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
 {

-#ifndef __WXMICROWIN__
+#if !defined(__WXMICROWIN__)

     // get system (a.k.a. window) menu
     // get system (a.k.a. window) menu

-    HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */);
+    HMENU hmenu = GetSystemMenu(GetHwnd(), FALSE /* get it */);

     if ( !hmenu )
     {
     if ( !hmenu )
     {

-        wxLogLastError(_T("GetSystemMenu"));
-
-        return FALSE;
+        // no system menu at all -- ok if we want to remove the close button
+        // anyhow, but bad if we want to show it
+        return !enable;

     }
 
     // enabling/disabling the close item from it also automatically
     }
 
     // enabling/disabling the close item from it also automatically


@@ -727,6 +822,54 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
     return TRUE;
 }
 
     return TRUE;
 }
 

+bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
+{
+#ifdef __WXWINCE__
+    return FALSE;
+#else
+    wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
+                 _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
+
+    // The empty region signifies that the shape should be removed from the
+    // window.
+    if ( region.IsEmpty() )
+    {
+        if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0)
+        {
+            wxLogLastError(_T("SetWindowRgn"));
+            return FALSE;
+        }
+        return TRUE;
+    }
+
+    // Windows takes ownership of the region, so
+    // we'll have to make a copy of the region to give to it.
+    DWORD noBytes = ::GetRegionData(GetHrgnOf(region), 0, NULL);
+    RGNDATA *rgnData = (RGNDATA*) new char[noBytes];
+    ::GetRegionData(GetHrgnOf(region), noBytes, rgnData);
+    HRGN hrgn = ::ExtCreateRegion(NULL, noBytes, rgnData);
+    delete[] (char*) rgnData;
+
+    // SetWindowRgn expects the region to be in coordinants
+    // relative to the window, not the client area.  Figure
+    // out the offset, if any.
+    RECT rect;
+    DWORD dwStyle =   ::GetWindowLong(GetHwnd(), GWL_STYLE);
+    DWORD dwExStyle = ::GetWindowLong(GetHwnd(), GWL_EXSTYLE);
+    ::GetClientRect(GetHwnd(), &rect);
+    ::AdjustWindowRectEx(&rect, dwStyle, FALSE, dwExStyle);
+    ::OffsetRgn(hrgn, -rect.left, -rect.top);
+
+    // Now call the shape API with the new region.
+    if (::SetWindowRgn(GetHwnd(), hrgn, TRUE) == 0)
+    {
+        wxLogLastError(_T("SetWindowRgn"));
+        return FALSE;
+    }
+    return TRUE;
+#endif
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindow event handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindow event handling
 // ----------------------------------------------------------------------------


@@ -737,17 +880,22 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
 {
     if ( event.GetActive() )
     {
 {
     if ( event.GetActive() )
     {

-        // restore focus to the child which was last focused
+        // restore focus to the child which was last focused unless we already
+        // have it

         wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd);
 
         wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd);
 

-        wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
-                                            : NULL;
-        if ( !parent )
+        wxWindow *winFocus = FindFocus();
+        if ( !winFocus || wxGetTopLevelParent(winFocus) != this )

         {
         {

-            parent = this;
-        }
+            wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+                                                : NULL;
+            if ( !parent )
+            {
+                parent = this;
+            }

 
 

-        wxSetFocusToChild(parent, &m_winLastFocused);
+            wxSetFocusToChild(parent, &m_winLastFocused);
+        }

     }
     else // deactivating
     {
     }
     else // deactivating
     {


@@ -758,23 +906,12 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
         {
             // let it know that it doesn't have focus any more
             m_winLastFocused->HandleKillFocus((WXHWND)NULL);
         {
             // let it know that it doesn't have focus any more
             m_winLastFocused->HandleKillFocus((WXHWND)NULL);

-        }

 
 

-        // so we NULL it out if it's a child from some other frame
-        wxWindow *win = m_winLastFocused;
-        while ( win )
-        {
-            if ( win->IsTopLevel() )
+            // and don't remember it if it's a child from some other frame
+            if ( wxGetTopLevelParent(m_winLastFocused) != this )

             {
             {

-                if ( win != this )
-                {
-                    m_winLastFocused = NULL;
-                }
-
-                break;
+                m_winLastFocused = NULL;

             }
             }

-
-            win = win->GetParent();

         }
 
         wxLogTrace(_T("focus"),
         }
 
         wxLogTrace(_T("focus"),


@@ -789,7 +926,10 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
 
 // the DialogProc for all wxWindows dialogs
 LONG APIENTRY _EXPORT
 
 // the DialogProc for all wxWindows dialogs
 LONG APIENTRY _EXPORT

-wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+wxDlgProc(HWND WXUNUSED(hDlg),
+          UINT message,
+          WPARAM WXUNUSED(wParam),
+          LPARAM WXUNUSED(lParam))

 {
     switch ( message )
     {
 {
     switch ( message )
     {


@@ -870,7 +1010,7 @@ HWND wxTLWHiddenParentModule::GetHWND()
             }
         }
 
             }
         }
 

-        ms_hwnd = ::CreateWindow(ms_className, _T(""), 0, 0, 0, 0, 0, NULL,
+        ms_hwnd = ::CreateWindow(ms_className, wxEmptyString, 0, 0, 0, 0, 0, NULL,

                                  (HMENU)NULL, wxGetInstance(), NULL);
         if ( !ms_hwnd )
         {
                                  (HMENU)NULL, wxGetInstance(), NULL);
         if ( !ms_hwnd )
         {


@@ -881,3 +1021,4 @@ HWND wxTLWHiddenParentModule::GetHWND()
     return ms_hwnd;
 }
 
     return ms_hwnd;
 }
 

+