X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0a56ab0c38aac05101593488c7e0972c36c38b7..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/os2/frame.cpp diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index 4c6fb21326..3464ed3300 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -3,29 +3,40 @@ // Purpose: wxFrame // Author: David Webster // Modified by: -// Created: 08/12/99 +// Created: 10/27/99 // RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "frame.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop #endif -#include "wx/frame.h" -#include "wx/event.h" +#ifndef WX_PRECOMP + #include "wx/setup.h" + #include "wx/frame.h" + #include "wx/menu.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/dialog.h" + #include "wx/settings.h" + #include "wx/dcclient.h" +#endif // WX_PRECOMP + +#include "wx/os2/private.h" #include "wx/statusbr.h" #include "wx/toolbar.h" #include "wx/menuitem.h" -#include "wx/menu.h" -#include "wx/dcclient.h" -#include "wx/dialog.h" -#include "wx/settings.h" -#include "wx/app.h" +#include "wx/log.h" -extern wxList wxModelessWindows; -extern wxList wxPendingDelete; +extern wxWindowList wxModelessWindows; +extern wxList WXDLLEXPORT wxPendingDelete; +extern wxChar wxFrameClassName[]; +extern wxMenu *wxCurrentPopupMenu; #if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxWindow) @@ -40,20 +51,15 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) #endif -#if wxUSE_NATIVE_STATUSBAR -bool wxFrame::m_useNativeStatusBar = TRUE; -#else bool wxFrame::m_useNativeStatusBar = FALSE; -#endif wxFrame::wxFrame() { + m_frameToolBar = NULL ; m_frameMenuBar = NULL; m_frameStatusBar = NULL; m_iconized = FALSE; - - m_frameToolBar = NULL ; } bool wxFrame::Create(wxWindow *parent, @@ -64,8 +70,9 @@ bool wxFrame::Create(wxWindow *parent, long style, const wxString& name) { - if (!parent) - wxTopLevelWindows.Append(this); +#if wxUSE_TOOLTIPS + m_hwndToolTip = 0; +#endif SetName(name); m_windowStyle = style; @@ -75,6 +82,7 @@ bool wxFrame::Create(wxWindow *parent, SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); +// m_icon = NULL; if ( id > -1 ) m_windowId = id; else @@ -82,15 +90,33 @@ bool wxFrame::Create(wxWindow *parent, if (parent) parent->AddChild(this); - wxModelessWindows.Append(this); + int x = pos.x; + int y = pos.y; + int width = size.x; + int height = size.y; - // TODO: create frame. + m_iconized = FALSE; - return 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 (!parent) + wxTopLevelWindows.Append(this); + + OS2Create(m_windowId, parent, wxFrameClassName, this, title, + x, y, width, height, style); + + wxModelessWindows.Append(this); + return TRUE; } wxFrame::~wxFrame() { + m_isBeingDeleted = TRUE; wxTopLevelWindows.DeleteObject(this); if (m_frameStatusBar) @@ -98,7 +124,8 @@ wxFrame::~wxFrame() if (m_frameMenuBar) delete m_frameMenuBar; -/* Check if it's the last top-level window */ +/* New behaviour March 1998: check if it's the last top-level window */ +// if (wxTheApp && (this == wxTheApp->GetTopWindow())) if (wxTheApp && (wxTopLevelWindows.Number() == 0)) { @@ -106,117 +133,249 @@ wxFrame::~wxFrame() if (wxTheApp->GetExitOnFrameDelete()) { - // TODO signal to the app that we're going to close +// PostQuitMessage(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 + +// TODO: +/* + if ( wxGetActiveWindow() == this ) + if (GetParent() && GetParent()->GetHWND()) + ::BringWindowToTop((HWND) GetParent()->GetHWND()); +*/ } // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. -void wxFrame::GetClientSize(int *x, int *y) const +void wxFrame::DoGetClientSize(int *x, int *y) const { - // TODO +// TODO: +/* + RECT rect; + ::GetClientRect(GetHwnd(), &rect); + + if ( GetStatusBar() ) + { + int statusX, statusY; + GetStatusBar()->GetClientSize(&statusX, &statusY); + rect.bottom -= statusY; + } + + wxPoint pt(GetClientAreaOrigin()); + rect.bottom -= pt.y; + rect.right -= pt.x; + + if ( x ) + *x = rect.right; + if ( y ) + *y = rect.bottom; +*/ } // Set the client size (i.e. leave the calculation of borders etc. // to wxWindows) -void wxFrame::SetClientSize(int width, int height) +void wxFrame::DoSetClientSize(int width, int height) { - // TODO -} + HWND hWnd = GetHwnd(); -void wxFrame::GetSize(int *width, int *height) const -{ - // TODO +// TODO: +/* + RECT rect; + ::GetClientRect(hWnd, &rect); + + RECT rect2; + GetWindowRect(hWnd, &rect2); + + // 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; + + if ( GetStatusBar() ) + { + int statusX, statusY; + GetStatusBar()->GetClientSize(&statusX, &statusY); + actual_height += statusY; + } + + wxPoint pt(GetClientAreaOrigin()); + actual_width += pt.y; + actual_height += pt.x; + + POINT point; + point.x = rect2.left; + point.y = rect2.top; + + MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE); + + wxSizeEvent event(wxSize(width, height), m_windowId); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); +*/ } -void wxFrame::GetPosition(int *x, int *y) const +void wxFrame::DoGetSize(int *width, int *height) const { - // TODO +// TODO: +/* + RECT rect; + GetWindowRect(GetHwnd(), &rect); + *width = rect.right - rect.left; + *height = rect.bottom - rect.top; +*/ } -void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxFrame::DoGetPosition(int *x, int *y) const { - // TODO +// TODO: +/* + RECT rect; + GetWindowRect(GetHwnd(), &rect); + POINT point; + point.x = rect.left; + point.y = rect.top; + + *x = point.x; + *y = point.y; +*/ } bool wxFrame::Show(bool show) { - // TODO - return FALSE; +// TODO: +/* + int cshow; + if (show) + cshow = SW_SHOW; + else + cshow = SW_HIDE; + + if (!show) + { + // Try to highlight the correct window (the parent) + HWND hWndParent = 0; + if (GetParent()) + { + hWndParent = (HWND) GetParent()->GetHWND(); + if (hWndParent) + ::BringWindowToTop(hWndParent); + } + } + + ShowWindow(GetHwnd(), (BOOL)cshow); + if (show) + { + BringWindowToTop(GetHwnd()); + + wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); + } + return TRUE; +*/ + return FALSE; } void wxFrame::Iconize(bool iconize) { - // TODO +// TODO: +/* + if (!iconize) + Show(TRUE); + + int cshow; + if (iconize) + cshow = SW_MINIMIZE; + else + cshow = SW_RESTORE; + ShowWindow(GetHwnd(), (BOOL)cshow); + m_iconized = iconize; +*/ } // Equivalent to maximize/restore in Windows void wxFrame::Maximize(bool maximize) { - // TODO +// TODO: +/* + Show(TRUE); + int cshow; + if (maximize) + cshow = SW_MAXIMIZE; + else + cshow = SW_RESTORE; + ShowWindow(GetHwnd(), cshow); + m_iconized = FALSE; +*/ } bool wxFrame::IsIconized() const { - // TODO - return FALSE; -} - -// Is the frame maximized? -bool wxFrame::IsMaximized(void) const -{ - // TODO - return FALSE; -} - -void wxFrame::SetTitle(const wxString& title) -{ - // TODO +// TODO: +/* + ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0); + return m_iconized; +*/ + return FALSE; } -wxString wxFrame::GetTitle() const +// Is it maximized? +bool wxFrame::IsMaximized() const { - // TODO - return wxString(""); +// return (::IsZoomed(GetHwnd()) != 0) ; + return FALSE; } void wxFrame::SetIcon(const wxIcon& icon) { +// TODO: +/* m_icon = icon; - // TODO + if ( m_icon.Ok() ) + SendMessage(GetHwnd(), WM_SETICON, + (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON()); +*/ } +#if wxUSE_STATUSBAR wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, const wxString& name) { wxStatusBar *statusBar = NULL; + { + statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), + style, name); - statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), - style, name); - - // Set the height according to the font and the border size - wxClientDC dc(statusBar); - dc.SetFont(statusBar->GetFont()); + // Set the height according to the font and the border size + wxClientDC dc(statusBar); + dc.SetFont(statusBar->GetFont()); - long x, y; - dc.GetTextExtent("X", &x, &y, NULL, NULL, NULL); + long x, y; + dc.GetTextExtent("X", &x, &y); - int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); + int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); - statusBar->SetSize(-1, -1, 100, height); + statusBar->SetSize(-1, -1, 100, height); + } - statusBar->SetFieldsCount(number); - return statusBar; + statusBar->SetFieldsCount(number); + return statusBar; } wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id, const wxString& name) { - // Calling CreateStatusBar twice is an error. + // VZ: calling CreateStatusBar twice is an error - why anyone would do it? wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, - "recreating status bar in wxFrame" ); + wxT("recreating status bar in wxFrame") ); m_frameStatusBar = OnCreateStatusBar(number, style, id, name); @@ -231,14 +390,14 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id, void wxFrame::SetStatusText(const wxString& text, int number) { - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" ); + wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") ); m_frameStatusBar->SetStatusText(text, number); } void wxFrame::SetStatusWidths(int n, const int widths_field[]) { - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); + wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set widths for") ); m_frameStatusBar->SetStatusWidths(n, widths_field); PositionStatusBar(); @@ -246,56 +405,63 @@ void wxFrame::SetStatusWidths(int n, const int widths_field[]) void wxFrame::PositionStatusBar() { - int w, h; - GetClientSize(&w, &h); - int sw, sh; - m_frameStatusBar->GetSize(&sw, &sh); - - // 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); + // native status bar positions itself + if (m_frameStatusBar) + { + int w, h; + GetClientSize(&w, &h); + int sw, sh; + m_frameStatusBar->GetSize(&sw, &sh); + + // 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); + } } +#endif // wxUSE_STATUSBAR -void wxFrame::SetMenuBar(wxMenuBar *menuBar) +void wxFrame::DetachMenuBar() { - if (!menuBar) + if (m_frameMenuBar) { + m_frameMenuBar->Detach(); m_frameMenuBar = NULL; + } +} + +void wxFrame::SetMenuBar(wxMenuBar *menu_bar) +{ + if (!menu_bar) + { + DetachMenuBar(); return; } - m_frameMenuBar = menuBar; + wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") ); + + if (m_frameMenuBar) + delete m_frameMenuBar; + + m_hMenu = menu_bar->Create(); - // TODO + if ( !m_hMenu ) + return; + + InternalSetMenuBar(); + + m_frameMenuBar = menu_bar; + menu_bar->Attach(this); } -void wxFrame::Fit() +void wxFrame::InternalSetMenuBar() { - // Work out max. size - wxNode *node = GetChildren().First(); - int max_width = 0; - int max_height = 0; - while (node) - { - // Find a child that's a subwindow, but not a dialog box. - wxWindow *win = (wxWindow *)node->Data(); - - if (!win->IsKindOf(CLASSINFO(wxFrame)) && - !win->IsKindOf(CLASSINFO(wxDialog))) +// TODO: +/* + if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) { - int width, height; - int x, y; - win->GetSize(&width, &height); - win->GetPosition(&x, &y); - - if ((x + width) > max_width) - max_width = x + width; - if ((y + height) > max_height) - max_height = y + height; + wxLogLastError("SetMenu"); } - node = node->Next(); - } - SetClientSize(max_width, max_height); +*/ } // Responds to colour changes, and passes event on to children. @@ -308,75 +474,173 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { wxSysColourChangedEvent event2; event2.SetEventObject( m_frameStatusBar ); - m_frameStatusBar->ProcessEvent(event2); + m_frameStatusBar->GetEventHandler()->ProcessEvent(event2); } // Propagate the event to the non-top-level children wxWindow::OnSysColourChanged(event); } -// Default resizing behaviour - if only ONE subwindow, -// resize to client rectangle size +/* + * 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; + + WXDWORD extendedStyle = MakeExtendedStyle(style); + +#if !defined(__WIN16__) && !defined(__SC__) + if (style & wxFRAME_TOOL_WINDOW) + extendedStyle |= WS_EX_TOOLWINDOW; +#endif + + if (style & wxSTAY_ON_TOP) + extendedStyle |= WS_EX_TOPMOST; + + m_iconized = FALSE; + if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height, + msflags, NULL, extendedStyle) ) + return FALSE; + + // 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)); + + return TRUE; +*/ + return FALSE; +} + +// Default resizing behaviour - if only ONE subwindow, resize to client +// rectangle size void wxFrame::OnSize(wxSizeEvent& event) { - // if we're using constraints - do use them - #if wxUSE_CONSTRAINTS - if ( GetAutoLayout() ) { - Layout(); - return; + // if we're using constraints - do use them +#if wxUSE_CONSTRAINTS + if ( GetAutoLayout() ) + { + Layout(); + return; } - #endif +#endif - // do we have _exactly_ one child? - wxWindow *child = NULL; - for ( wxNode *node = GetChildren().First(); node; node = node->Next() ) - { - wxWindow *win = (wxWindow *)node->Data(); - if ( !win->IsKindOf(CLASSINFO(wxFrame)) && - !win->IsKindOf(CLASSINFO(wxDialog)) && - (win != GetStatusBar()) && - (win != GetToolBar()) ) + // do we have _exactly_ one child? + wxWindow *child = NULL; + for ( wxWindowList::Node *node = GetChildren().GetFirst(); + node; + node = node->GetNext() ) { - if ( child ) - return; // it's our second subwindow - nothing to do - child = win; + wxWindow *win = node->GetData(); + if ( !win->IsTopLevel() +#if wxUSE_STATUSBAR + && (win != GetStatusBar()) +#endif // wxUSE_STATUSBAR +#if wxUSE_TOOLBAR + && (win != GetToolBar()) +#endif // wxUSE_TOOLBAR + ) + { + if ( child ) + return; // it's our second subwindow - nothing to do + child = win; + } } - } - if ( child ) { - // we have exactly one child - set it's size to fill the whole frame - int clientW, clientH; - GetClientSize(&clientW, &clientH); + if ( child ) { + // we have exactly one child - set it's size to fill the whole frame + int clientW, clientH; + GetClientSize(&clientW, &clientH); - int x = 0; - int y = 0; + int x = 0; + int y = 0; - child->SetSize(x, y, clientW, clientH); - } + child->SetSize(x, y, clientW, clientH); + } } // Default activation behaviour - set the focus for the first child // subwindow found. void wxFrame::OnActivate(wxActivateEvent& event) { - for(wxNode *node = GetChildren().First(); node; node = node->Next()) - { - // Find a child that's a subwindow, but not a dialog box. - wxWindow *child = (wxWindow *)node->Data(); - if (!child->IsKindOf(CLASSINFO(wxFrame)) && - !child->IsKindOf(CLASSINFO(wxDialog))) + for ( wxWindowList::Node *node = GetChildren().GetFirst(); + node; + node = node->GetNext() ) { - child->SetFocus(); - return; + // 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(); + + if ( !child->IsTopLevel() +#if wxUSE_TOOLBAR + && !wxDynamicCast(child, wxToolBar) +#endif // wxUSE_TOOLBAR +#if wxUSE_STATUSBAR + && !wxDynamicCast(child, wxStatusBar) +#endif // wxUSE_STATUSBAR + ) + { + child->SetFocus(); + return; + } } - } } // The default implementation for the close window event. - void wxFrame::OnCloseWindow(wxCloseEvent& event) { - this->Destroy(); + Destroy(); } // Destroy the window (delayed, if a managed window) @@ -392,18 +656,21 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event) { if (GetStatusBar()) { - if (event.GetMenuId() == -1) - SetStatusText(""); - else + wxString help; + int menuId = event.GetMenuId(); + if ( menuId != -1 ) { wxMenuBar *menuBar = GetMenuBar(); - if (menuBar) + if (menuBar && menuBar->FindItem(menuId)) { - wxString helpString(menuBar->GetHelpString(event.GetMenuId())); - if (helpString != "") - SetStatusText(helpString); + help = menuBar->GetHelpString(menuId); } } + + // set status text even if the string is empty - this will at + // least remove the string from the item which was previously + // selected + SetStatusText(help); } } @@ -412,48 +679,24 @@ wxMenuBar *wxFrame::GetMenuBar() const return m_frameMenuBar; } -void wxFrame::Centre(int direction) +bool wxFrame::ProcessCommand(int id) { - int display_width, display_height, width, height, x, y; - wxDisplaySize(&display_width, &display_height); + wxMenuBar *bar = GetMenuBar() ; + if ( !bar ) + return FALSE; - GetSize(&width, &height); - GetPosition(&x, &y); + wxMenuItem *item = bar->FindItem(id); - if (direction & wxHORIZONTAL) - x = (int)((display_width - width)/2); - if (direction & wxVERTICAL) - y = (int)((display_height - height)/2); + if ( item && item->IsCheckable() ) + { + bar->Check(id, !bar->IsChecked(id)) ; + } - SetSize(x, y, width, height); -} + wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); + commandEvent.SetInt( id ); + commandEvent.SetEventObject( this ); -// Call this to simulate a menu command -void wxFrame::Command(int id) -{ - ProcessCommand(id); -} - -void wxFrame::ProcessCommand(int id) -{ - wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); - commandEvent.SetInt( id ); - commandEvent.SetEventObject( this ); - - wxMenuBar *bar = GetMenuBar() ; - if (!bar) - return; - -/* TODO: check the menu item if required - wxMenuItem *item = bar->FindItemForId(id) ; - if (item && item->IsCheckable()) - { - bar->Check(id,!bar->Checked(id)) ; - } -*/ - - wxEvtHandler* evtHandler = GetEventHandler(); - evtHandler->ProcessEvent(commandEvent); + return GetEventHandler()->ProcessEvent(commandEvent); } // Checks if there is a toolbar, and returns the first free client position @@ -477,9 +720,9 @@ wxPoint wxFrame::GetClientAreaOrigin() const return pt; } -void wxFrame::ScreenToClient(int *x, int *y) const +void wxFrame::DoScreenToClient(int *x, int *y) const { - wxWindow::ScreenToClient(x, y); + wxWindow::DoScreenToClient(x, y); // We may be faking the client origin. // So a window that's really at (0, 30) may appear @@ -489,7 +732,7 @@ void wxFrame::ScreenToClient(int *x, int *y) const *y -= pt.y; } -void wxFrame::ClientToScreen(int *x, int *y) const +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 @@ -498,13 +741,14 @@ void wxFrame::ClientToScreen(int *x, int *y) const *x += pt1.x; *y += pt1.y; - wxWindow::ClientToScreen(x, y); + wxWindow::DoClientToScreen(x, y); } +#if wxUSE_TOOLBAR wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { wxCHECK_MSG( m_frameToolBar == NULL, FALSE, - "recreating toolbar in wxFrame" ); + wxT("recreating toolbar in wxFrame") ); wxToolBar* toolBar = OnCreateToolBar(style, id, name); if (toolBar) @@ -526,19 +770,16 @@ wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& n void wxFrame::PositionToolBar() { - int cw, ch; - - // TODO: we actually need to use the low-level client size, before - // the toolbar/status bar were added. - // So DEFINITELY replace the line below with something appropriate. - - GetClientSize(& cw, &ch); +// TODO: +/* + RECT rect; + ::GetClientRect(GetHwnd(), &rect); if ( GetStatusBar() ) { int statusX, statusY; GetStatusBar()->GetClientSize(&statusX, &statusY); - ch -= statusY; + rect.bottom -= statusY; } if (GetToolBar()) @@ -548,16 +789,295 @@ void wxFrame::PositionToolBar() if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) { - // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS - // means, pretend we don't have toolbar/status bar, so we - // have the original client size. - GetToolBar()->SetSize(0, 0, tw, ch, wxSIZE_NO_ADJUSTMENTS); + // Use the 'real' MSW position + GetToolBar()->SetSize(0, 0, tw, rect.bottom, wxSIZE_NO_ADJUSTMENTS); } else { - // Use the 'real' position - GetToolBar()->SetSize(0, 0, cw, th, wxSIZE_NO_ADJUSTMENTS); + // Use the 'real' MSW position + GetToolBar()->SetSize(0, 0, rect.right, th, wxSIZE_NO_ADJUSTMENTS); } } +*/ +} +#endif // wxUSE_TOOLBAR + +// 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) +{ + for ( wxWindowList::Node *node = GetChildren().GetFirst(); + node; + node = node->GetNext() ) + { + wxWindow *win = node->GetData(); + + if ( win->IsKindOf(CLASSINFO(wxFrame)) ) + { + ((wxFrame *)win)->Iconize(bIconize); + } + } +} + + +// make the window modal (all other windows unresponsive) +void wxFrame::MakeModal(bool modal) +{ + if (modal) { + wxEnableTopLevelWindows(FALSE); + Enable(TRUE); // keep this window enabled + } + else { + wxEnableTopLevelWindows(TRUE); + } +} + + +// =========================================================================== +// message processing +// =========================================================================== + +// --------------------------------------------------------------------------- +// preprocessing +// --------------------------------------------------------------------------- + +bool wxFrame::OS2TranslateMessage(WXMSG* pMsg) +{ + if ( wxWindow::OS2TranslateMessage(pMsg) ) + return TRUE; + + // try the menu bar accels + wxMenuBar *menuBar = GetMenuBar(); + if ( !menuBar ) + return FALSE; + + const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable(); + return acceleratorTable.Translate(this, pMsg); +} + +// --------------------------------------------------------------------------- +// our private (non virtual) message handlers +// --------------------------------------------------------------------------- + +bool wxFrame::HandlePaint() +{ +// TODO: +/* + RECT rect; + if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) + { + if ( m_iconized ) + { + HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) + : (HICON)m_defaultIcon; + + // Hold a pointer to the dc so long as the OnPaint() message + // is being processed + PAINTSTRUCT ps; + HDC hdc = ::BeginPaint(GetHwnd(), &ps); + + // Erase background before painting or we get white background + MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L); + + if ( hIcon ) + { + RECT rect; + ::GetClientRect(GetHwnd(), &rect); + + // FIXME: why hardcoded? + static const int icon_width = 32; + static const int icon_height = 32; + + int icon_x = (int)((rect.right - icon_width)/2); + int icon_y = (int)((rect.bottom - icon_height)/2); + + ::DrawIcon(hdc, icon_x, icon_y, hIcon); + } + + ::EndPaint(GetHwnd(), &ps); + + return TRUE; + } + else + { + return wxWindow::HandlePaint(); + } + } + else + { + // nothing to paint - processed + return TRUE; + } +*/ + return FALSE; +} + +bool wxFrame::HandleSize(int x, int y, WXUINT id) +{ + bool processed = FALSE; + +// TODO: +/* + switch ( id ) + { + case SIZENORMAL: + // 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 ) + break; + + // restore all child frames too + IconizeChildFrames(FALSE); + + // fall through + + case SIZEFULLSCREEN: + m_iconized = FALSE; + break; + + case SIZEICONIC: + // iconize all child frames too + IconizeChildFrames(TRUE); + + m_iconized = TRUE; + break; + } +*/ + if ( !m_iconized ) + { + // forward WM_SIZE to status bar control + PositionStatusBar(); + PositionToolBar(); + + wxSizeEvent event(wxSize(x, y), m_windowId); + event.SetEventObject( this ); + processed = GetEventHandler()->ProcessEvent(event); + } + + return processed; +} + +bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) +{ + if ( control ) + { + // In case it's e.g. a toolbar. + wxWindow *win = wxFindWinFromHandle(control); + if ( win ) + return win->OS2Command(cmd, id); + } + + // handle here commands from menus and accelerators + if ( cmd == 0 || cmd == 1 ) + { + if ( wxCurrentPopupMenu ) + { + wxMenu *popupMenu = wxCurrentPopupMenu; + wxCurrentPopupMenu = NULL; + + return popupMenu->OS2Command(cmd, id); + } + + if ( ProcessCommand(id) ) + { + return TRUE; + } + } + + return FALSE; +} + +bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) +{ + int item; + if ( flags == 0xFFFF && hMenu == 0 ) + { + // menu was removed from screen + item = -1; + } +// TODO: +/* + else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) ) + { + item = nItem; + } +*/ + else + { + // 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 ); + + return GetEventHandler()->ProcessEvent(event); +} + +// --------------------------------------------------------------------------- +// the window proc for wxFrame +// --------------------------------------------------------------------------- + +MRESULT wxFrame::OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +{ + MRESULT rc = 0; + bool processed = FALSE; + +// TODO: +/* + switch ( message ) + { + case WM_CLOSE: + // if we can't close, tell the system that we processed the + // message - otherwise it would close us + processed = !Close(); + break; + + case WM_COMMAND: + { + WORD id, cmd; + WXHWND hwnd; + UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam, + &id, &hwnd, &cmd); + + processed = HandleCommand(id, cmd, (WXHWND)hwnd); + } + break; + + case WM_MENUSELECT: + { + WXWORD item, flags; + WXHMENU hmenu; + UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu); + + processed = HandleMenuSelect(item, flags, hmenu); + } + break; + + case WM_PAINT: + processed = HandlePaint(); + break; + + case WM_QUERYDRAGICON: + { + HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) + : (HICON)(m_defaultIcon); + rc = (long)hIcon; + processed = rc != 0; + } + break; + + case WM_SIZE: + processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam); + break; + } +*/ + if ( !processed ) + rc = wxWindow::OS2WindowProc(hwnd, message, wParam, lParam); + + return rc; }