don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / private / stattext.h

diff --git a/include/wx/private/stattext.h b/include/wx/private/stattext.h
index ac22a59269970455bc4d4ec56e16fe0180f056f0..8c8966d64cf9d478ad625a3684c000c84d19201a 100644 (file)
--- a/include/wx/private/stattext.h
+++ b/include/wx/private/stattext.h
@@ -12,58 +12,7 @@
 #ifndef _WX_PRIVATE_STATTEXT_H_
 #define _WX_PRIVATE_STATTEXT_H_
 
 #ifndef _WX_PRIVATE_STATTEXT_H_
 #define _WX_PRIVATE_STATTEXT_H_
 

-#if wxUSE_STATTEXT
-
-// ----------------------------------------------------------------------------
-// wxTextWrapper
-// ----------------------------------------------------------------------------
-
-// this class is used to wrap the text on word boundary: wrapping is done by
-// calling OnStartLine() and OnOutputLine() functions
-class wxTextWrapper
-{
-public:
-    wxTextWrapper() { m_eol = false; }
-
-    // win is used for getting the font, text is the text to wrap, width is the
-    // max line width or -1 to disable wrapping
-    void Wrap(wxWindow *win, const wxString& text, int widthMax);
-
-    // we don't need it, but just to avoid compiler warnings
-    virtual ~wxTextWrapper() { }
-
-protected:
-    // line may be empty
-    virtual void OnOutputLine(const wxString& line) = 0;
-
-    // called at the start of every new line (except the very first one)
-    virtual void OnNewLine() { }
-
-private:
-    // call OnOutputLine() and set m_eol to true
-    void DoOutputLine(const wxString& line)
-    {
-        OnOutputLine(line);
-
-        m_eol = true;
-    }
-
-    // this function is a destructive inspector: when it returns true it also
-    // resets the flag to false so calling it again woulnd't return true any
-    // more
-    bool IsStartOfNewLine()
-    {
-        if ( !m_eol )
-            return false;
-
-        m_eol = false;
-
-        return true;
-    }
-
-
-    bool m_eol;
-};
+#include "wx/window.h"

 
 enum
 {
 
 enum
 {


@@ -90,6 +39,4 @@ enum
 //
 extern const wxChar *wxMarkupEntities[wxMARKUP_ELEMENT_MAX][wxMARKUP_ENTITY_MAX];
 
 //
 extern const wxChar *wxMarkupEntities[wxMARKUP_ELEMENT_MAX][wxMARKUP_ENTITY_MAX];
 

-#endif // wxUSE_STATTEXT
-

 #endif // _WX_PRIVATE_STATTEXT_H_
 #endif // _WX_PRIVATE_STATTEXT_H_