renamed wxComboControl to wxComboCtrl and related wxUSE_XXX and configure switches...

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

diff --git a/include/wx/richtext/richtextstyles.h b/include/wx/richtext/richtextstyles.h
index 6993808ee63200ab16836875c3199a18156d0c20..067030083dece0275a7fc84f5b6b4989f36c643d 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
@@ -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;