X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..2b0246530d08cf7724d94c70d631c166f9717c2c:/src/msw/toplevel.cpp diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 83212f896e..f5689a3aab 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/toplevel.cpp +// Name: src/msw/toplevel.cpp // Purpose: implements wxTopLevelWindow for MSW // Author: Vadim Zeitlin // Modified by: @@ -144,6 +144,14 @@ void wxTopLevelWindowMSW::Init() #if defined(__SMARTPHONE__) && defined(__WXWINCE__) m_MenuBarHWND = 0; #endif + +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + SHACTIVATEINFO* info = new SHACTIVATEINFO; + wxZeroMemory(*info); + info->cbSize = sizeof(SHACTIVATEINFO); + + m_activateInfo = (void*) info; +#endif } WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const @@ -205,7 +213,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const if ( style & wxMAXIMIZE_BOX ) msflags |= WS_MAXIMIZEBOX; -#ifndef __WXWINCE__ +#ifndef __WXWINCE__ if ( style & wxSYSTEM_MENU ) msflags |= WS_SYSMENU; #endif @@ -304,6 +312,63 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const return (WXHWND)hwndParent; } +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) +bool wxTopLevelWindowMSW::HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam) +{ + SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo; + if (!info) return false; + return SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info) == TRUE; +} +#endif + +WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +{ + WXLRESULT rc = 0; + bool processed = false; + +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + switch ( message ) + { + case WM_ACTIVATE: + { + SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo; + if (info) + { + DWORD flags = 0; + if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) flags = SHA_INPUTDIALOG; + SHHandleWMActivate(GetHwnd(), wParam, lParam, info, flags); + } + + // This implicitly sends a wxEVT_ACTIVATE_APP event + if (wxTheApp) + wxTheApp->SetActive(wParam != 0, FindFocus()); + + break; + } + case WM_SETTINGCHANGE: + { + processed = HandleSettingChange(wParam,lParam); + break; + } + case WM_HIBERNATE: + { + if (wxTheApp) + { + wxActivateEvent event(wxEVT_HIBERNATE, true, wxID_ANY); + event.SetEventObject(wxTheApp); + processed = wxTheApp->ProcessEvent(event); + } + break; + } + } +#endif + + if ( !processed ) + rc = wxTopLevelWindowBase::MSWWindowProc(message, wParam, lParam); + + return rc; +} + bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, const wxString& title, const wxPoint& pos, @@ -414,11 +479,11 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, } SubclassWin(m_hWnd); - + #ifdef __SMARTPHONE__ // Work around title non-display glitch Show(false); -#endif +#endif return true; #endif // __WXMICROWIN__/!__WXMICROWIN__ @@ -529,7 +594,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, // focus rectangles) work under Win2k+ if ( ret ) { - MSWUpdateUIState(); + MSWUpdateUIState(UIS_INITIALIZE); } // Note: if we include PocketPC in this test, dialogs can fail to show up, @@ -550,6 +615,12 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, wxTopLevelWindowMSW::~wxTopLevelWindowMSW() { +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo; + delete info; + m_activateInfo = NULL; +#endif + // after destroying an owned window, Windows activates the next top level // window in Z order but it may be different from our owner (to reproduce // this simply Alt-TAB to another application and back before closing the @@ -618,25 +689,6 @@ bool wxTopLevelWindowMSW::Show(bool show) frame->GetMenuBar()->AddAdornments(GetWindowStyleFlag()); #endif - if ( show ) - { - ::BringWindowToTop(GetHwnd()); - - wxActivateEvent event(wxEVT_ACTIVATE, true, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); - } - else // hide - { - // Try to highlight the correct window (the parent) - if ( GetParent() ) - { - HWND hWndParent = GetHwndOf(GetParent()); - if (hWndParent) - ::BringWindowToTop(hWndParent); - } - } - return true; } @@ -813,6 +865,16 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) // wxTopLevelWindowMSW misc // ---------------------------------------------------------------------------- +void wxTopLevelWindowMSW::SetTitle( const wxString& title) +{ + SetLabel(title); +} + +wxString wxTopLevelWindowMSW::GetTitle() const +{ + return GetLabel(); +} + void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); @@ -822,7 +884,7 @@ void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons) { wxTopLevelWindowBase::SetIcons(icons); -#if defined(__WIN95__) && !defined(__WXMICROWIN__) +#if !defined(__WXMICROWIN__) const wxIcon& sml = icons.GetIcon( wxSize( 16, 16 ) ); if( sml.Ok() && sml.GetWidth() == 16 && sml.GetHeight() == 16 ) { @@ -836,7 +898,7 @@ void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons) ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_BIG, (LPARAM)GetHiconOf(big) ); } -#endif // __WIN95__ +#endif // !__WXMICROWIN__ } bool wxTopLevelWindowMSW::EnableCloseButton(bool enable) @@ -1028,40 +1090,55 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event) LONG APIENTRY _EXPORT wxDlgProc(HWND hDlg, UINT message, - WPARAM WXUNUSED(wParam), - LPARAM WXUNUSED(lParam)) + WPARAM wParam, + LPARAM lParam) { - if ( message == WM_INITDIALOG ) + switch ( message ) { - // under CE, add a "Ok" button in the dialog title bar and make it full - // screen - // - // TODO: find the window for this HWND, and take into account - // wxMAXIMIZE and wxCLOSE_BOX. For now, assume both are present. - // - // Standard SDK doesn't have aygshell.dll: see - // include/wx/msw/wince/libraries.h + case WM_INITDIALOG: + { + // under CE, add a "Ok" button in the dialog title bar and make it full + // screen + // + // TODO: find the window for this HWND, and take into account + // wxMAXIMIZE and wxCLOSE_BOX. For now, assume both are present. + // + // Standard SDK doesn't have aygshell.dll: see + // include/wx/msw/wince/libraries.h #if defined(__WXWINCE__) && !defined(__WINCE_STANDARDSDK__) && !defined(__HANDHELDPC__) - SHINITDLGINFO shidi; - shidi.dwMask = SHIDIM_FLAGS; - shidi.dwFlags = SHIDIF_SIZEDLG // take account of the SIP or menubar + SHINITDLGINFO shidi; + shidi.dwMask = SHIDIM_FLAGS; + shidi.dwFlags = SHIDIF_SIZEDLG // take account of the SIP or menubar #ifndef __SMARTPHONE__ - | SHIDIF_DONEBUTTON + | SHIDIF_DONEBUTTON #endif ; - shidi.hDlg = hDlg; - SHInitDialog( &shidi ); + shidi.hDlg = hDlg; + SHInitDialog( &shidi ); #else // no SHInitDialog() - wxUnusedVar(hDlg); + wxUnusedVar(hDlg); +#endif + // for WM_INITDIALOG, returning TRUE tells system to set focus to + // the first control in the dialog box, but as we set the focus + // ourselves, we return FALSE for it as well + return FALSE; + } + + case WM_SETTINGCHANGE: + { +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + wxTopLevelWindow *tlw = wxDynamicCast(wxGetWindowFromHWND(hDlg), wxTopLevelWindow); + if(tlw) return tlw->HandleSettingChange(wParam,lParam) ? TRUE : FALSE; +#else + wxUnusedVar(wParam); + wxUnusedVar(lParam); #endif + break; + } } // for almost all messages, returning FALSE means that we didn't process // the message - // - // for WM_INITDIALOG, returning TRUE tells system to set focus to - // the first control in the dialog box, but as we set the focus - // ourselves, we return FALSE for it as well return FALSE; } @@ -1140,5 +1217,3 @@ HWND wxTLWHiddenParentModule::GetHWND() return ms_hwnd; } - -