compilation fix after incorrectly resolved conflict

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

diff --git a/include/wx/stubs/taskbar.h b/include/wx/stubs/taskbar.h
index 7dad1538e1219cfec3302f878e1f9df6b6274c88..7f4a36b8b4e7a125539eb4a496d77addab4dd967 100644 (file)
--- a/include/wx/stubs/taskbar.h
+++ b/include/wx/stubs/taskbar.h
@@ -27,11 +27,6 @@ public:
        virtual ~wxTaskBarIcon();
 
 // Accessors
-/* TODO: implementation
-    inline WXHWND GetHWND() const { return m_hWnd; }
-    inline bool IsOK() const { return (m_hWnd != 0) ; }
-    inline bool IsIconInstalled() const { return m_iconAdded; }
-*/
 
 // Operations
     bool SetIcon(const wxIcon& icon, const wxString& tooltip = "");
@@ -46,26 +41,8 @@ public:
     virtual void OnLButtonDClick();
     virtual void OnRButtonDClick();
 
-/* TODO
-// Implementation
-    static wxTaskBarIcon* FindObjectForHWND(WXHWND hWnd);
-    static void AddObject(wxTaskBarIcon* obj);
-    static void RemoveObject(wxTaskBarIcon* obj);
-    static bool RegisterWindowClass();
-    static WXHWND CreateTaskBarWindow();
-    long WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wParam, long lParam );
-*/
-
 // Data members
 protected:
-/* TODO: implementation
-    WXHWND          m_hWnd;
-    static bool     sm_registeredClass;
-    static unsigned int sm_taskbarMsg;
-    static wxList   sm_taskBarIcons;
-*/
-
-    bool            m_iconAdded;
 };
 
 #endif