Added "set new icon" menu item to taskbar sample; updated some makefiles

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

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index d12ac787a5b85fd337df3628dfd01cf6697e5b97..5984fe2b591df5a80c46e3b4fa6d500e4c6a642d 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -9,11 +9,26 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "frame.h"
+    #pragma implementation "frame.h"
+#endif
+
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#define XtScreen XTSCREEN

 #endif
 
 #endif
 

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

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


@@ -23,17 +38,22 @@
 #include "wx/settings.h"
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/settings.h"
 #include "wx/app.h"
 #include "wx/utils.h"

+#include "wx/log.h"
+
+#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>
 #if XmVersion >= 1002
 #endif
 
 #include <Xm/Xm.h>
 #include <X11/Shell.h>
 #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,17 +65,33 @@
 #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"
 

-void wxCloseFrameCallback(Widget, XtPointer, XmAnyCallbackStruct *cbs);
-void wxFrameFocusProc(Widget workArea, XtPointer clientData, 
-                      XmAnyCallbackStruct *cbs);
-static void wxFrameMapProc(Widget frameShell, XtPointer clientData, 
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static void wxFrameEventHandler(Widget    wid,
+                             XtPointer WXUNUSED(client_data),
+                             XEvent*   event,
+                             Boolean*  continueToDispatch);
+static void wxCloseFrameCallback(Widget, XtPointer, XmAnyCallbackStruct *cbs);
+static void wxFrameFocusProc(Widget workArea, XtPointer clientData,
+                            XmAnyCallbackStruct *cbs);
+static void wxFrameMapProc(Widget frameShell, XtPointer clientData,

                            XCrossingEvent * event);
 
                            XCrossingEvent * event);
 

+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+

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


@@ -63,44 +99,35 @@ extern wxList wxPendingDelete;
 // top frame
 static bool wxTopLevelUsed = FALSE;
 
 // 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()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)

-#endif

 
 

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

 
 

-wxFrame::wxFrame()
-{
-#if wxUSE_TOOLBAR
-    m_frameToolBar = NULL ;
-#endif // wxUSE_TOOLBAR
+// ----------------------------------------------------------------------------
+// frame construction
+// ----------------------------------------------------------------------------

 
 

-    m_frameMenuBar = NULL;
-    m_frameStatusBar = NULL;
-    
-    m_windowParent = NULL;
+void wxFrame::Init()
+{

     m_iconized = FALSE;
     m_iconized = FALSE;

-    
+

     //// Motif-specific
     m_frameShell = (WXWidget) NULL;
     m_frameWidget = (WXWidget) NULL;;
     m_workArea = (WXWidget) NULL;;
     m_clientArea = (WXWidget) NULL;;
     m_visibleStatus = TRUE;
     //// Motif-specific
     m_frameShell = (WXWidget) NULL;
     m_frameWidget = (WXWidget) NULL;;
     m_workArea = (WXWidget) NULL;;
     m_clientArea = (WXWidget) NULL;;
     m_visibleStatus = TRUE;

-    m_title = "";

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


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

-    if (!parent)
+    if ( parent )
+        parent->AddChild(this);
+    else

         wxTopLevelWindows.Append(this);
         wxTopLevelWindows.Append(this);

-    
+
+    wxModelessWindows.Append(this);
+

     SetName(name);
     SetName(name);

-    
+

     m_windowStyle = style;
     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_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
     m_foregroundColour = *wxBLACK;

-    m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-    
+    m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+

     if ( id > -1 )
         m_windowId = id;
     else
         m_windowId = (int)NewControlId();
     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;
-    
+
+    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 )
+    {
+        x = (displayW - width) / 2;
+        if (x < 10) x = 10;
+    }
+    if ( y == -1 )
+    {
+        y = (displayH - height) / 2;
+        if (y < 10) y = 10;
+    }
+
+    // VZ: what does this do??

     if (wxTopLevelUsed)
     if (wxTopLevelUsed)

+    {

         // Change suggested by Matthew Flatt
         // Change suggested by Matthew Flatt

-        m_frameShell = (WXWidget) XtAppCreateShell(name, wxTheApp->GetClassName(), topLevelShellWidgetClass, (Display*) wxGetDisplay(), NULL, 0);
+        m_frameShell = (WXWidget)XtAppCreateShell
+                                 (
+                                  name,
+                                  wxTheApp->GetClassName(),
+                                  topLevelShellWidgetClass,
+                                  (Display*) wxGetDisplay(),
+                                  NULL,
+                                  0
+                                 );
+    }

     else
     {
         m_frameShell = wxTheApp->GetTopLevelWidget();
         wxTopLevelUsed = TRUE;
     }
     else
     {
         m_frameShell = wxTheApp->GetTopLevelWidget();
         wxTopLevelUsed = TRUE;
     }

-    
-    XtVaSetValues((Widget) m_frameShell, 
+
+    XtVaSetValues((Widget) m_frameShell,

         // Allows menu to resize
         XmNallowShellResize, True,
         XmNdeleteResponse, XmDO_NOTHING,
         XmNmappedWhenManaged, False,
         XmNiconic, (style & wxICONIZE) ? TRUE : FALSE,
         NULL);
         // 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,
+
+    if (!title.IsEmpty())
+        XtVaSetValues((Widget) m_frameShell,
+        XmNtitle, title.c_str(),

         NULL);
         NULL);

-    
+

     m_frameWidget = (WXWidget) XtVaCreateManagedWidget("main_window",
         xmMainWindowWidgetClass, (Widget) m_frameShell,
         XmNresizePolicy, XmRESIZE_NONE,
         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_workArea = (WXWidget) XtVaCreateWidget("form",
         xmFormWidgetClass, (Widget) m_frameWidget,
         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,


@@ -189,34 +238,45 @@ bool wxFrame::Create(wxWindow *parent,
         XmNbottomAttachment, XmATTACH_FORM,
         //                    XmNresizePolicy, XmRESIZE_ANY,
         NULL);
         XmNbottomAttachment, XmATTACH_FORM,
         //                    XmNresizePolicy, XmRESIZE_ANY,
         NULL);

-    
+
+    wxLogTrace(wxTRACE_Messages,
+               "Created frame (0x%08x) with work area 0x%08x and client "
+               "area 0x%08x", m_frameWidget, m_workArea, m_clientArea);
+
+    XtAddEventHandler((Widget) m_clientArea, ExposureMask,FALSE,
+        wxUniversalRepaintProc, (XtPointer) this);
+
+    XtAddEventHandler((Widget) m_clientArea,
+        ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask,
+        FALSE,
+        wxFrameEventHandler,
+        (XtPointer)this);
+

     XtVaSetValues((Widget) m_frameWidget,
         XmNworkWindow, (Widget) m_workArea,
         NULL);
     XtVaSetValues((Widget) m_frameWidget,
         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);
     wxAddWindowToTable((Widget) m_workArea, this);

-    
-    XtTranslations ptr ;
-    
+    wxAddWindowToTable((Widget) m_clientArea, this);
+
+    XtTranslations ptr;
+

     XtOverrideTranslations((Widget) m_workArea,
         ptr = XtParseTranslationTable("<Configure>: resize()"));
     XtOverrideTranslations((Widget) m_workArea,
         ptr = XtParseTranslationTable("<Configure>: resize()"));

-    
+

     XtFree((char *)ptr);
     XtFree((char *)ptr);

-    
-    XtAddCallback((Widget) m_workArea, XmNfocusCallback, 
+
+    XtAddCallback((Widget) m_workArea, XmNfocusCallback,

         (XtCallbackProc)wxFrameFocusProc, (XtPointer)this);
         (XtCallbackProc)wxFrameFocusProc, (XtPointer)this);

-    
+

     /* Part of show-&-hide fix */
     XtAddEventHandler((Widget) m_frameShell, StructureNotifyMask,
         False, (XtEventHandler)wxFrameMapProc,
         (XtPointer)m_workArea);
     /* 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)
     if (x > -1)
         XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL);
     if (y > -1)


@@ -225,17 +285,17 @@ bool wxFrame::Create(wxWindow *parent,
         XtVaSetValues((Widget) m_frameShell, XmNwidth, width, NULL);
     if (height > -1)
         XtVaSetValues((Widget) m_frameShell, XmNheight, height, NULL);
         XtVaSetValues((Widget) m_frameShell, XmNwidth, width, NULL);
     if (height > -1)
         XtVaSetValues((Widget) m_frameShell, XmNheight, height, NULL);

-    
+

     m_mainWidget = m_frameWidget;
     m_mainWidget = m_frameWidget;

-    
+

     ChangeFont(FALSE);
     ChangeFont(FALSE);

-    
+

     // This patch comes from Torsten Liermann lier@lier1.muc.de
     if (XmIsMotifWMRunning( (Widget) m_frameShell ))
     {
     // This patch comes from Torsten Liermann lier@lier1.muc.de
     if (XmIsMotifWMRunning( (Widget) m_frameShell ))
     {

-        int decor = 0 ;
+        int decor = 0;

         if (style & wxRESIZE_BORDER)
         if (style & wxRESIZE_BORDER)

-            decor |= MWM_DECOR_RESIZEH ;
+            decor |= MWM_DECOR_RESIZEH;

         if (style & wxSYSTEM_MENU)
             decor |= MWM_DECOR_MENU;
         if ((style & wxCAPTION) ||
         if (style & wxSYSTEM_MENU)
             decor |= MWM_DECOR_MENU;
         if ((style & wxCAPTION) ||


@@ -250,7 +310,7 @@ bool wxFrame::Create(wxWindow *parent,
             decor |= MWM_DECOR_MINIMIZE;
         if (style & wxMAXIMIZE_BOX)
             decor |= MWM_DECOR_MAXIMIZE;
             decor |= MWM_DECOR_MINIMIZE;
         if (style & wxMAXIMIZE_BOX)
             decor |= MWM_DECOR_MAXIMIZE;

-        XtVaSetValues((Widget) m_frameShell,XmNmwmDecorations,decor,NULL) ;
+        XtVaSetValues((Widget) m_frameShell,XmNmwmDecorations,decor,NULL);

     }
     // This allows non-Motif window managers to support at least the
     // no-decorations case.
     }
     // This allows non-Motif window managers to support at least the
     // no-decorations case.


@@ -260,7 +320,7 @@ bool wxFrame::Create(wxWindow *parent,
             XtVaSetValues((Widget) m_frameShell,XmNoverrideRedirect,TRUE,NULL);
     }
     XtRealizeWidget((Widget) m_frameShell);
             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)
     // 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)


@@ -272,28 +332,40 @@ bool wxFrame::Create(wxWindow *parent,
     XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (void (*)())wxCloseFrameCallback, (caddr_t)this);
 #endif
 #endif
     XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (void (*)())wxCloseFrameCallback, (caddr_t)this);
 #endif
 #endif

-    
+

     ChangeBackgroundColour();
     ChangeBackgroundColour();

-    
+

     PreResize();
     PreResize();

-    
+

     wxSizeEvent sizeEvent(wxSize(width, height), GetId());
     sizeEvent.SetEventObject(this);
     wxSizeEvent sizeEvent(wxSize(width, height), GetId());
     sizeEvent.SetEventObject(this);

-    
+

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

-    
+

     return TRUE;
 }
 
 wxFrame::~wxFrame()
 {
     return TRUE;
 }
 
 wxFrame::~wxFrame()
 {

+    m_isBeingDeleted = TRUE;
+
+    if (m_clientArea)
+    {
+      XtRemoveEventHandler((Widget) m_clientArea, ExposureMask, FALSE,
+          wxUniversalRepaintProc, (XtPointer) this);
+      XtRemoveEventHandler((Widget) m_clientArea, ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask,
+          FALSE,
+          wxFrameEventHandler, (XtPointer) this);
+      wxDeleteWindowFromTable((Widget) m_clientArea);
+    }
+

     if (GetMainWidget())
         Show(FALSE);
     if (GetMainWidget())
         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);
         // Hack to stop core dump on Ultrix, OSF, for some strange reason.
 #if MOTIF_MENUBAR_DELETE_FIX
         GetMenuBar()->SetMainWidget((WXWidget) NULL);


@@ -301,67 +373,56 @@ wxFrame::~wxFrame()
         delete m_frameMenuBar;
         m_frameMenuBar = NULL;
     }
         delete m_frameMenuBar;
         m_frameMenuBar = NULL;
     }

-    
+

     wxTopLevelWindows.DeleteObject(this);
     wxModelessWindows.DeleteObject(this);
     wxTopLevelWindows.DeleteObject(this);
     wxModelessWindows.DeleteObject(this);

-    
+

     if (m_frameStatusBar)
     if (m_frameStatusBar)

+    {

         delete m_frameStatusBar;
         delete m_frameStatusBar;

-    
+        m_frameStatusBar = NULL;
+    }
+

     DestroyChildren();
     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);
     if (m_workArea)
     {
         wxDeleteWindowFromTable((Widget) m_workArea);

-        
+

         XtDestroyWidget ((Widget) m_workArea);
     }
         XtDestroyWidget ((Widget) m_workArea);
     }

-    
+

     if (m_frameWidget)
     {
         wxDeleteWindowFromTable((Widget) m_frameWidget);
         XtDestroyWidget ((Widget) m_frameWidget);
     }
     if (m_frameWidget)
     {
         wxDeleteWindowFromTable((Widget) m_frameWidget);
         XtDestroyWidget ((Widget) m_frameWidget);
     }

-    
+

     if (m_frameShell)
         XtDestroyWidget ((Widget) m_frameShell);
     if (m_frameShell)
         XtDestroyWidget ((Widget) m_frameShell);

-    
+

     SetMainWidget((WXWidget) NULL);
     SetMainWidget((WXWidget) NULL);

-    
+

     /* Check if it's the last top-level window */
     /* Check if it's the last top-level window */

-    
+

     if (wxTheApp && (wxTopLevelWindows.Number() == 0))
     {
         wxTheApp->SetTopWindow(NULL);
     if (wxTheApp && (wxTopLevelWindows.Number() == 0))
     {
         wxTheApp->SetTopWindow(NULL);

-        
+

         if (wxTheApp->GetExitOnFrameDelete())
         {
             // Signal to the app that we're going to close
             wxTheApp->ExitMainLoop();
         }
     }
         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.
 }
 
 // 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;
     if (m_frameStatusBar)
     {
         int sbw, sbh;


@@ -389,7 +450,7 @@ void wxFrame::GetClientSize(int *x, int *y) const
     {
     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)
       break;
       }
       if (hasSubPanel)
       break;
       }


@@ -400,20 +461,20 @@ void wxFrame::GetClientSize(int *x, int *y) const
       }
       }
     */
       }
       }
     */

-    
+

     *x = xx; *y = yy;
 }
 
 // Set the client size (i.e. leave the calculation of borders etc.
 // to wxWindows)
     *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)
+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,31 +494,31 @@ 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());
     sizeEvent.SetEventObject(this);
     wxSizeEvent sizeEvent(wxSize(width, height), GetId());
     sizeEvent.SetEventObject(this);

-    
+

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

-    
+

 }
 
 }
 

-void wxFrame::GetSize(int *width, int *height) const
+void wxFrame::DoGetSize(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
+void wxFrame::DoGetPosition(int *x, int *y) const

 {
     Window parent_window = XtWindow((Widget) m_frameShell),
         next_parent   = XtWindow((Widget) m_frameShell),
         root          = RootWindowOfScreen(XtScreen((Widget) m_frameShell));
 {
     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) {
     // 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) {


@@ -474,7 +535,7 @@ void wxFrame::GetPosition(int *x, int *y) const
     if (y) *y = yy;
 }
 
     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 (x > -1)
         XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL);


@@ -484,14 +545,14 @@ void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
         XtVaSetValues((Widget) m_frameWidget, XmNwidth, width, NULL);
     if (height > -1)
         XtVaSetValues((Widget) m_frameWidget, XmNheight, height, NULL);
         XtVaSetValues((Widget) m_frameWidget, XmNwidth, width, NULL);
     if (height > -1)
         XtVaSetValues((Widget) m_frameWidget, XmNheight, height, NULL);

-    
+

     if (!(height == -1 && width == -1))
     {
         PreResize();
     if (!(height == -1 && width == -1))
     {
         PreResize();

-        
+

         wxSizeEvent sizeEvent(wxSize(width, height), GetId());
         sizeEvent.SetEventObject(this);
         wxSizeEvent sizeEvent(wxSize(width, height), GetId());
         sizeEvent.SetEventObject(this);

-        
+

         GetEventHandler()->ProcessEvent(sizeEvent);
     }
 }
         GetEventHandler()->ProcessEvent(sizeEvent);
     }
 }


@@ -500,9 +561,9 @@ bool wxFrame::Show(bool show)
 {
     if (!m_frameShell)
         return wxWindow::Show(show);
 {
     if (!m_frameShell)
         return wxWindow::Show(show);

-    
+

     m_visibleStatus = show; /* show-&-hide fix */
     m_visibleStatus = show; /* show-&-hide fix */

-    
+

     m_isShown = show;
     if (show) {
         XtMapWidget((Widget) m_frameShell);
     m_isShown = show;
     if (show) {
         XtMapWidget((Widget) m_frameShell);


@@ -518,32 +579,37 @@ void wxFrame::Iconize(bool iconize)
 {
     if (!iconize)
         Show(TRUE);
 {
     if (!iconize)
         Show(TRUE);

-    
+

     if (m_frameShell)
         XtVaSetValues((Widget) m_frameShell, XmNiconic, (Boolean)iconize, NULL);
 }
 
     if (m_frameShell)
         XtVaSetValues((Widget) m_frameShell, XmNiconic, (Boolean)iconize, NULL);
 }
 

-// Equivalent to maximize/restore in Windows
+void wxFrame::Restore()
+{
+    if ( m_frameShell )
+        XtVaSetValues((Widget) m_frameShell, XmNiconic, FALSE, NULL);
+}
+

 void wxFrame::Maximize(bool maximize)
 {
     Show(TRUE);
 void wxFrame::Maximize(bool maximize)
 {
     Show(TRUE);

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

 }
 
 bool wxFrame::IsIconized() const
 {
     if (!m_frameShell)
         return FALSE;
 }
 
 bool wxFrame::IsIconized() const
 {
     if (!m_frameShell)
         return FALSE;

-    
+

     Boolean iconic;
     XtVaGetValues((Widget) m_frameShell, XmNiconic, &iconic, NULL);
     return iconic;
 }
 
 // Is it maximized?
     Boolean iconic;
     XtVaGetValues((Widget) m_frameShell, XmNiconic, &iconic, NULL);
     return iconic;
 }
 
 // Is it maximized?

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

 {
     // No maximizing in Motif (?)
     return FALSE;
 {
     // No maximizing in Motif (?)
     return FALSE;


@@ -553,95 +619,39 @@ void wxFrame::SetTitle(const wxString& title)
 {
     if (title == m_title)
         return;
 {
     if (title == m_title)
         return;

-    
+

     m_title = title;
     m_title = title;

-    
+

     if (!title.IsNull())
     if (!title.IsNull())

-        XtVaSetValues((Widget) m_frameShell, 
-        XmNtitle, (const char*) title,
-        XmNiconName, (const char*) title,
+        XtVaSetValues((Widget) m_frameShell,
+        XmNtitle, title.c_str(),
+        XmNiconName, title.c_str(),

         NULL);
 }
 
 void wxFrame::SetIcon(const wxIcon& icon)
 {
     m_icon = icon;
         NULL);
 }
 
 void wxFrame::SetIcon(const wxIcon& icon)
 {
     m_icon = icon;

-    
+

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

-    
+

     if (!icon.Ok() || !icon.GetPixmap())
         return;
     if (!icon.Ok() || !icon.GetPixmap())
         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;
-}
-
-wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
-                                      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;
-}

 
 

-void wxFrame::SetStatusText(const wxString& text, int 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[])
-{
-    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
-    
-    m_frameStatusBar->SetStatusWidths(n, widths_field);
-    PositionStatusBar();
+    XtVaSetValues((Widget) m_frameShell, XtNiconPixmap, icon.GetPixmap(), NULL);

 }
 
 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,113 +672,44 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar)
         m_frameMenuBar = NULL;
         return;
     }
         m_frameMenuBar = NULL;
         return;
     }

-    
+

     // Currently can't set it twice
     //    wxASSERT_MSG( (m_frameMenuBar == (wxMenuBar*) NULL), "Cannot set the menubar more than once");
     // Currently can't set it twice
     //    wxASSERT_MSG( (m_frameMenuBar == (wxMenuBar*) 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)
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     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);
 }
 

-// 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)
 {

+    if (!event.GetActive())
+        return;
+

     for(wxNode *node = GetChildren().First(); node; node = node->Next())
     {
         // Find a child that's a subwindow, but not a dialog box.
     for(wxNode *node = GetChildren().First(); node; node = node->Next())
     {
         // Find a child that's a subwindow, but not a dialog box.


@@ -782,194 +723,30 @@ 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.CanVeto())
-    {
-        this->Destroy();
-    }
-    else
-        event.Veto(TRUE);
-}
-
-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
-{
-    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)
+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);
-}

 
 

-void wxFrame::SetToolBar(wxToolBar *toolbar)
-{
-    m_frameToolBar = toolbar;
-}
-
-wxToolBar *wxFrame::GetToolBar() const
-{

     return m_frameToolBar;
 }
 
 void wxFrame::PositionToolBar()
 {
     return m_frameToolBar;
 }
 
 void wxFrame::PositionToolBar()
 {

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

     if (GetToolBar())
     {
     if (GetToolBar())
     {

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

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

-        
+

         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS


@@ -986,27 +763,7 @@ void wxFrame::PositionToolBar()
 }
 #endif // wxUSE_TOOLBAR
 
 }
 #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)
+void wxFrame::Raise()

 {
     Window parent_window = XtWindow((Widget) m_frameShell),
         next_parent   = XtWindow((Widget) m_frameShell),
 {
     Window parent_window = XtWindow((Widget) m_frameShell),
         next_parent   = XtWindow((Widget) m_frameShell),


@@ -1023,7 +780,7 @@ void wxFrame::Raise(void)
     XRaiseWindow(XtDisplay((Widget) m_frameShell), parent_window);
 }
 
     XRaiseWindow(XtDisplay((Widget) m_frameShell), parent_window);
 }
 

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

 {
     Window parent_window = XtWindow((Widget) m_frameShell),
         next_parent   = XtWindow((Widget) m_frameShell),
 {
     Window parent_window = XtWindow((Widget) m_frameShell),
         next_parent   = XtWindow((Widget) m_frameShell),


@@ -1040,25 +797,24 @@ void wxFrame::Lower(void)
     XLowerWindow(XtDisplay((Widget) m_frameShell), parent_window);
 }
 
     XLowerWindow(XtDisplay((Widget) m_frameShell), parent_window);
 }
 

-void wxFrameFocusProc(Widget workArea, XtPointer clientData, 
-                      XmAnyCallbackStruct *cbs)
+void wxFrameFocusProc(Widget WXUNUSED(workArea), XtPointer WXUNUSED(clientData),
+                      XmAnyCallbackStruct *WXUNUSED(cbs))

 {
 {

-    wxFrame *frame = (wxFrame *)clientData;
-    

     // wxDebugMsg("focus proc from frame %ld\n",(long)frame);
     // TODO
     // wxDebugMsg("focus proc from frame %ld\n",(long)frame);
     // TODO

-    //  frame->GetEventHandler()->OnSetFocus();
+    // wxFrame *frame = (wxFrame *)clientData;
+    // frame->GetEventHandler()->OnSetFocus();

 }
 
 /* MATTEW: Used to insure that hide-&-show within an event cycle works */
 }
 
 /* MATTEW: Used to insure that hide-&-show within an event cycle works */

-static void wxFrameMapProc(Widget frameShell, XtPointer clientData, 
+static void wxFrameMapProc(Widget frameShell, XtPointer clientData,

                            XCrossingEvent * event)
 {
                            XCrossingEvent * event)
 {

-    wxFrame *frame = (wxFrame *)wxWidgetHashTable->Get((long)clientData);
-    
+    wxFrame *frame = (wxFrame *)wxGetWindowFromTable((Widget)clientData);
+

     if (frame) {
         XEvent *e = (XEvent *)event;
     if (frame) {
         XEvent *e = (XEvent *)event;

-        
+

         if (e->xany.type == MapNotify)
         {
             // Iconize fix
         if (e->xany.type == MapNotify)
         {
             // Iconize fix


@@ -1081,7 +837,11 @@ bool wxFrame::PreResize()
 #if wxUSE_TOOLBAR
     PositionToolBar();
 #endif // wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR
     PositionToolBar();
 #endif // wxUSE_TOOLBAR

+
+#if wxUSE_STATUSBAR

     PositionStatusBar();
     PositionStatusBar();

+#endif // wxUSE_STATUSBAR
+

     return TRUE;
 }
 
     return TRUE;
 }
 


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

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

 {
     // TODO
 }
 {
     // TODO
 }


@@ -1107,14 +867,64 @@ void wxFrame::ChangeForegroundColour()
         DoChangeForegroundColour(GetClientWidget(), m_foregroundColour);
 }
 
         DoChangeForegroundColour(GetClientWidget(), m_foregroundColour);
 }
 

-void wxCloseFrameCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs)
+void wxCloseFrameCallback(Widget WXUNUSED(widget), XtPointer client_data, XmAnyCallbackStruct *WXUNUSED(cbs))

 {
     wxFrame *frame = (wxFrame *)client_data;
 {
     wxFrame *frame = (wxFrame *)client_data;

-    
+

     wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, frame->GetId());
     closeEvent.SetEventObject(frame);
     wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, frame->GetId());
     closeEvent.SetEventObject(frame);

-    
+

     // May delete the frame (with delayed deletion)
     frame->GetEventHandler()->ProcessEvent(closeEvent);
 }
 
     // May delete the frame (with delayed deletion)
     frame->GetEventHandler()->ProcessEvent(closeEvent);
 }
 

+static void wxFrameEventHandler(Widget    wid,
+                             XtPointer WXUNUSED(client_data),
+                             XEvent*   event,
+                             Boolean*  continueToDispatch)
+{
+    wxFrame *frame = (wxFrame *)wxGetWindowFromTable(wid);
+    if (frame)
+    {
+        wxMouseEvent wxevent(wxEVT_NULL);
+        if (wxTranslateMouseEvent(wxevent, frame, wid, event))
+        {
+            wxevent.SetEventObject(frame);
+            wxevent.SetId(frame->GetId());
+            frame->GetEventHandler()->ProcessEvent(wxevent);
+        }
+        else
+        {
+            // An attempt to implement OnCharHook by calling OnCharHook first;
+            // if this returns TRUE, set continueToDispatch to False
+            // (don't continue processing).
+            // Otherwise set it to True and call OnChar.
+            wxKeyEvent keyEvent(wxEVT_CHAR);
+            if (wxTranslateKeyEvent(keyEvent, frame, wid, event))
+            {
+                keyEvent.SetEventObject(frame);
+                keyEvent.SetId(frame->GetId());
+                keyEvent.SetEventType(wxEVT_CHAR_HOOK);
+                if (frame->GetEventHandler()->ProcessEvent(keyEvent))
+                {
+                    *continueToDispatch = False;
+                    return;
+                }
+                else
+                {
+                    // For simplicity, OnKeyDown is the same as OnChar
+                    // TODO: filter modifier key presses from OnChar
+                    keyEvent.SetEventType(wxEVT_KEY_DOWN);
+
+                    // Only process OnChar if OnKeyDown didn't swallow it
+                    if (!frame->GetEventHandler()->ProcessEvent (keyEvent))
+                    {
+                        keyEvent.SetEventType(wxEVT_CHAR);
+                        frame->GetEventHandler()->ProcessEvent(keyEvent);
+                    }
+                }
+            }
+        }
+    }
+    *continueToDispatch = True;
+}