X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8871035d85c46a417f9f91cdb8ce02d53d6a1dcc..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/richtext/richtextsymboldlg.h?ds=inline diff --git a/include/wx/richtext/richtextsymboldlg.h b/include/wx/richtext/richtextsymboldlg.h index 485d0ffe21..a5946bf7d2 100644 --- a/include/wx/richtext/richtextsymboldlg.h +++ b/include/wx/richtext/richtextsymboldlg.h @@ -16,17 +16,21 @@ * Includes */ +#include "wx/richtext/richtextuicustomization.h" #include "wx/dialog.h" #include "wx/vscroll.h" -#include "wx/combobox.h" -#include "wx/stattext.h" /*! * Forward declarations */ +class WXDLLIMPEXP_FWD_CORE wxStaticText; +class WXDLLIMPEXP_FWD_CORE wxComboBox; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; + ////@begin forward declarations class wxSymbolListCtrl; +class wxStdDialogButtonSizer; ////@end forward declarations // __UNICODE__ is a symbol used by DialogBlocks-generated code. @@ -41,7 +45,7 @@ class wxSymbolListCtrl; */ #define SYMBOL_WXSYMBOLPICKERDIALOG_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxCLOSE_BOX) -#define SYMBOL_WXSYMBOLPICKERDIALOG_TITLE _("Symbols") +#define SYMBOL_WXSYMBOLPICKERDIALOG_TITLE wxGetTranslation("Symbols") #define SYMBOL_WXSYMBOLPICKERDIALOG_IDNAME ID_SYMBOLPICKERDIALOG #define SYMBOL_WXSYMBOLPICKERDIALOG_SIZE wxSize(400, 300) #define SYMBOL_WXSYMBOLPICKERDIALOG_POSITION wxDefaultPosition @@ -54,6 +58,7 @@ class WXDLLIMPEXP_RICHTEXT wxSymbolPickerDialog: public wxDialog { DECLARE_DYNAMIC_CLASS( wxSymbolPickerDialog ) DECLARE_EVENT_TABLE() + DECLARE_HELP_PROVISION() public: /// Constructors @@ -103,29 +108,31 @@ public: ////@begin wxSymbolPickerDialog event handler declarations - /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_SYMBOLPICKERDIALOG_FONT + /// wxEVT_COMBOBOX event handler for ID_SYMBOLPICKERDIALOG_FONT void OnFontCtrlSelected( wxCommandEvent& event ); #if defined(__UNICODE__) - /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_SYMBOLPICKERDIALOG_SUBSET + /// wxEVT_COMBOBOX event handler for ID_SYMBOLPICKERDIALOG_SUBSET void OnSubsetSelected( wxCommandEvent& event ); + /// wxEVT_UPDATE_UI event handler for ID_SYMBOLPICKERDIALOG_SUBSET + void OnSymbolpickerdialogSubsetUpdate( wxUpdateUIEvent& event ); + #endif #if defined(__UNICODE__) - /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_SYMBOLPICKERDIALOG_FROM + /// wxEVT_COMBOBOX event handler for ID_SYMBOLPICKERDIALOG_FROM void OnFromUnicodeSelected( wxCommandEvent& event ); #endif -#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__) /// wxEVT_UPDATE_UI event handler for wxID_OK void OnOkUpdate( wxUpdateUIEvent& event ); -#endif -#if defined(__WXMAC__) - /// wxEVT_UPDATE_UI event handler for wxID_OK - void OnOkUpdate( wxUpdateUIEvent& event ); + /// wxEVT_BUTTON event handler for wxID_HELP + void OnHelpClick( wxCommandEvent& event ); + + /// wxEVT_UPDATE_UI event handler for wxID_HELP + void OnHelpUpdate( wxUpdateUIEvent& event ); -#endif ////@end wxSymbolPickerDialog event handler declarations ////@begin wxSymbolPickerDialog member function declarations @@ -133,15 +140,15 @@ public: wxString GetFontName() const { return m_fontName ; } void SetFontName(wxString value) { m_fontName = value ; } - wxString GetSymbol() const { return m_symbol ; } - void SetSymbol(wxString value) { m_symbol = value ; } - bool GetFromUnicode() const { return m_fromUnicode ; } void SetFromUnicode(bool value) { m_fromUnicode = value ; } wxString GetNormalTextFontName() const { return m_normalTextFontName ; } void SetNormalTextFontName(wxString value) { m_normalTextFontName = value ; } + wxString GetSymbol() const { return m_symbol ; } + void SetSymbol(wxString value) { m_symbol = value ; } + /// Retrieves bitmap resources wxBitmap GetBitmapResource( const wxString& name ); @@ -160,10 +167,11 @@ public: #if defined(__UNICODE__) wxComboBox* m_fromUnicodeCtrl; #endif + wxStdDialogButtonSizer* m_stdButtonSizer; wxString m_fontName; - wxString m_symbol; bool m_fromUnicode; wxString m_normalTextFontName; + wxString m_symbol; /// Control identifiers enum { ID_SYMBOLPICKERDIALOG = 10600, @@ -290,7 +298,7 @@ protected: virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const; // gets the line height - virtual wxCoord OnGetLineHeight(size_t line) const; + virtual wxCoord OnGetRowHeight(size_t line) const; // event handlers void OnPaint(wxPaintEvent& event); @@ -301,7 +309,7 @@ protected: // common part of all ctors void Init(); - // send the wxEVT_COMMAND_LISTBOX_SELECTED event + // send the wxEVT_LISTBOX event void SendSelectedEvent(); // change the current item (in single selection listbox it also implicitly @@ -360,7 +368,7 @@ private: bool m_unicodeMode; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSymbolListCtrl) + wxDECLARE_NO_COPY_CLASS(wxSymbolListCtrl); DECLARE_ABSTRACT_CLASS(wxSymbolListCtrl) };