X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9102b3671a45d116d781b0c8e90d2e9a84fbdcb..6ce43ac97db5cab1373d2e3c158849faffa8128d:/src/msw/toplevel.cpp diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 09e60871b1..f5ae3f72e8 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -148,10 +148,6 @@ void wxTopLevelWindowMSW::Init() #if defined(__SMARTPHONE__) && defined(__WXWINCE__) m_MenuBarHWND = 0; #endif -#ifdef __POCKETPC__ - // A dummy menubar for dialogs - m_menuBarHWND = 0; -#endif } WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const @@ -419,27 +415,6 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, ::SetWindowText(GetHwnd(), title); } -#ifdef __POCKETPC__ - // Create an empty menubar so that we don't see the menubar underneath - SHMENUBARINFO mbi; - - memset (&mbi, 0, sizeof (SHMENUBARINFO)); - mbi.cbSize = sizeof (SHMENUBARINFO); - mbi.hwndParent = (HWND) GetParent()->GetHWND(); - mbi.nToolBarId = 5000; - mbi.nBmpId = 0; - mbi.cBmpImages = 0; - mbi.dwFlags = 0 ; // SHCMBF_EMPTYBAR; - mbi.hInstRes = wxGetInstance(); - - if (!SHCreateMenuBar(&mbi)) - { - wxFAIL_MSG( _T("SHCreateMenuBar failed") ); - } - - m_menuBarHWND = (WXHWND) mbi.hwndMB; -#endif - SubclassWin(m_hWnd); #ifdef __SMARTPHONE__ @@ -588,15 +563,6 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, wxTopLevelWindowMSW::~wxTopLevelWindowMSW() { -#ifdef __POCKETPC__ - // Destroy the dummy menubar for dialogs - if (m_menuBarHWND) - { - ::DestroyWindow((HWND) m_menuBarHWND); - m_menuBarHWND = 0; - } -#endif - // after destroying an owned window, Windows activates the next top level // window in Z order but it may be different from our owner (to reproduce // this simply Alt-TAB to another application and back before closing the