Small fixes after wxHtmlTagHandler::GetParser() addition.

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

diff --git a/include/wx/richtext/richtextuicustomization.h b/include/wx/richtext/richtextuicustomization.h
index ea20a60d69e09faab3f2c6f7d9e1fa6568971558..428d7dc4fd27635c9ffaa6e4edcfcecaa8be8194 100644 (file)
--- a/include/wx/richtext/richtextuicustomization.h
+++ b/include/wx/richtext/richtextuicustomization.h
@@ -14,6 +14,8 @@
 
 #if wxUSE_RICHTEXT
 
 
 #if wxUSE_RICHTEXT
 

+#include "wx/window.h"
+

 /**
     @class wxRichTextUICustomization
     The base class for functionality to plug in to various rich text control dialogs,
 /**
     @class wxRichTextUICustomization
     The base class for functionality to plug in to various rich text control dialogs,


@@ -22,9 +24,9 @@
 
     The application will typically have calls like this in its initialisation:
 
 
     The application will typically have calls like this in its initialisation:
 

-    wxRichTextFormattingDialog::SetHelpId(ID_HELP_FORMATTINGDIALOG);
-    wxRichTextFormattingDialog::SetUICustomization(& wxGetApp().GetRichTextUICustomization());
-    wxRichTextBordersPage::SetHelpId(ID_HELP_BORDERSPAGE);
+    wxRichTextFormattingDialog::GetHelpInfo().SetHelpId(ID_HELP_FORMATTINGDIALOG);
+    wxRichTextFormattingDialog::GetHelpInfo().SetUICustomization(& wxGetApp().GetRichTextUICustomization());
+    wxRichTextBordersPage::GetHelpInfo().SetHelpId(ID_HELP_BORDERSPAGE);

     
     Only the wxRichTextFormattingDialog class needs to have its customization object and help id set,
     though the application set them for individual pages if it wants.
     
     Only the wxRichTextFormattingDialog class needs to have its customization object and help id set,
     though the application set them for individual pages if it wants.


@@ -58,10 +60,10 @@ public:
         
     virtual bool ShowHelp(wxWindow* win)
     {
         
     virtual bool ShowHelp(wxWindow* win)
     {

-        if (m_uiCustomization && m_helpTopic != -1)
-            return m_uiCustomization->ShowHelp(win, m_helpTopic);
-        else
+        if ( !m_uiCustomization || m_helpTopic == -1 )

             return false;
             return false;

+
+        return m_uiCustomization->ShowHelp(win, m_helpTopic);

     }
 
     /// Get the help topic identifier.
     }
 
     /// Get the help topic identifier.


@@ -107,6 +109,8 @@ protected:
     virtual wxRichTextUICustomization* GetUICustomization() const { return sm_helpInfo.GetUICustomization(); } \
     virtual void SetUICustomization(wxRichTextUICustomization* customization) { sm_helpInfo.SetUICustomization(customization); } \
     virtual bool ShowHelp(wxWindow* win) { return sm_helpInfo.ShowHelp(win); } \
     virtual wxRichTextUICustomization* GetUICustomization() const { return sm_helpInfo.GetUICustomization(); } \
     virtual void SetUICustomization(wxRichTextUICustomization* customization) { sm_helpInfo.SetUICustomization(customization); } \
     virtual bool ShowHelp(wxWindow* win) { return sm_helpInfo.ShowHelp(win); } \

+public: \
+    static wxRichTextHelpInfo& GetHelpInfo() { return sm_helpInfo; }\

 protected: \
     static wxRichTextHelpInfo sm_helpInfo; \
 public:
 protected: \
     static wxRichTextHelpInfo sm_helpInfo; \
 public: