compilation fix for wxUSE_INTL == 0 (patch 646466)

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index e65ef6c1518f38e39229eb3eb82d6f41bc353800..bd65405e7fdcf7838bb0aa61a9740a8e41b323e7 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -35,8 +35,11 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"

+    #include "wx/containr.h"        // wxSetFocusToChild()

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#include "wx/module.h"
+

 #include "wx/msw/private.h"
 
 #include "wx/popupwin.h"
 #include "wx/msw/private.h"
 
 #include "wx/popupwin.h"


@@ -60,6 +63,11 @@ static inline bool IsZoomed(HWND WXUNUSED(hwnd)) { return FALSE; }
 
 #endif // __WXMICROWIN__
 
 
 #endif // __WXMICROWIN__
 

+// NB: wxDlgProc must be defined here and not in dialog.cpp because the latter
+//     is not included by wxUniv build which does need wxDlgProc
+LONG APIENTRY _EXPORT
+wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -70,34 +78,40 @@ wxWindowList wxModelessWindows;
 // the name of the default wxWindows class
 extern const wxChar *wxCanvasClassName;
 
 // the name of the default wxWindows class
 extern const wxChar *wxCanvasClassName;
 

-// the hidden parent for wxFRAME_NO_TASKBAR unowned frames
-wxWindow *wxTopLevelWindowMSW::ms_hiddenParent = NULL;
-
-// ============================================================================
-// wxTopLevelWindowMSW implementation
-// ============================================================================
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxDialog helpers
+// wxTLWHiddenParentModule: used to manage the hidden parent window (we need a
+// module to ensure that the window is always deleted)

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// Dialog window proc
-LONG APIENTRY _EXPORT
-wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+class wxTLWHiddenParentModule : public wxModule

 {
 {

-    switch ( message )
-    {
-        case WM_INITDIALOG:
-            // for this message, returning TRUE tells system to set focus to
-            // the first control in the dialog box, but as we set the focus
-            // ourselves, we return FALSE from here as well, so fall through
+public:
+    // module init/finalize
+    virtual bool OnInit();
+    virtual void OnExit();

 
 

-        default:
-            // for all the other ones, FALSE means that we didn't process the
-            // message
-            return FALSE;
-    }
-}
+    // get the hidden window (creates on demand)
+    static HWND GetHWND();
+
+private:
+    // the HWND of the hidden parent
+    static HWND ms_hwnd;
+
+    // the class used to create it
+    static const wxChar *ms_className;
+
+    DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxTLWHiddenParentModule, wxModule)
+
+// ============================================================================
+// wxTopLevelWindowMSW implementation
+// ============================================================================
+
+BEGIN_EVENT_TABLE(wxTopLevelWindowMSW, wxTopLevelWindowBase)
+    EVT_ACTIVATE(wxTopLevelWindowMSW::OnActivate)
+END_EVENT_TABLE()

 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW creation
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW creation


@@ -116,6 +130,8 @@ void wxTopLevelWindowMSW::Init()
     m_fsOldWindowStyle = 0;
     m_fsIsMaximized = FALSE;
     m_fsIsShowing = FALSE;
     m_fsOldWindowStyle = 0;
     m_fsIsMaximized = FALSE;
     m_fsIsShowing = FALSE;

+
+    m_winLastFocused = (wxWindow *)NULL;

 }
 
 WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
 }
 
 WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const


@@ -223,38 +239,32 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const
     // parent HWND or it would be always on top of its parent which is not what
     // we usually want (in fact, we only want it for frames with the
     // wxFRAME_FLOAT_ON_PARENT flag)
     // parent HWND or it would be always on top of its parent which is not what
     // we usually want (in fact, we only want it for frames with the
     // wxFRAME_FLOAT_ON_PARENT flag)

-    wxWindow *parent;
+    HWND hwndParent = NULL;

     if ( HasFlag(wxFRAME_FLOAT_ON_PARENT) )
     {
     if ( HasFlag(wxFRAME_FLOAT_ON_PARENT) )
     {

-        parent = GetParent();
+        const wxWindow *parent = GetParent();

 
 

-        // this flag doesn't make sense then and will be ignored
-        wxASSERT_MSG( parent,
-                      _T("wxFRAME_FLOAT_ON_PARENT but no parent?") );
-    }
-    else // don't float on parent, must not be owned
-    {
-        parent = NULL;
+        if ( !parent )
+        {
+            // this flag doesn't make sense then and will be ignored
+            wxFAIL_MSG( _T("wxFRAME_FLOAT_ON_PARENT but no parent?") );
+        }
+        else
+        {
+            hwndParent = GetHwndOf(parent);
+        }

     }
     }

+    //else: don't float on parent, must not be owned

 
     // now deal with the 2nd taskbar-related problem (see comments above in
     // MSWGetStyle())
 
     // now deal with the 2nd taskbar-related problem (see comments above in
     // MSWGetStyle())

-    if ( HasFlag(wxFRAME_NO_TASKBAR) && !parent )
+    if ( HasFlag(wxFRAME_NO_TASKBAR) && !hwndParent )

     {
     {

-        if ( !ms_hiddenParent )
-        {
-            ms_hiddenParent = new wxTopLevelWindowMSW(NULL, -1, _T(""));
-
-            // we shouldn't leave it in wxTopLevelWindows or we wouldn't
-            // terminate the app when the last user-created frame is deleted --
-            // see ~wxTopLevelWindowMSW
-            wxTopLevelWindows.DeleteObject(ms_hiddenParent);
-        }
-
-        parent = ms_hiddenParent;
+        // use hidden parent
+        hwndParent = wxTLWHiddenParentModule::GetHWND();

     }
 
     }
 

-    return parent ? parent->GetHWND() : NULL;
+    return (WXHWND)hwndParent;

 }
 
 bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
 }
 
 bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,


@@ -461,15 +471,6 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
 
 wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
 {
 
 wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
 {

-    if ( this == ms_hiddenParent )
-    {
-        // stop [infinite] recursion which would otherwise happen when we do
-        // "delete ms_hiddenParent" below
-        return;
-    }
-
-    wxTopLevelWindows.DeleteObject(this);
-

     if ( wxModelessWindows.Find(this) )
         wxModelessWindows.DeleteObject(this);
 
     if ( wxModelessWindows.Find(this) )
         wxModelessWindows.DeleteObject(this);
 


@@ -485,23 +486,6 @@ wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
             ::BringWindowToTop(GetHwndOf(parent));
         }
     }
             ::BringWindowToTop(GetHwndOf(parent));
         }
     }

-
-    // If this is the last top-level window, exit.
-    if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
-    {
-        if ( ms_hiddenParent )
-        {
-            delete ms_hiddenParent;
-            ms_hiddenParent = NULL;
-        }
-
-        wxTheApp->SetTopWindow(NULL);
-
-        if ( wxTheApp->GetExitOnFrameDelete() )
-        {
-            ::PostQuitMessage(0);
-        }
-    }

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


@@ -741,43 +725,150 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxTopLevelWindowMSW message processing
+// wxTopLevelWindow event handling

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-long wxTopLevelWindowMSW::HandleNcActivate(bool activate)
+// Default activation behaviour - set the focus for the first child
+// subwindow found.
+void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)

 {
 {

-#if wxUSE_POPUPWIN
-    /*
-       Normally, when another top level (whether it is overlapped or popup)
-       window is shown, it is activated and the parent window (i.e. we) loses
-       the activation. This, however, looks very ugly when the child window is
-       a [custom] combobox which we implement using a popup window as surely
-       opening a combobox shouldn't result in deactivating the parent window.
-
-       So we don't redraw the title bar in this case, even if we still return
-       TRUE to let the change of activation to take place as otherwise the
-       controls inside the popup window wouldn't work properly.
-     */
-    if ( !activate && wxPopupWindow::FindPopupFor(this) )
+    if ( event.GetActive() )

     {
     {

-        return TRUE;
+        // restore focus to the child which was last focused
+        wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd);
+
+        wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+                                            : NULL;
+        if ( !parent )
+        {
+            parent = this;
+        }
+
+        wxSetFocusToChild(parent, &m_winLastFocused);
+    }
+    else // deactivating
+    {
+        // remember the last focused child if it is our child
+        m_winLastFocused = FindFocus();
+
+        // so we NULL it out if it's a child from some other frame
+        wxWindow *win = m_winLastFocused;
+        while ( win )
+        {
+            if ( win->IsTopLevel() )
+            {
+                if ( win != this )
+                {
+                    m_winLastFocused = NULL;
+                }
+
+                break;
+            }
+
+            win = win->GetParent();
+        }
+
+        wxLogTrace(_T("focus"),
+                   _T("wxTLW %08x deactivated, last focused: %08x."),
+                   (int) m_hWnd,
+                   (int) (m_winLastFocused ? GetHwndOf(m_winLastFocused)
+                                           : NULL));
+
+        event.Skip();

     }
     }

-#endif // wxUSE_POPUPWIN
+}

 
 

-    return FALSE;
+// the DialogProc for all wxWindows dialogs
+LONG APIENTRY _EXPORT
+wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    switch ( message )
+    {
+        case WM_INITDIALOG:
+            // for this message, returning TRUE tells system to set focus to
+            // the first control in the dialog box, but as we set the focus
+            // ourselves, we return FALSE from here as well, so fall through
+
+        default:
+            // for all the other ones, FALSE means that we didn't process the
+            // message
+            return FALSE;
+    }

 }
 
 }
 

-long
-wxTopLevelWindowMSW::MSWWindowProc(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
+// ============================================================================
+// wxTLWHiddenParentModule implementation
+// ============================================================================
+
+HWND wxTLWHiddenParentModule::ms_hwnd = NULL;
+
+const wxChar *wxTLWHiddenParentModule::ms_className = NULL;
+
+bool wxTLWHiddenParentModule::OnInit()

 {
 {

-    if ( msg == WM_NCACTIVATE )
+    ms_hwnd = NULL;
+    ms_className = NULL;
+
+    return TRUE;
+}
+
+void wxTLWHiddenParentModule::OnExit()
+{
+    if ( ms_hwnd )
+    {
+        if ( !::DestroyWindow(ms_hwnd) )
+        {
+            wxLogLastError(_T("DestroyWindow(hidden TLW parent)"));
+        }
+
+        ms_hwnd = NULL;
+    }
+
+    if ( ms_className )
+    {
+        if ( !::UnregisterClass(ms_className, wxGetInstance()) )
+        {
+            wxLogLastError(_T("UnregisterClass(\"wxTLWHiddenParent\")"));
+        }
+
+        ms_className = NULL;
+    }
+}
+
+/* static */
+HWND wxTLWHiddenParentModule::GetHWND()
+{
+    if ( !ms_hwnd )

     {
     {

-        if ( HandleNcActivate(wParam != 0) )
+        if ( !ms_className )

         {
         {

-            // we processed WM_NCACTIVATE ourselves
-            return TRUE;
+            static const wxChar *HIDDEN_PARENT_CLASS = _T("wxTLWHiddenParent");
+
+            WNDCLASS wndclass;
+            wxZeroMemory(wndclass);
+
+            wndclass.lpfnWndProc   = DefWindowProc;
+            wndclass.hInstance     = wxGetInstance();
+            wndclass.lpszClassName = HIDDEN_PARENT_CLASS;
+
+            if ( !::RegisterClass(&wndclass) )
+            {
+                wxLogLastError(_T("RegisterClass(\"wxTLWHiddenParent\")"));
+            }
+            else
+            {
+                ms_className = HIDDEN_PARENT_CLASS;
+            }
+        }
+
+        ms_hwnd = ::CreateWindow(ms_className, _T(""), 0, 0, 0, 0, 0, NULL,
+                                 (HMENU)NULL, wxGetInstance(), NULL);
+        if ( !ms_hwnd )
+        {
+            wxLogLastError(_T("CreateWindow(hidden TLW parent)"));

         }
     }
 
         }
     }
 

-    return wxTopLevelWindowBase::MSWWindowProc(msg, wParam, lParam);
+    return ms_hwnd;

 }
 }

+