Ignore non-existant string selection in wxComboBox::SetValue() in read-only mode...

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

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 4ea8a6716e32eb250fdaaa1afbd53ade5ec60449..ea5e99675873e3a34a1b05edd9e4621c35728f92 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.cpp
+// Name:        src/motif/frame.cpp

 // Purpose:     wxFrame
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxFrame
 // Author:      Julian Smart
 // Modified by:


@@ -9,31 +9,45 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "frame.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/frame.h"
 
 #include "wx/frame.h"

-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
-#include "wx/menuitem.h"
-#include "wx/menu.h"
-#include "wx/dcclient.h"
-#include "wx/dialog.h"
-#include "wx/settings.h"
-#include "wx/app.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/menu.h"
+    #include "wx/icon.h"
+    #include "wx/settings.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+#endif
+
+#ifdef __VMS__
+    #pragma message disable nosimpint
+#endif

 
 #if defined(__ultrix) || defined(__sgi)
 
 #if defined(__ultrix) || defined(__sgi)

-#include <Xm/Frame.h>
+    #include <Xm/Frame.h>

 #endif
 
 #include <Xm/Xm.h>
 #include <X11/Shell.h>
 #endif
 
 #include <Xm/Xm.h>
 #include <X11/Shell.h>

+#include <X11/Core.h>

 #if XmVersion >= 1002
 #if XmVersion >= 1002

-#include <Xm/XmAll.h>
+    #include <Xm/XmAll.h>

 #else
 #else

-#include <Xm/Frame.h>
+    #include <Xm/Frame.h>

 #endif
 #include <Xm/MwmUtil.h>
 #include <Xm/BulletinB.h>
 #endif
 #include <Xm/MwmUtil.h>
 #include <Xm/BulletinB.h>


@@ -45,62 +59,57 @@
 #include <Xm/LabelG.h>
 #include <Xm/Frame.h>
 #if   XmVersion > 1000
 #include <Xm/LabelG.h>
 #include <Xm/Frame.h>
 #if   XmVersion > 1000

-#include <Xm/Protocols.h>
+    #include <Xm/Protocols.h>
+#endif
+
+#ifdef __VMS__
+    #pragma message enable nosimpint

 #endif
 
 #include "wx/motif/private.h"
 #endif
 
 #include "wx/motif/private.h"

+#include "wx/unix/utilsx11.h"
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static void wxFrameMapProc(Widget frameShell, XtPointer clientData,
+                           XCrossingEvent* event);

 
 

-void wxCloseFrameCallback(Widget, XtPointer, XmAnyCallbackStruct *cbs);
-void wxFrameFocusProc(Widget workArea, XtPointer clientData, 
-                      XmAnyCallbackStruct *cbs);
-static void wxFrameMapProc(Widget frameShell, XtPointer clientData, 
-                           XCrossingEvent * event);
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------

 
 extern wxList wxModelessWindows;
 
 extern wxList wxModelessWindows;

-extern wxList wxPendingDelete;
-
-// TODO: this should be tidied so that any frame can be the
-// top frame
-static bool wxTopLevelUsed = FALSE;
-
-#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)
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+    EVT_ACTIVATE(wxFrame::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

 
 

-#if wxUSE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
-#else
-bool wxFrame::m_useNativeStatusBar = FALSE;
-#endif
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// frame construction
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

-#if wxUSE_TOOLBAR
-    m_frameToolBar = NULL ;
-#endif // wxUSE_TOOLBAR
+    m_iconized = false;

 
 

-    m_frameMenuBar = NULL;
-    m_frameStatusBar = NULL;
-    
-    m_windowParent = NULL;
-    m_iconized = FALSE;
-    

     //// Motif-specific
     m_frameShell = (WXWidget) 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_mainWidget = (WXWidget) NULL;
+    m_workArea = (WXWidget) NULL;
+    m_clientArea = (WXWidget) NULL;

 }
 
 bool wxFrame::Create(wxWindow *parent,
 }
 
 bool wxFrame::Create(wxWindow *parent,


@@ -111,74 +120,101 @@ bool wxFrame::Create(wxWindow *parent,
                      long style,
                      const wxString& name)
 {
                      long style,
                      const wxString& name)
 {

-    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
+    if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style,
+                                   name ) )
+        return false;
+
+    int x = pos.x, y = pos.y;
+    int width = size.x, height = size.y;
+
+    // Set reasonable values for position and size if defaults have been
+    // requested
+    //
+    // MB TODO: something better than these arbitrary values ?
+    // VZ       should use X resources for this...
+    if ( width == -1 )
+        width = 400;
+    if ( height == -1 )
+        height = 400;
+
+    int displayW, displayH;
+    wxDisplaySize( &displayW, &displayH );
+
+    if ( x == -1 )

     {
     {

-        m_frameShell = wxTheApp->GetTopLevelWidget();
-        wxTopLevelUsed = TRUE;
+        x = (displayW - width) / 2;
+        if (x < 10) x = 10;

     }
     }

-    
-    XtVaSetValues((Widget) m_frameShell, 
+    if ( y == -1 )
+    {
+        y = (displayH - height) / 2;
+        if (y < 10) y = 10;
+    }
+
+    SetTitle( title );
+
+    wxLogTrace(wxTRACE_Messages,
+               "Created frame (0x%p) with work area 0x%p and client "
+               "area 0x%p", m_mainWidget, m_workArea, m_clientArea);
+
+    XtAddEventHandler((Widget) m_clientArea, ExposureMask,False,
+        wxUniversalRepaintProc, (XtPointer) this);
+
+    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);
+
+    PostCreation();
+    PreResize();
+
+    wxSize newSize(width, height);
+    wxSizeEvent sizeEvent(newSize, GetId());
+    sizeEvent.SetEventObject(this);
+
+    HandleWindowEvent(sizeEvent);
+
+    return true;
+}
+
+bool wxFrame::XmDoCreateTLW(wxWindow* WXUNUSED(parent),
+                            wxWindowID WXUNUSED(id),
+                            const wxString& WXUNUSED(title),
+                            const wxPoint& WXUNUSED(pos),
+                            const wxSize& WXUNUSED(size),
+                            long style,
+                            const wxString& name)
+{
+    Widget frameShell;
+
+    frameShell = XtCreatePopupShell( name, topLevelShellWidgetClass,
+                                     (Widget)wxTheApp->GetTopLevelWidget(),
+                                     NULL, 0 );
+
+    XtVaSetValues(frameShell,

         // Allows menu to resize
         XmNallowShellResize, True,
         XmNdeleteResponse, XmDO_NOTHING,
         XmNmappedWhenManaged, 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,
+        XmNiconic, (style & wxICONIZE) ? True : False,

         NULL);
         NULL);

-    
-    m_frameWidget = (WXWidget) XtVaCreateManagedWidget("main_window",
-        xmMainWindowWidgetClass, (Widget) m_frameShell,
+
+    m_frameShell = (WXWidget)frameShell;
+
+    m_mainWidget = (WXWidget) XtVaCreateManagedWidget("main_window",
+        xmMainWindowWidgetClass, frameShell,

         XmNresizePolicy, XmRESIZE_NONE,
         NULL);
         XmNresizePolicy, XmRESIZE_NONE,
         NULL);

-    
+

     m_workArea = (WXWidget) XtVaCreateWidget("form",
     m_workArea = (WXWidget) XtVaCreateWidget("form",

-        xmFormWidgetClass, (Widget) m_frameWidget,
+        xmFormWidgetClass, (Widget) m_mainWidget,

         XmNresizePolicy, XmRESIZE_NONE,
         NULL);
         XmNresizePolicy, XmRESIZE_NONE,
         NULL);

-    
+

     m_clientArea = (WXWidget) XtVaCreateWidget("client",
         xmBulletinBoardWidgetClass, (Widget) m_workArea,
         XmNmarginWidth, 0,
     m_clientArea = (WXWidget) XtVaCreateWidget("client",
         xmBulletinBoardWidgetClass, (Widget) m_workArea,
         XmNmarginWidth, 0,


@@ -187,186 +223,98 @@ bool wxFrame::Create(wxWindow *parent,
         XmNleftAttachment, XmATTACH_FORM,
         XmNtopAttachment, XmATTACH_FORM,
         XmNbottomAttachment, XmATTACH_FORM,
         XmNleftAttachment, XmATTACH_FORM,
         XmNtopAttachment, XmATTACH_FORM,
         XmNbottomAttachment, XmATTACH_FORM,

-        //                    XmNresizePolicy, XmRESIZE_ANY,

         NULL);
         NULL);

-    
-    XtVaSetValues((Widget) m_frameWidget,
+
+    XtVaSetValues((Widget) m_mainWidget,

         XmNworkWindow, (Widget) m_workArea,
         NULL);
         XmNworkWindow, (Widget) m_workArea,
         NULL);

-    
-    
+

     XtManageChild((Widget) m_clientArea);
     XtManageChild((Widget) m_workArea);
     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);
-    
+
+    XtTranslations ptr = XtParseTranslationTable( "<Configure>: resize()" );
+    XtOverrideTranslations( (Widget) m_workArea, ptr );
+    XtFree( (char *)ptr );
+

     /* Part of show-&-hide fix */
     /* 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)
-    XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (XtCallbackProc) wxCloseFrameCallback, (XtPointer)this);
-#else
-#if XmREVISION == 1
-    XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (XtCallbackProc) wxCloseFrameCallback, (caddr_t)this);
-#else
-    XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (void (*)())wxCloseFrameCallback, (caddr_t)this);
-#endif
-#endif
-    
-    ChangeBackgroundColour();
-    
-    PreResize();
-    
-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-    sizeEvent.SetEventObject(this);
-    
-    GetEventHandler()->ProcessEvent(sizeEvent);
-    
-    return TRUE;
+    XtAddEventHandler( frameShell, StructureNotifyMask,
+                       False, (XtEventHandler)wxFrameMapProc,
+                       (XtPointer)this );
+
+    XtRealizeWidget(frameShell);
+
+    wxAddWindowToTable( (Widget)m_workArea, this);
+    wxAddWindowToTable( (Widget)m_clientArea, this);
+
+    wxModelessWindows.Append( this );
+
+    return true;

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

+    SendDestroyEvent();
+
+    if (m_clientArea)
+    {
+      XtRemoveEventHandler((Widget) m_clientArea, ExposureMask, False,
+          wxUniversalRepaintProc, (XtPointer) this);
+    }
+

     if (GetMainWidget())
     if (GetMainWidget())

-        Show(FALSE);
-    
+        Show(false);
+

     if (m_frameMenuBar)
     {
         m_frameMenuBar->DestroyMenuBar();
     if (m_frameMenuBar)
     {
         m_frameMenuBar->DestroyMenuBar();

-        
-        // Hack to stop core dump on Ultrix, OSF, for some strange reason.
-#if MOTIF_MENUBAR_DELETE_FIX
-        GetMenuBar()->SetMainWidget((WXWidget) NULL);
-#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++)
-    if (statusTextWidget[i])
-    XtDestroyWidget (statusTextWidget[i]);
-    
-      if (statusLineForm)
-      XtDestroyWidget (statusLineForm);
-      
-        if (statusLineWidget)
-        XtDestroyWidget (statusLineWidget);
-    */
-    
-    if (m_workArea)
-    {
-        wxDeleteWindowFromTable((Widget) m_workArea);
-        
-        XtDestroyWidget ((Widget) m_workArea);
+        wxDELETE(m_frameMenuBar);

     }
     }

-    
-    if (m_frameWidget)
+
+    wxDELETE(m_frameStatusBar);
+
+    PreDestroy();
+
+    Widget frameShell = (Widget)GetShellWidget();
+
+    if( frameShell )
+        XtRemoveEventHandler( frameShell, StructureNotifyMask,
+                              False, (XtEventHandler)wxFrameMapProc,
+                              (XtPointer)this );
+
+    if( m_clientArea )

     {
     {

-        wxDeleteWindowFromTable((Widget) m_frameWidget);
-        XtDestroyWidget ((Widget) m_frameWidget);
+        wxDeleteWindowFromTable( (Widget)m_clientArea );
+        XtDestroyWidget( (Widget)m_clientArea );

     }
     }

-    
-    if (m_frameShell)
-        XtDestroyWidget ((Widget) m_frameShell);
-    
-    SetMainWidget((WXWidget) NULL);
-    
-    /* Check if it's the last top-level window */
-    
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
+
+    if( m_workArea )

     {
     {

-        wxTheApp->SetTopWindow(NULL);
-        
-        if (wxTheApp->GetExitOnFrameDelete())
-        {
-            // Signal to the app that we're going to close
-            wxTheApp->ExitMainLoop();
-        }
+        XtVaSetValues( (Widget)m_mainWidget,
+                       XmNworkWindow, (Widget)NULL,
+                       NULL );
+
+        wxDeleteWindowFromTable( (Widget)m_workArea );
+        XtDestroyWidget( (Widget)m_workArea );

     }
     }

-    
+
+    if( m_mainWidget )
+        XtDestroyWidget( (Widget)m_mainWidget );
+
+    if( frameShell )
+        XtDestroyWidget( frameShell );

 }
 
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
 }
 
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.

-void wxFrame::GetClientSize(int *x, int *y) const
+void wxFrame::DoGetClientSize(int *x, int *y) const

 {
     Dimension xx, yy;
     XtVaGetValues((Widget) m_workArea, XmNwidth, &xx, XmNheight, &yy, NULL);
 {
     Dimension xx, yy;
     XtVaGetValues((Widget) m_workArea, XmNwidth, &xx, XmNheight, &yy, NULL);

-    
+

     if (m_frameStatusBar)
     {
         int sbw, sbh;
         m_frameStatusBar->GetSize(& sbw, & sbh);
     if (m_frameStatusBar)
     {
         int sbw, sbh;
         m_frameStatusBar->GetSize(& sbw, & sbh);

-        yy -= sbh;
+        yy = (Dimension)(yy - sbh);

     }
 #if wxUSE_TOOLBAR
     if (m_frameToolBar)
     }
 #if wxUSE_TOOLBAR
     if (m_frameToolBar)


@@ -374,46 +322,29 @@ void wxFrame::GetClientSize(int *x, int *y) const
         int tbw, tbh;
         m_frameToolBar->GetSize(& tbw, & tbh);
         if (m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL)
         int tbw, tbh;
         m_frameToolBar->GetSize(& tbw, & tbh);
         if (m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL)

-            xx -= tbw;
+            xx = (Dimension)(xx - tbw);

         else
         else

-            yy -= tbh;
+            yy = (Dimension)(yy - tbh);

     }
 #endif // wxUSE_TOOLBAR
     }
 #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;
-    for(wxNode* node = GetChildren().First(); node; node = node->Next())
-    {
-    wxWindow *win = (wxWindow *)node->Data();
-    hasSubPanel = (win->IsKindOf(CLASSINFO(wxPanel)) && !win->IsKindOf(CLASSINFO(wxDialog)));
-    
-      if (hasSubPanel)
-      break;
-      }
-      if (! hasSubPanel) {
-      Dimension ys;
-      XtVaGetValues((Widget) GetMenuBarWidget(), XmNheight, &ys, NULL);
-      yy -= ys;
-      }
-      }
-    */
-    
-    *x = xx; *y = yy;
+
+//CE found a call here with NULL y pointer
+    if (x)
+        *x = xx;
+    if (y)
+        *y = yy;

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

-// to wxWindows)
-void wxFrame::SetClientSize(int width, int height)
+// to wxWidgets)
+void wxFrame::DoSetClientSize(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);
 {
     // 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)
     {
         if (m_frameStatusBar)
     if (height > -1)
     {
         if (m_frameStatusBar)


@@ -433,215 +364,123 @@ void wxFrame::SetClientSize(int width, int height)
                 height += tbh;
         }
 #endif // wxUSE_TOOLBAR
                 height += tbh;
         }
 #endif // wxUSE_TOOLBAR

-        
+

         XtVaSetValues((Widget) m_workArea, XmNheight, height, NULL);
     }
     PreResize();
         XtVaSetValues((Widget) m_workArea, XmNheight, height, NULL);
     }
     PreResize();

-    
-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
+
+    wxSize newSize(width, height);
+    wxSizeEvent sizeEvent(newSize, GetId());

     sizeEvent.SetEventObject(this);
     sizeEvent.SetEventObject(this);

-    
-    GetEventHandler()->ProcessEvent(sizeEvent);
-    
+
+    HandleWindowEvent(sizeEvent);
+

 }
 
 }
 

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

 {
 {

+    if (!m_frameShell)
+    {
+        *width = -1; *height = -1;
+        return;
+    }
+

     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),
-        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) {
-        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,
-        &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)
+void wxFrame::DoSetSize(int x, int y, int width, int height, int WXUNUSED(sizeFlags))

 {
     if (x > -1)
         XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL);
     if (y > -1)
         XtVaSetValues((Widget) m_frameShell, XmNy, y, NULL);
     if (width > -1)
 {
     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);
+        XtVaSetValues((Widget) m_mainWidget, XmNwidth, width, NULL);

     if (height > -1)
     if (height > -1)

-        XtVaSetValues((Widget) m_frameWidget, XmNheight, height, NULL);
-    
+        XtVaSetValues((Widget) m_mainWidget, XmNheight, height, NULL);
+

     if (!(height == -1 && width == -1))
     {
         PreResize();
     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 )

 {
 {

-    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;
-}
+    if( !wxWindowBase::Show( show ) )
+        return false;

 
 

-void wxFrame::Iconize(bool iconize)
-{
-    if (!iconize)
-        Show(TRUE);
-    
-    if (m_frameShell)
-        XtVaSetValues((Widget) m_frameShell, XmNiconic, (Boolean)iconize, NULL);
-}
+    m_isShown = show;

 
 

-// Equivalent to maximize/restore in Windows
-void wxFrame::Maximize(bool maximize)
-{
-    Show(TRUE);
-    
-    if (maximize && m_frameShell)
-        XtVaSetValues((Widget) m_frameShell, XmNiconic, FALSE, NULL);
-}
+    Widget shell = (Widget)GetShellWidget();
+    if (!shell)
+        return wxWindow::Show(show);

 
 

-bool wxFrame::IsIconized() const
-{
-    if (!m_frameShell)
-        return FALSE;
-    
-    Boolean iconic;
-    XtVaGetValues((Widget) m_frameShell, XmNiconic, &iconic, NULL);
-    return iconic;
-}
+    SetVisibleStatus(show);
+    if (show)
+    {
+        XtPopup(shell, XtGrabNone);
+    }
+    else
+    {
+        XtPopdown(shell);
+    }

 
 

-// Is it maximized?
-bool wxFrame::IsMaximized(void) const
-{
-    // No maximizing in Motif (?)
-    return FALSE;
+    return true;

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

-    if (title == m_title)
+    wxString oldTitle = GetTitle();
+    if( title == oldTitle )

         return;
         return;

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

 }
 
 }
 

-void wxFrame::SetIcon(const wxIcon& icon)
+void wxFrame::DoSetIcon(const wxIcon& icon)

 {
 {

-    m_icon = icon;
-    

     if (!m_frameShell)
         return;
     if (!m_frameShell)
         return;

-    
-    if (!icon.Ok() || !icon.GetPixmap())
+
+    if (!icon.Ok() || !icon.GetDrawable())

         return;
         return;

-    
-    XtVaSetValues((Widget) m_frameShell, XtNiconPixmap, icon.GetPixmap(), NULL);
-}

 
 

-wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
-                                        const wxString& name)
-{
-    wxStatusBar *statusBar = NULL;
-    
-    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->SetFieldsCount(number);
-    return statusBar;
+    XtVaSetValues((Widget) m_frameShell,
+                  XtNiconPixmap, icon.GetDrawable(),
+                  NULL);

 }
 
 }
 

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

 {
 {

-    // 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;
-}
+    wxFrameBase::SetIcons( icons );

 
 

-void wxFrame::SetStatusText(const wxString& text, int number)
-{
-    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
-    
-    m_frameStatusBar->SetStatusText(text, number);
-}
+    if (!m_frameShell)
+        return;

 
 

-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();
+    DoSetIcon( m_icons.GetIcon( -1 ) );
+    wxSetIconsX11(GetXDisplay(),
+                  (WXWindow) XtWindow( (Widget) m_frameShell ), icons);

 }
 
 void wxFrame::PositionStatusBar()
 {
     if (!m_frameStatusBar)
         return;
 }
 
 void wxFrame::PositionStatusBar()
 {
     if (!m_frameStatusBar)
         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.
     m_frameStatusBar->SetSize(0, h, w, 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);


@@ -662,119 +501,50 @@ 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");
-    
+    //    wxASSERT_MSG( (m_frameMenuBar == NULL), "Cannot set the menubar more than once");
+

     if (m_frameMenuBar)
     {
         m_frameMenuBar->DestroyMenuBar();
         delete m_frameMenuBar;
     }
     if (m_frameMenuBar)
     {
         m_frameMenuBar->DestroyMenuBar();
         delete m_frameMenuBar;
     }

-    
+

     m_frameMenuBar = menuBar;
     m_frameMenuBar->CreateMenuBar(this);
 }
 
     m_frameMenuBar = menuBar;
     m_frameMenuBar->CreateMenuBar(this);
 }
 

-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)))
-        {
-            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();
-    }
-    SetClientSize(max_width, max_height);
-}
-

 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

     Refresh();
     Refresh();

-    
+

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

-        m_frameStatusBar->ProcessEvent(event2);
+        m_frameStatusBar->HandleWindowEvent(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);
 }
 

-// Default resizing behaviour - if only ONE subwindow,
-// resize to client rectangle size
-void wxFrame::OnSize(wxSizeEvent& event)
-{
-    // if we're using constraints - do use them
-#if wxUSE_CONSTRAINTS
-    if ( GetAutoLayout() ) {
-        Layout();
-        return;
-    }
-#endif
-    
-    // do we have _exactly_ one child?
-    wxWindow *child = NULL;
-    for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
-    {
-        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);
-    }
-}
-

 // 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())
+    if (!event.GetActive())
+        return;
+
+    for(wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node;
+        node = node->GetNext())

     {
         // Find a child that's a subwindow, but not a dialog box.
     {
         // 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)))
+        wxWindow *child = node->GetData();
+        if (!child->IsTopLevel())

         {
             child->SetFocus();
             return;
         {
             child->SetFocus();
             return;


@@ -782,296 +552,54 @@ void wxFrame::OnActivate(wxActivateEvent& event)
     }
 }
 
     }
 }
 

-// The default implementation for the close window event - calls
-// OnClose for backward compatibility.
-
-void wxFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
-}
-
-bool wxFrame::OnClose()
-{
-    return TRUE;
-}
-
-// 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())
-    {
-        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
-{
-    return m_frameMenuBar;
-}
-
-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);
-}
-
-// Call this to simulate a menu command
-void wxFrame::Command(int id)
-{
-    ProcessCommand(id);
-}
-
-void wxFrame::ProcessCommand(int id)
-{
-  wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
-  commandEvent.SetInt( id );
-  commandEvent.SetEventObject( this );
-
-  wxMenuBar *bar = GetMenuBar() ;
-  if (!bar)
-    return;
-
-/* TODO: check the menu item if required
-  wxMenuItem *item = bar->FindItemForId(id) ;
-  if (item && item->IsCheckable())
-  {
-    bar->Check(id,!bar->Checked(id)) ;
-  }
-*/
-
-  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 wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

-    if (GetToolBar())
-    {
-        int w, h;
-        GetToolBar()->GetSize(& w, & h);
-        
-        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
-        {
-            pt.x += w;
-        }
-        else
-        {
-            pt.y += h;
-        }
-    }
-#endif // wxUSE_TOOLBAR
-
-    return pt;
-}

 
 

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

 {
 {

-    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,
-        "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, wxPoint(0, 0), wxSize(100, 24), style, name);
+    return m_frameToolBar;

 }
 
 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
 }
 
 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {

-    m_frameToolBar = toolbar;
-}
-
-wxToolBar *wxFrame::GetToolBar() const
-{
-    return m_frameToolBar;
+    wxFrameBase::SetToolBar(toolbar);
+    SendSizeEvent();

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

-    int cw, ch;
-    
-    GetClientSize(& cw, &ch);
-    
-    if (GetToolBar())
+    wxToolBar* tb = GetToolBar();
+    if (tb)

     {
     {

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

         int tw, th;
         int tw, th;

-        GetToolBar()->GetSize(& tw, & th);
-        
-        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        tb->GetSize(& tw, & th);
+
+        if (tb->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.
         {
             // 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 + th, wxSIZE_NO_ADJUSTMENTS);
+            th = ch + th;

         }
         else
         {
             // Use the 'real' position
         }
         else
         {
             // Use the 'real' position

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

         }
         }

-    }
-}
-#endif // wxUSE_TOOLBAR

 
 

-void wxFrame::CaptureMouse()
-{
-    if (m_winCaptured)
-        return;
-    
-    if (GetMainWidget())
-        XtAddGrab((Widget) m_frameShell, TRUE, FALSE);
-    m_winCaptured = TRUE;
-}
-
-void wxFrame::ReleaseMouse()
-{
-    if (!m_winCaptured)
-        return;
-    
-    if (GetMainWidget())
-        XtRemoveGrab((Widget) m_frameShell);
-    m_winCaptured = FALSE;
-}
-
-void wxFrame::Raise(void)
-{
-    Window parent_window = XtWindow((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) {
-        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);
-}
-
-void wxFrame::Lower(void)
-{
-    Window parent_window = XtWindow((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) {
-        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);
-}
-
-void wxFrameFocusProc(Widget workArea, XtPointer clientData, 
-                      XmAnyCallbackStruct *cbs)
-{
-    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, 
-                           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());
-            }
-        }
-        else if (e->xany.type == UnmapNotify)
-            // Iconize fix
-            XtVaSetValues(frameShell, XmNiconic, (Boolean)True, NULL);
+        tb->SetSize(0, 0, -1, -1, wxSIZE_NO_ADJUSTMENTS);

     }
 }
     }
 }

+#endif // wxUSE_TOOLBAR

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


@@ -1079,8 +607,12 @@ bool wxFrame::PreResize()
 #if wxUSE_TOOLBAR
     PositionToolBar();
 #endif // wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR
     PositionToolBar();
 #endif // wxUSE_TOOLBAR

+
+#if wxUSE_STATUSBAR

     PositionStatusBar();
     PositionStatusBar();

-    return TRUE;
+#endif // wxUSE_STATUSBAR
+
+    return true;

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


@@ -1088,7 +620,7 @@ WXWidget wxFrame::GetClientWidget() const
     return m_clientArea;
 }
 
     return m_clientArea;
 }
 

-void wxFrame::ChangeFont(bool keepOriginalSize)
+void wxFrame::ChangeFont(bool WXUNUSED(keepOriginalSize))

 {
     // TODO
 }
 {
     // TODO
 }


@@ -1096,23 +628,34 @@ void wxFrame::ChangeFont(bool keepOriginalSize)
 void wxFrame::ChangeBackgroundColour()
 {
     if (GetClientWidget())
 void wxFrame::ChangeBackgroundColour()
 {
     if (GetClientWidget())

-        DoChangeBackgroundColour(GetClientWidget(), m_backgroundColour);
+        wxDoChangeBackgroundColour(GetClientWidget(), m_backgroundColour);

 }
 
 void wxFrame::ChangeForegroundColour()
 {
     if (GetClientWidget())
 }
 
 void wxFrame::ChangeForegroundColour()
 {
     if (GetClientWidget())

-        DoChangeForegroundColour(GetClientWidget(), m_foregroundColour);
+        wxDoChangeForegroundColour(GetClientWidget(), m_foregroundColour);

 }
 
 }
 

-void wxCloseFrameCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs)
+/* MATTEW: Used to insure that hide-&-show within an event cycle works */
+static void wxFrameMapProc( Widget frameShell, XtPointer clientData,
+                            XCrossingEvent* event )

 {
 {

-    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);
-}
+    wxFrame *tli = (wxFrame*)clientData;

 
 

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