wxSpinButton::GetValue() returns correct result now

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 2e00ecfccb9f171eff02016cb35e85e1327d32aa..4cba2dd81f22687da8cccfe710ec3c5075b9a2d0 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -17,35 +17,34 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #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/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 // WX_PRECOMP

 
 #include "wx/msw/private.h"
 #include "wx/statusbr.h"
 
 #include "wx/msw/private.h"
 #include "wx/statusbr.h"

+#include "wx/toolbar.h"

 #include "wx/menuitem.h"
 #include "wx/menuitem.h"

+#include "wx/log.h"

 
 

-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif
-
-#if USE_NATIVE_STATUSBAR
-#include <wx/msw/statbr95.h>
+#if wxUSE_NATIVE_STATUSBAR
+    #include <wx/msw/statbr95.h>

 #endif
 
 #endif
 

-extern wxList wxModelessWindows;
-extern wxList wxPendingDelete;
-extern char wxFrameClassName[];
+extern wxWindowList wxModelessWindows;
+extern wxList WXDLLEXPORT wxPendingDelete;
+extern wxChar wxFrameClassName[];
+extern wxMenu *wxCurrentPopupMenu;

 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)


@@ -60,36 +59,37 @@ END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #endif
 

-#if USE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
+#if wxUSE_NATIVE_STATUSBAR
+    bool wxFrame::m_useNativeStatusBar = TRUE;

 #else
 #else

-bool wxFrame::m_useNativeStatusBar = FALSE;
+    bool wxFrame::m_useNativeStatusBar = FALSE;

 #endif
 
 #endif
 

-wxFrame::wxFrame(void)
+wxFrame::wxFrame()

 {
 {

+  m_frameToolBar = NULL ;

   m_frameMenuBar = NULL;
   m_frameStatusBar = NULL;
 
   m_frameMenuBar = NULL;
   m_frameStatusBar = NULL;
 

-  m_windowParent = NULL;

   m_iconized = FALSE;
 }
 
 bool wxFrame::Create(wxWindow *parent,
   m_iconized = FALSE;
 }
 
 bool wxFrame::Create(wxWindow *parent,

-           const wxWindowID id,
+           wxWindowID id,

            const wxString& title,
            const wxPoint& pos,
            const wxSize& size,
            const wxString& title,
            const wxPoint& pos,
            const wxSize& size,

-           const long style,
+           long style,

            const wxString& name)
 {
            const wxString& name)
 {

-  if (!parent)
-    wxTopLevelWindows.Append(this);
+#if wxUSE_TOOLTIPS
+    m_hwndToolTip = 0;
+#endif

 
   SetName(name);
 
   SetName(name);

-//  m_modalShowing = FALSE;

   m_windowStyle = style;
   m_frameMenuBar = NULL;
   m_windowStyle = style;
   m_frameMenuBar = NULL;

+  m_frameToolBar = NULL ;

   m_frameStatusBar = NULL;
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
   m_frameStatusBar = NULL;
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));


@@ -108,14 +108,25 @@ bool wxFrame::Create(wxWindow *parent,
   int height = size.y;
 
   m_iconized = FALSE;
   int height = size.y;
 
   m_iconized = FALSE;

-  MSWCreate(m_windowId, (wxWindow *)parent, wxFrameClassName, this, (char *)(const char *)title,
-                   x, y, width, height, style);
+
+  // 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;
+
+  if (!parent)
+    wxTopLevelWindows.Append(this);
+
+  MSWCreate(m_windowId, parent, wxFrameClassName, this, title,
+            x, y, width, height, style);

 
   wxModelessWindows.Append(this);
   return TRUE;
 }
 
 
   wxModelessWindows.Append(this);
   return TRUE;
 }
 

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

 {
   m_isBeingDeleted = TRUE;
   wxTopLevelWindows.DeleteObject(this);
 {
   m_isBeingDeleted = TRUE;
   wxTopLevelWindows.DeleteObject(this);


@@ -147,36 +158,35 @@ wxFrame::~wxFrame(void)
     ::BringWindowToTop((HWND) GetParent()->GetHWND());
 }
 
     ::BringWindowToTop((HWND) GetParent()->GetHWND());
 }
 

-WXHMENU wxFrame::GetWinMenu(void) const
-{
-  return m_hMenu;
-}
-
-// 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
+// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
+void wxFrame::DoGetClientSize(int *x, int *y) const

 {
   RECT rect;
 {
   RECT rect;

-  GetClientRect((HWND) GetHWND(), &rect);
+  ::GetClientRect(GetHwnd(), &rect);

 
 

-  if ( m_frameStatusBar )
+  if ( GetStatusBar() )

   {
   {

-  int statusX, statusY;
-  m_frameStatusBar->GetClientSize(&statusX, &statusY);
-  rect.bottom -= statusY;
+    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)
   *x = rect.right;
   *y = rect.bottom;
 }
 
 // Set the client size (i.e. leave the calculation of borders etc.
 // to wxWindows)

-void wxFrame::SetClientSize(const int width, const int height)
+void wxFrame::DoSetClientSize(int width, int height)

 {
 {

-  HWND hWnd = (HWND) GetHWND();
+  HWND hWnd = GetHwnd();

 
   RECT rect;
 
   RECT rect;

-  GetClientRect(hWnd, &rect);
+  ::GetClientRect(hWnd, &rect);

 
   RECT rect2;
   GetWindowRect(hWnd, &rect2);
 
   RECT rect2;
   GetWindowRect(hWnd, &rect2);


@@ -187,39 +197,40 @@ void wxFrame::SetClientSize(const int width, const int height)
   int actual_width = rect2.right - rect2.left - rect.right + width;
   int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
 
   int actual_width = rect2.right - rect2.left - rect.right + width;
   int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
 

-  if ( m_frameStatusBar )
+  if ( GetStatusBar() )

   {
   {

-  int statusX, statusY;
-  m_frameStatusBar->GetClientSize(&statusX, &statusY);
-  actual_height += statusY;
+    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);
   POINT point;
   point.x = rect2.left;
   point.y = rect2.top;
 
   MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);

-#if WXWIN_COMPATIBILITY
-  GetEventHandler()->OldOnSize(width, height);
-#else
+

   wxSizeEvent event(wxSize(width, height), m_windowId);
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);
   wxSizeEvent event(wxSize(width, height), m_windowId);
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);

-#endif

 }
 
 }
 

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

 {
   RECT rect;
 {
   RECT rect;

-  GetWindowRect((HWND) GetHWND(), &rect);
+  GetWindowRect(GetHwnd(), &rect);

   *width = rect.right - rect.left;
   *height = rect.bottom - rect.top;
 }
 
   *width = rect.right - rect.left;
   *height = rect.bottom - rect.top;
 }
 

-void wxFrame::GetPosition(int *x, int *y) const
+void wxFrame::DoGetPosition(int *x, int *y) const

 {
   RECT rect;
 {
   RECT rect;

-  GetWindowRect((HWND) GetHWND(), &rect);
+  GetWindowRect(GetHwnd(), &rect);

   POINT point;
   point.x = rect.left;
   point.y = rect.top;
   POINT point;
   point.x = rect.left;
   point.y = rect.top;


@@ -228,7 +239,7 @@ void wxFrame::GetPosition(int *x, int *y) const
   *y = point.y;
 }
 
   *y = point.y;
 }
 

-void wxFrame::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
   int currentX, currentY;
   int x1 = x;
 {
   int currentX, currentY;
   int x1 = x;


@@ -247,18 +258,14 @@ void wxFrame::SetSize(const int x, const int y, const int width, const int heigh
   if (width == -1) w1 = ww ;
   if (height==-1) h1 = hh ;
 
   if (width == -1) w1 = ww ;
   if (height==-1) h1 = hh ;
 

-  MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, (BOOL)TRUE);
+  MoveWindow(GetHwnd(), x1, y1, w1, h1, (BOOL)TRUE);

 
 

-#if WXWIN_COMPATIBILITY
-  GetEventHandler()->OldOnSize(width, height);
-#else

   wxSizeEvent event(wxSize(width, height), m_windowId);
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);
   wxSizeEvent event(wxSize(width, height), m_windowId);
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);

-#endif

 }
 
 }
 

-bool wxFrame::Show(const bool show)
+bool wxFrame::Show(bool show)

 {
   int cshow;
   if (show)
 {
   int cshow;
   if (show)


@@ -278,23 +285,19 @@ bool wxFrame::Show(const bool show)
     }
   }
 
     }
   }
 

-  ShowWindow((HWND) GetHWND(), (BOOL)cshow);
+  ShowWindow(GetHwnd(), (BOOL)cshow);

   if (show)
   {
   if (show)
   {

-    BringWindowToTop((HWND) GetHWND());
+    BringWindowToTop(GetHwnd());

 
 

-#if WXWIN_COMPATIBILITY
-    OldOnActivate(TRUE);
-#else

     wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent(event);
     wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent(event);

-#endif

   }
   return TRUE;
 }
 
   }
   return TRUE;
 }
 

-void wxFrame::Iconize(const bool iconize)
+void wxFrame::Iconize(bool iconize)

 {
   if (!iconize)
     Show(TRUE);
 {
   if (!iconize)
     Show(TRUE);


@@ -304,12 +307,12 @@ void wxFrame::Iconize(const bool iconize)
     cshow = SW_MINIMIZE;
   else
     cshow = SW_RESTORE;
     cshow = SW_MINIMIZE;
   else
     cshow = SW_RESTORE;

-  ShowWindow((HWND) GetHWND(), (BOOL)cshow);
+  ShowWindow(GetHwnd(), (BOOL)cshow);

   m_iconized = iconize;
 }
 
 // Equivalent to maximize/restore in Windows
   m_iconized = iconize;
 }
 
 // Equivalent to maximize/restore in Windows

-void wxFrame::Maximize(const bool maximize)
+void wxFrame::Maximize(bool maximize)

 {
   Show(TRUE);
   int cshow;
 {
   Show(TRUE);
   int cshow;


@@ -317,25 +320,20 @@ void wxFrame::Maximize(const bool maximize)
     cshow = SW_MAXIMIZE;
   else
     cshow = SW_RESTORE;
     cshow = SW_MAXIMIZE;
   else
     cshow = SW_RESTORE;

-  ShowWindow((HWND) GetHWND(), cshow);
+  ShowWindow(GetHwnd(), cshow);

   m_iconized = FALSE;
 }
 
   m_iconized = FALSE;
 }
 

-bool wxFrame::IsIconized(void) const
+bool wxFrame::IsIconized() const

 {
 {

-  ((wxFrame *)this)->m_iconized = (::IsIconic((HWND) GetHWND()) != 0);
+  ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0);

   return m_iconized;
 }
 
   return m_iconized;
 }
 

-void wxFrame::SetTitle(const wxString& title)
-{
-  SetWindowText((HWND) GetHWND(), (const char *)title);
-}
-
-wxString wxFrame::GetTitle(void) const
+// Is it maximized?
+bool wxFrame::IsMaximized() const

 {
 {

-  GetWindowText((HWND) GetHWND(), wxBuffer, 1000);
-  return wxString(wxBuffer);
+    return (::IsZoomed(GetHwnd()) != 0) ;

 }
 
 void wxFrame::SetIcon(const wxIcon& icon)
 }
 
 void wxFrame::SetIcon(const wxIcon& icon)


@@ -343,28 +341,31 @@ void wxFrame::SetIcon(const wxIcon& icon)
   m_icon = icon;
 #if defined(__WIN95__)
   if ( m_icon.Ok() )
   m_icon = icon;
 #if defined(__WIN95__)
   if ( m_icon.Ok() )

-    SendMessage((HWND) GetHWND(), WM_SETICON,
+    SendMessage(GetHwnd(), WM_SETICON,

                 (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
 #endif
 }
 
                 (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
 #endif
 }
 

-wxStatusBar *wxFrame::OnCreateStatusBar(const 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 wxUSE_NATIVE_STATUSBAR

     if (UsesNativeStatusBar())
     {
     if (UsesNativeStatusBar())
     {

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

     }
     else
 #endif
     {
     }
     else
 #endif
     {

-        statusBar = new wxStatusBar(this, -1, wxPoint(0, 0), wxSize(100, 20));
+        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);
 
         // Set the height according to the font and the border size
         wxClientDC dc(statusBar);

-        dc.SetFont(* statusBar->GetFont());
+        dc.SetFont(statusBar->GetFont());

 
         long x, y;
         dc.GetTextExtent("X", &x, &y);
 
         long x, y;
         dc.GetTextExtent("X", &x, &y);


@@ -378,42 +379,44 @@ wxStatusBar *wxFrame::OnCreateStatusBar(const int number)
   return statusBar;
 }
 
   return statusBar;
 }
 

-bool wxFrame::CreateStatusBar(const int 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?
 {
   // VZ: calling CreateStatusBar twice is an error - why anyone would do it?

-  wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, 
-               "recreating status bar in wxFrame" );
+  wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
+               _T("recreating status bar in wxFrame") );

 
 

-  m_frameStatusBar = OnCreateStatusBar(number);
+  m_frameStatusBar = OnCreateStatusBar(number, style, id,
+    name);

   if ( m_frameStatusBar )
   {
     PositionStatusBar();
   if ( m_frameStatusBar )
   {
     PositionStatusBar();

-    return TRUE;
+    return m_frameStatusBar;

   }
   else
   }
   else

-    return FALSE;
+    return NULL;

 }
 
 }
 

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

 {
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+  wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") );

 
   m_frameStatusBar->SetStatusText(text, number);
 }
 
 
   m_frameStatusBar->SetStatusText(text, number);
 }
 

-void wxFrame::SetStatusWidths(const int n, const int *widths_field)
+void wxFrame::SetStatusWidths(int n, const int widths_field[])

 {
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+  wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") );

 
   m_frameStatusBar->SetStatusWidths(n, widths_field);
   PositionStatusBar();
 }
 
 
   m_frameStatusBar->SetStatusWidths(n, widths_field);
   PositionStatusBar();
 }
 

-void wxFrame::PositionStatusBar(void)
+void wxFrame::PositionStatusBar()

 {
   // native status bar positions itself
   if (m_frameStatusBar
 {
   // native status bar positions itself
   if (m_frameStatusBar

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

    && !m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))
 #endif
     )
    && !m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))
 #endif
     )


@@ -422,103 +425,44 @@ void wxFrame::PositionStatusBar(void)
       GetClientSize(&w, &h);
       int sw, sh;
       m_frameStatusBar->GetSize(&sw, &sh);
       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);
   }
 }
       m_frameStatusBar->SetSize(0, h, w, sh);
   }
 }

+#endif // wxUSE_STATUSBAR

 
 void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
 
 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;
+    if (!menu_bar)
+    {
+        m_frameMenuBar = NULL;
+        return;
+    }

 
 

-  this->m_hMenu = (WXHMENU) menu;
+    wxCHECK_RET( !menu_bar->GetFrame(), _T("this menubar is already attached") );

 
 

-  DWORD err = 0;
-  if (!SetMenu((HWND) GetHWND(), menu))
-  {
-#ifdef __WIN32__
-    err = GetLastError();
-#endif
-  }
+    if (m_frameMenuBar)
+        delete m_frameMenuBar;

 
 

-  m_frameMenuBar = menu_bar;
-  menu_bar->m_menuBarFrame = this;
-}
+    m_hMenu = menu_bar->Create();

 
 

-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
+    if ( !m_hMenu )
+        return;

 
 

-  // The above is necessary because LoadAccelerators is a macro
-  // which we have undefed earlier in the file to avoid confusion
-  // with wxFrame::LoadAccelerators. Ugh!
+    InternalSetMenuBar();

 
 

-  return (m_acceleratorTable != (WXHANDLE) NULL);
+    m_frameMenuBar = menu_bar;
+    menu_bar->Attach(this);

 }
 
 }
 

-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)))
+    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("SetMenu");

     }
     }

-    node = node->Next();
-  }
-  SetClientSize(max_width, max_height);

 }
 
 // Responds to colour changes, and passes event on to children.
 }
 
 // Responds to colour changes, and passes event on to children.


@@ -531,7 +475,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );

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

     }
 
     // Propagate the event to the non-top-level children
     }
 
     // Propagate the event to the non-top-level children


@@ -543,8 +487,8 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
  *
  */
 
  *
  */
 

-void wxFrame::MSWCreate(const int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title,
-                   const int x, const int y, const int width, const int height, const long style)
+bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title,
+                   int x, int y, int width, int height, long style)

 
 {
   m_defaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
 
 {
   m_defaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);


@@ -577,7 +521,7 @@ void wxFrame::MSWCreate(const int id, wxWindow *parent, const char *wclass, wxWi
 
   // Keep this in wxFrame because it saves recoding this function
   // in wxTinyFrame
 
   // Keep this in wxFrame because it saves recoding this function
   // in wxTinyFrame

-#if USE_ITSY_BITSY
+#if wxUSE_ITSY_BITSY

   if (style & wxTINY_CAPTION_VERT)
     msflags |= IBS_VERTCAPTION;
   if (style & wxTINY_CAPTION_HORIZ)
   if (style & wxTINY_CAPTION_VERT)
     msflags |= IBS_VERTCAPTION;
   if (style & wxTINY_CAPTION_HORIZ)


@@ -593,257 +537,111 @@ void wxFrame::MSWCreate(const int id, wxWindow *parent, const char *wclass, wxWi
 
   WXDWORD extendedStyle = MakeExtendedStyle(style);
 
 
   WXDWORD extendedStyle = MakeExtendedStyle(style);
 

+#if !defined(__WIN16__) && !defined(__SC__)
+  if (style & wxFRAME_TOOL_WINDOW)
+    extendedStyle |= WS_EX_TOOLWINDOW;
+#endif
+

   if (style & wxSTAY_ON_TOP)
     extendedStyle |= WS_EX_TOPMOST;
 
   m_iconized = FALSE;
   if (style & wxSTAY_ON_TOP)
     extendedStyle |= WS_EX_TOPMOST;
 
   m_iconized = FALSE;

-  wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,
-         msflags, NULL, extendedStyle);
+  if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,
+         msflags, NULL, extendedStyle) )
+         return FALSE;
+

   // Seems to be necessary if we use WS_POPUP
   // style instead of WS_OVERLAPPED
   if (width > -1 && height > -1)
   // 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));
-}
-
-bool wxFrame::MSWOnPaint(void)
-{
-#if DEBUG > 1
-  wxDebugMsg("wxFrameWnd::OnPaint %d\n", handle);
-#endif
-  RECT rect;
-  if (GetUpdateRect((HWND) GetHWND(), &rect, FALSE))
-  {
-    if (m_iconized)
-    {
-      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);
-    }
-    else
-    {
-      GetEventHandler()->OldOnPaint();
-    }
-    return 0;
-  }
-  return 1;
-}
-
-WXHICON wxFrame::MSWOnQueryDragIcon(void)
-{
-  if (m_icon.Ok() && (m_icon.GetHICON() != 0))
-    return m_icon.GetHICON();
-  else
-    return m_defaultIcon;
-}
-
-void wxFrame::MSWOnSize(const int x, const int y, const WXUINT id)
-{
-#if DEBUG > 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;
-  }
+    ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height));

 
 

- 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
-
-  PositionStatusBar();
-#if WXWIN_COMPATIBILITY
-  GetEventHandler()->OldOnSize(x, y);
-#else
-  wxSizeEvent event(wxSize(x, y), m_windowId);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
-#endif
- }
-}
-
-bool wxFrame::MSWOnClose(void)
-{
-#if DEBUG > 1
-  wxDebugMsg("wxFrameWnd::OnClose %d\n", handle);
-#endif
-    return Close();
+  return TRUE;

 }
 
 }
 

-bool wxFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control)
+// Default resizing behaviour - if only ONE subwindow, resize to client
+// rectangle size
+void wxFrame::OnSize(wxSizeEvent& event)

 {
 {

-#if DEBUG > 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))
+    // if we're using constraints - do use them
+#if wxUSE_CONSTRAINTS
+    if ( GetAutoLayout() )

     {
     {

-      ProcessCommand(id);
-      return TRUE;
+        Layout();
+        return;

     }
     }

-    else
-      return FALSE;
-  }
-  else
-    return FALSE;
-}
-
-void wxFrame::MSWOnMenuHighlight(const WXWORD nItem, const WXWORD nFlags, const WXHMENU hSysMenu)
-{
-#if WXWIN_COMPATIBILITY
-  if (nFlags == 0xFFFF && hSysMenu == 0)
-    GetEventHandler()->OldOnMenuSelect(-1);
-  else if (nFlags != MF_SEPARATOR)
-    GetEventHandler()->OldOnMenuSelect(nItem);
-#else
-  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);
-  }

 #endif
 #endif

-}

 
 

-bool wxFrame::MSWProcessMessage(WXMSG* pMsg)
-{
-  if (m_acceleratorTable != 0 &&
-          ::TranslateAccelerator((HWND) GetHWND(), (HANDLE) m_acceleratorTable, (MSG *)pMsg))
-    return TRUE;
-  
-  return FALSE;
-}
-
-// Default resizing behaviour - if only ONE subwindow,
-// resize to client rectangle size
-void wxFrame::OnSize(wxSizeEvent& event)
-{
-  // Search for a child which is a subwindow, not another frame.
-  wxWindow *child = NULL;
-  // Count the number of _subwindow_ children
-  int noChildren = 0;
-  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()))
+    // do we have _exactly_ one child?
+    wxWindow *child = NULL;
+    for ( wxWindowList::Node *node = GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )

     {
     {

-      child = win;
-      noChildren ++;
+        wxWindow *win = node->GetData();
+        if ( !win->IsTopLevel()
+#if wxUSE_STATUSBAR
+                && (win != GetStatusBar())
+#endif // wxUSE_STATUSBAR
+#if wxUSE_TOOLBAR
+                && (win != GetToolBar())
+#endif // wxUSE_TOOLBAR
+           )
+        {
+            if ( child )
+                return;     // it's our second subwindow - nothing to do
+            child = win;
+        }

     }
     }

-  }
-
-  // If not one child, call the Layout function if compiled in
-  if (!child || (noChildren > 1)
-#if USE_CONSTRAINTS
-   || GetAutoLayout()
-#endif
-   )
-  {
-#if USE_CONSTRAINTS
-    if (GetAutoLayout())
-      Layout();
-#endif
-    return;
-  }
-  
-  if (child)
-  {
-    int client_x, client_y;

 
 

-#if DEBUG > 1
-    wxDebugMsg("wxFrame::OnSize: about to set the child's size.\n");
-#endif
+    if ( child ) {
+        // we have exactly one child - set it's size to fill the whole frame
+        int clientW, clientH;
+        GetClientSize(&clientW, &clientH);

 
 

-    GetClientSize(&client_x, &client_y);
-    child->SetSize(0, 0, client_x, client_y);
-  }
+        int x = 0;
+        int y = 0;

 
 

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

 }
 
 // Default activation behaviour - set the focus for the first child
 // subwindow found.
 void wxFrame::OnActivate(wxActivateEvent& event)
 {
 }
 
 // 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)))
+    for ( wxWindowList::Node *node = GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )

     {
     {

-#if DEBUG > 1
-      wxDebugMsg("wxFrame::OnActivate: about to set the child's focus.\n");
-#endif
-      child->SetFocus();
-      return;
+        // FIXME all this is totally bogus - we need to do the same as wxPanel,
+        //       but how to do it without duplicating the code?
+
+        // restore focus
+        wxWindow *child = node->GetData();
+
+        if ( !child->IsTopLevel()
+#if wxUSE_TOOLBAR
+             && !wxDynamicCast(child, wxToolBar)
+#endif // wxUSE_TOOLBAR
+#if wxUSE_STATUSBAR
+             && !wxDynamicCast(child, wxStatusBar)
+#endif // wxUSE_STATUSBAR
+           )
+        {
+            child->SetFocus();
+            return;
+        }

     }
     }

-  }

 }
 
 }
 

-// The default implementation for the close window event - calls
-// OnClose for backward compatibility.
-
+// The default implementation for the close window event.

 void wxFrame::OnCloseWindow(wxCloseEvent& event)
 {
 void wxFrame::OnCloseWindow(wxCloseEvent& event)
 {

-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
+    Destroy();

 }
 
 // Destroy the window (delayed, if a managed window)
 }
 
 // Destroy the window (delayed, if a managed window)

-bool wxFrame::Destroy(void)
+bool wxFrame::Destroy()

 {
   if (!wxPendingDelete.Member(this))
     wxPendingDelete.Append(this);
 {
   if (!wxPendingDelete.Member(this))
     wxPendingDelete.Append(this);


@@ -855,220 +653,426 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 {
   if (GetStatusBar())
   {
 {
   if (GetStatusBar())
   {

-    if (event.GetMenuId() == -1)
-      SetStatusText("");
-    else
+    int menuId = event.GetMenuId();
+    if ( menuId != -1 )

     {
       wxMenuBar *menuBar = GetMenuBar();
     {
       wxMenuBar *menuBar = GetMenuBar();

-      if (menuBar)
+      if (menuBar && menuBar->FindItem(menuId))

       {
       {

-        wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
-        if (helpString != "")
-          SetStatusText(helpString);
+        // 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));

       }
     }
   }
 }
 
       }
     }
   }
 }
 

-#if WXWIN_COMPATIBILITY
-void wxFrame::OldOnSize(int x, int y)
+wxMenuBar *wxFrame::GetMenuBar() const

 {
 {

-#if WXWIN_COMPATIBILITY == 1
-  wxSizeEvent event(wxSize(x, y), m_windowId);
-  event.SetEventObject( this );
-  if (GetEventHandler()->ProcessEvent(event))
-  return;
-#endif
-  // Search for a child which is a subwindow, not another frame.
-  wxWindow *child = NULL;
-  // Count the number of _subwindow_ children
-  int noChildren = 0;
-  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()))
+  return m_frameMenuBar;
+}
+
+bool wxFrame::ProcessCommand(int id)
+{
+    wxMenuBar *bar = GetMenuBar() ;
+    if ( !bar )
+        return FALSE;
+
+    wxMenuItem *item = bar->FindItemForId(id);
+    if ( !item )
+        return FALSE;
+
+    if ( item->IsCheckable() )

     {
     {

-      child = win;
-      noChildren ++;
+        bar->Check(id, !bar->IsChecked(id)) ;

     }
     }

-  }
-
-  // If not one child, call the Layout function if compiled in
-  if (!child || (noChildren > 1)
-#if USE_CONSTRAINTS
-   || GetAutoLayout()
-#endif
-   )
-  {
-#if USE_CONSTRAINTS
-    if (GetAutoLayout())
-      Layout();
-#endif
-    return;
-  }
-  
-  if (child)
-  {
-    int client_x, client_y;

 
 

-#if DEBUG > 1
-    wxDebugMsg("wxFrame::OnSize: about to set the child's size.\n");
-#endif
+    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+    commandEvent.SetInt( id );
+    commandEvent.SetEventObject( this );

 
 

-    GetClientSize(&client_x, &client_y);
-    child->SetSize(0, 0, client_x, client_y);
-  }
+    return GetEventHandler()->ProcessEvent(commandEvent);

 }
 
 }
 

-// Default activation behaviour - set the focus for the first child
-// subwindow found.
-void wxFrame::OldOnActivate(bool flag)
+// Checks if there is a toolbar, and returns the first free client position
+wxPoint wxFrame::GetClientAreaOrigin() const

 {
 {

-#if WXWIN_COMPATIBILITY == 1
-  wxActivateEvent event(wxEVT_ACTIVATE, flag, m_windowId);
-  event.SetEventObject( this );
-  if (GetEventHandler()->ProcessEvent(event))
-  return;
-#endif
-  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)))
+    wxPoint pt(0, 0);
+    if (GetToolBar())

     {
     {

-#if DEBUG > 1
-      wxDebugMsg("wxFrame::OnActivate: about to set the child's focus.\n");
-#endif
-      child->SetFocus();
-      return;
+        int w, h;
+        GetToolBar()->GetSize(& w, & h);
+
+        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        {
+            pt.x += w;
+        }
+        else
+        {
+            pt.y += h;
+        }

     }
     }

-  }
+    return pt;

 }
 
 }
 

-// Default menu selection behaviour - display a help string
-void wxFrame::OldOnMenuSelect(int id)
+void wxFrame::ScreenToClient(int *x, int *y) const

 {
 {

-#if WXWIN_COMPATIBILITY == 1
-    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, id);
-    event.SetEventObject( this );
-  if (GetEventHandler()->ProcessEvent(event))
-    return;
-#endif
-  if (GetStatusBar())
-  {
-    if (id == -1)
-      SetStatusText("");
+    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;
+}
+
+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);
+}
+
+#if wxUSE_TOOLBAR
+wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+{
+    wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
+                 _T("recreating toolbar in wxFrame") );
+
+    wxToolBar* toolBar = OnCreateToolBar(style, id, name);
+    if (toolBar)
+    {
+        SetToolBar(toolBar);
+        PositionToolBar();
+        return toolBar;
+    }

     else
     {
     else
     {

-      wxMenuBar *menuBar = GetMenuBar();
-      if (menuBar)
-      {
-        wxString helpString(menuBar->GetHelpString(id));
-        if (helpString != "")
-          SetStatusText(helpString);
-      }
+        return NULL;

     }
     }

-  }

 }
 }

-#endif

 
 

-wxMenuBar *wxFrame::GetMenuBar(void) const
+wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)

 {
 {

-  return m_frameMenuBar;
+    return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
+}
+
+void wxFrame::PositionToolBar()
+{
+    RECT rect;
+    ::GetClientRect(GetHwnd(), &rect);
+
+    if ( GetStatusBar() )
+    {
+      int statusX, statusY;
+      GetStatusBar()->GetClientSize(&statusX, &statusY);
+      rect.bottom -= statusY;
+    }
+
+    if (GetToolBar())
+    {
+        int tw, th;
+        GetToolBar()->GetSize(& tw, & th);
+
+        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        {
+            // 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);
+        }
+    }

 }
 }

+#endif // wxUSE_TOOLBAR

 
 

-void wxFrame::Centre(const int direction)
+// 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)

 {
 {

-  int display_width, display_height, width, height, x, y;
-  wxDisplaySize(&display_width, &display_height);
+    for ( wxWindowList::Node *node = GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();

 
 

-  GetSize(&width, &height);
-  GetPosition(&x, &y);
+        if ( win->IsKindOf(CLASSINFO(wxFrame)) )
+        {
+            ((wxFrame *)win)->Iconize(bIconize);
+        }
+    }
+}

 
 

-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);

 
 

-  SetSize(x, y, width, height);
+// make the window modal (all other windows unresponsive)
+void wxFrame::MakeModal(bool modal)
+{
+    if (modal) {
+        wxEnableTopLevelWindows(FALSE);
+        Enable(TRUE);           // keep this window enabled
+    }
+    else {
+        wxEnableTopLevelWindows(TRUE);
+    }

 }
 
 }
 

-// Call this to simulate a menu command
-void wxFrame::Command(int id)
+
+// ===========================================================================
+// message processing
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// preprocessing
+// ---------------------------------------------------------------------------
+
+bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)

 {
 {

-  ProcessCommand(id);
+    if ( wxWindow::MSWTranslateMessage(pMsg) )
+        return TRUE;
+
+    // try the menu bar accels
+    wxMenuBar *menuBar = GetMenuBar();
+    if ( !menuBar )
+        return FALSE;
+
+    const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
+    return acceleratorTable.Ok() &&
+           ::TranslateAccelerator(GetHwnd(),
+                                  GetTableHaccel(acceleratorTable),
+                                  (MSG *)pMsg);

 }
 
 }
 

-void wxFrame::ProcessCommand(int id)
+// ---------------------------------------------------------------------------
+// our private (non virtual) message handlers
+// ---------------------------------------------------------------------------
+
+bool wxFrame::HandlePaint()

 {
 {

-  wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, id);
-  commandEvent.SetInt( id );
-  commandEvent.SetEventObject( this );
-
-  wxMenuBar *bar = GetMenuBar() ;
-  if (!bar)
-    return;
-
-  // Motif does the job by itself!!
-#ifndef __MOTIF__
-  wxMenuItem *item = bar->FindItemForId(id) ;
-  if (item && item->IsCheckable())
-  {
-//wxDebugMsg("Toggling id %d\n",id) ;
-    bar->Check(id,!bar->Checked(id)) ;
-  }
-#endif
-  if (!ProcessEvent(commandEvent))
-    OldOnMenuCommand(id);
+    RECT rect;
+    if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
+    {
+        if ( m_iconized )
+        {
+            HICON hIcon = m_icon.Ok() ? GetIconHicon(m_icon)
+                                      : (HICON)m_defaultIcon;
+
+            // Hold a pointer to the dc so long as the OnPaint() message
+            // is being processed
+            PAINTSTRUCT ps;
+            HDC hdc = ::BeginPaint(GetHwnd(), &ps);
+
+            // Erase background before painting or we get white background
+            MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L);
+
+            if ( hIcon )
+            {
+                RECT rect;
+                ::GetClientRect(GetHwnd(), &rect);
+
+                // FIXME: why hardcoded?
+                static const int icon_width = 32;
+                static const int icon_height = 32;
+
+                int icon_x = (int)((rect.right - icon_width)/2);
+                int icon_y = (int)((rect.bottom - icon_height)/2);
+
+                ::DrawIcon(hdc, icon_x, icon_y, hIcon);
+            }
+
+            ::EndPaint(GetHwnd(), &ps);
+
+            return TRUE;
+        }
+        else
+        {
+            wxPaintEvent event(m_windowId);
+            event.m_eventObject = this;
+
+            return GetEventHandler()->ProcessEvent(event);
+        }
+    }
+    else
+    {
+        // nothing to paint - processed
+        return TRUE;
+    }

 }
 
 }
 

-void wxFrame::OnIdle(wxIdleEvent& event)
+bool wxFrame::HandleSize(int x, int y, WXUINT id)

 {
 {

-  DoMenuUpdates();
+    bool processed = FALSE;
+
+    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;
+
+            // restore all child frames too
+            IconizeChildFrames(FALSE);
+
+            // fall through
+
+        case SIZEFULLSCREEN:
+            m_iconized = FALSE;
+            break;
+
+        case SIZEICONIC:
+            // iconize all child frames too
+            IconizeChildFrames(TRUE);
+
+            m_iconized = TRUE;
+            break;
+    }
+
+    if ( !m_iconized )
+    {
+        // forward WM_SIZE to status bar control
+#if wxUSE_NATIVE_STATUSBAR
+        if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
+        {
+            wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());
+            event.SetEventObject( m_frameStatusBar );
+
+            ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event);
+        }
+#endif // wxUSE_NATIVE_STATUSBAR
+
+        PositionStatusBar();
+        PositionToolBar();
+
+        wxSizeEvent event(wxSize(x, y), m_windowId);
+        event.SetEventObject( this );
+        processed = GetEventHandler()->ProcessEvent(event);
+    }
+
+    return processed;

 }
 
 }
 

-// Query app for menu item updates (called from OnIdle)
-void wxFrame::DoMenuUpdates(void)
+bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)

 {
 {

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

 
 

-  int i;
-  for (i = 0; i < bar->m_menuCount; i++)
-  {
-    wxMenu* menu = bar->m_menus[i];
+    // handle here commands from menus and accelerators
+    if ( cmd == 0 || cmd == 1 )
+    {
+        if ( wxCurrentPopupMenu )
+        {
+            wxMenu *popupMenu = wxCurrentPopupMenu;
+            wxCurrentPopupMenu = NULL;
+
+            return popupMenu->MSWCommand(cmd, id);
+        }
+
+        if ( ProcessCommand(id) )
+        {
+            return TRUE;
+        }
+    }

 
 

-    DoMenuUpdates(menu);
-  }
+    return FALSE;

 }
 
 }
 

-void wxFrame::DoMenuUpdates(wxMenu* menu)
+bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu)

 {
 {

-  wxNode* node = menu->m_menuItems.First();
-  while (node)
-  {
-    wxMenuItem* item = (wxMenuItem*) node->Data();
-    if ( !item->IsSeparator() )
+    int item;
+    if ( nFlags == 0xFFFF && hMenu == 0 )
+    {
+        // FIXME: what does this do? does it ever happen?
+        item = -1;
+    }
+    else if ((nFlags != MF_SEPARATOR) && (nItem != 0) && (nItem != 65535))

     {
     {

-        wxWindowID id = item->GetId();
-      wxUpdateUIEvent event(id);
-      event.SetEventObject( this );
+        item = nItem;
+    }
+    else
+    {
+        return FALSE;
+    }

 
 

-      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());
-      }
+    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
+    event.SetEventObject( this );
+
+    return GetEventHandler()->ProcessEvent(event);
+}
+
+// ---------------------------------------------------------------------------
+// the window proc for wxFrame
+// ---------------------------------------------------------------------------
+
+long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+{
+    long rc = 0;
+    bool processed = FALSE;

 
 

-      if (item->GetSubMenu())
-        DoMenuUpdates(item->GetSubMenu());
+    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_COMMAND:
+            {
+                WORD id, cmd;
+                WXHWND hwnd;
+                UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam,
+                              &id, &hwnd, &cmd);
+
+                processed = HandleCommand(id, cmd, (WXHWND)hwnd);
+            }
+            break;
+
+        case WM_MENUSELECT:
+            {
+                WXWORD item, flags;
+                WXHMENU hmenu;
+                UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
+
+                processed = HandleMenuSelect(item, flags, hmenu);
+            }
+            break;
+
+        case WM_PAINT:
+            processed = HandlePaint();
+            break;
+
+        case WM_QUERYDRAGICON:
+            {
+                HICON hIcon = m_icon.Ok() ? GetIconHicon(m_icon)
+                                          : (HICON)(m_defaultIcon);
+                rc = (long)hIcon;
+                processed = rc != 0;
+            }
+            break;
+
+        case WM_SIZE:
+            processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
+            break;

     }
     }

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

 }
 }