[aedGUI-cvs] aedGUI/include aedAnimatedImage.h,1.4,1.5 aedApp.h,1.17,1.18 aedBoxSizer.h,1.3,1.4 aedButton.h,1.13,1.14 aedCallBack.h,1.5,1.6 aedCheckBox.h,1.12,1.13 aedColor.h,1.5,1.6 aedCursor.h,1.2,1.3 aedDialogBox.h,1.5,1.6 aedFont.h,1.9,1.10 aedFrame.h,1.7,1.8 aedFunctor1Arg.h,1.1,1.2 aedFunctorBase.h,1.1,1.2 aedFunctorNoArgs.h,1.1,1.2 aedGui.h,1.16,1.17 aedImage.h,1.2,1.3 aedImageBank.h,1.1,1.2 aedListBox.h,1.7,1.8 aedLog.h,1.10,1.11 aedMenu.h,1.7,1.8 aedMenuBar.h,1.6,1.7 aedObject.h,1.10,1.11 aedProgressBar.h,1.8,1.9 aedRadioButtonGroup.h,1.11,1.12 aedRect.h,1.6,1.7 aedScrollBar.h,1.16,1.17 aedSignal.h,1.6,1.7 aedSizer.h,1.3,1.4 aedSlider.h,1.10,1.11 aedSpinner.h,1.6,1.7 aedStaticImage.h,1.4,1.5 aedStaticRTF.h,1.3,1.4 aedStaticText.h,1.16,1.17 aedTextBox.h,1.14,1.15 aedTheme.h,1.12,1.13 aedTimer.h,1.8,1.9 aedUpdateManager.h,1.3,1.4 aedWidget.h,1.6,1.7 aedWindow.h,1.41,1.42 aedXmlFile.h,1.3,1.4 dllmacros.h,1.6,1.7 drawlibs.h,1.5,1.6 rint.h,1.2,1.3

[<edu...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1:/tmp/cvs-serv11490/include

Modified Files:
	aedAnimatedImage.h aedApp.h aedBoxSizer.h aedButton.h 
	aedCallBack.h aedCheckBox.h aedColor.h aedCursor.h 
	aedDialogBox.h aedFont.h aedFrame.h aedFunctor1Arg.h 
	aedFunctorBase.h aedFunctorNoArgs.h aedGui.h aedImage.h 
	aedImageBank.h aedListBox.h aedLog.h aedMenu.h aedMenuBar.h 
	aedObject.h aedProgressBar.h aedRadioButtonGroup.h aedRect.h 
	aedScrollBar.h aedSignal.h aedSizer.h aedSlider.h aedSpinner.h 
	aedStaticImage.h aedStaticRTF.h aedStaticText.h aedTextBox.h 
	aedTheme.h aedTimer.h aedUpdateManager.h aedWidget.h 
	aedWindow.h aedXmlFile.h dllmacros.h drawlibs.h rint.h 
Log Message:

Wow... indent sure makes a mess :)


Index: aedAnimatedImage.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedAnimatedImage.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aedAnimatedImage.h	25 Oct 2003 00:06:01 -0000	1.4
--- aedAnimatedImage.h	6 Nov 2003 18:46:32 -0000	1.5
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedAnimatedImage class
***************
*** 50,54 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedAnimatedImage>;
  #endif
  
--- 51,55 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedAnimatedImage >;
  #endif
  

Index: aedApp.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedApp.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** aedApp.h	5 Nov 2003 19:26:06 -0000	1.17
--- aedApp.h	6 Nov 2003 18:46:32 -0000	1.18
***************
*** 62,66 ****
       * was not found
       */
!     aedFont *requestFont(std::string name, Uint8 size, int style = AED_FONT_STYLE_NORMAL);
  
      /** Add font path to the list of paths which will be used
--- 62,67 ----
       * was not found
       */
!     aedFont *requestFont(std::string name, Uint8 size, int style =
!                          AED_FONT_STYLE_NORMAL);
  
      /** Add font path to the list of paths which will be used
***************
*** 131,144 ****
  
      /** Return a pointer to the widget that has focus. */
!     aedWidget *getFocusWidget() const { return m_FocusWidget; }
!     
      /** Set focus. */
!     void setFocusWidget(aedWidget *win);
  
      /** Handle okay and cancel buttons. */
!     void setOkayButton(aedButton *button) { m_okayButton = button; }
!     void setCancelButton(aedButton *button) { m_cancelButton = button; }
!     aedButton *getOkayButton() { return m_okayButton; }
!     aedButton *getCancelButton() { return m_cancelButton; }
      void clickOkayButton();
      void clickCancelButton();
--- 132,160 ----
  
      /** Return a pointer to the widget that has focus. */
!     aedWidget *getFocusWidget() const
!     {
!         return m_FocusWidget;
!     }
! 
      /** Set focus. */
!     void setFocusWidget(aedWidget * win);
  
      /** Handle okay and cancel buttons. */
!     void setOkayButton(aedButton * button)
!     {
!         m_okayButton = button;
!     }
!     void setCancelButton(aedButton * button)
!     {
!         m_cancelButton = button;
!     }
!     aedButton *getOkayButton()
!     {
!         return m_okayButton;
!     }
!     aedButton *getCancelButton()
!     {
!         return m_cancelButton;
!     }
      void clickOkayButton();
      void clickCancelButton();
***************
*** 146,154 ****
      /** Enable or disable UTF8 text rendering.
       * Rendering UTF8 text is disabled by default. */
!     void setUTF8(bool enable) { m_UTF8 = enable; }
!     bool getUTF8() const { return m_UTF8; }
  
    private:
!     std::string tryFontPath(std::string path, std::string name);
  
    private:
--- 162,176 ----
      /** Enable or disable UTF8 text rendering.
       * Rendering UTF8 text is disabled by default. */
!     void setUTF8(bool enable)
!     {
!         m_UTF8 = enable;
!     }
!     bool getUTF8() const
!     {
!         return m_UTF8;
!     }
  
    private:
!       std::string tryFontPath(std::string path, std::string name);
  
    private:
***************
*** 160,167 ****
      aedWidget *m_Root;
      aedWidget *m_FocusWidget;
! 	aedButton *m_okayButton;
! 	aedButton *m_cancelButton;
  
! 	bool m_UTF8;
  };
  
--- 182,189 ----
      aedWidget *m_Root;
      aedWidget *m_FocusWidget;
!     aedButton *m_okayButton;
!     aedButton *m_cancelButton;
  
!     bool m_UTF8;
  };
  

Index: aedBoxSizer.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedBoxSizer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aedBoxSizer.h	25 Oct 2003 00:06:01 -0000	1.3
--- aedBoxSizer.h	6 Nov 2003 18:46:32 -0000	1.4
***************
*** 6,20 ****
  enum boxType
  {
! 	aedVERTICAL,
! 	aedHORIZONTAL
  };
  
! class DLLEXPORT aedBoxSizer : public aedSizer
  {
! 	public:
! 		aedBoxSizer(aedWidget *parent, boxType type);
! 		virtual void	calculateSize(void);
! 	private:
! 		boxType		m_BoxType;
  };
  
--- 6,20 ----
  enum boxType
  {
!     aedVERTICAL,
!     aedHORIZONTAL
  };
  
! class DLLEXPORT aedBoxSizer:public aedSizer
  {
!   public:
!     aedBoxSizer(aedWidget * parent, boxType type);
!     virtual void calculateSize(void);
!   private:
!       boxType m_BoxType;
  };
  

Index: aedButton.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedButton.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** aedButton.h	5 Nov 2003 19:26:06 -0000	1.13
--- aedButton.h	6 Nov 2003 18:46:32 -0000	1.14
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedButton class
***************
*** 43,51 ****
  {
    public:
      /** The constructor.
       * @param type type of the button you wish to create
       */
      aedButton(aedButtonType type = ROUND);
!     virtual ~aedButton();
      virtual void render(void);
      virtual int wm_update(Uint32 msdelta);
--- 44,53 ----
  {
    public:
+ 
      /** The constructor.
       * @param type type of the button you wish to create
       */
      aedButton(aedButtonType type = ROUND);
!     virtual ~ aedButton();
      virtual void render(void);
      virtual int wm_update(Uint32 msdelta);
***************
*** 53,62 ****
      virtual int wm_lbuttonup(Uint16 x, Uint16 y);
      virtual int wm_keydown(aedKeyEvent & event);
! 	virtual int wm_mouseenter();
! 	virtual int wm_mouseleave();
  
      /** Set button's caption. */
!     void setCaption(const std::string &caption);
!     
      /** Set button's image.*/
      void setImage(aedImage image);
--- 55,64 ----
      virtual int wm_lbuttonup(Uint16 x, Uint16 y);
      virtual int wm_keydown(aedKeyEvent & event);
!     virtual int wm_mouseenter();
!     virtual int wm_mouseleave();
  
      /** Set button's caption. */
!     void setCaption(const std::string & caption);
! 
      /** Set button's image.*/
      void setImage(aedImage image);
***************
*** 67,74 ****
          return m_ButtonDown;
      }
!     
      /** Change button state (true means button is pressed). */
      void setButtonState(bool s);
!     
      /** Set button type. */
      void setButtonType(aedButtonType type)
--- 69,76 ----
          return m_ButtonDown;
      }
! 
      /** Change button state (true means button is pressed). */
      void setButtonState(bool s);
! 
      /** Set button type. */
      void setButtonType(aedButtonType type)
***************
*** 76,80 ****
          m_ButtonType = type;
      }
!     
      /** Set toggle mode. */
      void setToggleMode(bool mode);
--- 78,82 ----
          m_ButtonType = type;
      }
! 
      /** Set toggle mode. */
      void setToggleMode(bool mode);
***************
*** 92,96 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedButton>;
  #endif
  
--- 94,98 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedButton >;
  #endif
  

Index: aedCallBack.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedCallBack.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aedCallBack.h	4 Oct 2003 00:35:53 -0000	1.5
--- aedCallBack.h	6 Nov 2003 18:46:32 -0000	1.6
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedCallBack class
***************
*** 29,94 ****
  class DLLEXPORT aedCallBack
  {
! public:
! 	aedCallBack() 
! 	{
! 		m_FuncPtr	= NULL;
! 	}
  
! 	aedCallBack(void (*function)(void *, void *)) :
! 	m_FuncPtr(new aedFunctorNoArgs<stub>(function))
! 	{
! 	}
  
! 	template <class A>
! 	aedCallBack(void (*function)(void *, void *, A *), A *arg) :
! 	m_FuncPtr(new aedFunctor1Arg<stub,A>(function, arg))
! 	{
! 	}
  
! 	template <class T>
! 	aedCallBack(T *obj, void (T::*memberfunction)(void *, void *)) :
! 	m_FuncPtr(new aedFunctorNoArgs<T>(obj, memberfunction))
! 	{
! 	}
  
! 	template <class T, class A>
! 	aedCallBack(T *obj, void (T::*memberfunction)(void *, void *, A *), A *arg) :
! 	m_FuncPtr(new aedFunctor1Arg<T,A>(obj, memberfunction, arg))
! 	{
! 	}
  
! 	aedCallBack (const aedCallBack &obj)
! 	{
! 		m_FuncPtr	= obj.getFunctor()->clone();
! 	}
  
! 	aedCallBack operator=(const aedCallBack &obj)
! 	{
! 		m_FuncPtr	= obj.getFunctor()->clone();
  
! 		return *this;
! 	}
  
! 	aedFunctorBase *getFunctor(void) const
! 	{
! 		return m_FuncPtr;
! 	}
  
! 	void Call(void *caller, void *data)
! 	{
! 		if (m_FuncPtr != NULL)
! 		{
! 			m_FuncPtr->Call(caller, data);
! 		}
! 	}
  
! 	~aedCallBack()
! 	{
! 		if (m_FuncPtr)
! 			delete m_FuncPtr;
! 	}
  
! private:
! 	aedFunctorBase *m_FuncPtr;
  };
  
--- 30,103 ----
  class DLLEXPORT aedCallBack
  {
!   public:
!     aedCallBack()
!     {
!         m_FuncPtr = NULL;
!     }
  
!     aedCallBack(void (*function) (void *, void *)):m_FuncPtr(new
!                                                              aedFunctorNoArgs <
!                                                              stub > (function))
!     {
!     }
  
!     template < class A >
!         aedCallBack(void (*function) (void *, void *, A *),
!                     A * arg):m_FuncPtr(new aedFunctor1Arg < stub, A > (function,
!                                                                        arg))
!     {
!     }
  
!     template < class T >
!         aedCallBack(T * obj,
!                     void (T::*memberfunction) (void *,
!                                                void *)):m_FuncPtr(new
!                                                                   aedFunctorNoArgs
!                                                                   < T > (obj,
!                                                                          memberfunction))
!     {
!     }
  
!     template < class T, class A >
!         aedCallBack(T * obj, void (T::*memberfunction) (void *, void *, A *),
!                     A * arg):m_FuncPtr(new aedFunctor1Arg < T, A > (obj,
!                                                                     memberfunction,
!                                                                     arg))
!     {
!     }
  
!     aedCallBack(const aedCallBack & obj)
!     {
!         m_FuncPtr = obj.getFunctor()->clone();
!     }
  
!     aedCallBack operator=(const aedCallBack & obj)
!     {
!         m_FuncPtr = obj.getFunctor()->clone();
  
!         return *this;
!     }
  
!     aedFunctorBase *getFunctor(void) const
!     {
!         return m_FuncPtr;
!     }
  
!     void Call(void *caller, void *data)
!     {
!         if(m_FuncPtr != NULL)
!         {
!             m_FuncPtr->Call(caller, data);
!         }
!     }
  
!     ~aedCallBack()
!     {
!         if(m_FuncPtr)
!             delete m_FuncPtr;
!     }
  
!   private:
!     aedFunctorBase * m_FuncPtr;
  };
  

Index: aedCheckBox.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedCheckBox.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** aedCheckBox.h	25 Oct 2003 00:06:01 -0000	1.12
--- aedCheckBox.h	6 Nov 2003 18:46:32 -0000	1.13
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedCheckBox class
***************
*** 34,54 ****
  
      virtual int wm_lbuttondown(Uint16 x, Uint16 y);
!     virtual void setCaption(const std::string &caption);
! 	virtual void render();
! 	virtual int wm_mouseenter();
! 	virtual int wm_mouseleave();
  
      /** Get checkbox state. */
      bool getState();
!     
      /** Set checkbox state. */
      void setState(bool state);
  
    private:
!     bool m_State;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedCheckBox>;
  #endif
  
--- 35,55 ----
  
      virtual int wm_lbuttondown(Uint16 x, Uint16 y);
!     virtual void setCaption(const std::string & caption);
!     virtual void render();
!     virtual int wm_mouseenter();
!     virtual int wm_mouseleave();
  
      /** Get checkbox state. */
      bool getState();
! 
      /** Set checkbox state. */
      void setState(bool state);
  
    private:
!       bool m_State;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedCheckBox >;
  #endif
  

Index: aedColor.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedColor.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aedColor.h	30 Aug 2003 14:09:15 -0000	1.5
--- aedColor.h	6 Nov 2003 18:46:32 -0000	1.6
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedColor class
***************
*** 74,81 ****
      void dumpAll(void)
      {
!         cout << "R: " << (int)r << endl;
!         cout << "G: " << (int)g << endl;
!         cout << "B: " << (int)b << endl;
!         cout << "A: " << (int)a << endl;                
      }
      void setAllColors(Uint8 _r, Uint8 _g, Uint8 _b, Uint8 _a)
--- 75,82 ----
      void dumpAll(void)
      {
!         cout << "R: " << (int) r << endl;
!         cout << "G: " << (int) g << endl;
!         cout << "B: " << (int) b << endl;
!         cout << "A: " << (int) a << endl;
      }
      void setAllColors(Uint8 _r, Uint8 _g, Uint8 _b, Uint8 _a)
***************
*** 90,104 ****
          return SDL_MapRGBA(surface->format, r, g, b, a);
      }
!     operator SDL_Color() const
      {
          SDL_Color c;
!         c.r = r;
!         c.g = g;
!         c.b = b;
!         c.unused = a;
!         return c;
      }
    private:
!     Uint8 r, g, b, a;
  };
  
--- 91,105 ----
          return SDL_MapRGBA(surface->format, r, g, b, a);
      }
!     operator  SDL_Color() const
      {
          SDL_Color c;
!           c.r = r;
!           c.g = g;
!           c.b = b;
!           c.unused = a;
!           return c;
      }
    private:
!       Uint8 r, g, b, a;
  };
  

Index: aedCursor.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedCursor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aedCursor.h	3 Oct 2003 15:08:21 -0000	1.2
--- aedCursor.h	6 Nov 2003 18:46:32 -0000	1.3
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
    aedMouseCursor:
***************
*** 15,30 ****
  class DLLEXPORT aedCursor
  {
!  public:
!   aedCursor();
!   ~aedCursor();
!   inline void setAnchor(Uint8 x, Uint8 y){xHot = x; yHot = y;};
!   void setImage(SDL_Surface *Image);
!   void render(SDL_Surface *Screen = NULL);
!  private:
!   Uint8 xHot;
!   Uint8 yHot;
!   SDL_Surface *CursorImage;
!   SDL_Surface *SavedImage;
!   SDL_Rect    SavedRect;
  };
  #endif
--- 16,36 ----
  class DLLEXPORT aedCursor
  {
!   public:
!     aedCursor();
!     ~aedCursor();
!     inline void setAnchor(Uint8 x, Uint8 y)
!     {
!         xHot = x;
!         yHot = y;
!     };
!     void setImage(SDL_Surface * Image);
!     void render(SDL_Surface * Screen = NULL);
! 
!   private:
!     Uint8 xHot;
!     Uint8 yHot;
!     SDL_Surface *CursorImage;
!     SDL_Surface *SavedImage;
!     SDL_Rect SavedRect;
  };
  #endif

Index: aedDialogBox.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedDialogBox.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aedDialogBox.h	25 Oct 2003 00:06:01 -0000	1.5
--- aedDialogBox.h	6 Nov 2003 18:46:32 -0000	1.6
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedDialogBox class
***************
*** 32,36 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedDialogBox>;
  #endif
  
--- 33,37 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedDialogBox >;
  #endif
  

Index: aedFont.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedFont.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** aedFont.h	8 Sep 2003 19:55:50 -0000	1.9
--- aedFont.h	6 Nov 2003 18:46:32 -0000	1.10
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedFont class
***************
*** 59,76 ****
  
      // These return rendered string as a surface which the caller must free
!     SDL_Surface *renderTextSolid(const char *str, const aedColor &color);
!     SDL_Surface *renderTextShaded(const char *str, const aedColor &fg, const aedColor &bg);
!     SDL_Surface *renderTextBlended(const char *str, const aedColor &color);
  
      // These are just for convenience, render directly to the given surface
      void renderTextSolid(SDL_Surface * s, int x, int y, const char *str,
!                          const aedColor &color);
      void renderTextShaded(SDL_Surface * s, int x, int y, const char *str,
!                           const aedColor &fg, const aedColor &bg);
      void renderTextBlended(SDL_Surface * s, int x, int y, const char *str,
!                            const aedColor &color);
  
    private:
!     TTF_Font *data;
  
      // This isn't the best design, but it does what we need:
--- 60,78 ----
  
      // These return rendered string as a surface which the caller must free
!     SDL_Surface *renderTextSolid(const char *str, const aedColor & color);
!     SDL_Surface *renderTextShaded(const char *str, const aedColor & fg,
!                                   const aedColor & bg);
!     SDL_Surface *renderTextBlended(const char *str, const aedColor & color);
  
      // These are just for convenience, render directly to the given surface
      void renderTextSolid(SDL_Surface * s, int x, int y, const char *str,
!                          const aedColor & color);
      void renderTextShaded(SDL_Surface * s, int x, int y, const char *str,
!                           const aedColor & fg, const aedColor & bg);
      void renderTextBlended(SDL_Surface * s, int x, int y, const char *str,
!                            const aedColor & color);
  
    private:
!       TTF_Font * data;
  
      // This isn't the best design, but it does what we need:
***************
*** 78,104 ****
      friend class aedApp;
      bool openFont(const char *file, int pointsize);
!     bool openFont(unsigned char *data, unsigned long int datasize, int pointsize);
      void closeFont();
  
    public:
!     static Uint16 getUnicode(const char *utf8, int *advance) {
          int i = 0;
          Uint16 ch;
  
!         ch = ((const unsigned char *)utf8)[i];
!         if ( ch >= 0xF0 ) {
!             ch  =  (Uint16)(utf8[i]&0x07) << 18;
!             ch |=  (Uint16)(utf8[++i]&0x3F) << 12;
!             ch |=  (Uint16)(utf8[++i]&0x3F) << 6;
!             ch |=  (Uint16)(utf8[++i]&0x3F);
!         } else if ( ch >= 0xE0 ) {
!             ch  =  (Uint16)(utf8[i]&0x3F) << 12;
!             ch |=  (Uint16)(utf8[++i]&0x3F) << 6;
!             ch |=  (Uint16)(utf8[++i]&0x3F);
!         } else if ( ch >= 0xC0 ) {
!             ch  =  (Uint16)(utf8[i]&0x3F) << 6;
!             ch |=  (Uint16)(utf8[++i]&0x3F);
          }
!         *advance = (i+1);
          return ch;
      }
--- 80,113 ----
      friend class aedApp;
      bool openFont(const char *file, int pointsize);
!     bool openFont(unsigned char *data, unsigned long int datasize,
!                   int pointsize);
      void closeFont();
  
    public:
!     static Uint16 getUnicode(const char *utf8, int *advance)
!     {
          int i = 0;
          Uint16 ch;
  
!           ch = ((const unsigned char *) utf8)[i];
!         if(ch >= 0xF0)
!         {
!             ch = (Uint16) (utf8[i] & 0x07) << 18;
!             ch |= (Uint16) (utf8[++i] & 0x3F) << 12;
!             ch |= (Uint16) (utf8[++i] & 0x3F) << 6;
!             ch |= (Uint16) (utf8[++i] & 0x3F);
          }
!         else if(ch >= 0xE0)
!         {
!             ch = (Uint16) (utf8[i] & 0x3F) << 12;
!             ch |= (Uint16) (utf8[++i] & 0x3F) << 6;
!             ch |= (Uint16) (utf8[++i] & 0x3F);
!         }
!         else if(ch >= 0xC0)
!         {
!             ch = (Uint16) (utf8[i] & 0x3F) << 6;
!             ch |= (Uint16) (utf8[++i] & 0x3F);
!         }
!         *advance = (i + 1);
          return ch;
      }

Index: aedFrame.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedFrame.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** aedFrame.h	25 Oct 2003 00:06:01 -0000	1.7
--- aedFrame.h	6 Nov 2003 18:46:32 -0000	1.8
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedFrame class
***************
*** 36,45 ****
      virtual void render(void);
    private:
!     Uint8 m_FontSize;
  
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedFrame>;
  #endif
  
--- 37,46 ----
      virtual void render(void);
    private:
!       Uint8 m_FontSize;
  
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedFrame >;
  #endif
  

Index: aedFunctor1Arg.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedFunctor1Arg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aedFunctor1Arg.h	30 Aug 2003 04:26:06 -0000	1.1
--- aedFunctor1Arg.h	6 Nov 2003 18:46:32 -0000	1.2
***************
*** 4,62 ****
  #include "aedFunctorBase.h"
  
! template <class T=stub, class A=stub>
! class DLLEXPORT aedFunctor1Arg : public aedFunctorBase  
  {
! public:
! 	aedFunctor1Arg(T *obj, void (T::*member)(void *, void *, A *), A *arg)
! 	{
! 		m_Object				= obj;
! 		m_MemberFunctionPointer			= member;
! 		m_Argument				= arg;
! 		m_FunctionPointer			= NULL;
! 	}
  
! 	aedFunctor1Arg(void (*function)(void *, void *, A *), A *arg)
! 	{
! 		m_FunctionPointer			= function;
! 		m_MemberFunctionPointer			= NULL;
! 		m_Object				= NULL;
! 		m_Argument				= arg;
! 	}
  
! 	virtual void operator() (void *caller, void *data)
! 	{
! 		this->Call(caller, data);
! 	}
  
! 	void Call (void *caller, void *data)
! 	{
! 		if (m_Object)
! 			(*m_Object.*m_MemberFunctionPointer)(caller, data, m_Argument);
! 		else
! 			m_FunctionPointer(caller, data, m_Argument);
! 	}
  
! 	aedFunctorBase *clone (void)
! 	{
! 		aedFunctor1Arg<T,A>	*clone;
  
! 		if (m_Object)
! 			clone	= new aedFunctor1Arg<T,A>(m_Object, m_MemberFunctionPointer, m_Argument);
! 		else
! 			clone	= new aedFunctor1Arg<T,A>(m_FunctionPointer, m_Argument);
  
! 		return clone;
! 	}
  
! 	virtual ~aedFunctor1Arg()
! 	{
  
! 	}
  
! private:
! 	T *m_Object;
! 	A *m_Argument;
! 	void (T::*m_MemberFunctionPointer)(void *,void *, A *);
! 	void (*m_FunctionPointer)(void *,void *, A *);
  
  };
--- 4,64 ----
  #include "aedFunctorBase.h"
  
! template < class T = stub, class A = stub > class DLLEXPORT aedFunctor1Arg:public
!     aedFunctorBase
  {
!   public:
!     aedFunctor1Arg(T * obj, void (T::*member) (void *, void *, A *), A * arg)
!     {
!         m_Object = obj;
!         m_MemberFunctionPointer = member;
!         m_Argument = arg;
!         m_FunctionPointer = NULL;
!     }
  
!     aedFunctor1Arg(void (*function) (void *, void *, A *), A * arg)
!     {
!         m_FunctionPointer = function;
!         m_MemberFunctionPointer = NULL;
!         m_Object = NULL;
!         m_Argument = arg;
!     }
  
!     virtual void operator() (void *caller, void *data)
!     {
!         this->Call(caller, data);
!     }
  
!     void Call(void *caller, void *data)
!     {
!         if(m_Object)
!             (*m_Object.*m_MemberFunctionPointer) (caller, data, m_Argument);
!         else
!             m_FunctionPointer(caller, data, m_Argument);
!     }
  
!     aedFunctorBase *clone(void)
!     {
!         aedFunctor1Arg < T, A > *clone;
  
!         if(m_Object)
!             clone =
!                 new aedFunctor1Arg < T, A > (m_Object, m_MemberFunctionPointer,
!                                              m_Argument);
!         else
!             clone = new aedFunctor1Arg < T, A > (m_FunctionPointer, m_Argument);
  
!         return clone;
!     }
  
!     virtual ~ aedFunctor1Arg()
!     {
  
!     }
  
!   private:
!     T * m_Object;
!     A *m_Argument;
!     void (T::*m_MemberFunctionPointer) (void *, void *, A *);
!     void (*m_FunctionPointer) (void *, void *, A *);
  
  };

Index: aedFunctorBase.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedFunctorBase.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aedFunctorBase.h	30 Aug 2003 04:26:06 -0000	1.1
--- aedFunctorBase.h	6 Nov 2003 18:46:32 -0000	1.2
***************
*** 5,21 ****
  #include "dllmacros.h"
  
! class DLLEXPORT aedFunctorBase  
  {
! public:
! 	//aedFunctorBase();
! 	//virtual ~aedFunctorBase();
  
! 	virtual void operator() (void *caller, void *data)=0;
! 	virtual void Call(void *caller, void *data)=0;
! 	virtual aedFunctorBase *clone(void)=0;
  
  };
  
! class stub {};
  
  #endif
--- 5,23 ----
  #include "dllmacros.h"
  
! class DLLEXPORT aedFunctorBase
  {
!   public:
!     //aedFunctorBase();
!     //virtual ~aedFunctorBase();
  
!     virtual void operator() (void *caller, void *data) = 0;
!     virtual void Call(void *caller, void *data) = 0;
!     virtual aedFunctorBase *clone(void) = 0;
  
  };
  
! class stub
! {
! };
  
  #endif

Index: aedFunctorNoArgs.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedFunctorNoArgs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aedFunctorNoArgs.h	30 Aug 2003 04:26:06 -0000	1.1
--- aedFunctorNoArgs.h	6 Nov 2003 18:46:32 -0000	1.2
***************
*** 4,59 ****
  #include "aedFunctorBase.h"
  
! template <class T=stub>
! class DLLEXPORT aedFunctorNoArgs : public aedFunctorBase  
  {
! public:
! 	aedFunctorNoArgs(T *obj, void (T::*member)(void *, void *))
! 	{
! 		m_Object		= obj;
! 		m_MemberFunctionPointer	= member;
! 		m_FunctionPointer	= NULL;
! 	}
  
! 	aedFunctorNoArgs(void (*function)(void *, void *))
! 	{
! 		m_FunctionPointer	= function;
! 		m_Object		= NULL;
! 		m_MemberFunctionPointer	= NULL;
! 	}
  
! 	virtual void operator() (void *caller, void *data)
! 	{
! 		this->Call(caller, data);
! 	}
  
! 	void Call (void *caller, void *data)
! 	{
! 		if (m_Object != NULL)
! 			(*m_Object.*m_MemberFunctionPointer)(caller, data);
! 		else
! 			m_FunctionPointer(caller, data);
! 	}
  
! 	aedFunctorBase *clone (void)
! 	{
! 		aedFunctorNoArgs<T>	*clone;
  
! 		if (m_Object)
! 			clone	= new aedFunctorNoArgs<T>(m_Object, m_MemberFunctionPointer);
! 		else
! 			clone	= new aedFunctorNoArgs<T>(m_FunctionPointer);
  
! 		return clone;
! 	}
  
! 	virtual ~aedFunctorNoArgs()
! 	{
  
! 	}
  
! private:
! 	T *m_Object;
! 	void (T::*m_MemberFunctionPointer)(void *,void *);
! 	void (*m_FunctionPointer)(void *,void *);
  
  };
--- 4,60 ----
  #include "aedFunctorBase.h"
  
! template < class T = stub > class DLLEXPORT aedFunctorNoArgs:public
!     aedFunctorBase
  {
!   public:
!     aedFunctorNoArgs(T * obj, void (T::*member) (void *, void *))
!     {
!         m_Object = obj;
!         m_MemberFunctionPointer = member;
!         m_FunctionPointer = NULL;
!     }
  
!     aedFunctorNoArgs(void (*function) (void *, void *))
!     {
!         m_FunctionPointer = function;
!         m_Object = NULL;
!         m_MemberFunctionPointer = NULL;
!     }
  
!     virtual void operator() (void *caller, void *data)
!     {
!         this->Call(caller, data);
!     }
  
!     void Call(void *caller, void *data)
!     {
!         if(m_Object != NULL)
!             (*m_Object.*m_MemberFunctionPointer) (caller, data);
!         else
!             m_FunctionPointer(caller, data);
!     }
  
!     aedFunctorBase *clone(void)
!     {
!         aedFunctorNoArgs < T > *clone;
  
!         if(m_Object)
!             clone =
!                 new aedFunctorNoArgs < T > (m_Object, m_MemberFunctionPointer);
!         else
!             clone = new aedFunctorNoArgs < T > (m_FunctionPointer);
  
!         return clone;
!     }
  
!     virtual ~ aedFunctorNoArgs()
!     {
  
!     }
  
!   private:
!     T * m_Object;
!     void (T::*m_MemberFunctionPointer) (void *, void *);
!     void (*m_FunctionPointer) (void *, void *);
  
  };

Index: aedGui.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedGui.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** aedGui.h	25 Oct 2003 00:06:01 -0000	1.16
--- aedGui.h	6 Nov 2003 18:46:32 -0000	1.17
***************
*** 25,28 ****
  #include "aedLog.h"
  
! #include "aedXmlFile.h"		// This must be included last
  #endif
--- 25,28 ----
  #include "aedLog.h"
  
! #include "aedXmlFile.h"         // This must be included last
  #endif

Index: aedImage.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedImage.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aedImage.h	28 Jul 2003 15:00:31 -0000	1.2
--- aedImage.h	6 Nov 2003 18:46:32 -0000	1.3
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedImage class

Index: aedImageBank.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedImageBank.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aedImageBank.h	29 Jun 2003 23:27:37 -0000	1.1
--- aedImageBank.h	6 Nov 2003 18:46:32 -0000	1.2
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedImageBank class

Index: aedListBox.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedListBox.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** aedListBox.h	25 Oct 2003 00:06:01 -0000	1.7
--- aedListBox.h	6 Nov 2003 18:46:32 -0000	1.8
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedTextBox class
***************
*** 31,50 ****
      aedListBox();
  
! 	virtual void add(std::string string);
! 	virtual void insert(int line, std::string string);
! 	virtual void del(int line);
! 	virtual void del(int startLine, int endLine);
! 	virtual int size();
  
      virtual int wm_update(Uint32 msdelta);
      virtual void render(void);
! 	
    protected:
! 	std::vector<std::string> m_Strings;
! 	int m_currentLine;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedListBox>;
  #endif
  
--- 32,51 ----
      aedListBox();
  
!     virtual void add(std::string string);
!     virtual void insert(int line, std::string string);
!     virtual void del(int line);
!     virtual void del(int startLine, int endLine);
!     virtual int size();
  
      virtual int wm_update(Uint32 msdelta);
      virtual void render(void);
! 
    protected:
!       std::vector < std::string > m_Strings;
!     int m_currentLine;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedListBox >;
  #endif
  

Index: aedLog.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedLog.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** aedLog.h	6 Sep 2003 17:40:27 -0000	1.10
--- aedLog.h	6 Nov 2003 18:46:32 -0000	1.11
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedLog class
***************
*** 67,97 ****
  enum
  {
! 	AED_LOG_NOTICE = 1,
! 	AED_LOG_WARNING = 2,
! 	AED_LOG_ERROR = 4,
! 	AED_LOG_ALL = AED_LOG_NOTICE | AED_LOG_WARNING | AED_LOG_ERROR
  };
  
  class DLLEXPORT aedLog
  {
! public:
! 	void notice(const char *msg, ...);
! 	void warning(const char *msg, ...);
! 	void error(const char *msg, ...);
! 	void fatal(const char *msg, ...);
! 	unsigned int addDestination(std::ostream *out);
! 	void removeDestination(unsigned int index);
! 	int getMask() { return m_Mask; }
! 	void setMask(int mask) { m_Mask = mask; }
! 	
! private:
! 	std::vector<std::ostream *> m_Destinations;
! 	int m_Mask;
! 	static const int m_BufferSize = 1024;
  
! 	friend class aedApp;
! 	aedLog();
! 	void operator=(const aedLog &);
! 	void output(const char *prefix, const char *str);
  };
  
--- 68,105 ----
  enum
  {
!     AED_LOG_NOTICE = 1,
!     AED_LOG_WARNING = 2,
!     AED_LOG_ERROR = 4,
!     AED_LOG_ALL = AED_LOG_NOTICE | AED_LOG_WARNING | AED_LOG_ERROR
  };
  
  class DLLEXPORT aedLog
  {
!   public:
!     void notice(const char *msg, ...);
!     void warning(const char *msg, ...);
!     void error(const char *msg, ...);
!     void fatal(const char *msg, ...);
!     unsigned int addDestination(std::ostream * out);
!     void removeDestination(unsigned int index);
!     int getMask()
!     {
!         return m_Mask;
!     }
!     void setMask(int mask)
!     {
!         m_Mask = mask;
!     }
  
!   private:
!     std::vector < std::ostream * >m_Destinations;
!     int m_Mask;
!     static const int m_BufferSize = 1024;
! 
!     friend class aedApp;
! 
!     aedLog();
!     void operator=(const aedLog &);
!     void output(const char *prefix, const char *str);
  };
  

Index: aedMenu.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedMenu.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** aedMenu.h	25 Oct 2003 00:06:01 -0000	1.7
--- aedMenu.h	6 Nov 2003 18:46:32 -0000	1.8
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedMenu class
***************
*** 41,46 ****
       * @return index of the newly-added item in the menu
       */
!     unsigned int addItem(const std::string &caption, aedMenu * child = NULL);
!     
      /** Remove an item from a menu.
       * @param index index of the item you wish to remove from the menu */
--- 42,47 ----
       * @return index of the newly-added item in the menu
       */
!     unsigned int addItem(const std::string & caption, aedMenu * child = NULL);
! 
      /** Remove an item from a menu.
       * @param index index of the item you wish to remove from the menu */
***************
*** 58,66 ****
    private:
      int m_Highlight;
!     std::vector < aedMenuItem > m_Items;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template  DLLEXPORT aedFunctor1Arg<stub, aedMenu>;
  #endif
  
--- 59,67 ----
    private:
      int m_Highlight;
!       std::vector < aedMenuItem > m_Items;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedMenu >;
  #endif
  

Index: aedMenuBar.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedMenuBar.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aedMenuBar.h	25 Oct 2003 00:06:01 -0000	1.6
--- aedMenuBar.h	6 Nov 2003 18:46:32 -0000	1.7
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedMenuBar class
***************
*** 37,48 ****
       * @return index of the attached menu */
      unsigned int attachMenu(std::string title, aedMenu * menu, int pos = -1);
!     
      /** Detach a menu from a menu bar.
       * @param index index of the menu to be removed */
      void detachMenu(unsigned int index);
!     
      /** Detach a menu from a menu bar.
       * @param menu pointer to the menu to be removed */
!     void detachMenu(aedMenu *menu);
  
      int wm_lbuttondown(Uint16 x, Uint16 y);
--- 38,49 ----
       * @return index of the attached menu */
      unsigned int attachMenu(std::string title, aedMenu * menu, int pos = -1);
! 
      /** Detach a menu from a menu bar.
       * @param index index of the menu to be removed */
      void detachMenu(unsigned int index);
! 
      /** Detach a menu from a menu bar.
       * @param menu pointer to the menu to be removed */
!     void detachMenu(aedMenu * menu);
  
      int wm_lbuttondown(Uint16 x, Uint16 y);
***************
*** 60,64 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template  DLLEXPORT aedFunctor1Arg<stub, aedMenuBar>;
  #endif
  #endif /* AEDMENUBAR_H */
--- 61,65 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedMenuBar >;
  #endif
  #endif /* AEDMENUBAR_H */

Index: aedObject.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedObject.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** aedObject.h	3 Oct 2003 01:54:22 -0000	1.10
--- aedObject.h	6 Nov 2003 18:46:32 -0000	1.11
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedObject class
***************
*** 48,52 ****
      GOT_FOCUS = 1500,
      LOST_FOCUS,
! 	
      // Keyboard events
      KEY_DOWN = 2000,
--- 49,53 ----
      GOT_FOCUS = 1500,
      LOST_FOCUS,
! 
      // Keyboard events
      KEY_DOWN = 2000,
***************
*** 74,86 ****
    public:
      aedObject();
!     virtual ~aedObject();
!     
      /** Connect an event to a callback. */
      bool connect(aedEvents evt, aedCallBack cbf);
      bool disconnect(aedEvents evt);
      void triggerEvent(aedEvents evt, void *caller, void *data);
! 	
! protected:
!     std::multimap < aedEvents, aedSignal > m_Signals;
  };
  
--- 75,87 ----
    public:
      aedObject();
!     virtual ~ aedObject();
! 
      /** Connect an event to a callback. */
      bool connect(aedEvents evt, aedCallBack cbf);
      bool disconnect(aedEvents evt);
      void triggerEvent(aedEvents evt, void *caller, void *data);
! 
!   protected:
!       std::multimap < aedEvents, aedSignal > m_Signals;
  };
  

Index: aedProgressBar.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedProgressBar.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** aedProgressBar.h	25 Oct 2003 00:06:01 -0000	1.8
--- aedProgressBar.h	6 Nov 2003 18:46:32 -0000	1.9
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedProgressBar class
***************
*** 32,45 ****
      aedProgressBar();
      virtual ~ aedProgressBar();
!     
      /** Set the value of the progress bar.
       * @param value some value in the range [0, 100] */
      void setValue(Uint8 value);
!     
      /** Return the value of the progress bar. */
!     Uint8 getValue (void) const { return m_PercentValue; }
!     
      virtual void render(void);
! 	
    private:
        Uint8 m_PercentValue;
--- 33,49 ----
      aedProgressBar();
      virtual ~ aedProgressBar();
! 
      /** Set the value of the progress bar.
       * @param value some value in the range [0, 100] */
      void setValue(Uint8 value);
! 
      /** Return the value of the progress bar. */
!     Uint8 getValue(void) const
!     {
!         return m_PercentValue;
!     }
! 
      virtual void render(void);
! 
    private:
        Uint8 m_PercentValue;
***************
*** 47,52 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedProgressBar>;
  #endif
  
! #endif  /* AEDPROGRESSBAR_H */
--- 51,56 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedProgressBar >;
  #endif
  
! #endif /* AEDPROGRESSBAR_H */

Index: aedRadioButtonGroup.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedRadioButtonGroup.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aedRadioButtonGroup.h	25 Oct 2003 00:06:01 -0000	1.11
--- aedRadioButtonGroup.h	6 Nov 2003 18:46:33 -0000	1.12
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedRadioButtonGroup class
***************
*** 36,41 ****
      /** Add a button to the group.
       * @param caption caption of the button to add */
!     void addButton(const std::string &caption);
!     
      /** Remove a button from the group.
       * @param index index of the button in the group (first button has index 0)  */
--- 37,42 ----
      /** Add a button to the group.
       * @param caption caption of the button to add */
!     void addButton(const std::string & caption);
! 
      /** Remove a button from the group.
       * @param index index of the button in the group (first button has index 0)  */
***************
*** 43,48 ****
  
      /** Get the index of currently selected button. */
!     int getSelectedButton() const { return m_Selected; }
!     
      /** Select a button.
       * @param index index of the button to be selected */
--- 44,52 ----
  
      /** Get the index of currently selected button. */
!     int getSelectedButton() const
!     {
!         return m_Selected;
!     }
! 
      /** Select a button.
       * @param index index of the button to be selected */
***************
*** 51,63 ****
      int wm_lbuttondown(Uint16 x, Uint16 y);
      int wm_lostfocus();
!     
    private:
      int m_Selected;
      Uint16 m_NextY;
!     std::vector < aedCheckBox * >m_Buttons;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedRadioButtonGroup>;
  #endif
  
--- 55,67 ----
      int wm_lbuttondown(Uint16 x, Uint16 y);
      int wm_lostfocus();
! 
    private:
      int m_Selected;
      Uint16 m_NextY;
!       std::vector < aedCheckBox * >m_Buttons;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedRadioButtonGroup >;
  #endif
  

Index: aedRect.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedRect.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aedRect.h	16 Jul 2003 03:18:40 -0000	1.6
--- aedRect.h	6 Nov 2003 18:46:33 -0000	1.7
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedRect class
***************
*** 118,122 ****
          std::cout << "--" << std::endl;
      }
!     
      SDL_Rect getSDLRect(void)
      {
--- 119,123 ----
          std::cout << "--" << std::endl;
      }
! 
      SDL_Rect getSDLRect(void)
      {
***************
*** 150,152 ****
  };
  
! #endif	/* AEDRECT_H */
--- 151,153 ----
  };
  
! #endif /* AEDRECT_H */

Index: aedScrollBar.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedScrollBar.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** aedScrollBar.h	25 Oct 2003 00:06:01 -0000	1.16
--- aedScrollBar.h	6 Nov 2003 18:46:33 -0000	1.17
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedScrollBar class
***************
*** 33,38 ****
  
      virtual void create(aedWidget * parent = NULL, aedRect pos =
!                         aedDEFAULTPOSITION, std::string caption =
!                         "");
      virtual int wm_update(Uint32 msdelta);
      virtual int wm_lbuttonup(Uint16 x, Uint16 y);
--- 34,38 ----
  
      virtual void create(aedWidget * parent = NULL, aedRect pos =
!                         aedDEFAULTPOSITION, std::string caption = "");
      virtual int wm_update(Uint32 msdelta);
      virtual int wm_lbuttonup(Uint16 x, Uint16 y);
***************
*** 49,53 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedScrollBar>;
  #endif
  
--- 49,53 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedScrollBar >;
  #endif
  

Index: aedSignal.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedSignal.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aedSignal.h	30 Aug 2003 04:26:06 -0000	1.6
--- aedSignal.h	6 Nov 2003 18:46:33 -0000	1.7
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedSignal class

Index: aedSizer.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedSizer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aedSizer.h	25 Oct 2003 00:06:01 -0000	1.3
--- aedSizer.h	6 Nov 2003 18:46:33 -0000	1.4
***************
*** 6,19 ****
  class DLLEXPORT aedSizer
  {
! 	public:
! 		aedSizer();
! 		aedSizer(aedWidget *parent);
! 		virtual ~aedSizer();
! 		void		addWidget(aedWidget *widget);
! 		virtual void	calculateSize(void) = 0;
  
! 	protected:
! 		aedWidget			*m_Parent;
! 		std::vector<aedWidget *>	m_Widgets;
  };
  
--- 6,19 ----
  class DLLEXPORT aedSizer
  {
!   public:
!     aedSizer();
!     aedSizer(aedWidget * parent);
!     virtual ~ aedSizer();
!     void addWidget(aedWidget * widget);
!     virtual void calculateSize(void) = 0;
  
!   protected:
!       aedWidget * m_Parent;
!       std::vector < aedWidget * >m_Widgets;
  };
  

Index: aedSlider.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedSlider.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** aedSlider.h	25 Oct 2003 00:06:01 -0000	1.10
--- aedSlider.h	6 Nov 2003 18:46:33 -0000	1.11
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedSlider class
***************
*** 38,41 ****
--- 39,43 ----
  {
    public:
+ 
      /** The constructor, creates a new slider.
       * @param orient the slider's orientation */
***************
*** 50,54 ****
      /** Set slider's value. */
      void setValue(Uint32 val);
!     
      /** Get slider's value. */
      Uint32 getValue() const
--- 52,56 ----
      /** Set slider's value. */
      void setValue(Uint32 val);
! 
      /** Get slider's value. */
      Uint32 getValue() const
***************
*** 61,65 ****
       * @param maxval the maximum value of the new range */
      void setRange(Uint32 minval, Uint32 maxval);
!     
      /** Get slider's range.
       * Store minimum and maximum values into variables pointed to by
--- 63,67 ----
       * @param maxval the maximum value of the new range */
      void setRange(Uint32 minval, Uint32 maxval);
! 
      /** Get slider's range.
       * Store minimum and maximum values into variables pointed to by
***************
*** 78,82 ****
          return m_BigChange;
      }
!     
      /** Set the amount of a "big change". */
      void setBigChange(Uint32 bigchange);
--- 80,84 ----
          return m_BigChange;
      }
! 
      /** Set the amount of a "big change". */
      void setBigChange(Uint32 bigchange);
***************
*** 103,107 ****
       @param bigChange if true, make a big change */
      void incrementValue(bool bigChange = false);
!     
      /** Decrement slider's value.
       @param bigChange if true, make a big change */
--- 105,109 ----
       @param bigChange if true, make a big change */
      void incrementValue(bool bigChange = false);
! 
      /** Decrement slider's value.
       @param bigChange if true, make a big change */
***************
*** 109,113 ****
  
      aedRect getElevatorRect();
! 	
    protected:
      bool m_Dragging;
--- 111,115 ----
  
      aedRect getElevatorRect();
! 
    protected:
      bool m_Dragging;
***************
*** 120,124 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedSlider>;
  #endif
  
--- 122,126 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedSlider >;
  #endif
  

Index: aedSpinner.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedSpinner.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aedSpinner.h	25 Oct 2003 00:06:01 -0000	1.6
--- aedSpinner.h	6 Nov 2003 18:46:33 -0000	1.7
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedSpinner class
***************
*** 32,37 ****
      aedSpinner();
      virtual void create(aedWidget * parent = NULL, aedRect pos =
!                         aedDEFAULTPOSITION, std::string caption =
!                         "");
  
      int wm_update(Uint32 msdelta);
--- 33,37 ----
      aedSpinner();
      virtual void create(aedWidget * parent = NULL, aedRect pos =
!                         aedDEFAULTPOSITION, std::string caption = "");
  
      int wm_update(Uint32 msdelta);
***************
*** 55,59 ****
  
    private:
!     Sint32 m_Value, m_Min, m_Max;
      aedButton m_ButtonUp, m_ButtonDown;
      aedTextBox m_TextBox;
--- 55,59 ----
  
    private:
!       Sint32 m_Value, m_Min, m_Max;
      aedButton m_ButtonUp, m_ButtonDown;
      aedTextBox m_TextBox;
***************
*** 65,69 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedSpinner>;
  #endif
  
--- 65,69 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedSpinner >;
  #endif
  

Index: aedStaticImage.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedStaticImage.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aedStaticImage.h	25 Oct 2003 00:06:01 -0000	1.4
--- aedStaticImage.h	6 Nov 2003 18:46:33 -0000	1.5
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedStaticImage class
***************
*** 36,40 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedStaticImage>;
  #endif
  
--- 37,41 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedStaticImage >;
  #endif
  

Index: aedStaticRTF.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedStaticRTF.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aedStaticRTF.h	25 Oct 2003 00:06:01 -0000	1.3
--- aedStaticRTF.h	6 Nov 2003 18:46:33 -0000	1.4
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedStaticRTF class
***************
*** 35,43 ****
      bool setDocument(char *text, int textlen);
      int getDocumentHeight(int width);
!     void setDocumentOffset(float offset); // 0.0 - 1.0
      virtual void render(void);
  
    private:
!     RTF_Context *m_doc;
      float m_docOffset;
  
--- 36,44 ----
      bool setDocument(char *text, int textlen);
      int getDocumentHeight(int width);
!     void setDocumentOffset(float offset);       // 0.0 - 1.0
      virtual void render(void);
  
    private:
!       RTF_Context * m_doc;
      float m_docOffset;
  
***************
*** 45,49 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedStaticRTF>;
  #endif
  
--- 46,50 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedStaticRTF >;
  #endif
  

Index: aedStaticText.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedStaticText.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** aedStaticText.h	25 Oct 2003 00:06:01 -0000	1.16
--- aedStaticText.h	6 Nov 2003 18:46:33 -0000	1.17
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedStaticText class
***************
*** 35,39 ****
  
      virtual void render(void);
!     
      /** Set text justification.
       * @param just one of AED_JUST_LEFT, AED_JUST_CENTER, AED_JUST_RIGHT
--- 36,40 ----
  
      virtual void render(void);
! 
      /** Set text justification.
       * @param just one of AED_JUST_LEFT, AED_JUST_CENTER, AED_JUST_RIGHT
***************
*** 44,48 ****
          setRenderState(true);
      }
!     
      /** Set font size. */
      void setFontSize(Uint8 size);
--- 45,49 ----
          setRenderState(true);
      }
! 
      /** Set font size. */
      void setFontSize(Uint8 size);
***************
*** 51,55 ****
          return m_FontSize;
      }
!     
      /** Set text color. */
      void setTextColor(aedColor color)
--- 52,56 ----
          return m_FontSize;
      }
! 
      /** Set text color. */
      void setTextColor(aedColor color)
***************
*** 58,65 ****
          setRenderState(true);
      }
!     
      /** Enable/disable bold text. */
      void setTextBold(bool bold);
!     
      /** Enable/disable word wrapping. */
      void setWordWrap(bool state)
--- 59,66 ----
          setRenderState(true);
      }
! 
      /** Enable/disable bold text. */
      void setTextBold(bool bold);
! 
      /** Enable/disable word wrapping. */
      void setWordWrap(bool state)
***************
*** 70,74 ****
  
      int getPosAtPixel(int x, int y);
!     virtual void setCaption(const std::string &caption);
  
    protected:
--- 71,75 ----
  
      int getPosAtPixel(int x, int y);
!     virtual void setCaption(const std::string & caption);
  
    protected:
***************
*** 86,90 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedStaticText>;
  #endif
  
--- 87,91 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedStaticText >;
  #endif
  

Index: aedTextBox.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedTextBox.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** aedTextBox.h	25 Oct 2003 00:06:01 -0000	1.14
--- aedTextBox.h	6 Nov 2003 18:46:33 -0000	1.15
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedTextBox class
***************
*** 33,39 ****
      virtual int wm_update(Uint32 msdelta);
      virtual int wm_lbuttondown(Uint16 x, Uint16 y);
! 	virtual int wm_lbuttonup(Uint16 x, Uint16 y);
! 	virtual int wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy);
! 	virtual int wm_mouseleave();
      virtual int wm_keydown(aedKeyEvent & event);
      virtual void render();
--- 34,40 ----
      virtual int wm_update(Uint32 msdelta);
      virtual int wm_lbuttondown(Uint16 x, Uint16 y);
!     virtual int wm_lbuttonup(Uint16 x, Uint16 y);
!     virtual int wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy);
!     virtual int wm_mouseleave();
      virtual int wm_keydown(aedKeyEvent & event);
      virtual void render();
***************
*** 60,64 ****
          return m_PasswordMode;
      }
!     
      /** Enable/disable password mode. */
      void setPasswordMode(bool enable)
--- 61,65 ----
          return m_PasswordMode;
      }
! 
      /** Enable/disable password mode. */
      void setPasswordMode(bool enable)
***************
*** 73,114 ****
      /** Set the string of characters to be ignored when processing
       * keyboard events. */
!     void setCharMask(std::string mask) { m_CharMask = mask; }
!     std::string getCharMask() { return m_CharMask; }
  
! 	void setSelection(Uint32 start, Uint32 end)
! 	{
! 		// Clamp the selection to the size of the string
! 		if (start > m_Caption.size())	start = m_Caption.size();
! 		if (end > m_Caption.size())		end = m_Caption.size();
  
! 		m_SelectionStart = start;
! 		m_SelectionEnd = end;
! 	}
  
! 	void setSelectionStart(Uint32 start)
! 	{
! 		setSelection(m_SelectionStart, start);
! 	}
  
! 	void setSelectionEnd(Uint32 end)
! 	{
! 		setSelection(m_SelectionStart, end);
! 	}
  
! 	int calculateCaretPosition(Uint16 x, Uint16 y);
  
    protected:
      Uint16 m_CaretPos;
! 	bool m_Selecting;
! 	Uint32 m_SelectionStart, m_SelectionEnd;
! 	Uint32 m_BlinkInterval, m_TimeSinceLastUpdate;
      int m_StartPixel;
      bool m_ShowCaret;
      bool m_PasswordMode;
      std::string m_CharMask;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedTextBox>;
  #endif
  
--- 74,124 ----
      /** Set the string of characters to be ignored when processing
       * keyboard events. */
!     void setCharMask(std::string mask)
!     {
!         m_CharMask = mask;
!     }
!     std::string getCharMask()
!     {
!         return m_CharMask;
!     }
  
!     void setSelection(Uint32 start, Uint32 end)
!     {
!         // Clamp the selection to the size of the string
!         if(start > m_Caption.size())
!             start = m_Caption.size();
!         if(end > m_Caption.size())
!             end = m_Caption.size();
  
!         m_SelectionStart = start;
!         m_SelectionEnd = end;
!     }
  
!     void setSelectionStart(Uint32 start)
!     {
!         setSelection(m_SelectionStart, start);
!     }
  
!     void setSelectionEnd(Uint32 end)
!     {
!         setSelection(m_SelectionStart, end);
!     }
  
!     int calculateCaretPosition(Uint16 x, Uint16 y);
  
    protected:
      Uint16 m_CaretPos;
!     bool m_Selecting;
!     Uint32 m_SelectionStart, m_SelectionEnd;
!     Uint32 m_BlinkInterval, m_TimeSinceLastUpdate;
      int m_StartPixel;
      bool m_ShowCaret;
      bool m_PasswordMode;
+ 
      std::string m_CharMask;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedTextBox >;
  #endif
  

Index: aedTheme.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedTheme.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** aedTheme.h	25 Oct 2003 19:23:05 -0000	1.12
--- aedTheme.h	6 Nov 2003 18:46:33 -0000	1.13
***************
*** 37,45 ****
  {
    public:
! 	aedTheme();
!     virtual ~aedTheme();
  
-     const aedThemeInfo *getThemeInfo() { return &m_ThemeInfo; }
- 	
      // Font properties
      std::string defaultFontName;
--- 37,48 ----
  {
    public:
!     aedTheme();
!     virtual ~ aedTheme();
! 
!     const aedThemeInfo *getThemeInfo()
!     {
!         return &m_ThemeInfo;
!     }
  
      // Font properties
      std::string defaultFontName;
***************
*** 63,75 ****
      DRAWFUNC(ScrollBar);
      DRAWFUNC(Frame);
! 	DRAWFUNC(ProgressBar);
! 	DRAWFUNC(CheckBox);
  
      virtual void drawBorder(aedWidget * widget, SDL_Surface * screen);
      virtual void drawBox(aedWidget * widget, SDL_Surface * screen);
      virtual void drawSquareButton(aedButton * widget, SDL_Surface * screen);
!     
    protected:
! 	aedThemeInfo m_ThemeInfo;
  };
  
--- 66,78 ----
      DRAWFUNC(ScrollBar);
      DRAWFUNC(Frame);
!     DRAWFUNC(ProgressBar);
!     DRAWFUNC(CheckBox);
  
      virtual void drawBorder(aedWidget * widget, SDL_Surface * screen);
      virtual void drawBox(aedWidget * widget, SDL_Surface * screen);
      virtual void drawSquareButton(aedButton * widget, SDL_Surface * screen);
! 
    protected:
!     aedThemeInfo m_ThemeInfo;
  };
  

Index: aedTimer.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedTimer.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** aedTimer.h	18 Sep 2003 20:45:53 -0000	1.8
--- aedTimer.h	6 Nov 2003 18:46:33 -0000	1.9
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The aedTimer class
***************
*** 35,43 ****
      aedTimer();
      ~aedTimer();
!     
      /** Set timer's interval.
       * @param time time in milliseconds */
      void setAlarm(Uint32 time);
!     
      /** Enable/disable timer. */
      void enable(bool state);
--- 36,44 ----
      aedTimer();
      ~aedTimer();
! 
      /** Set timer's interval.
       * @param time time in milliseconds */
      void setAlarm(Uint32 time);
! 
      /** Enable/disable timer. */
      void enable(bool state);
***************
*** 56,60 ****
  
  #if defined(_MSC_VER)
! DLLEXTERN template  DLLEXPORT aedFunctor1Arg<stub, aedTimer>;
  #endif
  
--- 57,61 ----
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg < stub, aedTimer >;
  #endif
  

Index: aedUpdateManager.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedUpdateManager.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aedUpdateManager.h	20 Aug 2003 16...
 
[truncated message content]