Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/imlib/jwindow.h

    r655 r659  
    6161    friend class InputManager;
    6262
    63 protected:
    64     Jwindow *owner;
    65 
    6663public :
    6764    ifield();
    68     int x, y;
     65    virtual ~ifield();
    6966
    70     int id;
    71     ifield *next;
    7267    virtual void set_owner(Jwindow *owner);
    73     virtual void move(int newx, int newy) { x = newx; y = newy; }
     68    virtual void Move(vec2i pos) { m_pos = pos; }
    7469    virtual void area(int &x1, int &y1, int &x2, int &y2) = 0;
    7570    virtual void draw_first(image *screen) = 0;
     
    8176    virtual ifield *find(int search_id) { if (id==search_id) return this; else return NULL; }
    8277    virtual ifield *unlink(int id) { (void)id; return NULL; }
    83     virtual ~ifield();
    84 } ;
     78
     79    vec2i m_pos;
     80    int id;
     81    ifield *next;
     82
     83protected:
     84    Jwindow *owner;
     85};
    8586
    8687class Jwindow
     
    9091public:
    9192    Jwindow *next;
    92     int x, y, l, h, backg;
     93    int l, h, backg;
    9394    InputManager *inm;
    9495    void *local_info;  // pointer to info block for local system (may support windows)
    9596
    9697    Jwindow(char const *name = NULL);
    97     Jwindow(int X, int Y, int L, int H, ifield *f, char const *name = NULL);
     98    Jwindow(vec2i pos, int L, int H, ifield *f, char const *name = NULL);
    9899    ~Jwindow();
    99100
     
    122123    static int bottom_border();
    123124
     125    vec2i m_pos;
    124126    image *m_surf;
    125127
Note: See TracChangeset for help on using the changeset viewer.