* BUG: Fix event handling when a window has only invisible top-level menus.
* BUG: Fix a possible crash in TrayIcon mouse wheel event handling.


git-svn-id: svn://localhost/gambas/trunk@5247 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-10-22 13:51:39 +00:00
parent 53c284099b
commit b029b7d560
2 changed files with 2 additions and 3 deletions

View file

@ -1223,7 +1223,7 @@ int gMainWindow::clientY()
{ {
GtkRequisition req; GtkRequisition req;
if (menuBar && GTK_WIDGET_VISIBLE(GTK_WIDGET(menuBar))) if (isMenuBarVisible()) //menuBar && GTK_WIDGET_VISIBLE(GTK_WIDGET(menuBar)))
{ {
gtk_widget_size_request(GTK_WIDGET(menuBar), &req); gtk_widget_size_request(GTK_WIDGET(menuBar), &req);
return req.height; return req.height;

View file

@ -267,15 +267,14 @@ gPicture *gTrayIcon::_default_icon = NULL;
gTrayIcon::gTrayIcon() gTrayIcon::gTrayIcon()
{ {
plug = NULL; plug = NULL;
//icon = NULL;
buftext = NULL; buftext = NULL;
_icon = NULL; _icon = NULL;
_style = NULL; _style = NULL;
_loopLevel = 0; _loopLevel = 0;
//onHide=false;
onMousePress=NULL; onMousePress=NULL;
onMouseRelease=NULL; onMouseRelease=NULL;
onMouseWheel = NULL;
onMenu=NULL; onMenu=NULL;
onFocusEnter=NULL; onFocusEnter=NULL;
onFocusLeave=NULL; onFocusLeave=NULL;