summaryrefslogtreecommitdiff
path: root/src/dialog.cpp
diff options
context:
space:
mode:
authorIan C <ianc@noddybox.co.uk>2005-03-28 01:42:58 +0000
committerIan C <ianc@noddybox.co.uk>2005-03-28 01:42:58 +0000
commit82f1d860690dc0a2d0210db12344f7ea5e88b6a4 (patch)
tree517481a81e64cc70b5187ce6eeb20d8fa326fa54 /src/dialog.cpp
parent4f54380eb1f7574bf9cc147cb8870508da09e10c (diff)
Added ComboBox. Also improved callback filtering and made controls auto register themselves.
Diffstat (limited to 'src/dialog.cpp')
-rw-r--r--src/dialog.cpp21
1 files changed, 17 insertions, 4 deletions
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;