make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/richtext/richtextformatdlg.h b/include/wx/richtext/richtextformatdlg.h
index 279231699e0882d08441075e58217894ade08f95..3e2726342ba6e0f950fabb155f4dd659f4d12d0d 100644 (file)
--- a/include/wx/richtext/richtextformatdlg.h
+++ b/include/wx/richtext/richtextformatdlg.h
@@ -30,8 +30,8 @@
 #include "wx/richtext/richtextbuffer.h"
 #include "wx/richtext/richtextstyles.h"
 
 #include "wx/richtext/richtextbuffer.h"
 #include "wx/richtext/richtextstyles.h"
 

-class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog;
-class WXDLLIMPEXP_CORE wxImageList;
+class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFormattingDialog;
+class WXDLLIMPEXP_FWD_CORE wxImageList;

 
 /*!
  * Flags determining the pages and buttons to be created in the dialog
 
 /*!
  * Flags determining the pages and buttons to be created in the dialog


@@ -46,6 +46,23 @@ class WXDLLIMPEXP_CORE wxImageList;
 
 #define wxRICHTEXT_FORMAT_HELP_BUTTON       0x0100
 
 
 #define wxRICHTEXT_FORMAT_HELP_BUTTON       0x0100
 

+/*!
+ * Indices for bullet styles in list control
+ */
+
+enum {
+    wxRICHTEXT_BULLETINDEX_NONE = 0,
+    wxRICHTEXT_BULLETINDEX_ARABIC,
+    wxRICHTEXT_BULLETINDEX_UPPER_CASE,
+    wxRICHTEXT_BULLETINDEX_LOWER_CASE,
+    wxRICHTEXT_BULLETINDEX_UPPER_CASE_ROMAN,
+    wxRICHTEXT_BULLETINDEX_LOWER_CASE_ROMAN,
+    wxRICHTEXT_BULLETINDEX_OUTLINE,
+    wxRICHTEXT_BULLETINDEX_SYMBOL,
+    wxRICHTEXT_BULLETINDEX_BITMAP,
+    wxRICHTEXT_BULLETINDEX_STANDARD
+};
+

 /*!
  * Shorthand for common combinations of pages
  */
 /*!
  * Shorthand for common combinations of pages
  */


@@ -101,7 +118,7 @@ DECLARE_CLASS(wxRichTextFormattingDialog)
 public:
     wxRichTextFormattingDialog() { Init(); }
 
 public:
     wxRichTextFormattingDialog() { Init(); }
 

-    wxRichTextFormattingDialog(long flags, wxWindow* parent, const wxString& title = _("Formatting"), wxWindowID id = wxID_ANY,
+    wxRichTextFormattingDialog(long flags, wxWindow* parent, const wxString& title = wxGetTranslation(wxT("Formatting")), wxWindowID id = wxID_ANY,

         const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize,
         long style = wxDEFAULT_DIALOG_STYLE)
     {
         const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize,
         long style = wxDEFAULT_DIALOG_STYLE)
     {


@@ -113,7 +130,7 @@ public:
 
     void Init();
 
 
     void Init();
 

-    bool Create(long flags, wxWindow* parent, const wxString& title = _("Formatting"), wxWindowID id = wxID_ANY,
+    bool Create(long flags, wxWindow* parent, const wxString& title = wxGetTranslation(wxT("Formatting")), wxWindowID id = wxID_ANY,

         const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize,
         long style = wxDEFAULT_DIALOG_STYLE);
 
         const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize,
         long style = wxDEFAULT_DIALOG_STYLE);
 


@@ -205,9 +222,15 @@ public:
         wxWindow(parent, id, pos, sz, style)
     {
         SetBackgroundColour(*wxWHITE);
         wxWindow(parent, id, pos, sz, style)
     {
         SetBackgroundColour(*wxWHITE);

+        m_textEffects = 0;

     }
 
     }
 

+    void SetTextEffects(int effects) { m_textEffects = effects; }
+    int GetTextEffects() const { return m_textEffects; }
+

 private:
 private:

+    int m_textEffects;
+

     void OnPaint(wxPaintEvent& event);
     DECLARE_EVENT_TABLE()
 };
     void OnPaint(wxPaintEvent& event);
     DECLARE_EVENT_TABLE()
 };