mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-20 12:58:08 +01:00
Remove NEWAPPICON #ifdefs
It wasn't defined anywhere and when I defined it, the compilation did not finish: appicon.c: In function drawCorner: appicon.c:206: error: WScreen has no member named focused_texture appicon.c:208: error: WScreen has no member named unfocused_texture appicon.c: At top level: appicon.c:214: error: conflicting types for drawCorner appicon.c:193: note: previous definition of drawCorner was here make[2]: *** [appicon.o] Fehler 1 make[1]: *** [all] Fehler 2 make: *** [all-recursive] Fehler 1 So let's simply remove those #ifdefs.
This commit is contained in:
@@ -136,15 +136,10 @@ void wSetFocusTo(WScreen * scr, WWindow * wwin)
|
||||
|
||||
if (wwin == NULL) {
|
||||
XSetInputFocus(dpy, scr->no_focus_win, RevertToParent, CurrentTime);
|
||||
if (old_focused) {
|
||||
if (old_focused)
|
||||
wWindowUnfocus(old_focused);
|
||||
}
|
||||
if (oapp) {
|
||||
if (oapp)
|
||||
wAppMenuUnmap(oapp->menu);
|
||||
#ifdef NEWAPPICON
|
||||
wApplicationDeactivate(oapp);
|
||||
#endif
|
||||
}
|
||||
|
||||
WMPostNotificationName(WMNChangedFocus, NULL, (void *)True);
|
||||
return;
|
||||
@@ -205,12 +200,8 @@ void wSetFocusTo(WScreen * scr, WWindow * wwin)
|
||||
wwin->next = NULL;
|
||||
scr->focused_window = wwin;
|
||||
|
||||
if (oapp && oapp != napp) {
|
||||
if (oapp && oapp != napp)
|
||||
wAppMenuUnmap(oapp->menu);
|
||||
#ifdef NEWAPPICON
|
||||
wApplicationDeactivate(oapp);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
wWindowFocus(wwin, focused);
|
||||
@@ -222,9 +213,6 @@ void wSetFocusTo(WScreen * scr, WWindow * wwin)
|
||||
|
||||
if (wwin->flags.mapped)
|
||||
wAppMenuMap(napp->menu, wwin);
|
||||
#ifdef NEWAPPICON
|
||||
wApplicationActivate(napp);
|
||||
#endif
|
||||
}
|
||||
|
||||
XFlush(dpy);
|
||||
|
||||
Reference in New Issue
Block a user