X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ccef86c75da7844d15435f4093bf992f60786cea..b5435dccd098ae153c3b7b3b8fca8dd0d763986c:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index c4ab391cd8..f17d23dddb 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" @@ -63,10 +67,8 @@ // globals // ---------------------------------------------------------------------------- -extern const wxChar *wxFrameClassName; - #if wxUSE_MENUS_NATIVE -extern wxMenu *wxCurrentPopupMenu; + extern wxMenu *wxCurrentPopupMenu; #endif // wxUSE_MENUS_NATIVE // ---------------------------------------------------------------------------- @@ -74,7 +76,6 @@ extern wxMenu *wxCurrentPopupMenu; // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) - EVT_ACTIVATE(wxFrame::OnActivate) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() @@ -110,11 +111,8 @@ void wxFrame::Init() m_fsStatusBarFields = 0; m_fsStatusBarHeight = 0; m_fsToolBarHeight = 0; -// m_fsMenu = 0; m_wasMinimized = FALSE; - - m_winLastFocused = (wxWindow *)NULL; } bool wxFrame::Create(wxWindow *parent, @@ -138,7 +136,6 @@ bool wxFrame::Create(wxWindow *parent, wxFrame::~wxFrame() { m_isBeingDeleted = TRUE; - DeleteAllBars(); } @@ -197,12 +194,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 @@ -272,6 +264,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar) } else // set new non NULL menu bar { +#ifndef __WXWINCE__ // Can set a menubar several times. if ( menubar->GetHMenu() ) { @@ -287,14 +280,26 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar) return; } } - +#endif InternalSetMenuBar(); } } void wxFrame::InternalSetMenuBar() { -#ifndef __WXMICROWIN__ +#ifdef __WXMICROWIN__ + // Nothing +#elif defined(__WXWINCE__) + + if (!GetToolBar()) + { + wxToolBar* toolBar = new wxToolBar(this, -1, + wxDefaultPosition, wxDefaultSize, + wxBORDER_NONE | wxTB_HORIZONTAL, + wxToolBarNameStr, GetMenuBar()); + SetToolBar(toolBar); + } +#else if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) { wxLogLastError(wxT("SetMenu")); @@ -326,12 +331,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); @@ -343,9 +351,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 @@ -370,6 +380,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 @@ -378,6 +391,7 @@ bool wxFrame::ShowFullScreen(bool show, long style) theToolBar->SetSize(-1, m_fsToolBarHeight); theToolBar->Show(TRUE); } +#endif // __WXWINCE__ #endif // wxUSE_TOOLBAR #if wxUSE_STATUSBAR @@ -392,63 +406,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); } // ---------------------------------------------------------------------------- @@ -459,6 +424,11 @@ void wxFrame::OnActivate(wxActivateEvent& event) wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { +#ifdef __WXWINCE__ + // We may already have a toolbar from calling SetMenuBar. + if (GetToolBar()) + return GetToolBar(); +#endif if ( wxFrameBase::CreateToolBar(style, id, name) ) { PositionToolBar(); @@ -472,6 +442,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; @@ -495,11 +471,14 @@ void wxFrame::PositionToolBar() else { tw = width; + if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT ) + th -= 3; } // 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 +493,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 +539,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,11 +578,12 @@ bool wxFrame::HandlePaint() RECT rect; if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) { -#ifndef __WXMICROWIN__ +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) if ( m_iconized ) { - HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) - : (HICON)GetDefaultIcon(); + const wxIcon& icon = GetIcon(); + HICON hIcon = icon.Ok() ? GetHiconOf(icon) + : (HICON)GetDefaultIcon(); // Hold a pointer to the dc so long as the OnPaint() message // is being processed @@ -648,7 +628,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 ) { @@ -691,9 +671,7 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) PositionToolBar(); #endif // wxUSE_TOOLBAR - wxSizeEvent event(wxSize(x, y), m_windowId); - event.SetEventObject( this ); - processed = GetEventHandler()->ProcessEvent(event); + processed = wxWindow::HandleSize(x, y, id); } return processed; @@ -747,17 +725,11 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) #endif else { -#if wxUSE_STATUSBAR // don't give hints for separators (doesn't make sense) nor for the // 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 - wxStatusBar *statbar = GetStatusBar(); - if ( statbar ) - { - statbar->SetStatusText(wxEmptyString); - } -#endif // wxUSE_STATUSBAR + DoGiveHelp(wxEmptyString, FALSE); return FALSE; } @@ -814,7 +786,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; @@ -825,20 +801,15 @@ 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: { - HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) - : (HICON)GetDefaultIcon(); + const wxIcon& icon = GetIcon(); + HICON hIcon = icon.Ok() ? GetHiconOf(icon) + : (HICON)GetDefaultIcon(); rc = (long)hIcon; processed = rc != 0; } @@ -847,8 +818,30 @@ 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); +}