Fixed UI customization helper

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-03-12 13:33:36 +00:00
parent 77120d82a4
commit ad8f91377f

View File

@@ -24,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::GetHelpInfo().SetHelpId(ID_HELP_FORMATTINGDIALOG);
wxRichTextFormattingDialog::SetUICustomization(& wxGetApp().GetRichTextUICustomization()); wxRichTextFormattingDialog::GetHelpInfo().SetUICustomization(& wxGetApp().GetRichTextUICustomization());
wxRichTextBordersPage::SetHelpId(ID_HELP_BORDERSPAGE); wxRichTextBordersPage::GetHelpInfo().SetHelpId(ID_HELP_BORDERSPAGE);
Only the wxRichTextFormattingDialog class needs to have its customization object and help id set, 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. though the application set them for individual pages if it wants.
@@ -109,6 +109,8 @@ protected:
virtual wxRichTextUICustomization* GetUICustomization() const { return sm_helpInfo.GetUICustomization(); } \ virtual wxRichTextUICustomization* GetUICustomization() const { return sm_helpInfo.GetUICustomization(); } \
virtual void SetUICustomization(wxRichTextUICustomization* customization) { sm_helpInfo.SetUICustomization(customization); } \ virtual void SetUICustomization(wxRichTextUICustomization* customization) { sm_helpInfo.SetUICustomization(customization); } \
virtual bool ShowHelp(wxWindow* win) { return sm_helpInfo.ShowHelp(win); } \ virtual bool ShowHelp(wxWindow* win) { return sm_helpInfo.ShowHelp(win); } \
public: \
static wxRichTextHelpInfo& GetHelpInfo() { return sm_helpInfo; }\
protected: \ protected: \
static wxRichTextHelpInfo sm_helpInfo; \ static wxRichTextHelpInfo sm_helpInfo; \
public: public: