Changeset 106 for abuse/trunk/src/imlib/tools.cppTweet

Timestamp:

Mar 15, 2008, 12:55:44 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Rename the "eh" variable to "wm" because it's a window manager, not an event handler.
• No longer pass the window manager to functions, there's only one.

Inspired by Win32 Abuse changelog for January 28, 2001:

• Starting work on singleton code; will get rid of all

references to an arbitrary window_manager* because
there's only going to be one, and it's not ever
going to change.

File:

• abuse/trunk/src/imlib/tools.cpp (modified) (4 diffs)

abuse/trunk/src/imlib/tools.cpp

@@ -21 +21 @@
 }
 
-void tool_picker::remap(palette *pal, window_manager *wm, image *screen)
+void tool_picker::remap(palette *pal, image *screen)
 {
   delete map;
   map=new filter(old_pal,pal);
-  draw_first(screen,wm);
+  draw_first(screen);
 }
 
 tool_picker::tool_picker(int X, int Y, int ID, 
               int show_h, visual_object **Icons, int *Ids, int total_ic, 
-                         palette *icon_palette, palette *pal, window_manager *wm, ifield *Next) :
+                         palette *icon_palette, palette *pal, ifield *Next) :
   spicker(X,Y,ID,show_h,1,1,0,Next)
 {
@@ -39 +39 @@
   for (int i=0;i<total_ic;i++)
   {
-    if (icons[i]->width(wm)>iw) iw=icons[i]->width(wm);
-    if (icons[i]->height(wm)>ih) ih=icons[i]->height(wm);
+    if (icons[i]->width()>iw) iw=icons[i]->width();
+    if (icons[i]->height()>ih) ih=icons[i]->height();
   }
   map=new filter(icon_palette,pal);
@@ -47 +47 @@
 }
 
-void tool_picker::draw_item(window_manager *wm, image *screen, int x, int y, int num, int active)
+void tool_picker::draw_item(image *screen, int x, int y, int num, int active)
 {
   if (!active)
@@ -53 +53 @@
   else
     screen->bar(x,y,x+iw-1,y+ih-1,wm->bright_color());
-  icons[num]->draw(screen,x,y,wm,map);
+  icons[num]->draw(screen,x,y,map);
 }