X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a23fd0e1d1329a4a258b4defb3e0b0001b700c6e..9085d634d9e29a877761ef51a01c740749648e33:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 459843e361..99f1e9c763 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: frame.cpp +// Name: msw/frame.cpp // Purpose: wxFrame // Author: Julian Smart // Modified by: @@ -9,8 +9,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "frame.h" + #pragma implementation "frame.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -21,1044 +29,744 @@ #endif #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/frame.h" - #include "wx/menu.h" #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" #endif // WX_PRECOMP #include "wx/msw/private.h" -#include "wx/statusbr.h" -#include "wx/toolbar.h" + +#if wxUSE_STATUSBAR + #include "wx/statusbr.h" + #include "wx/generic/statusbr.h" +#endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR + #include "wx/toolbar.h" +#endif // wxUSE_TOOLBAR + #include "wx/menuitem.h" #include "wx/log.h" -#ifdef LoadAccelerators -#undef LoadAccelerators -#endif +#ifdef __WXUNIVERSAL__ + #include "wx/univ/theme.h" + #include "wx/univ/colschem.h" +#endif // __WXUNIVERSAL__ -#if wxUSE_NATIVE_STATUSBAR - #include -#endif +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- + +#if wxUSE_MENUS_NATIVE + extern wxMenu *wxCurrentPopupMenu; +#endif // wxUSE_MENUS_NATIVE + +// ---------------------------------------------------------------------------- +// event tables +// ---------------------------------------------------------------------------- -extern wxWindowList wxModelessWindows; -extern wxList WXDLLEXPORT wxPendingDelete; -extern char 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) +BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) + EVT_ACTIVATE(wxFrame::OnActivate) + EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) -#if wxUSE_NATIVE_STATUSBAR - bool wxFrame::m_useNativeStatusBar = TRUE; -#else - bool wxFrame::m_useNativeStatusBar = FALSE; -#endif +// ============================================================================ +// implementation +// ============================================================================ -wxFrame::wxFrame() -{ - m_frameToolBar = NULL ; - m_frameMenuBar = NULL; - m_frameStatusBar = NULL; +// ---------------------------------------------------------------------------- +// 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 -bool wxFrame::Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +// ---------------------------------------------------------------------------- +// creation/destruction +// ---------------------------------------------------------------------------- + +void wxFrame::Init() { #if wxUSE_TOOLTIPS m_hwndToolTip = 0; #endif - if (!parent) - wxTopLevelWindows.Append(this); - - SetName(name); -// m_modalShowing = FALSE; - m_windowStyle = style; - m_frameMenuBar = NULL; - m_frameToolBar = NULL ; - m_frameStatusBar = NULL; - - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); - -// m_icon = NULL; - if ( id > -1 ) - m_windowId = id; - else - m_windowId = (int)NewControlId(); + // Data to save/restore when calling ShowFullScreen + m_fsStatusBarFields = 0; + m_fsStatusBarHeight = 0; + m_fsToolBarHeight = 0; +// m_fsMenu = 0; - if (parent) parent->AddChild(this); + m_wasMinimized = FALSE; - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; + m_winLastFocused = (wxWindow *)NULL; +} - m_iconized = FALSE; +bool wxFrame::Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) + return FALSE; - // 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; + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - MSWCreate(m_windowId, parent, wxFrameClassName, this, title, - x, y, width, height, style); + wxModelessWindows.Append(this); - wxModelessWindows.Append(this); - return TRUE; + return TRUE; } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; - wxTopLevelWindows.DeleteObject(this); - - if (m_frameStatusBar) - delete m_frameStatusBar; - if (m_frameMenuBar) - delete m_frameMenuBar; + m_isBeingDeleted = TRUE; -/* New behaviour March 1998: check if it's the last top-level window */ -// if (wxTheApp && (this == wxTheApp->GetTopWindow())) + DeleteAllBars(); +} - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) - { - wxTheApp->SetTopWindow(NULL); +// ---------------------------------------------------------------------------- +// wxFrame client size calculations +// ---------------------------------------------------------------------------- - if (wxTheApp->GetExitOnFrameDelete()) +void wxFrame::DoSetClientSize(int width, int height) +{ + // leave enough space for the status bar if we have (and show) it +#if wxUSE_STATUSBAR + wxStatusBar *statbar = GetStatusBar(); + if ( statbar && statbar->IsShown() ) { - PostQuitMessage(0); + height += statbar->GetSize().y; } - } - - wxModelessWindows.DeleteObject(this); +#endif // wxUSE_STATUSBAR - // 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()); -} + // call GetClientAreaOrigin() to take the toolbar into account + wxPoint pt = GetClientAreaOrigin(); + width += pt.x; + height += pt.y; -WXHMENU wxFrame::GetWinMenu() const -{ - return m_hMenu; + wxTopLevelWindow::DoSetClientSize(width, height); } // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. void wxFrame::DoGetClientSize(int *x, int *y) const { - RECT rect; - ::GetClientRect((HWND) 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; -} - -// Set the client size (i.e. leave the calculation of borders etc. -// to wxWindows) -void wxFrame::DoSetClientSize(int width, int height) -{ - HWND 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; - - MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE); - - wxSizeEvent event(wxSize(width, height), m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); -} - -void wxFrame::DoGetSize(int *width, int *height) const -{ - RECT rect; - GetWindowRect((HWND) GetHWND(), &rect); - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; -} + wxTopLevelWindow::DoGetClientSize(x, y); -void wxFrame::DoGetPosition(int *x, int *y) const -{ - RECT rect; - GetWindowRect((HWND) GetHWND(), &rect); - POINT point; - point.x = rect.left; - point.y = rect.top; - - *x = point.x; - *y = point.y; -} + // account for the possible toolbar + wxPoint pt = GetClientAreaOrigin(); + if ( x ) + *x -= pt.x; -void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags) -{ - int currentX, currentY; - int x1 = x; - int y1 = y; - int w1 = width; - int h1 = height; - - GetPosition(¤tX, ¤tY); - if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - x1 = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - y1 = currentY; - - int ww,hh ; - GetSize(&ww,&hh) ; - if (width == -1) w1 = ww ; - if (height==-1) h1 = hh ; - - MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, (BOOL)TRUE); - - 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_STATUSBAR + // adjust client area height to take the status bar into account + if ( y ) { - hWndParent = (HWND) GetParent()->GetHWND(); - if (hWndParent) - ::BringWindowToTop(hWndParent); + wxStatusBar *statbar = GetStatusBar(); + if ( statbar && statbar->IsShown() ) + { + *y -= statbar->GetClientSize().y; + } } - } - - ShowWindow((HWND) GetHWND(), (BOOL)cshow); - if (show) - { - BringWindowToTop((HWND) 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((HWND) GetHWND(), (BOOL)cshow); - m_iconized = iconize; -} - -// 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((HWND) GetHWND(), cshow); - m_iconized = FALSE; -} - -bool wxFrame::IsIconized() const -{ - ((wxFrame *)this)->m_iconized = (::IsIconic((HWND) GetHWND()) != 0); - return m_iconized; +#endif // wxUSE_STATUSBAR } -// Is it maximized? -bool wxFrame::IsMaximized() const -{ - return (::IsZoomed((HWND) GetHWND()) != 0) ; -} +// ---------------------------------------------------------------------------- +// wxFrame: various geometry-related functions +// ---------------------------------------------------------------------------- -void wxFrame::SetTitle(const wxString& title) +void wxFrame::Raise() { - SetWindowText((HWND) GetHWND(), (const char *)title); +#ifdef __WIN16__ + // no SetForegroundWindow() in Win16 + wxFrameBase::Raise(); +#else // Win32 + ::SetForegroundWindow(GetHwnd()); +#endif // Win16/32 } -wxString wxFrame::GetTitle() const +// generate an artificial resize event +void wxFrame::SendSizeEvent() { - GetWindowText((HWND) GetHWND(), wxBuffer, 1000); - return wxString(wxBuffer); -} + if ( !m_iconized ) + { + RECT r = wxGetWindowRect(GetHwnd()); -void wxFrame::SetIcon(const wxIcon& icon) -{ - m_icon = icon; -#if defined(__WIN95__) - if ( m_icon.Ok() ) - SendMessage((HWND) GetHWND(), WM_SETICON, - (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON()); -#endif + (void)::PostMessage(GetHwnd(), WM_SIZE, + IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED, + MAKELPARAM(r.right - r.left, r.bottom - r.top)); + } } -wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, - const wxString& name) +#if wxUSE_STATUSBAR +wxStatusBar *wxFrame::OnCreateStatusBar(int number, + long style, + wxWindowID id, + const wxString& name) { wxStatusBar *statusBar = 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; -} + statusBar->SetFieldsCount(number); -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, - "recreating status bar in wxFrame" ); - - m_frameStatusBar = OnCreateStatusBar(number, style, id, - name); - if ( m_frameStatusBar ) - { - PositionStatusBar(); - return m_frameStatusBar; - } - else - return NULL; -} - -void wxFrame::SetStatusText(const wxString& text, int number) -{ - wxCHECK_RET( m_frameStatusBar != NULL, "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, "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); - } -} - -void wxFrame::SetMenuBar(wxMenuBar *menu_bar) -{ - if (!menu_bar) - { - m_frameMenuBar = NULL; + if ( !m_frameStatusBar || !m_frameStatusBar->IsShown() ) return; - } - wxCHECK_RET( !menu_bar->GetFrame(), "this menubar is already attached" ); + int w, h; + GetClientSize(&w, &h); + int sw, sh; + m_frameStatusBar->GetSize(&sw, &sh); - if (m_frameMenuBar) - delete m_frameMenuBar; + // 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 - m_hMenu = menu_bar->Create(); +#if wxUSE_MENUS_NATIVE - if ( !m_hMenu ) - return; +void wxFrame::AttachMenuBar(wxMenuBar *menubar) +{ + wxFrameBase::AttachMenuBar(menubar); - if ( !::SetMenu((HWND)GetHWND(), (HMENU)m_hMenu) ) + if ( !menubar ) { - wxLogLastError("SetMenu"); + // actually remove the menu from the frame + m_hMenu = (WXHMENU)0; + InternalSetMenuBar(); } + else // set new non NULL menu bar + { + // Can set a menubar several times. + if ( menubar->GetHMenu() ) + { + m_hMenu = menubar->GetHMenu(); + } + else // no HMENU yet + { + m_hMenu = menubar->Create(); - m_frameMenuBar = menu_bar; - menu_bar->Attach(this); -} - -#if 0 -bool wxFrame::LoadAccelerators(const wxString& table) -{ - m_acceleratorTable = (WXHANDLE) -#ifdef __WIN32__ -#ifdef UNICODE - ::LoadAcceleratorsW(wxGetInstance(), (const char *)table); -#else - ::LoadAcceleratorsA(wxGetInstance(), (const char *)table); -#endif -#else - ::LoadAccelerators(wxGetInstance(), (const char *)table); -#endif - - // The above is necessary because LoadAccelerators is a macro - // which we have undefed earlier in the file to avoid confusion - // with wxFrame::LoadAccelerators. Ugh! + if ( !m_hMenu ) + { + wxFAIL_MSG( _T("failed to create menu bar") ); + return; + } + } - return (m_acceleratorTable != (WXHANDLE) NULL); + InternalSetMenuBar(); + } } -#endif -void wxFrame::Fit() +void wxFrame::InternalSetMenuBar() { - // Work out max. size - wxNode *node = GetChildren().First(); - int max_width = 0; - int max_height = 0; - while (node) - { - // Find a child that's a subwindow, but not a dialog box. - wxWindow *win = (wxWindow *)node->Data(); - - if (!win->IsKindOf(CLASSINFO(wxFrame)) && - !win->IsKindOf(CLASSINFO(wxDialog))) +#ifndef __WXMICROWIN__ + if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) { - int width, height; - int x, y; - win->GetSize(&width, &height); - win->GetPosition(&x, &y); - - if ((x + width) > max_width) - max_width = x + width; - if ((y + height) > max_height) - max_height = y + height; + wxLogLastError(wxT("SetMenu")); } - node = node->Next(); - } - SetClientSize(max_width, max_height); +#endif } +#endif // wxUSE_MENUS_NATIVE + // Responds to colour changes, and passes event on to children. void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); +#if wxUSE_STATUSBAR if ( m_frameStatusBar ) { wxSysColourChangedEvent event2; event2.SetEventObject( m_frameStatusBar ); m_frameStatusBar->GetEventHandler()->ProcessEvent(event2); } +#endif // wxUSE_STATUSBAR // Propagate the event to the non-top-level children wxWindow::OnSysColourChanged(event); } -/* - * Frame window - * - */ - -bool wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title, - int x, int y, int width, int height, long style) - +// Pass TRUE to show full screen, FALSE to restore. +bool wxFrame::ShowFullScreen(bool show, long style) { - 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; - - WXDWORD extendedStyle = MakeExtendedStyle(style); + if ( IsFullScreen() == show ) + return FALSE; -#if !defined(__WIN16__) && !defined(__SC__) - if (style & wxFRAME_TOOL_WINDOW) - extendedStyle |= WS_EX_TOOLWINDOW; -#endif + if (show) + { +#if wxUSE_TOOLBAR + wxToolBar *theToolBar = GetToolBar(); + if (theToolBar) + theToolBar->GetSize(NULL, &m_fsToolBarHeight); - if (style & wxSTAY_ON_TOP) - extendedStyle |= WS_EX_TOPMOST; + // zap the toolbar, menubar, and statusbar - m_iconized = FALSE; - if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height, - msflags, NULL, extendedStyle) ) - return FALSE; + if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar) + { + theToolBar->SetSize(-1,0); + theToolBar->Show(FALSE); + } +#endif // wxUSE_TOOLBAR - // Seems to be necessary if we use WS_POPUP - // style instead of WS_OVERLAPPED - if (width > -1 && height > -1) - ::PostMessage((HWND) GetHWND(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height)); +#ifndef __WXMICROWIN__ + if (style & wxFULLSCREEN_NOMENUBAR) + SetMenu((HWND)GetHWND(), (HMENU) NULL); +#endif - return TRUE; -} +#if wxUSE_STATUSBAR + wxStatusBar *theStatusBar = GetStatusBar(); + if (theStatusBar) + theStatusBar->GetSize(NULL, &m_fsStatusBarHeight); -bool wxFrame::MSWOnPaint() -{ - RECT rect; - if (GetUpdateRect((HWND) GetHWND(), &rect, FALSE)) - { - if (m_iconized) - { - HICON the_icon; - if (m_icon.Ok()) - the_icon = (HICON) m_icon.GetHICON(); - else - the_icon = (HICON) m_defaultIcon; - - PAINTSTRUCT ps; - // Hold a pointer to the dc so long as the OnPaint() message - // is being processed - HDC cdc = BeginPaint((HWND) GetHWND(), &ps); - - // Erase background before painting or we get white background - this->MSWDefWindowProc(WM_ICONERASEBKGND,(WORD)(LONG) ps.hdc,0L); - - if (the_icon) - { - RECT rect; - ::GetClientRect((HWND) GetHWND(), &rect); - int icon_width = 32; - int icon_height = 32; - int icon_x = (int)((rect.right - icon_width)/2); - int icon_y = (int)((rect.bottom - icon_height)/2); - DrawIcon(cdc, icon_x, icon_y, the_icon); - } - - EndPaint((HWND) GetHWND(), &ps); + // Save the number of fields in the statusbar + if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar) + { + //m_fsStatusBarFields = theStatusBar->GetFieldsCount(); + //SetStatusBar((wxStatusBar*) NULL); + //delete theStatusBar; + theStatusBar->Show(FALSE); + } + else + m_fsStatusBarFields = 0; +#endif // wxUSE_STATUSBAR } else { - wxPaintEvent event(m_windowId); - event.m_eventObject = this; - if (!GetEventHandler()->ProcessEvent(event)) - Default(); - } - return 0; - } - return 1; -} +#if wxUSE_TOOLBAR + wxToolBar *theToolBar = GetToolBar(); -WXHICON wxFrame::MSWOnQueryDragIcon() -{ - if (m_icon.Ok() && (m_icon.GetHICON() != 0)) - return m_icon.GetHICON(); - else - return m_defaultIcon; + // restore the toolbar, menubar, and statusbar + if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR)) + { + theToolBar->SetSize(-1, m_fsToolBarHeight); + theToolBar->Show(TRUE); + } +#endif // wxUSE_TOOLBAR + +#if wxUSE_STATUSBAR + if ( m_fsStyle & wxFULLSCREEN_NOSTATUSBAR ) + { + //CreateStatusBar(m_fsStatusBarFields); + if (GetStatusBar()) + { + GetStatusBar()->Show(TRUE); + PositionStatusBar(); + } + } +#endif // wxUSE_STATUSBAR + +#ifndef __WXMICROWIN__ + if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) + SetMenu((HWND)GetHWND(), (HMENU)m_hMenu); +#endif + } + + return wxFrameBase::ShowFullScreen(show, style); } -bool wxFrame::MSWOnSize(int x, int y, WXUINT id) +// Default activation behaviour - set the focus for the first child +// subwindow found. +void wxFrame::OnActivate(wxActivateEvent& event) { - bool processed = FALSE; - - switch ( id ) + if ( event.GetActive() ) { - case SIZENORMAL: - // 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 - if ( !m_iconized ) - break; - - // restore all child frames too - IconizeChildFrames(FALSE); - - // fall through + // restore focus to the child which was last focused + wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd); - case SIZEFULLSCREEN: - m_iconized = FALSE; - break; - - case SIZEICONIC: - // iconize all child frames too - IconizeChildFrames(TRUE); + wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() + : NULL; + if ( !parent ) + { + parent = this; + } - m_iconized = TRUE; - break; + wxSetFocusToChild(parent, &m_winLastFocused); } - - if ( !m_iconized ) + else // deactivating { - // forward WM_SIZE to status bar control -#if wxUSE_NATIVE_STATUSBAR - if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))) + // remember the last focused child if it is our child + m_winLastFocused = FindFocus(); + + // so we NULL it out if it's a child from some other frame + wxWindow *win = m_winLastFocused; + while ( win ) { - wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId()); - event.SetEventObject( m_frameStatusBar ); + if ( win->IsTopLevel() ) + { + if ( win != this ) + { + m_winLastFocused = NULL; + } - ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event); + break; + } + + win = win->GetParent(); } -#endif // wxUSE_NATIVE_STATUSBAR - PositionStatusBar(); - PositionToolBar(); + wxLogTrace(_T("focus"), + _T("wxFrame %08x deactivated, last focused: %08x."), + m_hWnd, + m_winLastFocused ? GetHwndOf(m_winLastFocused) + : NULL); - wxSizeEvent event(wxSize(x, y), m_windowId); - event.SetEventObject( this ); - processed = GetEventHandler()->ProcessEvent(event); + event.Skip(); } - - return processed; } -bool wxFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) -{ - if (cmd == 0 || cmd == 1 ) // Can be either a menu command or an accelerator. - { - // In case it's e.g. a toolbar. - wxWindow *win = wxFindWinFromHandle(control); - if (win) - return win->MSWCommand(cmd, id); - - if (wxCurrentPopupMenu) - { - wxMenu *popupMenu = wxCurrentPopupMenu; - wxCurrentPopupMenu = NULL; - if (popupMenu->MSWCommand(cmd, id)) - return TRUE; - } - - if (GetMenuBar() && GetMenuBar()->FindItemForId(id)) - { - ProcessCommand(id); - return TRUE; - } - else - return FALSE; - } - else - return wxWindow::MSWOnCommand(id, cmd, control); -} +// ---------------------------------------------------------------------------- +// tool/status bar stuff +// ---------------------------------------------------------------------------- -bool wxFrame::MSWProcessMessage(WXMSG* pMsg) -{ - return FALSE; -} +#if wxUSE_TOOLBAR -bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) +wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { - if (m_acceleratorTable.Ok() && - ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), (MSG *)pMsg)) - return TRUE; + if ( wxFrameBase::CreateToolBar(style, id, name) ) + { + PositionToolBar(); + } - return FALSE; + return m_frameToolBar; } -// Default resizing behaviour - if only ONE subwindow, resize to client -// rectangle size -void wxFrame::OnSize(wxSizeEvent& event) +void wxFrame::PositionToolBar() { - // if we're using constraints - do use them -#if wxUSE_CONSTRAINTS - if ( GetAutoLayout() ) - { - Layout(); - return; - } -#endif - - // do we have _exactly_ one child? - wxWindow *child = NULL; - for ( wxNode *node = GetChildren().First(); node; node = node->Next() ) + wxToolBar *toolbar = GetToolBar(); + if ( toolbar && toolbar->IsShown() ) { - wxWindow *win = (wxWindow *)node->Data(); - if ( !win->IsKindOf(CLASSINFO(wxFrame)) && - !win->IsKindOf(CLASSINFO(wxDialog)) && - (win != GetStatusBar()) && - (win != GetToolBar()) ) + // don't call our (or even wxTopLevelWindow) version because we want + // the real (full) client area size, not excluding the tool/status bar + int width, height; + wxWindow::DoGetClientSize(&width, &height); + +#if wxUSE_STATUSBAR + wxStatusBar *statbar = GetStatusBar(); + if ( statbar && statbar->IsShown() ) { - if ( child ) - return; // it's our second subwindow - nothing to do - child = win; + height -= statbar->GetClientSize().y; } - } +#endif // wxUSE_STATUSBAR - if ( child ) { - // we have exactly one child - set it's size to fill the whole frame - int clientW, clientH; - GetClientSize(&clientW, &clientH); + int tw, th; + toolbar->GetSize(&tw, &th); - int x = 0; - int y = 0; + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) + { + th = height; + } + else + { + tw = width; + if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT ) + th -= 3; + } - child->SetSize(x, y, clientW, clientH); + // use the 'real' MSW position here, don't offset relativly to the + // client area origin + toolbar->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS); } } -// Default activation behaviour - set the focus for the first child -// subwindow found. -void wxFrame::OnActivate(wxActivateEvent& event) -{ - for(wxNode *node = GetChildren().First(); node; node = node->Next()) - { - // Find a child that's a subwindow, but not a dialog box. - wxWindow *child = (wxWindow *)node->Data(); - if (!child->IsKindOf(CLASSINFO(wxFrame)) && - !child->IsKindOf(CLASSINFO(wxDialog))) - { - child->SetFocus(); - return; - } - } -} +#endif // wxUSE_TOOLBAR -// The default implementation for the close window event. -void wxFrame::OnCloseWindow(wxCloseEvent& event) -{ - this->Destroy(); -} +// ---------------------------------------------------------------------------- +// frame state (iconized/maximized/...) +// ---------------------------------------------------------------------------- -// Destroy the window (delayed, if a managed window) -bool wxFrame::Destroy() -{ - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); - return TRUE; -} - -// Default menu selection behaviour - display a help string -void wxFrame::OnMenuHighlight(wxMenuEvent& event) +// 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) { - if (GetStatusBar()) - { - int menuId = event.GetMenuId(); - if ( menuId != -1 ) + for ( wxWindowList::Node *node = GetChildren().GetFirst(); + node; + node = node->GetNext() ) { - wxMenuBar *menuBar = GetMenuBar(); - if (menuBar && menuBar->FindItem(menuId)) - { - // set status text even if the string is empty - this will at - // least remove the string from the item which was previously - // selected - SetStatusText(menuBar->GetHelpString(menuId)); - } + wxWindow *win = node->GetData(); + + // 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 +#ifdef __WIN95__ + if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW ) + continue; +#endif // Win95 + + // the child MDI frames are a special case and should not be touched by + // the parent frame - instead, they are managed by the user + wxFrame *frame = wxDynamicCast(win, wxFrame); + if ( frame +#if wxUSE_MDI_ARCHITECTURE + && !wxDynamicCast(frame, wxMDIChildFrame) +#endif // wxUSE_MDI_ARCHITECTURE + ) + { + // 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 ) + { + // note that we shouldn't touch the hidden frames neither + // because iconizing/restoring them would show them as a side + // effect + frame->m_wasMinimized = frame->IsIconized() || !frame->IsShown(); + } + + // this test works for both iconizing and restoring + if ( !frame->m_wasMinimized ) + frame->Iconize(bIconize); + } } - } } -wxMenuBar *wxFrame::GetMenuBar() const +WXHICON wxFrame::GetDefaultIcon() const { - return m_frameMenuBar; + return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON + : wxDEFAULT_FRAME_ICON); } -void wxFrame::Centre(int direction) -{ - int display_width, display_height, width, height, x, y; - wxDisplaySize(&display_width, &display_height); +// =========================================================================== +// message processing +// =========================================================================== - GetSize(&width, &height); - GetPosition(&x, &y); +// --------------------------------------------------------------------------- +// preprocessing +// --------------------------------------------------------------------------- - if (direction & wxHORIZONTAL) - x = (int)((display_width - width)/2); - if (direction & wxVERTICAL) - y = (int)((display_height - height)/2); +bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) +{ + if ( wxWindow::MSWTranslateMessage(pMsg) ) + return TRUE; - SetSize(x, y, width, height); -} +#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__) + // try the menu bar accels + wxMenuBar *menuBar = GetMenuBar(); + if ( !menuBar ) + return FALSE; -// Call this to simulate a menu command -void wxFrame::Command(int id) -{ - ProcessCommand(id); + const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable(); + return acceleratorTable.Translate(this, pMsg); +#else + return FALSE; +#endif // wxUSE_MENUS && wxUSE_ACCEL } -void wxFrame::ProcessCommand(int id) +// --------------------------------------------------------------------------- +// our private (non virtual) message handlers +// --------------------------------------------------------------------------- + +bool wxFrame::HandlePaint() { - wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); - commandEvent.SetInt( id ); - commandEvent.SetEventObject( this ); + RECT rect; + if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) + { +#ifndef __WXMICROWIN__ + if ( m_iconized ) + { + const wxIcon& icon = GetIcon(); + HICON hIcon = icon.Ok() ? GetHiconOf(icon) + : (HICON)GetDefaultIcon(); - wxMenuBar *bar = GetMenuBar() ; - if (!bar) - return; + // Hold a pointer to the dc so long as the OnPaint() message + // is being processed + PAINTSTRUCT ps; + HDC hdc = ::BeginPaint(GetHwnd(), &ps); - wxMenuItem *item = bar->FindItemForId(id) ; - if (item && item->IsCheckable()) - { - bar->Check(id,!bar->Checked(id)) ; - } + // Erase background before painting or we get white background + MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L); -/* - // Process events starting with the window with the focus, if any. - wxWindow* focusWin = wxFindFocusDescendant(this); + if ( hIcon ) + { + RECT rect; + ::GetClientRect(GetHwnd(), &rect); - wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler(); -*/ + // FIXME: why hardcoded? + static const int icon_width = 32; + static const int icon_height = 32; - wxEvtHandler* evtHandler = GetEventHandler(); - evtHandler->ProcessEvent(commandEvent); -} + int icon_x = (int)((rect.right - icon_width)/2); + int icon_y = (int)((rect.bottom - icon_height)/2); -// Checks if there is a toolbar, and returns the first free client position -wxPoint wxFrame::GetClientAreaOrigin() const -{ - wxPoint pt(0, 0); - if (GetToolBar()) - { - int w, h; - GetToolBar()->GetSize(& w, & h); + ::DrawIcon(hdc, icon_x, icon_y, hIcon); + } - if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) - { - pt.x += w; + ::EndPaint(GetHwnd(), &ps); + + return TRUE; } else + #endif { - pt.y += h; + return wxWindow::HandlePaint(); } } - return pt; + else + { + // nothing to paint - processed + return TRUE; + } } -void wxFrame::ScreenToClient(int *x, int *y) const +bool wxFrame::HandleSize(int x, int y, WXUINT id) { - 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; -} + bool processed = FALSE; +#ifndef __WXMICROWIN__ -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); -} + switch ( id ) + { + case SIZENORMAL: + // 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 + if ( !m_iconized ) + break; -wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) -{ - wxCHECK_MSG( m_frameToolBar == NULL, FALSE, - "recreating toolbar in wxFrame" ); + // restore all child frames too + IconizeChildFrames(FALSE); - wxToolBar* toolBar = OnCreateToolBar(style, id, name); - if (toolBar) - { - SetToolBar(toolBar); - PositionToolBar(); - return toolBar; + (void)SendIconizeEvent(FALSE); + + // fall through + + case SIZEFULLSCREEN: + m_iconized = FALSE; + break; + + case SIZEICONIC: + // iconize all child frames too + IconizeChildFrames(TRUE); + + (void)SendIconizeEvent(); + + m_iconized = TRUE; + break; } - else +#endif + + if ( !m_iconized ) { - return NULL; +#if wxUSE_STATUSBAR + PositionStatusBar(); +#endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR + PositionToolBar(); +#endif // wxUSE_TOOLBAR + + processed = wxWindow::HandleSize(x, y, id); } -} -wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name) -{ - return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name); + return processed; } -void wxFrame::PositionToolBar() +bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) { - RECT rect; - ::GetClientRect((HWND) GetHWND(), &rect); - - if ( GetStatusBar() ) + if ( control ) { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - rect.bottom -= statusY; + // In case it's e.g. a toolbar. + wxWindow *win = wxFindWinFromHandle(control); + if ( win ) + return win->MSWCommand(cmd, id); } - if (GetToolBar()) + // handle here commands from menus and accelerators + if ( cmd == 0 || cmd == 1 ) { - int tw, th; - GetToolBar()->GetSize(& tw, & th); - - if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) +#if wxUSE_MENUS_NATIVE + if ( wxCurrentPopupMenu ) { - // Use the 'real' MSW position - GetToolBar()->SetSize(0, 0, tw, rect.bottom, wxSIZE_NO_ADJUSTMENTS); - } - else - { - // Use the 'real' MSW position - GetToolBar()->SetSize(0, 0, rect.right, th, wxSIZE_NO_ADJUSTMENTS); - } - } -} + wxMenu *popupMenu = wxCurrentPopupMenu; + wxCurrentPopupMenu = NULL; -// 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(); - node; - node = node->GetNext() ) - { - wxWindow *win = node->GetData(); + return popupMenu->MSWCommand(cmd, id); + } +#endif // wxUSE_MENUS_NATIVE - if ( win->IsKindOf(CLASSINFO(wxFrame)) ) + if ( ProcessCommand(id) ) { - ((wxFrame *)win)->Iconize(bIconize); + return TRUE; } } -} -// =========================================================================== -// our private (non virtual) message handlers -// =========================================================================== + return FALSE; +} -bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu) +bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) { int item; - if ( nFlags == 0xFFFF && hMenu == 0 ) + if ( flags == 0xFFFF && hMenu == 0 ) { - // FIXME: what does this do? does it ever happen? + // menu was removed from screen item = -1; } - else if ((nFlags != MF_SEPARATOR) && (nItem != 0) && (nItem != 65535)) +#ifndef __WXMICROWIN__ + else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) ) { item = nItem; } +#endif else { + // don't give hints for separators (doesn't make sense) nor for the + // items opening popup menus (they don't have them anyhow) but do clear + // the status line - otherwise, we would be left with the help message + // for the previous item which doesn't apply any more + DoGiveHelp(wxEmptyString, FALSE); + return FALSE; } wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item); - event.SetEventObject( this ); + event.SetEventObject(this); + + return GetEventHandler()->ProcessEvent(event); +} + +bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup) +{ + // we don't have the menu id here, so we use the id to specify if the event + // was from a popup menu or a normal one + wxMenuEvent event(evtType, isPopup ? -1 : 0); + event.SetEventObject(this); return GetEventHandler()->ProcessEvent(event); } @@ -1074,19 +782,62 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) switch ( message ) { + case WM_CLOSE: + // if we can't close, tell the system that we processed the + // message - otherwise it would close us + processed = !Close(); + break; + + case WM_SIZE: + processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam); + break; + + case WM_COMMAND: + { + WORD id, cmd; + WXHWND hwnd; + UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam, + &id, &hwnd, &cmd); + + processed = HandleCommand(id, cmd, (WXHWND)hwnd); + } + break; + + case WM_PAINT: + processed = HandlePaint(); + break; + +#ifndef __WXMICROWIN__ case WM_MENUSELECT: { - WORD item = (WORD)wParam; -#ifdef __WIN32__ - WORD flags = HIWORD(wParam); - HMENU sysmenu = (HMENU)lParam; -#else - WORD flags = LOWORD(lParam); - HMENU sysmenu = (HMENU)HIWORD(lParam); -#endif - processed = HandleMenuSelect(item, flags, (WXHMENU)sysmenu); + WXWORD item, flags; + WXHMENU hmenu; + UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu); + + processed = HandleMenuSelect(item, flags, hmenu); } break; + +#ifndef __WIN16__ + case WM_ENTERMENULOOP: + processed = HandleMenuLoop(wxEVT_MENU_OPEN, wParam); + break; + + case WM_EXITMENULOOP: + processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam); + break; +#endif // __WIN16__ + + case WM_QUERYDRAGICON: + { + const wxIcon& icon = GetIcon(); + HICON hIcon = icon.Ok() ? GetHiconOf(icon) + : (HICON)GetDefaultIcon(); + rc = (long)hIcon; + processed = rc != 0; + } + break; +#endif // !__WXMICROWIN__ } if ( !processed ) @@ -1094,3 +845,4 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) return rc; } +