X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a46a5df879c4f820d0a0a435b34c7d5e4793991..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/os2/toplevel.cpp?ds=sidebyside diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp index a24707edd1..242f6c7ab1 100644 --- a/src/os2/toplevel.cpp +++ b/src/os2/toplevel.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/toplevel.cpp -// Purpose: implements wxTopLevelWindow for MSW +// Name: os2/toplevel.cpp +// Purpose: implements wxTopLevelWindow for OS/2 // Author: Vadim Zeitlin // Modified by: // Created: 30.12.01 // RCS-ID: $Id$ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -31,13 +31,16 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/toplevel.h" + #include "wx/dialog.h" #include "wx/string.h" #include "wx/log.h" #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" // ---------------------------------------------------------------------------- @@ -49,14 +52,20 @@ // globals // ---------------------------------------------------------------------------- -// list of all frames and modeless dialogs -wxWindowList wxModelessWindows; - -// the name of the default wxWindows class +// the name of the default wxWidgets class extern void wxAssociateWinWithHandle( HWND hWnd ,wxWindowOS2* pWin ); bool wxTopLevelWindowOS2::m_sbInitialized = FALSE; +wxWindow* wxTopLevelWindowOS2::m_spHiddenParent = NULL; + +// ============================================================================ +// wxTopLevelWindowOS2 implementation +// ============================================================================ + +BEGIN_EVENT_TABLE(wxTopLevelWindowOS2, wxTopLevelWindowBase) + EVT_ACTIVATE(wxTopLevelWindowOS2::OnActivate) +END_EVENT_TABLE() // ============================================================================ // wxTopLevelWindowMSW implementation @@ -65,28 +74,62 @@ bool wxTopLevelWindowOS2::m_sbInitialized = FALSE; // Dialog window proc MRESULT EXPENTRY wxDlgProc( HWND WXUNUSED(hWnd) ,UINT uMessage - ,MPARAM WXUNUSED(wParam) - ,MPARAM WXUNUSED(lParam) + ,void * WXUNUSED(wParam) + ,void * WXUNUSED(lParam) ) { - if (uMessage == WM_INITDLG) + switch(uMessage) { - // - // For this message, returning TRUE tells system to set focus to the - // first control in the dialog box. - // - return (MRESULT)TRUE; - } - else - { - // - // For all the other ones, FALSE means that we didn't process the - // message - // - return (MRESULT)FALSE; + case WM_INITDLG: + // + // For this message, returning TRUE tells system to set focus to + // the first control in the dialog box, but we set the focus + // ourselves, however in OS/2 we must return true to enable the dialog + // + return (MRESULT)TRUE; + default: + // + // For all the other ones, FALSE means that we didn't process the + // message + // + return (MRESULT)FALSE; } } // 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 // ---------------------------------------------------------------------------- @@ -110,60 +153,160 @@ void wxTopLevelWindowOS2::Init() m_hFrame = NULLHANDLE; memset(&m_vSwp, 0, sizeof(SWP)); memset(&m_vSwpClient, 0, sizeof(SWP)); + m_pWinLastFocused = (wxWindow *)NULL; } // end of wxTopLevelWindowIOS2::Init -long wxTopLevelWindowOS2::OS2GetCreateWindowFlags( - long* plExflags -) const +void wxTopLevelWindowOS2::OnActivate( + wxActivateEvent& rEvent +) { - long lStyle = GetWindowStyle(); - long lMsflags = 0; + if (rEvent.GetActive()) + { + // + // Restore focus to the child which was last focused + // + wxLogTrace(_T("focus"), _T("wxTLW %08lx activated."), m_hWnd); - if (lStyle == wxDEFAULT_FRAME_STYLE) - lMsflags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | - FCF_MINMAX | FCF_TASKLIST; - else + wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent() + : NULL; + if (!pParent) + { + pParent = this; + } + + wxSetFocusToChild( pParent + ,&m_pWinLastFocused + ); + } + else // deactivating { - if ((lStyle & wxCAPTION) == wxCAPTION) - lMsflags = FCF_TASKLIST; - else - lMsflags = FCF_NOMOVEWITHOWNER; - - if ((lStyle & wxVSCROLL) == wxVSCROLL) - lMsflags |= FCF_VERTSCROLL; - if ((lStyle & wxHSCROLL) == wxHSCROLL) - lMsflags |= FCF_HORZSCROLL; - if (lStyle & wxMINIMIZE_BOX) - lMsflags |= FCF_MINBUTTON; - if (lStyle & wxMAXIMIZE_BOX) - lMsflags |= FCF_MAXBUTTON; - if (lStyle & wxTHICK_FRAME) - lMsflags |= FCF_DLGBORDER; - if (lStyle & wxSYSTEM_MENU) - lMsflags |= FCF_SYSMENU; - if (lStyle & wxCAPTION) - lMsflags |= FCF_TASKLIST; - if (lStyle & wxCLIP_CHILDREN) + // + // Remember the last focused child if it is our child + // + m_pWinLastFocused = FindFocus(); + + // + // So we NULL it out if it's a child from some other frame + // + wxWindow* pWin = m_pWinLastFocused; + + while (pWin) { - // Invalid for frame windows under PM + if (pWin->IsTopLevel()) + { + if (pWin != this) + { + m_pWinLastFocused = NULL; + } + break; + } + pWin = pWin->GetParent(); } - if (lStyle & wxTINY_CAPTION_VERT) - lMsflags |= FCF_TASKLIST; - if (lStyle & wxTINY_CAPTION_HORIZ) - lMsflags |= FCF_TASKLIST; + wxLogTrace(_T("focus"), + _T("wxTLW %08lx deactivated, last focused: %08lx."), + m_hWnd, + m_pWinLastFocused ? GetHwndOf(m_pWinLastFocused) + : NULL); + rEvent.Skip(); + } +} // end of wxTopLevelWindowOS2::OnActivate + +WXDWORD wxTopLevelWindowOS2::OS2GetStyle( + long lStyle +, WXDWORD* pdwExflags +) const +{ + long lMsflags = wxWindow::OS2GetStyle( (lStyle & ~wxBORDER_MASK) | wxBORDER_NONE + ,pdwExflags + ); - if ((lStyle & wxTHICK_FRAME) == 0) - lMsflags |= FCF_BORDER; - if (lStyle & wxFRAME_TOOL_WINDOW) - *plExflags = kFrameToolWindow; + if ((lStyle & wxDEFAULT_FRAME_STYLE) == wxDEFAULT_FRAME_STYLE) + lMsflags |= FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | + FCF_MINMAX | FCF_TASKLIST; - if (lStyle & wxSTAY_ON_TOP) - lMsflags |= FCF_SYSMODAL; + if ((lStyle & wxCAPTION) == wxCAPTION) + lMsflags |= FCF_TASKLIST; + else + lMsflags |= FCF_NOMOVEWITHOWNER; + + if ((lStyle & wxVSCROLL) == wxVSCROLL) + lMsflags |= FCF_VERTSCROLL; + if ((lStyle & wxHSCROLL) == wxHSCROLL) + lMsflags |= FCF_HORZSCROLL; + if (lStyle & wxMINIMIZE_BOX) + lMsflags |= FCF_MINBUTTON; + if (lStyle & wxMAXIMIZE_BOX) + lMsflags |= FCF_MAXBUTTON; + if (lStyle & wxTHICK_FRAME) + lMsflags |= FCF_DLGBORDER; + if (lStyle & wxSYSTEM_MENU) + lMsflags |= FCF_SYSMENU; + if (lStyle & wxCAPTION) + lMsflags |= FCF_TASKLIST; + if (lStyle & wxCLIP_CHILDREN) + { + // Invalid for frame windows under PM } + + if (lStyle & wxTINY_CAPTION_VERT) + lMsflags |= FCF_TASKLIST; + if (lStyle & wxTINY_CAPTION_HORIZ) + lMsflags |= FCF_TASKLIST; + + if ((lStyle & wxTHICK_FRAME) == 0) + lMsflags |= FCF_BORDER; + if (lStyle & wxFRAME_TOOL_WINDOW) + *pdwExflags = kFrameToolWindow; + + if (lStyle & wxSTAY_ON_TOP) + lMsflags |= FCF_SYSMODAL; + return lMsflags; } // end of wxTopLevelWindowOS2::OS2GetCreateWindowFlags +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) + // + if (HasFlag(wxFRAME_FLOAT_ON_PARENT) ) + { + const wxWindow* pParent = GetParent(); + + if (!pParent) + { + // + // This flag doesn't make sense then and will be ignored + // + wxFAIL_MSG( _T("wxFRAME_FLOAT_ON_PARENT but no parent?") ); + } + else + { + hWndParent = GetHwndOf(pParent); + } + } + //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( ULONG ulDlgTemplate , const wxString& rsTitle @@ -218,9 +361,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; } @@ -270,7 +413,7 @@ bool wxTopLevelWindowOS2::CreateDialog( nX = (vSizeDpy.x - nWidth) / 2; nY = (vSizeDpy.y - nHeight) / 2; } - m_backgroundColour.Set(wxString("LIGHT GREY")); + m_backgroundColour.Set(wxString(wxT("LIGHT GREY"))); LONG lColor = (LONG)m_backgroundColour.GetPixel(); @@ -289,7 +432,7 @@ bool wxTopLevelWindowOS2::CreateDialog( ,nY ,nWidth ,nHeight - ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW + ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW | SWP_ACTIVATE ); ::WinQueryWindowPos(GetHwnd(), GetSwp()); m_hFrame = m_hWnd; @@ -303,8 +446,8 @@ bool wxTopLevelWindowOS2::CreateFrame( , const wxSize& rSize ) { - long lExflags; - long lFlags = OS2GetCreateWindowFlags(&lExflags); + WXDWORD lExflags; + WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags); long lStyle = GetWindowStyleFlag(); int nX = rPos.x; int nY = rPos.y; @@ -355,7 +498,7 @@ bool wxTopLevelWindowOS2::CreateFrame( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error creating frame. Error: %s\n", sError); + wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str()); return FALSE; } @@ -367,7 +510,7 @@ bool wxTopLevelWindowOS2::CreateFrame( wxAssociateWinWithHandle(m_hWnd, this); wxAssociateWinWithHandle(m_hFrame, this); - m_backgroundColour.Set(wxString("MEDIUM GREY")); + m_backgroundColour.Set(wxString(wxT("MEDIUM GREY"))); LONG lColor = (LONG)m_backgroundColour.GetPixel(); @@ -379,7 +522,7 @@ bool wxTopLevelWindowOS2::CreateFrame( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error creating frame. Error: %s\n", sError); + wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str()); return FALSE; } @@ -416,7 +559,7 @@ bool wxTopLevelWindowOS2::CreateFrame( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error sizing frame. Error: %s\n", sError); + wxLogError(_T("Error sizing frame. Error: %s\n"), sError.c_str()); return FALSE; } lStyle = ::WinQueryWindowULong( m_hWnd @@ -435,7 +578,7 @@ bool wxTopLevelWindowOS2::Create( , wxWindowID vId , const wxString& rsTitle , const wxPoint& rPos -, const wxSize& rSize +, const wxSize& rSizeOrig , long lStyle , const wxString& rsName ) @@ -447,6 +590,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); @@ -484,20 +640,23 @@ 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 @@ -565,8 +724,15 @@ bool wxTopLevelWindowOS2::Show( { int nShowCmd; SWP vSwp; - RECTL vRect; + if (bShow != IsShown() ) + { + m_isShown = bShow; + } + else + { + return FALSE; + } if (bShow) { if (m_bMaximizeOnShow) @@ -614,15 +780,6 @@ bool wxTopLevelWindowOS2::Show( ::WinQueryWindowPos(hWndParent, &vSwp); m_bIconized = vSwp.fl & SWP_MINIMIZE; - if (hWndParent) - ::WinSetWindowPos( hWndParent - ,HWND_TOP - ,vSwp.x - ,vSwp.y - ,vSwp.cx - ,vSwp.cy - ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE - ); ::WinEnableWindow(hWndParent, TRUE); } } @@ -650,13 +807,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); @@ -820,17 +976,26 @@ bool wxTopLevelWindowOS2::ShowFullScreen( void wxTopLevelWindowOS2::SetIcon( const wxIcon& rIcon ) +{ + SetIcons(wxIconBundle(rIcon)); +} // end of wxTopLevelWindowOS2::SetIcon + +void wxTopLevelWindowOS2::SetIcons( + const wxIconBundle& rIcons +) { // // This sets m_icon // - wxTopLevelWindowBase::SetIcon(rIcon); + wxTopLevelWindowBase::SetIcons(rIcons); + + const wxIcon& vIcon = rIcons.GetIcon(wxSize(32, 32)); - if (m_icon.Ok()) + if (vIcon.Ok() && vIcon.GetWidth() == 32 && vIcon.GetHeight() == 32) { ::WinSendMsg( m_hFrame ,WM_SETICON - ,(MPARAM)((HPOINTER)m_icon.GetHICON()) + ,(MPARAM)((HPOINTER)vIcon.GetHICON()) ,NULL ); ::WinSendMsg( m_hFrame @@ -884,3 +1049,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() + ,(PSZ)zHIDDEN_PARENT_CLASS + ,NULL + ,0 + ,sizeof(ULONG) + )) + { + wxLogLastError(_T("RegisterClass(\"wxTLWHiddenParent\")")); + } + else + { + m_szClassName = zHIDDEN_PARENT_CLASS; + } + } + m_shWnd = ::WinCreateWindow( HWND_DESKTOP + ,(PSZ)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