Reverting failed mering of SOC2014_TASKBAR.

Command: git svn dcommit is aborted, and the two branches is diverged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/frame.h

@@ -11,10 +11,6 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
-#if wxUSE_TASKBARBUTTON
-class WXDLLIMPEXP_FWD_ADV wxTaskBarButton;
-#endif
-
 class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
 {
 public:
@@ -113,15 +109,6 @@ public:
     virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu);
 #endif // wxUSE_MENUS
 
-#if wxUSE_TASKBARBUTTON
-    // Return the taskbar button of the window.
-    //
-    // The pointer returned by this method belongs to the window and will be
-    // deleted when the window itself is, do not delete it yourself. May return
-    // NULL if the initialization of taskbar button failed.
-    wxTaskBarButton* MSWGetTaskBarButton();
-#endif // wxUSE_TASKBARBUTTON
-
 protected:
     // common part of all ctors
     void Init();
@@ -178,10 +165,6 @@ private:
     // used by IconizeChildFrames(), see comments there
     bool m_wasMinimized;
 
-#if wxUSE_TASKBARBUTTON
-    wxTaskBarButton *m_taskBarButton;
-#endif
-
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame)
 };