Changeset 659 for abuse/trunk/src/imlib/jwindow.hTweet

Timestamp:

May 15, 2011, 6:22:25 AM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: rename Jwindow's x and y members to m_pos.

File:

• abuse/trunk/src/imlib/jwindow.h (modified) (4 diffs)

abuse/trunk/src/imlib/jwindow.h

@@ -61 +61 @@
     friend class InputManager;
 
-protected:
-    Jwindow *owner;
-
 public :
     ifield();
-    int x, y;
+    virtual ~ifield();
 
-    int id;
-    ifield *next;
     virtual void set_owner(Jwindow *owner);
-    virtual void move(int newx, int newy) { x = newx; y = newy; }
+    virtual void Move(vec2i pos) { m_pos = pos; }
     virtual void area(int &x1, int &y1, int &x2, int &y2) = 0;
     virtual void draw_first(image *screen) = 0;
@@ -81 +76 @@
     virtual ifield *find(int search_id) { if (id==search_id) return this; else return NULL; }
     virtual ifield *unlink(int id) { (void)id; return NULL; }
-    virtual ~ifield();
-} ;
+
+    vec2i m_pos;
+    int id;
+    ifield *next;
+
+protected:
+    Jwindow *owner;
+};
 
 class Jwindow
@@ -90 +91 @@
 public:
     Jwindow *next;
-    int x, y, l, h, backg;
+    int l, h, backg;
     InputManager *inm;
     void *local_info;  // pointer to info block for local system (may support windows)
 
     Jwindow(char const *name = NULL);
-    Jwindow(int X, int Y, int L, int H, ifield *f, char const *name = NULL);
+    Jwindow(vec2i pos, int L, int H, ifield *f, char const *name = NULL);
     ~Jwindow();
 
@@ -122 +123 @@
     static int bottom_border();
 
+    vec2i m_pos;
     image *m_surf;