comparison: ui/wpf/UIwrapper/UIwrapper/toolkit.cpp
ui/wpf/UIwrapper/UIwrapper/toolkit.cpp
- changeset 82
- 0cdb8089a29f
- parent 81
- 5eb765a7a793
- child 83
- a38aec91bd66
equal
deleted
inserted
replaced
| 81:5eb765a7a793 | 82:0cdb8089a29f |
|---|---|
| 21 return object; | 21 return object; |
| 22 } | 22 } |
| 23 | 23 |
| 24 // EventWrapper | 24 // EventWrapper |
| 25 | 25 |
| 26 EventWrapper::EventWrapper(UIcallback callback, void *userdata) { | 26 EventWrapper::EventWrapper(UIcallback callback, void *eventdata) { |
| 27 this->callback = callback; | 27 this->callback = callback; |
| 28 this->userdata = userdata; | 28 this->userdata = eventdata; |
| 29 action = gcnew Action(this, &EventWrapper::Callback); | 29 action = gcnew Action<IntPtr>(this, &EventWrapper::Callback); |
| 30 } | 30 } |
| 31 | 31 |
| 32 Action^ EventWrapper::GetAction() { | 32 Action<IntPtr>^ EventWrapper::GetAction() { |
| 33 return action; | 33 return action; |
| 34 } | 34 } |
| 35 | 35 |
| 36 void EventWrapper::Callback() { | 36 void EventWrapper::Callback(IntPtr uiobj) { |
| 37 callback(NULL, NULL); | 37 if (callback) { |
| 38 callback(uiobj.ToPointer(), userdata); | |
| 39 } | |
| 38 } | 40 } |
| 39 | 41 |
| 40 UI_EXPORT void __stdcall UIinit(char *appname) { | 42 UI_EXPORT void __stdcall UIinit(char *appname) { |
| 41 UI::Application ^app = UI::Application::GetInstance(); | 43 UI::Application ^app = UI::Application::GetInstance(); |
| 42 app->Name = gcnew String(appname); | 44 app->Name = gcnew String(appname); |
