/////////////////////////////////////////////////////////////////////////////
-// Name: 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
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "frame.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#include "wx/frame.h"
+
#ifndef WX_PRECOMP
- #include "wx/setup.h"
- #include "wx/frame.h"
- #include "wx/menu.h"
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/app.h"
+ #include "wx/menu.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/settings.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"
-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
-#include "wx/menuitem.h"
-#include "wx/log.h"
-#if wxUSE_NATIVE_STATUSBAR
- #include <wx/msw/statbr95.h>
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+ #include <ole2.h>
+ #include <aygshell.h>
+ #include "wx/msw/winundef.h"
#endif
-extern wxWindowList wxModelessWindows;
-extern wxList WXDLLEXPORT wxPendingDelete;
-extern wxChar wxFrameClassName[];
-extern wxMenu *wxCurrentPopupMenu;
-
-#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
- EVT_SIZE(wxFrame::OnSize)
- EVT_ACTIVATE(wxFrame::OnActivate)
- EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
- EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
- EVT_IDLE(wxFrame::OnIdle)
- EVT_CLOSE(wxFrame::OnCloseWindow)
-END_EVENT_TABLE()
+#include "wx/generic/statusbr.h"
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-#endif
+#ifdef __WXUNIVERSAL__
+ #include "wx/univ/theme.h"
+ #include "wx/univ/colschem.h"
+#endif // __WXUNIVERSAL__
-#if wxUSE_NATIVE_STATUSBAR
- bool wxFrame::m_useNativeStatusBar = TRUE;
-#else
- bool wxFrame::m_useNativeStatusBar = FALSE;
+// FIXME-VC6: Only VC6 doesn't have this in its standard headers so this
+// could be removed once support for it is dropped.
+#ifndef WM_UNINITMENUPOPUP
+ #define WM_UNINITMENUPOPUP 0x0125
#endif
-wxFrame::wxFrame()
-{
- m_frameToolBar = NULL ;
- m_frameMenuBar = NULL;
- m_frameStatusBar = NULL;
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
- m_iconized = FALSE;
-}
+#if wxUSE_MENUS || wxUSE_MENUS_NATIVE
+ extern wxMenu *wxCurrentPopupMenu;
+#endif // wxUSE_MENUS || wxUSE_MENUS_NATIVE
-bool wxFrame::Create(wxWindow *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
-#if wxUSE_TOOLTIPS
- m_hwndToolTip = 0;
-#endif
-
- SetName(name);
- m_windowStyle = style;
- m_frameMenuBar = NULL;
- m_frameToolBar = NULL ;
- m_frameStatusBar = NULL;
-
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
-// m_icon = NULL;
- if ( id > -1 )
- m_windowId = id;
- else
- m_windowId = (int)NewControlId();
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+ EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
+END_EVENT_TABLE()
- if (parent) parent->AddChild(this);
+// ============================================================================
+// implementation
+// ============================================================================
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
+// ----------------------------------------------------------------------------
+// static class members
+// ----------------------------------------------------------------------------
- m_iconized = FALSE;
+#if wxUSE_STATUSBAR
+ #if wxUSE_NATIVE_STATUSBAR
+ bool wxFrame::m_useNativeStatusBar = true;
+ #else
+ bool wxFrame::m_useNativeStatusBar = false;
+ #endif
+#endif // wxUSE_NATIVE_STATUSBAR
- // we pass NULL as parent to MSWCreate because frames with parents behave
- // very strangely under Win95 shell
- // Alteration by JACS: keep normal Windows behaviour (float on top of parent)
- // with this style.
- if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
- parent = NULL;
+// ----------------------------------------------------------------------------
+// creation/destruction
+// ----------------------------------------------------------------------------
- if (!parent)
- wxTopLevelWindows.Append(this);
+void wxFrame::Init()
+{
+#if wxUSE_MENUS
+ m_hMenu = NULL;
+#endif // wxUSE_MENUS
- MSWCreate(m_windowId, parent, wxFrameClassName, this, title,
- x, y, width, height, style);
+#if wxUSE_TOOLTIPS
+ m_hwndToolTip = 0;
+#endif
- wxModelessWindows.Append(this);
- return TRUE;
+ m_wasMinimized = false;
}
-wxFrame::~wxFrame()
+bool wxFrame::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString& title,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
{
- m_isBeingDeleted = TRUE;
- wxTopLevelWindows.DeleteObject(this);
+ if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+ return false;
- if (m_frameStatusBar)
- delete m_frameStatusBar;
- if (m_frameMenuBar)
- delete m_frameMenuBar;
+ SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
-/* New behaviour March 1998: check if it's the last top-level window */
-// if (wxTheApp && (this == wxTheApp->GetTopWindow()))
-
- if (wxTheApp && (wxTopLevelWindows.Number() == 0))
- {
- wxTheApp->SetTopWindow(NULL);
-
- if (wxTheApp->GetExitOnFrameDelete())
- {
- PostQuitMessage(0);
- }
- }
+#if defined(__SMARTPHONE__)
+ SetLeftMenu(wxID_EXIT, _("Done"));
+#endif
- wxModelessWindows.DeleteObject(this);
+#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__
- // For some reason, wxWindows can activate another task altogether
- // when a frame is destroyed after a modal dialog has been invoked.
- // Try to bring the parent to the top.
- if (GetParent() && GetParent()->GetHWND())
- ::BringWindowToTop((HWND) GetParent()->GetHWND());
+ return true;
}
-// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
-void wxFrame::DoGetClientSize(int *x, int *y) const
+wxFrame::~wxFrame()
{
- RECT rect;
- ::GetClientRect(GetHwnd(), &rect);
-
- if ( GetStatusBar() )
- {
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- rect.bottom -= statusY;
- }
-
- wxPoint pt(GetClientAreaOrigin());
- rect.bottom -= pt.y;
- rect.right -= pt.x;
-
- *x = rect.right;
- *y = rect.bottom;
+ SendDestroyEvent();
+
+ DeleteAllBars();
}
-// Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
+// ----------------------------------------------------------------------------
+// wxFrame client size calculations
+// ----------------------------------------------------------------------------
+
void wxFrame::DoSetClientSize(int width, int height)
{
- HWND hWnd = GetHwnd();
-
- RECT rect;
- ::GetClientRect(hWnd, &rect);
-
- RECT rect2;
- GetWindowRect(hWnd, &rect2);
-
- // Find the difference between the entire window (title bar and all)
- // and the client area; add this to the new client size to move the
- // window
- int actual_width = rect2.right - rect2.left - rect.right + width;
- int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
-
- if ( GetStatusBar() )
- {
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- actual_height += statusY;
- }
-
- wxPoint pt(GetClientAreaOrigin());
- actual_width += pt.y;
- actual_height += pt.x;
-
- POINT point;
- point.x = rect2.left;
- point.y = rect2.top;
+ // leave enough space for the status bar if we have (and show) it
+#if wxUSE_STATUSBAR
+ wxStatusBar *statbar = GetStatusBar();
+ if ( statbar && statbar->IsShown() )
+ {
+ height += statbar->GetSize().y;
+ }
+#endif // wxUSE_STATUSBAR
- MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
+ // call GetClientAreaOrigin() to take the toolbar into account
+ wxPoint pt = GetClientAreaOrigin();
+ width += pt.x;
+ height += pt.y;
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
-}
+#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
-void wxFrame::DoGetSize(int *width, int *height) const
-{
- RECT rect;
- GetWindowRect(GetHwnd(), &rect);
- *width = rect.right - rect.left;
- *height = rect.bottom - rect.top;
+ wxTopLevelWindow::DoSetClientSize(width, height);
}
-void wxFrame::DoGetPosition(int *x, int *y) const
+// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
+void wxFrame::DoGetClientSize(int *x, int *y) const
{
- RECT rect;
- GetWindowRect(GetHwnd(), &rect);
- POINT point;
- point.x = rect.left;
- point.y = rect.top;
-
- *x = point.x;
- *y = point.y;
-}
+ wxTopLevelWindow::DoGetClientSize(x, y);
-void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
- wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+ // account for the possible toolbar
+ wxPoint pt = GetClientAreaOrigin();
+ if ( x )
+ *x -= pt.x;
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
-}
+ if ( y )
+ *y -= pt.y;
-bool wxFrame::Show(bool show)
-{
- int cshow;
- if (show)
- cshow = SW_SHOW;
- else
- cshow = SW_HIDE;
-
- if (!show)
- {
- // Try to highlight the correct window (the parent)
- HWND hWndParent = 0;
- if (GetParent())
+#if wxUSE_TOOLBAR
+ wxToolBar * const toolbar = GetToolBar();
+ if ( toolbar )
{
- hWndParent = (HWND) GetParent()->GetHWND();
- if (hWndParent)
- ::BringWindowToTop(hWndParent);
+ 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()
}
- }
-
- ShowWindow(GetHwnd(), (BOOL)cshow);
- if (show)
- {
- BringWindowToTop(GetHwnd());
-
- wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
- }
- return TRUE;
-}
-
-void wxFrame::Iconize(bool iconize)
-{
- if (!iconize)
- Show(TRUE);
-
- int cshow;
- if (iconize)
- cshow = SW_MINIMIZE;
- else
- cshow = SW_RESTORE;
- ShowWindow(GetHwnd(), (BOOL)cshow);
- m_iconized = iconize;
-}
+#endif // wxUSE_TOOLBAR
-// Equivalent to maximize/restore in Windows
-void wxFrame::Maximize(bool maximize)
-{
- Show(TRUE);
- int cshow;
- if (maximize)
- cshow = SW_MAXIMIZE;
- else
- cshow = SW_RESTORE;
- ShowWindow(GetHwnd(), cshow);
- m_iconized = FALSE;
+#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
}
-bool wxFrame::IsIconized() const
-{
- ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0);
- return m_iconized;
-}
+// ----------------------------------------------------------------------------
+// wxFrame: various geometry-related functions
+// ----------------------------------------------------------------------------
-// Is it maximized?
-bool wxFrame::IsMaximized() const
+// generate an artificial resize event
+void wxFrame::SendSizeEvent(int flags)
{
- return (::IsZoomed(GetHwnd()) != 0) ;
-}
+ if ( !m_iconized )
+ {
+ RECT r = wxGetWindowRect(GetHwnd());
-void wxFrame::SetIcon(const wxIcon& icon)
-{
- m_icon = icon;
-#if defined(__WIN95__)
- if ( m_icon.Ok() )
- SendMessage(GetHwnd(), WM_SETICON,
- (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
-#endif
+ 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));
+ }
+ }
}
#if wxUSE_STATUSBAR
-wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
- const wxString& name)
+wxStatusBar *wxFrame::OnCreateStatusBar(int number,
+ long style,
+ wxWindowID id,
+ const wxString& name)
{
- wxStatusBar *statusBar = NULL;
+ wxStatusBar *statusBar wxDUMMY_INITIALIZE(NULL);
#if wxUSE_NATIVE_STATUSBAR
- if (UsesNativeStatusBar())
+ if ( !UsesNativeStatusBar() )
{
- statusBar = new wxStatusBar95(this, id, style);
+ statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style);
}
else
#endif
{
- statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
- style, name);
-
- // Set the height according to the font and the border size
- wxClientDC dc(statusBar);
- dc.SetFont(statusBar->GetFont());
-
- long x, y;
- dc.GetTextExtent("X", &x, &y);
-
- int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY());
-
- statusBar->SetSize(-1, -1, 100, height);
+ statusBar = new wxStatusBar(this, id, style, name);
}
- statusBar->SetFieldsCount(number);
- return statusBar;
-}
-
-wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
- const wxString& name)
-{
- // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
- wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
- _T("recreating status bar in wxFrame") );
-
- m_frameStatusBar = OnCreateStatusBar(number, style, id,
- name);
- if ( m_frameStatusBar )
- {
- PositionStatusBar();
- return m_frameStatusBar;
- }
- else
- return NULL;
-}
+ statusBar->SetFieldsCount(number);
-void wxFrame::SetStatusText(const wxString& text, int number)
-{
- wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") );
-
- m_frameStatusBar->SetStatusText(text, number);
-}
-
-void wxFrame::SetStatusWidths(int n, const int widths_field[])
-{
- wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") );
-
- m_frameStatusBar->SetStatusWidths(n, widths_field);
- PositionStatusBar();
+ return statusBar;
}
void wxFrame::PositionStatusBar()
{
- // native status bar positions itself
- if (m_frameStatusBar
-#if wxUSE_NATIVE_STATUSBAR
- && !m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))
-#endif
- )
- {
- int w, h;
- GetClientSize(&w, &h);
- int sw, sh;
- m_frameStatusBar->GetSize(&sw, &sh);
-
- // 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);
- }
-}
-#endif // wxUSE_STATUSBAR
-
-void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
-{
- if (!menu_bar)
- {
- m_frameMenuBar = NULL;
+ if ( !m_frameStatusBar || !m_frameStatusBar->IsShown() )
return;
- }
- wxCHECK_RET( !menu_bar->GetFrame(), _T("this menubar is already attached") );
+ int w, h;
+ GetClientSize(&w, &h);
- if (m_frameMenuBar)
- delete m_frameMenuBar;
+ int sw, sh;
+ m_frameStatusBar->GetSize(&sw, &sh);
- m_hMenu = menu_bar->Create();
+ int x = 0;
+#if wxUSE_TOOLBAR
+ wxToolBar * const toolbar = GetToolBar();
+ if ( toolbar && !toolbar->HasFlag(wxTB_TOP) )
+ {
+ const wxSize sizeTB = toolbar->GetSize();
- if ( !m_hMenu )
- return;
+ if ( toolbar->HasFlag(wxTB_LEFT | wxTB_RIGHT) )
+ {
+ if ( toolbar->HasFlag(wxTB_LEFT) )
+ x -= sizeTB.x;
- InternalSetMenuBar();
+ 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
- m_frameMenuBar = menu_bar;
- menu_bar->Attach(this);
+ // 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(x, h, w, sh);
}
-void wxFrame::InternalSetMenuBar()
-{
- if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
- {
- wxLogLastError("SetMenu");
- }
-}
+#endif // wxUSE_STATUSBAR
-// Responds to colour changes, and passes event on to children.
-void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+#if wxUSE_MENUS_NATIVE
+
+void wxFrame::AttachMenuBar(wxMenuBar *menubar)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
- Refresh();
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
- if ( m_frameStatusBar )
+ wxMenu *autoMenu = NULL;
+
+ if( menubar->GetMenuCount() == 1 )
{
- wxSysColourChangedEvent event2;
- event2.SetEventObject( m_frameStatusBar );
- m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
+ autoMenu = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(menubar->GetMenu(0));
+ SetRightMenu(wxID_ANY, menubar->GetMenuLabel(0), autoMenu);
}
+ else
+ {
+ autoMenu = new wxMenu;
- // Propagate the event to the non-top-level children
- wxWindow::OnSysColourChanged(event);
-}
+ 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);
+ }
-/*
- * Frame window
- *
- */
+ SetRightMenu(wxID_ANY, _("Menu"), autoMenu);
+ }
-bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title,
- int x, int y, int width, int height, long style)
+#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);
+ }
-{
- m_defaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
-
- // If child windows aren't properly drawn initially, WS_CLIPCHILDREN
- // could be the culprit. But without it, you can get a lot of flicker.
-
- DWORD msflags = 0;
- if ((style & wxCAPTION) == wxCAPTION)
- msflags = WS_OVERLAPPED;
- else
- msflags = WS_POPUP;
-
- if (style & wxMINIMIZE_BOX)
- msflags |= WS_MINIMIZEBOX;
- if (style & wxMAXIMIZE_BOX)
- msflags |= WS_MAXIMIZEBOX;
- if (style & wxTHICK_FRAME)
- msflags |= WS_THICKFRAME;
- if (style & wxSYSTEM_MENU)
- msflags |= WS_SYSMENU;
- if ((style & wxMINIMIZE) || (style & wxICONIZE))
- msflags |= WS_MINIMIZE;
- if (style & wxMAXIMIZE)
- msflags |= WS_MAXIMIZE;
- if (style & wxCAPTION)
- msflags |= WS_CAPTION;
- if (style & wxCLIP_CHILDREN)
- msflags |= WS_CLIPCHILDREN;
-
- // Keep this in wxFrame because it saves recoding this function
- // in wxTinyFrame
-#if wxUSE_ITSY_BITSY
- if (style & wxTINY_CAPTION_VERT)
- msflags |= IBS_VERTCAPTION;
- if (style & wxTINY_CAPTION_HORIZ)
- msflags |= IBS_HORZCAPTION;
-#else
- if (style & wxTINY_CAPTION_VERT)
- msflags |= WS_CAPTION;
- if (style & wxTINY_CAPTION_HORIZ)
- msflags |= WS_CAPTION;
-#endif
- if ((style & wxTHICK_FRAME) == 0)
- msflags |= WS_BORDER;
+ // 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;
- WXDWORD extendedStyle = MakeExtendedStyle(style);
+ RECT rc;
+ ::GetWindowRect(GetHwnd(), &rc);
+ // adjust for menu / titlebar height
+ rc.bottom -= (2*menuHeight-1);
-#if !defined(__WIN16__) && !defined(__SC__)
- if (style & wxFRAME_TOOL_WINDOW)
- extendedStyle |= WS_EX_TOOLWINDOW;
+ ::MoveWindow(GetHwnd(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
+ }
#endif
- if (style & wxSTAY_ON_TOP)
- extendedStyle |= WS_EX_TOPMOST;
+ wxFrameBase::AttachMenuBar(menubar);
- m_iconized = FALSE;
- if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,
- msflags, NULL, extendedStyle) )
- return FALSE;
-
- // Seems to be necessary if we use WS_POPUP
- // style instead of WS_OVERLAPPED
- if (width > -1 && height > -1)
- ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height));
-
- return TRUE;
-}
-
-// Default resizing behaviour - if only ONE subwindow, resize to client
-// rectangle size
-void wxFrame::OnSize(wxSizeEvent& event)
-{
- // if we're using constraints - do use them
-#if wxUSE_CONSTRAINTS
- if ( GetAutoLayout() )
+ if ( !menubar )
{
- Layout();
- return;
+ // actually remove the menu from the frame
+ m_hMenu = (WXHMENU)0;
+ InternalSetMenuBar();
}
-#endif
-
- // do we have _exactly_ one child?
- wxWindow *child = NULL;
- for ( wxWindowList::Node *node = GetChildren().GetFirst();
- node;
- node = node->GetNext() )
+ else // set new non NULL menu bar
{
- wxWindow *win = node->GetData();
- if ( !win->IsTopLevel()
-#if wxUSE_STATUSBAR
- && (win != GetStatusBar())
-#endif // wxUSE_STATUSBAR
-#if wxUSE_TOOLBAR
- && (win != GetToolBar())
-#endif // wxUSE_TOOLBAR
- )
+#if !defined(__WXWINCE__) || defined(WINCE_WITH_COMMANDBAR)
+ // Can set a menubar several times.
+ if ( menubar->GetHMenu() )
{
- if ( child )
- return; // it's our second subwindow - nothing to do
- child = win;
+ m_hMenu = menubar->GetHMenu();
}
- }
-
- if ( child ) {
- // we have exactly one child - set it's size to fill the whole frame
- int clientW, clientH;
- GetClientSize(&clientW, &clientH);
-
- int x = 0;
- int y = 0;
+ else // no HMENU yet
+ {
+ m_hMenu = menubar->Create();
- child->SetSize(x, y, clientW, clientH);
+ if ( !m_hMenu )
+ {
+ wxFAIL_MSG( wxT("failed to create menu bar") );
+ return;
+ }
+ }
+#endif
+ InternalSetMenuBar();
}
}
-// Default activation behaviour - set the focus for the first child
-// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
+void wxFrame::InternalSetMenuBar()
{
- for ( wxWindowList::Node *node = GetChildren().GetFirst();
- node;
- node = node->GetNext() )
+#if defined(__WXMICROWIN__) || defined(__WXWINCE__)
+ // Nothing
+#else
+ if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
{
- // FIXME all this is totally bogus - we need to do the same as wxPanel,
- // but how to do it without duplicating the code?
-
- // restore focus
- wxWindow *child = node->GetData();
-
- if ( !child->IsTopLevel()
-#if wxUSE_TOOLBAR
- && !wxDynamicCast(child, wxToolBar)
-#endif // wxUSE_TOOLBAR
-#if wxUSE_STATUSBAR
- && !wxDynamicCast(child, wxStatusBar)
-#endif // wxUSE_STATUSBAR
- )
- {
- child->SetFocus();
- return;
- }
+ wxLogLastError(wxT("SetMenu"));
}
+#endif
}
-// The default implementation for the close window event.
-void wxFrame::OnCloseWindow(wxCloseEvent& event)
-{
- Destroy();
-}
+#endif // wxUSE_MENUS_NATIVE
-// Destroy the window (delayed, if a managed window)
-bool wxFrame::Destroy()
+#if wxUSE_MENUS
+wxMenu* wxFrame::MSWFindMenuFromHMENU(WXHMENU hMenu)
{
- if (!wxPendingDelete.Member(this))
- wxPendingDelete.Append(this);
- return TRUE;
+ return GetMenuBar() ? GetMenuBar()->MSWGetMenu(hMenu) : NULL;
}
+#endif // wxUSE_MENUS
-// Default menu selection behaviour - display a help string
-void wxFrame::OnMenuHighlight(wxMenuEvent& event)
+// Responds to colour changes, and passes event on to children.
+void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- if (GetStatusBar())
- {
- wxString help;
- int menuId = event.GetMenuId();
- if ( menuId != -1 )
+ // Don't override the colour explicitly set by the user, if any.
+ if ( !UseBgCol() )
{
- wxMenuBar *menuBar = GetMenuBar();
- if (menuBar && menuBar->FindItem(menuId))
- {
- help = menuBar->GetHelpString(menuId);
- }
+ SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+ Refresh();
}
- // set status text even if the string is empty - this will at
- // least remove the string from the item which was previously
- // selected
- SetStatusText(help);
- }
-}
+#if wxUSE_STATUSBAR
+ if ( m_frameStatusBar )
+ {
+ wxSysColourChangedEvent event2;
+ event2.SetEventObject( m_frameStatusBar );
+ m_frameStatusBar->HandleWindowEvent(event2);
+ }
+#endif // wxUSE_STATUSBAR
-wxMenuBar *wxFrame::GetMenuBar() const
-{
- return m_frameMenuBar;
+ // Propagate the event to the non-top-level children
+ wxWindow::OnSysColourChanged(event);
}
-bool wxFrame::ProcessCommand(int id)
+// Pass true to show full screen, false to restore.
+bool wxFrame::ShowFullScreen(bool show, long style)
{
- wxMenuBar *bar = GetMenuBar() ;
- if ( !bar )
- return FALSE;
-
- wxMenuItem *item = bar->FindItemForId(id);
- if ( !item )
- return FALSE;
+ // TODO-CE: add support for CE
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+ if ( IsFullScreen() == show )
+ return false;
- if ( item->IsCheckable() )
+ if (show)
{
- bar->Check(id, !bar->IsChecked(id)) ;
- }
+ // zap the toolbar, menubar, and statusbar if needed
+ //
+ // TODO: hide commandbar for WINCE_WITH_COMMANDBAR
+#if wxUSE_TOOLBAR
+ wxToolBar *theToolBar = GetToolBar();
- wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
- commandEvent.SetInt( id );
- commandEvent.SetEventObject( this );
+ if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
+ {
+ if ( theToolBar->IsShown() )
+ {
+ theToolBar->SetSize(wxDefaultCoord,0);
+ theToolBar->Show(false);
+ }
+ else // prevent it from being restored later
+ {
+ style &= ~wxFULLSCREEN_NOTOOLBAR;
+ }
+ }
+#endif // wxUSE_TOOLBAR
- return GetEventHandler()->ProcessEvent(commandEvent);
-}
+ if (style & wxFULLSCREEN_NOMENUBAR)
+ SetMenu((HWND)GetHWND(), (HMENU) NULL);
-// Checks if there is a toolbar, and returns the first free client position
-wxPoint wxFrame::GetClientAreaOrigin() const
-{
- wxPoint pt(0, 0);
- if (GetToolBar())
+#if wxUSE_STATUSBAR
+ wxStatusBar *theStatusBar = GetStatusBar();
+
+ // Save the number of fields in the statusbar
+ if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
+ {
+ if ( theStatusBar->IsShown() )
+ theStatusBar->Show(false);
+ else
+ style &= ~wxFULLSCREEN_NOSTATUSBAR;
+ }
+#endif // wxUSE_STATUSBAR
+ }
+ else // restore to normal
{
- int w, h;
- GetToolBar()->GetSize(& w, & h);
+ // restore the toolbar, menubar, and statusbar if we had hid them
+#if wxUSE_TOOLBAR
+ wxToolBar *theToolBar = GetToolBar();
- if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+ if ((m_fsStyle & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
{
- pt.x += w;
+ theToolBar->Show(true);
}
- else
+#endif // wxUSE_TOOLBAR
+
+#if wxUSE_MENUS
+ if (m_fsStyle & wxFULLSCREEN_NOMENUBAR)
+ {
+ const WXHMENU hmenu = MSWGetActiveMenu();
+ if ( hmenu )
+ ::SetMenu(GetHwnd(), (HMENU)hmenu);
+ }
+#endif // wxUSE_MENUS
+
+#if wxUSE_STATUSBAR
+ wxStatusBar *theStatusBar = GetStatusBar();
+
+ if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
{
- pt.y += h;
+ theStatusBar->Show(true);
+ PositionStatusBar();
}
+#endif // wxUSE_STATUSBAR
}
- return pt;
-}
+#endif // !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-void wxFrame::ScreenToClient(int *x, int *y) const
-{
- wxWindow::ScreenToClient(x, y);
-
- // We may be faking the client origin.
- // So a window that's really at (0, 30) may appear
- // (to wxWin apps) to be at (0, 0).
- wxPoint pt(GetClientAreaOrigin());
- *x -= pt.x;
- *y -= pt.y;
+ return wxFrameBase::ShowFullScreen(show, style);
}
-void wxFrame::ClientToScreen(int *x, int *y) const
-{
- // We may be faking the client origin.
- // So a window that's really at (0, 30) may appear
- // (to wxWin apps) to be at (0, 0).
- wxPoint pt1(GetClientAreaOrigin());
- *x += pt1.x;
- *y += pt1.y;
-
- wxWindow::ClientToScreen(x, y);
-}
+// ----------------------------------------------------------------------------
+// tool/status bar stuff
+// ----------------------------------------------------------------------------
#if wxUSE_TOOLBAR
+
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
- wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
- _T("recreating toolbar in wxFrame") );
-
- wxToolBar* toolBar = OnCreateToolBar(style, id, name);
- if (toolBar)
+#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) )
{
- SetToolBar(toolBar);
PositionToolBar();
- return toolBar;
}
- else
- {
- return NULL;
- }
-}
-wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)
-{
- return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
+ return m_frameToolBar;
}
void wxFrame::PositionToolBar()
{
- RECT rect;
- ::GetClientRect(GetHwnd(), &rect);
-
- if ( GetStatusBar() )
+ // 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() )
{
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- rect.bottom -= statusY;
- }
+ // 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 (GetToolBar())
- {
- int tw, th;
- GetToolBar()->GetSize(& tw, & th);
+#if wxUSE_STATUSBAR
+ wxStatusBar *statbar = GetStatusBar();
+ if ( statbar && statbar->IsShown() )
+ {
+ height -= statbar->GetClientSize().y;
+ }
+#endif // wxUSE_STATUSBAR
+
+ int tx, ty, tw, th;
+ toolbar->GetPosition( &tx, &ty );
+ toolbar->GetSize( &tw, &th );
+
+ 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
+ {
+ x = 0;
+ y = 0;
+ }
- if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+#if defined(WINCE_WITH_COMMANDBAR)
+ // We're using a commandbar - so we have to allow for it.
+ if (GetMenuBar() && GetMenuBar()->GetCommandBar())
{
- // Use the 'real' MSW position
- GetToolBar()->SetSize(0, 0, tw, rect.bottom, wxSIZE_NO_ADJUSTMENTS);
+ 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
{
- // Use the 'real' MSW position
- GetToolBar()->SetSize(0, 0, rect.right, th, wxSIZE_NO_ADJUSTMENTS);
+ desiredW = width;
+ desiredH = th;
}
+
+ // 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
+// ----------------------------------------------------------------------------
+// frame state (iconized/maximized/...)
+// ----------------------------------------------------------------------------
+
// propagate our state change to all child frames: this allows us to emulate X
// Windows behaviour where child frames float independently of the parent one
// 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() )
{
wxWindow *win = node->GetData();
- if ( win->IsKindOf(CLASSINFO(wxFrame)) )
+ // iconizing the frames with this style under Win95 shell puts them at
+ // the bottom of the screen (as the MDI children) instead of making
+ // 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
+ if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW )
+ continue;
+
+ // 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
+ && !frame->IsMDIChild()
+#endif // wxUSE_MDI_ARCHITECTURE
+ )
{
- ((wxFrame *)win)->Iconize(bIconize);
+ // we don't want to restore the child frames which had been
+ // iconized even before we were iconized, so save the child frame
+ // status when iconizing the parent frame and check it when
+ // restoring it
+ if ( bIconize )
+ {
+ frame->m_wasMinimized = frame->IsIconized();
+ }
+
+ // 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);
}
}
}
-
-// make the window modal (all other windows unresponsive)
-void wxFrame::MakeModal(bool modal)
+WXHICON wxFrame::GetDefaultIcon() const
{
- if (modal) {
- wxEnableTopLevelWindows(FALSE);
- Enable(TRUE); // keep this window enabled
- }
- else {
- wxEnableTopLevelWindows(TRUE);
- }
+ // we don't have any standard icons (any more)
+ return (WXHICON)0;
}
-
// ===========================================================================
// message processing
// ===========================================================================
// preprocessing
// ---------------------------------------------------------------------------
-bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
+bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)
{
if ( wxWindow::MSWTranslateMessage(pMsg) )
- return TRUE;
+ return true;
- // try the menu bar accels
+#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
+ // try the menu bar accelerators
wxMenuBar *menuBar = GetMenuBar();
- if ( !menuBar )
- return FALSE;
+ if ( menuBar && menuBar->GetAcceleratorTable()->Translate(frame, pMsg) )
+ return true;
+#endif // wxUSE_MENUS && wxUSE_ACCEL
- const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
- return acceleratorTable.Translate(this, pMsg);
+ return false;
}
// ---------------------------------------------------------------------------
// our private (non virtual) message handlers
// ---------------------------------------------------------------------------
-bool wxFrame::HandlePaint()
+bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
{
- RECT rect;
- if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
- {
- if ( m_iconized )
- {
- HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
- : (HICON)m_defaultIcon;
-
- // 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
- {
- return wxWindow::HandlePaint();
- }
- }
- else
- {
- // nothing to paint - processed
- return TRUE;
- }
-}
-
-bool wxFrame::HandleSize(int x, int 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
break;
// restore all child frames too
- IconizeChildFrames(FALSE);
-
- // fall through
+ IconizeChildFrames(false);
- case SIZEFULLSCREEN:
- m_iconized = FALSE;
+ (void)SendIconizeEvent(false);
break;
- case SIZEICONIC:
+ case SIZE_MINIMIZED:
// iconize all child frames too
- IconizeChildFrames(TRUE);
-
- m_iconized = TRUE;
+ IconizeChildFrames(true);
break;
}
+#else
+ wxUnusedVar(id);
+#endif // !__WXWINCE__
if ( !m_iconized )
{
- // forward WM_SIZE to status bar control
-#if wxUSE_NATIVE_STATUSBAR
- if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
- {
- wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());
- event.SetEventObject( m_frameStatusBar );
-
- ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event);
- }
-#endif // wxUSE_NATIVE_STATUSBAR
-
+#if wxUSE_STATUSBAR
PositionStatusBar();
- PositionToolBar();
-
- wxSizeEvent event(wxSize(x, y), m_windowId);
- event.SetEventObject( this );
- processed = GetEventHandler()->ProcessEvent(event);
- }
-
- return processed;
-}
+#endif // wxUSE_STATUSBAR
-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_TOOLBAR
+ PositionToolBar();
+#endif // wxUSE_TOOLBAR
- // handle here commands from menus and accelerators
- if ( cmd == 0 || cmd == 1 )
- {
- if ( wxCurrentPopupMenu )
+#if defined(WINCE_WITH_COMMANDBAR)
+ // Position the menu command bar
+ if (GetMenuBar() && GetMenuBar()->GetCommandBar())
{
- wxMenu *popupMenu = wxCurrentPopupMenu;
- wxCurrentPopupMenu = NULL;
+ RECT rect;
+ ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
+ wxSize clientSz = GetClientSize();
- return popupMenu->MSWCommand(cmd, id);
- }
+ if ( !::MoveWindow((HWND) GetMenuBar()->GetCommandBar(), 0, 0, clientSz.x, rect.bottom - rect.top, true ) )
+ {
+ wxLogLastError(wxT("MoveWindow"));
+ }
- if ( ProcessCommand(id) )
- {
- return TRUE;
}
+#endif // WINCE_WITH_COMMANDBAR
}
- return FALSE;
+ // call the base class version to generate the appropriate events
+ return false;
}
-bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
+bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
{
- int item;
- if ( flags == 0xFFFF && hMenu == 0 )
- {
- // menu was removed from screen
- item = -1;
- }
- else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
- {
- item = nItem;
- }
- else
+#if wxUSE_MENUS
+
+#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 */) )
{
- // don't give hints for separators (doesn't make sense) nor for the
- // items opening popup menus (they don't have them anyhow)
- return FALSE;
+#if wxUSE_MENUS_NATIVE
+ if ( !wxCurrentPopupMenu )
+#endif // wxUSE_MENUS_NATIVE
+ {
+ wxMenuItem * const mitem = FindItemInMenuBar((signed short)id);
+ if ( mitem )
+ return ProcessCommand(mitem);
+ }
}
+#endif // wxUSE_MENUS
- wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
- event.SetEventObject( this );
-
- return GetEventHandler()->ProcessEvent(event);
+ return wxFrameBase::HandleCommand(id, cmd, control);;
}
// ---------------------------------------------------------------------------
// 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);
- }
- break;
-
- case WM_MENUSELECT:
- {
- WXWORD item, flags;
- WXHMENU hmenu;
- UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
+ HandleCommand(id, cmd, (WXHWND)hwnd);
- processed = HandleMenuSelect(item, flags, hmenu);
+ // 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;
- case WM_PAINT:
- processed = HandlePaint();
- break;
-
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
case WM_QUERYDRAGICON:
{
- HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
- : (HICON)(m_defaultIcon);
- rc = (long)hIcon;
+ const wxIcon& icon = GetIcon();
+ HICON hIcon = icon.IsOk() ? GetHiconOf(icon)
+ : (HICON)GetDefaultIcon();
+ rc = (WXLRESULT)hIcon;
processed = rc != 0;
}
break;
-
- 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