X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=otk%2Fbutton.cc;h=8dea882e461c41b07405be9f6d4f868a27242882;hb=7efcff07ea463bd9ae1d374119540fb8dc508489;hp=f080c7699d24d5de5a90f0d113a72cc84de5b85e;hpb=d4d15160fe81353a9f7958c1feb1821abe179a70;p=chaz%2Fopenbox diff --git a/otk/button.cc b/otk/button.cc index f080c769..8dea882e 100644 --- a/otk/button.cc +++ b/otk/button.cc @@ -1,3 +1,9 @@ +// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- + +#ifdef HAVE_CONFIG_H +# include "../config.h" +#endif + #include "button.hh" namespace otk { @@ -14,8 +20,6 @@ OtkButton::OtkButton(OtkWidget *parent) OtkButton::~OtkButton() { - if (_pressed_focus_tx) delete _pressed_focus_tx; - if (_pressed_unfocus_tx) delete _pressed_unfocus_tx; } void OtkButton::press(unsigned int mouse_button) @@ -51,18 +55,18 @@ void OtkButton::setUnfocusTexture(BTexture *texture) _unpr_unfocus_tx = texture; } -int OtkButton::buttonPressHandler(const XButtonEvent &e) +void OtkButton::buttonPressHandler(const XButtonEvent &e) { press(e.button); update(); - return OtkFocusWidget::buttonPressHandler(e); + OtkFocusWidget::buttonPressHandler(e); } -int OtkButton::buttonReleaseHandler(const XButtonEvent &e) +void OtkButton::buttonReleaseHandler(const XButtonEvent &e) { release(e.button); update(); - return OtkFocusWidget::buttonReleaseHandler(e); + OtkFocusWidget::buttonReleaseHandler(e); } }