[Enigma-cvs] enigma/src gui.hh,1.15,1.16 gui.cc,1.20,1.21

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv12581/src

Modified Files:
        gui.hh gui.cc 
Log Message:
Added alignment options to Label constructor


Index: gui.hh
===================================================================
RCS file: /cvsroot/enigma/enigma/src/gui.hh,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** gui.hh      20 Oct 2003 16:21:41 -0000      1.15
--- gui.hh      15 Nov 2003 12:36:06 -0000      1.16
***************
*** 175,179 ****
      class Label : public Widget {
      public:
!         Label (const std::string &text="");
  
          // Widget interface
--- 175,181 ----
      class Label : public Widget {
      public:
!         Label (const std::string &text="",
!                HAlignment halign=HALIGN_CENTER, 
!                VAlignment valign=VALIGN_CENTER);
  
          // Widget interface

Index: gui.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/gui.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** gui.cc      27 Oct 2003 11:49:35 -0000      1.20
--- gui.cc      15 Nov 2003 12:36:06 -0000      1.21
***************
*** 159,167 ****
  /* -------------------- Label -------------------- */
  
! Label::Label (const std::string &text)
  : m_text (text),
    m_font(enigma::GetFont("menufont")),
!   m_halign(HALIGN_CENTER),
!   m_valign(VALIGN_CENTER)
  {}
  
--- 159,169 ----
  /* -------------------- Label -------------------- */
  
! Label::Label (const std::string &text,
!               HAlignment halign, 
!               VAlignment valign)
  : m_text (text),
    m_font(enigma::GetFont("menufont")),
!   m_halign(halign),
!   m_valign(valign)
  {}