fix wxMenu leak (reopened #9089)

[wxWidgets.git] / src / msw / wince / menuce.cpp

diff --git a/src/msw/wince/menuce.cpp b/src/msw/wince/menuce.cpp
index 10c97cd142c1f4e3d5506ac806425425e9b41c0f..238e2f0f95ef621637a12d5486aad9960d0d403e 100644 (file)
--- a/src/msw/wince/menuce.cpp
+++ b/src/msw/wince/menuce.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "menuce"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,9 +24,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)

 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"


@@ -38,16 +32,18 @@
     #include "wx/menu.h"
 #endif //WX_PRECOMP
 
     #include "wx/menu.h"
 #endif //WX_PRECOMP
 

-#ifdef __SMARTPHONE__
-

 #include <windows.h>
 #include <ole2.h>
 #include <shellapi.h>
 #include <aygshell.h>
 #include <windows.h>
 #include <ole2.h>
 #include <shellapi.h>
 #include <aygshell.h>

+#include <tpcshell.h>
+#include <tpcuser.h>

 #include "wx/msw/wince/missing.h"
 
 #include "wx/msw/wince/resources.h"
 
 #include "wx/msw/wince/missing.h"
 
 #include "wx/msw/wince/resources.h"
 

+#include "wx/stockitem.h"
+

 wxTopLevelWindowMSW::ButtonMenu::ButtonMenu()
 {
     m_id = wxID_ANY;
 wxTopLevelWindowMSW::ButtonMenu::ButtonMenu()
 {
     m_id = wxID_ANY;


@@ -81,7 +77,10 @@ void wxTopLevelWindowMSW::ButtonMenu::SetButton(int id, const wxString& label, w
 {
     m_assigned = true;
     m_id = id;
 {
     m_assigned = true;
     m_id = id;

-    m_label = label;
+    if(label.empty() && wxIsStockID(id))
+        m_label = wxGetStockLabel(id, wxSTOCK_NOFLAGS);
+    else
+        m_label = label;

     m_menu = subMenu;
 }
 
     m_menu = subMenu;
 }
 


@@ -241,6 +240,10 @@ void wxTopLevelWindowMSW::ReloadAllButtons()
         ::ShowWindow( prev_MenuBar, SW_HIDE );
     ::ShowWindow( m_MenuBarHWND, SW_SHOW );
 
         ::ShowWindow( prev_MenuBar, SW_HIDE );
     ::ShowWindow( m_MenuBarHWND, SW_SHOW );
 

+    // Setup backspace key handling
+    SendMessage(m_MenuBarHWND, SHCMBM_OVERRIDEKEY, VK_TBACK,
+                MAKELPARAM( SHMBOF_NODEFAULT | SHMBOF_NOTIFY,
+                            SHMBOF_NODEFAULT | SHMBOF_NOTIFY ));

 }
 
 bool wxTopLevelWindowMSW::HandleCommand(WXWORD id, WXWORD WXUNUSED(cmd), WXHWND WXUNUSED(control))
 }
 
 bool wxTopLevelWindowMSW::HandleCommand(WXWORD id, WXWORD WXUNUSED(cmd), WXHWND WXUNUSED(control))


@@ -257,5 +260,18 @@ bool wxTopLevelWindowMSW::HandleCommand(WXWORD id, WXWORD WXUNUSED(cmd), WXHWND
     return false;
 }
 
     return false;
 }
 

-#endif // __SMARTPHONE__
+bool wxTopLevelWindowMSW::MSWShouldPreProcessMessage(WXMSG* pMsg)
+{
+    MSG *msg = (MSG *)pMsg;
+
+    // Process back key to be like backspace.
+    if (msg->message == WM_HOTKEY)
+    {
+        if (HIWORD(msg->lParam) == VK_TBACK)
+            SHSendBackToFocusWindow(msg->message, msg->wParam, msg->lParam);
+    }
+
+    return wxTopLevelWindowBase::MSWShouldPreProcessMessage(pMsg);
+}

 
 

+#endif // __SMARTPHONE__ && __WXWINCE__