[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Use PTBatcherGUI tray icon only on win...

[<hug...@li...>]

branch:     2011.2
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/96e662f127f2
changeset:  5567:96e662f127f2
user:       tmodes
date:       Sun Aug 28 17:32:37 2011 +0200
description:

Use PTBatcherGUI tray icon only on windows

diffstat:

 src/hugin1/ptbatcher/BatchFrame.cpp |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (23 lines):

diff -r e84e95a8546d -r 96e662f127f2 src/hugin1/ptbatcher/BatchFrame.cpp
--- a/src/hugin1/ptbatcher/BatchFrame.cpp	Thu Sep 15 17:37:46 2011 +0200
+++ b/src/hugin1/ptbatcher/BatchFrame.cpp	Sun Aug 28 17:32:37 2011 +0200
@@ -140,6 +140,9 @@
 #endif
     SetIcon(myIcon);
 
+#if defined __WXMSW__
+    //show tray icon only on windows
+    //because not all window manager on *nix provide a usable tray area
 #if wxCHECK_VERSION(2,9,0)
     if(wxTaskBarIcon::IsAvailable())
     {
@@ -161,6 +164,9 @@
         m_tray=NULL;
     };
 #endif
+#else
+    m_tray=NULL;
+#endif
 	m_batch = new Batch(this,wxTheApp->argv[0],true);
 	m_batch->gui = true;
 	m_batch->LoadTemp();