now stable make

fixed dos endings fixed compilation errors
oktonion · Jul 4, 2017 · 49fed46 · 49fed46
1 parent 6e73738
commit 49fed46
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/Basic.cpp b/src/Basic.cpp
@@ -119,35 +119,35 @@ void PhWidgets::Basic::addRepeatCallback(Widget::callback_t callback)
 
 void PhWidgets::Basic::OnActivated(PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::activate].get(), data, info);
+	onEvent(resource.callback[Callback::activate].get(), info);
 }
 
 void PhWidgets::Basic::OnArmed(PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::arm].get(), data, info);
+	onEvent(resource.callback[Callback::arm].get(), info);
 }
 
 void PhWidgets::Basic::OnDisarmed(PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::disarm].get(), data, info);
+	onEvent(resource.callback[Callback::disarm].get(), info);
 }
 
 void PhWidgets::Basic::OnGotFocused(PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::got_focus].get(), data, info);
+	onEvent(resource.callback[Callback::got_focus].get(), info);
 }
 
 void PhWidgets::Basic::OnLostFocus(PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::lost_focus].get(), data, info);
+	onEvent(resource.callback[Callback::lost_focus].get(), info);
 }
 
 void PhWidgets::Basic::OnMenu(PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::menu].get(), data, info);
+	onEvent(resource.callback[Callback::menu].get(), info);
 }
 
 void PhWidgets::Basic::OnRepeat(PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::repeat].get(), data, info);
+	onEvent(resource.callback[Callback::repeat].get(), info);
 }
diff --git a/src/Widget.cpp b/src/Widget.cpp
@@ -266,7 +266,7 @@ Widget::operator const PtWidget_t*() const
 	return widget();
 }
 
-void Widget::onEvent(const PtCallbackList_t *cl, PtCallbackInfo_t * info)
+void Widget::onEvent(PtCallbackList_t *cl, PtCallbackInfo_t * info)
 {
 
 	if (nullptr == cl)
@@ -279,32 +279,32 @@ void Widget::onEvent(const PtCallbackList_t *cl, PtCallbackInfo_t * info)
 
 void Widget::OnDestroyed( PtCallbackInfo_t * info)
 {
-	onEvent( resource.callback[Callback::destroyed].get(), data, info);
+	onEvent( resource.callback[Callback::destroyed].get(), info);
 }
 
 void PhWidgets::Widget::OnBlocked( PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::blocked].get(), data, info);
+	onEvent(resource.callback[Callback::blocked].get(), info);
 }
 
 void PhWidgets::Widget::OnDragDrop( PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::dnd].get(), data, info);
+	onEvent(resource.callback[Callback::dnd].get(), info);
 }
 
 void PhWidgets::Widget::OnOutbound( PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::outbound].get(), data, info);
+	onEvent(resource.callback[Callback::outbound].get(), info);
 }
 
 void PhWidgets::Widget::OnRealized( PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::realized].get(), data, info);
+	onEvent(resource.callback[Callback::realized].get(), info);
 }
 
 void PhWidgets::Widget::OnUnrealized( PtCallbackInfo_t * info)
 {
-	onEvent(resource.callback[Callback::unrealized].get(), data, info);
+	onEvent(resource.callback[Callback::unrealized].get(), info);
 }
 
 //for properties:

diff --git a/src/Widget.h b/src/Widget.h
@@ -775,7 +775,7 @@ namespace PhWidgets
 		void addRealizedCallback(callback_t callback);
 		void addUnrealizedCallback(callback_t callback);
 
-		void onEvent(const PtCallbackList_t *cl, PtCallbackInfo_t * info);
+		void onEvent(PtCallbackList_t *cl, PtCallbackInfo_t * info);
 
 	public:
 
@@ -979,7 +979,7 @@ namespace detail
 			addLink(callback, data);\
 		}\
 \
-		inline const PtCallbackList_t* get()\
+		inline PtCallbackList_t* get()\
 		{\
 			return getLink();\
 		}\
@@ -1014,7 +1014,7 @@ namespace detail
 			addLink(callback, event, data);\
 		}\
 \
-		inline const PtCallbackList_t* get()\
+		inline PtCallbackList_t* get()\
 		{\
 			return getLink();\
 		}\
@@ -1044,7 +1044,7 @@ namespace detail
 			addLink(callback, hotkey, keymode);\
 		}\
 \
-		inline const PtCallbackList_t* get()\
+		inline PtCallbackList_t* get()\
 		{\
 			return getLink();\
 		}\