avoid warnings about undefined wxUSE_LOG_DEBUG if wxUSE_LOG=0

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

diff --git a/include/wx/richtext/richtextstyles.h b/include/wx/richtext/richtextstyles.h
index 6993808ee63200ab16836875c3199a18156d0c20..deae6c3d1356a29bfd58ccddafe574c2e880112c 100644 (file)
--- a/include/wx/richtext/richtextstyles.h
+++ b/include/wx/richtext/richtextstyles.h
@@ -16,12 +16,10 @@
  * Includes
  */
 
-#include "wx/defs.h"
+#include "wx/richtext/richtextbuffer.h"
 
 #if wxUSE_RICHTEXT
 
-#include "wx/richtext/richtextbuffer.h"
-
 #if wxUSE_HTML
 #include "wx/htmllbox.h"
 #endif
@@ -30,15 +28,15 @@
  * Forward declarations
  */
 
-class WXDLLIMPEXP_ADV wxRichTextCtrl;
-class WXDLLIMPEXP_ADV wxRichTextBuffer;
+class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl;
+class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer;
 
 /*!
  * wxRichTextStyleDefinition class declaration
  * A base class for paragraph and character styles.
  */
 
-class WXDLLIMPEXP_ADV wxRichTextStyleDefinition: public wxObject
+class WXDLLIMPEXP_RICHTEXT wxRichTextStyleDefinition: public wxObject
 {
     DECLARE_CLASS(wxRichTextStyleDefinition)
 public:
@@ -73,7 +71,7 @@ protected:
  * wxRichTextCharacterStyleDefinition class declaration
  */
 
-class WXDLLIMPEXP_ADV wxRichTextCharacterStyleDefinition: public wxRichTextStyleDefinition
+class WXDLLIMPEXP_RICHTEXT wxRichTextCharacterStyleDefinition: public wxRichTextStyleDefinition
 {
     DECLARE_DYNAMIC_CLASS(wxRichTextCharacterStyleDefinition)
 public:
@@ -91,7 +89,7 @@ protected:
  * wxRichTextParagraphStyleDefinition class declaration
  */
 
-class WXDLLIMPEXP_ADV wxRichTextParagraphStyleDefinition: public wxRichTextStyleDefinition
+class WXDLLIMPEXP_RICHTEXT wxRichTextParagraphStyleDefinition: public wxRichTextStyleDefinition
 {
     DECLARE_DYNAMIC_CLASS(wxRichTextParagraphStyleDefinition)
 public:
@@ -116,7 +114,7 @@ protected:
  * The style sheet
  */
 
-class WXDLLIMPEXP_ADV wxRichTextStyleSheet: public wxObject
+class WXDLLIMPEXP_RICHTEXT wxRichTextStyleSheet: public wxObject
 {
     DECLARE_CLASS( wxRichTextStyleSheet )
 
@@ -184,7 +182,7 @@ protected:
  * A listbox to display styles.
  */
 
-class WXDLLIMPEXP_ADV wxRichTextStyleListBox: public wxHtmlListBox
+class WXDLLIMPEXP_RICHTEXT wxRichTextStyleListBox: public wxHtmlListBox
 {
     DECLARE_CLASS(wxRichTextStyleListBox)
     DECLARE_EVENT_TABLE()
@@ -194,9 +192,6 @@ public:
         const wxSize& size = wxDefaultSize, long style = 0);
     ~wxRichTextStyleListBox();
 
-    /// Returns the HTML for this item
-    virtual wxString OnGetItem(size_t n) const;
-
     /// Creates a suitable HTML fragment for a definition
     wxString CreateHTML(wxRichTextStyleDefinition* def) const;
 
@@ -228,6 +223,10 @@ public:
     // Convert units in tends of a millimetre to device units
     int ConvertTenthsMMToPixels(wxDC& dc, int units) const;
 
+protected:
+    /// Returns the HTML for this item
+    virtual wxString OnGetItem(size_t n) const;
+
 private:
 
     wxRichTextStyleSheet*   m_styleSheet;