Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/richtext/richtextuicustomization.h b/include/wx/richtext/richtextuicustomization.h
index d507aba2fa6a5b5ece83b9e3bde8139870cb13b1..92c42d7b1ff64fa2bd26fc4e24f2d2262291e41e 100644 (file)
--- a/include/wx/richtext/richtextuicustomization.h
+++ b/include/wx/richtext/richtextuicustomization.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2010-11-14
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,9 +23,9 @@
 
     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.
@@ -60,10 +59,10 @@ public:
         
     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 m_uiCustomization->ShowHelp(win, m_helpTopic);
     }
 
     /// Get the help topic identifier.
@@ -109,6 +108,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); } \
+public: \
+    static wxRichTextHelpInfo& GetHelpInfo() { return sm_helpInfo; }\
 protected: \
     static wxRichTextHelpInfo sm_helpInfo; \
 public: