Fix rebase error.

Author: Chaobin Zhang

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

include/wx/msw/frame.h

@@ -12,7 +12,7 @@
 #define _WX_FRAME_H_
 
 #if wxUSE_TASKBARBUTTON
-class WXDLLIMPEXP_FWD_ADV wxTaskBarButton;
+class WXDLLIMPEXP_FWD_CORE wxTaskBarButton;
 #endif
 
 class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
@@ -40,6 +40,9 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
+#if wxUSE_TASKBARBUTTON
+    virtual ~wxFrame();
+#endif
 
     // implement base class pure virtuals
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
@@ -179,7 +182,7 @@ private:
     bool m_wasMinimized;
 
 #if wxUSE_TASKBARBUTTON
-    wxTaskBarButton *m_taskBarButton;
+    wxTaskBarButton* m_taskBarButton;
 #endif
 
     DECLARE_EVENT_TABLE()

include/wx/msw/taskbarbutton.h

@@ -14,6 +14,7 @@
 
 #include "wx/defs.h"
 #include "wx/vector.h"
+#include "wx/taskbarbutton.h"
 
 namespace {
 class ITaskbarList3;

include/wx/msw/toplevel.h

@@ -121,22 +121,6 @@ public:
     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const { return false; }
 
-#if wxUSE_MENUS && !defined(__WXUNIVERSAL__)
-    bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
-
-    // handle WM_EXITMENULOOP message for Win95 only
-    bool HandleExitMenuLoop(WXWORD isPopup);
-
-    // handle WM_(UN)INITMENUPOPUP message to generate wxEVT_MENU_OPEN/CLOSE
-    bool HandleMenuPopup(wxEventType evtType, WXHMENU hMenu);
-
-    // Command part of HandleMenuPopup() and HandleExitMenuLoop().
-    bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup);
-
-    // Find the menu corresponding to the given handle.
-    virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu);
-#endif // wxUSE_MENUS && !__WXUNIVERSAL__
-
 protected:
     // common part of all ctors
     void Init();
@@ -251,10 +235,6 @@ private:
     // MSWGetSystemMenu(). Owned by this window.
     wxMenu *m_menuSystem;
 
-    // The number of currently opened menus: 0 initially, 1 when a top level
-    // menu is opened, 2 when its submenu is opened and so on.
-    int m_menuDepth;
-
     DECLARE_EVENT_TABLE()
     wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW);
 };