Applied slightly-modified patch 1826540 from Gareth Simpson.

[wxWidgets.git] / include / wx / msw / taskbar.h

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index 8dbbc96aac8c314f1539ee479d3cd4d6e401dcbf..6c297edf07dfa5d34c0886fe66d862d84baf3e93 100644 (file)
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -10,44 +10,42 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 

-#ifndef _TASKBAR_H_
-#define _TASKBAR_H_
+#ifndef _WX_TASKBAR_H_
+#define _WX_TASKBAR_H_

 
 #include "wx/icon.h"
 
 // private helper class:
 class WXDLLIMPEXP_FWD_ADV wxTaskBarIconWindow;
 
 
 #include "wx/icon.h"
 
 // private helper class:
 class WXDLLIMPEXP_FWD_ADV wxTaskBarIconWindow;
 

-class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
+class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase

 {
 {

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)

 public:
     wxTaskBarIcon();
     virtual ~wxTaskBarIcon();
 
 public:
     wxTaskBarIcon();
     virtual ~wxTaskBarIcon();
 

-// Accessors
-    inline bool IsOk() const { return true; }
-    inline bool IsIconInstalled() const { return m_iconAdded; }
+    // Accessors
+    bool IsOk() const { return true; }
+    bool IsIconInstalled() const { return m_iconAdded; }

 
 

-// Operations
+    // Operations

     bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
     bool RemoveIcon(void);
     bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
     bool RemoveIcon(void);

-    bool PopupMenu(wxMenu *menu); //, int x, int y);
+    bool PopupMenu(wxMenu *menu);

 
 

-// Implementation

 protected:
     friend class wxTaskBarIconWindow;
 protected:
     friend class wxTaskBarIconWindow;

+

     long WindowProc(unsigned int msg, unsigned int wParam, long lParam);
     void RegisterWindowMessages();
 
     long WindowProc(unsigned int msg, unsigned int wParam, long lParam);
     void RegisterWindowMessages();
 

-// Data members
-protected:
+

     wxTaskBarIconWindow *m_win;
     bool                 m_iconAdded;
     wxIcon               m_icon;
     wxString             m_strTooltip;
 
     wxTaskBarIconWindow *m_win;
     bool                 m_iconAdded;
     wxIcon               m_icon;
     wxString             m_strTooltip;
 

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)

 };
 
 };
 

-#endif
-    // _TASKBAR_H_
+#endif // _WX_TASKBAR_H_