Archive/flwm
1
0
Fork 0
mirror of https://git.code.sf.net/p/flwm/flwm synced 2025-12-12 07:16:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed compilation warnings from modern systems

Browse Source
This commit is contained in:
Bill Spitzak
2014-11-24 16:29:11 -08:00
parent d7543b20a1
commit 7c3b8d7ed0
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Frame.C
View File

@ -1,5 +1,6 @@
// Frame.C
#define FL_INTERNALS 1
#include "config.h"
#include "Frame.H"
#include "Desktop.H"
@ -915,7 +916,7 @@ void Frame::raise() {
// preserving stacking order:
for (p = &first; *p;) {
Frame* f = *p;
if (f == this || f->is_transient_for(this) && f->state() != UNMAPPED) {
if (f == this || (f->is_transient_for(this) && f->state() != UNMAPPED)) {
*p = f->next; // remove it from list
if (previous) {
XWindowChanges w;
@ -970,7 +971,7 @@ void Frame::lower() {
void Frame::iconize() {
for (Frame* c = first; c; c = c->next) {
if (c == this || c->is_transient_for(this) && c->state() != UNMAPPED)
if (c == this || (c->is_transient_for(this) && c->state() != UNMAPPED))
c->state(ICONIC);
}
}
@ -1163,7 +1164,7 @@ void Frame::show_hide_buttons() {
#endif
}
if (min_h == max_h || flag(KEEP_ASPECT|NO_RESIZE) ||
!max_h_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM) {
(!max_h_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM)) {
max_h_button.hide();
} else {
max_h_button.position(BUTTON_LEFT,by);
@ -1171,7 +1172,7 @@ void Frame::show_hide_buttons() {
by += BUTTON_H;
}
if (min_w == max_w || flag(KEEP_ASPECT|NO_RESIZE) ||
!max_w_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM) {
(!max_w_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM)) {
max_w_button.hide();
} else {
max_w_button.position(BUTTON_LEFT,by);
@ -1646,8 +1647,8 @@ int Frame::handle(int e) {
nh = iy+ih-(Fl::event_y_root()-dy);
else {ny = y(); nh = h();}
if (flag(KEEP_ASPECT)) {
if (nw-dwidth > nh-dwidth
&& (what&(FL_ALIGN_LEFT|FL_ALIGN_RIGHT))
if ((nw-dwidth > nh-dwidth
&& (what&(FL_ALIGN_LEFT|FL_ALIGN_RIGHT)))
|| !(what&(FL_ALIGN_TOP|FL_ALIGN_BOTTOM)))
nh = nw-dwidth+dheight;
else