]> git.saurik.com Git - wxWidgets.git/blame - src/msw/frame.cpp
build fixes and cleanup
[wxWidgets.git] / src / msw / frame.cpp
CommitLineData
2bda0e17 1/////////////////////////////////////////////////////////////////////////////
08b97268 2// Name: src/msw/frame.cpp
0d53fc34 3// Purpose: wxFrame
2bda0e17
KB
4// Author: Julian Smart
5// Modified by:
6// Created: 01/02/97
7// RCS-ID: $Id$
6c9a19aa 8// Copyright: (c) Julian Smart
65571936 9// Licence: wxWindows licence
2bda0e17
KB
10/////////////////////////////////////////////////////////////////////////////
11
7c0ea335
VZ
12// ============================================================================
13// declarations
14// ============================================================================
15
16// ----------------------------------------------------------------------------
17// headers
18// ----------------------------------------------------------------------------
19
2bda0e17
KB
20// For compilers that support precompilation, includes "wx.h".
21#include "wx/wxprec.h"
22
23#ifdef __BORLANDC__
9f3362c4 24 #pragma hdrstop
2bda0e17
KB
25#endif
26
76b49cf4
WS
27#include "wx/frame.h"
28
2bda0e17 29#ifndef WX_PRECOMP
57bd4c60 30 #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
9f3362c4 31 #include "wx/app.h"
1e6feb95 32 #include "wx/menu.h"
9f3362c4
VZ
33 #include "wx/utils.h"
34 #include "wx/dialog.h"
35 #include "wx/settings.h"
36 #include "wx/dcclient.h"
d3cc7c65 37 #include "wx/mdi.h"
f6bcfd97 38 #include "wx/panel.h"
e4db172a 39 #include "wx/log.h"
4e3e485b 40 #include "wx/toolbar.h"
3304646d 41 #include "wx/statusbr.h"
25466131 42 #include "wx/menuitem.h"
9f3362c4 43#endif // WX_PRECOMP
2bda0e17
KB
44
45#include "wx/msw/private.h"
7c0ea335 46
afafd942 47#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
855ec944
VZ
48 #include <ole2.h>
49 #include <aygshell.h>
50 #include "wx/msw/winundef.h"
afafd942
JS
51#endif
52
8f62e633
RD
53#include "wx/generic/statusbr.h"
54
1e6feb95
VZ
55#ifdef __WXUNIVERSAL__
56 #include "wx/univ/theme.h"
57 #include "wx/univ/colschem.h"
58#endif // __WXUNIVERSAL__
59
7c0ea335
VZ
60// ----------------------------------------------------------------------------
61// globals
62// ----------------------------------------------------------------------------
2bda0e17 63
1e6feb95 64#if wxUSE_MENUS_NATIVE
03baf031 65 extern wxMenu *wxCurrentPopupMenu;
1e6feb95 66#endif // wxUSE_MENUS_NATIVE
2bda0e17 67
7c0ea335
VZ
68// ----------------------------------------------------------------------------
69// event tables
70// ----------------------------------------------------------------------------
71
0d53fc34 72BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
0d53fc34 73 EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
2bda0e17
KB
74END_EVENT_TABLE()
75
51596bcb 76#if wxUSE_EXTENDED_RTTI
bc9fb572
JS
77WX_DEFINE_FLAGS( wxFrameStyle )
78
3ff066a4 79wxBEGIN_FLAGS( wxFrameStyle )
bc9fb572
JS
80 // new style border flags, we put them first to
81 // use them for streaming out
3ff066a4
SC
82 wxFLAGS_MEMBER(wxBORDER_SIMPLE)
83 wxFLAGS_MEMBER(wxBORDER_SUNKEN)
84 wxFLAGS_MEMBER(wxBORDER_DOUBLE)
85 wxFLAGS_MEMBER(wxBORDER_RAISED)
86 wxFLAGS_MEMBER(wxBORDER_STATIC)
87 wxFLAGS_MEMBER(wxBORDER_NONE)
cbe874bd 88
bc9fb572 89 // old style border flags
3ff066a4
SC
90 wxFLAGS_MEMBER(wxSIMPLE_BORDER)
91 wxFLAGS_MEMBER(wxSUNKEN_BORDER)
92 wxFLAGS_MEMBER(wxDOUBLE_BORDER)
93 wxFLAGS_MEMBER(wxRAISED_BORDER)
94 wxFLAGS_MEMBER(wxSTATIC_BORDER)
cb0afb26 95 wxFLAGS_MEMBER(wxBORDER)
bc9fb572
JS
96
97 // standard window styles
3ff066a4
SC
98 wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
99 wxFLAGS_MEMBER(wxCLIP_CHILDREN)
100 wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
101 wxFLAGS_MEMBER(wxWANTS_CHARS)
cb0afb26 102 wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
3ff066a4
SC
103 wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
104 wxFLAGS_MEMBER(wxVSCROLL)
105 wxFLAGS_MEMBER(wxHSCROLL)
bc9fb572
JS
106
107 // frame styles
3ff066a4
SC
108 wxFLAGS_MEMBER(wxSTAY_ON_TOP)
109 wxFLAGS_MEMBER(wxCAPTION)
1c067fe3 110#if WXWIN_COMPATIBILITY_2_6
3ff066a4 111 wxFLAGS_MEMBER(wxTHICK_FRAME)
1c067fe3 112#endif // WXWIN_COMPATIBILITY_2_6
3ff066a4
SC
113 wxFLAGS_MEMBER(wxSYSTEM_MENU)
114 wxFLAGS_MEMBER(wxRESIZE_BORDER)
1c067fe3 115#if WXWIN_COMPATIBILITY_2_6
3ff066a4 116 wxFLAGS_MEMBER(wxRESIZE_BOX)
1c067fe3 117#endif // WXWIN_COMPATIBILITY_2_6
3ff066a4
SC
118 wxFLAGS_MEMBER(wxCLOSE_BOX)
119 wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
120 wxFLAGS_MEMBER(wxMINIMIZE_BOX)
bc9fb572 121
3ff066a4
SC
122 wxFLAGS_MEMBER(wxFRAME_TOOL_WINDOW)
123 wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)
bc9fb572 124
3ff066a4 125 wxFLAGS_MEMBER(wxFRAME_SHAPED)
bc9fb572 126
3ff066a4 127wxEND_FLAGS( wxFrameStyle )
bc9fb572 128
51596bcb
SC
129IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
130
3ff066a4 131wxBEGIN_PROPERTIES_TABLE(wxFrame)
fb8a56b7 132 wxEVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
c5ca409b 133
3ff066a4 134 wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
af498247
VZ
135 wxPROPERTY_FLAGS( WindowStyle , wxFrameStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
136 wxPROPERTY( MenuBar , wxMenuBar * , SetMenuBar , GetMenuBar , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
3ff066a4 137wxEND_PROPERTIES_TABLE()
51596bcb 138
3ff066a4
SC
139wxBEGIN_HANDLERS_TABLE(wxFrame)
140wxEND_HANDLERS_TABLE()
51596bcb 141
cbe874bd 142wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
51596bcb
SC
143
144#else
58b43418 145IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
51596bcb 146#endif
2bda0e17 147
7c0ea335
VZ
148// ============================================================================
149// implementation
150// ============================================================================
151
152// ----------------------------------------------------------------------------
153// static class members
154// ----------------------------------------------------------------------------
155
1e6feb95
VZ
156#if wxUSE_STATUSBAR
157 #if wxUSE_NATIVE_STATUSBAR
cbe874bd 158 bool wxFrame::m_useNativeStatusBar = true;
1e6feb95 159 #else
cbe874bd 160 bool wxFrame::m_useNativeStatusBar = false;
1e6feb95
VZ
161 #endif
162#endif // wxUSE_NATIVE_STATUSBAR
2bda0e17 163
7c0ea335
VZ
164// ----------------------------------------------------------------------------
165// creation/destruction
166// ----------------------------------------------------------------------------
2bda0e17 167
0d53fc34 168void wxFrame::Init()
2bda0e17 169{
cf8ff92f
VZ
170#if wxUSE_MENUS
171 m_hMenu = NULL;
172#endif // wxUSE_MENUS
173
9f3362c4
VZ
174#if wxUSE_TOOLTIPS
175 m_hwndToolTip = 0;
176#endif
a2327a9f 177
cbe874bd 178 m_wasMinimized = false;
7c0ea335 179}
9f3362c4 180
0d53fc34 181bool wxFrame::Create(wxWindow *parent,
7c0ea335
VZ
182 wxWindowID id,
183 const wxString& title,
184 const wxPoint& pos,
185 const wxSize& size,
186 long style,
187 const wxString& name)
188{
82c9f85c 189 if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
ef6d716b 190 return false;
d2aef312 191
98a02e87 192 SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
b9691677 193
aaf803e9 194#if defined(__SMARTPHONE__)
ef6d716b
WS
195 SetLeftMenu(wxID_EXIT, _("Done"));
196#endif
197
855ec944 198#if wxUSE_ACCEL && defined(__POCKETPC__)
aaf803e9
JS
199 // The guidelines state that Ctrl+Q should quit the app.
200 // Let's define an accelerator table to send wxID_EXIT.
201 wxAcceleratorEntry entries[1];
202 entries[0].Set(wxACCEL_CTRL, 'Q', wxID_EXIT);
203 wxAcceleratorTable accel(1, entries);
204 SetAcceleratorTable(accel);
855ec944 205#endif // wxUSE_ACCEL && __POCKETPC__
aaf803e9 206
ef6d716b 207 return true;
2bda0e17
KB
208}
209
0d53fc34 210wxFrame::~wxFrame()
2bda0e17 211{
cbe874bd 212 m_isBeingDeleted = true;
82c9f85c 213 DeleteAllBars();
2bda0e17
KB
214}
215
d4597e13
VZ
216// ----------------------------------------------------------------------------
217// wxFrame client size calculations
218// ----------------------------------------------------------------------------
2bda0e17 219
0d53fc34 220void wxFrame::DoSetClientSize(int width, int height)
2bda0e17 221{
82c9f85c 222 // leave enough space for the status bar if we have (and show) it
7c0ea335 223#if wxUSE_STATUSBAR
8d8bd249
VZ
224 wxStatusBar *statbar = GetStatusBar();
225 if ( statbar && statbar->IsShown() )
226 {
8d8bd249
VZ
227 height += statbar->GetSize().y;
228 }
7c0ea335 229#endif // wxUSE_STATUSBAR
2bda0e17 230
68d02db3
VZ
231 // call GetClientAreaOrigin() to take the toolbar into account
232 wxPoint pt = GetClientAreaOrigin();
233 width += pt.x;
234 height += pt.y;
3882e746 235
7a976304 236#if wxUSE_TOOLBAR
3882e746
VZ
237 wxToolBar * const toolbar = GetToolBar();
238 if ( toolbar )
7a976304 239 {
3882e746 240 if ( toolbar->HasFlag(wxTB_RIGHT | wxTB_BOTTOM) )
7a976304 241 {
3882e746
VZ
242 const wxSize sizeTB = toolbar->GetSize();
243 if ( toolbar->HasFlag(wxTB_RIGHT) )
244 width -= sizeTB.x;
245 else // wxTB_BOTTOM
246 height -= sizeTB.y;
7a976304 247 }
3882e746 248 //else: toolbar already taken into account by GetClientAreaOrigin()
7a976304 249 }
3882e746 250#endif // wxUSE_TOOLBAR
68d02db3 251
82c9f85c 252 wxTopLevelWindow::DoSetClientSize(width, height);
2bda0e17
KB
253}
254
d4597e13
VZ
255// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
256void wxFrame::DoGetClientSize(int *x, int *y) const
257{
258 wxTopLevelWindow::DoGetClientSize(x, y);
259
68d02db3
VZ
260 // account for the possible toolbar
261 wxPoint pt = GetClientAreaOrigin();
262 if ( x )
263 *x -= pt.x;
264
265 if ( y )
266 *y -= pt.y;
3882e746 267
5b2acc3a 268#if wxUSE_TOOLBAR
3882e746
VZ
269 wxToolBar * const toolbar = GetToolBar();
270 if ( toolbar )
5b2acc3a 271 {
3882e746 272 if ( toolbar->HasFlag(wxTB_RIGHT | wxTB_BOTTOM) )
5b2acc3a 273 {
3882e746
VZ
274 const wxSize sizeTB = toolbar->GetSize();
275 if ( toolbar->HasFlag(wxTB_RIGHT) )
276 {
277 if ( x )
278 *x -= sizeTB.x;
279 }
280 else // wxTB_BOTTOM
281 {
282 if ( y )
283 *y -= sizeTB.y;
284 }
7a976304 285 }
3882e746 286 //else: toolbar already taken into account by GetClientAreaOrigin()
7a976304 287 }
3882e746
VZ
288#endif // wxUSE_TOOLBAR
289
d4597e13
VZ
290#if wxUSE_STATUSBAR
291 // adjust client area height to take the status bar into account
292 if ( y )
293 {
294 wxStatusBar *statbar = GetStatusBar();
295 if ( statbar && statbar->IsShown() )
296 {
297 *y -= statbar->GetClientSize().y;
298 }
299 }
300#endif // wxUSE_STATUSBAR
301}
302
7c0ea335 303// ----------------------------------------------------------------------------
0d53fc34 304// wxFrame: various geometry-related functions
7c0ea335
VZ
305// ----------------------------------------------------------------------------
306
0d53fc34 307void wxFrame::Raise()
c48926e1 308{
c48926e1 309 ::SetForegroundWindow(GetHwnd());
c48926e1
VZ
310}
311
67bd5bad 312// generate an artificial resize event
ecdc1183 313void wxFrame::SendSizeEvent(int flags)
67bd5bad 314{
67bd5bad
GT
315 if ( !m_iconized )
316 {
82c9f85c
VZ
317 RECT r = wxGetWindowRect(GetHwnd());
318
ecdc1183
VZ
319 if ( flags & wxSEND_EVENT_POST )
320 {
321 ::PostMessage(GetHwnd(), WM_SIZE,
322 IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
323 MAKELPARAM(r.right - r.left, r.bottom - r.top));
324 }
325 else // send it
326 {
327 ::SendMessage(GetHwnd(), WM_SIZE,
328 IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
329 MAKELPARAM(r.right - r.left, r.bottom - r.top));
330 }
67bd5bad
GT
331 }
332}
333
d427503c 334#if wxUSE_STATUSBAR
0d53fc34 335wxStatusBar *wxFrame::OnCreateStatusBar(int number,
7c0ea335
VZ
336 long style,
337 wxWindowID id,
338 const wxString& name)
2bda0e17 339{
5cb598ae 340 wxStatusBar *statusBar wxDUMMY_INITIALIZE(NULL);
2bda0e17 341
47d67540 342#if wxUSE_NATIVE_STATUSBAR
1f0500b3 343 if ( !UsesNativeStatusBar() )
2bda0e17 344 {
1f0500b3 345 statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style);
2bda0e17
KB
346 }
347 else
348#endif
349 {
1f0500b3
VZ
350 statusBar = new wxStatusBar(this, id, style, name);
351 }
ed791986 352
1f0500b3 353 statusBar->SetFieldsCount(number);
2bda0e17 354
7c0ea335 355 return statusBar;
2bda0e17
KB
356}
357
0d53fc34 358void wxFrame::PositionStatusBar()
2bda0e17 359{
d4597e13 360 if ( !m_frameStatusBar || !m_frameStatusBar->IsShown() )
ed791986
VZ
361 return;
362
cbc66a27
VZ
363 int w, h;
364 GetClientSize(&w, &h);
3882e746 365
cbc66a27
VZ
366 int sw, sh;
367 m_frameStatusBar->GetSize(&sw, &sh);
368
8efbb8ad
VZ
369 int x = 0;
370#if wxUSE_TOOLBAR
371 wxToolBar * const toolbar = GetToolBar();
372 if ( toolbar && !toolbar->HasFlag(wxTB_TOP) )
373 {
374 const wxSize sizeTB = toolbar->GetSize();
375
376 if ( toolbar->HasFlag(wxTB_LEFT | wxTB_RIGHT) )
377 {
378 if ( toolbar->HasFlag(wxTB_LEFT) )
379 x -= sizeTB.x;
380
381 w += sizeTB.x;
382 }
383 else // wxTB_BOTTOM
384 {
385 // we need to position the status bar below the toolbar
386 h += sizeTB.y;
387 }
388 }
389 //else: no adjustments necessary for the toolbar on top
390#endif // wxUSE_TOOLBAR
391
cbc66a27
VZ
392 // Since we wish the status bar to be directly under the client area,
393 // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
8efbb8ad 394 m_frameStatusBar->SetSize(x, h, w, sh);
2bda0e17 395}
3882e746 396
d427503c 397#endif // wxUSE_STATUSBAR
2bda0e17 398
6522713c 399#if wxUSE_MENUS_NATIVE
ea9a4296 400
0d53fc34 401void wxFrame::AttachMenuBar(wxMenuBar *menubar)
2bda0e17 402{
3180bc0e 403#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
fb8a56b7 404
ed679e74
WS
405 wxMenu *autoMenu = NULL;
406
407 if( menubar->GetMenuCount() == 1 )
408 {
409 autoMenu = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(menubar->GetMenu(0));
52af3158 410 SetRightMenu(wxID_ANY, menubar->GetMenuLabel(0), autoMenu);
ed679e74
WS
411 }
412 else
fb8a56b7 413 {
ed679e74
WS
414 autoMenu = new wxMenu;
415
416 for( size_t n = 0; n < menubar->GetMenuCount(); n++ )
417 {
418 wxMenu *item = menubar->GetMenu(n);
52af3158 419 wxString label = menubar->GetMenuLabel(n);
ed679e74
WS
420 wxMenu *new_item = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(item);
421 autoMenu->Append(wxID_ANY, label, new_item);
422 }
423
424 SetRightMenu(wxID_ANY, _("Menu"), autoMenu);
fb8a56b7
WS
425 }
426
fb8a56b7 427#elif defined(WINCE_WITHOUT_COMMANDBAR)
a96b4743
JS
428 if (!GetToolBar())
429 {
a9102b36 430 wxToolMenuBar* toolBar = new wxToolMenuBar(this, wxID_ANY,
a96b4743
JS
431 wxDefaultPosition, wxDefaultSize,
432 wxBORDER_NONE | wxTB_HORIZONTAL,
af5454a4 433 wxToolBarNameStr, menubar);
a96b4743
JS
434 SetToolBar(toolBar);
435 menubar->SetToolBar(toolBar);
436 }
fb8a56b7 437
c0a91b51
VZ
438 // When the main window is created using CW_USEDEFAULT the height of the
439 // menubar is not taken into account, so we resize it afterwards if a
440 // menubar is present
441 HWND hwndMenuBar = SHFindMenuBar(GetHwnd());
442 if ( hwndMenuBar )
fb8a56b7 443 {
c0a91b51
VZ
444 RECT mbRect;
445 ::GetWindowRect(hwndMenuBar, &mbRect);
446 const int menuHeight = mbRect.bottom - mbRect.top;
447
fb8a56b7 448 RECT rc;
c0a91b51 449 ::GetWindowRect(GetHwnd(), &rc);
fb8a56b7
WS
450 // adjust for menu / titlebar height
451 rc.bottom -= (2*menuHeight-1);
452
c0a91b51 453 ::MoveWindow(Gethwnd(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
fb8a56b7 454 }
a96b4743
JS
455#endif
456
f008af16 457 wxFrameBase::AttachMenuBar(menubar);
6beb85c0 458
f6bcfd97 459 if ( !menubar )
c2dcfdef 460 {
f6bcfd97
BP
461 // actually remove the menu from the frame
462 m_hMenu = (WXHMENU)0;
463 InternalSetMenuBar();
065de612 464 }
f6bcfd97 465 else // set new non NULL menu bar
065de612 466 {
3d487566 467#if !defined(__WXWINCE__) || defined(WINCE_WITH_COMMANDBAR)
f6bcfd97 468 // Can set a menubar several times.
f6bcfd97
BP
469 if ( menubar->GetHMenu() )
470 {
471 m_hMenu = menubar->GetHMenu();
472 }
f008af16 473 else // no HMENU yet
f6bcfd97 474 {
f6bcfd97 475 m_hMenu = menubar->Create();
065de612 476
f6bcfd97 477 if ( !m_hMenu )
f008af16
VZ
478 {
479 wxFAIL_MSG( _T("failed to create menu bar") );
f6bcfd97 480 return;
f008af16 481 }
f6bcfd97 482 }
39d2f9a7 483#endif
f6bcfd97 484 InternalSetMenuBar();
1e6feb95 485 }
2bda0e17
KB
486}
487
0d53fc34 488void wxFrame::InternalSetMenuBar()
2bda0e17 489{
a96b4743 490#if defined(__WXMICROWIN__) || defined(__WXWINCE__)
4676948b 491 // Nothing
4676948b 492#else
42e69d6b 493 if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
2bda0e17 494 {
f6bcfd97 495 wxLogLastError(wxT("SetMenu"));
2bda0e17 496 }
04ef50df 497#endif
2bda0e17
KB
498}
499
1e6feb95
VZ
500#endif // wxUSE_MENUS_NATIVE
501
2bda0e17 502// Responds to colour changes, and passes event on to children.
0d53fc34 503void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
2bda0e17 504{
98a02e87 505 SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
2bda0e17
KB
506 Refresh();
507
1e6feb95 508#if wxUSE_STATUSBAR
2bda0e17
KB
509 if ( m_frameStatusBar )
510 {
511 wxSysColourChangedEvent event2;
512 event2.SetEventObject( m_frameStatusBar );
937013e0 513 m_frameStatusBar->HandleWindowEvent(event2);
2bda0e17 514 }
1e6feb95 515#endif // wxUSE_STATUSBAR
2bda0e17
KB
516
517 // Propagate the event to the non-top-level children
518 wxWindow::OnSysColourChanged(event);
519}
520
cbe874bd 521// Pass true to show full screen, false to restore.
0d53fc34 522bool wxFrame::ShowFullScreen(bool show, long style)
a2327a9f 523{
b01a88e0
VZ
524 // TODO-CE: add support for CE
525#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
085ad686 526 if ( IsFullScreen() == show )
cbe874bd 527 return false;
c641b1d2 528
a2327a9f
JS
529 if (show)
530 {
b01a88e0
VZ
531 // zap the toolbar, menubar, and statusbar if needed
532 //
533 // TODO: hide commandbar for WINCE_WITH_COMMANDBAR
1e6feb95 534#if wxUSE_TOOLBAR
f6bcfd97 535 wxToolBar *theToolBar = GetToolBar();
a2327a9f
JS
536
537 if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
538 {
b01a88e0
VZ
539 if ( theToolBar->IsShown() )
540 {
541 theToolBar->SetSize(wxDefaultCoord,0);
542 theToolBar->Show(false);
543 }
544 else // prevent it from being restored later
545 {
546 style &= ~wxFULLSCREEN_NOTOOLBAR;
547 }
a2327a9f 548 }
1e6feb95 549#endif // wxUSE_TOOLBAR
a2327a9f
JS
550
551 if (style & wxFULLSCREEN_NOMENUBAR)
552 SetMenu((HWND)GetHWND(), (HMENU) NULL);
553
1e6feb95
VZ
554#if wxUSE_STATUSBAR
555 wxStatusBar *theStatusBar = GetStatusBar();
1e6feb95 556
a2327a9f
JS
557 // Save the number of fields in the statusbar
558 if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
559 {
b01a88e0
VZ
560 if ( theStatusBar->IsShown() )
561 theStatusBar->Show(false);
562 else
563 style &= ~wxFULLSCREEN_NOSTATUSBAR;
a2327a9f 564 }
1e6feb95 565#endif // wxUSE_STATUSBAR
a2327a9f 566 }
b01a88e0 567 else // restore to normal
a2327a9f 568 {
b01a88e0 569 // restore the toolbar, menubar, and statusbar if we had hid them
1e6feb95 570#if wxUSE_TOOLBAR
a2327a9f
JS
571 wxToolBar *theToolBar = GetToolBar();
572
b01a88e0 573 if ((m_fsStyle & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
a2327a9f 574 {
cbe874bd 575 theToolBar->Show(true);
a2327a9f 576 }
1e6feb95 577#endif // wxUSE_TOOLBAR
a2327a9f 578
a8ff046b 579#if wxUSE_MENUS
bc88602a
JS
580 if (m_fsStyle & wxFULLSCREEN_NOMENUBAR)
581 {
582 WXHMENU menu = m_hMenu;
583
584#if wxUSE_MDI_ARCHITECTURE
585 wxMDIParentFrame *frame = wxDynamicCast(this, wxMDIParentFrame);
586 if (frame)
587 {
588 wxMDIChildFrame *child = frame->GetActiveChild();
589 if (child)
590 {
591 menu = child->GetWinMenu();
592 }
593 }
594#endif // wxUSE_MDI_ARCHITECTURE
595
596 if (menu)
597 {
598 ::SetMenu(GetHwnd(), (HMENU)menu);
599 }
600 }
a8ff046b 601#endif // wxUSE_MENUS
b01a88e0 602
1e6feb95 603#if wxUSE_STATUSBAR
b01a88e0
VZ
604 wxStatusBar *theStatusBar = GetStatusBar();
605
606 if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
a2327a9f 607 {
b01a88e0
VZ
608 theStatusBar->Show(true);
609 PositionStatusBar();
a2327a9f 610 }
1e6feb95 611#endif // wxUSE_STATUSBAR
a2327a9f 612 }
b01a88e0 613#endif // !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
f6bcfd97 614
085ad686 615 return wxFrameBase::ShowFullScreen(show, style);
2bda0e17
KB
616}
617
7c0ea335
VZ
618// ----------------------------------------------------------------------------
619// tool/status bar stuff
620// ----------------------------------------------------------------------------
621
d427503c 622#if wxUSE_TOOLBAR
7c0ea335 623
0d53fc34 624wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
81d66cf3 625{
3d487566 626#if defined(WINCE_WITHOUT_COMMANDBAR)
39d2f9a7
JS
627 // We may already have a toolbar from calling SetMenuBar.
628 if (GetToolBar())
629 return GetToolBar();
630#endif
7c0ea335 631 if ( wxFrameBase::CreateToolBar(style, id, name) )
81d66cf3 632 {
81d66cf3 633 PositionToolBar();
81d66cf3 634 }
81d66cf3 635
7c0ea335 636 return m_frameToolBar;
81d66cf3
JS
637}
638
0d53fc34 639void wxFrame::PositionToolBar()
81d66cf3 640{
8898842f
VZ
641 // TODO: we want to do something different in WinCE, because the toolbar
642 // should be associated with the commandbar, instead of being
643 // independent window.
644#if !defined(WINCE_WITHOUT_COMMANDBAR)
d4597e13
VZ
645 wxToolBar *toolbar = GetToolBar();
646 if ( toolbar && toolbar->IsShown() )
647 {
648 // don't call our (or even wxTopLevelWindow) version because we want
649 // the real (full) client area size, not excluding the tool/status bar
650 int width, height;
651 wxWindow::DoGetClientSize(&width, &height);
81d66cf3 652
7c0ea335 653#if wxUSE_STATUSBAR
d4597e13
VZ
654 wxStatusBar *statbar = GetStatusBar();
655 if ( statbar && statbar->IsShown() )
656 {
657 height -= statbar->GetClientSize().y;
658 }
7c0ea335 659#endif // wxUSE_STATUSBAR
3882e746
VZ
660
661 int tx, ty, tw, th;
662 toolbar->GetPosition( &tx, &ty );
663 toolbar->GetSize( &tw, &th );
664
dd639a4f 665 int x, y;
3882e746
VZ
666 if ( toolbar->HasFlag(wxTB_BOTTOM) )
667 {
668 x = 0;
669 y = height - th;
670 }
671 else if ( toolbar->HasFlag(wxTB_RIGHT) )
672 {
673 x = width - tw;
674 y = 0;
675 }
676 else // left or top
677 {
678 x = 0;
679 y = 0;
680 }
681
3d487566 682#if defined(WINCE_WITH_COMMANDBAR)
fb8a56b7
WS
683 // We're using a commandbar - so we have to allow for it.
684 if (GetMenuBar() && GetMenuBar()->GetCommandBar())
685 {
686 RECT rect;
687 ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
688 y = rect.bottom - rect.top;
689 }
3882e746
VZ
690#endif // WINCE_WITH_COMMANDBAR
691
692 if ( toolbar->HasFlag(wxTB_BOTTOM) )
693 {
694 if ( ty < 0 && ( -ty == th ) )
695 ty = height - th;
696 if ( tx < 0 && (-tx == tw ) )
697 tx = 0;
698 }
699 else if ( toolbar->HasFlag(wxTB_RIGHT) )
7a976304
VZ
700 {
701 if( ty < 0 && ( -ty == th ) )
702 ty = 0;
703 if( tx < 0 && ( -tx == tw ) )
704 tx = width - tw;
705 }
3882e746
VZ
706 else // left or top
707 {
708 if (ty < 0 && (-ty == th))
709 ty = 0;
710 if (tx < 0 && (-tx == tw))
711 tx = 0;
712 }
cbe874bd 713
229de929
JS
714 int desiredW = tw;
715 int desiredH = th;
81d66cf3 716
7a976304 717 if ( toolbar->IsVertical() )
81d66cf3 718 {
229de929 719 desiredH = height;
81d66cf3
JS
720 }
721 else
722 {
229de929 723 desiredW = width;
cbe874bd 724 }
7c0ea335 725
d4597e13
VZ
726 // use the 'real' MSW position here, don't offset relativly to the
727 // client area origin
229de929
JS
728
729 // Optimise such that we don't have to always resize the toolbar
cbe874bd 730 // when the frame changes, otherwise we'll get a lot of flicker.
5cb598ae
WS
731 bool heightChanging wxDUMMY_INITIALIZE(true);
732 bool widthChanging wxDUMMY_INITIALIZE(true);
cbe874bd 733
7a976304 734 if ( toolbar->IsVertical() )
229de929
JS
735 {
736 // It's OK if the current height is greater than what can be shown.
737 heightChanging = (desiredH > th) ;
738 widthChanging = (desiredW != tw) ;
cbe874bd
WS
739
740 // The next time around, we may not have to set the size
229de929
JS
741 if (heightChanging)
742 desiredH = desiredH + 200;
743 }
744 else
745 {
746 // It's OK if the current width is greater than what can be shown.
747 widthChanging = (desiredW > tw) ;
748 heightChanging = (desiredH != th) ;
749
cbe874bd 750 // The next time around, we may not have to set the size
229de929
JS
751 if (widthChanging)
752 desiredW = desiredW + 200;
753 }
cbe874bd 754
229de929 755 if (tx != 0 || ty != 0 || widthChanging || heightChanging)
45f27284 756 toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
cbe874bd 757
81d66cf3 758 }
8898842f 759#endif // !WINCE_WITH_COMMANDBAR
81d66cf3 760}
d4597e13 761
d427503c 762#endif // wxUSE_TOOLBAR
d2aef312 763
7c0ea335
VZ
764// ----------------------------------------------------------------------------
765// frame state (iconized/maximized/...)
766// ----------------------------------------------------------------------------
767
a23fd0e1
VZ
768// propagate our state change to all child frames: this allows us to emulate X
769// Windows behaviour where child frames float independently of the parent one
770// on the desktop, but are iconized/restored with it
0d53fc34 771void wxFrame::IconizeChildFrames(bool bIconize)
d2aef312 772{
4bc0f25e
VZ
773 m_iconized = bIconize;
774
222ed1d6 775 for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
a23fd0e1
VZ
776 node;
777 node = node->GetNext() )
778 {
779 wxWindow *win = node->GetData();
780
3ca6a5f0
BP
781 // iconizing the frames with this style under Win95 shell puts them at
782 // the bottom of the screen (as the MDI children) instead of making
783 // them appear in the taskbar because they are, by virtue of this
784 // style, not managed by the taskbar - instead leave Windows take care
785 // of them
3ca6a5f0
BP
786 if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW )
787 continue;
3ca6a5f0 788
3f7bc32b
VZ
789 // the child MDI frames are a special case and should not be touched by
790 // the parent frame - instead, they are managed by the user
2e9f62da 791 wxFrame *frame = wxDynamicCast(win, wxFrame);
1e6feb95
VZ
792 if ( frame
793#if wxUSE_MDI_ARCHITECTURE
4ab2824c 794 && !frame->IsMDIChild()
1e6feb95
VZ
795#endif // wxUSE_MDI_ARCHITECTURE
796 )
a23fd0e1 797 {
9327c3aa
VZ
798 // we don't want to restore the child frames which had been
799 // iconized even before we were iconized, so save the child frame
800 // status when iconizing the parent frame and check it when
801 // restoring it
802 if ( bIconize )
803 {
9c72ebec 804 frame->m_wasMinimized = frame->IsIconized();
9327c3aa
VZ
805 }
806
9c72ebec
VZ
807 // note that we shouldn't touch the hidden frames neither because
808 // iconizing/restoring them would show them as a side effect
809 if ( !frame->m_wasMinimized && frame->IsShown() )
9327c3aa 810 frame->Iconize(bIconize);
a23fd0e1 811 }
d2aef312 812 }
d2aef312
VZ
813}
814
0d53fc34 815WXHICON wxFrame::GetDefaultIcon() const
82c9f85c 816{
94826170
VZ
817 // we don't have any standard icons (any more)
818 return (WXHICON)0;
82c9f85c
VZ
819}
820
a23fd0e1 821// ===========================================================================
42e69d6b 822// message processing
a23fd0e1
VZ
823// ===========================================================================
824
42e69d6b
VZ
825// ---------------------------------------------------------------------------
826// preprocessing
827// ---------------------------------------------------------------------------
828
1ac76609 829bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)
42e69d6b
VZ
830{
831 if ( wxWindow::MSWTranslateMessage(pMsg) )
cbe874bd 832 return true;
42e69d6b 833
1e6feb95 834#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
7802da36 835 // try the menu bar accelerators
42e69d6b 836 wxMenuBar *menuBar = GetMenuBar();
7802da36
VZ
837 if ( menuBar && menuBar->GetAcceleratorTable()->Translate(frame, pMsg) )
838 return true;
a1a1ca89 839#endif // wxUSE_MENUS && wxUSE_ACCEL
42e69d6b 840
cbe874bd 841 return false;
42e69d6b
VZ
842}
843
844// ---------------------------------------------------------------------------
845// our private (non virtual) message handlers
846// ---------------------------------------------------------------------------
847
4bc0f25e 848bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
42e69d6b 849{
4676948b 850#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
42e69d6b
VZ
851 switch ( id )
852 {
4bc0f25e
VZ
853 case SIZE_RESTORED:
854 case SIZE_MAXIMIZED:
42e69d6b
VZ
855 // only do it it if we were iconized before, otherwise resizing the
856 // parent frame has a curious side effect of bringing it under it's
857 // children
858 if ( !m_iconized )
859 break;
860
861 // restore all child frames too
cbe874bd 862 IconizeChildFrames(false);
42e69d6b 863
cbe874bd 864 (void)SendIconizeEvent(false);
42e69d6b
VZ
865 break;
866
4bc0f25e 867 case SIZE_MINIMIZED:
42e69d6b 868 // iconize all child frames too
cbe874bd 869 IconizeChildFrames(true);
42e69d6b
VZ
870 break;
871 }
276c8cfb
WS
872#else
873 wxUnusedVar(id);
4bc0f25e 874#endif // !__WXWINCE__
42e69d6b
VZ
875
876 if ( !m_iconized )
877 {
1e6feb95 878#if wxUSE_STATUSBAR
42e69d6b 879 PositionStatusBar();
1e6feb95
VZ
880#endif // wxUSE_STATUSBAR
881
882#if wxUSE_TOOLBAR
42e69d6b 883 PositionToolBar();
1e6feb95 884#endif // wxUSE_TOOLBAR
42e69d6b 885
3d487566 886#if defined(WINCE_WITH_COMMANDBAR)
fb8a56b7
WS
887 // Position the menu command bar
888 if (GetMenuBar() && GetMenuBar()->GetCommandBar())
889 {
890 RECT rect;
891 ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
892 wxSize clientSz = GetClientSize();
893
894 if ( !::MoveWindow((HWND) GetMenuBar()->GetCommandBar(), 0, 0, clientSz.x, rect.bottom - rect.top, true ) )
895 {
896 wxLogLastError(wxT("MoveWindow"));
897 }
898
899 }
4bc0f25e 900#endif // WINCE_WITH_COMMANDBAR
42e69d6b
VZ
901 }
902
4bc0f25e
VZ
903 // call the base class version to generate the appropriate events
904 return false;
42e69d6b
VZ
905}
906
660e7fda 907bool wxFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control)
42e69d6b 908{
a6ac49b1
VZ
909 // we only need to handle the menu and accelerator commands from the items
910 // of our menu bar, base wxWindow class already handles the rest
911 if ( !control && (cmd == 0 /* menu */ || cmd == 1 /* accel */) )
42e69d6b 912 {
1e6feb95 913#if wxUSE_MENUS_NATIVE
a6ac49b1 914 if ( !wxCurrentPopupMenu )
1e6feb95 915#endif // wxUSE_MENUS_NATIVE
fb8a56b7 916 {
a6ac49b1
VZ
917 wxMenuBar * const mbar = GetMenuBar();
918 if ( mbar )
919 {
920 // sign extend to int from short before comparing with the
921 // other int ids
922 const int id = (signed short)id_;
fb8a56b7 923
a6ac49b1
VZ
924 wxMenuItem * const mitem = mbar->FindItem(id);
925 if ( mitem )
926 return ProcessCommand(mitem);
927 }
42e69d6b
VZ
928 }
929 }
930
a6ac49b1 931 return wxFrameBase::HandleCommand(id_, cmd, control);;
42e69d6b
VZ
932}
933
a8ff046b
VZ
934#if wxUSE_MENUS
935
0d53fc34 936bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
a23fd0e1
VZ
937{
938 int item;
c219cecc 939 if ( flags == 0xFFFF && hMenu == 0 )
a23fd0e1 940 {
c219cecc 941 // menu was removed from screen
a23fd0e1
VZ
942 item = -1;
943 }
04ef50df 944#ifndef __WXMICROWIN__
c219cecc 945 else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
a23fd0e1
VZ
946 {
947 item = nItem;
948 }
04ef50df 949#endif
a23fd0e1
VZ
950 else
951 {
c219cecc 952 // don't give hints for separators (doesn't make sense) nor for the
f6bcfd97
BP
953 // items opening popup menus (they don't have them anyhow) but do clear
954 // the status line - otherwise, we would be left with the help message
955 // for the previous item which doesn't apply any more
6d99eb3e 956 DoGiveHelp(wxEmptyString, true);
f6bcfd97 957
cbe874bd 958 return false;
a23fd0e1
VZ
959 }
960
961 wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
ccef86c7
VZ
962 event.SetEventObject(this);
963
937013e0 964 return HandleWindowEvent(event);
ccef86c7
VZ
965}
966
967bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup)
968{
969 // we don't have the menu id here, so we use the id to specify if the event
970 // was from a popup menu or a normal one
971 wxMenuEvent event(evtType, isPopup ? -1 : 0);
972 event.SetEventObject(this);
a23fd0e1 973
937013e0 974 return HandleWindowEvent(event);
a23fd0e1
VZ
975}
976
a8ff046b
VZ
977bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
978{
979 wxMenu* menu = NULL;
980 if (GetMenuBar())
981 {
982 int nCount = GetMenuBar()->GetMenuCount();
983 for (int n = 0; n < nCount; n++)
984 {
985 if (GetMenuBar()->GetMenu(n)->GetHMenu() == hMenu)
986 {
987 menu = GetMenuBar()->GetMenu(n);
988 break;
989 }
990 }
991 }
992
993 wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);
994 event.SetEventObject(this);
995
937013e0 996 return HandleWindowEvent(event);
a8ff046b
VZ
997}
998
999#endif // wxUSE_MENUS
1000
a23fd0e1 1001// ---------------------------------------------------------------------------
0d53fc34 1002// the window proc for wxFrame
a23fd0e1
VZ
1003// ---------------------------------------------------------------------------
1004
c140b7e7 1005WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
a23fd0e1 1006{
c140b7e7 1007 WXLRESULT rc = 0;
cbe874bd 1008 bool processed = false;
a23fd0e1
VZ
1009
1010 switch ( message )
1011 {
42e69d6b
VZ
1012 case WM_CLOSE:
1013 // if we can't close, tell the system that we processed the
1014 // message - otherwise it would close us
1015 processed = !Close();
1016 break;
1017
ccef86c7
VZ
1018 case WM_SIZE:
1019 processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
1020 break;
1021
42e69d6b
VZ
1022 case WM_COMMAND:
1023 {
1024 WORD id, cmd;
1025 WXHWND hwnd;
1026 UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam,
1027 &id, &hwnd, &cmd);
1028
a6ac49b1
VZ
1029 HandleCommand(id, cmd, (WXHWND)hwnd);
1030
1031 // don't pass WM_COMMAND to the base class whether we processed
1032 // it or not because we did generate an event for it (our
1033 // HandleCommand() calls the base class version) and we must
1034 // not do it again or the handlers which skip the event would
1035 // be called twice
1036 processed = true;
42e69d6b
VZ
1037 }
1038 break;
1039
a8ff046b
VZ
1040#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
1041#if wxUSE_MENUS
92f1a59c
JS
1042 case WM_INITMENUPOPUP:
1043 processed = HandleInitMenuPopup((WXHMENU) wParam);
1044 break;
1045
a23fd0e1
VZ
1046 case WM_MENUSELECT:
1047 {
42e69d6b
VZ
1048 WXWORD item, flags;
1049 WXHMENU hmenu;
1050 UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
1051
1052 processed = HandleMenuSelect(item, flags, hmenu);
a23fd0e1
VZ
1053 }
1054 break;
bc92cdf9 1055
ccef86c7 1056 case WM_EXITMENULOOP:
373a5fb3 1057 processed = HandleMenuLoop(wxEVT_MENU_CLOSE, (WXWORD)wParam);
ccef86c7 1058 break;
a8ff046b 1059#endif // wxUSE_MENUS
ccef86c7 1060
42e69d6b
VZ
1061 case WM_QUERYDRAGICON:
1062 {
f618020a
MB
1063 const wxIcon& icon = GetIcon();
1064 HICON hIcon = icon.Ok() ? GetHiconOf(icon)
1065 : (HICON)GetDefaultIcon();
dca0f651 1066 rc = (WXLRESULT)hIcon;
42e69d6b
VZ
1067 processed = rc != 0;
1068 }
1069 break;
ccef86c7 1070#endif // !__WXMICROWIN__
a23fd0e1
VZ
1071 }
1072
1073 if ( !processed )
7e25f59e 1074 rc = wxFrameBase::MSWWindowProc(message, wParam, lParam);
a23fd0e1
VZ
1075
1076 return rc;
1077}
21802234 1078
a9928e9d
JS
1079// ----------------------------------------------------------------------------
1080// wxFrame size management: we exclude the areas taken by menu/status/toolbars
1081// from the client area, so the client area is what's really available for the
1082// frame contents
1083// ----------------------------------------------------------------------------
1084
1085// get the origin of the client area in the client coordinates
1086wxPoint wxFrame::GetClientAreaOrigin() const
1087{
1088 wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
1089
1090#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && \
1091 (!defined(__WXWINCE__) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
3882e746 1092 wxToolBar * const toolbar = GetToolBar();
a9928e9d
JS
1093 if ( toolbar && toolbar->IsShown() )
1094 {
3882e746 1095 const wxSize sizeTB = toolbar->GetSize();
a9928e9d 1096
3882e746 1097 if ( toolbar->HasFlag(wxTB_TOP) )
a9928e9d 1098 {
3882e746 1099 pt.y += sizeTB.y;
a9928e9d 1100 }
3882e746 1101 else if ( toolbar->HasFlag(wxTB_LEFT) )
a9928e9d 1102 {
3882e746 1103 pt.x += sizeTB.x;
a9928e9d
JS
1104 }
1105 }
1106#endif // wxUSE_TOOLBAR
1107
3d487566 1108#if defined(WINCE_WITH_COMMANDBAR)
fb8a56b7
WS
1109 if (GetMenuBar() && GetMenuBar()->GetCommandBar())
1110 {
1111 RECT rect;
1112 ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
1113 pt.y += (rect.bottom - rect.top);
1114 }
a9928e9d
JS
1115#endif
1116
1117 return pt;
1118}