disable (some) features that are not available in DirectFB

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

diff --git a/include/wx/richtext/richtextsymboldlg.h b/include/wx/richtext/richtextsymboldlg.h
index 5267efb8d82b25a2aeb887f12bce49fdf2b3d001..92f0129b48ae7770cfb016b3d7551983417ab208 100644 (file)
--- a/include/wx/richtext/richtextsymboldlg.h
+++ b/include/wx/richtext/richtextsymboldlg.h
@@ -18,16 +18,15 @@
 
 #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
  */
 
 ////@begin forward declarations
 
 /*!
  * 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
 
 // __UNICODE__ is a symbol used by DialogBlocks-generated code.
 ////@end forward declarations
 
 // __UNICODE__ is a symbol used by DialogBlocks-generated code.


@@ -60,11 +59,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();


@@ -93,6 +92,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();
 


@@ -111,20 +116,10 @@ public:
     void OnFromUnicodeSelected( wxCommandEvent& event );
 
 #endif
     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


@@ -148,9 +143,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__)


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

+    static bool             sm_showToolTips;

 };
 
 /*!
 };
 
 /*!