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

wxMotif fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-10-14 17:27:59 +00:00
parent 833a51f67e
commit ecb9c007bd
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/cshelp.cpp
View File

@@ -91,21 +91,21 @@ wxContextHelp::~wxContextHelp()
// Not currently needed, but on some systems capture may not work as // Not currently needed, but on some systems capture may not work as
// expected so we'll leave it here for now. // expected so we'll leave it here for now.
#if 0 #ifdef __WXMOTIF__
static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push) static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push)
{ {
if (push) if (push)
win->PushEventHandler(new wxContextHelpEvtHandler(help)); win->PushEventHandler(new wxContextHelpEvtHandler(help));
else else
win->PopEventHandler(); win->PopEventHandler(TRUE);
wxNode* node = win->GetChildren().First(); wxWindowList::Node* node = win->GetChildren().GetFirst();
while (node) while (node)
{ {
wxWindow* child = (wxWindow*) node->Data(); wxWindow* child = node->GetData();
wxPushOrPopEventHandlers(help, child, push); wxPushOrPopEventHandlers(help, child, push);
node = node->Next(); node = node->GetNext();
} }
} }
#endif #endif
@@ -128,8 +128,11 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
m_status = FALSE; m_status = FALSE;
#ifdef __WXMOTIF__
wxPushOrPopEventHandlers(this, win, TRUE);
#else
win->PushEventHandler(new wxContextHelpEvtHandler(this)); win->PushEventHandler(new wxContextHelpEvtHandler(this));
//wxPushOrPopEventHandlers(this, win, TRUE); #endif
win->CaptureMouse(); win->CaptureMouse();
@@ -137,8 +140,11 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
win->ReleaseMouse(); win->ReleaseMouse();
#ifdef __WXMOTIF__
wxPushOrPopEventHandlers(this, win, FALSE);
#else
win->PopEventHandler(TRUE); win->PopEventHandler(TRUE);
//wxPushOrPopEventHandlers(this, win, FALSE); #endif
win->SetCursor(oldCursor); win->SetCursor(oldCursor);
@@ -146,14 +152,14 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
{ {
wxPoint pt; wxPoint pt;
wxWindow* winAtPtr = wxFindWindowAtPointer(pt); wxWindow* winAtPtr = wxFindWindowAtPointer(pt);
/*
#if 0
if (winAtPtr) if (winAtPtr)
{ {
wxString msg; printf("Picked %s (%d)\n", winAtPtr->GetName().c_str(),
msg.Printf("Picked %s (%d)", (const char*) winAtPtr->GetName(), winAtPtr->GetId()); winAtPtr->GetId());
cout << msg << '\n';
} }
*/ #endif
if (winAtPtr) if (winAtPtr)
DispatchEvent(winAtPtr, pt); DispatchEvent(winAtPtr, pt);