X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07854e5edda33cdb2c4ff50f545f7a3eb94badc3..1b1b531857cd17285816fcfd6a1a4cc623c6848b:/src/richtext/richtextsymboldlg.cpp?ds=inline

diff --git a/src/richtext/richtextsymboldlg.cpp b/src/richtext/richtextsymboldlg.cpp
index 7f53ddd320..183638b5b3 100644
--- a/src/richtext/richtextsymboldlg.cpp
+++ b/src/richtext/richtextsymboldlg.cpp
@@ -1,19 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        richtextsymboldlg.cpp
+// Name:        src/richtext/richtextsymboldlg.cpp
 // Purpose:
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/5/2006 3:11:58 PM
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_RICHTEXT
@@ -21,18 +21,19 @@
 #include "wx/richtext/richtextsymboldlg.h"
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
+    #include "wx/sizer.h"
+    #include "wx/stattext.h"
+    #include "wx/combobox.h"
+    #include "wx/button.h"
+    #include "wx/settings.h"
+    #include "wx/icon.h"
+    #include "wx/listbox.h"
 #endif
 
-////@begin includes
-////@end includes
-
-#include "wx/fontenum.h"
 #include "wx/dcbuffer.h"
-#include "wx/settings.h"
 
-////@begin XPM images
-////@end XPM images
+// Only for cached font name
+#include "wx/richtext/richtextctrl.h"
 
 /* Microsoft Unicode subset numbering
  */
@@ -275,6 +276,8 @@ bool wxSubsetValidForFont(int subsetIndex, FONTSIGNATURE *fontSig)
 }
 #endif
 
+bool wxSymbolPickerDialog::sm_showToolTips = false;
+
 /*!
  * wxSymbolPickerDialog type definition
  */
@@ -299,7 +302,7 @@ BEGIN_EVENT_TABLE( wxSymbolPickerDialog, wxDialog )
     EVT_COMBOBOX( ID_SYMBOLPICKERDIALOG_FROM, wxSymbolPickerDialog::OnFromUnicodeSelected )
 #endif
 
-#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOS2__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__)
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__)
     EVT_UPDATE_UI( wxID_OK, wxSymbolPickerDialog::OnOkUpdate )
 #endif
 
@@ -397,7 +400,10 @@ void wxSymbolPickerDialog::CreateControls()
     itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
 
     wxString* m_fontCtrlStrings = NULL;
-    m_fontCtrl = new wxComboBox( itemDialog1, ID_SYMBOLPICKERDIALOG_FONT, _T(""), wxDefaultPosition, wxSize(240, -1), 0, m_fontCtrlStrings, wxCB_READONLY );
+    m_fontCtrl = new wxComboBox( itemDialog1, ID_SYMBOLPICKERDIALOG_FONT, wxEmptyString, wxDefaultPosition, wxSize(240, -1), 0, m_fontCtrlStrings, wxCB_READONLY );
+    m_fontCtrl->SetHelpText(_("The font from which to take the symbol."));
+    if (ShowToolTips())
+        m_fontCtrl->SetToolTip(_("The font from which to take the symbol."));
     itemBoxSizer5->Add(m_fontCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     itemBoxSizer5->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
@@ -410,7 +416,7 @@ void wxSymbolPickerDialog::CreateControls()
 
 #if defined(__UNICODE__)
     wxString* m_subsetCtrlStrings = NULL;
-    m_subsetCtrl = new wxComboBox( itemDialog1, ID_SYMBOLPICKERDIALOG_SUBSET, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_subsetCtrlStrings, wxCB_READONLY );
+    m_subsetCtrl = new wxComboBox( itemDialog1, ID_SYMBOLPICKERDIALOG_SUBSET, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, m_subsetCtrlStrings, wxCB_READONLY );
     m_subsetCtrl->SetHelpText(_("Shows a Unicode subset."));
     if (ShowToolTips())
         m_subsetCtrl->SetToolTip(_("Shows a Unicode subset."));
@@ -432,7 +438,10 @@ void wxSymbolPickerDialog::CreateControls()
     wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Character code:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer12->Add(itemStaticText15, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
 
-    m_characterCodeCtrl = new wxTextCtrl( itemDialog1, ID_SYMBOLPICKERDIALOG_CHARACTERCODE, _T(""), wxDefaultPosition, wxSize(140, -1), wxTE_READONLY|wxTE_CENTRE );
+    m_characterCodeCtrl = new wxTextCtrl( itemDialog1, ID_SYMBOLPICKERDIALOG_CHARACTERCODE, wxEmptyString, wxDefaultPosition, wxSize(140, -1), wxTE_READONLY|wxTE_CENTRE );
+    m_characterCodeCtrl->SetHelpText(_("The character code."));
+    if (ShowToolTips())
+        m_characterCodeCtrl->SetToolTip(_("The character code."));
     itemBoxSizer12->Add(m_characterCodeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     itemBoxSizer12->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
@@ -450,11 +459,14 @@ void wxSymbolPickerDialog::CreateControls()
     };
     m_fromUnicodeCtrl = new wxComboBox( itemDialog1, ID_SYMBOLPICKERDIALOG_FROM, _("ASCII"), wxDefaultPosition, wxDefaultSize, 2, m_fromUnicodeCtrlStrings, wxCB_READONLY );
     m_fromUnicodeCtrl->SetStringSelection(_("ASCII"));
+    m_fromUnicodeCtrl->SetHelpText(_("The range to show."));
+    if (ShowToolTips())
+        m_fromUnicodeCtrl->SetToolTip(_("The range to show."));
     itemBoxSizer12->Add(m_fromUnicodeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 #endif
 
-#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOS2__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__)
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__)
     wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
     itemBoxSizer3->Add(itemBoxSizer20, 0, wxGROW, 5);
 
@@ -507,14 +519,14 @@ bool wxSymbolPickerDialog::TransferDataToWindow()
 
     if (m_fontCtrl->GetCount() == 0)
     {
-        wxArrayString faceNames = wxFontEnumerator::GetFacenames();
+        wxArrayString faceNames = wxRichTextCtrl::GetAvailableFontNames();
         faceNames.Sort();
 
         faceNames.Insert(_("(Normal text)"), 0);
         m_fontCtrl->Append(faceNames);
     }
 
-    if (m_fontName.IsEmpty())
+    if (m_fontName.empty())
         m_fontCtrl->SetSelection(0);
     else
     {
@@ -524,7 +536,7 @@ bool wxSymbolPickerDialog::TransferDataToWindow()
             m_fontCtrl->SetSelection(0);
     }
 
-    if (!m_symbol.IsEmpty())
+    if (!m_symbol.empty())
     {
         int sel = (int) m_symbol[0];
         m_symbolsCtrl->SetSelection(sel);
@@ -554,12 +566,12 @@ void wxSymbolPickerDialog::UpdateSymbolDisplay(bool updateSymbolList, bool showA
 {
     wxFont font;
     wxString fontNameToUse;
-    if (m_fontName.IsEmpty())
+    if (m_fontName.empty())
         fontNameToUse = m_normalTextFontName;
     else
         fontNameToUse = m_fontName;
 
-    if (!fontNameToUse.IsEmpty())
+    if (!fontNameToUse.empty())
     {
         font = wxFont(14, wxDEFAULT, wxNORMAL, wxNORMAL, false, fontNameToUse);
     }
@@ -571,7 +583,7 @@ void wxSymbolPickerDialog::UpdateSymbolDisplay(bool updateSymbolList, bool showA
         m_symbolsCtrl->SetFont(font);
     }
 
-    if (!m_symbol.IsEmpty())
+    if (!m_symbol.empty())
     {
         m_symbolStaticCtrl->SetFont(font);
         m_symbolStaticCtrl->SetLabel(m_symbol);
@@ -624,7 +636,7 @@ void wxSymbolPickerDialog::OnSymbolSelected( wxCommandEvent& event )
         return;
 
     int sel = event.GetSelection();
-    if (sel == -1)
+    if (sel == wxNOT_FOUND)
         m_symbol = wxEmptyString;
     else
     {
@@ -702,22 +714,13 @@ void wxSymbolPickerDialog::SetUnicodeMode(bool unicodeMode)
 /// Get the selected symbol character
 int wxSymbolPickerDialog::GetSymbolChar() const
 {
-    if (m_symbol.IsEmpty())
+    if (m_symbol.empty())
         return -1;
     else
         return (int) m_symbol[0];
 }
 
 
-/*!
- * Should we show tooltips?
- */
-
-bool wxSymbolPickerDialog::ShowToolTips()
-{
-    return true;
-}
-
 /*!
  * Get bitmap resources
  */