X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f99e9c3148205809ce076bcf69668926f945cd8..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/statusbr.h diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h index e0efd1cff4..241f5cbf8e 100644 --- a/include/wx/statusbr.h +++ b/include/wx/statusbr.h @@ -90,7 +90,7 @@ protected: bool m_bEllipsized; }; -WX_DECLARE_OBJARRAY(wxStatusBarPane, wxStatusBarPaneArray); +WX_DECLARE_EXPORTED_OBJARRAY(wxStatusBarPane, wxStatusBarPaneArray); // ---------------------------------------------------------------------------- // wxStatusBar: a window near the bottom of the frame used for status info @@ -186,13 +186,15 @@ protected: // wxWindow overrides: - virtual void DoSetToolTip( wxToolTip *tip ) +#if wxUSE_TOOLTIPS + virtual void DoSetToolTip( wxToolTip *tip ) { wxASSERT_MSG(!HasFlag(wxSTB_SHOW_TIPS), "Do not set tooltip(s) manually when using wxSTB_SHOW_TIPS!"); wxWindow::DoSetToolTip(tip); } - +#endif + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }