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

Some Motif fixes; makefile fixes; added wxTransferStreamToFile/FileToStream for wxWin

Browse Source 
streams; fixed wxSP_... ids that clashed with wxTextCtrl; added generic GetPixel implementation for GTK/Motif


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-02-24 15:04:24 +00:00
parent 07eb77a690
commit dc1efb1d9f
35 changed files with 643 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/motif/frame.cpp
View File

@@ -71,6 +71,10 @@
// 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);
@@ -235,6 +239,12 @@ bool wxFrame::Create(wxWindow *parent,
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);
@@ -243,6 +253,7 @@ bool wxFrame::Create(wxWindow *parent,
XtManageChild((Widget) m_workArea);
wxAddWindowToTable((Widget) m_workArea, this);
wxAddWindowToTable((Widget) m_clientArea, this);
XtTranslations ptr;
@@ -332,8 +343,14 @@ 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);
@@ -854,3 +871,54 @@ void wxCloseFrameCallback(Widget WXUNUSED(widget), XtPointer client_data, XmAnyC
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;
}