From 82f1d860690dc0a2d0210db12344f7ea5e88b6a4 Mon Sep 17 00:00:00 2001 From: Ian C Date: Mon, 28 Mar 2005 01:42:58 +0000 Subject: Added ComboBox. Also improved callback filtering and made controls auto register themselves. --- src/dialog.cpp | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'src/dialog.cpp') diff --git a/src/dialog.cpp b/src/dialog.cpp index 96d80f9..512dbdd 100644 --- a/src/dialog.cpp +++ b/src/dialog.cpp @@ -108,7 +108,10 @@ BOOL Dialog::InstanceProc(HWND wnd, UINT msg, WPARAM wp, LPARAM lp) for(ControlSet::iterator i=m_cset.begin();i!=m_cset.end();++i) { - W32DEBUGOUT(MsgName(msg) << " for resource " << lo); + W32DEBUGOUT(MsgName(msg) << " (" << msg << + ", " << wp << ", " << lp << ")" << + " for resource " << (*i)->ResourceID()); + (*i)->ProcessMessage(msg,wp,lp); } @@ -124,17 +127,27 @@ BOOL Dialog::InstanceProc(HWND wnd, UINT msg, WPARAM wp, LPARAM lp) ret=Window::InstanceProc(wnd,msg,wp,lp); break; - default: + // Messages passed onto controls + // + case WM_COMMAND: + // Check for windows and resources in the wp + // for(ControlSet::iterator i=m_cset.begin();i!=m_cset.end();++i) { - if (lo==(*i)->ResourceID()) + if (lo==(*i)->ResourceID()) { - W32DEBUGOUT(MsgName(msg) << " for resource " << lo); + W32DEBUGOUT(MsgName(msg) << " (" << msg << + ", " << wp << ", " << lp << ")" << + " for resource " << (*i)->ResourceID()); + ret=(*i)->ProcessMessage(msg,wp,lp); break; } } break; + + default: + break; } return ret; -- cgit v1.2.3