/////////////////////////////////////////////////////////////////////////////
-// Name: msw/frame.cpp
+// Name: src/msw/frame.cpp
// Purpose: wxFrame
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "frame.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#include "wx/frame.h"
+
#ifndef WX_PRECOMP
- #include "wx/frame.h"
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/app.h"
#include "wx/menu.h"
#include "wx/utils.h"
#include "wx/dcclient.h"
#include "wx/mdi.h"
#include "wx/panel.h"
+ #include "wx/log.h"
+ #include "wx/toolbar.h"
+ #include "wx/statusbr.h"
+ #include "wx/menuitem.h"
#endif // WX_PRECOMP
#include "wx/msw/private.h"
-#if wxUSE_STATUSBAR
- #include "wx/statusbr.h"
- #include "wx/generic/statusbr.h"
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_TOOLBAR
- #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+ #include <ole2.h>
+ #include <aygshell.h>
+ #include "wx/msw/winundef.h"
+#endif
-#include "wx/menuitem.h"
-#include "wx/log.h"
+#include "wx/generic/statusbr.h"
#ifdef __WXUNIVERSAL__
#include "wx/univ/theme.h"
// globals
// ----------------------------------------------------------------------------
-extern const wxChar *wxFrameClassName;
-
#if wxUSE_MENUS_NATIVE
-extern wxMenu *wxCurrentPopupMenu;
+ extern wxMenu *wxCurrentPopupMenu;
#endif // wxUSE_MENUS_NATIVE
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
- EVT_ACTIVATE(wxFrame::OnActivate)
EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-
// ============================================================================
// implementation
// ============================================================================
#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
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;
-// m_fsMenu = 0;
-
- m_wasMinimized = FALSE;
-
- m_winLastFocused = (wxWindow *)NULL;
+ m_wasMinimized = false;
}
bool wxFrame::Create(wxWindow *parent,
const wxString& name)
{
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
- return FALSE;
+ return false;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
- wxModelessWindows.Append(this);
+#if defined(__SMARTPHONE__)
+ SetLeftMenu(wxID_EXIT, _("Done"));
+#endif
+
+#if wxUSE_ACCEL && 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 // wxUSE_ACCEL && __POCKETPC__
- return TRUE;
+ return true;
}
wxFrame::~wxFrame()
{
- m_isBeingDeleted = TRUE;
+ SendDestroyEvent();
DeleteAllBars();
}
-// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
-void wxFrame::DoGetClientSize(int *x, int *y) const
-{
- RECT rect;
- ::GetClientRect(GetHwnd(), &rect);
-
-#if wxUSE_STATUSBAR
- if ( GetStatusBar() && GetStatusBar()->IsShown() )
- {
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- rect.bottom -= statusY;
- }
-#endif // wxUSE_STATUSBAR
-
- wxPoint pt(GetClientAreaOrigin());
- rect.bottom -= pt.y;
- rect.right -= pt.x;
-
- if ( x )
- *x = rect.right;
- if ( y )
- *y = rect.bottom;
-}
+// ----------------------------------------------------------------------------
+// wxFrame client size calculations
+// ----------------------------------------------------------------------------
void wxFrame::DoSetClientSize(int width, int height)
{
}
#endif // wxUSE_STATUSBAR
+ // call GetClientAreaOrigin() to take the toolbar into account
+ wxPoint pt = GetClientAreaOrigin();
+ width += pt.x;
+ height += pt.y;
+
+#if wxUSE_TOOLBAR
+ wxToolBar * const toolbar = GetToolBar();
+ if ( toolbar )
+ {
+ if ( toolbar->HasFlag(wxTB_RIGHT | wxTB_BOTTOM) )
+ {
+ const wxSize sizeTB = toolbar->GetSize();
+ if ( toolbar->HasFlag(wxTB_RIGHT) )
+ width -= sizeTB.x;
+ else // wxTB_BOTTOM
+ height -= sizeTB.y;
+ }
+ //else: toolbar already taken into account by GetClientAreaOrigin()
+ }
+#endif // wxUSE_TOOLBAR
+
wxTopLevelWindow::DoSetClientSize(width, height);
}
+// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
+void wxFrame::DoGetClientSize(int *x, int *y) const
+{
+ wxTopLevelWindow::DoGetClientSize(x, y);
+
+ // account for the possible toolbar
+ wxPoint pt = GetClientAreaOrigin();
+ if ( x )
+ *x -= pt.x;
+
+ if ( y )
+ *y -= pt.y;
+
+#if wxUSE_TOOLBAR
+ wxToolBar * const toolbar = GetToolBar();
+ if ( toolbar )
+ {
+ if ( toolbar->HasFlag(wxTB_RIGHT | wxTB_BOTTOM) )
+ {
+ const wxSize sizeTB = toolbar->GetSize();
+ if ( toolbar->HasFlag(wxTB_RIGHT) )
+ {
+ if ( x )
+ *x -= sizeTB.x;
+ }
+ else // wxTB_BOTTOM
+ {
+ if ( y )
+ *y -= sizeTB.y;
+ }
+ }
+ //else: toolbar already taken into account by GetClientAreaOrigin()
+ }
+#endif // wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+ // adjust client area height to take the status bar into account
+ if ( y )
+ {
+ wxStatusBar *statbar = GetStatusBar();
+ if ( statbar && statbar->IsShown() )
+ {
+ *y -= statbar->GetSize().y;
+ }
+ }
+#endif // wxUSE_STATUSBAR
+}
+
// ----------------------------------------------------------------------------
// wxFrame: various geometry-related functions
// ----------------------------------------------------------------------------
void wxFrame::Raise()
{
-#ifdef __WIN16__
- // no SetForegroundWindow() in Win16
- wxFrameBase::Raise();
-#else // Win32
::SetForegroundWindow(GetHwnd());
-#endif // Win16/32
}
// generate an artificial resize event
-void wxFrame::SendSizeEvent()
+void wxFrame::SendSizeEvent(int flags)
{
if ( !m_iconized )
{
RECT r = wxGetWindowRect(GetHwnd());
- (void)::PostMessage(GetHwnd(), WM_SIZE,
- IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
- MAKELPARAM(r.right - r.left, r.bottom - r.top));
+ if ( flags & wxSEND_EVENT_POST )
+ {
+ ::PostMessage(GetHwnd(), WM_SIZE,
+ IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
+ MAKELPARAM(r.right - r.left, r.bottom - r.top));
+ }
+ else // send it
+ {
+ ::SendMessage(GetHwnd(), WM_SIZE,
+ IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
+ MAKELPARAM(r.right - r.left, r.bottom - r.top));
+ }
}
}
wxWindowID id,
const wxString& name)
{
- wxStatusBar *statusBar = NULL;
+ wxStatusBar *statusBar wxDUMMY_INITIALIZE(NULL);
#if wxUSE_NATIVE_STATUSBAR
if ( !UsesNativeStatusBar() )
void wxFrame::PositionStatusBar()
{
- if ( !m_frameStatusBar )
+ if ( !m_frameStatusBar || !m_frameStatusBar->IsShown() )
return;
int w, h;
GetClientSize(&w, &h);
+
int sw, sh;
m_frameStatusBar->GetSize(&sw, &sh);
+ int x = 0;
+#if wxUSE_TOOLBAR
+ wxToolBar * const toolbar = GetToolBar();
+ if ( toolbar && !toolbar->HasFlag(wxTB_TOP) )
+ {
+ const wxSize sizeTB = toolbar->GetSize();
+
+ if ( toolbar->HasFlag(wxTB_LEFT | wxTB_RIGHT) )
+ {
+ if ( toolbar->HasFlag(wxTB_LEFT) )
+ x -= sizeTB.x;
+
+ w += sizeTB.x;
+ }
+ else // wxTB_BOTTOM
+ {
+ // we need to position the status bar below the toolbar
+ h += sizeTB.y;
+ }
+ }
+ //else: no adjustments necessary for the toolbar on top
+#endif // wxUSE_TOOLBAR
+
// 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);
+ m_frameStatusBar->SetSize(x, h, w, sh);
}
+
#endif // wxUSE_STATUSBAR
#if wxUSE_MENUS_NATIVE
void wxFrame::AttachMenuBar(wxMenuBar *menubar)
{
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+
+ wxMenu *autoMenu = NULL;
+
+ if( menubar->GetMenuCount() == 1 )
+ {
+ autoMenu = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(menubar->GetMenu(0));
+ SetRightMenu(wxID_ANY, menubar->GetMenuLabel(0), autoMenu);
+ }
+ else
+ {
+ autoMenu = new wxMenu;
+
+ for( size_t n = 0; n < menubar->GetMenuCount(); n++ )
+ {
+ wxMenu *item = menubar->GetMenu(n);
+ wxString label = menubar->GetMenuLabel(n);
+ wxMenu *new_item = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(item);
+ autoMenu->Append(wxID_ANY, label, new_item);
+ }
+
+ SetRightMenu(wxID_ANY, _("Menu"), autoMenu);
+ }
+
+#elif defined(WINCE_WITHOUT_COMMANDBAR)
+ if (!GetToolBar())
+ {
+ wxToolMenuBar* toolBar = new wxToolMenuBar(this, wxID_ANY,
+ wxDefaultPosition, wxDefaultSize,
+ wxBORDER_NONE | wxTB_HORIZONTAL,
+ wxToolBarNameStr, menubar);
+ SetToolBar(toolBar);
+ menubar->SetToolBar(toolBar);
+ }
+
+ // When the main window is created using CW_USEDEFAULT the height of the
+ // menubar is not taken into account, so we resize it afterwards if a
+ // menubar is present
+ HWND hwndMenuBar = SHFindMenuBar(GetHwnd());
+ if ( hwndMenuBar )
+ {
+ RECT mbRect;
+ ::GetWindowRect(hwndMenuBar, &mbRect);
+ const int menuHeight = mbRect.bottom - mbRect.top;
+
+ RECT rc;
+ ::GetWindowRect(GetHwnd(), &rc);
+ // adjust for menu / titlebar height
+ rc.bottom -= (2*menuHeight-1);
+
+ ::MoveWindow(Gethwnd(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
+ }
+#endif
+
wxFrameBase::AttachMenuBar(menubar);
if ( !menubar )
}
else // set new non NULL menu bar
{
+#if !defined(__WXWINCE__) || defined(WINCE_WITH_COMMANDBAR)
// Can set a menubar several times.
if ( menubar->GetHMenu() )
{
if ( !m_hMenu )
{
- wxFAIL_MSG( _T("failed to create menu bar") );
+ wxFAIL_MSG( wxT("failed to create menu bar") );
return;
}
}
-
+#endif
InternalSetMenuBar();
}
}
void wxFrame::InternalSetMenuBar()
{
-#ifndef __WXMICROWIN__
+#if defined(__WXMICROWIN__) || defined(__WXWINCE__)
+ // Nothing
+#else
if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
{
wxLogLastError(wxT("SetMenu"));
// Responds to colour changes, and passes event on to children.
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
#if wxUSE_STATUSBAR
{
wxSysColourChangedEvent event2;
event2.SetEventObject( m_frameStatusBar );
- m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
+ m_frameStatusBar->HandleWindowEvent(event2);
}
#endif // wxUSE_STATUSBAR
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)
{
- if ( IsFullScreen() == show )
- return FALSE;
+ // TODO-CE: add support for CE
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+ if ( IsFullScreen() == show )
+ return false;
if (show)
{
+ // zap the toolbar, menubar, and statusbar if needed
+ //
+ // TODO: hide commandbar for WINCE_WITH_COMMANDBAR
#if wxUSE_TOOLBAR
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 // wxUSE_TOOLBAR
-#ifndef __WXMICROWIN__
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
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 // wxUSE_TOOLBAR
-#if wxUSE_STATUSBAR
- if ( m_fsStyle & wxFULLSCREEN_NOSTATUSBAR )
+#if wxUSE_MENUS
+ if (m_fsStyle & wxFULLSCREEN_NOMENUBAR)
{
- //CreateStatusBar(m_fsStatusBarFields);
- if (GetStatusBar())
- {
- GetStatusBar()->Show(TRUE);
- PositionStatusBar();
- }
+ const WXHMENU hmenu = MSWGetActiveMenu();
+ if ( hmenu )
+ ::SetMenu(GetHwnd(), (HMENU)hmenu);
}
-#endif // wxUSE_STATUSBAR
-
-#ifndef __WXMICROWIN__
- if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
- SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
-#endif
- }
-
- return wxFrameBase::ShowFullScreen(show, style);
-}
+#endif // wxUSE_MENUS
-// 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);
+#if wxUSE_STATUSBAR
+ wxStatusBar *theStatusBar = GetStatusBar();
- wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
- : NULL;
- if ( !parent )
+ if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
{
- parent = this;
+ theStatusBar->Show(true);
+ PositionStatusBar();
}
-
- wxSetFocusToChild(parent, &m_winLastFocused);
+#endif // wxUSE_STATUSBAR
}
- 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);
+#endif // !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
- event.Skip();
- }
+ return wxFrameBase::ShowFullScreen(show, style);
}
// ----------------------------------------------------------------------------
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
+#if defined(WINCE_WITHOUT_COMMANDBAR)
+ // We may already have a toolbar from calling SetMenuBar.
+ if (GetToolBar())
+ return GetToolBar();
+#endif
if ( wxFrameBase::CreateToolBar(style, id, name) )
{
PositionToolBar();
void wxFrame::PositionToolBar()
{
- RECT rect;
- ::GetClientRect(GetHwnd(), &rect);
+ // TODO: we want to do something different in WinCE, because the toolbar
+ // should be associated with the commandbar, instead of being
+ // independent window.
+#if !defined(WINCE_WITHOUT_COMMANDBAR)
+ wxToolBar *toolbar = GetToolBar();
+ if ( toolbar && toolbar->IsShown() )
+ {
+ // 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;
+ wxWindow::DoGetClientSize(&width, &height);
#if wxUSE_STATUSBAR
- if ( GetStatusBar() )
- {
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- rect.bottom -= statusY;
- }
+ wxStatusBar *statbar = GetStatusBar();
+ if ( statbar && statbar->IsShown() )
+ {
+ height -= statbar->GetClientSize().y;
+ }
#endif // wxUSE_STATUSBAR
- if ( GetToolBar() && GetToolBar()->IsShown() )
- {
- int tw, th;
- GetToolBar()->GetSize(&tw, &th);
+ int tx, ty, tw, th;
+ toolbar->GetPosition( &tx, &ty );
+ toolbar->GetSize( &tw, &th );
- if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
+ int x, y;
+ if ( toolbar->HasFlag(wxTB_BOTTOM) )
+ {
+ x = 0;
+ y = height - th;
+ }
+ else if ( toolbar->HasFlag(wxTB_RIGHT) )
+ {
+ x = width - tw;
+ y = 0;
+ }
+ else // left or top
{
- th = rect.bottom;
+ x = 0;
+ y = 0;
+ }
+
+#if defined(WINCE_WITH_COMMANDBAR)
+ // We're using a commandbar - so we have to allow for it.
+ if (GetMenuBar() && GetMenuBar()->GetCommandBar())
+ {
+ RECT rect;
+ ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
+ y = rect.bottom - rect.top;
+ }
+#endif // WINCE_WITH_COMMANDBAR
+
+ if ( toolbar->HasFlag(wxTB_BOTTOM) )
+ {
+ if ( ty < 0 && ( -ty == th ) )
+ ty = height - th;
+ if ( tx < 0 && (-tx == tw ) )
+ tx = 0;
+ }
+ else if ( toolbar->HasFlag(wxTB_RIGHT) )
+ {
+ if( ty < 0 && ( -ty == th ) )
+ ty = 0;
+ if( tx < 0 && ( -tx == tw ) )
+ tx = width - tw;
+ }
+ else // left or top
+ {
+ if (ty < 0 && (-ty == th))
+ ty = 0;
+ if (tx < 0 && (-tx == tw))
+ tx = 0;
+ }
+
+ int desiredW,
+ desiredH;
+
+ if ( toolbar->IsVertical() )
+ {
+ desiredW = tw;
+ desiredH = height;
}
else
{
- tw = rect.right;
+ desiredW = width;
+ desiredH = th;
}
- // Use the 'real' MSW position here
- GetToolBar()->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS);
+ // use the 'real' MSW position here, don't offset relatively to the
+ // client area origin
+ toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
+
}
+#endif // !WINCE_WITH_COMMANDBAR
}
+
#endif // wxUSE_TOOLBAR
// ----------------------------------------------------------------------------
// on the desktop, but are iconized/restored with it
void wxFrame::IconizeChildFrames(bool bIconize)
{
- for ( wxWindowList::Node *node = GetChildren().GetFirst();
+ m_iconized = bIconize;
+
+ for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
node;
node = node->GetNext() )
{
// them appear in the taskbar because they are, by virtue of this
// style, not managed by the taskbar - instead leave Windows take care
// of them
-#ifdef __WIN95__
if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW )
continue;
-#endif // Win95
// the child MDI frames are a special case and should not be touched by
// the parent frame - instead, they are managed by the user
wxFrame *frame = wxDynamicCast(win, wxFrame);
if ( frame
#if wxUSE_MDI_ARCHITECTURE
- && !wxDynamicCast(frame, wxMDIChildFrame)
+ && !frame->IsMDIChild()
#endif // wxUSE_MDI_ARCHITECTURE
)
{
frame->m_wasMinimized = frame->IsIconized();
}
- // this test works for both iconizing and restoring
- if ( !frame->m_wasMinimized )
+ // note that we shouldn't touch the hidden frames neither because
+ // iconizing/restoring them would show them as a side effect
+ if ( !frame->m_wasMinimized && frame->IsShown() )
frame->Iconize(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;
}
// ===========================================================================
// preprocessing
// ---------------------------------------------------------------------------
-bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
+bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)
{
if ( wxWindow::MSWTranslateMessage(pMsg) )
- return TRUE;
+ return true;
#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
- // try the menu bar accels
+ // try the menu bar accelerators
wxMenuBar *menuBar = GetMenuBar();
- if ( !menuBar )
- return FALSE;
-
- const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
- return acceleratorTable.Translate(this, pMsg);
-#else
- return FALSE;
+ if ( menuBar && menuBar->GetAcceleratorTable()->Translate(frame, pMsg) )
+ return true;
#endif // wxUSE_MENUS && wxUSE_ACCEL
+
+ return false;
}
// ---------------------------------------------------------------------------
// our private (non virtual) message handlers
// ---------------------------------------------------------------------------
-bool wxFrame::HandlePaint()
-{
- RECT rect;
- if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
- {
-#ifndef __WXMICROWIN__
- if ( m_iconized )
- {
- HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
- : (HICON)GetDefaultIcon();
-
- // 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
- 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);
-
- ::DrawIcon(hdc, icon_x, icon_y, hIcon);
- }
-
- ::EndPaint(GetHwnd(), &ps);
-
- return TRUE;
- }
- else
- #endif
- {
- return wxWindow::HandlePaint();
- }
- }
- else
- {
- // nothing to paint - processed
- 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;
-#ifndef __WXMICROWIN__
-
+#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
break;
// restore all child frames too
- IconizeChildFrames(FALSE);
+ IconizeChildFrames(false);
- (void)SendIconizeEvent(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 )
{
PositionToolBar();
#endif // wxUSE_TOOLBAR
- wxSizeEvent event(wxSize(x, y), m_windowId);
- event.SetEventObject( this );
- processed = GetEventHandler()->ProcessEvent(event);
+#if defined(WINCE_WITH_COMMANDBAR)
+ // Position the menu command bar
+ if (GetMenuBar() && GetMenuBar()->GetCommandBar())
+ {
+ RECT rect;
+ ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
+ wxSize clientSz = GetClientSize();
+
+ if ( !::MoveWindow((HWND) GetMenuBar()->GetCommandBar(), 0, 0, clientSz.x, rect.bottom - rect.top, true ) )
+ {
+ wxLogLastError(wxT("MoveWindow"));
+ }
+
+ }
+#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)
{
- if ( control )
- {
- // In case it's e.g. a toolbar.
- wxWindow *win = wxFindWinFromHandle(control);
- if ( win )
- return win->MSWCommand(cmd, id);
- }
+#if wxUSE_MENUS
- // handle here commands from menus and accelerators
- if ( cmd == 0 || cmd == 1 )
+#if defined(WINCE_WITHOUT_COMMANDBAR)
+ if (GetToolBar() && GetToolBar()->FindById(id))
+ return GetToolBar()->MSWCommand(cmd, id);
+#endif
+
+ // we only need to handle the menu and accelerator commands from the items
+ // of our menu bar, base wxWindow class already handles the rest
+ if ( !control && (cmd == 0 /* menu */ || cmd == 1 /* accel */) )
{
#if wxUSE_MENUS_NATIVE
- if ( wxCurrentPopupMenu )
- {
- wxMenu *popupMenu = wxCurrentPopupMenu;
- wxCurrentPopupMenu = NULL;
-
- return popupMenu->MSWCommand(cmd, id);
- }
+ if ( !wxCurrentPopupMenu )
#endif // wxUSE_MENUS_NATIVE
-
- if ( ProcessCommand(id) )
{
- return TRUE;
+ wxMenuItem * const mitem = FindItemInMenuBar((signed short)id);
+ if ( mitem )
+ return ProcessCommand(mitem);
}
}
+#endif // wxUSE_MENUS
- return FALSE;
+ return wxFrameBase::HandleCommand(id, cmd, control);;
}
-bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
+#if wxUSE_MENUS
+
+bool
+wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU WXUNUSED(hMenu))
{
- int item;
- if ( flags == 0xFFFF && hMenu == 0 )
- {
- // menu was removed from screen
- item = -1;
- }
-#ifndef __WXMICROWIN__
- else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
- {
- item = nItem;
- }
-#endif
- else
+ // sign extend to int from unsigned short we get from Windows
+ int item = (signed short)nItem;
+
+ // WM_MENUSELECT is generated for both normal items and menus, including
+ // the top level menus of the menu bar, which can't be represented using
+ // any valid identifier in wxMenuEvent so use an otherwise unused value for
+ // them
+ if ( flags & (MF_POPUP | MF_SEPARATOR) )
+ item = wxID_NONE;
+
+ wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
+ event.SetEventObject(this);
+
+ if ( HandleWindowEvent(event) )
+ return true;
+
+ // by default, i.e. if the event wasn't handled above, clear the status bar
+ // text when an item which can't have any associated help string in wx API
+ // is selected
+ if ( item == wxID_NONE )
+ DoGiveHelp(wxEmptyString, true);
+
+ return false;
+}
+
+bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup)
+{
+ // we don't have the menu id here, so we use the id to specify if the event
+ // was from a popup menu or a normal one
+ wxMenuEvent event(evtType, isPopup ? -1 : 0);
+ event.SetEventObject(this);
+
+ return HandleWindowEvent(event);
+}
+
+bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
+{
+ wxMenu* menu = NULL;
+ if (GetMenuBar())
{
-#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 )
+ int nCount = GetMenuBar()->GetMenuCount();
+ for (int n = 0; n < nCount; n++)
{
- statbar->SetStatusText(wxEmptyString);
+ if (GetMenuBar()->GetMenu(n)->GetHMenu() == hMenu)
+ {
+ menu = GetMenuBar()->GetMenu(n);
+ break;
+ }
}
-#endif // wxUSE_STATUSBAR
-
- return FALSE;
}
- wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
- event.SetEventObject( this );
+ wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);
+ event.SetEventObject(this);
- return GetEventHandler()->ProcessEvent(event);
+ return HandleWindowEvent(event);
}
+#endif // wxUSE_MENUS
+
// ---------------------------------------------------------------------------
// the window proc for wxFrame
// ---------------------------------------------------------------------------
-long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
- long rc = 0;
- bool processed = FALSE;
+ WXLRESULT rc = 0;
+ bool processed = false;
switch ( message )
{
processed = !Close();
break;
+ case WM_SIZE:
+ processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
+ break;
+
case WM_COMMAND:
{
WORD id, cmd;
UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam,
&id, &hwnd, &cmd);
- processed = HandleCommand(id, cmd, (WXHWND)hwnd);
+ HandleCommand(id, cmd, (WXHWND)hwnd);
+
+ // don't pass WM_COMMAND to the base class whether we processed
+ // it or not because we did generate an event for it (our
+ // HandleCommand() calls the base class version) and we must
+ // not do it again or the handlers which skip the event would
+ // be called twice
+ processed = true;
}
break;
-#ifndef __WXMICROWIN__
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if wxUSE_MENUS
+ case WM_INITMENUPOPUP:
+ processed = HandleInitMenuPopup((WXHMENU) wParam);
+ break;
+
case WM_MENUSELECT:
{
WXWORD item, flags;
processed = HandleMenuSelect(item, flags, hmenu);
}
break;
-#endif
- case WM_PAINT:
- processed = HandlePaint();
+ case WM_EXITMENULOOP:
+ processed = HandleMenuLoop(wxEVT_MENU_CLOSE, (WXWORD)wParam);
break;
+#endif // wxUSE_MENUS
-#ifndef __WXMICROWIN__
case WM_QUERYDRAGICON:
{
- HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
- : (HICON)GetDefaultIcon();
- rc = (long)hIcon;
+ const wxIcon& icon = GetIcon();
+ HICON hIcon = icon.Ok() ? GetHiconOf(icon)
+ : (HICON)GetDefaultIcon();
+ rc = (WXLRESULT)hIcon;
processed = rc != 0;
}
break;
-#endif
-
- case WM_SIZE:
- processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
- break;
+#endif // !__WXMICROWIN__
}
if ( !processed )
- rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+ rc = wxFrameBase::MSWWindowProc(message, wParam, lParam);
return rc;
}
+// ----------------------------------------------------------------------------
+// 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
+// ----------------------------------------------------------------------------
+
+// get the origin of the client area in the client coordinates
+wxPoint wxFrame::GetClientAreaOrigin() const
+{
+ wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
+
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && \
+ (!defined(__WXWINCE__) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
+ wxToolBar * const toolbar = GetToolBar();
+ if ( toolbar && toolbar->IsShown() )
+ {
+ const wxSize sizeTB = toolbar->GetSize();
+
+ if ( toolbar->HasFlag(wxTB_TOP) )
+ {
+ pt.y += sizeTB.y;
+ }
+ else if ( toolbar->HasFlag(wxTB_LEFT) )
+ {
+ pt.x += sizeTB.x;
+ }
+ }
+#endif // wxUSE_TOOLBAR
+
+#if defined(WINCE_WITH_COMMANDBAR)
+ if (GetMenuBar() && GetMenuBar()->GetCommandBar())
+ {
+ RECT rect;
+ ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
+ pt.y += (rect.bottom - rect.top);
+ }
+#endif
+
+ return pt;
+}
projects / wxWidgets.git / blobdiff