form text element widgets now subclassed so they can activate their window in response to a WM_MOUSEACTIVATE message. bug 126974 r:blythe a:don

This commit is contained in:
danm 1998-07-08 16:28:16 +00:00
parent 07d5ac2f15
commit fe6c78261b
2 changed files with 42 additions and 4 deletions

View File

@ -21,16 +21,17 @@
#include "fmtext.h"
#include "odctrl.h"
#include "intl_csi.h"
// This file is dedicated to form type select one elements
// otherwise known as list boxes on windows and
// their implementation as requried by the XP layout
// library.
// This file is dedicated to form type text edit boxes on windows and
// their implementation as required by the XP layout library.
static const char gWndProcProperty[] = "CFormTextWndProc";
// Construction simply clears all members.
CFormText::CFormText()
{
// No widget yet.
m_pWidget = NULL;
mRealWndProc = 0;
}
// Destruction cleans out all members.
@ -169,6 +170,10 @@ void CFormText::DestroyWidget()
{
// Get rid of the widget if around.
if(m_pWidget) {
RemoveProp(m_pWidget->m_hWnd, gWndProcProperty);
if (mRealWndProc)
SetWindowLong(m_pWidget->m_hWnd, GWL_WNDPROC,
(LONG)mRealWndProc);
m_pWidget->DestroyWindow();
delete m_pWidget;
m_pWidget = NULL;
@ -247,6 +252,10 @@ void CFormText::CreateWidget()
return;
}
SetProp(m_pWidget->m_hWnd, gWndProcProperty, this);
mRealWndProc = (WNDPROC)SetWindowLong(m_pWidget->m_hWnd,
GWL_WNDPROC, (LONG)TempWndProc);
// Next, need to size the widget.
// Obtain a font.
// Measure some text.
@ -515,3 +524,26 @@ HWND CFormText::GetRaw()
{
return(m_pWidget ? m_pWidget->m_hWnd : NULL);
}
LRESULT CALLBACK EXPORT CFormText::TempWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam) {
LRESULT ret;
CFormText *thisObj = (CFormText *)GetProp(hWnd, gWndProcProperty);
ASSERT(thisObj);
if (!thisObj)
return 0;
/* Standard processing is fine, except for mouseactivate messages. We explicitly
activate the window if the standard windproc seems to think we should. A
doubleclick in an inactive window running under NT 4.0 will otherwise cause
the window to lose focus (and textedit fields in forms seem to be inactive
unless we take this step.)
*/
ret = CallWindowProc(thisObj->mRealWndProc, hWnd, message, wParam, lParam);
if (message == WM_MOUSEACTIVATE && (ret == MA_ACTIVATE || ret == MA_ACTIVATEANDEAT))
CallWindowProc(thisObj->mRealWndProc, hWnd, WM_ACTIVATE, WA_ACTIVE, NULL);
return ret;
}

View File

@ -82,6 +82,12 @@ public:
// The edit field.
private:
CODNetscapeEdit *m_pWidget;
// a windproc for taking extra control of the associated widget
public:
static LRESULT CALLBACK EXPORT TempWndProc(HWND,UINT,WPARAM,LPARAM);
private:
WNDPROC mRealWndProc;
};
#endif // __FORM_TEXT_H