Restore MSW's colour picker

[wxWidgets.git] / src / palmos / taskbar.cpp

diff --git a/src/palmos/taskbar.cpp b/src/palmos/taskbar.cpp
index fe982906d8f426692b03a58fca6ff447dd28e0f5..5bdb1f85510ec0e043e7d507ed669944ed0475d2 100644 (file)
--- a/src/palmos/taskbar.cpp
+++ b/src/palmos/taskbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////

-// File:        taskbar.cpp
+// File:        src/palmos/taskbar.cpp

 // Purpose:     Implements wxTaskBarIcon class for manipulating icons on
 //              the task bar.
 // Author:      Julian Smart
 // Purpose:     Implements wxTaskBarIcon class for manipulating icons on
 //              the task bar.
 // Author:      Julian Smart


@@ -10,23 +10,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "taskbar.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_TASKBARICON
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
-#include "wx/window.h"
-#include "wx/frame.h"
-#include "wx/utils.h"
-#include "wx/menu.h"
+    #include "wx/window.h"
+    #include "wx/frame.h"
+    #include "wx/utils.h"
+    #include "wx/menu.h"

 #endif
 
 #if defined(__WIN95__)
 #endif
 
 #if defined(__WIN95__)


@@ -87,12 +84,12 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 
 bool wxTaskBarIcon::RemoveIcon()
 {
 
 bool wxTaskBarIcon::RemoveIcon()
 {

-       return false;
+    return false;

 }
 
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {
 }
 
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {

-       return false;
+    return false;

 }
 
 void wxTaskBarIcon::RegisterWindowMessages()
 }
 
 void wxTaskBarIcon::RegisterWindowMessages()


@@ -112,3 +109,4 @@ long wxTaskBarIcon::WindowProc(unsigned int msg,
 
 #endif // __WIN95__
 
 
 #endif // __WIN95__
 

+#endif // wxUSE_TASKBARICON