← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/flwm/intrepid

« back to all changes in this revision

Viewing changes to debian/patches/202_background_color_2.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Bill Allombert
  • Date: 2006-06-10 22:14:18 UTC
  • Revision ID: james.westby@ubuntu.com-20060610221418-w428q939ifc1g1qx
Tags: 1.00-10
http://bugs.debian.org/358337
* Add patch 104_g++-4.1_warning that fix five warnings.
* Add patch 105_double_ampersand that fix handling of '&' in window titles
  in the windows list.  Closes: #358337. Thanks Silas S. Brown.
* Rediff Debian patches to compensate.
* Bump Standards-Version to 3.7.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/202_background_color_2.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 203_background_color.dpatch by  <ballombe@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: fix the -fg -bg, -bg2 options.
 
6
 
 
7
@DPATCH@
 
8
diff -urNad flwm-1.00~/Menu.C flwm-1.00/Menu.C
 
9
--- flwm-1.00~/Menu.C   2006-02-23 21:32:53.000000000 +0100
 
10
+++ flwm-1.00/Menu.C    2006-02-23 21:36:32.000000000 +0100
 
11
@@ -172,10 +172,14 @@
 
12
     new_desktop_input = new Fl_Input(10,30,170,25,"New desktop name:");
 
13
     new_desktop_input->align(FL_ALIGN_TOP_LEFT);
 
14
     new_desktop_input->labelfont(FL_BOLD);
 
15
+    new_desktop_input->labelcolor(FL_FOREGROUND_COLOR);
 
16
+      
 
17
     Fl_Return_Button* b = new Fl_Return_Button(100,60,80,20,"OK");
 
18
     b->callback(new_desktop_ok_cb);
 
19
+    b->labelcolor(FL_FOREGROUND_COLOR);
 
20
     Fl_Button* b2 = new Fl_Button(10,60,80,20,"Cancel");
 
21
     b2->callback(cancel_cb);
 
22
+    b2->labelcolor(FL_FOREGROUND_COLOR);
 
23
     w->set_non_modal();
 
24
     w->end();
 
25
   }
 
26
@@ -217,10 +221,13 @@
 
27
     w = new FrameWindow(190,90);
 
28
     Fl_Box* l = new Fl_Box(0, 0, 190, 60, "Really log out?");
 
29
     l->labelfont(FL_BOLD);
 
30
+    l->labelcolor(FL_FOREGROUND_COLOR);
 
31
     Fl_Return_Button* b = new Fl_Return_Button(100,60,80,20,"OK");
 
32
     b->callback(exit_cb);
 
33
+    b->labelcolor(FL_FOREGROUND_COLOR);
 
34
     Fl_Button* b2 = new Fl_Button(10,60,80,20,"Cancel");
 
35
     b2->callback(cancel_cb);
 
36
+    b2->labelcolor(FL_FOREGROUND_COLOR);
 
37
     w->set_non_modal();
 
38
     w->end();
 
39
   }
 
40
@@ -280,10 +287,10 @@
 
41
   m.label(data);
 
42
   m.flags = 0;
 
43
   m.labeltype(FL_NORMAL_LABEL);
 
44
+  m.labelcolor(FL_FOREGROUND_COLOR);
 
45
   m.shortcut(0);
 
46
   m.labelfont(MENU_FONT_SLOT);
 
47
   m.labelsize(MENU_FONT_SIZE);
 
48
-  m.labelcolor(FL_FOREGROUND_COLOR);
 
49
 }
 
50
 
 
51
 #if WMX_MENU_ITEMS
 
52
@@ -513,6 +520,7 @@
 
53
       if (c->state() == UNMAPPED || c->transient_for()) continue;
 
54
       init(menu[n],(char*)c);
 
55
       menu[n].labeltype(FRAME_LABEL);
 
56
+      menu[n].labelcolor(FL_FOREGROUND_COLOR);
 
57
       menu[n].callback(frame_callback, c);
 
58
       if (is_active_frame(c)) preset = menu+n;
 
59
       n++;
 
60
@@ -542,6 +550,7 @@
 
61
        if (c->desktop() == d || !c->desktop() && d == Desktop::current()) {
 
62
          init(menu[n],(char*)c);
 
63
          menu[n].labeltype(FRAME_LABEL);
 
64
+         menu[n].labelcolor(FL_FOREGROUND_COLOR);
 
65
          menu[n].callback(d == Desktop::current() ?
 
66
                           frame_callback : move_frame_callback, c);
 
67
          if (d == Desktop::current() && is_active_frame(c)) preset = menu+n;
 
68
@@ -589,7 +598,10 @@
 
69
       if (one_desktop)
 
70
 #endif
 
71
        if (!level)
 
72
+        {
 
73
          menu[n].labeltype(TEXT_LABEL);
 
74
+         menu[n].labelcolor(FL_FOREGROUND_COLOR);
 
75
+        }
 
76
 
 
77
       int      nextlev = (i==num_wmx-1)?0:strspn(wmxlist[i+1], "/")-1;
 
78
       if (nextlev < level) {
 
79
@@ -621,8 +633,11 @@
 
80
   if (one_desktop)
 
81
 #endif
 
82
     // fix the menus items so they are indented to align with window names:
 
83
-    while (menu[n].label()) menu[n++].labeltype(TEXT_LABEL);
 
84
-
 
85
+    while (menu[n].label()) 
 
86
+    {
 
87
+      menu[n].labelcolor(FL_FOREGROUND_COLOR);
 
88
+      menu[n++].labeltype(TEXT_LABEL);
 
89
+    }
 
90
   const Fl_Menu_Item* picked =
 
91
     menu->popup(Fl::event_x(), Fl::event_y(), 0, preset);
 
92
   if (picked && picked->callback()) picked->do_callback(0);