X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b389a12d03d1485d6297a031be44d90ad64623c4..7ce8248bc6a8904e0cea31c2a82aac5a85b130da:/src/os2/toplevel.cpp diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp index 237037106b..9fbc3e6ae3 100644 --- a/src/os2/toplevel.cpp +++ b/src/os2/toplevel.cpp @@ -6,7 +6,7 @@ // Created: 30.12.01 // RCS-ID: $Id$ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -36,8 +36,10 @@ #include "wx/intl.h" #include "wx/frame.h" #include "wx/control.h" + #include "wx/containr.h" // wxSetFocusToChild() #endif //WX_PRECOMP +#include "wx/module.h" // wxSetFocusToChild() #include "wx/os2/private.h" // ---------------------------------------------------------------------------- @@ -74,8 +76,8 @@ END_EVENT_TABLE() // Dialog window proc MRESULT EXPENTRY wxDlgProc( HWND WXUNUSED(hWnd) ,UINT uMessage - ,MPARAM WXUNUSED(wParam) - ,MPARAM WXUNUSED(lParam) + ,void * WXUNUSED(wParam) + ,void * WXUNUSED(lParam) ) { switch(uMessage) @@ -96,6 +98,40 @@ MRESULT EXPENTRY wxDlgProc( HWND WXUNUSED(hWnd) } } // end of wxDlgProc +// ---------------------------------------------------------------------------- +// wxTLWHiddenParentModule: used to manage the hidden parent window (we need a +// module to ensure that the window is always deleted) +// ---------------------------------------------------------------------------- + +class wxTLWHiddenParentModule : public wxModule +{ +public: + // + // Module init/finalize + // + virtual bool OnInit(void); + virtual void OnExit(void); + + // + // Get the hidden window (creates on demand) + // + static HWND GetHWND(void); + +private: + // + // The HWND of the hidden parent + // + static HWND m_shWnd; + + // + // The class used to create it + // + static const wxChar* m_szClassName; + DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule) +}; // end of CLASS wxTLWHiddenParentModule + +IMPLEMENT_DYNAMIC_CLASS(wxTLWHiddenParentModule, wxModule) + // ---------------------------------------------------------------------------- // wxTopLevelWindowOS2 creation // ---------------------------------------------------------------------------- @@ -131,7 +167,7 @@ void wxTopLevelWindowOS2::OnActivate( // // Restore focus to the child which was last focused // - wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), m_hWnd); + wxLogTrace(_T("focus"), _T("wxTLW %08lx activated."), m_hWnd); wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent() : NULL; @@ -170,7 +206,7 @@ void wxTopLevelWindowOS2::OnActivate( } wxLogTrace(_T("focus"), - _T("wxTLW %08x deactivated, last focused: %08x."), + _T("wxTLW %08lx deactivated, last focused: %08lx."), m_hWnd, m_pWinLastFocused ? GetHwndOf(m_pWinLastFocused) : NULL); @@ -234,42 +270,44 @@ WXDWORD wxTopLevelWindowOS2::OS2GetStyle( WXHWND wxTopLevelWindowOS2::OS2GetParent() const { + HWND hWndParent = NULL; + // // For the frames without wxFRAME_FLOAT_ON_PARENT style we should use NULL // 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* pParent; - if (HasFlag(wxFRAME_FLOAT_ON_PARENT) ) { - pParent = GetParent(); + const wxWindow* pParent = GetParent(); - // this flag doesn't make sense then and will be ignored - wxASSERT_MSG( pParent, - _T("wxFRAME_FLOAT_ON_PARENT but no parent?") ); - } - else // don't float on parent, must not be owned - { - pParent = NULL; - } - if (HasFlag(wxFRAME_NO_TASKBAR) && !pParent) - { - if (!m_spHiddenParent) + if (!pParent) { - m_spHiddenParent = new wxTopLevelWindowOS2(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 + // This flag doesn't make sense then and will be ignored // - wxTopLevelWindows.DeleteObject(m_spHiddenParent); + wxFAIL_MSG( _T("wxFRAME_FLOAT_ON_PARENT but no parent?") ); + } + else + { + hWndParent = GetHwndOf(pParent); } - pParent = m_spHiddenParent; } - return pParent ? pParent->GetHWND() : NULL; + //else: don't float on parent, must not be owned + + // + // Now deal with the 2nd taskbar-related problem (see comments above in + // OS2GetStyle()) + // + if (HasFlag(wxFRAME_NO_TASKBAR) && !hWndParent) + { + // + // Use hidden parent + // + hWndParent = wxTLWHiddenParentModule::GetHWND(); + } + return (WXHWND)hWndParent; } // end of wxTopLevelWindowOS2::OS2GetParent bool wxTopLevelWindowOS2::CreateDialog( @@ -326,9 +364,9 @@ bool wxTopLevelWindowOS2::CreateDialog( if ( !m_hWnd ) { - wxFAIL_MSG(_("Did you forget to include wx/os2/wx.rc in your resources?")); + wxFAIL_MSG(wxT("Did you forget to include wx/os2/wx.rc in your resources?")); - wxLogSysError(_("Can't create dialog using template '%ul'"), ulDlgTemplate); + wxLogSysError(wxT("Can't create dialog using template '%ld'"), ulDlgTemplate); return FALSE; } @@ -463,7 +501,7 @@ bool wxTopLevelWindowOS2::CreateFrame( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error creating frame. Error: %s\n", sError); + wxLogError("Error creating frame. Error: %s\n", sError.c_str()); return FALSE; } @@ -487,7 +525,7 @@ bool wxTopLevelWindowOS2::CreateFrame( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error creating frame. Error: %s\n", sError); + wxLogError("Error creating frame. Error: %s\n", sError.c_str()); return FALSE; } @@ -524,7 +562,7 @@ bool wxTopLevelWindowOS2::CreateFrame( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error sizing frame. Error: %s\n", sError); + wxLogError("Error sizing frame. Error: %s\n", sError.c_str()); return FALSE; } lStyle = ::WinQueryWindowULong( m_hWnd @@ -543,7 +581,7 @@ bool wxTopLevelWindowOS2::Create( , wxWindowID vId , const wxString& rsTitle , const wxPoint& rPos -, const wxSize& rSize +, const wxSize& rSizeOrig , long lStyle , const wxString& rsName ) @@ -555,6 +593,19 @@ bool wxTopLevelWindowOS2::Create( m_windowStyle = lStyle; SetName(rsName); m_windowId = vId == -1 ? NewControlId() : vId; + + // always create a frame of some reasonable, even if arbitrary, size (at + // least for MSW compatibility) + wxSize rSize = rSizeOrig; + if ( rSize.x == -1 || rSize.y == -1 ) + { + wxSize sizeDpy = wxGetDisplaySize(); + if ( rSize.x == -1 ) + rSize.x = sizeDpy.x / 3; + if ( rSize.y == -1 ) + rSize.y = sizeDpy.y / 5; + } + wxTopLevelWindows.Append(this); if (pParent) pParent->AddChild(this); @@ -592,20 +643,26 @@ bool wxTopLevelWindowOS2::Create( wxTopLevelWindowOS2::~wxTopLevelWindowOS2() { - wxTopLevelWindows.DeleteObject(this); - if (wxModelessWindows.Find(this)) wxModelessWindows.DeleteObject(this); // - // If this is the last top-level window, exit. + // After destroying an owned window, Windows activates the next top level + // window in Z order but it may be different from our owner (to reproduce + // this simply Alt-TAB to another application and back before closing the + // owned frame) whereas we always want to yield activation to our parent // - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) + if (HasFlag(wxFRAME_FLOAT_ON_PARENT)) { - wxTheApp->SetTopWindow(NULL); - if ( wxTheApp->GetExitOnFrameDelete() ) + wxWindow* pParent = GetParent(); + + if (pParent) { - ::WinPostMsg(NULL, WM_QUIT, 0, 0); + ::WinSetWindowPos( GetHwndOf(pParent) + ,HWND_TOP + ,0, 0, 0, 0 + ,SWP_ZORDER + ); } } } // end of wxTopLevelWindowOS2::~wxTopLevelWindowOS2 @@ -673,8 +730,15 @@ bool wxTopLevelWindowOS2::Show( { int nShowCmd; SWP vSwp; - RECTL vRect; + if (bShow != IsShown() ) + { + m_isShown = bShow; + } + else + { + return FALSE; + } if (bShow) { if (m_bMaximizeOnShow) @@ -749,13 +813,12 @@ void wxTopLevelWindowOS2::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 // - m_bMaximizeOnShow = TRUE; + m_bMaximizeOnShow = bMaximize; } } // end of wxTopLevelWindowOS2::Maximize bool wxTopLevelWindowOS2::IsMaximized() const { - bool bIconic; ::WinQueryWindowPos(m_hFrame, (PSWP)&m_vSwp); return (m_vSwp.fl & SWP_MAXIMIZE); @@ -992,3 +1055,75 @@ bool wxTopLevelWindowOS2::EnableCloseButton( return TRUE; } // end of wxTopLevelWindowOS2::EnableCloseButton +// ============================================================================ +// wxTLWHiddenParentModule implementation +// ============================================================================ + +HWND wxTLWHiddenParentModule::m_shWnd = NULL; +const wxChar* wxTLWHiddenParentModule::m_szClassName = NULL; + +bool wxTLWHiddenParentModule::OnInit() +{ + m_shWnd = NULL; + m_szClassName = NULL; + return TRUE; +} // end of wxTLWHiddenParentModule::OnInit + +void wxTLWHiddenParentModule::OnExit() +{ + if (m_shWnd) + { + if (!::WinDestroyWindow(m_shWnd)) + { + wxLogLastError(_T("DestroyWindow(hidden TLW parent)")); + } + m_shWnd = NULL; + } + + m_szClassName = NULL; +} // end of wxTLWHiddenParentModule::OnExit + +/* static */ +HWND wxTLWHiddenParentModule::GetHWND() +{ + if (!m_shWnd) + { + if (!m_szClassName) + { + static const wxChar* zHIDDEN_PARENT_CLASS = _T("wxTLWHiddenParent"); + + if (!::WinRegisterClass( wxGetInstance() + ,zHIDDEN_PARENT_CLASS + ,NULL + ,0 + ,sizeof(ULONG) + )) + { + wxLogLastError(_T("RegisterClass(\"wxTLWHiddenParent\")")); + } + else + { + m_szClassName = zHIDDEN_PARENT_CLASS; + } + } + m_shWnd = ::WinCreateWindow( HWND_DESKTOP + ,m_szClassName + ,"" + ,0L + ,(LONG)0L + ,(LONG)0L + ,(LONG)0L + ,(LONG)0L + ,NULLHANDLE + ,HWND_TOP + ,0L + ,NULL + ,NULL + ); + if (!m_shWnd) + { + wxLogLastError(_T("CreateWindow(hidden TLW parent)")); + } + } + return m_shWnd; +} // end of wxTLWHiddenParentModule::GetHWND