DPF

commit bb05e224bf668bf8f51f3bdcf5928ff3f1c2c89b
parent c3e5d5199960157377736dce3b5e2cac61804d11
Author: falkTX <falktx@gmail.com>
Date:   Tue,  1 Mar 2016 17:17:26 +0100

Fix build without blendish stuff

Diffstat:
M
dgl/Makefile
 | 
4
----
M
dgl/src/Common.hpp
 | 
13
++++---------
M
dgl/src/ImageWidgets.cpp
 | 
2
+-

3 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/dgl/Makefile b/dgl/Makefile
@@ -12,9 +12,6 @@ BUILD_C_FLAGS   += $(DGL_FLAGS) -I. -Isrc
 BUILD_CXX_FLAGS += $(DGL_FLAGS) -I. -Isrc
 LINK_FLAGS      += $(DGL_LIBS)
 
-# needed by oui-blendish
-BUILD_CXX_FLAGS += -Wno-unused-parameter
-
 # --------------------------------------------------------------
 
 OBJS = \
@@ -24,7 +21,6 @@ OBJS = \
 	src/Image.cpp.o \
 	src/ImageWidgets.cpp.o \
 	src/NanoVG.cpp.o \
-	src/NanoWidgets.cpp.o \
 	src/Resources.cpp.o \
 	src/Widget.cpp.o
 
diff --git a/dgl/src/Common.hpp b/dgl/src/Common.hpp
@@ -18,7 +18,6 @@
 #define DGL_COMMON_HPP_INCLUDED
 
 #include "../ImageWidgets.hpp"
-#include "../NanoWidgets.hpp"
 
 START_NAMESPACE_DGL
 
@@ -35,15 +34,13 @@ struct ButtonImpl {
     int state;
     Widget* self;
 
-    BlendishButton::Callback* callback_b;
-    ImageButton::Callback* callback_i;
+    ImageButton::Callback* callback_img;
 
     ButtonImpl(Widget* const s) noexcept
         : button(-1),
           state(kStateNormal),
           self(s),
-          callback_b(nullptr),
-          callback_i(nullptr) {}
+          callback_img(nullptr) {}
 
     bool onMouse(const Widget::MouseEvent& ev)
     {
@@ -68,10 +65,8 @@ struct ButtonImpl {
             state = kStateHover;
             self->repaint();
 
-            if (callback_b != nullptr)
-                callback_b->blendishButtonClicked((BlendishButton*)self, button2);
-            if (callback_i != nullptr)
-                callback_i->imageButtonClicked((ImageButton*)self, button2);
+            if (callback_img != nullptr)
+                callback_img->imageButtonClicked((ImageButton*)self, button2);
 
             return true;
         }
diff --git a/dgl/src/ImageWidgets.cpp b/dgl/src/ImageWidgets.cpp
@@ -159,7 +159,7 @@ ImageButton::~ImageButton()
 
 void ImageButton::setCallback(Callback* callback) noexcept
 {
-    pData->impl.callback_i = callback;
+    pData->impl.callback_img = callback;
 }
 
 void ImageButton::onDisplay()