nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed bad pointer check

Browse source
This commit is contained in:
fluxgen 2003-01-10 02:16:29 +00:00
parent 44ffacb0df
commit 6072177888
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/FbTk/Button.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Button.cc,v 1.3 2002/12/25 11:27:29 fluxgen Exp $ // $Id: Button.cc,v 1.4 2003/01/10 02:16:29 fluxgen Exp $
#include "Button.hh" #include "Button.hh"
@ -57,11 +57,11 @@ Button::~Button() {
} }
void Button::setOnClick(RefCount<Command> &cmd, int button) { void Button::setOnClick(RefCount<Command> &cmd, int button) {
// we only handle buttons 1 to 5 // we only handle buttons 1 to 5
if (button > 5 || button == 0) if (button > 5 || button == 0)
return; return;
//set on click command for the button //set on click command for the button
m_onclick[button - 1] = cmd; m_onclick[button - 1] = cmd;
} }
void Button::move(int x, int y) { void Button::move(int x, int y) {
@ -124,7 +124,7 @@ void Button::buttonReleaseEvent(XButtonEvent &event) {
if (m_gc == 0) // get default gc if (m_gc == 0) // get default gc
m_gc = DefaultGC(disp, m_win.screenNumber()); m_gc = DefaultGC(disp, m_win.screenNumber());
XCopyArea(disp, m_foreground_pm, m_win.window(), m_gc, 0, 0, width(), height(), 0, 0); XCopyArea(disp, m_foreground_pm, m_win.window(), m_gc, 0, 0, width(), height(), 0, 0);
} }
@ -132,8 +132,9 @@ void Button::buttonReleaseEvent(XButtonEvent &event) {
event.x > width() || event.y > height()) event.x > width() || event.y > height())
return; return;
if (event.button > 0 && event.button <= 5) if (event.button > 0 && event.button <= 5 &&
m_onclick[event.button - 1]->execute(); m_onclick[event.button -1].get() != 0)
m_onclick[event.button - 1]->execute();
} }