wxSplitPath() bugs corrected and it's documented

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

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index f8f02a0cb5422e77fbfa9db951d25de97a0927f3..024c031119bdd08bcb27c906cdf73f9bf718683b 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -51,10 +51,10 @@
 #include "wx/motif/private.h"
 
 void wxCloseFrameCallback(Widget, XtPointer, XmAnyCallbackStruct *cbs);
 #include "wx/motif/private.h"
 
 void wxCloseFrameCallback(Widget, XtPointer, XmAnyCallbackStruct *cbs);

-static void wxFrameFocusProc(Widget workArea, XtPointer clientData, 
+void wxFrameFocusProc(Widget workArea, XtPointer clientData, 

                       XmAnyCallbackStruct *cbs);
 static void wxFrameMapProc(Widget frameShell, XtPointer clientData, 
                       XmAnyCallbackStruct *cbs);
 static void wxFrameMapProc(Widget frameShell, XtPointer clientData, 

-                          XCrossingEvent * event);
+                           XCrossingEvent * event);

 
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;
 
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;


@@ -65,18 +65,18 @@ static bool wxTopLevelUsed = FALSE;
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
 
 #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)
+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()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #endif
 
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #endif
 

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

 bool wxFrame::m_useNativeStatusBar = TRUE;
 #else
 bool wxFrame::m_useNativeStatusBar = FALSE;
 bool wxFrame::m_useNativeStatusBar = TRUE;
 #else
 bool wxFrame::m_useNativeStatusBar = FALSE;


@@ -84,13 +84,16 @@ bool wxFrame::m_useNativeStatusBar = FALSE;
 
 wxFrame::wxFrame()
 {
 
 wxFrame::wxFrame()
 {

+#if wxUSE_TOOLBAR

     m_frameToolBar = NULL ;
     m_frameToolBar = NULL ;

+#endif // wxUSE_TOOLBAR
+

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

-
+    

     m_windowParent = NULL;
     m_iconized = FALSE;
     m_windowParent = NULL;
     m_iconized = FALSE;

-
+    

     //// Motif-specific
     m_frameShell = (WXWidget) NULL;
     m_frameWidget = (WXWidget) NULL;;
     //// Motif-specific
     m_frameShell = (WXWidget) NULL;
     m_frameWidget = (WXWidget) NULL;;


@@ -101,503 +104,555 @@ wxFrame::wxFrame()
 }
 
 bool wxFrame::Create(wxWindow *parent,
 }
 
 bool wxFrame::Create(wxWindow *parent,

-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+                     wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos,
+                     const wxSize& size,
+                     long style,
+                     const wxString& name)

 {
 {

-  if (!parent)
-      wxTopLevelWindows.Append(this);
-
-  SetName(name);
-
-  m_windowStyle = style;
-  m_frameMenuBar = NULL;
-  m_frameToolBar = NULL ;
-  m_frameStatusBar = NULL;
-
-  //// Motif-specific
-  m_frameShell = (WXWidget) NULL;
-  m_frameWidget = (WXWidget) NULL;;
-  m_workArea = (WXWidget) NULL;;
-  m_clientArea = (WXWidget) NULL;;
-  m_visibleStatus = TRUE;
-  m_title = "";
-
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-
-  if ( id > -1 )
-    m_windowId = id;
-  else
-    m_windowId = (int)NewControlId();
-
-  if (parent) parent->AddChild(this);
-
-  wxModelessWindows.Append(this);
-
-  int x = pos.x; int y = pos.y;
-  int width = size.x; int height = size.y;
-
-  if (wxTopLevelUsed)
-    // Change suggested by Matthew Flatt
-    m_frameShell = (WXWidget) XtAppCreateShell(name, wxTheApp->GetClassName(), topLevelShellWidgetClass, (Display*) wxGetDisplay(), NULL, 0);
-  else
-  {
-    m_frameShell = wxTheApp->GetTopLevelWidget();
-    wxTopLevelUsed = TRUE;
-  }
-
-  XtVaSetValues((Widget) m_frameShell, 
-                 // Allows menu to resize
-                 XmNallowShellResize, True,
-                 XmNdeleteResponse, XmDO_NOTHING,
-                 XmNmappedWhenManaged, False,
-                 XmNiconic, (style & wxICONIZE) ? TRUE : FALSE,
-                 NULL);
-
-  if (!title.IsNull())
+    if (!parent)
+        wxTopLevelWindows.Append(this);
+    
+    SetName(name);
+    
+    m_windowStyle = style;
+    m_frameMenuBar = NULL;
+#if wxUSE_TOOLBAR
+    m_frameToolBar = NULL ;
+#endif // wxUSE_TOOLBAR
+    m_frameStatusBar = NULL;
+    
+    //// Motif-specific
+    m_frameShell = (WXWidget) NULL;
+    m_frameWidget = (WXWidget) NULL;;
+    m_workArea = (WXWidget) NULL;;
+    m_clientArea = (WXWidget) NULL;;
+    m_visibleStatus = TRUE;
+    m_title = "";
+    
+    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+    m_foregroundColour = *wxBLACK;
+    m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    
+    if ( id > -1 )
+        m_windowId = id;
+    else
+        m_windowId = (int)NewControlId();
+    
+    if (parent) parent->AddChild(this);
+    
+    wxModelessWindows.Append(this);
+    
+    int x = pos.x; int y = pos.y;
+    int width = size.x; int height = size.y;
+    
+    if (wxTopLevelUsed)
+        // Change suggested by Matthew Flatt
+        m_frameShell = (WXWidget) XtAppCreateShell(name, wxTheApp->GetClassName(), topLevelShellWidgetClass, (Display*) wxGetDisplay(), NULL, 0);
+    else
+    {
+        m_frameShell = wxTheApp->GetTopLevelWidget();
+        wxTopLevelUsed = TRUE;
+    }
+    

     XtVaSetValues((Widget) m_frameShell, 
     XtVaSetValues((Widget) m_frameShell, 

-                  XmNtitle, (const char*) title,
-                  NULL);
-
-  m_frameWidget = (WXWidget) XtVaCreateManagedWidget("main_window",
-                    xmMainWindowWidgetClass, (Widget) m_frameShell,
-                    XmNresizePolicy, XmRESIZE_NONE,
-                    NULL);
-
-  m_workArea = (WXWidget) XtVaCreateWidget("form",
-                    xmFormWidgetClass, (Widget) m_frameWidget,
-                    XmNresizePolicy, XmRESIZE_NONE,
-                    NULL);
-
-  m_clientArea = (WXWidget) XtVaCreateWidget("client",
-                    xmBulletinBoardWidgetClass, (Widget) m_workArea,
-                    XmNmarginWidth, 0,
-                    XmNmarginHeight, 0,
-                    XmNrightAttachment, XmATTACH_FORM,
-                    XmNleftAttachment, XmATTACH_FORM,
-                    XmNtopAttachment, XmATTACH_FORM,
-                    XmNbottomAttachment, XmATTACH_FORM,
-//                    XmNresizePolicy, XmRESIZE_ANY,
-                    NULL);
-
-  XtVaSetValues((Widget) m_frameWidget,
-    XmNworkWindow, (Widget) m_workArea,
-    NULL);
-
-
-  XtManageChild((Widget) m_clientArea);
-  XtManageChild((Widget) m_workArea);
-
-  wxASSERT_MSG ((wxWidgetHashTable->Get((long)m_workArea) == (wxObject*) NULL), "Widget table clash in frame.cpp") ;
-
-  wxAddWindowToTable((Widget) m_workArea, this);
-
-  XtTranslations ptr ;
-
-  XtOverrideTranslations((Widget) m_workArea,
-              ptr = XtParseTranslationTable("<Configure>: resize()"));
-
-  XtFree((char *)ptr);
-
-  XtAddCallback((Widget) m_workArea, XmNfocusCallback, 
-                (XtCallbackProc)wxFrameFocusProc, (XtPointer)this);
-
-  /* Part of show-&-hide fix */
-  XtAddEventHandler((Widget) m_frameShell, StructureNotifyMask,
-                   False, (XtEventHandler)wxFrameMapProc,
-                   (XtPointer)m_workArea);
-
-  if (x > -1)
-    XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL);
-  if (y > -1)
-    XtVaSetValues((Widget) m_frameShell, XmNy, y, NULL);
-  if (width > -1)
-    XtVaSetValues((Widget) m_frameShell, XmNwidth, width, NULL);
-  if (height > -1)
-    XtVaSetValues((Widget) m_frameShell, XmNheight, height, NULL);
-
-  m_mainWidget = m_frameWidget;
-
-  // This patch comes from Torsten Liermann lier@lier1.muc.de
-  if (XmIsMotifWMRunning( (Widget) m_frameShell ))
-  {
-    int decor = 0 ;
-    if (style & wxRESIZE_BORDER)
-      decor |= MWM_DECOR_RESIZEH ;
-    if (style & wxSYSTEM_MENU)
-      decor |= MWM_DECOR_MENU;
-    if ((style & wxCAPTION) ||
-        (style & wxTINY_CAPTION_HORIZ) ||
-        (style & wxTINY_CAPTION_VERT))
-      decor |= MWM_DECOR_TITLE;
-    if (style & wxTHICK_FRAME)
-      decor |= MWM_DECOR_BORDER;
-    if (style & wxTHICK_FRAME)
-      decor |= MWM_DECOR_BORDER;
-    if (style & wxMINIMIZE_BOX)
-      decor |= MWM_DECOR_MINIMIZE;
-    if (style & wxMAXIMIZE_BOX)
-      decor |= MWM_DECOR_MAXIMIZE;
-    XtVaSetValues((Widget) m_frameShell,XmNmwmDecorations,decor,NULL) ;
-  }
-  // This allows non-Motif window managers to support at least the
-  // no-decorations case.
-  else
-  {
-    if (style == 0)
-        XtVaSetValues((Widget) m_frameShell,XmNoverrideRedirect,TRUE,NULL);
-  }
-  XtRealizeWidget((Widget) m_frameShell);
-
-  // Intercept CLOSE messages from the window manager
-  Atom WM_DELETE_WINDOW = XmInternAtom(XtDisplay((Widget) m_frameShell), "WM_DELETE_WINDOW", False);
+        // Allows menu to resize
+        XmNallowShellResize, True,
+        XmNdeleteResponse, XmDO_NOTHING,
+        XmNmappedWhenManaged, False,
+        XmNiconic, (style & wxICONIZE) ? TRUE : FALSE,
+        NULL);
+    
+    if (!title.IsNull())
+        XtVaSetValues((Widget) m_frameShell, 
+        XmNtitle, (const char*) title,
+        NULL);
+    
+    m_frameWidget = (WXWidget) XtVaCreateManagedWidget("main_window",
+        xmMainWindowWidgetClass, (Widget) m_frameShell,
+        XmNresizePolicy, XmRESIZE_NONE,
+        NULL);
+    
+    m_workArea = (WXWidget) XtVaCreateWidget("form",
+        xmFormWidgetClass, (Widget) m_frameWidget,
+        XmNresizePolicy, XmRESIZE_NONE,
+        NULL);
+    
+    m_clientArea = (WXWidget) XtVaCreateWidget("client",
+        xmBulletinBoardWidgetClass, (Widget) m_workArea,
+        XmNmarginWidth, 0,
+        XmNmarginHeight, 0,
+        XmNrightAttachment, XmATTACH_FORM,
+        XmNleftAttachment, XmATTACH_FORM,
+        XmNtopAttachment, XmATTACH_FORM,
+        XmNbottomAttachment, XmATTACH_FORM,
+        //                    XmNresizePolicy, XmRESIZE_ANY,
+        NULL);
+    
+    XtVaSetValues((Widget) m_frameWidget,
+        XmNworkWindow, (Widget) m_workArea,
+        NULL);
+    
+    
+    XtManageChild((Widget) m_clientArea);
+    XtManageChild((Widget) m_workArea);
+    
+    wxASSERT_MSG ((wxWidgetHashTable->Get((long)m_workArea) == (wxObject*) NULL), "Widget table clash in frame.cpp") ;
+    
+    wxAddWindowToTable((Widget) m_workArea, this);
+    
+    XtTranslations ptr ;
+    
+    XtOverrideTranslations((Widget) m_workArea,
+        ptr = XtParseTranslationTable("<Configure>: resize()"));
+    
+    XtFree((char *)ptr);
+    
+    XtAddCallback((Widget) m_workArea, XmNfocusCallback, 
+        (XtCallbackProc)wxFrameFocusProc, (XtPointer)this);
+    
+    /* Part of show-&-hide fix */
+    XtAddEventHandler((Widget) m_frameShell, StructureNotifyMask,
+        False, (XtEventHandler)wxFrameMapProc,
+        (XtPointer)m_workArea);
+    
+    if (x > -1)
+        XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL);
+    if (y > -1)
+        XtVaSetValues((Widget) m_frameShell, XmNy, y, NULL);
+    if (width > -1)
+        XtVaSetValues((Widget) m_frameShell, XmNwidth, width, NULL);
+    if (height > -1)
+        XtVaSetValues((Widget) m_frameShell, XmNheight, height, NULL);
+    
+    m_mainWidget = m_frameWidget;
+    
+    ChangeFont(FALSE);
+    
+    // This patch comes from Torsten Liermann lier@lier1.muc.de
+    if (XmIsMotifWMRunning( (Widget) m_frameShell ))
+    {
+        int decor = 0 ;
+        if (style & wxRESIZE_BORDER)
+            decor |= MWM_DECOR_RESIZEH ;
+        if (style & wxSYSTEM_MENU)
+            decor |= MWM_DECOR_MENU;
+        if ((style & wxCAPTION) ||
+            (style & wxTINY_CAPTION_HORIZ) ||
+            (style & wxTINY_CAPTION_VERT))
+            decor |= MWM_DECOR_TITLE;
+        if (style & wxTHICK_FRAME)
+            decor |= MWM_DECOR_BORDER;
+        if (style & wxTHICK_FRAME)
+            decor |= MWM_DECOR_BORDER;
+        if (style & wxMINIMIZE_BOX)
+            decor |= MWM_DECOR_MINIMIZE;
+        if (style & wxMAXIMIZE_BOX)
+            decor |= MWM_DECOR_MAXIMIZE;
+        XtVaSetValues((Widget) m_frameShell,XmNmwmDecorations,decor,NULL) ;
+    }
+    // This allows non-Motif window managers to support at least the
+    // no-decorations case.
+    else
+    {
+        if (style == 0)
+            XtVaSetValues((Widget) m_frameShell,XmNoverrideRedirect,TRUE,NULL);
+    }
+    XtRealizeWidget((Widget) m_frameShell);
+    
+    // Intercept CLOSE messages from the window manager
+    Atom WM_DELETE_WINDOW = XmInternAtom(XtDisplay((Widget) m_frameShell), "WM_DELETE_WINDOW", False);

 #if (XmREVISION > 1 || XmVERSION > 1)
 #if (XmREVISION > 1 || XmVERSION > 1)

-  XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (XtCallbackProc) wxCloseFrameCallback, (XtPointer)this);
+    XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (XtCallbackProc) wxCloseFrameCallback, (XtPointer)this);

 #else
 #if XmREVISION == 1
 #else
 #if XmREVISION == 1

-  XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (XtCallbackProc) wxCloseFrameCallback, (caddr_t)this);
+    XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (XtCallbackProc) wxCloseFrameCallback, (caddr_t)this);

 #else
 #else

-  XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (void (*)())wxCloseFrameCallback, (caddr_t)this);
+    XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (void (*)())wxCloseFrameCallback, (caddr_t)this);

 #endif
 #endif
 #endif
 #endif

-
-  PreResize();
-
-  wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-  sizeEvent.SetEventObject(this);
-
-  GetEventHandler()->ProcessEvent(sizeEvent);
-
-  return TRUE;
+    
+    ChangeBackgroundColour();
+    
+    PreResize();
+    
+    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
+    sizeEvent.SetEventObject(this);
+    
+    GetEventHandler()->ProcessEvent(sizeEvent);
+    
+    return TRUE;

 }
 
 wxFrame::~wxFrame()
 {
 }
 
 wxFrame::~wxFrame()
 {

-  if (GetMainWidget())
-    Show(FALSE);
-
-  if (m_frameMenuBar)
-  {
-// Hack to stop core dump on Ultrix, OSF, for some strange reason.
+    if (GetMainWidget())
+        Show(FALSE);
+    
+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->DestroyMenuBar();
+        
+        // Hack to stop core dump on Ultrix, OSF, for some strange reason.

 #if MOTIF_MENUBAR_DELETE_FIX
 #if MOTIF_MENUBAR_DELETE_FIX

-    GetMenuBar()->SetMainWidget((WXWidget) NULL);
+        GetMenuBar()->SetMainWidget((WXWidget) NULL);

 #endif
 #endif

-    delete m_frameMenuBar;
-    m_frameMenuBar = NULL;
-  }
-
-  wxTopLevelWindows.DeleteObject(this);
-  wxModelessWindows.DeleteObject(this);
-
-  if (m_frameStatusBar)
-    delete m_frameStatusBar;
-
-  DestroyChildren();
-
-/*
-  int i;
-  for (i = 0; i < wxMAX_STATUS; i++)
+        delete m_frameMenuBar;
+        m_frameMenuBar = NULL;
+    }
+    
+    wxTopLevelWindows.DeleteObject(this);
+    wxModelessWindows.DeleteObject(this);
+    
+    if (m_frameStatusBar)
+        delete m_frameStatusBar;
+    
+    DestroyChildren();
+    
+    /*
+    int i;
+    for (i = 0; i < wxMAX_STATUS; i++)

     if (statusTextWidget[i])
     if (statusTextWidget[i])

-      XtDestroyWidget (statusTextWidget[i]);
-
-  if (statusLineForm)
-    XtDestroyWidget (statusLineForm);
-
-  if (statusLineWidget)
-    XtDestroyWidget (statusLineWidget);
- */
-
-  wxDeleteWindowFromTable((Widget) m_workArea);
-
-  XtDestroyWidget ((Widget) m_workArea);
-  XtDestroyWidget ((Widget) m_frameWidget);
-
-  wxDeleteWindowFromTable((Widget) m_frameWidget);
-
-  XtDestroyWidget ((Widget) m_frameShell);
-
-  SetMainWidget((WXWidget) NULL);
-
-/* Check if it's the last top-level window */
-
-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
-
-    if (wxTheApp->GetExitOnFrameDelete())
+    XtDestroyWidget (statusTextWidget[i]);
+    
+      if (statusLineForm)
+      XtDestroyWidget (statusLineForm);
+      
+        if (statusLineWidget)
+        XtDestroyWidget (statusLineWidget);
+    */
+    
+    if (m_workArea)

     {
     {

-       // Signal to the app that we're going to close
-       wxTheApp->ExitMainLoop();
+        wxDeleteWindowFromTable((Widget) m_workArea);
+        
+        XtDestroyWidget ((Widget) m_workArea);

     }
     }

-  }
-
+    
+    if (m_frameWidget)
+    {
+        wxDeleteWindowFromTable((Widget) m_frameWidget);
+        XtDestroyWidget ((Widget) m_frameWidget);
+    }
+    
+    if (m_frameShell)
+        XtDestroyWidget ((Widget) m_frameShell);
+    
+    SetMainWidget((WXWidget) NULL);
+    
+    /* Check if it's the last top-level window */
+    
+    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
+    {
+        wxTheApp->SetTopWindow(NULL);
+        
+        if (wxTheApp->GetExitOnFrameDelete())
+        {
+            // Signal to the app that we're going to close
+            wxTheApp->ExitMainLoop();
+        }
+    }
+    

 }
 
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
 void wxFrame::GetClientSize(int *x, int *y) const
 {
 }
 
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
 void wxFrame::GetClientSize(int *x, int *y) const
 {

-  Dimension xx, yy;
-  XtVaGetValues((Widget) m_workArea, XmNwidth, &xx, XmNheight, &yy, NULL);
-
-  /* TODO
-  if (status_line_exists)
-  {
-    Dimension ys;
-    XtVaGetValues(statusLineWidget, XmNheight, &ys, NULL);
-    yy -= ys;
-  }
-  */
-
-  if (GetMenuBar() != (wxMenuBar*) NULL)
-  {
+    Dimension xx, yy;
+    XtVaGetValues((Widget) m_workArea, XmNwidth, &xx, XmNheight, &yy, NULL);
+    
+    if (m_frameStatusBar)
+    {
+        int sbw, sbh;
+        m_frameStatusBar->GetSize(& sbw, & sbh);
+        yy -= sbh;
+    }
+#if wxUSE_TOOLBAR
+    if (m_frameToolBar)
+    {
+        int tbw, tbh;
+        m_frameToolBar->GetSize(& tbw, & tbh);
+        if (m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL)
+            xx -= tbw;
+        else
+            yy -= tbh;
+    }
+#endif // wxUSE_TOOLBAR
+    /*
+    if (GetMenuBar() != (wxMenuBar*) NULL)
+    {

     // it seems that if a frame holds a panel, the menu bar size
     // gets automatically taken care of --- grano@cs.helsinki.fi 4.4.95
     bool hasSubPanel = FALSE;
     // it seems that if a frame holds a panel, the menu bar size
     // gets automatically taken care of --- grano@cs.helsinki.fi 4.4.95
     bool hasSubPanel = FALSE;

-    for(wxNode* node = GetChildren()->First(); node; node = node->Next())
+    for(wxNode* node = GetChildren().First(); node; node = node->Next())

     {
     {

-     wxWindow *win = (wxWindow *)node->Data();
-     hasSubPanel = (win->IsKindOf(CLASSINFO(wxPanel)) && !win->IsKindOf(CLASSINFO(wxDialog)));
-
+    wxWindow *win = (wxWindow *)node->Data();
+    hasSubPanel = (win->IsKindOf(CLASSINFO(wxPanel)) && !win->IsKindOf(CLASSINFO(wxDialog)));
+    

       if (hasSubPanel)
       if (hasSubPanel)

-          break;
-    }
-    if (! hasSubPanel) {
+      break;
+      }
+      if (! hasSubPanel) {

       Dimension ys;
       XtVaGetValues((Widget) GetMenuBarWidget(), XmNheight, &ys, NULL);
       yy -= ys;
       Dimension ys;
       XtVaGetValues((Widget) GetMenuBarWidget(), XmNheight, &ys, NULL);
       yy -= ys;

-    }
-  }
-
-  *x = xx; *y = yy;
+      }
+      }
+    */
+    
+    *x = xx; *y = yy;

 }
 
 // Set the client size (i.e. leave the calculation of borders etc.
 // to wxWindows)
 void wxFrame::SetClientSize(int width, int height)
 {
 }
 
 // Set the client size (i.e. leave the calculation of borders etc.
 // to wxWindows)
 void wxFrame::SetClientSize(int width, int height)
 {

-  // Calculate how large the new main window should be
-  // by finding the difference between the client area and the
-  // main window area, and adding on to the new client area
-  if (width > -1)
-    XtVaSetValues((Widget) m_workArea, XmNwidth, width, NULL);
-
-  if (height > -1)
-  {
-    /* TODO
-    if (status_line_exists)
+    // Calculate how large the new main window should be
+    // by finding the difference between the client area and the
+    // main window area, and adding on to the new client area
+    if (width > -1)
+        XtVaSetValues((Widget) m_workArea, XmNwidth, width, NULL);
+    
+    if (height > -1)

     {
     {

-      Dimension ys;
-      XtVaGetValues(statusLineWidget, XmNheight, &ys, NULL);
-      height += ys;
+        if (m_frameStatusBar)
+        {
+            int sbw, sbh;
+            m_frameStatusBar->GetSize(& sbw, & sbh);
+            height += sbh;
+        }
+#if wxUSE_TOOLBAR
+        if (m_frameToolBar)
+        {
+            int tbw, tbh;
+            m_frameToolBar->GetSize(& tbw, & tbh);
+            if (m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL)
+                width += tbw;
+            else
+                height += tbh;
+        }
+#endif // wxUSE_TOOLBAR
+        
+        XtVaSetValues((Widget) m_workArea, XmNheight, height, NULL);

     }
     }

-    */
-    XtVaSetValues((Widget) m_workArea, XmNheight, height, NULL);
-  }
-  PreResize();
-
-  wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-  sizeEvent.SetEventObject(this);
-
-  GetEventHandler()->ProcessEvent(sizeEvent);
-
+    PreResize();
+    
+    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
+    sizeEvent.SetEventObject(this);
+    
+    GetEventHandler()->ProcessEvent(sizeEvent);
+    

 }
 
 void wxFrame::GetSize(int *width, int *height) const
 {
 }
 
 void wxFrame::GetSize(int *width, int *height) const
 {

-  Dimension xx, yy;
-  XtVaGetValues((Widget) m_frameShell, XmNwidth, &xx, XmNheight, &yy, NULL);
-  *width = xx; *height = yy;
+    Dimension xx, yy;
+    XtVaGetValues((Widget) m_frameShell, XmNwidth, &xx, XmNheight, &yy, NULL);
+    *width = xx; *height = yy;

 }
 
 void wxFrame::GetPosition(int *x, int *y) const
 {
     Window parent_window = XtWindow((Widget) m_frameShell),
 }
 
 void wxFrame::GetPosition(int *x, int *y) const
 {
     Window parent_window = XtWindow((Widget) m_frameShell),

-          next_parent   = XtWindow((Widget) m_frameShell),
-          root          = RootWindowOfScreen(XtScreen((Widget) m_frameShell));
-
+        next_parent   = XtWindow((Widget) m_frameShell),
+        root          = RootWindowOfScreen(XtScreen((Widget) m_frameShell));
+    

     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {
     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {

-       Window *theChildren; unsigned int n;
-       parent_window = next_parent;
-       XQueryTree(XtDisplay((Widget) m_frameShell), parent_window, &root,
-                  &next_parent, &theChildren, &n);
-       XFree(theChildren); // not needed
+        Window *theChildren; unsigned int n;
+        parent_window = next_parent;
+        XQueryTree(XtDisplay((Widget) m_frameShell), parent_window, &root,
+            &next_parent, &theChildren, &n);
+        XFree(theChildren); // not needed

     }
     int xx, yy; unsigned int dummy;
     XGetGeometry(XtDisplay((Widget) m_frameShell), parent_window, &root,
     }
     int xx, yy; unsigned int dummy;
     XGetGeometry(XtDisplay((Widget) m_frameShell), parent_window, &root,

-                &xx, &yy, &dummy, &dummy, &dummy, &dummy);
+        &xx, &yy, &dummy, &dummy, &dummy, &dummy);

     if (x) *x = xx;
     if (y) *y = yy;
 }
 
 void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
     if (x) *x = xx;
     if (y) *y = yy;
 }
 
 void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
 {

-  if (x > -1)
-    XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL);
-  if (y > -1)
-    XtVaSetValues((Widget) m_frameShell, XmNy, y, NULL);
-  if (width > -1)
-    XtVaSetValues((Widget) m_frameWidget, XmNwidth, width, NULL);
-  if (height > -1)
-    XtVaSetValues((Widget) m_frameWidget, XmNheight, height, NULL);
-
-  if (!(height == -1 && width == -1))
-  {
-    PreResize();
-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-    sizeEvent.SetEventObject(this);
-
-    GetEventHandler()->ProcessEvent(sizeEvent);
-  }
+    if (x > -1)
+        XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL);
+    if (y > -1)
+        XtVaSetValues((Widget) m_frameShell, XmNy, y, NULL);
+    if (width > -1)
+        XtVaSetValues((Widget) m_frameWidget, XmNwidth, width, NULL);
+    if (height > -1)
+        XtVaSetValues((Widget) m_frameWidget, XmNheight, height, NULL);
+    
+    if (!(height == -1 && width == -1))
+    {
+        PreResize();
+        
+        wxSizeEvent sizeEvent(wxSize(width, height), GetId());
+        sizeEvent.SetEventObject(this);
+        
+        GetEventHandler()->ProcessEvent(sizeEvent);
+    }

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

-  m_visibleStatus = show; /* show-&-hide fix */
-
-  m_isShown = show;
-  if (show) {
-    XtMapWidget((Widget) m_frameShell);
-    XRaiseWindow(XtDisplay((Widget) m_frameShell), XtWindow((Widget) m_frameShell));
-  } else {
-    XtUnmapWidget((Widget) m_frameShell);
-//    XmUpdateDisplay(wxTheApp->topLevel); // Experimental: may be responsible for crashes
-  }
-  return TRUE;
+    if (!m_frameShell)
+        return wxWindow::Show(show);
+    
+    m_visibleStatus = show; /* show-&-hide fix */
+    
+    m_isShown = show;
+    if (show) {
+        XtMapWidget((Widget) m_frameShell);
+        XRaiseWindow(XtDisplay((Widget) m_frameShell), XtWindow((Widget) m_frameShell));
+    } else {
+        XtUnmapWidget((Widget) m_frameShell);
+        //    XmUpdateDisplay(wxTheApp->topLevel); // Experimental: may be responsible for crashes
+    }
+    return TRUE;

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

-  if (!iconize)
-    Show(TRUE);
-
-  XtVaSetValues((Widget) m_frameShell, XmNiconic, (Boolean)iconize, NULL);
+    if (!iconize)
+        Show(TRUE);
+    
+    if (m_frameShell)
+        XtVaSetValues((Widget) m_frameShell, XmNiconic, (Boolean)iconize, NULL);

 }
 
 // Equivalent to maximize/restore in Windows
 void wxFrame::Maximize(bool maximize)
 {
 }
 
 // Equivalent to maximize/restore in Windows
 void wxFrame::Maximize(bool maximize)
 {

-  Show(TRUE);
-
-  if (maximize)
-    XtVaSetValues((Widget) m_frameShell, XmNiconic, FALSE, NULL);
+    Show(TRUE);
+    
+    if (maximize && m_frameShell)
+        XtVaSetValues((Widget) m_frameShell, XmNiconic, FALSE, NULL);

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

-  Boolean iconic;
-  XtVaGetValues((Widget) m_frameShell, XmNiconic, &iconic, NULL);
-  return iconic;
+    if (!m_frameShell)
+        return FALSE;
+    
+    Boolean iconic;
+    XtVaGetValues((Widget) m_frameShell, XmNiconic, &iconic, NULL);
+    return iconic;
+}
+
+// Is it maximized?
+bool wxFrame::IsMaximized(void) const
+{
+    // No maximizing in Motif (?)
+    return FALSE;

 }
 
 void wxFrame::SetTitle(const wxString& title)
 {
 }
 
 void wxFrame::SetTitle(const wxString& title)
 {

-  if (title == m_title)
-    return;
+    if (title == m_title)
+        return;

     
     

-  m_title = title;
-
-  if (!title.IsNull())
-    XtVaSetValues((Widget) m_frameShell, 
-                  XmNtitle, (const char*) title,
-                  XmNiconName, (const char*) title,
-                  NULL);
+    m_title = title;
+    
+    if (!title.IsNull())
+        XtVaSetValues((Widget) m_frameShell, 
+        XmNtitle, (const char*) title,
+        XmNiconName, (const char*) title,
+        NULL);

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

-  m_icon = icon;
-
-  // TODO
-  /*
-  if (!icon.Ok() || !icon.GetPixmap())
-    return;
-
-  XtVaSetValues((Widget) m_frameShell, XtNiconPixmap, icon->.GetPixmap(), NULL);
-  */
+    m_icon = icon;
+    
+    if (!m_frameShell)
+        return;
+    
+    if (!icon.Ok() || !icon.GetPixmap())
+        return;
+    
+    XtVaSetValues((Widget) m_frameShell, XtNiconPixmap, icon.GetPixmap(), NULL);

 }
 
 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
 }
 
 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,

-    const wxString& name)
+                                        const wxString& name)

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

-
+    

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

-
+    

     int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());
     int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());

-
+    

     statusBar->SetSize(-1, -1, 100, height);
     statusBar->SetSize(-1, -1, 100, height);

-
+    

     statusBar->SetFieldsCount(number);
     return statusBar;
 }
 
 wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
     statusBar->SetFieldsCount(number);
     return statusBar;
 }
 
 wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,

-    const wxString& name)
+                                      const wxString& name)

 {
 {

-  // Calling CreateStatusBar twice is an error.
-  wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, 
-               "recreating status bar in wxFrame" );
-
-  m_frameStatusBar = OnCreateStatusBar(number, style, id,
-    name);
-  if ( m_frameStatusBar )
-  {
-    PositionStatusBar();
-    return m_frameStatusBar;
-  }
-  else
-    return NULL;
+    // Calling CreateStatusBar twice is an error.
+    wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, 
+        "recreating status bar in wxFrame" );
+    
+    m_frameStatusBar = OnCreateStatusBar(number, style, id,
+        name);
+    if ( m_frameStatusBar )
+    {
+        PositionStatusBar();
+        return m_frameStatusBar;
+    }
+    else
+        return NULL;

 }
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
 }
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {

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

 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[])
 {
 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[])
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
-
-  m_frameStatusBar->SetStatusWidths(n, widths_field);
-  PositionStatusBar();
+    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+    
+    m_frameStatusBar->SetStatusWidths(n, widths_field);
+    PositionStatusBar();

 }
 
 void wxFrame::PositionStatusBar()
 {
     if (!m_frameStatusBar)
 }
 
 void wxFrame::PositionStatusBar()
 {
     if (!m_frameStatusBar)

-      return;
-
+        return;
+    

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

 }
 
 WXWidget wxFrame::GetMenuBarWidget() const
 {
 }
 
 WXWidget wxFrame::GetMenuBarWidget() const
 {

-  if (GetMenuBar())
-    return GetMenuBar()->GetMainWidget();
-  else
-    return (WXWidget) NULL;
+    if (GetMenuBar())
+        return GetMenuBar()->GetMainWidget();
+    else
+        return (WXWidget) NULL;

 }
 
 void wxFrame::SetMenuBar(wxMenuBar *menuBar)
 }
 
 void wxFrame::SetMenuBar(wxMenuBar *menuBar)


@@ -607,63 +662,47 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar)
         m_frameMenuBar = NULL;
         return;
     }
         m_frameMenuBar = NULL;
         return;
     }

-
+    

     // Currently can't set it twice
     // Currently can't set it twice

-    wxASSERT_MSG( (m_frameMenuBar == (wxMenuBar*) NULL), "Cannot set the menubar more than once");
-  
-    m_frameMenuBar = menuBar;
-
-  Widget menuBarW = XmCreateMenuBar ((Widget) m_frameWidget, "MenuBar", NULL, 0);
-  m_frameMenuBar->SetMainWidget( (WXWidget) menuBarW);
-
-  int i;
-  for (i = 0; i < menuBar->GetMenuCount(); i++)
+    //    wxASSERT_MSG( (m_frameMenuBar == (wxMenuBar*) NULL), "Cannot set the menubar more than once");
+    
+    if (m_frameMenuBar)

     {
     {

-      wxMenu *menu = menuBar->GetMenu(i);
-      wxString title(menuBar->m_titles[i]);
-      menu->SetButtonWidget(menu->CreateMenu (menuBar, menuBarW, menu, title, TRUE));
-
-      /*
-       * COMMENT THIS OUT IF YOU DON'T LIKE A RIGHT-JUSTIFIED HELP MENU
-       */
-      wxStripMenuCodes ((char*) (const char*) title, wxBuffer);
-
-      if (strcmp (wxBuffer, "Help") == 0)
-       XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
+        m_frameMenuBar->DestroyMenuBar();
+        delete m_frameMenuBar;

     }
     }

-
-  XtRealizeWidget ((Widget) menuBarW);
-  XtManageChild ((Widget) menuBarW);
-  menuBar->SetMenuBarFrame(this);
+    
+    m_frameMenuBar = menuBar;
+    m_frameMenuBar->CreateMenuBar(this);

 }
 
 void wxFrame::Fit()
 {
 }
 
 void wxFrame::Fit()
 {

-  // 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)))
+    // Work out max. size
+    wxNode *node = GetChildren().First();
+    int max_width = 0;
+    int max_height = 0;
+    while (node)

     {
     {

-      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;
+        // 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)))
+        {
+            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;
+        }
+        node = node->Next();

     }
     }

-    node = node->Next();
-  }
-  SetClientSize(max_width, max_height);
+    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.


@@ -671,14 +710,14 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();

-
+    

     if ( m_frameStatusBar )
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );
         m_frameStatusBar->ProcessEvent(event2);
     }
     if ( m_frameStatusBar )
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );
         m_frameStatusBar->ProcessEvent(event2);
     }

-
+    

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


@@ -687,137 +726,128 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 // resize to client rectangle size
 void wxFrame::OnSize(wxSizeEvent& event)
 {
 // resize to client rectangle size
 void wxFrame::OnSize(wxSizeEvent& event)
 {

-  // if we're using constraints - do use them
-  #if USE_CONSTRAINTS
+    // if we're using constraints - do use them
+#if wxUSE_CONSTRAINTS

     if ( GetAutoLayout() ) {
     if ( GetAutoLayout() ) {

-      Layout();
-      return;
+        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()) )
+#endif
+    
+    // do we have _exactly_ one child?
+    wxWindow *child = NULL;
+    for ( wxNode *node = GetChildren().First(); node; node = node->Next() )

     {
     {

-      if ( child )
-        return;     // it's our second subwindow - nothing to do
-      child = win;
+        wxWindow *win = (wxWindow *)node->Data();
+        if ( !win->IsKindOf(CLASSINFO(wxFrame))  &&
+            !win->IsKindOf(CLASSINFO(wxDialog)) && 
+            (win != GetStatusBar())
+#if wxUSE_TOOLBAR
+             && (win != GetToolBar())
+#endif // wxUSE_TOOLBAR
+           )
+        {
+            if ( child )
+                return;     // it's our second subwindow - nothing to do
+            child = win;
+        }
+    }
+    
+    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);

     }
     }

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

 }
 
 // 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(wxNode *node = GetChildren().First(); node; node = node->Next())

     {
     {

-#if WXDEBUG > 1
-      wxDebugMsg("wxFrame::OnActivate: about to set the child's focus.\n");
-#endif
-      child->SetFocus();
-      return;
+        // Find a child that's a subwindow, but not a dialog box.
+        wxWindow *child = (wxWindow *)node->Data();
+        if (!child->IsKindOf(CLASSINFO(wxFrame)) &&
+            !child->IsKindOf(CLASSINFO(wxDialog)))
+        {
+            child->SetFocus();
+            return;
+        }

     }
     }

-  }

 }
 
 }
 

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

 // OnClose for backward compatibility.
 
 void wxFrame::OnCloseWindow(wxCloseEvent& event)
 {
 // OnClose for backward compatibility.
 
 void wxFrame::OnCloseWindow(wxCloseEvent& event)
 {

-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
-}
-
-bool wxFrame::OnClose()
-{
-    return TRUE;
+    this->Destroy();

 }
 
 // Destroy the window (delayed, if a managed window)
 bool wxFrame::Destroy()
 {
 }
 
 // Destroy the window (delayed, if a managed window)
 bool wxFrame::Destroy()
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
+    if (!wxPendingDelete.Member(this))
+        wxPendingDelete.Append(this);
+    return TRUE;

 }
 
 // Default menu selection behaviour - display a help string
 void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 {
 }
 
 // Default menu selection behaviour - display a help string
 void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 {

-  if (GetStatusBar())
-  {
-    if (event.GetMenuId() == -1)
-      SetStatusText("");
-    else
+    if (GetStatusBar())

     {
     {

-      wxMenuBar *menuBar = GetMenuBar();
-      if (menuBar)
-      {
-        wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
-        if (helpString != "")
-          SetStatusText(helpString);
-      }
+        if (event.GetMenuId() == -1)
+            SetStatusText("");
+        else
+        {
+            wxMenuBar *menuBar = GetMenuBar();
+            if (menuBar)
+            {
+                wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
+                if (helpString != "")
+                    SetStatusText(helpString);
+            }
+        }

     }
     }

-  }

 }
 
 wxMenuBar *wxFrame::GetMenuBar() const
 {
 }
 
 wxMenuBar *wxFrame::GetMenuBar() const
 {

-  return m_frameMenuBar;
+    return m_frameMenuBar;

 }
 
 void wxFrame::Centre(int direction)
 {
 }
 
 void wxFrame::Centre(int direction)
 {

-  int display_width, display_height, width, height, x, y;
-  wxDisplaySize(&display_width, &display_height);
-
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
-
-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
-
-  SetSize(x, y, width, height);
+    int display_width, display_height, width, height, x, y;
+    wxDisplaySize(&display_width, &display_height);
+    
+    GetSize(&width, &height);
+    GetPosition(&x, &y);
+    
+    if (direction & wxHORIZONTAL)
+        x = (int)((display_width - width)/2);
+    if (direction & wxVERTICAL)
+        y = (int)((display_height - height)/2);
+    
+    SetSize(x, y, width, height);

 }
 
 // Call this to simulate a menu command
 void wxFrame::Command(int id)
 {
 }
 
 // Call this to simulate a menu command
 void wxFrame::Command(int id)
 {

-  ProcessCommand(id);
+    ProcessCommand(id);

 }
 
 void wxFrame::ProcessCommand(int id)
 {
 }
 
 void wxFrame::ProcessCommand(int id)
 {

-  wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, id);
+  wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);

   commandEvent.SetInt( id );
   commandEvent.SetEventObject( this );
 
   commandEvent.SetInt( id );
   commandEvent.SetEventObject( this );
 


@@ -840,11 +870,12 @@ void wxFrame::ProcessCommand(int id)
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt(0, 0);
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt(0, 0);

+#if wxUSE_TOOLBAR

     if (GetToolBar())
     {
         int w, h;
         GetToolBar()->GetSize(& w, & h);
     if (GetToolBar())
     {
         int w, h;
         GetToolBar()->GetSize(& w, & h);

-
+        

         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             pt.x += w;
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             pt.x += w;


@@ -854,14 +885,41 @@ wxPoint wxFrame::GetClientAreaOrigin() const
             pt.y += h;
         }
     }
             pt.y += h;
         }
     }

+#endif // wxUSE_TOOLBAR
+

     return pt;
 }
 
     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);
+}
+
+#if wxUSE_TOOLBAR

 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,

-               "recreating toolbar in wxFrame" );
-
+        "recreating toolbar in wxFrame" );
+    

     wxToolBar* toolBar = OnCreateToolBar(style, id, name);
     if (toolBar)
     {
     wxToolBar* toolBar = OnCreateToolBar(style, id, name);
     if (toolBar)
     {


@@ -877,37 +935,36 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
 
 wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)
 {
 
 wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)
 {

-    return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
+    return new wxToolBar(this, id, wxPoint(0, 0), wxSize(100, 24), style, name);

 }
 
 }
 

-void wxFrame::PositionToolBar()
+void wxFrame::SetToolBar(wxToolBar *toolbar)

 {
 {

-    int cw, ch;
+    m_frameToolBar = toolbar;
+}

 
 

-    // TODO: we actually need to use the low-level client size, before
-    // the toolbar/status bar were added.
-    // So DEFINITELY replace the line below with something appropriate.
+wxToolBar *wxFrame::GetToolBar() const
+{
+    return m_frameToolBar;
+}

 
 

+void wxFrame::PositionToolBar()
+{
+    int cw, ch;
+    

     GetClientSize(& cw, &ch);
     GetClientSize(& cw, &ch);

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

     if (GetToolBar())
     {
         int tw, th;
         GetToolBar()->GetSize(& tw, & th);
     if (GetToolBar())
     {
         int tw, th;
         GetToolBar()->GetSize(& tw, & th);

-
+        

         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
             // means, pretend we don't have toolbar/status bar, so we
             // have the original client size.
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
             // means, pretend we don't have toolbar/status bar, so we
             // have the original client size.

-            GetToolBar()->SetSize(0, 0, tw, ch, wxSIZE_NO_ADJUSTMENTS);
+            GetToolBar()->SetSize(0, 0, tw, ch + th, wxSIZE_NO_ADJUSTMENTS);

         }
         else
         {
         }
         else
         {


@@ -916,40 +973,41 @@ void wxFrame::PositionToolBar()
         }
     }
 }
         }
     }
 }

+#endif // wxUSE_TOOLBAR

 
 void wxFrame::CaptureMouse()
 {
 
 void wxFrame::CaptureMouse()
 {

-  if (m_winCaptured)
-    return;
+    if (m_winCaptured)
+        return;

     
     

-  if (GetMainWidget())
-    XtAddGrab((Widget) m_frameShell, TRUE, FALSE);
-  m_winCaptured = TRUE;
+    if (GetMainWidget())
+        XtAddGrab((Widget) m_frameShell, TRUE, FALSE);
+    m_winCaptured = TRUE;

 }
 
 void wxFrame::ReleaseMouse()
 {
 }
 
 void wxFrame::ReleaseMouse()
 {

-  if (!m_winCaptured)
-    return;
+    if (!m_winCaptured)
+        return;

     
     

-  if (GetMainWidget())
-    XtRemoveGrab((Widget) m_frameShell);
-  m_winCaptured = FALSE;
+    if (GetMainWidget())
+        XtRemoveGrab((Widget) m_frameShell);
+    m_winCaptured = FALSE;

 }
 
 void wxFrame::Raise(void)
 {
     Window parent_window = XtWindow((Widget) m_frameShell),
 }
 
 void wxFrame::Raise(void)
 {
     Window parent_window = XtWindow((Widget) m_frameShell),

-          next_parent   = XtWindow((Widget) m_frameShell),
-          root          = RootWindowOfScreen(XtScreen((Widget) m_frameShell));
+        next_parent   = XtWindow((Widget) m_frameShell),
+        root          = RootWindowOfScreen(XtScreen((Widget) m_frameShell));

     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {
     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {

-       Window *theChildren; unsigned int n;
-       parent_window = next_parent;
-       XQueryTree(XtDisplay((Widget) m_frameShell), parent_window, &root,
-                  &next_parent, &theChildren, &n);
-       XFree(theChildren); // not needed
+        Window *theChildren; unsigned int n;
+        parent_window = next_parent;
+        XQueryTree(XtDisplay((Widget) m_frameShell), parent_window, &root,
+            &next_parent, &theChildren, &n);
+        XFree(theChildren); // not needed

     }
     XRaiseWindow(XtDisplay((Widget) m_frameShell), parent_window);
 }
     }
     XRaiseWindow(XtDisplay((Widget) m_frameShell), parent_window);
 }


@@ -957,80 +1015,95 @@ void wxFrame::Raise(void)
 void wxFrame::Lower(void)
 {
     Window parent_window = XtWindow((Widget) m_frameShell),
 void wxFrame::Lower(void)
 {
     Window parent_window = XtWindow((Widget) m_frameShell),

-          next_parent   = XtWindow((Widget) m_frameShell),
-          root          = RootWindowOfScreen(XtScreen((Widget) m_frameShell));
+        next_parent   = XtWindow((Widget) m_frameShell),
+        root          = RootWindowOfScreen(XtScreen((Widget) m_frameShell));

     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {
     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {

-       Window *theChildren; unsigned int n;
-       parent_window = next_parent;
-       XQueryTree(XtDisplay((Widget) m_frameShell), parent_window, &root,
-                  &next_parent, &theChildren, &n);
-       XFree(theChildren); // not needed
+        Window *theChildren; unsigned int n;
+        parent_window = next_parent;
+        XQueryTree(XtDisplay((Widget) m_frameShell), parent_window, &root,
+            &next_parent, &theChildren, &n);
+        XFree(theChildren); // not needed

     }
     XLowerWindow(XtDisplay((Widget) m_frameShell), parent_window);
 }
 
     }
     XLowerWindow(XtDisplay((Widget) m_frameShell), parent_window);
 }
 

-void wxFrame::SetToolBar(wxToolBar *toolbar)
-{ m_frameToolBar = toolbar; }
-
-wxToolBar *wxFrame::GetToolBar() const
-{ return m_frameToolBar; }
-
-static void wxFrameFocusProc(Widget workArea, XtPointer clientData, 
+void wxFrameFocusProc(Widget workArea, XtPointer clientData, 

                       XmAnyCallbackStruct *cbs)
 {
                       XmAnyCallbackStruct *cbs)
 {

-  wxFrame *frame = (wxFrame *)clientData;
-
-  // wxDebugMsg("focus proc from frame %ld\n",(long)frame);
-  // TODO
-  //  frame->GetEventHandler()->OnSetFocus();
+    wxFrame *frame = (wxFrame *)clientData;
+    
+    // wxDebugMsg("focus proc from frame %ld\n",(long)frame);
+    // TODO
+    //  frame->GetEventHandler()->OnSetFocus();

 }
 
 /* MATTEW: Used to insure that hide-&-show within an event cycle works */
 static void wxFrameMapProc(Widget frameShell, XtPointer clientData, 
 }
 
 /* MATTEW: Used to insure that hide-&-show within an event cycle works */
 static void wxFrameMapProc(Widget frameShell, XtPointer clientData, 

-                          XCrossingEvent * event)
+                           XCrossingEvent * event)

 {
 {

-  wxFrame *frame = (wxFrame *)wxWidgetHashTable->Get((long)clientData);
-
-  if (frame) {
-    XEvent *e = (XEvent *)event;
-
-    if (e->xany.type == MapNotify)
-    {
-      // Iconize fix
-      XtVaSetValues(frameShell, XmNiconic, (Boolean)False, NULL);
-      if (!frame->GetVisibleStatus())
-      {
-       /* We really wanted this to be hidden! */
-       XtUnmapWidget((Widget) frame->GetShellWidget());
-      }
+    wxFrame *frame = (wxFrame *)wxWidgetHashTable->Get((long)clientData);
+    
+    if (frame) {
+        XEvent *e = (XEvent *)event;
+        
+        if (e->xany.type == MapNotify)
+        {
+            // Iconize fix
+            XtVaSetValues(frameShell, XmNiconic, (Boolean)False, NULL);
+            if (!frame->GetVisibleStatus())
+            {
+                /* We really wanted this to be hidden! */
+                XtUnmapWidget((Widget) frame->GetShellWidget());
+            }
+        }
+        else if (e->xany.type == UnmapNotify)
+            // Iconize fix
+            XtVaSetValues(frameShell, XmNiconic, (Boolean)True, NULL);

     }
     }

-    else if (e->xany.type == UnmapNotify)
-      // Iconize fix
-      XtVaSetValues(frameShell, XmNiconic, (Boolean)True, NULL);
-  }

 }
 
 //// Motif-specific
 bool wxFrame::PreResize()
 {
 }
 
 //// Motif-specific
 bool wxFrame::PreResize()
 {

-  PositionStatusBar();
-  return TRUE;
+#if wxUSE_TOOLBAR
+    PositionToolBar();
+#endif // wxUSE_TOOLBAR
+    PositionStatusBar();
+    return TRUE;

 }
 
 WXWidget wxFrame::GetClientWidget() const
 {
 }
 
 WXWidget wxFrame::GetClientWidget() const
 {

-  return m_clientArea;
+    return m_clientArea;

 }
 
 }
 

-void wxCloseFrameCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs)
+void wxFrame::ChangeFont(bool keepOriginalSize)
+{
+    // TODO
+}
+
+void wxFrame::ChangeBackgroundColour()

 {
 {

-  wxFrame *frame = (wxFrame *)client_data;
+    if (GetClientWidget())
+        DoChangeBackgroundColour(GetClientWidget(), m_backgroundColour);
+}

 
 

-  wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, frame->GetId());
-  closeEvent.SetEventObject(frame);
+void wxFrame::ChangeForegroundColour()
+{
+    if (GetClientWidget())
+        DoChangeForegroundColour(GetClientWidget(), m_foregroundColour);
+}

 
 

-  // May delete the frame (with delayed deletion)
-  frame->GetEventHandler()->ProcessEvent(closeEvent);
+void wxCloseFrameCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs)
+{
+    wxFrame *frame = (wxFrame *)client_data;
+    
+    wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, frame->GetId());
+    closeEvent.SetEventObject(frame);
+    
+    // May delete the frame (with delayed deletion)
+    frame->GetEventHandler()->ProcessEvent(closeEvent);

 }
 }

+