X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38374d0d7aa865e9bbe8ee61b75b94ffcdfb220..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/src/os2/frame.cpp diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index fa543a0f52..50a4cea7f1 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -27,6 +27,7 @@ #if wxUSE_STATUSBAR #include "wx/statusbr.h" + #include "wx/generic/statusbr.h" #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR @@ -49,14 +50,12 @@ extern wxMenu *wxCurrentPopupMenu; // event tables // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_ACTIVATE(wxFrame::OnActivate) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif // ============================================================================ // implementation @@ -67,9 +66,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) // ---------------------------------------------------------------------------- #if wxUSE_NATIVE_STATUSBAR - bool wxFrame::m_useNativeStatusBar = TRUE; + bool wxFrame::m_bUseNativeStatusBar = TRUE; #else - bool wxFrame::m_useNativeStatusBar = FALSE; + bool wxFrame::m_bUseNativeStatusBar = FALSE; #endif // ---------------------------------------------------------------------------- @@ -78,313 +77,451 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) void wxFrame::Init() { - m_iconized = FALSE; + m_bIconized = FALSE; #if wxUSE_TOOLTIPS - m_hwndToolTip = 0; + m_hWndToolTip = 0; #endif -} - -bool wxFrame::Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) + // Data to save/restore when calling ShowFullScreen + m_lFsStyle = 0L; + m_lFsOldWindowStyle = 0L; + m_nFsStatusBarFields = 0; + m_nFsStatusBarHeight = 0; + m_nFsToolBarHeight = 0; + m_bFsIsMaximized = FALSE; + m_bFsIsShowing = FALSE; +} // end of wxFrame::Init + +bool wxFrame::Create( + wxWindow* pParent +, wxWindowID vId +, const wxString& rsTitle +, const wxPoint& rPos +, const wxSize& rSize +, long lulStyle +, const wxString& rsName +) { - SetName(name); - m_windowStyle = style; - m_frameMenuBar = NULL; - m_frameToolBar = NULL; - m_frameStatusBar = NULL; + int nX = rPos.x; + int nY = rPos.y; + int nWidth = rSize.x; + int nHeight = rSize.y; - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); + SetName(rsName); + m_windowStyle = lulStyle; + m_frameMenuBar = NULL; + m_frameToolBar = NULL; + m_frameStatusBar = NULL; - if ( id > -1 ) - m_windowId = id; - else - m_windowId = (int)NewControlId(); + SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); - if (parent) parent->AddChild(this); + if (vId > -1 ) + m_windowId = vId; + else + m_windowId = (int)NewControlId(); - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; + if (pParent) + pParent->AddChild(this); - m_iconized = FALSE; + m_bIconized = FALSE; - // we pass NULL as parent to MSWCreate because frames with parents behave - // very strangely under Win95 shell - // Alteration by JACS: keep normal Windows behaviour (float on top of parent) - // with this style. - if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0) - parent = NULL; + if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0) + pParent = NULL; - if (!parent) - wxTopLevelWindows.Append(this); + if (!pParent) + wxTopLevelWindows.Append(this); - OS2Create(m_windowId, parent, wxFrameClassName, this, title, - x, y, width, height, style); + OS2Create( m_windowId + ,pParent + ,wxFrameClassName + ,this + ,rsTitle + ,nX + ,nY + ,nWidth + ,nHeight + ,lulStyle + ); - wxModelessWindows.Append(this); - return TRUE; -} + wxModelessWindows.Append(this); + return TRUE; +} // end of wxFrame::Create wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; - wxTopLevelWindows.DeleteObject(this); + m_isBeingDeleted = TRUE; + wxTopLevelWindows.DeleteObject(this); -// TODO: -/* - DeleteAllBars(); + DeleteAllBars(); - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) - { - wxTheApp->SetTopWindow(NULL); + if (wxTheApp && (wxTopLevelWindows.Number() == 0)) + { + wxTheApp->SetTopWindow(NULL); - if (wxTheApp->GetExitOnFrameDelete()) + if (wxTheApp->GetExitOnFrameDelete()) + { + ::WinPostMsg(GetHwnd(), WM_QUIT, 0, 0); + } + } + wxModelessWindows.DeleteObject(this); + + // + // For some reason, wxWindows can activate another task altogether + // when a frame is destroyed after a modal dialog has been invoked. + // Try to bring the parent to the top. + // + // MT:Only do this if this frame is currently the active window, else weird + // things start to happen. + // + if (wxGetActiveWindow() == this) { - PostQuitMessage(0); + if (GetParent() && GetParent()->GetHWND()) + { + ::WinSetWindowPos( (HWND) GetParent()->GetHWND() + ,HWND_TOP + ,0 + ,0 + ,0 + ,0 + ,SWP_ZORDER + ); + } } - } - - wxModelessWindows.DeleteObject(this); - - // For some reason, wxWindows can activate another task altogether - // when a frame is destroyed after a modal dialog has been invoked. - // Try to bring the parent to the top. - // MT:Only do this if this frame is currently the active window, else weird - // things start to happen - if ( wxGetActiveWindow() == this ) - if (GetParent() && GetParent()->GetHWND()) - ::BringWindowToTop((HWND) GetParent()->GetHWND()); -*/ -} +} // end of wxFrame::~wxFrame +// // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. -void wxFrame::DoGetClientSize(int *x, int *y) const +// +void wxFrame::DoGetClientSize( + int* pX +, int* pY +) const { -// TODO: -/* - RECT rect; - ::GetClientRect(GetHwnd(), &rect); + // + // OS/2 PM's coordinates go from bottom-left not + // top-left thus the += instead of the -= + // + RECTL vRect; + HWND hWndClient; + + // + // PM has no GetClientRect that inherantly knows about the client window + // We have to explicitly go fetch it! + // + hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); + ::WinQueryWindowRect(hWndClient, &vRect); #if wxUSE_STATUSBAR - if ( GetStatusBar() ) - { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - rect.bottom -= statusY; - } + if ( GetStatusBar() ) + { + int nStatusX; + int nStatusY; + + GetStatusBar()->GetClientSize( &nStatusX + ,&nStatusY + ); + vRect.yBottom += nStatusY; + } #endif // wxUSE_STATUSBAR - wxPoint pt(GetClientAreaOrigin()); - rect.bottom -= pt.y; - rect.right -= pt.x; + wxPoint vPoint(GetClientAreaOrigin()); - if ( x ) - *x = rect.right; - if ( y ) - *y = rect.bottom; -*/ -} + vRect.yBottom += vPoint.y; + vRect.xRight -= vPoint.x; + + if (pX) + *pX = vRect.xRight; + if (pY) + *pY = vRect.yBottom; +} // end of wxFrame::DoGetClientSize +// // Set the client size (i.e. leave the calculation of borders etc. // to wxWindows) -void wxFrame::DoSetClientSize(int width, int height) +// +void wxFrame::DoSetClientSize( + int nWidth +, int nHeight +) { - HWND hWnd = GetHwnd(); + HWND hWnd = GetHwnd(); + HWND hWndClient; + RECTL vRect; + RECTL vRect2; -// TODO: -/* - RECT rect; - ::GetClientRect(hWnd, &rect); + hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); + ::WinQueryWindowRect(hWndClient, &vRect); - RECT rect2; - GetWindowRect(hWnd, &rect2); + ::WinQueryWindowRect(hWnd, &vRect2); - // Find the difference between the entire window (title bar and all) - // and the client area; add this to the new client size to move the - // window - int actual_width = rect2.right - rect2.left - rect.right + width; - int actual_height = rect2.bottom - rect2.top - rect.bottom + height; + // + // Find the difference between the entire window (title bar and all) + // and the client area; add this to the new client size to move the + // window. Remember OS/2's backwards y coord system! + // + int nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth; + int nActualHeight = vRect2.yTop + vRect2.yTop - vRect.yTop + nHeight; #if wxUSE_STATUSBAR - if ( GetStatusBar() ) - { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - actual_height += statusY; - } -#endif // wxUSE_STATUSBAR - - wxPoint pt(GetClientAreaOrigin()); - actual_width += pt.y; - actual_height += pt.x; + if ( GetStatusBar() ) + { + int nStatusX; + int nStatusY; - POINT point; - point.x = rect2.left; - point.y = rect2.top; + GetStatusBar()->GetClientSize( &nStatusX + ,&nStatusY + ); + nActualHeight += nStatusY; + } +#endif // wxUSE_STATUSBAR - MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE); + wxPoint vPoint(GetClientAreaOrigin()); + nActualWidth += vPoint.y; + nActualHeight += vPoint.x; + + POINTL vPointl; + + vPointl.x = vRect2.xLeft; + vPoint.y = vRect2.yTop; + + ::WinSetWindowPos( hWnd + ,HWND_TOP + ,vPointl.x + ,vPointl.y + ,nActualWidth + ,nActualHeight + ,SWP_MOVE | SWP_SIZE | SWP_SHOW + ); + + wxSizeEvent vEvent( wxSize( nWidth + ,nHeight + ) + ,m_windowId + ); + vEvent.SetEventObject(this); + GetEventHandler()->ProcessEvent(vEvent); +} // end of wxFrame::DoSetClientSize + +void wxFrame::DoGetSize( + int* pWidth +, int* pHeight +) const +{ + RECTL vRect; - wxSizeEvent event(wxSize(width, height), m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); -*/ -} + ::WinQueryWindowRect(GetHwnd(), &vRect); + *pWidth = vRect.xRight - vRect.xLeft; + *pHeight = vRect.yTop - vRect.yBottom; +} // end of wxFrame::DoGetSize -void wxFrame::DoGetSize(int *width, int *height) const +void wxFrame::DoGetPosition( + int* pX +, int* pY +) const { -// TODO: -/* - RECT rect; - GetWindowRect(GetHwnd(), &rect); - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; -*/ -} + RECTL vRect; + POINTL vPoint; -void wxFrame::DoGetPosition(int *x, int *y) const -{ -// TODO: -/* - RECT rect; - GetWindowRect(GetHwnd(), &rect); - POINT point; - point.x = rect.left; - point.y = rect.top; + ::WinQueryWindowRect(GetHwnd(), &vRect); + vPoint.x = vRect.xLeft; - *x = point.x; - *y = point.y; -*/ -} + // + // OS/2 is backwards [WIN32 it is vRect.yTop] + // + vPoint.y = vRect.yBottom; + + *pX = vPoint.x; + *pY = vPoint.y; +} // end of wxFrame::DoGetPosition // ---------------------------------------------------------------------------- // variations around ::ShowWindow() // ---------------------------------------------------------------------------- -void wxFrame::DoShowWindow(int nShowCmd) +void wxFrame::DoShowWindow( + int bShowCmd +) { -// TODO: -/* - ::ShowWindow(GetHwnd(), nShowCmd); - - m_iconized = nShowCmd == SW_MINIMIZE; -*/ -} - -bool wxFrame::Show(bool show) + HWND hClient; + + // + // Send anything to initialize the frame + // + ::WinSendMsg( GetHwnd() + ,WM_UPDATEFRAME + ,(MPARAM)FCF_MENU + ,(MPARAM)0 + ); + hClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); + ::WinShowWindow(GetHwnd(), (BOOL)bShowCmd); + ::WinShowWindow(hClient, (BOOL)bShowCmd); +} // end of wxFrame::DoShowWindow + +bool wxFrame::Show( + bool bShow +) { -// TODO: -/* - DoShowWindow(show ? SW_SHOW : SW_HIDE); + SWP vSwp; - if ( show ) - { - ::BringWindowToTop(GetHwnd()); + DoShowWindow((int)bShow); - wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + if (bShow) + { + wxActivateEvent vEvent(wxEVT_ACTIVATE, TRUE, m_windowId); + + ::WinQueryWindowPos(GetHwnd(), &vSwp); + m_bIconized = vSwp.fl & SWP_MINIMIZE; + ::WinSetWindowPos( (HWND) GetHWND() + ,HWND_TOP + ,vSwp.x + ,vSwp.y + ,vSwp.cx + ,vSwp.cy + ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE + ); + vEvent.SetEventObject(this); + GetEventHandler()->ProcessEvent(vEvent); } else { + // // Try to highlight the correct window (the parent) - if ( GetParent() ) + // + if (GetParent()) { - HWND hWndParent = GetHwndOf(GetParent()); + HWND hWndParent = GetHwndOf(GetParent()); + + ::WinQueryWindowPos(hWndParent, &vSwp); + m_bIconized = vSwp.fl & SWP_MINIMIZE; if (hWndParent) - ::BringWindowToTop(hWndParent); + ::WinSetWindowPos( hWndParent + ,HWND_TOP + ,vSwp.x + ,vSwp.y + ,vSwp.cx + ,vSwp.cy + ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE + ); } } -*/ return TRUE; -} +} // end of wxFrame::Show -void wxFrame::Iconize(bool iconize) +void wxFrame::Iconize( + bool bIconize +) { -// DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE); -} + DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE); +} // end of wxFrame::Iconize -void wxFrame::Maximize(bool maximize) +void wxFrame::Maximize( + bool bMaximize) { -// DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE); -} + DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE); +} // end of wxFrame::Maximize void wxFrame::Restore() { -// DoShowWindow(SW_RESTORE); -} + DoShowWindow(SWP_RESTORE); +} // end of wxFrame::Restore bool wxFrame::IsIconized() const { -// TODO: -/* - ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0); - return m_iconized; -*/ - return FALSE; -} + SWP vSwp; + bool bIconic; + + ::WinQueryWindowPos(GetHwnd(), &vSwp); + + if (vSwp.fl & SWP_MINIMIZE) + ((wxFrame*)this)->m_bIconized = TRUE; + else + ((wxFrame*)this)->m_bIconized = FALSE; + return m_bIconized; +} // end of wxFrame::IsIconized // Is it maximized? bool wxFrame::IsMaximized() const { -// TODO: -/* - return (::IsZoomed(GetHwnd()) != 0); -*/ - return FALSE; -} + SWP vSwp; + bool bIconic; + + ::WinQueryWindowPos(GetHwnd(), &vSwp); + return (vSwp.fl & SWP_MAXIMIZE); +} // end of wxFrame::IsMaximized -void wxFrame::SetIcon(const wxIcon& icon) +void wxFrame::SetIcon( + const wxIcon& rIcon +) { - wxFrameBase::SetIcon(icon); + wxFrameBase::SetIcon(rIcon); -// TODO: -/* - if ( m_icon.Ok() ) + if ((m_icon.GetHICON()) != NULLHANDLE) { - SendMessage(GetHwnd(), WM_SETICON, - (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON()); + ::WinSendMsg( GetHwnd() + ,WM_SETICON + ,(MPARAM)((HPOINTER)m_icon.GetHICON()) + ,NULL + ); + ::WinSendMsg( GetHwnd() + ,WM_UPDATEFRAME + ,(MPARAM)FCF_ICON + ,(MPARAM)0 + ); } -*/ -} +} // end of wxFrame::SetIcon #if wxUSE_STATUSBAR -wxStatusBar *wxFrame::OnCreateStatusBar(int number, - long style, - wxWindowID id, - const wxString& name) +wxStatusBar* wxFrame::OnCreateStatusBar( + int nNumber +, long lulStyle +, wxWindowID vId +, const wxString& rName +) { - wxStatusBar *statusBar = NULL; - - statusBar = wxFrameBase::OnCreateStatusBar(number, style, id, name); + wxStatusBar* pStatusBar = NULL; - return statusBar; -} + pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber + ,lulStyle + ,vId + ,rName + ); + return pStatusBar; +} // end of wxFrame::OnCreateStatusBar void wxFrame::PositionStatusBar() { -// TODO: -/* - // native status bar positions itself - if ( m_frameStatusBar ) + // + // Native status bar positions itself + // + if (m_frameStatusBar) { - int w, h; - GetClientSize(&w, &h); - int sw, sh; - m_frameStatusBar->GetSize(&sw, &sh); - + int nWidth; + int nHeight; + int nStatbarWidth; + int nStatbarHeight; + HWND hWndClient; + RECTL vRect; + + hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); + ::WinQueryWindowRect(hWndClient, &vRect); + nWidth = vRect.xRight - vRect.xLeft; + nHeight = vRect.yTop - vRect.yBottom; + + m_frameStatusBar->GetSize( &nStatbarWidth + ,&nStatbarHeight + ); + + // // Since we wish the status bar to be directly under the client area, // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS. - m_frameStatusBar->SetSize(0, h, w, sh); + // + m_frameStatusBar->SetSize( 0 + ,nHeight + ,nWidth + ,nStatbarHeight + ); } -*/ -} +} // end of wxFrame::PositionStatusBar #endif // wxUSE_STATUSBAR void wxFrame::DetachMenuBar() @@ -394,169 +531,417 @@ void wxFrame::DetachMenuBar() m_frameMenuBar->Detach(); m_frameMenuBar = NULL; } -} +} // end of wxFrame::DetachMenuBar -void wxFrame::SetMenuBar(wxMenuBar *menu_bar) +void wxFrame::SetMenuBar( + wxMenuBar* pMenuBar +) { - if (!menu_bar) + if (!pMenuBar) { DetachMenuBar(); return; } - wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") ); + m_frameMenuBar = NULL; - if (m_frameMenuBar) - delete m_frameMenuBar; + // Can set a menubar several times. + // TODO: how to prevent a memory leak if you have a currently-unattached + // menubar? wxWindows assumes that the frame will delete the menu (otherwise + // there are problems for MDI). + if (pMenuBar->GetHMenu()) + { + m_hMenu = pMenuBar->GetHMenu(); + } + else + { + pMenuBar->Detach(); - m_hMenu = menu_bar->Create(); + m_hMenu = pMenuBar->Create(); - if ( !m_hMenu ) - return; + if (!m_hMenu) + return; + } InternalSetMenuBar(); - m_frameMenuBar = menu_bar; - menu_bar->Attach(this); -} + m_frameMenuBar = pMenuBar; + pMenuBar->Attach(this); +} // end of wxFrame::SetMenuBar void wxFrame::InternalSetMenuBar() { -// TODO: -/* - if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) - { - wxLogLastError("SetMenu"); - } -*/ -} - -// Responds to colour changes, and passes event on to children. -void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) + WinSendMsg((HWND)GetHwnd(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); +} // end of wxFrame::InternalSetMenuBar + +// +// Responds to colour changes, and passes event on to children +// +void wxFrame::OnSysColourChanged( + wxSysColourChangedEvent& rEvent +) { -// TODO: -/* SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); - if ( m_frameStatusBar ) + if (m_frameStatusBar) { - wxSysColourChangedEvent event2; - event2.SetEventObject( m_frameStatusBar ); - m_frameStatusBar->GetEventHandler()->ProcessEvent(event2); + wxSysColourChangedEvent vEvent2; + + vEvent2.SetEventObject(m_frameStatusBar); + m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2); } + // // Propagate the event to the non-top-level children - wxWindow::OnSysColourChanged(event); -*/ -} - -/* - * Frame window - * - */ - -bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title, - int x, int y, int width, int height, long style) - -{ - m_defaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON); - - // If child windows aren't properly drawn initially, WS_CLIPCHILDREN - // could be the culprit. But without it, you can get a lot of flicker. - -// TODO: -/* - DWORD msflags = 0; - if ((style & wxCAPTION) == wxCAPTION) - msflags = WS_OVERLAPPED; - else - msflags = WS_POPUP; - - if (style & wxMINIMIZE_BOX) - msflags |= WS_MINIMIZEBOX; - if (style & wxMAXIMIZE_BOX) - msflags |= WS_MAXIMIZEBOX; - if (style & wxTHICK_FRAME) - msflags |= WS_THICKFRAME; - if (style & wxSYSTEM_MENU) - msflags |= WS_SYSMENU; - if ((style & wxMINIMIZE) || (style & wxICONIZE)) - msflags |= WS_MINIMIZE; - if (style & wxMAXIMIZE) - msflags |= WS_MAXIMIZE; - if (style & wxCAPTION) - msflags |= WS_CAPTION; - if (style & wxCLIP_CHILDREN) - msflags |= WS_CLIPCHILDREN; - - // Keep this in wxFrame because it saves recoding this function - // in wxTinyFrame -#if wxUSE_ITSY_BITSY - if (style & wxTINY_CAPTION_VERT) - msflags |= IBS_VERTCAPTION; - if (style & wxTINY_CAPTION_HORIZ) - msflags |= IBS_HORZCAPTION; -#else - if (style & wxTINY_CAPTION_VERT) - msflags |= WS_CAPTION; - if (style & wxTINY_CAPTION_HORIZ) - msflags |= WS_CAPTION; -#endif - if ((style & wxTHICK_FRAME) == 0) - msflags |= WS_BORDER; + // + wxWindow::OnSysColourChanged(rEvent); +} // end of wxFrame::OnSysColourChanged + +// Pass TRUE to show full screen, FALSE to restore. +bool wxFrame::ShowFullScreen( + bool bShow +, long lStyle +) +{ + /* + // TODO + if (show) + { + if (IsFullScreen()) + return FALSE; - WXDWORD extendedStyle = MakeExtendedStyle(style); + m_fsIsShowing = TRUE; + m_fsStyle = style; -#if !defined(__WIN16__) && !defined(__SC__) - if (style & wxFRAME_TOOL_WINDOW) - extendedStyle |= WS_EX_TOOLWINDOW; -#endif + wxToolBar *theToolBar = GetToolBar(); + wxStatusBar *theStatusBar = GetStatusBar(); + + int dummyWidth; + + if (theToolBar) + theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight); + if (theStatusBar) + theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight); + + // zap the toolbar, menubar, and statusbar + + if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar) + { + theToolBar->SetSize(-1,0); + theToolBar->Show(FALSE); + } + + if (style & wxFULLSCREEN_NOMENUBAR) + SetMenu((HWND)GetHWND(), (HMENU) NULL); + + // Save the number of fields in the statusbar + if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar) + { + m_fsStatusBarFields = theStatusBar->GetFieldsCount(); + SetStatusBar((wxStatusBar*) NULL); + delete theStatusBar; + } + else + m_fsStatusBarFields = 0; + + // zap the frame borders + + // save the 'normal' window style + m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE); + + // save the old position, width & height, maximize state + m_fsOldSize = GetRect(); + m_fsIsMaximized = IsMaximized(); + + // decide which window style flags to turn off + LONG newStyle = m_fsOldWindowStyle; + LONG offFlags = 0; + + if (style & wxFULLSCREEN_NOBORDER) + offFlags |= WS_BORDER; + if (style & wxFULLSCREEN_NOCAPTION) + offFlags |= (WS_CAPTION | WS_SYSMENU); + + newStyle &= (~offFlags); + + // change our window style to be compatible with full-screen mode + SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle); - if (style & wxSTAY_ON_TOP) - extendedStyle |= WS_EX_TOPMOST; + // resize to the size of the desktop + int width, height; - m_iconized = FALSE; - if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height, - msflags, NULL, extendedStyle) ) - return FALSE; + RECT rect; + ::GetWindowRect(GetDesktopWindow(), &rect); + width = rect.right - rect.left; + height = rect.bottom - rect.top; - // Seems to be necessary if we use WS_POPUP - // style instead of WS_OVERLAPPED - if (width > -1 && height > -1) - ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height)); + SetSize(width, height); + + // now flush the window style cache and actually go full-screen + SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED); + + wxSizeEvent event(wxSize(width, height), GetId()); + GetEventHandler()->ProcessEvent(event); + + return TRUE; + } + else + { + if (!IsFullScreen()) + return FALSE; + + m_fsIsShowing = FALSE; + + wxToolBar *theToolBar = GetToolBar(); + + // restore the toolbar, menubar, and statusbar + if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR)) + { + theToolBar->SetSize(-1, m_fsToolBarHeight); + theToolBar->Show(TRUE); + } + + if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0)) + { + CreateStatusBar(m_fsStatusBarFields); + PositionStatusBar(); + } + + if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) + SetMenu((HWND)GetHWND(), (HMENU)m_hMenu); + + Maximize(m_fsIsMaximized); + SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle); + SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y, + m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED); + + return TRUE; + } */ - return TRUE; -} + return TRUE; +} // end of wxFrame::ShowFullScreen + +// +// Frame window +// +bool wxFrame::OS2Create( + int nId +, wxWindow* pParent +, const wxChar* zWclass +, wxWindow* pWxWin +, const wxChar* zTitle +, int nX +, int nY +, int nWidth +, int nHeight +, long ulStyle +) +{ + ULONG ulCreateFlags = 0L; + ULONG ulStyleFlags = 0L; + ULONG ulExtraFlags = 0L; + FRAMECDATA vFrameCtlData; + HWND hParent = NULLHANDLE; + HWND hClient = NULLHANDLE; + HWND hTitlebar = NULLHANDLE; + HWND hHScroll = NULLHANDLE; + HWND hVScroll = NULLHANDLE; + SWP vSwp; + SWP vSwpTitlebar; + SWP vSwpVScroll; + SWP vSwpHScroll; + + m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON); + memset(&vSwp, '\0', sizeof(SWP)); + memset(&vSwpTitlebar, '\0', sizeof(SWP)); + memset(&vSwpVScroll, '\0', sizeof(SWP)); + memset(&vSwpHScroll, '\0', sizeof(SWP)); + if (pParent) + hParent = GetWinHwnd(pParent); + else + hParent = HWND_DESKTOP; + + if (ulStyle == wxDEFAULT_FRAME_STYLE) + ulCreateFlags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | + FCF_MINMAX | FCF_VERTSCROLL | FCF_HORZSCROLL | FCF_TASKLIST; + else + { + if ((ulStyle & wxCAPTION) == wxCAPTION) + ulCreateFlags = FCF_TASKLIST; + else + ulCreateFlags = FCF_NOMOVEWITHOWNER; + + if (ulStyle & wxMINIMIZE_BOX) + ulCreateFlags |= FCF_MINBUTTON; + if (ulStyle & wxMAXIMIZE_BOX) + ulCreateFlags |= FCF_MAXBUTTON; + if (ulStyle & wxTHICK_FRAME) + ulCreateFlags |= FCF_DLGBORDER; + if (ulStyle & wxSYSTEM_MENU) + ulCreateFlags |= FCF_SYSMENU; + if (ulStyle & wxCAPTION) + ulCreateFlags |= FCF_TASKLIST; + if (ulStyle & wxCLIP_CHILDREN) + { + // Invalid for frame windows under PM + } + + if (ulStyle & wxTINY_CAPTION_VERT) + ulCreateFlags |= FCF_TASKLIST; + if (ulStyle & wxTINY_CAPTION_HORIZ) + ulCreateFlags |= FCF_TASKLIST; + + if ((ulStyle & wxTHICK_FRAME) == 0) + ulCreateFlags |= FCF_BORDER; + if (ulStyle & wxFRAME_TOOL_WINDOW) + ulExtraFlags = kFrameToolWindow; + + if (ulStyle & wxSTAY_ON_TOP) + ulCreateFlags |= FCF_SYSMODAL; + } + if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE)) + ulStyleFlags |= WS_MINIMIZED; + if (ulStyle & wxMAXIMIZE) + ulStyleFlags |= WS_MAXIMIZED; + + // + // Clear the visible flag, we always call show + // + ulStyleFlags &= (unsigned long)~WS_VISIBLE; + m_bIconized = FALSE; + + // + // Set the frame control block + // + vFrameCtlData.cb = sizeof(vFrameCtlData); + vFrameCtlData.flCreateFlags = ulCreateFlags; + vFrameCtlData.hmodResources = 0L; + vFrameCtlData.idResources = 0; + + // + // Create the frame window + // + if (!wxWindow::OS2Create( hParent + ,WC_FRAME + ,zTitle + ,ulStyleFlags + ,(long)nX + ,(long)nY + ,(long)nWidth + ,(long)nHeight + ,NULLHANDLE + ,HWND_TOP + ,(long)nId + ,(void*)&vFrameCtlData + ,NULL + )) + { + return FALSE; + } + // + // Create the client window. We must call the API from here rather than + // the static base class create because we need a separate handle + // + if ((hClient = ::WinCreateWindow( GetHwnd() // Frame is parent + ,zWclass // Custom client class + ,NULL // Window title + ,0 // No styles + ,0, 0, 0, 0 // Window position + ,NULLHANDLE // Owner + ,HWND_TOP // Sibling + ,FID_CLIENT // standard client ID + ,NULL // Creation data + ,NULL // Window Pres Params + )) == 0L) + { + return FALSE; + } + // + // Send anything to initialize the frame + // + ::WinSendMsg( GetHwnd() + ,WM_UPDATEFRAME + ,(MPARAM)FCF_TASKLIST + ,(MPARAM)0 + ); + + // + // Now size everything. If adding a menu the client will need to be resized. + // + if (!::WinSetWindowPos( GetHwnd() + ,HWND_TOP + ,nX + ,nY + ,nWidth + ,nHeight + ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE + )) + return FALSE; + + WinQueryWindowPos(GetHwnd(), &vSwp); + + if (ulCreateFlags & FCF_TITLEBAR) + { + hTitlebar = WinWindowFromID(GetHwnd(), FID_TITLEBAR); + WinQueryWindowPos(hTitlebar, &vSwpTitlebar); + } + if (ulCreateFlags & FCF_HORZSCROLL) + { + hHScroll = WinWindowFromID(GetHwnd(), FID_HORZSCROLL); + WinQueryWindowPos(hHScroll, &vSwpHScroll); + } + if (ulCreateFlags & FCF_VERTSCROLL) + { + hVScroll = WinWindowFromID(GetHwnd(), FID_VERTSCROLL); + WinQueryWindowPos(hVScroll, &vSwpVScroll); + } + if (!::WinSetWindowPos( hClient + ,HWND_TOP + ,SV_CXSIZEBORDER + ,(SV_CYSIZEBORDER - 1) + vSwpHScroll.cy + ,vSwp.cx - ((SV_CXSIZEBORDER * 2) + vSwpVScroll.cx) + ,vSwp.cy - ((SV_CYSIZEBORDER * 2) + 1 + vSwpTitlebar.cy + vSwpHScroll.cy) + ,SWP_SIZE | SWP_MOVE + )) + return FALSE; + WinQueryWindowPos(hClient, &vSwp); + return TRUE; +} // end of wxFrame::OS2Create + +// // Default activation behaviour - set the focus for the first child // subwindow found. -void wxFrame::OnActivate(wxActivateEvent& event) +// +void wxFrame::OnActivate( + wxActivateEvent& rEvent +) { - for ( wxWindowList::Node *node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) + for (wxWindowList::Node* pNode = GetChildren().GetFirst(); + pNode; + pNode = pNode->GetNext()) { // FIXME all this is totally bogus - we need to do the same as wxPanel, // but how to do it without duplicating the code? // restore focus - wxWindow *child = node->GetData(); + wxWindow* pChild = pNode->GetData(); - if ( !child->IsTopLevel() + if (!pChild->IsTopLevel() #if wxUSE_TOOLBAR - && !wxDynamicCast(child, wxToolBar) + && !wxDynamicCast(pChild, wxToolBar) #endif // wxUSE_TOOLBAR #if wxUSE_STATUSBAR - && !wxDynamicCast(child, wxStatusBar) + && !wxDynamicCast(pChild, wxStatusBar) #endif // wxUSE_STATUSBAR ) { - child->SetFocus(); + pChild->SetFocus(); return; } } -} +} // end of wxFrame::OnActivate // ---------------------------------------------------------------------------- // wxFrame size management: we exclude the areas taken by menu/status/toolbars @@ -567,47 +952,29 @@ void wxFrame::OnActivate(wxActivateEvent& event) // Checks if there is a toolbar, and returns the first free client position wxPoint wxFrame::GetClientAreaOrigin() const { - wxPoint pt(0, 0); + wxPoint vPoint(0, 0); + if (GetToolBar()) { - int w, h; - GetToolBar()->GetSize(& w, & h); + int nWidth; + int nHeight; + + GetToolBar()->GetSize( &nWidth + ,&nHeight + ); if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) { - pt.x += w; + vPoint.x += nWidth; } else { - pt.y += h; + // PM is backwards from windows + vPoint.y += nHeight; } } - return pt; -} - -void wxFrame::DoScreenToClient(int *x, int *y) const -{ - wxWindow::DoScreenToClient(x, y); - - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - wxPoint pt(GetClientAreaOrigin()); - *x -= pt.x; - *y -= pt.y; -} - -void wxFrame::DoClientToScreen(int *x, int *y) const -{ - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - wxPoint pt1(GetClientAreaOrigin()); - *x += pt1.x; - *y += pt1.y; - - wxWindow::DoClientToScreen(x, y); -} + return vPoint; +} // end of wxFrame::GetClientAreaOrigin // ---------------------------------------------------------------------------- // tool/status bar stuff @@ -615,74 +982,100 @@ void wxFrame::DoClientToScreen(int *x, int *y) const #if wxUSE_TOOLBAR -wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) +wxToolBar* wxFrame::CreateToolBar( + long lStyle +, wxWindowID vId +, const wxString& rName +) { - if ( wxFrameBase::CreateToolBar(style, id, name) ) + if (wxFrameBase::CreateToolBar( lStyle + ,vId + ,rName + )) { PositionToolBar(); } - return m_frameToolBar; -} +} // end of wxFrame::CreateToolBar void wxFrame::PositionToolBar() { -// TODO: -/* - RECT rect; - ::GetClientRect(GetHwnd(), &rect); + HWND hWndClient; + RECTL vRect; + + hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); + ::WinQueryWindowRect(hWndClient, &vRect); #if wxUSE_STATUSBAR - if ( GetStatusBar() ) + if (GetStatusBar()) { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - rect.bottom -= statusY; + int nStatusX; + int nStatusY; + + GetStatusBar()->GetClientSize( &nStatusX + ,&nStatusY + ); + // PM is backwards from windows + vRect.yBottom += nStatusY; } #endif // wxUSE_STATUSBAR if ( GetToolBar() ) { - int tw, th; - GetToolBar()->GetSize(&tw, &th); + int nToolbarWidth; + int nToolbarHeight; + + GetToolBar()->GetSize( &nToolbarWidth + ,&nToolbarHeight + ); - if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) + if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) { - th = rect.bottom; + nToolbarHeight = vRect.yBottom; } else { - tw = rect.right; + nToolbarWidth = vRect.xRight; } - // Use the 'real' MSW position here - GetToolBar()->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS); + // + // Use the 'real' PM position here + // + GetToolBar()->SetSize( 0 + ,0 + ,nToolbarWidth + ,nToolbarHeight + ,wxSIZE_NO_ADJUSTMENTS + ); } -*/ -} +} // end of wxFrame::PositionToolBar #endif // wxUSE_TOOLBAR // ---------------------------------------------------------------------------- // frame state (iconized/maximized/...) // ---------------------------------------------------------------------------- +// // propagate our state change to all child frames: this allows us to emulate X // Windows behaviour where child frames float independently of the parent one // on the desktop, but are iconized/restored with it -void wxFrame::IconizeChildFrames(bool bIconize) +// +void wxFrame::IconizeChildFrames( + bool bIconize +) { - for ( wxWindowList::Node *node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) + for (wxWindowList::Node* pNode = GetChildren().GetFirst(); + pNode; + pNode = pNode->GetNext() ) { - wxWindow *win = node->GetData(); + wxWindow* pWin = pNode->GetData(); - if ( win->IsKindOf(CLASSINFO(wxFrame)) ) + if (pWin->IsKindOf(CLASSINFO(wxFrame)) ) { - ((wxFrame *)win)->Iconize(bIconize); + ((wxFrame *)pWin)->Iconize(bIconize); } } -} +} // end of wxFrame::IconizeChildFrames // =========================================================================== // message processing @@ -691,64 +1084,73 @@ void wxFrame::IconizeChildFrames(bool bIconize) // --------------------------------------------------------------------------- // preprocessing // --------------------------------------------------------------------------- - -bool wxFrame::OS2TranslateMessage(WXMSG* pMsg) +bool wxFrame::OS2TranslateMessage( + WXMSG* pMsg +) { -// TODO: -/* - if ( wxWindow::OS2TranslateMessage(pMsg) ) + if (wxWindow::OS2TranslateMessage(pMsg)) return TRUE; -*/ + // // try the menu bar accels - wxMenuBar *menuBar = GetMenuBar(); - if ( !menuBar ) + // + wxMenuBar* pMenuBar = GetMenuBar(); + + if (!pMenuBar ) return FALSE; - const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable(); - return acceleratorTable.Translate(this, pMsg); -} + const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable(); + return rAcceleratorTable.Translate(this, pMsg); +} // end of wxFrame::OS2TranslateMessage // --------------------------------------------------------------------------- // our private (non virtual) message handlers // --------------------------------------------------------------------------- - bool wxFrame::HandlePaint() { -// TODO: -/* - RECT rect; - if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) + RECTL vRect; + + if (::WinQueryUpdateRect(GetHwnd(), &vRect)) { - if ( m_iconized ) + if (m_bIconized) { - HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) - : (HICON)m_defaultIcon; + // + // Icons in PM are the same as "pointers" + // + HPOINTER hIcon; + + if (m_icon.Ok()) + hIcon = (HPOINTER)::WinSendMsg(GetHwnd(), WM_QUERYICON, 0L, 0L); + else + hIcon = (HPOINTER)m_hDefaultIcon; + // // Hold a pointer to the dc so long as the OnPaint() message // is being processed - PAINTSTRUCT ps; - HDC hdc = ::BeginPaint(GetHwnd(), &ps); + // + RECTL vRect2; + HPS hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2); + // // Erase background before painting or we get white background - MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L); + // + OS2DefWindowProc(WM_ERASEBACKGROUND, (MPARAM)hPs, (MPARAM)&vRect2); - if ( hIcon ) + if (hIcon) { - RECT rect; - ::GetClientRect(GetHwnd(), &rect); + HWND hWndClient; + RECTL vRect3; - // FIXME: why hardcoded? - static const int icon_width = 32; - static const int icon_height = 32; + hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); + ::WinQueryWindowRect(hWndClient, &vRect3); - int icon_x = (int)((rect.right - icon_width)/2); - int icon_y = (int)((rect.bottom - icon_height)/2); + static const int nIconWidth = 32; + static const int nIconHeight = 32; + int nIconX = (int)((vRect3.xRight - nIconWidth)/2); + int nIconY = (int)((vRect3.yBottom + nIconHeight)/2); - ::DrawIcon(hdc, icon_x, icon_y, hIcon); + ::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL); } - - ::EndPaint(GetHwnd(), &ps); - + ::WinEndPaint(hPs); return TRUE; } else @@ -761,188 +1163,246 @@ bool wxFrame::HandlePaint() // nothing to paint - processed return TRUE; } -*/ return FALSE; -} +} // end of wxFrame::HandlePaint -bool wxFrame::HandleSize(int x, int y, WXUINT id) +bool wxFrame::HandleSize( + int nX +, int nY +, WXUINT nId +) { - bool processed = FALSE; + bool bProcessed = FALSE; -// TODO: -/* - switch ( id ) + switch (nId) { - case SIZENORMAL: - // only do it it if we were iconized before, otherwise resizing the + case kSizeNormal: + // + // Only do it it if we were iconized before, otherwise resizing the // parent frame has a curious side effect of bringing it under it's // children - if ( !m_iconized ) + if (!m_bIconized ) break; + // // restore all child frames too + // IconizeChildFrames(FALSE); + // // fall through + // - case SIZEFULLSCREEN: - m_iconized = FALSE; + case kSizeMax: + m_bIconized = FALSE; break; - case SIZEICONIC: - // iconize all child frames too + case kSizeMin: + // + // Iconize all child frames too + // IconizeChildFrames(TRUE); - - m_iconized = TRUE; + m_bIconized = TRUE; break; } - if ( !m_iconized ) + if (!m_bIconized) { + // // forward WM_SIZE to status bar control + // #if wxUSE_NATIVE_STATUSBAR if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))) { - wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId()); - event.SetEventObject( m_frameStatusBar ); - - ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event); + wxSizeEvent vEvent( wxSize( nX + ,nY + ) + ,m_frameStatusBar->GetId() + ); + + vEvent.SetEventObject(m_frameStatusBar); + m_frameStatusBar->OnSize(vEvent); } #endif // wxUSE_NATIVE_STATUSBAR PositionStatusBar(); PositionToolBar(); - - wxSizeEvent event(wxSize(x, y), m_windowId); - event.SetEventObject( this ); - processed = GetEventHandler()->ProcessEvent(event); + wxSizeEvent vEvent( wxSize( nX + ,nY + ) + ,m_windowId + ); + + vEvent.SetEventObject(this); + bProcessed = GetEventHandler()->ProcessEvent(vEvent); } -*/ - return processed; -} - -bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) + return bProcessed; +} // end of wxFrame::HandleSize + +bool wxFrame::HandleCommand( + WXWORD nId +, WXWORD nCmd +, WXHWND hControl +) { -// TODO: -/* - if ( control ) + if (hControl) { + // // In case it's e.g. a toolbar. - wxWindow *win = wxFindWinFromHandle(control); - if ( win ) - return win->MSWCommand(cmd, id); + // + wxWindow* pWin = wxFindWinFromHandle(hControl); + + if (pWin) + return pWin->OS2Command( nCmd + ,nId + ); } - // handle here commands from menus and accelerators - if ( cmd == 0 || cmd == 1 ) + // + // Handle here commands from menus and accelerators + // + if (nCmd == 0 || nCmd == 1) { - if ( wxCurrentPopupMenu ) + if (wxCurrentPopupMenu) { - wxMenu *popupMenu = wxCurrentPopupMenu; + wxMenu* pPopupMenu = wxCurrentPopupMenu; + wxCurrentPopupMenu = NULL; - return popupMenu->MSWCommand(cmd, id); + return pPopupMenu->OS2Command( nCmd + ,nId + ); } - if ( ProcessCommand(id) ) + if (ProcessCommand(nId)) { return TRUE; } } -*/ return FALSE; -} +} // end of wxFrame::HandleCommand -bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) +bool wxFrame::HandleMenuSelect( + WXWORD nItem +, WXWORD nFlags +, WXHMENU hMenu +) { - int item; - if ( flags == 0xFFFF && hMenu == 0 ) + int nMenuItem; + + if (nFlags == 0xFFFF && hMenu == 0) { - // menu was removed from screen - item = -1; + // + // Menu was removed from screen + // + nMenuItem = -1; } -// TODO: -/* - else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) ) + else if (!(nFlags & MIS_SUBMENU) && !(nFlags & MIS_SEPARATOR)) { - item = nItem; + nMenuItem = nItem; } else { - // don't give hints for separators (doesn't make sense) nor for the + // + // Don't give hints for separators (doesn't make sense) nor for the // items opening popup menus (they don't have them anyhow) + // return FALSE; } -*/ - wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item); - event.SetEventObject( this ); + wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nMenuItem); - return GetEventHandler()->ProcessEvent(event); -} + vEvent.SetEventObject(this); + return GetEventHandler()->ProcessEvent(vEvent); +} // end of wxFrame::HandleMenuSelect // --------------------------------------------------------------------------- // the window proc for wxFrame // --------------------------------------------------------------------------- -MRESULT wxFrame::OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +MRESULT wxFrame::OS2WindowProc( + WXUINT uMessage +, WXWPARAM wParam +, WXLPARAM lParam +) { - long rc = 0; - bool processed = FALSE; + MRESULT mRc = 0L; + bool bProcessed = FALSE; -// TODO: -/* - switch ( message ) + switch (uMessage) { case WM_CLOSE: - // if we can't close, tell the system that we processed the + // + // If we can't close, tell the system that we processed the // message - otherwise it would close us - processed = !Close(); + // + bProcessed = !Close(); break; case WM_COMMAND: { - WORD id, cmd; - WXHWND hwnd; - UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam, - &id, &hwnd, &cmd); - - processed = HandleCommand(id, cmd, (WXHWND)hwnd); + WORD wId; + WORD wCmd; + WXHWND hWnd; + + UnpackCommand( (WXWPARAM)wParam + ,(WXLPARAM)lParam + ,&wId + ,&hWnd + ,&wCmd + ); + bProcessed = HandleCommand( wId + ,wCmd + ,(WXHWND)hWnd + ); } break; case WM_MENUSELECT: { - WXWORD item, flags; - WXHMENU hmenu; - UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu); - - processed = HandleMenuSelect(item, flags, hmenu); + WXWORD wItem; + WXWORD wFlags; + WXHMENU hMenu; + + UnpackMenuSelect( wParam + ,lParam + ,&wItem + ,&wFlags + ,&hMenu + ); + bProcessed = HandleMenuSelect( wItem + ,wFlags + ,hMenu + ); } break; case WM_PAINT: - processed = HandlePaint(); + bProcessed = HandlePaint(); break; - case WM_QUERYDRAGICON: + case CM_QUERYDRAGIMAGE: { - HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) - : (HICON)(m_defaultIcon); - rc = (long)hIcon; - processed = rc != 0; + HPOINTER hIcon; + + if (m_icon.Ok()) + hIcon = (HPOINTER)::WinSendMsg(GetHwnd(), WM_QUERYICON, 0L, 0L); + else + hIcon = (HPOINTER)m_hDefaultIcon; + mRc = (MRESULT)hIcon; + bProcessed = mRc != 0; } break; case WM_SIZE: - processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam); + bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam); break; } - if ( !processed ) - rc = wxWindow::MSWWindowProc(message, wParam, lParam); - - return rc; -*/ + if (!bProcessed ) + mRc = wxWindow::OS2WindowProc( uMessage + ,wParam + ,lParam + ); return (MRESULT)0; -} +} // wxFrame::OS2WindowProc