Update of /cvsroot/wgui/wgui/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6271/includes
Modified Files:
wg_frame.h wg_label.h wg_messagebox.h wg_renderedstring.h
Log Message:
Fixed project files to ignore "unreached code" warning in std::lists.
Other minor changes.
Index: wg_renderedstring.h
===================================================================
RCS file: /cvsroot/wgui/wgui/includes/wg_renderedstring.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wg_renderedstring.h 29 Dec 2005 13:46:18 -0000 1.20
--- wg_renderedstring.h 27 Jan 2006 16:59:40 -0000 1.21
***************
*** 84,88 ****
//! \param pOriginOffset A pointer to a CPoint object that will receive the offset of the top left corner of the rendered string from the origin of the string
//! \param pCharacterRects A pointer to a CRect vector that will receive CRects that contain each character. The corrdinates are in reference to the top left corner of the string as a whole
! void GetMetrics(CPoint* pBoundedDimensions, CPoint* pOriginOffset, std::vector<CRect>* pCharacterRects = 0) const;
//! Get the length of the rendered string in characters
--- 84,88 ----
//! \param pOriginOffset A pointer to a CPoint object that will receive the offset of the top left corner of the rendered string from the origin of the string
//! \param pCharacterRects A pointer to a CRect vector that will receive CRects that contain each character. The corrdinates are in reference to the top left corner of the string as a whole
! void GetMetrics(CPoint* pBoundedDimensions = 0, CPoint* pOriginOffset = 0, std::vector<CRect>* pCharacterRects = 0) const;
//! Get the length of the rendered string in characters
Index: wg_frame.h
===================================================================
RCS file: /cvsroot/wgui/wgui/includes/wg_frame.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wg_frame.h 27 Sep 2005 19:00:01 -0000 1.21
--- wg_frame.h 27 Jan 2006 16:59:40 -0000 1.22
***************
*** 48,52 ****
//! \param sTitle The window title, which will appear in the title bar of the view
//! \param bResizable If true, the window will be resizable
! CFrame(const CRect& WindowRect, CView* pParent, CFontEngine* pFontEngine, const std::string& sTitle, bool bResizable = true);
//! Standard destructor
--- 48,52 ----
//! \param sTitle The window title, which will appear in the title bar of the view
//! \param bResizable If true, the window will be resizable
! CFrame(const CRect& WindowRect, CView* pParent, CFontEngine* pFontEngine = 0, const std::string& sTitle = "", bool bResizable = true);
//! Standard destructor
Index: wg_messagebox.h
===================================================================
RCS file: /cvsroot/wgui/wgui/includes/wg_messagebox.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wg_messagebox.h 22 Sep 2005 20:51:48 -0000 1.7
--- wg_messagebox.h 27 Jan 2006 16:59:40 -0000 1.8
***************
*** 54,57 ****
--- 54,60 ----
};
+ //! This will attempt to size the message box to fit the text
+ virtual void FitToText(void);
+
// CMessageClient overrides
Index: wg_label.h
===================================================================
RCS file: /cvsroot/wgui/wgui/includes/wg_label.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wg_label.h 29 Dec 2005 13:46:18 -0000 1.19
--- wg_label.h 27 Jan 2006 16:59:40 -0000 1.20
***************
*** 57,66 ****
//! Sets the color of the font used to render the label
//! \param FontColor The color of the label text
! void SetFontColor(CRGBColor& FontColor) { m_FontColor = FontColor; }
//! Gets the font color for the label
//! \return The color of the text in the label
! CRGBColor GetFontColor(void) { return m_FontColor; }
// CWindow overrides
--- 57,70 ----
//! Sets the color of the font used to render the label
//! \param FontColor The color of the label text
! virtual void SetFontColor(CRGBColor& FontColor) { m_FontColor = FontColor; }
//! Gets the font color for the label
//! \return The color of the text in the label
! virtual CRGBColor GetFontColor(void) { return m_FontColor; }
+ //! Return a pointer to the rendered string
+ //! \return A CRenderedString pointer
+ virtual CRenderedString* GetRenderedString(void) const { return m_pRenderedString.get(); }
+
// CWindow overrides
|
