Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/richtext/richtextsymboldlg.h b/include/wx/richtext/richtextsymboldlg.h
index 19bd1300050e3e28fa2b2823fd16d4ea2e38d827..a5946bf7d26b1cd55144fa281d6bdeac008fb667 100644 (file)
--- a/include/wx/richtext/richtextsymboldlg.h
+++ b/include/wx/richtext/richtextsymboldlg.h
@@ -16,20 +16,21 @@
  * Includes
  */
 
  * Includes
  */
 

+#include "wx/richtext/richtextuicustomization.h"

 #include "wx/dialog.h"
 #include "wx/vscroll.h"
 #include "wx/dialog.h"
 #include "wx/vscroll.h"

-#include "wx/combobox.h"
-#include "wx/stattext.h"

 
 /*!
  * Forward declarations
  */
 
 
 /*!
  * Forward declarations
  */
 

+class WXDLLIMPEXP_FWD_CORE wxStaticText;
+class WXDLLIMPEXP_FWD_CORE wxComboBox;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+

 ////@begin forward declarations
 class wxSymbolListCtrl;
 ////@begin forward declarations
 class wxSymbolListCtrl;

-
-class WXDLLIMPEXP_CORE wxTextCtrl;
-
+class wxStdDialogButtonSizer;

 ////@end forward declarations
 
 // __UNICODE__ is a symbol used by DialogBlocks-generated code.
 ////@end forward declarations
 
 // __UNICODE__ is a symbol used by DialogBlocks-generated code.


@@ -44,7 +45,7 @@ class WXDLLIMPEXP_CORE wxTextCtrl;
  */
 
 #define SYMBOL_WXSYMBOLPICKERDIALOG_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxCLOSE_BOX)
  */
 
 #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
 #define SYMBOL_WXSYMBOLPICKERDIALOG_IDNAME ID_SYMBOLPICKERDIALOG
 #define SYMBOL_WXSYMBOLPICKERDIALOG_SIZE wxSize(400, 300)
 #define SYMBOL_WXSYMBOLPICKERDIALOG_POSITION wxDefaultPosition


@@ -57,6 +58,7 @@ class WXDLLIMPEXP_RICHTEXT wxSymbolPickerDialog: public wxDialog
 {
     DECLARE_DYNAMIC_CLASS( wxSymbolPickerDialog )
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS( wxSymbolPickerDialog )
     DECLARE_EVENT_TABLE()

+    DECLARE_HELP_PROVISION()

 
 public:
     /// Constructors
 
 public:
     /// Constructors


@@ -106,23 +108,31 @@ public:
 
 ////@begin wxSymbolPickerDialog event handler declarations
 
 
 ////@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__)
     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 );
 
     void OnSubsetSelected( wxCommandEvent& event );
 

+    /// wxEVT_UPDATE_UI event handler for ID_SYMBOLPICKERDIALOG_SUBSET
+    void OnSymbolpickerdialogSubsetUpdate( wxUpdateUIEvent& event );
+

 #endif
 #if defined(__UNICODE__)
 #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
     void OnFromUnicodeSelected( wxCommandEvent& event );
 
 #endif

-

     /// wxEVT_UPDATE_UI event handler for wxID_OK
     void OnOkUpdate( wxUpdateUIEvent& event );
 
     /// 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 );
+

 ////@end wxSymbolPickerDialog event handler declarations
 
 ////@begin wxSymbolPickerDialog member function declarations
 ////@end wxSymbolPickerDialog event handler declarations
 
 ////@begin wxSymbolPickerDialog member function declarations


@@ -130,15 +140,15 @@ public:
     wxString GetFontName() const { return m_fontName ; }
     void SetFontName(wxString value) { m_fontName = value ; }
 
     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 ; }
 
     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 );
 
     /// Retrieves bitmap resources
     wxBitmap GetBitmapResource( const wxString& name );
 


@@ -157,10 +167,11 @@ public:
 #if defined(__UNICODE__)
     wxComboBox* m_fromUnicodeCtrl;
 #endif
 #if defined(__UNICODE__)
     wxComboBox* m_fromUnicodeCtrl;
 #endif

+    wxStdDialogButtonSizer* m_stdButtonSizer;

     wxString m_fontName;
     wxString m_fontName;

-    wxString m_symbol;

     bool m_fromUnicode;
     wxString m_normalTextFontName;
     bool m_fromUnicode;
     wxString m_normalTextFontName;

+    wxString m_symbol;

     /// Control identifiers
     enum {
         ID_SYMBOLPICKERDIALOG = 10600,
     /// Control identifiers
     enum {
         ID_SYMBOLPICKERDIALOG = 10600,


@@ -298,7 +309,7 @@ protected:
     // common part of all ctors
     void Init();
 
     // 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
     void SendSelectedEvent();
 
     // change the current item (in single selection listbox it also implicitly


@@ -357,7 +368,7 @@ private:
     bool        m_unicodeMode;
 
     DECLARE_EVENT_TABLE()
     bool        m_unicodeMode;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxSymbolListCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxSymbolListCtrl);

     DECLARE_ABSTRACT_CLASS(wxSymbolListCtrl)
 };
 
     DECLARE_ABSTRACT_CLASS(wxSymbolListCtrl)
 };