X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb8a56b77ce195d0bd9ac6984e3e5cbb7136faca..21a7ac1820e0ae5694f925321cdcd4fc792da6df:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index fd160920d6..73f53067bf 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -46,6 +46,12 @@ #include #endif +#if defined(__POCKETPC__) || defined(__SMARTPHONE__) +#include "wx/msw/ole/oleutils.h" +#include +#include "wx/msw/winundef.h" +#endif + #if wxUSE_STATUSBAR #include "wx/statusbr.h" #include "wx/generic/statusbr.h" @@ -91,7 +97,7 @@ wxBEGIN_FLAGS( wxFrameStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -141,7 +147,7 @@ wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxFrame) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) +wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) #else IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) @@ -157,9 +163,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) #if wxUSE_STATUSBAR #if wxUSE_NATIVE_STATUSBAR - bool wxFrame::m_useNativeStatusBar = TRUE; + bool wxFrame::m_useNativeStatusBar = true; #else - bool wxFrame::m_useNativeStatusBar = FALSE; + bool wxFrame::m_useNativeStatusBar = false; #endif #endif // wxUSE_NATIVE_STATUSBAR @@ -169,16 +175,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) void wxFrame::Init() { +#if wxUSE_MENUS + m_hMenu = NULL; +#endif // wxUSE_MENUS + #if wxUSE_TOOLTIPS m_hwndToolTip = 0; #endif - // Data to save/restore when calling ShowFullScreen - m_fsStatusBarFields = 0; - m_fsStatusBarHeight = 0; - m_fsToolBarHeight = 0; +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + SHACTIVATEINFO* info = new SHACTIVATEINFO; + memset(info, 0, sizeof(SHACTIVATEINFO)); + info->cbSize = sizeof(SHACTIVATEINFO); + + m_activateInfo = (void*) info; +#endif - m_wasMinimized = FALSE; + m_wasMinimized = false; } bool wxFrame::Create(wxWindow *parent, @@ -190,17 +203,36 @@ bool wxFrame::Create(wxWindow *parent, const wxString& name) { if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) - return FALSE; + return false; - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); + SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); + +#if defined(__SMARTPHONE__) + SetLeftMenu(wxID_EXIT, _("Done")); +#endif + +#if defined(__POCKETPC__) + // The guidelines state that Ctrl+Q should quit the app. + // Let's define an accelerator table to send wxID_EXIT. + wxAcceleratorEntry entries[1]; + entries[0].Set(wxACCEL_CTRL, 'Q', wxID_EXIT); + wxAcceleratorTable accel(1, entries); + SetAcceleratorTable(accel); +#endif - return TRUE; + return true; } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; DeleteAllBars(); + +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo; + delete info; + m_activateInfo = NULL; +#endif } // ---------------------------------------------------------------------------- @@ -280,7 +312,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, wxWindowID id, const wxString& name) { - wxStatusBar *statusBar = NULL; + wxStatusBar *statusBar wxDUMMY_INITIALIZE(NULL); #if wxUSE_NATIVE_STATUSBAR if ( !UsesNativeStatusBar() ) @@ -318,22 +350,34 @@ void wxFrame::PositionStatusBar() void wxFrame::AttachMenuBar(wxMenuBar *menubar) { -#if defined(__SMARTPHONE__) - wxMenu *autoMenu = new wxMenu; +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) - for( size_t n = 0; n < menubar->GetMenuCount(); n++ ) + wxMenu *autoMenu = NULL; + + if( menubar->GetMenuCount() == 1 ) + { + autoMenu = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(menubar->GetMenu(0)); + SetRightMenu(wxID_ANY, menubar->GetLabelTop(0), autoMenu); + } + else { - wxMenu *item = menubar->GetMenu(n); - wxString label = menubar->GetLabelTop(n); - wxMenu *new_item = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(item); - autoMenu->Append(wxID_ANY, label, new_item); + autoMenu = new wxMenu; + + for( size_t n = 0; n < menubar->GetMenuCount(); n++ ) + { + wxMenu *item = menubar->GetMenu(n); + wxString label = menubar->GetLabelTop(n); + wxMenu *new_item = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(item); + autoMenu->Append(wxID_ANY, label, new_item); + } + + SetRightMenu(wxID_ANY, _("Menu"), autoMenu); } - SetRightMenu(wxID_ANY, _("Menu"), autoMenu); #elif defined(WINCE_WITHOUT_COMMANDBAR) if (!GetToolBar()) { - wxToolBar* toolBar = new wxToolBar(this, -1, + wxToolMenuBar* toolBar = new wxToolMenuBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxTB_HORIZONTAL, wxToolBarNameStr, menubar); @@ -352,7 +396,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar) // adjust for menu / titlebar height rc.bottom -= (2*menuHeight-1); - MoveWindow((HWND) GetHWND(), rc.left, rc.top, rc.right, rc.bottom, FALSE); + ::MoveWindow((HWND) GetHWND(), rc.left, rc.top, rc.right, rc.bottom, FALSE); } #endif @@ -404,7 +448,7 @@ void wxFrame::InternalSetMenuBar() // Responds to colour changes, and passes event on to children. void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); + SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); #if wxUSE_STATUSBAR @@ -420,95 +464,78 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) wxWindow::OnSysColourChanged(event); } -// Pass TRUE to show full screen, FALSE to restore. +// Pass true to show full screen, false to restore. bool wxFrame::ShowFullScreen(bool show, long style) { + // TODO-CE: add support for CE +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) if ( IsFullScreen() == show ) - return FALSE; + return false; if (show) { + // zap the toolbar, menubar, and statusbar if needed + // + // TODO: hide commandbar for WINCE_WITH_COMMANDBAR #if wxUSE_TOOLBAR - -#if defined(WINCE_WITH_COMMANDBAR) - // TODO: hide commandbar -#else wxToolBar *theToolBar = GetToolBar(); - if (theToolBar) - theToolBar->GetSize(NULL, &m_fsToolBarHeight); - - // zap the toolbar, menubar, and statusbar if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar) { - theToolBar->SetSize(-1,0); - theToolBar->Show(FALSE); + if ( theToolBar->IsShown() ) + { + theToolBar->SetSize(wxDefaultCoord,0); + theToolBar->Show(false); + } + else // prevent it from being restored later + { + style &= ~wxFULLSCREEN_NOTOOLBAR; + } } -#endif // __WXWINCE__ #endif // wxUSE_TOOLBAR -#if defined(__WXMICROWIN__) -#elif defined(__WXWINCE__) - // TODO: make it work for WinCE -#else if (style & wxFULLSCREEN_NOMENUBAR) SetMenu((HWND)GetHWND(), (HMENU) NULL); -#endif #if wxUSE_STATUSBAR wxStatusBar *theStatusBar = GetStatusBar(); - if (theStatusBar) - theStatusBar->GetSize(NULL, &m_fsStatusBarHeight); // Save the number of fields in the statusbar if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar) { - //m_fsStatusBarFields = theStatusBar->GetFieldsCount(); - //SetStatusBar((wxStatusBar*) NULL); - //delete theStatusBar; - theStatusBar->Show(FALSE); + if ( theStatusBar->IsShown() ) + theStatusBar->Show(false); + else + style &= ~wxFULLSCREEN_NOSTATUSBAR; } - else - m_fsStatusBarFields = 0; #endif // wxUSE_STATUSBAR } - else + else // restore to normal { + // restore the toolbar, menubar, and statusbar if we had hid them #if wxUSE_TOOLBAR -#if defined(WINCE_WITHOUT_COMMANDBAR) - // TODO: show commandbar -#else wxToolBar *theToolBar = GetToolBar(); - // restore the toolbar, menubar, and statusbar - if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR)) + if ((m_fsStyle & wxFULLSCREEN_NOTOOLBAR) && theToolBar) { - theToolBar->SetSize(-1, m_fsToolBarHeight); - theToolBar->Show(TRUE); + theToolBar->Show(true); } -#endif // __WXWINCE__ #endif // wxUSE_TOOLBAR + if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && m_hMenu) + ::SetMenu(GetHwnd(), (HMENU)m_hMenu); + #if wxUSE_STATUSBAR - if ( m_fsStyle & wxFULLSCREEN_NOSTATUSBAR ) + wxStatusBar *theStatusBar = GetStatusBar(); + + if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar) { - //CreateStatusBar(m_fsStatusBarFields); - if (GetStatusBar()) - { - GetStatusBar()->Show(TRUE); - PositionStatusBar(); - } + theStatusBar->Show(true); + PositionStatusBar(); } #endif // wxUSE_STATUSBAR - -#if defined(__WXMICROWIN__) -#elif defined(__WXWINCE__) - // TODO: make it work for WinCE -#else - if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) - SetMenu((HWND)GetHWND(), (HMENU)m_hMenu); -#endif } +#endif // !defined(__WXMICROWIN__) && !defined(__WXWINCE__) return wxFrameBase::ShowFullScreen(show, style); } @@ -574,13 +601,13 @@ void wxFrame::PositionToolBar() int tw, th; toolbar->GetPosition(&tx, &ty); toolbar->GetSize(&tw, &th); - + // Adjust if (ty < 0 && (-ty == th)) ty = 0; if (tx < 0 && (-tx == tw)) - tx = 0; - + tx = 0; + int desiredW = tw; int desiredH = th; @@ -593,23 +620,23 @@ void wxFrame::PositionToolBar() desiredW = width; // if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT ) // desiredW -= 3; - } + } // use the 'real' MSW position here, don't offset relativly to the // client area origin // Optimise such that we don't have to always resize the toolbar - // when the frame changes, otherwise we'll get a lot of flicker. - bool heightChanging = TRUE; - bool widthChanging = TRUE; - + // when the frame changes, otherwise we'll get a lot of flicker. + bool heightChanging wxDUMMY_INITIALIZE(true); + bool widthChanging wxDUMMY_INITIALIZE(true); + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) { // It's OK if the current height is greater than what can be shown. heightChanging = (desiredH > th) ; widthChanging = (desiredW != tw) ; - - // The next time around, we may not have to set the size + + // The next time around, we may not have to set the size if (heightChanging) desiredH = desiredH + 200; } @@ -619,14 +646,14 @@ void wxFrame::PositionToolBar() widthChanging = (desiredW > tw) ; heightChanging = (desiredH != th) ; - // The next time around, we may not have to set the size + // The next time around, we may not have to set the size if (widthChanging) desiredW = desiredW + 200; } - + if (tx != 0 || ty != 0 || widthChanging || heightChanging) toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS); - + #endif // __WXWINCE__ } } @@ -642,6 +669,8 @@ void wxFrame::PositionToolBar() // on the desktop, but are iconized/restored with it void wxFrame::IconizeChildFrames(bool bIconize) { + m_iconized = bIconize; + for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext() ) @@ -663,7 +692,7 @@ void wxFrame::IconizeChildFrames(bool bIconize) wxFrame *frame = wxDynamicCast(win, wxFrame); if ( frame #if wxUSE_MDI_ARCHITECTURE - && !wxDynamicCast(frame, wxMDIChildFrame) + && !frame->IsMDIChild() #endif // wxUSE_MDI_ARCHITECTURE ) { @@ -701,18 +730,18 @@ WXHICON wxFrame::GetDefaultIcon() const bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) { if ( wxWindow::MSWTranslateMessage(pMsg) ) - return TRUE; + return true; #if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__) // try the menu bar accels wxMenuBar *menuBar = GetMenuBar(); if ( !menuBar ) - return FALSE; + return false; const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable(); return acceleratorTable.Translate(this, pMsg); #else - return FALSE; + return false; #endif // wxUSE_MENUS && wxUSE_ACCEL } @@ -723,7 +752,7 @@ bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) bool wxFrame::HandlePaint() { RECT rect; - if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) + if ( ::GetUpdateRect(GetHwnd(), &rect, FALSE) ) { #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) if ( m_iconized ) @@ -757,7 +786,7 @@ bool wxFrame::HandlePaint() ::EndPaint(GetHwnd(), &ps); - return TRUE; + return true; } else #endif @@ -768,18 +797,17 @@ bool wxFrame::HandlePaint() else { // nothing to paint - processed - return TRUE; + return true; } } -bool wxFrame::HandleSize(int x, int y, WXUINT id) +bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id) { - bool processed = FALSE; #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) - switch ( id ) { - case SIZENORMAL: + case SIZE_RESTORED: + case SIZE_MAXIMIZED: // 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 @@ -787,26 +815,19 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) break; // restore all child frames too - IconizeChildFrames(FALSE); - - (void)SendIconizeEvent(FALSE); + IconizeChildFrames(false); - // fall through - - case SIZEFULLSCREEN: - m_iconized = FALSE; + (void)SendIconizeEvent(false); break; - case SIZEICONIC: + case SIZE_MINIMIZED: // iconize all child frames too - IconizeChildFrames(TRUE); - - (void)SendIconizeEvent(); - - m_iconized = TRUE; + IconizeChildFrames(true); break; } -#endif +#else + wxUnusedVar(id); +#endif // !__WXWINCE__ if ( !m_iconized ) { @@ -832,13 +853,11 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) } } -#endif - - - processed = wxWindow::HandleSize(x, y, id); +#endif // WINCE_WITH_COMMANDBAR } - return processed; + // call the base class version to generate the appropriate events + return false; } bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) @@ -864,21 +883,21 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) } #endif // wxUSE_MENUS_NATIVE -#ifdef __SMARTPHONE__ +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) // handle here commands from Smartphone menu bar if ( wxTopLevelWindow::HandleCommand(id, cmd, control ) ) { return true; } -#endif // __SMARTPHONE__ +#endif // __SMARTPHONE__ && __WXWINCE__ if ( ProcessCommand(id) ) { - return TRUE; + return true; } } - return FALSE; + return false; } bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) @@ -901,9 +920,9 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) // items opening popup menus (they don't have them anyhow) but do clear // the status line - otherwise, we would be left with the help message // for the previous item which doesn't apply any more - DoGiveHelp(wxEmptyString, FALSE); + DoGiveHelp(wxEmptyString, false); - return FALSE; + return false; } wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item); @@ -929,10 +948,43 @@ bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup) WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { WXLRESULT rc = 0; - bool processed = FALSE; + bool processed = false; switch ( message ) { +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + case WM_ACTIVATE: + { + SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo; + if (info) + SHHandleWMActivate(GetHwnd(), wParam, lParam, info, FALSE); + + // This implicitly sends a wxEVT_ACTIVATE_APP event + if (wxTheApp) + wxTheApp->SetActive(wParam != 0, FindFocus()); + break; + } + case WM_SETTINGCHANGE: + { + SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo; + if (info) + SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info); + processed = true; + break; + } + case WM_HIBERNATE: + { + wxActivateEvent event(wxEVT_HIBERNATE, true, wxID_ANY); + event.SetEventObject(wxTheApp); + + if (wxTheApp) + { + processed = wxTheApp->ProcessEvent(event); + } + break; + } +#endif + case WM_CLOSE: // if we can't close, tell the system that we processed the // message - otherwise it would close us @@ -974,7 +1026,7 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara break; case WM_EXITMENULOOP: - processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam); + processed = HandleMenuLoop(wxEVT_MENU_CLOSE, (WXWORD)wParam); break; case WM_QUERYDRAGICON: @@ -1011,7 +1063,7 @@ bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu) } } } - + wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu); event.SetEventObject(this);