Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More Motif additions: mdi and sashtest samples now just about work!

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-10-19 21:51:15 +00:00
parent 68dda78574
commit 8704bf74fb
45 changed files with 13490 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/motif/frame.cpp
View File

@@ -51,7 +51,7 @@
#include "wx/motif/private.h"
void wxCloseFrameCallback(Widget, XtPointer, XmAnyCallbackStruct *cbs);
static void wxFrameFocusProc(Widget workArea, XtPointer clientData,
void wxFrameFocusProc(Widget workArea, XtPointer clientData,
XmAnyCallbackStruct *cbs);
static void wxFrameMapProc(Widget frameShell, XtPointer clientData,
XCrossingEvent * event);
@@ -310,14 +310,21 @@ wxFrame::~wxFrame()
XtDestroyWidget (statusLineWidget);
*/
wxDeleteWindowFromTable((Widget) m_workArea);
if (m_workArea)
{
wxDeleteWindowFromTable((Widget) m_workArea);
XtDestroyWidget ((Widget) m_workArea);
XtDestroyWidget ((Widget) m_frameWidget);
XtDestroyWidget ((Widget) m_workArea);
}
wxDeleteWindowFromTable((Widget) m_frameWidget);
if (m_frameWidget)
{
wxDeleteWindowFromTable((Widget) m_frameWidget);
XtDestroyWidget ((Widget) m_frameWidget);
}
XtDestroyWidget ((Widget) m_frameShell);
if (m_frameShell)
XtDestroyWidget ((Widget) m_frameShell);
SetMainWidget((WXWidget) NULL);
@@ -982,7 +989,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
wxToolBar *wxFrame::GetToolBar() const
{ return m_frameToolBar; }
static void wxFrameFocusProc(Widget workArea, XtPointer clientData,
void wxFrameFocusProc(Widget workArea, XtPointer clientData,
XmAnyCallbackStruct *cbs)
{
wxFrame *frame = (wxFrame *)clientData;