X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b389a12d03d1485d6297a031be44d90ad64623c4..a8cb1a4947bbbf5e18ce52448f4c3bb4cff4daee:/src/os2/toplevel.cpp diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp index 237037106b..b57f915139 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: src/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 /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "toplevel.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -31,13 +27,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,15 +48,11 @@ // globals // ---------------------------------------------------------------------------- -// list of all frames and modeless dialogs -wxWindowList wxModelessWindows; +// the name of the default wxWidgets class +extern void wxAssociateWinWithHandle( HWND hWnd, wxWindowOS2* pWin ); -// the name of the default wxWindows class -extern void wxAssociateWinWithHandle( HWND hWnd - ,wxWindowOS2* pWin - ); -bool wxTopLevelWindowOS2::m_sbInitialized = FALSE; -wxWindow* wxTopLevelWindowOS2::m_spHiddenParent = NULL; +bool wxTopLevelWindowOS2::m_sbInitialized = false; +wxWindow* wxTopLevelWindowOS2::m_spHiddenParent = NULL; // ============================================================================ // wxTopLevelWindowOS2 implementation @@ -74,8 +69,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,25 +91,59 @@ 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 // ---------------------------------------------------------------------------- void wxTopLevelWindowOS2::Init() { - m_bIconized = m_bMaximizeOnShow = FALSE; + m_bIconized = m_bMaximizeOnShow = false; // // Unlike (almost?) all other windows, frames are created hidden // - m_isShown = FALSE; + m_isShown = false; // // Data to save/restore when calling ShowFullScreen m_lFsStyle = 0; m_lFsOldWindowStyle = 0; - m_bFsIsMaximized = FALSE; - m_bFsIsShowing = FALSE; + m_bFsIsMaximized = false; + m_bFsIsShowing = false; m_hFrame = NULLHANDLE; memset(&m_vSwp, 0, sizeof(SWP)); @@ -131,7 +160,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 +199,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); @@ -187,97 +216,97 @@ WXDWORD wxTopLevelWindowOS2::OS2GetStyle( ,pdwExflags ); - if (lStyle == wxDEFAULT_FRAME_STYLE) + if ((lStyle & wxDEFAULT_FRAME_STYLE) == wxDEFAULT_FRAME_STYLE) lMsflags |= FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | FCF_MINMAX | FCF_TASKLIST; + + 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) { - 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 - } + // Invalid for frame windows under PM + } - if (lStyle & wxTINY_CAPTION_VERT) - lMsflags |= FCF_TASKLIST; - if (lStyle & wxTINY_CAPTION_HORIZ) - lMsflags |= FCF_TASKLIST; + 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 & wxTHICK_FRAME) == 0) + lMsflags |= FCF_BORDER; + if (lStyle & wxFRAME_TOOL_WINDOW) + *pdwExflags = kFrameToolWindow; + + if (lStyle & wxSTAY_ON_TOP) + lMsflags |= FCF_SYSMODAL; - 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) // - 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( - ULONG ulDlgTemplate -, const wxString& rsTitle -, const wxPoint& rPos -, const wxSize& rSize -) + +bool wxTopLevelWindowOS2::CreateDialog( ULONG ulDlgTemplate, + const wxString& WXUNUSED(rsTitle), + const wxPoint& rPos, + const wxSize& rSize ) { wxWindow* pParent = GetParent(); @@ -326,11 +355,11 @@ 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; + return false; } // @@ -378,7 +407,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(); @@ -388,7 +417,7 @@ bool wxTopLevelWindowOS2::CreateDialog( ,(PVOID)&lColor )) { - return FALSE; + return false; } ::WinSetWindowPos( GetHwnd() @@ -402,29 +431,27 @@ bool wxTopLevelWindowOS2::CreateDialog( ::WinQueryWindowPos(GetHwnd(), GetSwp()); m_hFrame = m_hWnd; SubclassWin(m_hWnd); - return TRUE; + return true; } // end of wxTopLevelWindowOS2::CreateDialog -bool wxTopLevelWindowOS2::CreateFrame( - const wxString& rsTitle -, const wxPoint& rPos -, const wxSize& rSize -) +bool wxTopLevelWindowOS2::CreateFrame( const wxString& rsTitle, + const wxPoint& rPos, + const wxSize& rSize ) { - WXDWORD lExflags; - WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags); - long lStyle = GetWindowStyleFlag(); - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - ULONG ulStyleFlags = 0L; - ERRORID vError; - wxString sError; - wxWindow* pParent = GetParent(); - HWND hParent; - HWND hFrame; - HWND hClient; + WXDWORD lExflags; + WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags); + long lStyle = GetWindowStyleFlag(); + int nX = rPos.x; + int nY = rPos.y; + int nWidth = rSize.x; + int nHeight = rSize.y; + ULONG ulStyleFlags = 0L; + ERRORID vError; + wxString sError; + wxWindow* pParent = GetParent(); + HWND hParent; + HWND hFrame; + HWND hClient; if (pParent) hParent = GetHwndOf(pParent); @@ -440,7 +467,7 @@ bool wxTopLevelWindowOS2::CreateFrame( // Clear the visible flag, we always call show // ulStyleFlags &= (unsigned long)~WS_VISIBLE; - m_bIconized = FALSE; + m_bIconized = false; // // Create the frame window: We break ranks with other ports now @@ -463,8 +490,8 @@ bool wxTopLevelWindowOS2::CreateFrame( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error creating frame. Error: %s\n", sError); - return FALSE; + wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str()); + return false; } // @@ -475,7 +502,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(); @@ -487,8 +514,8 @@ bool wxTopLevelWindowOS2::CreateFrame( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error creating frame. Error: %s\n", sError); - return FALSE; + wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str()); + return false; } // @@ -524,8 +551,8 @@ bool wxTopLevelWindowOS2::CreateFrame( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error sizing frame. Error: %s\n", sError); - return FALSE; + wxLogError(_T("Error sizing frame. Error: %s\n"), sError.c_str()); + return false; } lStyle = ::WinQueryWindowULong( m_hWnd ,QWL_STYLE @@ -535,7 +562,7 @@ bool wxTopLevelWindowOS2::CreateFrame( ,QWL_STYLE ,lStyle ); - return TRUE; + return true; } // end of wxTopLevelWindowOS2::CreateFrame bool wxTopLevelWindowOS2::Create( @@ -543,7 +570,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 +582,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); @@ -562,7 +602,7 @@ bool wxTopLevelWindowOS2::Create( if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) { // - // We have different dialog templates to allows creation of dialogs + // We have different dialog templates to allow creation of dialogs // with & without captions under OS2indows, resizeable or not (but a // resizeable dialog always has caption - otherwise it would look too // strange) @@ -592,20 +632,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 @@ -667,20 +710,25 @@ void wxTopLevelWindowOS2::DoShowWindow( m_bIconized = nShowCmd == SWP_MINIMIZE; } // end of wxTopLevelWindowOS2::DoShowWindow -bool wxTopLevelWindowOS2::Show( - bool bShow -) +bool wxTopLevelWindowOS2::Show( bool bShow ) { - int nShowCmd; - SWP vSwp; - RECTL vRect; + int nShowCmd; + SWP vSwp; + if (bShow != IsShown() ) + { + m_isShown = bShow; + } + else + { + return false; + } if (bShow) { if (m_bMaximizeOnShow) { nShowCmd = SWP_MAXIMIZE; - m_bMaximizeOnShow = FALSE; + m_bMaximizeOnShow = false; } else { @@ -695,10 +743,10 @@ bool wxTopLevelWindowOS2::Show( if (bShow) { - wxActivateEvent vEvent(wxEVT_ACTIVATE, TRUE, m_windowId); + wxActivateEvent vEvent(wxEVT_ACTIVATE, true, m_windowId); ::WinQueryWindowPos(m_hFrame, &vSwp); - m_bIconized = vSwp.fl & SWP_MINIMIZE; + m_bIconized = ( vSwp.fl & SWP_MINIMIZE ) == SWP_MINIMIZE ; ::WinQueryWindowPos(m_hWnd, &m_vSwpClient); ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); ::WinQueryWindowPos(m_hWnd, &vSwp); @@ -718,14 +766,14 @@ bool wxTopLevelWindowOS2::Show( // if (GetParent()) { - HWND hWndParent = GetHwndOf(GetParent()); + HWND hWndParent = GetHwndOf(GetParent()); ::WinQueryWindowPos(hWndParent, &vSwp); - m_bIconized = vSwp.fl & SWP_MINIMIZE; + m_bIconized = (vSwp.fl & SWP_MINIMIZE)==SWP_MINIMIZE; ::WinEnableWindow(hWndParent, TRUE); } } - return TRUE; + return true; } // end of wxTopLevelWindowOS2::Show // ---------------------------------------------------------------------------- @@ -749,21 +797,27 @@ 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); + return (m_vSwp.fl & SWP_MAXIMIZE) == SWP_MAXIMIZE; } // end of wxTopLevelWindowOS2::IsMaximized -void wxTopLevelWindowOS2::Iconize( - bool bIconize -) +void wxTopLevelWindowOS2::SetTitle( const wxString& title) +{ + SetLabel(title); +} + +wxString wxTopLevelWindowOS2::GetTitle() const +{ + return GetLabel(); +} + +void wxTopLevelWindowOS2::Iconize( bool bIconize ) { DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE); } // end of wxTopLevelWindowOS2::Iconize @@ -773,9 +827,9 @@ bool wxTopLevelWindowOS2::IsIconized() const // also update the current state ::WinQueryWindowPos(m_hFrame, (PSWP)&m_vSwp); if (m_vSwp.fl & SWP_MINIMIZE) - ((wxTopLevelWindow*)this)->m_bIconized = TRUE; + ((wxTopLevelWindow*)this)->m_bIconized = true; else - ((wxTopLevelWindow*)this)->m_bIconized = FALSE; + ((wxTopLevelWindow*)this)->m_bIconized = false; return m_bIconized; } // end of wxTopLevelWindowOS2::IsIconized @@ -803,17 +857,15 @@ void wxTopLevelWindowOS2::SendSizeEvent() // wxTopLevelWindowOS2 fullscreen // ---------------------------------------------------------------------------- -bool wxTopLevelWindowOS2::ShowFullScreen( - bool bShow -, long lStyle -) +bool wxTopLevelWindowOS2::ShowFullScreen( bool bShow, + long lStyle ) { if (bShow) { if (IsFullScreen()) - return FALSE; + return false; - m_bFsIsShowing = TRUE; + m_bFsIsShowing = true; m_lFsStyle = lStyle; // @@ -836,8 +888,8 @@ bool wxTopLevelWindowOS2::ShowFullScreen( // // Decide which window lStyle flags to turn off // - LONG lNewStyle = m_lFsOldWindowStyle; - LONG lOffFlags = 0; + LONG lNewStyle = m_lFsOldWindowStyle; + LONG lOffFlags = 0; if (lStyle & wxFULLSCREEN_NOBORDER) lOffFlags |= FCF_BORDER; @@ -857,16 +909,14 @@ bool wxTopLevelWindowOS2::ShowFullScreen( // // Resize to the size of the desktop // - int nWidth; - int nHeight; - RECTL vRect = wxGetWindowRect(HWND_DESKTOP); + int nWidth; + int nHeight; + RECTL vRect = wxGetWindowRect(HWND_DESKTOP); nWidth = vRect.xRight - vRect.xLeft; nHeight = vRect.yTop - vRect.yBottom; - SetSize( nWidth - ,nHeight - ); + SetSize( nWidth, nHeight ); // // Now flush the window style cache and actually go full-screen @@ -880,21 +930,17 @@ bool wxTopLevelWindowOS2::ShowFullScreen( ,SWP_SIZE | SWP_MOVE ); - wxSizeEvent vEvent( wxSize( nWidth - ,nHeight - ) - ,GetId() - ); - + wxSize full( nWidth, nHeight ); + wxSizeEvent vEvent( full, GetId() ); GetEventHandler()->ProcessEvent(vEvent); - return TRUE; + return true; } else { if (!IsFullScreen()) - return FALSE; + return false; - m_bFsIsShowing = FALSE; + m_bFsIsShowing = false; Maximize(m_bFsIsMaximized); ::WinSetWindowULong( (HWND)GetHWND() ,QWL_STYLE @@ -908,7 +954,7 @@ bool wxTopLevelWindowOS2::ShowFullScreen( ,m_vFsOldSize.height ,SWP_SIZE | SWP_MOVE ); - return TRUE; + return true; } } // end of wxTopLevelWindowOS2::ShowFullScreen @@ -949,19 +995,17 @@ void wxTopLevelWindowOS2::SetIcons( } } // end of wxTopLevelWindowOS2::SetIcon -bool wxTopLevelWindowOS2::EnableCloseButton( - bool bEnable -) +bool wxTopLevelWindowOS2::EnableCloseButton( bool bEnable ) { // // Get system (a.k.a. window) menu // - HMENU hMenu = ::WinWindowFromID(m_hFrame, FID_SYSMENU); + HMENU hMenu = ::WinWindowFromID(m_hFrame, FID_SYSMENU); if (!hMenu) { wxLogLastError(_T("GetSystemMenu")); - return FALSE; + return false; } // @@ -989,6 +1033,77 @@ bool wxTopLevelWindowOS2::EnableCloseButton( ,(MPARAM)FCF_MENU ,(MPARAM)0 ); - return TRUE; + 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