Support wxDF_UNICODETEXT

[wxWidgets.git] / src / richtext / richtextbulletspage.cpp

diff --git a/src/richtext/richtextbulletspage.cpp b/src/richtext/richtextbulletspage.cpp
index 632fd213ecc5e2a56b81cbe5dcd0b585fc7e450a..e71094592f4cb440cb5c856c8ed083e532265497 100644 (file)
--- a/src/richtext/richtextbulletspage.cpp
+++ b/src/richtext/richtextbulletspage.cpp
@@ -9,20 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-

 #if wxUSE_RICHTEXT
 
 #include "wx/richtext/richtextbulletspage.h"
 
 #if wxUSE_RICHTEXT
 
 #include "wx/richtext/richtextbulletspage.h"
 

-#ifndef WX_PRECOMP
-#endif
-

 #include "wx/richtext/richtextsymboldlg.h"
 #include "wx/fontenum.h"
 
 #include "wx/richtext/richtextsymboldlg.h"
 #include "wx/fontenum.h"
 


@@ -90,7 +80,7 @@ wxRichTextBulletsPage::wxRichTextBulletsPage( wxWindow* parent, wxWindowID id, c
 /*!
  * Initialise members
  */
 /*!
  * Initialise members
  */

- 
+

 void wxRichTextBulletsPage::Init()
 {
     m_hasBulletStyle = false;
 void wxRichTextBulletsPage::Init()
 {
     m_hasBulletStyle = false;


@@ -252,12 +242,12 @@ void wxRichTextBulletsPage::CreateControls()
     m_symbolCtrl->Append(_(">"));
     m_symbolCtrl->Append(_("+"));
     m_symbolCtrl->Append(_("~"));
     m_symbolCtrl->Append(_(">"));
     m_symbolCtrl->Append(_("+"));
     m_symbolCtrl->Append(_("~"));

-    
+

     wxFontEnumerator enumerator;
     enumerator.EnumerateFacenames();
     wxArrayString facenames = enumerator.GetFacenames();
     facenames.Sort();
     wxFontEnumerator enumerator;
     enumerator.EnumerateFacenames();
     wxArrayString facenames = enumerator.GetFacenames();
     facenames.Sort();

-    
+

     m_symbolFontCtrl->Append(facenames);
 }
 
     m_symbolFontCtrl->Append(facenames);
 }
 


@@ -347,7 +337,7 @@ bool wxRichTextBulletsPage::TransferDataToWindow()
         if (attr->GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD)
             m_periodCtrl->SetValue(true);
         else
         if (attr->GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD)
             m_periodCtrl->SetValue(true);
         else

-            m_periodCtrl->SetValue(false);        
+            m_periodCtrl->SetValue(false);

     }
     else
         m_styleListBox->SetSelection(-1);
     }
     else
         m_styleListBox->SetSelection(-1);


@@ -625,10 +615,10 @@ void wxRichTextBulletsPage::OnChooseSymbolClick( wxCommandEvent& WXUNUSED(event)
         if (dlg.ShowModal() == wxID_OK)
         {
             m_dontUpdate = true;
         if (dlg.ShowModal() == wxID_OK)
         {
             m_dontUpdate = true;

-            
+

             m_symbolCtrl->SetValue(dlg.GetSymbol());
             m_symbolFontCtrl->SetValue(dlg.GetFontName());
             m_symbolCtrl->SetValue(dlg.GetSymbol());
             m_symbolFontCtrl->SetValue(dlg.GetFontName());

-            
+

             UpdatePreview();
 
             m_dontUpdate = false;
             UpdatePreview();
 
             m_dontUpdate = false;