Correct wxDataViewCtrl::IsExpanded

[wxWidgets.git] / interface / wx / richtext / richtextsymboldlg.h

diff --git a/interface/wx/richtext/richtextsymboldlg.h b/interface/wx/richtext/richtextsymboldlg.h
index 1095e8c05840c75a25220fbe03093dfe52016986..3e1778910c125071be6a149a75ea6263cd30c1a4 100644 (file)
--- a/interface/wx/richtext/richtextsymboldlg.h
+++ b/interface/wx/richtext/richtextsymboldlg.h
@@ -42,14 +42,14 @@
         ctrl-GetStyle(ctrl->GetInsertionPoint(), attr);
 
         wxString currentFontName;
         ctrl-GetStyle(ctrl->GetInsertionPoint(), attr);
 
         wxString currentFontName;

-        if (attr.HasFont() && attr.GetFont().Ok())
+        if (attr.HasFont() && attr.GetFont().IsOk())

             currentFontName = attr.GetFont().GetFaceName();
 
         // Don't set the initial font in the dialog (so the user is choosing
         // 'normal text', i.e. the current font) but do tell the dialog
         // what 'normal text' is.
 
             currentFontName = attr.GetFont().GetFaceName();
 
         // Don't set the initial font in the dialog (so the user is choosing
         // 'normal text', i.e. the current font) but do tell the dialog
         // what 'normal text' is.
 

-        wxSymbolPickerDialog dlg(wxT("*"), wxEmptyString, currentFontName, this);
+        wxSymbolPickerDialog dlg("*", wxEmptyString, currentFontName, this);

 
         if (dlg.ShowModal() == wxID_OK)
         {
 
         if (dlg.ShowModal() == wxID_OK)
         {


@@ -120,15 +120,10 @@ public:
         Creation: see @ref wxSymbolPickerDialog() "the constructor" for details about
         the parameters.
     */
         Creation: see @ref wxSymbolPickerDialog() "the constructor" for details about
         the parameters.
     */

-    bool Create(const wxString& symbol,
-                const wxString& initialFont,
-                const wxString& normalTextFont,
-                wxWindow* parent,
+    bool Create(const wxString& symbol, const wxString& initialFont,
+                const wxString& normalTextFont, wxWindow* parent,

                 wxWindowID id = wxID_ANY,
                 wxWindowID id = wxID_ANY,

-                const wxString& title = _("Symbols"),
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxCLOSE_BOX);
+                const wxString& caption = wxGetTranslation("Symbols"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(400, 300), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxCLOSE_BOX);

 
     /**
         Returns the font name (the font reflected in the font list).
 
     /**
         Returns the font name (the font reflected in the font list).


@@ -163,7 +158,7 @@ public:
     /**
         Sets the initial/selected font name.
     */
     /**
         Sets the initial/selected font name.
     */

-    void SetFontName(const wxString& value);
+    void SetFontName(wxString value);

 
     /**
         Sets the internal flag indicating that the full Unicode range should be
 
     /**
         Sets the internal flag indicating that the full Unicode range should be


@@ -174,12 +169,12 @@ public:
     /**
         Sets the name of the font to be used in the absence of a selected font.
     */
     /**
         Sets the name of the font to be used in the absence of a selected font.
     */

-    void SetNormalTextFontName(const wxString& value);
+    void SetNormalTextFontName(wxString value);

 
     /**
         Sets the symbol as a one or zero character string.
     */
 
     /**
         Sets the symbol as a one or zero character string.
     */

-    void SetSymbol(const wxString& value);
+    void SetSymbol(wxString value);

 
     /**
         Sets Unicode display mode.
 
     /**
         Sets Unicode display mode.