X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f361cddbfcff9c54eef6b8c447d2b93ee2825f5..42d11c8e66149da692edaddcffc4c67cfa7ca496:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 99f1e9c763..f2dff269be 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,6 +42,10 @@ #include "wx/msw/private.h" +#ifdef __WXWINCE__ +#include +#endif + #if wxUSE_STATUSBAR #include "wx/statusbr.h" #include "wx/generic/statusbr.h" @@ -72,7 +76,6 @@ // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) - EVT_ACTIVATE(wxFrame::OnActivate) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() @@ -103,16 +106,16 @@ void wxFrame::Init() #if wxUSE_TOOLTIPS m_hwndToolTip = 0; #endif +#ifdef __WXWINCE__ + m_commandBar = 0; +#endif // Data to save/restore when calling ShowFullScreen m_fsStatusBarFields = 0; m_fsStatusBarHeight = 0; m_fsToolBarHeight = 0; -// m_fsMenu = 0; m_wasMinimized = FALSE; - - m_winLastFocused = (wxWindow *)NULL; } bool wxFrame::Create(wxWindow *parent, @@ -136,8 +139,11 @@ bool wxFrame::Create(wxWindow *parent, wxFrame::~wxFrame() { m_isBeingDeleted = TRUE; - DeleteAllBars(); +#ifdef __WXWINCE__ + RemoveCommandBar(); +#endif + } // ---------------------------------------------------------------------------- @@ -195,12 +201,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const void wxFrame::Raise() { -#ifdef __WIN16__ - // no SetForegroundWindow() in Win16 - wxFrameBase::Raise(); -#else // Win32 ::SetForegroundWindow(GetHwnd()); -#endif // Win16/32 } // generate an artificial resize event @@ -292,7 +293,23 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar) void wxFrame::InternalSetMenuBar() { -#ifndef __WXMICROWIN__ +#ifdef __WXMICROWIN__ + // Nothing +#elif defined(__WXWINCE__) + + CreateCommandBar() ; + + if (m_commandBar) + { + if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL, + (LPTSTR) (HMENU) m_hMenu, 0)) + { + wxFAIL_MSG( _T("failed to set menubar") ); + return; + } + CommandBar_DrawMenuBar((HWND) m_commandBar, 0); + } +#else if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) { wxLogLastError(wxT("SetMenu")); @@ -324,12 +341,15 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) // Pass TRUE to show full screen, FALSE to restore. bool wxFrame::ShowFullScreen(bool show, long style) { - if ( IsFullScreen() == show ) + if ( IsFullScreen() == show ) return FALSE; if (show) { #if wxUSE_TOOLBAR +#ifdef __WXWINCE__ + // TODO: hide commandbar +#else wxToolBar *theToolBar = GetToolBar(); if (theToolBar) theToolBar->GetSize(NULL, &m_fsToolBarHeight); @@ -341,9 +361,11 @@ bool wxFrame::ShowFullScreen(bool show, long style) theToolBar->SetSize(-1,0); theToolBar->Show(FALSE); } +#endif // __WXWINCE__ #endif // wxUSE_TOOLBAR -#ifndef __WXMICROWIN__ + // TODO: make it work for WinCE +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) if (style & wxFULLSCREEN_NOMENUBAR) SetMenu((HWND)GetHWND(), (HMENU) NULL); #endif @@ -368,6 +390,9 @@ bool wxFrame::ShowFullScreen(bool show, long style) else { #if wxUSE_TOOLBAR +#ifdef __WXWINCE__ + // TODO: show commandbar +#else wxToolBar *theToolBar = GetToolBar(); // restore the toolbar, menubar, and statusbar @@ -376,6 +401,7 @@ bool wxFrame::ShowFullScreen(bool show, long style) theToolBar->SetSize(-1, m_fsToolBarHeight); theToolBar->Show(TRUE); } +#endif // __WXWINCE__ #endif // wxUSE_TOOLBAR #if wxUSE_STATUSBAR @@ -390,63 +416,14 @@ bool wxFrame::ShowFullScreen(bool show, long style) } #endif // wxUSE_STATUSBAR -#ifndef __WXMICROWIN__ + // TODO: make it work for WinCE +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) SetMenu((HWND)GetHWND(), (HMENU)m_hMenu); #endif } - - return wxFrameBase::ShowFullScreen(show, style); -} - -// Default activation behaviour - set the focus for the first child -// subwindow found. -void wxFrame::OnActivate(wxActivateEvent& event) -{ - if ( event.GetActive() ) - { - // restore focus to the child which was last focused - wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd); - - wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() - : NULL; - if ( !parent ) - { - parent = this; - } - - wxSetFocusToChild(parent, &m_winLastFocused); - } - else // deactivating - { - // remember the last focused child if it is our child - m_winLastFocused = FindFocus(); - - // so we NULL it out if it's a child from some other frame - wxWindow *win = m_winLastFocused; - while ( win ) - { - if ( win->IsTopLevel() ) - { - if ( win != this ) - { - m_winLastFocused = NULL; - } - - break; - } - - win = win->GetParent(); - } - wxLogTrace(_T("focus"), - _T("wxFrame %08x deactivated, last focused: %08x."), - m_hWnd, - m_winLastFocused ? GetHwndOf(m_winLastFocused) - : NULL); - - event.Skip(); - } + return wxFrameBase::ShowFullScreen(show, style); } // ---------------------------------------------------------------------------- @@ -470,6 +447,12 @@ void wxFrame::PositionToolBar() wxToolBar *toolbar = GetToolBar(); if ( toolbar && toolbar->IsShown() ) { +#ifdef __WXWINCE__ + // We want to do something different in WinCE, because + // the toolbar should be associated with the commandbar, + // and not an independent window. + // TODO +#else // don't call our (or even wxTopLevelWindow) version because we want // the real (full) client area size, not excluding the tool/status bar int width, height; @@ -500,6 +483,7 @@ void wxFrame::PositionToolBar() // use the 'real' MSW position here, don't offset relativly to the // client area origin toolbar->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS); +#endif // __WXWINCE__ } } @@ -514,7 +498,7 @@ void wxFrame::PositionToolBar() // on the desktop, but are iconized/restored with it void wxFrame::IconizeChildFrames(bool bIconize) { - for ( wxWindowList::Node *node = GetChildren().GetFirst(); + for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext() ) { @@ -560,8 +544,8 @@ void wxFrame::IconizeChildFrames(bool bIconize) WXHICON wxFrame::GetDefaultIcon() const { - return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON - : wxDEFAULT_FRAME_ICON); + // we don't have any standard icons (any more) + return (WXHICON)0; } // =========================================================================== @@ -599,7 +583,7 @@ bool wxFrame::HandlePaint() RECT rect; if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) { -#ifndef __WXMICROWIN__ +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) if ( m_iconized ) { const wxIcon& icon = GetIcon(); @@ -649,7 +633,7 @@ bool wxFrame::HandlePaint() bool wxFrame::HandleSize(int x, int y, WXUINT id) { bool processed = FALSE; -#ifndef __WXMICROWIN__ +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) switch ( id ) { @@ -807,7 +791,11 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) processed = HandlePaint(); break; -#ifndef __WXMICROWIN__ + case WM_INITMENUPOPUP: + processed = HandleInitMenuPopup((WXHMENU) wParam); + break; + +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) case WM_MENUSELECT: { WXWORD item, flags; @@ -818,15 +806,9 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) } break; -#ifndef __WIN16__ - case WM_ENTERMENULOOP: - processed = HandleMenuLoop(wxEVT_MENU_OPEN, wParam); - break; - case WM_EXITMENULOOP: processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam); break; -#endif // __WIN16__ case WM_QUERYDRAGICON: { @@ -841,8 +823,57 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) } if ( !processed ) - rc = wxWindow::MSWWindowProc(message, wParam, lParam); + rc = wxFrameBase::MSWWindowProc(message, wParam, lParam); return rc; } +// handle WM_INITMENUPOPUP message +bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu) +{ + wxMenu* menu = NULL; + if (GetMenuBar()) + { + int nCount = GetMenuBar()->GetMenuCount(); + for (int n = 0; n < nCount; n++) + { + if (GetMenuBar()->GetMenu(n)->GetHMenu() == hMenu) + { + menu = GetMenuBar()->GetMenu(n); + break; + } + } + } + + wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu); + event.SetEventObject(this); + + return GetEventHandler()->ProcessEvent(event); +} + +#ifdef __WXWINCE__ +WXHWND wxFrame::CreateCommandBar() +{ + if (m_commandBar) + return m_commandBar; + + m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), GetHwnd(), NewControlId()); + if (!m_commandBar) + { + wxFAIL_MSG( _T("failed to create commandbar") ); + return 0; + } + return m_commandBar; +} + +void wxFrame::RemoveCommandBar() +{ + if (m_commandBar) + { + ::DestroyWindow((HWND) m_commandBar); + m_commandBar = NULL; + } +} +#endif + +