Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 4cba2dd81f22687da8cccfe710ec3c5075b9a2d0..1b2f3db2e9bde5d9046ab42e18b87a8d4c059083 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,8 +9,16 @@
 // 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -32,32 +40,49 @@
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"

-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
+
+#if wxUSE_STATUSBAR
+    #include "wx/statusbr.h"
+
+    #if wxUSE_NATIVE_STATUSBAR
+        #include "wx/msw/statbr95.h"
+    #endif
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    #include "wx/toolbar.h"
+#endif // wxUSE_TOOLBAR
+

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

-#if wxUSE_NATIVE_STATUSBAR
-    #include <wx/msw/statbr95.h>
-#endif
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------

 
 extern wxWindowList wxModelessWindows;
 extern wxList WXDLLEXPORT wxPendingDelete;
 
 extern wxWindowList wxModelessWindows;
 extern wxList WXDLLEXPORT wxPendingDelete;

-extern wxChar wxFrameClassName[];
+extern const wxChar *wxFrameClassName;

 extern wxMenu *wxCurrentPopupMenu;
 
 extern wxMenu *wxCurrentPopupMenu;
 

-#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-  EVT_SIZE(wxFrame::OnSize)
-  EVT_ACTIVATE(wxFrame::OnActivate)
-  EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
-  EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-  EVT_IDLE(wxFrame::OnIdle)
-  EVT_CLOSE(wxFrame::OnCloseWindow)
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+    EVT_ACTIVATE(wxFrame::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)

-#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// static class members
+// ----------------------------------------------------------------------------

 
 #if wxUSE_NATIVE_STATUSBAR
     bool wxFrame::m_useNativeStatusBar = TRUE;
 
 #if wxUSE_NATIVE_STATUSBAR
     bool wxFrame::m_useNativeStatusBar = TRUE;


@@ -65,36 +90,35 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
     bool wxFrame::m_useNativeStatusBar = FALSE;
 #endif
 
     bool wxFrame::m_useNativeStatusBar = FALSE;
 #endif
 

-wxFrame::wxFrame()
-{
-  m_frameToolBar = NULL ;
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
+// ----------------------------------------------------------------------------
+// creation/destruction
+// ----------------------------------------------------------------------------

 
 

-  m_iconized = FALSE;
-}
-
-bool wxFrame::Create(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+void wxFrame::Init()

 {
 {

+    m_iconized = FALSE;
+

 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif

+}

 
 

+bool wxFrame::Create(wxWindow *parent,
+                     wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos,
+                     const wxSize& size,
+                     long style,
+                     const wxString& name)
+{

   SetName(name);
   m_windowStyle = style;
   m_frameMenuBar = NULL;
   SetName(name);
   m_windowStyle = style;
   m_frameMenuBar = NULL;

-  m_frameToolBar = NULL ;
+  m_frameToolBar = NULL;

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

-//  m_icon = NULL;

   if ( id > -1 )
     m_windowId = id;
   else
   if ( id > -1 )
     m_windowId = id;
   else


@@ -131,13 +155,7 @@ wxFrame::~wxFrame()
   m_isBeingDeleted = TRUE;
   wxTopLevelWindows.DeleteObject(this);
 
   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()))
+  DeleteAllBars();

 
   if (wxTheApp && (wxTopLevelWindows.Number() == 0))
   {
 
   if (wxTheApp && (wxTopLevelWindows.Number() == 0))
   {


@@ -154,6 +172,9 @@ wxFrame::~wxFrame()
   // 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.
   // 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.

+  // MT:Only do this if this frame is currently the active window, else weird
+  // things start to happen
+  if ( wxGetActiveWindow() == this )

   if (GetParent() && GetParent()->GetHWND())
     ::BringWindowToTop((HWND) GetParent()->GetHWND());
 }
   if (GetParent() && GetParent()->GetHWND())
     ::BringWindowToTop((HWND) GetParent()->GetHWND());
 }


@@ -164,19 +185,23 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
   RECT rect;
   ::GetClientRect(GetHwnd(), &rect);
 
   RECT rect;
   ::GetClientRect(GetHwnd(), &rect);
 

+#if wxUSE_STATUSBAR

   if ( GetStatusBar() )
   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);
     rect.bottom -= statusY;
   }
   if ( GetStatusBar() )
   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);
     rect.bottom -= statusY;
   }

+#endif // wxUSE_STATUSBAR

 
   wxPoint pt(GetClientAreaOrigin());
   rect.bottom -= pt.y;
   rect.right -= pt.x;
 
 
   wxPoint pt(GetClientAreaOrigin());
   rect.bottom -= pt.y;
   rect.right -= pt.x;
 

-  *x = rect.right;
-  *y = rect.bottom;
+  if ( x )
+    *x = rect.right;
+  if ( y )
+    *y = rect.bottom;

 }
 
 // Set the client size (i.e. leave the calculation of borders etc.
 }
 
 // Set the client size (i.e. leave the calculation of borders etc.


@@ -197,12 +222,14 @@ void wxFrame::DoSetClientSize(int width, 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 wxUSE_STATUSBAR

   if ( GetStatusBar() )
   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);
     actual_height += statusY;
   }
   if ( GetStatusBar() )
   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);
     actual_height += statusY;
   }

+#endif // wxUSE_STATUSBAR

 
   wxPoint pt(GetClientAreaOrigin());
   actual_width += pt.y;
 
   wxPoint pt(GetClientAreaOrigin());
   actual_width += pt.y;


@@ -239,89 +266,56 @@ void wxFrame::DoGetPosition(int *x, int *y) const
   *y = point.y;
 }
 
   *y = point.y;
 }
 

-void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-  int currentX, currentY;
-  int x1 = x;
-  int y1 = y;
-  int w1 = width;
-  int h1 = height;
-
-  GetPosition(&currentX, &currentY);
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    y1 = currentY;
+// ----------------------------------------------------------------------------
+// variations around ::ShowWindow()
+// ----------------------------------------------------------------------------

 
 

-  int ww,hh ;
-  GetSize(&ww,&hh) ;
-  if (width == -1) w1 = ww ;
-  if (height==-1) h1 = hh ;
-
-  MoveWindow(GetHwnd(), x1, y1, w1, h1, (BOOL)TRUE);
+void wxFrame::DoShowWindow(int nShowCmd)
+{
+    ::ShowWindow(GetHwnd(), nShowCmd);

 
 

-  wxSizeEvent event(wxSize(width, height), m_windowId);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+    m_iconized = nShowCmd == SW_MINIMIZE;

 }
 
 bool wxFrame::Show(bool show)
 {
 }
 
 bool wxFrame::Show(bool show)
 {

-  int cshow;
-  if (show)
-    cshow = SW_SHOW;
-  else
-    cshow = SW_HIDE;
+    DoShowWindow(show ? SW_SHOW : SW_HIDE);

 
 

-  if (!show)
-  {
-    // Try to highlight the correct window (the parent)
-    HWND hWndParent = 0;
-    if (GetParent())
+    if ( show )

     {
     {

-      hWndParent = (HWND) GetParent()->GetHWND();
-      if (hWndParent)
-        ::BringWindowToTop(hWndParent);
-    }
-  }
+        ::BringWindowToTop(GetHwnd());

 
 

-  ShowWindow(GetHwnd(), (BOOL)cshow);
-  if (show)
-  {
-    BringWindowToTop(GetHwnd());
+        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent(event);
+    }
+    else
+    {
+        // Try to highlight the correct window (the parent)
+        if ( GetParent() )
+        {
+            HWND hWndParent = GetHwndOf(GetParent());
+            if (hWndParent)
+                ::BringWindowToTop(hWndParent);
+        }
+    }

 
 

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

 }
 
 void wxFrame::Iconize(bool iconize)
 {
 }
 
 void wxFrame::Iconize(bool iconize)
 {

-  if (!iconize)
-    Show(TRUE);
-
-  int cshow;
-  if (iconize)
-    cshow = SW_MINIMIZE;
-  else
-    cshow = SW_RESTORE;
-  ShowWindow(GetHwnd(), (BOOL)cshow);
-  m_iconized = iconize;
+    DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE);

 }
 
 }
 

-// Equivalent to maximize/restore in Windows

 void wxFrame::Maximize(bool maximize)
 {
 void wxFrame::Maximize(bool maximize)
 {

-  Show(TRUE);
-  int cshow;
-  if (maximize)
-    cshow = SW_MAXIMIZE;
-  else
-    cshow = SW_RESTORE;
-  ShowWindow(GetHwnd(), cshow);
-  m_iconized = FALSE;
+    DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE);
+}
+
+void wxFrame::Restore()
+{
+    DoShowWindow(SW_RESTORE);

 }
 
 bool wxFrame::IsIconized() const
 }
 
 bool wxFrame::IsIconized() const


@@ -333,115 +327,117 @@ bool wxFrame::IsIconized() const
 // Is it maximized?
 bool wxFrame::IsMaximized() const
 {
 // Is it maximized?
 bool wxFrame::IsMaximized() const
 {

-    return (::IsZoomed(GetHwnd()) != 0) ;
+    return (::IsZoomed(GetHwnd()) != 0);

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

-  m_icon = icon;
+    wxFrameBase::SetIcon(icon);
+

 #if defined(__WIN95__)
 #if defined(__WIN95__)

-  if ( m_icon.Ok() )
-    SendMessage(GetHwnd(), WM_SETICON,
-                (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
-#endif
+    if ( m_icon.Ok() )
+    {
+        SendMessage(GetHwnd(), WM_SETICON,
+                    (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
+    }
+#endif // __WIN95__

 }
 
 #if wxUSE_STATUSBAR
 }
 
 #if wxUSE_STATUSBAR

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

 {
     wxStatusBar *statusBar = NULL;
 
 #if wxUSE_NATIVE_STATUSBAR
 {
     wxStatusBar *statusBar = NULL;
 
 #if wxUSE_NATIVE_STATUSBAR

-    if (UsesNativeStatusBar())
+    if ( UsesNativeStatusBar() )

     {
         statusBar = new wxStatusBar95(this, id, style);
     {
         statusBar = new wxStatusBar95(this, id, style);

+
+        statusBar->SetFieldsCount(number);

     }
     else
 #endif
     {
     }
     else
 #endif
     {

-        statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
-            style, name);
-
-        // Set the height according to the font and the border size
-        wxClientDC dc(statusBar);
-        dc.SetFont(statusBar->GetFont());
-
-        long x, y;
-        dc.GetTextExtent("X", &x, &y);
-
-        int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());
-
-        statusBar->SetSize(-1, -1, 100, height);
+        statusBar = wxFrameBase::OnCreateStatusBar(number, style, id, name);

     }
 
     }
 

-  statusBar->SetFieldsCount(number);
-  return statusBar;
+    return statusBar;

 }
 
 }
 

-wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
-    const wxString& name)
+void wxFrame::PositionStatusBar()

 {
 {

-  // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
-  wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
-               _T("recreating status bar in wxFrame") );
+    // native status bar positions itself
+    if ( m_frameStatusBar
+#if wxUSE_NATIVE_STATUSBAR
+         && !m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))
+#endif
+       )
+    {
+        int w, h;
+        GetClientSize(&w, &h);
+        int sw, sh;
+        m_frameStatusBar->GetSize(&sw, &sh);

 
 

-  m_frameStatusBar = OnCreateStatusBar(number, style, id,
-    name);
-  if ( m_frameStatusBar )
-  {
-    PositionStatusBar();
-    return m_frameStatusBar;
-  }
-  else
-    return NULL;
+        // 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::SetStatusText(const wxString& text, int number)
+void wxFrame::DetachMenuBar()

 {
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") );
-
-  m_frameStatusBar->SetStatusText(text, number);
+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->Detach();
+        m_frameMenuBar = NULL;
+    }

 }
 
 }
 

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

 {
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") );
+    if (!menu_bar)
+    {
+        DetachMenuBar();
+        return;
+    }

 
 

-  m_frameStatusBar->SetStatusWidths(n, widths_field);
-  PositionStatusBar();
-}
+    m_frameMenuBar = NULL;

 
 

-void wxFrame::PositionStatusBar()
-{
-  // native status bar positions itself
-  if (m_frameStatusBar
-#if wxUSE_NATIVE_STATUSBAR
-   && !m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))
-#endif
-    )
-  {
-      int w, h;
-      GetClientSize(&w, &h);
-      int sw, sh;
-      m_frameStatusBar->GetSize(&sw, &sh);
-
-      // Since we wish the status bar to be directly under the client area,
-      // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
-      m_frameStatusBar->SetSize(0, h, w, sh);
-  }
-}
-#endif // wxUSE_STATUSBAR
+    // Can set a menubar several times.
+    // TODO: how to prevent a memory leak if you have a currently-unattached
+    // menubar? wxWindows assumes that the frame will delete the menu (otherwise
+    // there are problems for MDI).
+    if (menu_bar->GetHMenu())
+    {
+        m_hMenu = menu_bar->GetHMenu();
+    }
+    else
+    {
+        menu_bar->Detach();

 
 

-void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
-{
+        m_hMenu = menu_bar->Create();
+
+        if ( !m_hMenu )
+            return;
+    }
+
+    InternalSetMenuBar();
+
+    m_frameMenuBar = menu_bar;
+    menu_bar->Attach(this);
+
+#if 0 // Old code that assumes only one call of SetMenuBar per frame.

     if (!menu_bar)
     {
     if (!menu_bar)
     {

-        m_frameMenuBar = NULL;
+        DetachMenuBar();

         return;
     }
 
         return;
     }
 

-    wxCHECK_RET( !menu_bar->GetFrame(), _T("this menubar is already attached") );
+    wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") );

 
     if (m_frameMenuBar)
         delete m_frameMenuBar;
 
     if (m_frameMenuBar)
         delete m_frameMenuBar;


@@ -455,6 +451,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
 
     m_frameMenuBar = menu_bar;
     menu_bar->Attach(this);
 
     m_frameMenuBar = menu_bar;
     menu_bar->Attach(this);

+#endif

 }
 
 void wxFrame::InternalSetMenuBar()
 }
 
 void wxFrame::InternalSetMenuBar()


@@ -558,57 +555,19 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow
   return TRUE;
 }
 
   return TRUE;
 }
 

-// Default resizing behaviour - if only ONE subwindow, resize to client
-// rectangle size
-void wxFrame::OnSize(wxSizeEvent& event)
+// Default activation behaviour - set the focus for the first child
+// subwindow found.
+void wxFrame::OnActivate(wxActivateEvent& event)

 {
 {

-    // if we're using constraints - do use them
-#if wxUSE_CONSTRAINTS
-    if ( GetAutoLayout() )
+    if ( !event.GetActive() )

     {
     {

-        Layout();
-        return;
-    }
-#endif
+        event.Skip();

 
 

-    // do we have _exactly_ one child?
-    wxWindow *child = NULL;
-    for ( wxWindowList::Node *node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        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;
-        }
+        return;

     }
 
     }
 

-    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;
-
-        child->SetSize(x, y, clientW, clientH);
-    }
-}
+    wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);

 
 

-// Default activation behaviour - set the focus for the first child
-// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
-{

     for ( wxWindowList::Node *node = GetChildren().GetFirst();
           node;
           node = node->GetNext() )
     for ( wxWindowList::Node *node = GetChildren().GetFirst();
           node;
           node = node->GetNext() )


@@ -629,139 +588,25 @@ void wxFrame::OnActivate(wxActivateEvent& event)
            )
         {
             child->SetFocus();
            )
         {
             child->SetFocus();

-            return;
-        }
-    }
-}
-
-// The default implementation for the close window event.
-void wxFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    Destroy();
-}
-
-// Destroy the window (delayed, if a managed window)
-bool wxFrame::Destroy()
-{
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
-}
-
-// Default menu selection behaviour - display a help string
-void wxFrame::OnMenuHighlight(wxMenuEvent& event)
-{
-  if (GetStatusBar())
-  {
-    int menuId = event.GetMenuId();
-    if ( menuId != -1 )
-    {
-      wxMenuBar *menuBar = GetMenuBar();
-      if (menuBar && menuBar->FindItem(menuId))
-      {
-        // set status text even if the string is empty - this will at
-        // least remove the string from the item which was previously
-        // selected
-        SetStatusText(menuBar->GetHelpString(menuId));
-      }
-    }
-  }
-}
-
-wxMenuBar *wxFrame::GetMenuBar() const
-{
-  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() )
-    {
-        bar->Check(id, !bar->IsChecked(id)) ;
-    }
-
-    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
-    commandEvent.SetInt( id );
-    commandEvent.SetEventObject( this );
-
-    return GetEventHandler()->ProcessEvent(commandEvent);
-}
-
-// Checks if there is a toolbar, and returns the first free client position
-wxPoint wxFrame::GetClientAreaOrigin() const
-{
-    wxPoint pt(0, 0);
-    if (GetToolBar())
-    {
-        int w, h;
-        GetToolBar()->GetSize(& w, & h);
-
-        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
-        {
-            pt.x += w;
-        }
-        else
-        {
-            pt.y += h;
+            break;

         }
     }
         }
     }

-    return pt;

 }
 
 }
 

-void wxFrame::ScreenToClient(int *x, int *y) const
-{
-    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);
-}
+// ----------------------------------------------------------------------------
+// tool/status bar stuff
+// ----------------------------------------------------------------------------

 
 #if wxUSE_TOOLBAR
 
 #if wxUSE_TOOLBAR

+

 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
 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)
+    if ( wxFrameBase::CreateToolBar(style, id, name) )

     {
     {

-        SetToolBar(toolBar);

         PositionToolBar();
         PositionToolBar();

-        return toolBar;
-    }
-    else
-    {
-        return NULL;

     }
     }

-}

 
 

-wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)
-{
-    return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
+    return m_frameToolBar;

 }
 
 void wxFrame::PositionToolBar()
 }
 
 void wxFrame::PositionToolBar()


@@ -769,32 +614,39 @@ void wxFrame::PositionToolBar()
     RECT rect;
     ::GetClientRect(GetHwnd(), &rect);
 
     RECT rect;
     ::GetClientRect(GetHwnd(), &rect);
 

+#if wxUSE_STATUSBAR

     if ( GetStatusBar() )
     {
     if ( GetStatusBar() )
     {

-      int statusX, statusY;
-      GetStatusBar()->GetClientSize(&statusX, &statusY);
-      rect.bottom -= statusY;
+        int statusX, statusY;
+        GetStatusBar()->GetClientSize(&statusX, &statusY);
+        rect.bottom -= statusY;

     }
     }

+#endif // wxUSE_STATUSBAR

 
 

-    if (GetToolBar())
+    if ( GetToolBar() )

     {
         int tw, th;
     {
         int tw, th;

-        GetToolBar()->GetSize(& tw, & th);
+        GetToolBar()->GetSize(&tw, &th);

 
 

-        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )

         {
         {

-            // Use the 'real' MSW position
-            GetToolBar()->SetSize(0, 0, tw, rect.bottom, wxSIZE_NO_ADJUSTMENTS);
+            th = rect.bottom;

         }
         else
         {
         }
         else
         {

-            // Use the 'real' MSW position
-            GetToolBar()->SetSize(0, 0, rect.right, th, wxSIZE_NO_ADJUSTMENTS);
+            tw = rect.right;

         }
         }

+
+        // Use the 'real' MSW position here
+        GetToolBar()->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS);

     }
 }
 #endif // wxUSE_TOOLBAR
 
     }
 }
 #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
 // 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


@@ -813,20 +665,6 @@ void wxFrame::IconizeChildFrames(bool bIconize)
     }
 }
 
     }
 }
 

-
-// 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);
-    }
-}
-
-

 // ===========================================================================
 // message processing
 // ===========================================================================
 // ===========================================================================
 // message processing
 // ===========================================================================


@@ -846,10 +684,7 @@ bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
         return FALSE;
 
     const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
         return FALSE;
 
     const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();

-    return acceleratorTable.Ok() &&
-           ::TranslateAccelerator(GetHwnd(),
-                                  GetTableHaccel(acceleratorTable),
-                                  (MSG *)pMsg);
+    return acceleratorTable.Translate(this, pMsg);

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -863,7 +698,7 @@ bool wxFrame::HandlePaint()
     {
         if ( m_iconized )
         {
     {
         if ( m_iconized )
         {

-            HICON hIcon = m_icon.Ok() ? GetIconHicon(m_icon)
+            HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)

                                       : (HICON)m_defaultIcon;
 
             // Hold a pointer to the dc so long as the OnPaint() message
                                       : (HICON)m_defaultIcon;
 
             // Hold a pointer to the dc so long as the OnPaint() message


@@ -895,10 +730,7 @@ bool wxFrame::HandlePaint()
         }
         else
         {
         }
         else
         {

-            wxPaintEvent event(m_windowId);
-            event.m_eventObject = this;
-
-            return GetEventHandler()->ProcessEvent(event);
+            return wxWindow::HandlePaint();

         }
     }
     else
         }
     }
     else


@@ -992,20 +824,22 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu)
+bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)

 {
     int item;
 {
     int item;

-    if ( nFlags == 0xFFFF && hMenu == 0 )
+    if ( flags == 0xFFFF && hMenu == 0 )

     {
     {

-        // FIXME: what does this do? does it ever happen?
+        // menu was removed from screen

         item = -1;
     }
         item = -1;
     }

-    else if ((nFlags != MF_SEPARATOR) && (nItem != 0) && (nItem != 65535))
+    else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )

     {
         item = nItem;
     }
     else
     {
     {
         item = nItem;
     }
     else
     {

+        // don't give hints for separators (doesn't make sense) nor for the
+        // items opening popup menus (they don't have them anyhow)

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -1059,7 +893,7 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 
         case WM_QUERYDRAGICON:
             {
 
         case WM_QUERYDRAGICON:
             {

-                HICON hIcon = m_icon.Ok() ? GetIconHicon(m_icon)
+                HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)

                                           : (HICON)(m_defaultIcon);
                 rc = (long)hIcon;
                 processed = rc != 0;
                                           : (HICON)(m_defaultIcon);
                 rc = (long)hIcon;
                 processed = rc != 0;


@@ -1076,3 +910,4 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 
     return rc;
 }
 
     return rc;
 }

+