]> git.saurik.com Git - wxWidgets.git/blame - src/msw/frame.cpp
Version changes
[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
0d53fc34 313void wxFrame::SendSizeEvent()
67bd5bad 314{
67bd5bad
GT
315 if ( !m_iconized )
316 {
82c9f85c
VZ
317 RECT r = wxGetWindowRect(GetHwnd());
318
67bd5bad
GT
319 (void)::PostMessage(GetHwnd(), WM_SIZE,
320 IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
321 MAKELPARAM(r.right - r.left, r.bottom - r.top));
322 }
323}
324
d427503c 325#if wxUSE_STATUSBAR
0d53fc34 326wxStatusBar *wxFrame::OnCreateStatusBar(int number,
7c0ea335
VZ
327 long style,
328 wxWindowID id,
329 const wxString& name)
2bda0e17 330{
5cb598ae 331 wxStatusBar *statusBar wxDUMMY_INITIALIZE(NULL);
2bda0e17 332
47d67540 333#if wxUSE_NATIVE_STATUSBAR
1f0500b3 334 if ( !UsesNativeStatusBar() )
2bda0e17 335 {
1f0500b3 336 statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style);
2bda0e17
KB
337 }
338 else
339#endif
340 {
1f0500b3
VZ
341 statusBar = new wxStatusBar(this, id, style, name);
342 }
ed791986 343
1f0500b3 344 statusBar->SetFieldsCount(number);
2bda0e17 345
7c0ea335 346 return statusBar;
2bda0e17
KB
347}
348
0d53fc34 349void wxFrame::PositionStatusBar()
2bda0e17 350{
d4597e13 351 if ( !m_frameStatusBar || !m_frameStatusBar->IsShown() )
ed791986
VZ
352 return;
353
cbc66a27
VZ
354 int w, h;
355 GetClientSize(&w, &h);
3882e746 356
cbc66a27
VZ
357 int sw, sh;
358 m_frameStatusBar->GetSize(&sw, &sh);
359
360 // Since we wish the status bar to be directly under the client area,
361 // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
362 m_frameStatusBar->SetSize(0, h, w, sh);
2bda0e17 363}
3882e746 364
d427503c 365#endif // wxUSE_STATUSBAR
2bda0e17 366
6522713c 367#if wxUSE_MENUS_NATIVE
ea9a4296 368
0d53fc34 369void wxFrame::AttachMenuBar(wxMenuBar *menubar)
2bda0e17 370{
3180bc0e 371#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
fb8a56b7 372
ed679e74
WS
373 wxMenu *autoMenu = NULL;
374
375 if( menubar->GetMenuCount() == 1 )
376 {
377 autoMenu = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(menubar->GetMenu(0));
378 SetRightMenu(wxID_ANY, menubar->GetLabelTop(0), autoMenu);
379 }
380 else
fb8a56b7 381 {
ed679e74
WS
382 autoMenu = new wxMenu;
383
384 for( size_t n = 0; n < menubar->GetMenuCount(); n++ )
385 {
386 wxMenu *item = menubar->GetMenu(n);
387 wxString label = menubar->GetLabelTop(n);
388 wxMenu *new_item = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(item);
389 autoMenu->Append(wxID_ANY, label, new_item);
390 }
391
392 SetRightMenu(wxID_ANY, _("Menu"), autoMenu);
fb8a56b7
WS
393 }
394
fb8a56b7 395#elif defined(WINCE_WITHOUT_COMMANDBAR)
a96b4743
JS
396 if (!GetToolBar())
397 {
a9102b36 398 wxToolMenuBar* toolBar = new wxToolMenuBar(this, wxID_ANY,
a96b4743
JS
399 wxDefaultPosition, wxDefaultSize,
400 wxBORDER_NONE | wxTB_HORIZONTAL,
af5454a4 401 wxToolBarNameStr, menubar);
a96b4743
JS
402 SetToolBar(toolBar);
403 menubar->SetToolBar(toolBar);
404 }
fb8a56b7
WS
405 // Now adjust size for menu bar
406 int menuHeight = 26;
407
408 //When the main window is created using CW_USEDEFAULT the height of the
409 // is created is not taken into account). So we resize the window after
410 // if a menubar is present
411 {
412 RECT rc;
413 ::GetWindowRect((HWND) GetHWND(), &rc);
414 // adjust for menu / titlebar height
415 rc.bottom -= (2*menuHeight-1);
416
cbe874bd 417 ::MoveWindow((HWND) GetHWND(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
fb8a56b7 418 }
a96b4743
JS
419#endif
420
f008af16 421 wxFrameBase::AttachMenuBar(menubar);
6beb85c0 422
f6bcfd97 423 if ( !menubar )
c2dcfdef 424 {
f6bcfd97
BP
425 // actually remove the menu from the frame
426 m_hMenu = (WXHMENU)0;
427 InternalSetMenuBar();
065de612 428 }
f6bcfd97 429 else // set new non NULL menu bar
065de612 430 {
3d487566 431#if !defined(__WXWINCE__) || defined(WINCE_WITH_COMMANDBAR)
f6bcfd97 432 // Can set a menubar several times.
f6bcfd97
BP
433 if ( menubar->GetHMenu() )
434 {
435 m_hMenu = menubar->GetHMenu();
436 }
f008af16 437 else // no HMENU yet
f6bcfd97 438 {
f6bcfd97 439 m_hMenu = menubar->Create();
065de612 440
f6bcfd97 441 if ( !m_hMenu )
f008af16
VZ
442 {
443 wxFAIL_MSG( _T("failed to create menu bar") );
f6bcfd97 444 return;
f008af16 445 }
f6bcfd97 446 }
39d2f9a7 447#endif
f6bcfd97 448 InternalSetMenuBar();
1e6feb95 449 }
2bda0e17
KB
450}
451
0d53fc34 452void wxFrame::InternalSetMenuBar()
2bda0e17 453{
a96b4743 454#if defined(__WXMICROWIN__) || defined(__WXWINCE__)
4676948b 455 // Nothing
4676948b 456#else
42e69d6b 457 if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
2bda0e17 458 {
f6bcfd97 459 wxLogLastError(wxT("SetMenu"));
2bda0e17 460 }
04ef50df 461#endif
2bda0e17
KB
462}
463
1e6feb95
VZ
464#endif // wxUSE_MENUS_NATIVE
465
2bda0e17 466// Responds to colour changes, and passes event on to children.
0d53fc34 467void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
2bda0e17 468{
98a02e87 469 SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
2bda0e17
KB
470 Refresh();
471
1e6feb95 472#if wxUSE_STATUSBAR
2bda0e17
KB
473 if ( m_frameStatusBar )
474 {
475 wxSysColourChangedEvent event2;
476 event2.SetEventObject( m_frameStatusBar );
02800301 477 m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
2bda0e17 478 }
1e6feb95 479#endif // wxUSE_STATUSBAR
2bda0e17
KB
480
481 // Propagate the event to the non-top-level children
482 wxWindow::OnSysColourChanged(event);
483}
484
cbe874bd 485// Pass true to show full screen, false to restore.
0d53fc34 486bool wxFrame::ShowFullScreen(bool show, long style)
a2327a9f 487{
b01a88e0
VZ
488 // TODO-CE: add support for CE
489#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
085ad686 490 if ( IsFullScreen() == show )
cbe874bd 491 return false;
c641b1d2 492
a2327a9f
JS
493 if (show)
494 {
b01a88e0
VZ
495 // zap the toolbar, menubar, and statusbar if needed
496 //
497 // TODO: hide commandbar for WINCE_WITH_COMMANDBAR
1e6feb95 498#if wxUSE_TOOLBAR
f6bcfd97 499 wxToolBar *theToolBar = GetToolBar();
a2327a9f
JS
500
501 if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
502 {
b01a88e0
VZ
503 if ( theToolBar->IsShown() )
504 {
505 theToolBar->SetSize(wxDefaultCoord,0);
506 theToolBar->Show(false);
507 }
508 else // prevent it from being restored later
509 {
510 style &= ~wxFULLSCREEN_NOTOOLBAR;
511 }
a2327a9f 512 }
1e6feb95 513#endif // wxUSE_TOOLBAR
a2327a9f
JS
514
515 if (style & wxFULLSCREEN_NOMENUBAR)
516 SetMenu((HWND)GetHWND(), (HMENU) NULL);
517
1e6feb95
VZ
518#if wxUSE_STATUSBAR
519 wxStatusBar *theStatusBar = GetStatusBar();
1e6feb95 520
a2327a9f
JS
521 // Save the number of fields in the statusbar
522 if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
523 {
b01a88e0
VZ
524 if ( theStatusBar->IsShown() )
525 theStatusBar->Show(false);
526 else
527 style &= ~wxFULLSCREEN_NOSTATUSBAR;
a2327a9f 528 }
1e6feb95 529#endif // wxUSE_STATUSBAR
a2327a9f 530 }
b01a88e0 531 else // restore to normal
a2327a9f 532 {
b01a88e0 533 // restore the toolbar, menubar, and statusbar if we had hid them
1e6feb95 534#if wxUSE_TOOLBAR
a2327a9f
JS
535 wxToolBar *theToolBar = GetToolBar();
536
b01a88e0 537 if ((m_fsStyle & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
a2327a9f 538 {
cbe874bd 539 theToolBar->Show(true);
a2327a9f 540 }
1e6feb95 541#endif // wxUSE_TOOLBAR
a2327a9f 542
bc88602a
JS
543 if (m_fsStyle & wxFULLSCREEN_NOMENUBAR)
544 {
545 WXHMENU menu = m_hMenu;
546
547#if wxUSE_MDI_ARCHITECTURE
548 wxMDIParentFrame *frame = wxDynamicCast(this, wxMDIParentFrame);
549 if (frame)
550 {
551 wxMDIChildFrame *child = frame->GetActiveChild();
552 if (child)
553 {
554 menu = child->GetWinMenu();
555 }
556 }
557#endif // wxUSE_MDI_ARCHITECTURE
558
559 if (menu)
560 {
561 ::SetMenu(GetHwnd(), (HMENU)menu);
562 }
563 }
b01a88e0 564
1e6feb95 565#if wxUSE_STATUSBAR
b01a88e0
VZ
566 wxStatusBar *theStatusBar = GetStatusBar();
567
568 if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
a2327a9f 569 {
b01a88e0
VZ
570 theStatusBar->Show(true);
571 PositionStatusBar();
a2327a9f 572 }
1e6feb95 573#endif // wxUSE_STATUSBAR
a2327a9f 574 }
b01a88e0 575#endif // !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
f6bcfd97 576
085ad686 577 return wxFrameBase::ShowFullScreen(show, style);
2bda0e17
KB
578}
579
7c0ea335
VZ
580// ----------------------------------------------------------------------------
581// tool/status bar stuff
582// ----------------------------------------------------------------------------
583
d427503c 584#if wxUSE_TOOLBAR
7c0ea335 585
0d53fc34 586wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
81d66cf3 587{
3d487566 588#if defined(WINCE_WITHOUT_COMMANDBAR)
39d2f9a7
JS
589 // We may already have a toolbar from calling SetMenuBar.
590 if (GetToolBar())
591 return GetToolBar();
592#endif
7c0ea335 593 if ( wxFrameBase::CreateToolBar(style, id, name) )
81d66cf3 594 {
81d66cf3 595 PositionToolBar();
81d66cf3 596 }
81d66cf3 597
7c0ea335 598 return m_frameToolBar;
81d66cf3
JS
599}
600
0d53fc34 601void wxFrame::PositionToolBar()
81d66cf3 602{
5b2acc3a 603 int x = 0, y = 0;
d4597e13
VZ
604 wxToolBar *toolbar = GetToolBar();
605 if ( toolbar && toolbar->IsShown() )
606 {
3d487566 607#if defined(WINCE_WITHOUT_COMMANDBAR)
09785dd3
JS
608 // We want to do something different in WinCE, because
609 // the toolbar should be associated with the commandbar,
610 // and not an independent window.
611 // TODO
612#else
d4597e13
VZ
613 // don't call our (or even wxTopLevelWindow) version because we want
614 // the real (full) client area size, not excluding the tool/status bar
615 int width, height;
616 wxWindow::DoGetClientSize(&width, &height);
81d66cf3 617
7c0ea335 618#if wxUSE_STATUSBAR
d4597e13
VZ
619 wxStatusBar *statbar = GetStatusBar();
620 if ( statbar && statbar->IsShown() )
621 {
622 height -= statbar->GetClientSize().y;
623 }
7c0ea335 624#endif // wxUSE_STATUSBAR
3882e746
VZ
625
626 int tx, ty, tw, th;
627 toolbar->GetPosition( &tx, &ty );
628 toolbar->GetSize( &tw, &th );
629
630 if ( toolbar->HasFlag(wxTB_BOTTOM) )
631 {
632 x = 0;
633 y = height - th;
634 }
635 else if ( toolbar->HasFlag(wxTB_RIGHT) )
636 {
637 x = width - tw;
638 y = 0;
639 }
640 else // left or top
641 {
642 x = 0;
643 y = 0;
644 }
645
3d487566 646#if defined(WINCE_WITH_COMMANDBAR)
fb8a56b7
WS
647 // We're using a commandbar - so we have to allow for it.
648 if (GetMenuBar() && GetMenuBar()->GetCommandBar())
649 {
650 RECT rect;
651 ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
652 y = rect.bottom - rect.top;
653 }
3882e746
VZ
654#endif // WINCE_WITH_COMMANDBAR
655
656 if ( toolbar->HasFlag(wxTB_BOTTOM) )
657 {
658 if ( ty < 0 && ( -ty == th ) )
659 ty = height - th;
660 if ( tx < 0 && (-tx == tw ) )
661 tx = 0;
662 }
663 else if ( toolbar->HasFlag(wxTB_RIGHT) )
7a976304
VZ
664 {
665 if( ty < 0 && ( -ty == th ) )
666 ty = 0;
667 if( tx < 0 && ( -tx == tw ) )
668 tx = width - tw;
669 }
3882e746
VZ
670 else // left or top
671 {
672 if (ty < 0 && (-ty == th))
673 ty = 0;
674 if (tx < 0 && (-tx == tw))
675 tx = 0;
676 }
cbe874bd 677
229de929
JS
678 int desiredW = tw;
679 int desiredH = th;
81d66cf3 680
7a976304 681 if ( toolbar->IsVertical() )
81d66cf3 682 {
229de929 683 desiredH = height;
81d66cf3
JS
684 }
685 else
686 {
229de929 687 desiredW = width;
cbe874bd 688 }
7c0ea335 689
d4597e13
VZ
690 // use the 'real' MSW position here, don't offset relativly to the
691 // client area origin
229de929
JS
692
693 // Optimise such that we don't have to always resize the toolbar
cbe874bd 694 // when the frame changes, otherwise we'll get a lot of flicker.
5cb598ae
WS
695 bool heightChanging wxDUMMY_INITIALIZE(true);
696 bool widthChanging wxDUMMY_INITIALIZE(true);
cbe874bd 697
7a976304 698 if ( toolbar->IsVertical() )
229de929
JS
699 {
700 // It's OK if the current height is greater than what can be shown.
701 heightChanging = (desiredH > th) ;
702 widthChanging = (desiredW != tw) ;
cbe874bd
WS
703
704 // The next time around, we may not have to set the size
229de929
JS
705 if (heightChanging)
706 desiredH = desiredH + 200;
707 }
708 else
709 {
710 // It's OK if the current width is greater than what can be shown.
711 widthChanging = (desiredW > tw) ;
712 heightChanging = (desiredH != th) ;
713
cbe874bd 714 // The next time around, we may not have to set the size
229de929
JS
715 if (widthChanging)
716 desiredW = desiredW + 200;
717 }
cbe874bd 718
229de929 719 if (tx != 0 || ty != 0 || widthChanging || heightChanging)
45f27284 720 toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
cbe874bd 721
09785dd3 722#endif // __WXWINCE__
81d66cf3
JS
723 }
724}
d4597e13 725
d427503c 726#endif // wxUSE_TOOLBAR
d2aef312 727
7c0ea335
VZ
728// ----------------------------------------------------------------------------
729// frame state (iconized/maximized/...)
730// ----------------------------------------------------------------------------
731
a23fd0e1
VZ
732// propagate our state change to all child frames: this allows us to emulate X
733// Windows behaviour where child frames float independently of the parent one
734// on the desktop, but are iconized/restored with it
0d53fc34 735void wxFrame::IconizeChildFrames(bool bIconize)
d2aef312 736{
4bc0f25e
VZ
737 m_iconized = bIconize;
738
222ed1d6 739 for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
a23fd0e1
VZ
740 node;
741 node = node->GetNext() )
742 {
743 wxWindow *win = node->GetData();
744
3ca6a5f0
BP
745 // iconizing the frames with this style under Win95 shell puts them at
746 // the bottom of the screen (as the MDI children) instead of making
747 // them appear in the taskbar because they are, by virtue of this
748 // style, not managed by the taskbar - instead leave Windows take care
749 // of them
3ca6a5f0
BP
750 if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW )
751 continue;
3ca6a5f0 752
3f7bc32b
VZ
753 // the child MDI frames are a special case and should not be touched by
754 // the parent frame - instead, they are managed by the user
2e9f62da 755 wxFrame *frame = wxDynamicCast(win, wxFrame);
1e6feb95
VZ
756 if ( frame
757#if wxUSE_MDI_ARCHITECTURE
4ab2824c 758 && !frame->IsMDIChild()
1e6feb95
VZ
759#endif // wxUSE_MDI_ARCHITECTURE
760 )
a23fd0e1 761 {
9327c3aa
VZ
762 // we don't want to restore the child frames which had been
763 // iconized even before we were iconized, so save the child frame
764 // status when iconizing the parent frame and check it when
765 // restoring it
766 if ( bIconize )
767 {
9c72ebec 768 frame->m_wasMinimized = frame->IsIconized();
9327c3aa
VZ
769 }
770
9c72ebec
VZ
771 // note that we shouldn't touch the hidden frames neither because
772 // iconizing/restoring them would show them as a side effect
773 if ( !frame->m_wasMinimized && frame->IsShown() )
9327c3aa 774 frame->Iconize(bIconize);
a23fd0e1 775 }
d2aef312 776 }
d2aef312
VZ
777}
778
0d53fc34 779WXHICON wxFrame::GetDefaultIcon() const
82c9f85c 780{
94826170
VZ
781 // we don't have any standard icons (any more)
782 return (WXHICON)0;
82c9f85c
VZ
783}
784
a23fd0e1 785// ===========================================================================
42e69d6b 786// message processing
a23fd0e1
VZ
787// ===========================================================================
788
42e69d6b
VZ
789// ---------------------------------------------------------------------------
790// preprocessing
791// ---------------------------------------------------------------------------
792
1ac76609 793bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)
42e69d6b
VZ
794{
795 if ( wxWindow::MSWTranslateMessage(pMsg) )
cbe874bd 796 return true;
42e69d6b 797
1e6feb95 798#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
42e69d6b
VZ
799 // try the menu bar accels
800 wxMenuBar *menuBar = GetMenuBar();
a1a1ca89
VZ
801 if ( menuBar )
802 {
803 const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
1ac76609 804 return acceleratorTable.Translate(frame, pMsg);
a1a1ca89
VZ
805 }
806#endif // wxUSE_MENUS && wxUSE_ACCEL
42e69d6b 807
cbe874bd 808 return false;
42e69d6b
VZ
809}
810
811// ---------------------------------------------------------------------------
812// our private (non virtual) message handlers
813// ---------------------------------------------------------------------------
814
0d53fc34 815bool wxFrame::HandlePaint()
42e69d6b
VZ
816{
817 RECT rect;
cbe874bd 818 if ( ::GetUpdateRect(GetHwnd(), &rect, FALSE) )
42e69d6b 819 {
4676948b 820#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
42e69d6b
VZ
821 if ( m_iconized )
822 {
f618020a
MB
823 const wxIcon& icon = GetIcon();
824 HICON hIcon = icon.Ok() ? GetHiconOf(icon)
825 : (HICON)GetDefaultIcon();
42e69d6b
VZ
826
827 // Hold a pointer to the dc so long as the OnPaint() message
828 // is being processed
829 PAINTSTRUCT ps;
830 HDC hdc = ::BeginPaint(GetHwnd(), &ps);
831
832 // Erase background before painting or we get white background
833 MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L);
834
835 if ( hIcon )
836 {
837 RECT rect;
838 ::GetClientRect(GetHwnd(), &rect);
839
840 // FIXME: why hardcoded?
841 static const int icon_width = 32;
842 static const int icon_height = 32;
843
844 int icon_x = (int)((rect.right - icon_width)/2);
845 int icon_y = (int)((rect.bottom - icon_height)/2);
846
847 ::DrawIcon(hdc, icon_x, icon_y, hIcon);
848 }
849
850 ::EndPaint(GetHwnd(), &ps);
851
cbe874bd 852 return true;
42e69d6b
VZ
853 }
854 else
04ef50df 855 #endif
42e69d6b 856 {
5d1d2d46 857 return wxWindow::HandlePaint();
42e69d6b
VZ
858 }
859 }
860 else
861 {
862 // nothing to paint - processed
cbe874bd 863 return true;
42e69d6b
VZ
864 }
865}
866
4bc0f25e 867bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
42e69d6b 868{
4676948b 869#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
42e69d6b
VZ
870 switch ( id )
871 {
4bc0f25e
VZ
872 case SIZE_RESTORED:
873 case SIZE_MAXIMIZED:
42e69d6b
VZ
874 // only do it it if we were iconized before, otherwise resizing the
875 // parent frame has a curious side effect of bringing it under it's
876 // children
877 if ( !m_iconized )
878 break;
879
880 // restore all child frames too
cbe874bd 881 IconizeChildFrames(false);
42e69d6b 882
cbe874bd 883 (void)SendIconizeEvent(false);
42e69d6b
VZ
884 break;
885
4bc0f25e 886 case SIZE_MINIMIZED:
42e69d6b 887 // iconize all child frames too
cbe874bd 888 IconizeChildFrames(true);
42e69d6b
VZ
889 break;
890 }
276c8cfb
WS
891#else
892 wxUnusedVar(id);
4bc0f25e 893#endif // !__WXWINCE__
42e69d6b
VZ
894
895 if ( !m_iconized )
896 {
1e6feb95 897#if wxUSE_STATUSBAR
42e69d6b 898 PositionStatusBar();
1e6feb95
VZ
899#endif // wxUSE_STATUSBAR
900
901#if wxUSE_TOOLBAR
42e69d6b 902 PositionToolBar();
1e6feb95 903#endif // wxUSE_TOOLBAR
42e69d6b 904
3d487566 905#if defined(WINCE_WITH_COMMANDBAR)
fb8a56b7
WS
906 // Position the menu command bar
907 if (GetMenuBar() && GetMenuBar()->GetCommandBar())
908 {
909 RECT rect;
910 ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
911 wxSize clientSz = GetClientSize();
912
913 if ( !::MoveWindow((HWND) GetMenuBar()->GetCommandBar(), 0, 0, clientSz.x, rect.bottom - rect.top, true ) )
914 {
915 wxLogLastError(wxT("MoveWindow"));
916 }
917
918 }
4bc0f25e 919#endif // WINCE_WITH_COMMANDBAR
42e69d6b
VZ
920 }
921
4bc0f25e
VZ
922 // call the base class version to generate the appropriate events
923 return false;
42e69d6b
VZ
924}
925
0d53fc34 926bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
42e69d6b
VZ
927{
928 if ( control )
929 {
930 // In case it's e.g. a toolbar.
931 wxWindow *win = wxFindWinFromHandle(control);
932 if ( win )
933 return win->MSWCommand(cmd, id);
934 }
935
936 // handle here commands from menus and accelerators
937 if ( cmd == 0 || cmd == 1 )
938 {
1e6feb95 939#if wxUSE_MENUS_NATIVE
42e69d6b
VZ
940 if ( wxCurrentPopupMenu )
941 {
942 wxMenu *popupMenu = wxCurrentPopupMenu;
943 wxCurrentPopupMenu = NULL;
944
945 return popupMenu->MSWCommand(cmd, id);
946 }
1e6feb95 947#endif // wxUSE_MENUS_NATIVE
42e69d6b 948
3180bc0e 949#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
fb8a56b7
WS
950 // handle here commands from Smartphone menu bar
951 if ( wxTopLevelWindow::HandleCommand(id, cmd, control ) )
952 {
953 return true;
954 }
3180bc0e 955#endif // __SMARTPHONE__ && __WXWINCE__
fb8a56b7 956
42e69d6b
VZ
957 if ( ProcessCommand(id) )
958 {
cbe874bd 959 return true;
42e69d6b
VZ
960 }
961 }
962
cbe874bd 963 return false;
42e69d6b
VZ
964}
965
0d53fc34 966bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
a23fd0e1
VZ
967{
968 int item;
c219cecc 969 if ( flags == 0xFFFF && hMenu == 0 )
a23fd0e1 970 {
c219cecc 971 // menu was removed from screen
a23fd0e1
VZ
972 item = -1;
973 }
04ef50df 974#ifndef __WXMICROWIN__
c219cecc 975 else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
a23fd0e1
VZ
976 {
977 item = nItem;
978 }
04ef50df 979#endif
a23fd0e1
VZ
980 else
981 {
c219cecc 982 // don't give hints for separators (doesn't make sense) nor for the
f6bcfd97
BP
983 // items opening popup menus (they don't have them anyhow) but do clear
984 // the status line - otherwise, we would be left with the help message
985 // for the previous item which doesn't apply any more
cbe874bd 986 DoGiveHelp(wxEmptyString, false);
f6bcfd97 987
cbe874bd 988 return false;
a23fd0e1
VZ
989 }
990
991 wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
ccef86c7
VZ
992 event.SetEventObject(this);
993
994 return GetEventHandler()->ProcessEvent(event);
995}
996
997bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup)
998{
999 // we don't have the menu id here, so we use the id to specify if the event
1000 // was from a popup menu or a normal one
1001 wxMenuEvent event(evtType, isPopup ? -1 : 0);
1002 event.SetEventObject(this);
a23fd0e1
VZ
1003
1004 return GetEventHandler()->ProcessEvent(event);
1005}
1006
1007// ---------------------------------------------------------------------------
0d53fc34 1008// the window proc for wxFrame
a23fd0e1
VZ
1009// ---------------------------------------------------------------------------
1010
c140b7e7 1011WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
a23fd0e1 1012{
c140b7e7 1013 WXLRESULT rc = 0;
cbe874bd 1014 bool processed = false;
a23fd0e1
VZ
1015
1016 switch ( message )
1017 {
42e69d6b
VZ
1018 case WM_CLOSE:
1019 // if we can't close, tell the system that we processed the
1020 // message - otherwise it would close us
1021 processed = !Close();
1022 break;
1023
ccef86c7
VZ
1024 case WM_SIZE:
1025 processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
1026 break;
1027
42e69d6b
VZ
1028 case WM_COMMAND:
1029 {
1030 WORD id, cmd;
1031 WXHWND hwnd;
1032 UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam,
1033 &id, &hwnd, &cmd);
1034
1035 processed = HandleCommand(id, cmd, (WXHWND)hwnd);
1036 }
1037 break;
1038
ccef86c7
VZ
1039 case WM_PAINT:
1040 processed = HandlePaint();
1041 break;
1042
92f1a59c
JS
1043 case WM_INITMENUPOPUP:
1044 processed = HandleInitMenuPopup((WXHMENU) wParam);
1045 break;
1046
4676948b 1047#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
a23fd0e1
VZ
1048 case WM_MENUSELECT:
1049 {
42e69d6b
VZ
1050 WXWORD item, flags;
1051 WXHMENU hmenu;
1052 UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
1053
1054 processed = HandleMenuSelect(item, flags, hmenu);
a23fd0e1
VZ
1055 }
1056 break;
bc92cdf9 1057
ccef86c7 1058 case WM_EXITMENULOOP:
373a5fb3 1059 processed = HandleMenuLoop(wxEVT_MENU_CLOSE, (WXWORD)wParam);
ccef86c7 1060 break;
ccef86c7 1061
42e69d6b
VZ
1062 case WM_QUERYDRAGICON:
1063 {
f618020a
MB
1064 const wxIcon& icon = GetIcon();
1065 HICON hIcon = icon.Ok() ? GetHiconOf(icon)
1066 : (HICON)GetDefaultIcon();
42e69d6b
VZ
1067 rc = (long)hIcon;
1068 processed = rc != 0;
1069 }
1070 break;
ccef86c7 1071#endif // !__WXMICROWIN__
a23fd0e1
VZ
1072 }
1073
1074 if ( !processed )
7e25f59e 1075 rc = wxFrameBase::MSWWindowProc(message, wParam, lParam);
a23fd0e1
VZ
1076
1077 return rc;
1078}
21802234 1079
92f1a59c
JS
1080// handle WM_INITMENUPOPUP message
1081bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
e39af974 1082{
92f1a59c
JS
1083 wxMenu* menu = NULL;
1084 if (GetMenuBar())
1085 {
1086 int nCount = GetMenuBar()->GetMenuCount();
1087 for (int n = 0; n < nCount; n++)
1088 {
1089 if (GetMenuBar()->GetMenu(n)->GetHMenu() == hMenu)
1090 {
1091 menu = GetMenuBar()->GetMenu(n);
1092 break;
1093 }
1094 }
1095 }
cbe874bd 1096
92f1a59c 1097 wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);
e39af974
JS
1098 event.SetEventObject(this);
1099
1100 return GetEventHandler()->ProcessEvent(event);
e39af974 1101}
a9928e9d
JS
1102
1103// ----------------------------------------------------------------------------
1104// wxFrame size management: we exclude the areas taken by menu/status/toolbars
1105// from the client area, so the client area is what's really available for the
1106// frame contents
1107// ----------------------------------------------------------------------------
1108
1109// get the origin of the client area in the client coordinates
1110wxPoint wxFrame::GetClientAreaOrigin() const
1111{
1112 wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
1113
1114#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && \
1115 (!defined(__WXWINCE__) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
3882e746 1116 wxToolBar * const toolbar = GetToolBar();
a9928e9d
JS
1117 if ( toolbar && toolbar->IsShown() )
1118 {
3882e746 1119 const wxSize sizeTB = toolbar->GetSize();
a9928e9d 1120
3882e746 1121 if ( toolbar->HasFlag(wxTB_TOP) )
a9928e9d 1122 {
3882e746 1123 pt.y += sizeTB.y;
a9928e9d 1124 }
3882e746 1125 else if ( toolbar->HasFlag(wxTB_LEFT) )
a9928e9d 1126 {
3882e746 1127 pt.x += sizeTB.x;
a9928e9d
JS
1128 }
1129 }
1130#endif // wxUSE_TOOLBAR
1131
3d487566 1132#if defined(WINCE_WITH_COMMANDBAR)
fb8a56b7
WS
1133 if (GetMenuBar() && GetMenuBar()->GetCommandBar())
1134 {
1135 RECT rect;
1136 ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
1137 pt.y += (rect.bottom - rect.top);
1138 }
a9928e9d
JS
1139#endif
1140
1141 return pt;
1142}