make sure we are removing ourselves from the focus of the toplevel frame when deletin...

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index a4c8b0b9021861f92fbabb96efc44fb094520fac..98c8c7eacdcd5523ef33754120cad4d4fa68711e 100644 (file)
--- 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:
 // Purpose:     wxFrame
 // Author:      Julian Smart
 // Modified by:


@@ -9,950 +9,840 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "frame.h"
+    #pragma implementation "frame.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/setup.h"
-#include "wx/frame.h"
-#include "wx/menu.h"
-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/settings.h"
-#include "wx/dcclient.h"
-#endif
+    #include "wx/frame.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/msw/private.h"

-#include "wx/statusbr.h"
-#include "wx/menuitem.h"
-
-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif

 
 

-#if USE_NATIVE_STATUSBAR
-#include <wx/msw/statbr95.h>
-#endif
-
-extern wxList wxModelessWindows;
-extern wxList wxPendingDelete;
-extern char wxFrameClassName[];
-
-#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-  EVT_SIZE(wxFrame::OnSize)
-  EVT_ACTIVATE(wxFrame::OnActivate)
-  EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
-  EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-  EVT_IDLE(wxFrame::OnIdle)
-  EVT_CLOSE(wxFrame::OnCloseWindow)
-END_EVENT_TABLE()
+#if wxUSE_STATUSBAR
+    #include "wx/statusbr.h"
+    #include "wx/generic/statusbr.h"
+#endif // wxUSE_STATUSBAR

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-#endif
+#if wxUSE_TOOLBAR
+    #include "wx/toolbar.h"
+#endif // wxUSE_TOOLBAR

 
 

-#if USE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
-#else
-bool wxFrame::m_useNativeStatusBar = FALSE;
-#endif
+#include "wx/menuitem.h"
+#include "wx/log.h"

 
 

-wxFrame::wxFrame(void)
-{
-  m_frameToolBar = NULL ;
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
+#ifdef __WXUNIVERSAL__
+    #include "wx/univ/theme.h"
+    #include "wx/univ/colschem.h"
+#endif // __WXUNIVERSAL__

 
 

-  m_windowParent = NULL;
-  m_iconized = FALSE;
-}
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------

 
 

-bool wxFrame::Create(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
-{
-  if (!parent)
-    wxTopLevelWindows.Append(this);
+#if wxUSE_MENUS_NATIVE
+    extern wxMenu *wxCurrentPopupMenu;
+#endif // wxUSE_MENUS_NATIVE

 
 

-  SetName(name);
-//  m_modalShowing = FALSE;
-  m_windowStyle = style;
-  m_frameMenuBar = NULL;
-  m_frameToolBar = NULL ;
-  m_frameStatusBar = NULL;
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------

 
 

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+    EVT_ACTIVATE(wxFrame::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
+END_EVENT_TABLE()

 
 

-//  m_icon = NULL;
-  if ( id > -1 )
-    m_windowId = id;
-  else
-    m_windowId = (int)NewControlId();
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

 
 

-  if (parent) parent->AddChild(this);
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+// ----------------------------------------------------------------------------
+// static class members
+// ----------------------------------------------------------------------------

 
 

-  m_iconized = FALSE;
-  MSWCreate(m_windowId, (wxWindow *)parent, wxFrameClassName, this, (char *)(const char *)title,
-                   x, y, width, height, style);
+#if wxUSE_STATUSBAR
+    #if wxUSE_NATIVE_STATUSBAR
+        bool wxFrame::m_useNativeStatusBar = TRUE;
+    #else
+        bool wxFrame::m_useNativeStatusBar = FALSE;
+    #endif
+#endif // wxUSE_NATIVE_STATUSBAR

 
 

-  wxModelessWindows.Append(this);
-  return TRUE;
-}
+// ----------------------------------------------------------------------------
+// creation/destruction
+// ----------------------------------------------------------------------------

 
 

-wxFrame::~wxFrame(void)
+void wxFrame::Init()

 {
 {

-  m_isBeingDeleted = TRUE;
-  wxTopLevelWindows.DeleteObject(this);
-
-  if (m_frameStatusBar)
-    delete m_frameStatusBar;
-  if (m_frameMenuBar)
-    delete m_frameMenuBar;
-
-/* New behaviour March 1998: check if it's the last top-level window */
-//  if (wxTheApp && (this == wxTheApp->GetTopWindow()))
-
-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
-
-    if (wxTheApp->GetExitOnFrameDelete())
-    {
-       PostQuitMessage(0);
-    }
-  }
-
-  wxModelessWindows.DeleteObject(this);
+#if wxUSE_TOOLTIPS
+    m_hwndToolTip = 0;
+#endif

 
 

-  // 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());
-}
+    // Data to save/restore when calling ShowFullScreen
+    m_fsStatusBarFields = 0;
+    m_fsStatusBarHeight = 0;
+    m_fsToolBarHeight = 0;
+//  m_fsMenu = 0;

 
 

-WXHMENU wxFrame::GetWinMenu(void) const
-{
-  return m_hMenu;
-}
+    m_wasMinimized = FALSE;

 
 

-// Get size *available for subwindows* i.e. excluding menu bar etc.
-// For XView, this is the same as GetSize
-void wxFrame::GetClientSize(int *x, int *y) const
-{
-  RECT rect;
-  GetClientRect((HWND) GetHWND(), &rect);
-
-  if ( m_frameStatusBar )
-  {
-  int statusX, statusY;
-  m_frameStatusBar->GetClientSize(&statusX, &statusY);
-  rect.bottom -= statusY;
-  }
-  *x = rect.right;
-  *y = rect.bottom;
+    m_winLastFocused = (wxWindow *)NULL;

 }
 
 }
 

-// Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
-void wxFrame::SetClientSize(int width, int height)
+bool wxFrame::Create(wxWindow *parent,
+                     wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos,
+                     const wxSize& size,
+                     long style,
+                     const wxString& name)

 {
 {

-  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 ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return FALSE;

 
 

-  if ( m_frameStatusBar )
-  {
-  int statusX, statusY;
-  m_frameStatusBar->GetClientSize(&statusX, &statusY);
-  actual_height += statusY;
-  }
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

 
 

-  POINT point;
-  point.x = rect2.left;
-  point.y = rect2.top;
+    wxModelessWindows.Append(this);

 
 

-  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);
+    return TRUE;

 }
 
 }
 

-void wxFrame::GetSize(int *width, int *height) const
+wxFrame::~wxFrame()

 {
 {

-  RECT rect;
-  GetWindowRect((HWND) GetHWND(), &rect);
-  *width = rect.right - rect.left;
-  *height = rect.bottom - rect.top;
-}
+    m_isBeingDeleted = TRUE;

 
 

-void wxFrame::GetPosition(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;
+    DeleteAllBars();

 }
 
 }
 

-void wxFrame::SetSize(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(&currentX, &currentY);
-  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);
-}
+// ----------------------------------------------------------------------------
+// wxFrame client size calculations
+// ----------------------------------------------------------------------------

 
 

-bool wxFrame::Show(bool show)
+void wxFrame::DoSetClientSize(int width, int height)

 {
 {

-  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())
+    // leave enough space for the status bar if we have (and show) it
+#if wxUSE_STATUSBAR
+    wxStatusBar *statbar = GetStatusBar();
+    if ( statbar && statbar->IsShown() )

     {
     {

-      hWndParent = (HWND) GetParent()->GetHWND();
-      if (hWndParent)
-        ::BringWindowToTop(hWndParent);
+        height += statbar->GetSize().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;
-}
+#endif // wxUSE_STATUSBAR

 
 

-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;
-}
+    // call GetClientAreaOrigin() to take the toolbar into account
+    wxPoint pt = GetClientAreaOrigin();
+    width += pt.x;
+    height += pt.y;

 
 

-// 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;
+    wxTopLevelWindow::DoSetClientSize(width, height);

 }
 
 }
 

-bool wxFrame::IsIconized(void) const
+// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
+void wxFrame::DoGetClientSize(int *x, int *y) const

 {
 {

-  ((wxFrame *)this)->m_iconized = (::IsIconic((HWND) GetHWND()) != 0);
-  return m_iconized;
-}
+    wxTopLevelWindow::DoGetClientSize(x, y);

 
 

-void wxFrame::SetTitle(const wxString& title)
-{
-  SetWindowText((HWND) GetHWND(), (const char *)title);
+    // account for the possible toolbar
+    wxPoint pt = GetClientAreaOrigin();
+    if ( x )
+        *x -= pt.x;
+
+    if ( y )
+        *y -= pt.y;
+
+#if wxUSE_STATUSBAR
+    // adjust client area height to take the status bar into account
+    if ( y )
+    {
+        wxStatusBar *statbar = GetStatusBar();
+        if ( statbar && statbar->IsShown() )
+        {
+            *y -= statbar->GetClientSize().y;
+        }
+    }
+#endif // wxUSE_STATUSBAR

 }
 
 }
 

-wxString wxFrame::GetTitle(void) const
+// ----------------------------------------------------------------------------
+// wxFrame: various geometry-related functions
+// ----------------------------------------------------------------------------
+
+void wxFrame::Raise()

 {
 {

-  GetWindowText((HWND) GetHWND(), wxBuffer, 1000);
-  return wxString(wxBuffer);
+#ifdef __WIN16__
+    // no SetForegroundWindow() in Win16
+    wxFrameBase::Raise();
+#else // Win32
+    ::SetForegroundWindow(GetHwnd());
+#endif // Win16/32

 }
 
 }
 

-void wxFrame::SetIcon(const wxIcon& icon)
+// generate an artificial resize event
+void wxFrame::SendSizeEvent()

 {
 {

-  m_icon = icon;
-#if defined(__WIN95__)
-  if ( m_icon.Ok() )
-    SendMessage((HWND) GetHWND(), WM_SETICON,
-                (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
-#endif
+    if ( !m_iconized )
+    {
+        RECT r = wxGetWindowRect(GetHwnd());
+
+        (void)::PostMessage(GetHwnd(), WM_SIZE,
+                            IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
+                            MAKELPARAM(r.right - r.left, r.bottom - r.top));
+    }

 }
 
 }
 

-wxStatusBar *wxFrame::OnCreateStatusBar(int number)
+#if wxUSE_STATUSBAR
+wxStatusBar *wxFrame::OnCreateStatusBar(int number,
+                                        long style,
+                                        wxWindowID id,
+                                        const wxString& name)

 {
     wxStatusBar *statusBar = NULL;
 
 {
     wxStatusBar *statusBar = NULL;
 

-#if USE_NATIVE_STATUSBAR
-    if (UsesNativeStatusBar())
+#if wxUSE_NATIVE_STATUSBAR
+    if ( !UsesNativeStatusBar() )

     {
     {

-        statusBar = new wxStatusBar95(this);
+        statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style);

     }
     else
 #endif
     {
     }
     else
 #endif
     {

-        statusBar = new wxStatusBar(this, -1, wxPoint(0, 0), wxSize(100, 20));
-
-        // 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);

 
 

-bool wxFrame::CreateStatusBar(int number)
-{
-  // 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);
-  if ( m_frameStatusBar )
-  {
-    PositionStatusBar();
-    return TRUE;
-  }
-  else
-    return FALSE;
+    return statusBar;

 }
 
 }
 

-void wxFrame::SetStatusText(const wxString& text, int number)
+void wxFrame::PositionStatusBar()

 {
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+    if ( !m_frameStatusBar || !m_frameStatusBar->IsShown() )
+        return;

 
 

-  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" );
+    int w, h;
+    GetClientSize(&w, &h);
+    int sw, sh;
+    m_frameStatusBar->GetSize(&sw, &sh);

 
 

-  m_frameStatusBar->SetStatusWidths(n, widths_field);
-  PositionStatusBar();
+    // Since we wish the status bar to be directly under the client area,
+    // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
+    m_frameStatusBar->SetSize(0, h, w, sh);

 }
 }

+#endif // wxUSE_STATUSBAR

 
 

-void wxFrame::PositionStatusBar(void)
-{
-  // native status bar positions itself
-  if (m_frameStatusBar
-#if USE_NATIVE_STATUSBAR
-   && !m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))
-#endif
-    )
-  {
-      int w, h;
-      GetClientSize(&w, &h);
-      int sw, sh;
-      m_frameStatusBar->GetSize(&sw, &sh);
-      m_frameStatusBar->SetSize(0, h, w, sh);
-  }
-}
-
-void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
-{
-  if (!menu_bar)
-  {
-    m_frameMenuBar = NULL;
-    return;
-  }
-  
-  if (menu_bar->m_menuBarFrame)
-   return;
-
-  int i;
-  HMENU menu = CreateMenu();
-
-  for (i = 0; i < menu_bar->m_menuCount; i ++)
-  {
-    HMENU popup = (HMENU)menu_bar->m_menus[i]->m_hMenu;
-    //
-    // After looking Bounds Checker result, it seems that all
-    // menus must be individually destroyed. So, don't reset m_hMenu,
-    // to  allow ~wxMenu to do the job.
-    //
-    menu_bar->m_menus[i]->m_savehMenu = (WXHMENU) popup;
-    // Uncommenting for the moment... JACS
-    menu_bar->m_menus[i]->m_hMenu = 0;
-    AppendMenu(menu, MF_POPUP | MF_STRING, (UINT)popup, menu_bar->m_titles[i]);
-  }
-
-  menu_bar->m_hMenu = (WXHMENU)menu;
-  if (m_frameMenuBar)
-    delete m_frameMenuBar;
-
-  this->m_hMenu = (WXHMENU) menu;
-
-  DWORD err = 0;
-  if (!SetMenu((HWND) GetHWND(), menu))
-  {
-#ifdef __WIN32__
-    err = GetLastError();
-#endif
-  }
-
-  m_frameMenuBar = menu_bar;
-  menu_bar->m_menuBarFrame = this;
-}
+#if wxUSE_MENUS_NATIVE

 
 

-bool wxFrame::LoadAccelerators(const wxString& table)
+void wxFrame::AttachMenuBar(wxMenuBar *menubar)

 {
 {

-  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!
+    wxFrameBase::AttachMenuBar(menubar);

 
 

-  return (m_acceleratorTable != (WXHANDLE) NULL);
+    if ( !menubar )
+    {
+        // 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();
+
+            if ( !m_hMenu )
+            {
+                wxFAIL_MSG( _T("failed to create menu bar") );
+                return;
+            }
+        }
+
+        InternalSetMenuBar();
+    }

 }
 
 }
 

-void wxFrame::Fit(void)
+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)
 {
 // 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();
 
     Refresh();
 

+#if wxUSE_STATUSBAR

     if ( m_frameStatusBar )
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );
     if ( m_frameStatusBar )
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );

-        m_frameStatusBar->ProcessEvent(event2);
+        m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);

     }
     }

+#endif // wxUSE_STATUSBAR

 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 

-/*
- * Frame window
- *
- */
-
-void 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 USE_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 (style & wxSTAY_ON_TOP)
-    extendedStyle |= WS_EX_TOPMOST;
+    if (show)
+    {
+#if wxUSE_TOOLBAR
+        wxToolBar *theToolBar = GetToolBar();
+        if (theToolBar)
+            theToolBar->GetSize(NULL, &m_fsToolBarHeight);
+
+        // zap the toolbar, menubar, and statusbar
+
+        if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
+        {
+            theToolBar->SetSize(-1,0);
+            theToolBar->Show(FALSE);
+        }
+#endif // wxUSE_TOOLBAR
+
+#ifndef __WXMICROWIN__
+        if (style & wxFULLSCREEN_NOMENUBAR)
+            SetMenu((HWND)GetHWND(), (HMENU) NULL);
+#endif

 
 

-  m_iconized = FALSE;
-  wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,
-         msflags, NULL, extendedStyle);
-  // 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));
+#if wxUSE_STATUSBAR
+        wxStatusBar *theStatusBar = GetStatusBar();
+        if (theStatusBar)
+            theStatusBar->GetSize(NULL, &m_fsStatusBarHeight);
+
+        // Save the number of fields in the statusbar
+        if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
+        {
+            //m_fsStatusBarFields = theStatusBar->GetFieldsCount();
+            //SetStatusBar((wxStatusBar*) NULL);
+            //delete theStatusBar;
+            theStatusBar->Show(FALSE);
+        }
+        else
+            m_fsStatusBarFields = 0;
+#endif // wxUSE_STATUSBAR
+    }
+    else
+    {
+#if wxUSE_TOOLBAR
+        wxToolBar *theToolBar = GetToolBar();
+
+        // 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::MSWOnPaint(void)
+// Default activation behaviour - set the focus for the first child
+// subwindow found.
+void wxFrame::OnActivate(wxActivateEvent& event)

 {
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxFrameWnd::OnPaint %d\n", handle);
-#endif
-  RECT rect;
-  if (GetUpdateRect((HWND) GetHWND(), &rect, FALSE))
-  {
-    if (m_iconized)
+    if ( event.GetActive() )

     {
     {

-      HICON the_icon;
-    if (m_icon.Ok())
-      the_icon = (HICON) m_icon.GetHICON();
-      if (the_icon == 0)
-        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)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);
+        // restore focus to the child which was last focused
+        wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
+
+        wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+                                            : NULL;
+        if ( !parent )
+        {
+            parent = this;
+        }
+
+        wxSetFocusToChild(parent, &m_winLastFocused);

     }
     }

-    else
+    else // deactivating

     {
     {

-        wxPaintEvent event(m_windowId);
-        event.m_eventObject = this;
-        if (!GetEventHandler()->ProcessEvent(event))
-            Default();
+        // remember the last focused child if it is our child
+        m_winLastFocused = FindFocus();
+
+        // so we NULL it out if it's a child from some other frame
+        wxWindow *win = m_winLastFocused;
+        while ( win )
+        {
+            if ( win->IsTopLevel() )
+            {
+                if ( win != this )
+                {
+                    m_winLastFocused = NULL;
+                }
+
+                break;
+            }
+
+            win = win->GetParent();
+        }
+
+        wxLogTrace(_T("focus"),
+                   _T("wxFrame %08x deactivated, last focused: %08x."),
+                   m_hWnd,
+                   m_winLastFocused ? GetHwndOf(m_winLastFocused)
+                                    : NULL);
+
+        event.Skip();

     }
     }

-    return 0;
-  }
-  return 1;

 }
 
 }
 

-WXHICON wxFrame::MSWOnQueryDragIcon(void)
-{
-  if (m_icon.Ok() && (m_icon.GetHICON() != 0))
-    return m_icon.GetHICON();
-  else
-    return m_defaultIcon;
-}
+// ----------------------------------------------------------------------------
+// tool/status bar stuff
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOOLBAR

 
 

-void wxFrame::MSWOnSize(int x, int y, WXUINT id)
+wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)

 {
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxFrameWnd::OnSize %d\n", m_hWnd);
-#endif
-  switch (id)
-  {
-    case SIZEFULLSCREEN:
-    case SIZENORMAL:
-      m_iconized = FALSE;
-    break;
-    case SIZEICONIC:
-      m_iconized = TRUE;
-    break;
-  }
-
- if (!m_iconized)
- {
-  // forward WM_SIZE to status bar control
-#if USE_NATIVE_STATUSBAR
-  if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
-  {
-    wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());
-    event.SetEventObject( m_frameStatusBar );
-
-    ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event);
-  }
-#endif
+    if ( wxFrameBase::CreateToolBar(style, id, name) )
+    {
+        PositionToolBar();
+    }

 
 

-  PositionStatusBar();
-  wxSizeEvent event(wxSize(x, y), m_windowId);
-  event.SetEventObject( this );
-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
- }
+    return m_frameToolBar;

 }
 
 }
 

-bool wxFrame::MSWOnClose(void)
+void wxFrame::PositionToolBar()

 {
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxFrameWnd::OnClose %d\n", handle);
-#endif
-    return Close();
+    wxToolBar *toolbar = GetToolBar();
+    if ( toolbar && toolbar->IsShown() )
+    {
+        // don't call our (or even wxTopLevelWindow) version because we want
+        // the real (full) client area size, not excluding the tool/status bar
+        int width, height;
+        wxWindow::DoGetClientSize(&width, &height);
+
+#if wxUSE_STATUSBAR
+        wxStatusBar *statbar = GetStatusBar();
+        if ( statbar && statbar->IsShown() )
+        {
+            height -= statbar->GetClientSize().y;
+        }
+#endif // wxUSE_STATUSBAR
+
+        int tw, th;
+        toolbar->GetSize(&tw, &th);
+
+        if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
+        {
+            th = height;
+        }
+        else
+        {
+            tw = width;
+            if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT )
+                th -= 3;
+        }
+
+        // use the 'real' MSW position here, don't offset relativly to the
+        // client area origin
+        toolbar->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS);
+    }

 }
 
 }
 

-bool wxFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
+#endif // wxUSE_TOOLBAR
+
+// ----------------------------------------------------------------------------
+// frame state (iconized/maximized/...)
+// ----------------------------------------------------------------------------
+
+// propagate our state change to all child frames: this allows us to emulate X
+// Windows behaviour where child frames float independently of the parent one
+// on the desktop, but are iconized/restored with it
+void wxFrame::IconizeChildFrames(bool bIconize)

 {
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxFrameWnd::OnCommand %d\n", handle);
-#endif
-  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 (GetMenuBar() && GetMenuBar()->FindItemForId(id))
+    for ( wxWindowList::Node *node = GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )

     {
     {

-      ProcessCommand(id);
-      return TRUE;
+        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);
+        }

     }
     }

-    else
-      return FALSE;
-  }
-  else
-    return FALSE;

 }
 
 }
 

-void wxFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU hSysMenu)
+WXHICON wxFrame::GetDefaultIcon() const

 {
 {

-  if (nFlags == 0xFFFF && hSysMenu == 0)
-  {
-    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, -1);
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(event);
-  }
-  else if (nFlags != MF_SEPARATOR)
-  {
-    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, nItem);
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(event);
-  }
+    return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON
+                                      : wxDEFAULT_FRAME_ICON);

 }
 
 }
 

-bool wxFrame::MSWProcessMessage(WXMSG* pMsg)
+// ===========================================================================
+// message processing
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// preprocessing
+// ---------------------------------------------------------------------------
+
+bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)

 {
 {

-  if (m_acceleratorTable != 0 &&
-          ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable, (MSG *)pMsg))
-    return TRUE;
-  
-  return FALSE;
+    if ( wxWindow::MSWTranslateMessage(pMsg) )
+        return TRUE;
+
+#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
+    // try the menu bar accels
+    wxMenuBar *menuBar = GetMenuBar();
+    if ( !menuBar )
+        return FALSE;
+
+    const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
+    return acceleratorTable.Translate(this, pMsg);
+#else
+    return FALSE;
+#endif // wxUSE_MENUS && wxUSE_ACCEL

 }
 
 }
 

-// Default resizing behaviour - if only ONE subwindow,
-// resize to client rectangle size
-void wxFrame::OnSize(wxSizeEvent& event)
+// ---------------------------------------------------------------------------
+// our private (non virtual) message handlers
+// ---------------------------------------------------------------------------
+
+bool wxFrame::HandlePaint()

 {
 {

-  // if we're using constraints - do use them
-  #if USE_CONSTRAINTS
-    if ( GetAutoLayout() ) {
-      Layout();
-      return;
-    }
-  #endif
-
-  // do we have _exactly_ one child?
-  wxWindow *child = NULL;
-  for ( wxNode *node = GetChildren()->First(); node; node = node->Next() )
-  {
-    wxWindow *win = (wxWindow *)node->Data();
-    if ( !win->IsKindOf(CLASSINFO(wxFrame))  &&
-         !win->IsKindOf(CLASSINFO(wxDialog)) && 
-         (win != GetStatusBar()) &&
-         (win != GetToolBar()) )
+    RECT rect;
+    if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )

     {
     {

-      if ( child )
-        return;     // it's our second subwindow - nothing to do
-      child = win;
+#ifndef __WXMICROWIN__
+        if ( m_iconized )
+        {
+            const wxIcon& icon = GetIcon();
+            HICON hIcon = icon.Ok() ? GetHiconOf(icon)
+                                    : (HICON)GetDefaultIcon();
+
+            // Hold a pointer to the dc so long as the OnPaint() message
+            // is being processed
+            PAINTSTRUCT ps;
+            HDC hdc = ::BeginPaint(GetHwnd(), &ps);
+
+            // Erase background before painting or we get white background
+            MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L);
+
+            if ( hIcon )
+            {
+                RECT rect;
+                ::GetClientRect(GetHwnd(), &rect);
+
+                // FIXME: why hardcoded?
+                static const int icon_width = 32;
+                static const int icon_height = 32;
+
+                int icon_x = (int)((rect.right - icon_width)/2);
+                int icon_y = (int)((rect.bottom - icon_height)/2);
+
+                ::DrawIcon(hdc, icon_x, icon_y, hIcon);
+            }
+
+            ::EndPaint(GetHwnd(), &ps);
+
+            return TRUE;
+        }
+        else
+ #endif
+        {
+            return wxWindow::HandlePaint();
+        }

     }
     }

-  }
-
-  if ( child ) {
-    // we have exactly one child - set it's size to fill the whole frame
-    int clientW, clientH;
-    GetClientSize(&clientW, &clientH);
-
-    int x = 0;
-    int y = 0;
-
-    // Manage the toolbar if there is one
-    if ( GetToolBar() )
+    else

     {
     {

-        int wt, ht;
-        GetToolBar()->GetSize(&wt, &ht);
-        clientH -= ht;
-        y += ht;
-        GetToolBar()->SetSize(0, 0, clientW, ht);
+        // nothing to paint - processed
+        return TRUE;

     }
     }

-
-    child->SetSize(x, y, clientW, clientH);
-  }

 }
 
 }
 

-// Default activation behaviour - set the focus for the first child
-// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
+bool wxFrame::HandleSize(int x, int y, WXUINT id)

 {
 {

-  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)))
+    bool processed = FALSE;
+#ifndef __WXMICROWIN__
+
+    switch ( id )

     {
     {

-#if WXDEBUG > 1
-      wxDebugMsg("wxFrame::OnActivate: about to set the child's focus.\n");
-#endif
-      child->SetFocus();
-      return;
-    }
-  }
-}
+        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;

 
 

-// The default implementation for the close window event - calls
-// OnClose for backward compatibility.
+            // restore all child frames too
+            IconizeChildFrames(FALSE);

 
 

-void wxFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
+            (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;
+    }
+#endif
+
+    if ( !m_iconized )

     {
     {

-        this->Destroy();
+#if wxUSE_STATUSBAR
+        PositionStatusBar();
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+        PositionToolBar();
+#endif // wxUSE_TOOLBAR
+
+        processed = wxWindow::HandleSize(x, y, id);

     }
     }

-}

 
 

-bool wxFrame::OnClose(void)
-{
-    return TRUE;
+    return processed;

 }
 
 }
 

-// Destroy the window (delayed, if a managed window)
-bool wxFrame::Destroy(void)
+bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)

 {
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
-}
+    if ( control )
+    {
+        // In case it's e.g. a toolbar.
+        wxWindow *win = wxFindWinFromHandle(control);
+        if ( win )
+            return win->MSWCommand(cmd, id);
+    }

 
 

-// Default menu selection behaviour - display a help string
-void wxFrame::OnMenuHighlight(wxMenuEvent& event)
-{
-  if (GetStatusBar())
-  {
-    if (event.GetMenuId() == -1)
-      SetStatusText("");
-    else
+    // handle here commands from menus and accelerators
+    if ( cmd == 0 || cmd == 1 )

     {
     {

-      wxMenuBar *menuBar = GetMenuBar();
-      if (menuBar)
-      {
-        wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
-        if (helpString != "")
-          SetStatusText(helpString);
-      }
+#if wxUSE_MENUS_NATIVE
+        if ( wxCurrentPopupMenu )
+        {
+            wxMenu *popupMenu = wxCurrentPopupMenu;
+            wxCurrentPopupMenu = NULL;
+
+            return popupMenu->MSWCommand(cmd, id);
+        }
+#endif // wxUSE_MENUS_NATIVE
+
+        if ( ProcessCommand(id) )
+        {
+            return TRUE;
+        }

     }
     }

-  }
-}

 
 

-wxMenuBar *wxFrame::GetMenuBar(void) const
-{
-  return m_frameMenuBar;
+    return FALSE;

 }
 
 }
 

-void wxFrame::Centre(int direction)
+bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)

 {
 {

-  int display_width, display_height, width, height, x, y;
-  wxDisplaySize(&display_width, &display_height);
+    int item;
+    if ( flags == 0xFFFF && hMenu == 0 )
+    {
+        // menu was removed from screen
+        item = -1;
+    }
+#ifndef __WXMICROWIN__
+    else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
+    {
+        item = nItem;
+    }
+#endif
+    else
+    {
+        // 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);

 
 

-  GetSize(&width, &height);
-  GetPosition(&x, &y);
+        return FALSE;
+    }

 
 

-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
+    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
+    event.SetEventObject(this);

 
 

-  SetSize(x, y, width, height);
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-// Call this to simulate a menu command
-void wxFrame::Command(int id)
+bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup)

 {
 {

-  ProcessCommand(id);
-}
+    // 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);

 
 

-void wxFrame::ProcessCommand(int id)
-{
-  wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, id);
-  commandEvent.SetInt( id );
-  commandEvent.SetEventObject( this );
-
-  wxMenuBar *bar = GetMenuBar() ;
-  if (!bar)
-    return;
-
-  wxMenuItem *item = bar->FindItemForId(id) ;
-  if (item && item->IsCheckable())
-  {
-    bar->Check(id,!bar->Checked(id)) ;
-  }
-  GetEventHandler()->ProcessEvent(commandEvent);
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-void wxFrame::OnIdle(wxIdleEvent& event)
-{
-  DoMenuUpdates();
-}
+// ---------------------------------------------------------------------------
+// the window proc for wxFrame
+// ---------------------------------------------------------------------------

 
 

-// Query app for menu item updates (called from OnIdle)
-void wxFrame::DoMenuUpdates(void)
+long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-  wxMenuBar* bar = GetMenuBar();
-  if (!bar)
-    return;
-
-  int i;
-  for (i = 0; i < bar->m_menuCount; i++)
-  {
-    wxMenu* menu = bar->m_menus[i];
+    long rc = 0;
+    bool processed = FALSE;

 
 

-    DoMenuUpdates(menu);
-  }
-}
-
-void wxFrame::DoMenuUpdates(wxMenu* menu)
-{
-  wxNode* node = menu->m_menuItems.First();
-  while (node)
-  {
-    wxMenuItem* item = (wxMenuItem*) node->Data();
-    if ( !item->IsSeparator() )
+    switch ( message )

     {
     {

-        wxWindowID id = item->GetId();
-      wxUpdateUIEvent event(id);
-      event.SetEventObject( this );
-
-      if (GetEventHandler()->ProcessEvent(event))
-      {
-        if (event.GetSetText())
-          menu->SetLabel(id, event.GetText());
-        if (event.GetSetChecked())
-          menu->Check(id, event.GetChecked());
-        if (event.GetSetEnabled())
-          menu->Enable(id, event.GetEnabled());
-      }
-
-      if (item->GetSubMenu())
-        DoMenuUpdates(item->GetSubMenu());
+        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:
+            {
+                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__

     }
     }

-    node = node->Next();
-  }
+
+    if ( !processed )
+        rc = wxFrameBase::MSWWindowProc(message, wParam, lParam);
+
+    return rc;

 }
 }

+