Get/SetTitle only for wxTopLevelWindow (wxOS2 part).

[wxWidgets.git] / include / wx / richtext / richtextbuffer.h

diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index 68e1fefd458d3f7d0ab501d90db80328242b492b..ec08ad73766a6e96a2e08121bb5b4b9358c9cd4b 100644 (file)
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_RICHTEXTBUFFER_H_
+#define _WX_RICHTEXTBUFFER_H_
+

 /*
 
   Data structures
 /*
 
   Data structures


@@ -84,17 +87,17 @@
 
  */
 
 
  */
 

-#ifndef _WX_RICHTEXTBUFFER_H_
-#define _WX_RICHTEXTBUFFER_H_
-

 /*!
  * Includes
  */
 
 /*!
  * Includes
  */
 

-#include "wx/list.h"
+#include "wx/defs.h"

 
 #if wxUSE_RICHTEXT
 
 
 #if wxUSE_RICHTEXT
 

+#include "wx/list.h"
+#include "wx/textctrl.h"
+#include "wx/bitmap.h"

 #include "wx/image.h"
 #include "wx/cmdproc.h"
 #include "wx/txtstrm.h"
 #include "wx/image.h"
 #include "wx/cmdproc.h"
 #include "wx/txtstrm.h"


@@ -489,13 +492,13 @@ private:
     wxString            m_paragraphStyleName;
 };
 
     wxString            m_paragraphStyleName;
 };
 

-#define wxTEXT_ATTR_CHARACTER (wxTEXT_ATTR_FONT) | wxTEXT_ATTR_BACKGROUND_COLOUR | wxTEXT_ATTR_TEXT_COLOUR
+#define wxTEXT_ATTR_CHARACTER (wxTEXT_ATTR_FONT | wxTEXT_ATTR_BACKGROUND_COLOUR | wxTEXT_ATTR_TEXT_COLOUR)

 
 

-#define wxTEXT_ATTR_PARAGRAPH  wxTEXT_ATTR_ALIGNMENT|wxTEXT_ATTR_LEFT_INDENT|wxTEXT_ATTR_RIGHT_INDENT|wxTEXT_ATTR_TABS|\
+#define wxTEXT_ATTR_PARAGRAPH (wxTEXT_ATTR_ALIGNMENT|wxTEXT_ATTR_LEFT_INDENT|wxTEXT_ATTR_RIGHT_INDENT|wxTEXT_ATTR_TABS|\

     wxTEXT_ATTR_PARA_SPACING_BEFORE|wxTEXT_ATTR_PARA_SPACING_AFTER|wxTEXT_ATTR_LINE_SPACING|\
     wxTEXT_ATTR_PARA_SPACING_BEFORE|wxTEXT_ATTR_PARA_SPACING_AFTER|wxTEXT_ATTR_LINE_SPACING|\

-    wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_SYMBOL
+    wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_SYMBOL)

 
 

-#define wxTEXT_ATTR_ALL wxTEXT_ATTR_CHARACTER|wxTEXT_ATTR_PARAGRAPH
+#define wxTEXT_ATTR_ALL (wxTEXT_ATTR_CHARACTER|wxTEXT_ATTR_PARAGRAPH)

 
 /*!
  * wxRichTextObject class declaration
 
 /*!
  * wxRichTextObject class declaration


@@ -648,7 +651,7 @@ protected:
     wxTextAttrEx            m_attributes;
 };
 
     wxTextAttrEx            m_attributes;
 };
 

-WX_DECLARE_EXPORTED_LIST( wxRichTextObject, wxRichTextObjectList );
+WX_DECLARE_LIST_WITH_DECL( wxRichTextObject, wxRichTextObjectList, class WXDLLIMPEXP_ADV );

 
 /*!
  * wxRichTextCompositeObject class declaration
 
 /*!
  * wxRichTextCompositeObject class declaration


@@ -1071,7 +1074,7 @@ protected:
     wxRichTextParagraph* m_parent;
 };
 
     wxRichTextParagraph* m_parent;
 };
 

-WX_DECLARE_EXPORTED_LIST( wxRichTextLine, wxRichTextLineList );
+WX_DECLARE_LIST_WITH_DECL( wxRichTextLine, wxRichTextLineList , class WXDLLIMPEXP_ADV );

 
 /*!
  * wxRichTextParagraph class declaration
 
 /*!
  * wxRichTextParagraph class declaration