Rebake from clean wx tree.

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

diff --git a/include/wx/richtext/richtextsymboldlg.h b/include/wx/richtext/richtextsymboldlg.h
index 3588885f0c8fd71c2430a7ddba100fc05fb0e486..20992812ff1ea777944caac5adf2994c6586080a 100644 (file)
--- a/include/wx/richtext/richtextsymboldlg.h
+++ b/include/wx/richtext/richtextsymboldlg.h
@@ -23,19 +23,27 @@
  * Forward declarations
  */
 
  * Forward declarations
  */
 

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

 ////@begin forward declarations
 ////@begin forward declarations

-class WXDLLIMPEXP_RICHTEXT wxSymbolListCtrl;
-class WXDLLIMPEXP_CORE wxComboBox;
-class WXDLLIMPEXP_CORE wxStaticText;
-class WXDLLIMPEXP_CORE wxTextCtrl;
+class wxSymbolListCtrl;

 ////@end forward declarations
 
 ////@end forward declarations
 

+// __UNICODE__ is a symbol used by DialogBlocks-generated code.
+#ifndef __UNICODE__
+#if wxUSE_UNICODE
+#define __UNICODE__
+#endif
+#endif
+

 /*!
  * Symbols
  */
 
 #define SYMBOL_WXSYMBOLPICKERDIALOG_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxCLOSE_BOX)
 /*!
  * Symbols
  */
 
 #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


@@ -53,11 +61,11 @@ public:
     /// Constructors
     wxSymbolPickerDialog( );
     wxSymbolPickerDialog( const wxString& symbol, const wxString& fontName, const wxString& normalTextFont,
     /// Constructors
     wxSymbolPickerDialog( );
     wxSymbolPickerDialog( const wxString& symbol, const wxString& fontName, const wxString& normalTextFont,

-        wxWindow* parent, wxWindowID id = SYMBOL_WXSYMBOLPICKERDIALOG_IDNAME, const wxString& caption = SYMBOL_WXSYMBOLPICKERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXSYMBOLPICKERDIALOG_POSITION, const wxSize& size = SYMBOL_WXSYMBOLPICKERDIALOG_SIZE, long style = SYMBOL_WXSYMBOLPICKERDIALOG_STYLE );
+        wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& caption = SYMBOL_WXSYMBOLPICKERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXSYMBOLPICKERDIALOG_POSITION, const wxSize& size = SYMBOL_WXSYMBOLPICKERDIALOG_SIZE, long style = SYMBOL_WXSYMBOLPICKERDIALOG_STYLE );

 
     /// Creation
     bool Create( const wxString& symbol, const wxString& fontName, const wxString& normalTextFont,
 
     /// Creation
     bool Create( const wxString& symbol, const wxString& fontName, const wxString& normalTextFont,

-        wxWindow* parent, wxWindowID id = SYMBOL_WXSYMBOLPICKERDIALOG_IDNAME, const wxString& caption = SYMBOL_WXSYMBOLPICKERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXSYMBOLPICKERDIALOG_POSITION, const wxSize& size = SYMBOL_WXSYMBOLPICKERDIALOG_SIZE, long style = SYMBOL_WXSYMBOLPICKERDIALOG_STYLE );
+        wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& caption = SYMBOL_WXSYMBOLPICKERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXSYMBOLPICKERDIALOG_POSITION, const wxSize& size = SYMBOL_WXSYMBOLPICKERDIALOG_SIZE, long style = SYMBOL_WXSYMBOLPICKERDIALOG_STYLE );

 
     /// Initialises members variables
     void Init();
 
     /// Initialises members variables
     void Init();


@@ -86,6 +94,12 @@ public:
     /// Specifying normal text?
     bool UseNormalFont() const { return m_fontName.IsEmpty(); }
 
     /// Specifying normal text?
     bool UseNormalFont() const { return m_fontName.IsEmpty(); }
 

+    /// Should we show tooltips?
+    static bool ShowToolTips() { return sm_showToolTips; }
+
+    /// Determines whether tooltips will be shown
+    static void SetShowToolTips(bool show) { sm_showToolTips = show; }
+

     /// Data transfer
     virtual bool TransferDataToWindow();
 
     /// Data transfer
     virtual bool TransferDataToWindow();
 


@@ -98,26 +112,18 @@ public:
     /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_SYMBOLPICKERDIALOG_SUBSET
     void OnSubsetSelected( wxCommandEvent& event );
 
     /// wxEVT_COMMAND_COMBOBOX_SELECTED 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
     void OnFromUnicodeSelected( wxCommandEvent& event );
 
 #endif
 #endif
 #if defined(__UNICODE__)
     /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_SYMBOLPICKERDIALOG_FROM
     void OnFromUnicodeSelected( wxCommandEvent& event );
 
 #endif

-#if defined(__WXMSW__)   || \
-    defined(__WXMAC__)   || \
-    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 );
 
     /// wxEVT_UPDATE_UI event handler for wxID_OK
     void OnOkUpdate( wxUpdateUIEvent& event );
 

-#endif

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


@@ -141,9 +147,6 @@ public:
     wxIcon GetIconResource( const wxString& name );
 ////@end wxSymbolPickerDialog member function declarations
 
     wxIcon GetIconResource( const wxString& name );
 ////@end wxSymbolPickerDialog member function declarations
 

-    /// Should we show tooltips?
-    static bool ShowToolTips();
-

 ////@begin wxSymbolPickerDialog member variables
     wxComboBox* m_fontCtrl;
 #if defined(__UNICODE__)
 ////@begin wxSymbolPickerDialog member variables
     wxComboBox* m_fontCtrl;
 #if defined(__UNICODE__)


@@ -171,6 +174,7 @@ public:
 ////@end wxSymbolPickerDialog member variables
 
     bool m_dontUpdate;
 ////@end wxSymbolPickerDialog member variables
 
     bool m_dontUpdate;

+    static bool             sm_showToolTips;

 };
 
 /*!
 };
 
 /*!


@@ -284,7 +288,7 @@ protected:
     virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const;
 
     // gets the line height
     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);
 
     // event handlers
     void OnPaint(wxPaintEvent& event);


@@ -354,7 +358,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)
 };