X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6ebb51430cd8e4a9a11c6c5a5ca7c3ff9d7a72a..b3402d0df8c9f763da1e32fc28c824014e5516c6:/src/os2/frame.cpp diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index 47169e8359..47bfc39c75 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -3,7 +3,7 @@ // 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 @@ -24,62 +24,81 @@ #endif // WX_PRECOMP #include "wx/os2/private.h" -#include "wx/statusbr.h" -#include "wx/toolbar.h" + +#if wxUSE_STATUSBAR + #include "wx/statusbr.h" +#endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR + #include "wx/toolbar.h" +#endif // wxUSE_TOOLBAR + #include "wx/menuitem.h" #include "wx/log.h" +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- + extern wxWindowList wxModelessWindows; extern wxList WXDLLEXPORT wxPendingDelete; extern wxChar wxFrameClassName[]; extern wxMenu *wxCurrentPopupMenu; -#if !USE_SHARED_LIBRARY -BEGIN_EVENT_TABLE(wxFrame, wxWindow) - EVT_SIZE(wxFrame::OnSize) - EVT_ACTIVATE(wxFrame::OnActivate) - EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) - EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) - EVT_IDLE(wxFrame::OnIdle) - EVT_CLOSE(wxFrame::OnCloseWindow) +// ---------------------------------------------------------------------------- +// event tables +// ---------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) + EVT_ACTIVATE(wxFrame::OnActivate) + EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif -bool wxFrame::m_useNativeStatusBar = FALSE; +// ============================================================================ +// implementation +// ============================================================================ -wxFrame::wxFrame() -{ - m_frameToolBar = NULL ; - m_frameMenuBar = NULL; - m_frameStatusBar = NULL; +// ---------------------------------------------------------------------------- +// static class members +// ---------------------------------------------------------------------------- - m_iconized = FALSE; -} +#if wxUSE_NATIVE_STATUSBAR + bool wxFrame::m_useNativeStatusBar = TRUE; +#else + bool wxFrame::m_useNativeStatusBar = FALSE; +#endif -bool wxFrame::Create( wxWindow *parent - ,wxWindowID id - ,const wxString& title - ,const wxPoint& pos - ,const wxSize& size - ,long style - ,const wxString& name - ) +// ---------------------------------------------------------------------------- +// creation/destruction +// ---------------------------------------------------------------------------- + +void wxFrame::Init() { + m_iconized = FALSE; + #if wxUSE_TOOLTIPS 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) +{ SetName(name); m_windowStyle = style; m_frameMenuBar = NULL; - m_frameToolBar = NULL ; + m_frameToolBar = NULL; m_frameStatusBar = NULL; SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); -// m_icon = NULL; if ( id > -1 ) m_windowId = id; else @@ -94,6 +113,10 @@ bool wxFrame::Create( wxWindow *parent m_iconized = 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; @@ -112,10 +135,9 @@ wxFrame::~wxFrame() m_isBeingDeleted = TRUE; wxTopLevelWindows.DeleteObject(this); - if (m_frameStatusBar) - delete m_frameStatusBar; - if (m_frameMenuBar) - delete m_frameMenuBar; +// TODO: +/* + DeleteAllBars(); if (wxTheApp && (wxTopLevelWindows.Number() == 0)) { @@ -123,8 +145,7 @@ wxFrame::~wxFrame() if (wxTheApp->GetExitOnFrameDelete()) { -// TODO: PostQuitMessage(0); - return; + PostQuitMessage(0); } } @@ -136,27 +157,29 @@ wxFrame::~wxFrame() // 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()) - // TODO: OS/2 PM version - // ::BringWindowToTop((HWND) GetParent()->GetHWND()); -return; + if (GetParent() && GetParent()->GetHWND()) + ::BringWindowToTop((HWND) GetParent()->GetHWND()); +*/ } // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. void wxFrame::DoGetClientSize(int *x, int *y) const { +// TODO: +/* RECT rect; -//TODO: ::GetClientRect(GetHwnd(), &rect); + ::GetClientRect(GetHwnd(), &rect); +#if wxUSE_STATUSBAR if ( GetStatusBar() ) { int statusX, statusY; GetStatusBar()->GetClientSize(&statusX, &statusY); -// TODO: OS/2's rect rect.bottom -= statusY; + rect.bottom -= statusY; } +#endif // wxUSE_STATUSBAR wxPoint pt(GetClientAreaOrigin()); -/* rect.bottom -= pt.y; rect.right -= pt.x; @@ -173,214 +196,192 @@ void wxFrame::DoSetClientSize(int width, int height) { HWND hWnd = GetHwnd(); +// TODO: +/* RECT rect; -// TODO: ::GetClientRect(hWnd, &rect); + ::GetClientRect(hWnd, &rect); RECT rect2; -//TODO: ::GetWindowRect(hWnd, &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 wxUSE_STATUSBAR if ( GetStatusBar() ) { int statusX, statusY; GetStatusBar()->GetClientSize(&statusX, &statusY); -// actual_height += statusY; + actual_height += statusY; } -/* +#endif // wxUSE_STATUSBAR + 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::DoGetSize(int *width, int *height) const { +// TODO: +/* RECT rect; -// TODO: ::GetWindowRect(GetHwnd(), &rect); -// *width = rect.right - rect.left; -// *height = rect.bottom - rect.top; + GetWindowRect(GetHwnd(), &rect); + *width = rect.right - rect.left; + *height = rect.bottom - rect.top; +*/ } void wxFrame::DoGetPosition(int *x, int *y) const { +// TODO: +/* RECT rect; -// TODO: ::GetWindowRect(GetHwnd(), &rect); - POINTL point; -// point.x = rect.left; -// point.y = rect.top; + GetWindowRect(GetHwnd(), &rect); + POINT point; + point.x = rect.left; + point.y = rect.top; *x = point.x; *y = point.y; +*/ } -bool wxFrame::Show(bool show) +// ---------------------------------------------------------------------------- +// variations around ::ShowWindow() +// ---------------------------------------------------------------------------- + +void wxFrame::DoShowWindow(int nShowCmd) { - int cshow; +// TODO: /* - if (show) - cshow = SW_SHOW; - else - cshow = SW_HIDE; + ::ShowWindow(GetHwnd(), nShowCmd); + + m_iconized = nShowCmd == SW_MINIMIZE; */ - if (!show) - { - // Try to highlight the correct window (the parent) - HWND hWndParent = 0; - if (GetParent()) - { - hWndParent = (HWND) GetParent()->GetHWND(); - if (hWndParent) -// TODO: ::BringWindowToTop(hWndParent); - cshow = (int)show; // just to have something here, remove - } - } +} -// TODO: ::ShowWindow(GetHwnd(), (BOOL)cshow); - if (show) - { -// TODO: ::BringWindowToTop(GetHwnd()); +bool wxFrame::Show(bool show) +{ +// TODO: +/* + DoShowWindow(show ? SW_SHOW : SW_HIDE); - wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); - } - return TRUE; + if ( show ) + { + ::BringWindowToTop(GetHwnd()); + + wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); + } + else + { + // Try to highlight the correct window (the parent) + if ( GetParent() ) + { + HWND hWndParent = GetHwndOf(GetParent()); + if (hWndParent) + ::BringWindowToTop(hWndParent); + } + } +*/ + return TRUE; } void wxFrame::Iconize(bool iconize) { - if (!iconize) - Show(TRUE); - - int cshow; -/* - if (iconize) - cshow = SW_MINIMIZE; - else - cshow = SW_RESTORE; - ShowWindow(GetHwnd(), (BOOL)cshow); -*/ - m_iconized = iconize; +// DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE); } -// Equivalent to maximize/restore in Windows void wxFrame::Maximize(bool maximize) { - Show(TRUE); - int cshow; -/* - if (maximize) - cshow = SW_MAXIMIZE; - else - cshow = SW_RESTORE; - ShowWindow(GetHwnd(), cshow); -*/ - m_iconized = FALSE; +// DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE); +} + +void wxFrame::Restore() +{ +// DoShowWindow(SW_RESTORE); } bool wxFrame::IsIconized() const { -// TODO: ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0); +// TODO: +/* + ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0); return m_iconized; +*/ + return FALSE; } // Is it maximized? bool wxFrame::IsMaximized() const { -//TODO: return (::IsZoomed(GetHwnd()) != 0) ; - return FALSE; // remove +// TODO: +/* + return (::IsZoomed(GetHwnd()) != 0); +*/ + return FALSE; } void wxFrame::SetIcon(const wxIcon& icon) { - m_icon = icon; + wxFrameBase::SetIcon(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 *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); - - // 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); + statusBar = wxFrameBase::OnCreateStatusBar(number, style, id, name); - int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); - statusBar->SetSize(-1, -1, 100, height); - statusBar->SetFieldsCount(number); return statusBar; } -wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id, - const wxString& name) -{ - // VZ: calling CreateStatusBar twice is an error - why anyone would do it? - wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, - wxT("recreating status bar in wxFrame") ); - - m_frameStatusBar = OnCreateStatusBar(number, style, id, - name); - if ( m_frameStatusBar ) - { - PositionStatusBar(); - return m_frameStatusBar; - } - else - return NULL; -} - -void wxFrame::SetStatusText(const wxString& text, int number) -{ - 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, wxT("no statusbar to set widths for") ); - - m_frameStatusBar->SetStatusWidths(n, widths_field); - PositionStatusBar(); -} - void wxFrame::PositionStatusBar() { - // 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); - } +// TODO: +/* + // 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 @@ -388,7 +389,7 @@ void wxFrame::DetachMenuBar() { if (m_frameMenuBar) { -// Fix this in wxMenuBar m_frameMenuBar->Detach(); + m_frameMenuBar->Detach(); m_frameMenuBar = NULL; } } @@ -401,12 +402,12 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar) return; } -// Fix this in wxMenuBar wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") ); + wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") ); if (m_frameMenuBar) delete m_frameMenuBar; -// Fix this in wxMenuBar m_hMenu = menu_bar->Create(); + m_hMenu = menu_bar->Create(); if ( !m_hMenu ) return; @@ -414,13 +415,14 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar) InternalSetMenuBar(); m_frameMenuBar = menu_bar; -// Fix this in wxMenuBar menu_bar->Attach(this); + menu_bar->Attach(this); } void wxFrame::InternalSetMenuBar() { // TODO: -/* if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) +/* + if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) { wxLogLastError("SetMenu"); } @@ -430,6 +432,8 @@ void wxFrame::InternalSetMenuBar() // Responds to colour changes, and passes event on to children. void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { +// TODO: +/* SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); @@ -442,6 +446,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) // Propagate the event to the non-top-level children wxWindow::OnSysColourChanged(event); +*/ } /* @@ -457,6 +462,7 @@ bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow // 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; @@ -509,7 +515,7 @@ bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow extendedStyle |= WS_EX_TOPMOST; m_iconized = FALSE; - if ( !wxWindow::OS2Create(id, parent, wclass, wx_win, title, x, y, width, height, + if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height, msflags, NULL, extendedStyle) ) return FALSE; @@ -521,53 +527,6 @@ bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow return TRUE; } -// 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; - } -#endif - - // do we have _exactly_ one child? - wxWindow *child = NULL; - for ( wxWindowList::Node *node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - 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); - - int x = 0; - int y = 0; - - child->SetSize(x, y, clientW, clientH); - } -} - // Default activation behaviour - set the focus for the first child // subwindow found. void wxFrame::OnActivate(wxActivateEvent& event) @@ -597,70 +556,11 @@ void wxFrame::OnActivate(wxActivateEvent& event) } } -// The default implementation for the close window event. -void wxFrame::OnCloseWindow(wxCloseEvent& event) -{ - Destroy(); -} - -// Destroy the window (delayed, if a managed window) -bool wxFrame::Destroy() -{ - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); - return TRUE; -} - -// Default menu selection behaviour - display a help string -void wxFrame::OnMenuHighlight(wxMenuEvent& event) -{ - if (GetStatusBar()) - { - wxString help; - int menuId = event.GetMenuId(); - if ( menuId != -1 ) - { - wxMenuBar *menuBar = GetMenuBar(); -// Fix this in wxMenuBar -/* - if (menuBar && menuBar->FindItem(menuId)) - { - 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); - } -} - -wxMenuBar *wxFrame::GetMenuBar() const -{ - return m_frameMenuBar; -} - -bool wxFrame::ProcessCommand(int id) -{ - wxMenuBar *bar = GetMenuBar() ; - if ( !bar ) - return FALSE; - - wxMenuItem *item = bar->FindItemForId(id); - - if ( item && item->IsCheckable() ) - { - bar->Check(id, !bar->IsChecked(id)) ; - } - - wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); - commandEvent.SetInt( id ); - commandEvent.SetEventObject( this ); - - return GetEventHandler()->ProcessEvent(commandEvent); -} +// ---------------------------------------------------------------------------- +// wxFrame size management: we exclude the areas taken by menu/status/toolbars +// from the client area, so the client area is what's really available for the +// frame contents +// ---------------------------------------------------------------------------- // Checks if there is a toolbar, and returns the first free client position wxPoint wxFrame::GetClientAreaOrigin() const @@ -685,7 +585,7 @@ wxPoint wxFrame::GetClientAreaOrigin() 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 @@ -707,61 +607,63 @@ void wxFrame::DoClientToScreen(int *x, int *y) const wxWindow::DoClientToScreen(x, y); } +// ---------------------------------------------------------------------------- +// tool/status bar stuff +// ---------------------------------------------------------------------------- + #if wxUSE_TOOLBAR + wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { - wxCHECK_MSG( m_frameToolBar == NULL, FALSE, - wxT("recreating toolbar in wxFrame") ); - - wxToolBar* toolBar = OnCreateToolBar(style, id, name); - if (toolBar) + if ( wxFrameBase::CreateToolBar(style, id, name) ) { - SetToolBar(toolBar); PositionToolBar(); - return toolBar; - } - else - { - return NULL; } -} -wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name) -{ - return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name); + return m_frameToolBar; } void wxFrame::PositionToolBar() { +// TODO: +/* RECT rect; -// TODO: ::GetClientRect(GetHwnd(), &rect); + ::GetClientRect(GetHwnd(), &rect); +#if wxUSE_STATUSBAR if ( GetStatusBar() ) { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); -// TODO: rect.bottom -= statusY; + int statusX, statusY; + GetStatusBar()->GetClientSize(&statusX, &statusY); + rect.bottom -= statusY; } +#endif // wxUSE_STATUSBAR - if (GetToolBar()) + if ( GetToolBar() ) { int tw, th; - GetToolBar()->GetSize(& tw, & th); + GetToolBar()->GetSize(&tw, &th); - if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) + if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) { - // Use the 'real' MSW position - GetToolBar()->SetSize(0, 0, tw, rect.yBottom, wxSIZE_NO_ADJUSTMENTS); + th = rect.bottom; } else { - // Use the 'real' MSW position - GetToolBar()->SetSize(0, 0, rect.xRight, th, wxSIZE_NO_ADJUSTMENTS); + tw = rect.right; } + + // Use the 'real' MSW position here + GetToolBar()->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS); } +*/ } #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 @@ -780,20 +682,6 @@ void wxFrame::IconizeChildFrames(bool 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 // =========================================================================== @@ -804,17 +692,18 @@ void wxFrame::MakeModal(bool modal) bool wxFrame::OS2TranslateMessage(WXMSG* pMsg) { -// TODO: if ( wxWindow::OS2TranslateMessage(pMsg) ) -// return TRUE; - +// TODO: +/* + if ( wxWindow::OS2TranslateMessage(pMsg) ) + return TRUE; +*/ // try the menu bar accels wxMenuBar *menuBar = GetMenuBar(); if ( !menuBar ) return FALSE; -// TODO: const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable(); -// return acceleratorTable.Translate(this, pMsg); - return TRUE; + const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable(); + return acceleratorTable.Translate(this, pMsg); } // --------------------------------------------------------------------------- @@ -823,60 +712,64 @@ bool wxFrame::OS2TranslateMessage(WXMSG* pMsg) bool wxFrame::HandlePaint() { - RECT rect; // TODO: -// if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) -// { -// if ( m_iconized ) -// { -// HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) -// : (HICON)m_defaultIcon; -// +/* + 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 -// OS2DefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L); -// -// if ( hIcon ) -// { -// RECT rect; -// TODO: ::GetClientRect(GetHwnd(), &rect); + 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); -// -// TODO: ::DrawIcon(hdc, icon_x, icon_y, hIcon); -// } -// -// TODO: ::EndPaint(GetHwnd(), &ps); -// -// return TRUE; -// } -// else -// { -// return wxWindow::HandlePaint(); -// } -// } -// else -// { -// // nothing to paint - processed -// return TRUE; -// } - return TRUE; + 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; -/* switch ( id ) +// TODO: +/* + switch ( id ) { case SIZENORMAL: // only do it it if we were iconized before, otherwise resizing the @@ -901,9 +794,20 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) m_iconized = TRUE; break; } -*/ + if ( !m_iconized ) { + // 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); + } +#endif // wxUSE_NATIVE_STATUSBAR + PositionStatusBar(); PositionToolBar(); @@ -911,19 +815,20 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) event.SetEventObject( this ); processed = GetEventHandler()->ProcessEvent(event); } - +*/ return processed; } bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) { +// TODO: +/* if ( control ) { // In case it's e.g. a toolbar. wxWindow *win = wxFindWinFromHandle(control); if ( win ) -// TODO: return win->OS2Command(cmd, id); - return TRUE; + return win->MSWCommand(cmd, id); } // handle here commands from menus and accelerators @@ -934,8 +839,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) wxMenu *popupMenu = wxCurrentPopupMenu; wxCurrentPopupMenu = NULL; -// return popupMenu->OS2Command(cmd, id); - return TRUE; + return popupMenu->MSWCommand(cmd, id); } if ( ProcessCommand(id) ) @@ -943,7 +847,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) return TRUE; } } - +*/ return FALSE; } @@ -955,19 +859,19 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) // 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 ); @@ -980,7 +884,7 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) MRESULT wxFrame::OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - MRESULT rc = 0; + long rc = 0; bool processed = FALSE; // TODO: @@ -1031,10 +935,12 @@ MRESULT wxFrame::OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPA processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam); break; } -*/ + if ( !processed ) - rc = wxWindow::OS2WindowProc(hwnd, message, wParam, lParam); + rc = wxWindow::MSWWindowProc(message, wParam, lParam); return rc; +*/ + return (MRESULT)0; }