Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxNotificationMessage::AlwaysUseGeneric() MSW-specific method

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-02 19:42:15 +00:00
parent 1970409e33
commit 5e6b39c9d6
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/msw/notifmsg.h
View File

@@ -47,11 +47,21 @@ public:
// returns the task bar icon which was used previously (may be NULL) // returns the task bar icon which was used previously (may be NULL)
static wxTaskBarIcon *UseTaskBarIcon(wxTaskBarIcon *icon); static wxTaskBarIcon *UseTaskBarIcon(wxTaskBarIcon *icon);
// call this to always use the generic implementation, even if the system
// supports the balloon tooltips used by the native one
static void AlwaysUseGeneric(bool alwaysUseGeneric)
{
ms_alwaysUseGeneric = alwaysUseGeneric;
}
private: private:
// common part of all ctors // common part of all ctors
void Init() { m_impl = NULL; } void Init() { m_impl = NULL; }
// flag indicating whether we should always use generic implementation
static bool ms_alwaysUseGeneric;
// the real implementation of this class (selected during run-time because // the real implementation of this class (selected during run-time because
// the balloon task bar icons are not available in all Windows versions) // the balloon task bar icons are not available in all Windows versions)
class wxNotifMsgImpl *m_impl; class wxNotifMsgImpl *m_impl;

5
src/msw/notifmsg.cpp
View File

@@ -377,6 +377,9 @@ wxAutoNotifMsgImpl::DoShow(const wxString& title,
// wxNotificationMessage // wxNotificationMessage
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
/* static */
bool wxNotificationMessage::ms_alwaysUseGeneric = false;
/* static */ /* static */
wxTaskBarIcon *wxNotificationMessage::UseTaskBarIcon(wxTaskBarIcon *icon) wxTaskBarIcon *wxNotificationMessage::UseTaskBarIcon(wxTaskBarIcon *icon)
{ {
@@ -387,7 +390,7 @@ bool wxNotificationMessage::Show(int timeout)
{ {
if ( !m_impl ) if ( !m_impl )
{ {
if ( wxTheApp->GetShell32Version() >= 500 ) if ( !ms_alwaysUseGeneric && wxTheApp->GetShell32Version() >= 500 )
{ {
if ( timeout == Timeout_Never ) if ( timeout == Timeout_Never )
m_impl = new wxManualNotifMsgImpl(GetParent()); m_impl = new wxManualNotifMsgImpl(GetParent());