diff --git a/gb.gtk/src/gmainwindow.cpp b/gb.gtk/src/gmainwindow.cpp index 227389b04..648c4afd2 100644 --- a/gb.gtk/src/gmainwindow.cpp +++ b/gb.gtk/src/gmainwindow.cpp @@ -1223,7 +1223,7 @@ int gMainWindow::clientY() { 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); return req.height; diff --git a/gb.gtk/src/gtrayicon.cpp b/gb.gtk/src/gtrayicon.cpp index e36b1daeb..4580a03fa 100644 --- a/gb.gtk/src/gtrayicon.cpp +++ b/gb.gtk/src/gtrayicon.cpp @@ -267,15 +267,14 @@ gPicture *gTrayIcon::_default_icon = NULL; gTrayIcon::gTrayIcon() { plug = NULL; - //icon = NULL; buftext = NULL; _icon = NULL; _style = NULL; _loopLevel = 0; - //onHide=false; onMousePress=NULL; onMouseRelease=NULL; + onMouseWheel = NULL; onMenu=NULL; onFocusEnter=NULL; onFocusLeave=NULL;