fix wxUniv/MSW compilation with wxUSE_MENUS==0 (patch 1744277)

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 8bc91d1d2f26ce2e98d18ddc5e1f3469ced14969..b95bd215c2140c2f19150f4658b85f304839095c 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -171,6 +171,7 @@ bool wxTaskBarIcon::RemoveIcon()
     return Shell_NotifyIcon(NIM_DELETE, &notifyData) != 0;
 }
 
     return Shell_NotifyIcon(NIM_DELETE, &notifyData) != 0;
 }
 

+#if wxUSE_MENUS

 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {
     wxASSERT_MSG( m_win != NULL, _T("taskbar icon not initialized") );
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {
     wxASSERT_MSG( m_win != NULL, _T("taskbar icon not initialized") );


@@ -206,6 +207,7 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 
     return rval;
 }
 
     return rval;
 }

+#endif // wxUSE_MENUS

 
 void wxTaskBarIcon::RegisterWindowMessages()
 {
 
 void wxTaskBarIcon::RegisterWindowMessages()
 {

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index d83eac47eeb9e4745e21468fe139ece278ed3f15..4617bdd7b3a9f84355607f96c9d787e72d359275 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3151,6 +3151,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
             break;
 #endif
 
             break;
 #endif
 

+#if wxUSE_MENUS

         case WM_MENUCHAR:
             // we're only interested in our own menus, not MF_SYSMENU
             if ( HIWORD(wParam) == MF_POPUP )
         case WM_MENUCHAR:
             // we're only interested in our own menus, not MF_SYSMENU
             if ( HIWORD(wParam) == MF_POPUP )


@@ -3164,6 +3165,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
                 }
             }
             break;
                 }
             }
             break;

+#endif // wxUSE_MENUS

 
 #ifndef __WXWINCE__
         case WM_POWERBROADCAST:
 
 #ifndef __WXWINCE__
         case WM_POWERBROADCAST:


@@ -5195,6 +5197,7 @@ bool wxWindowMSW::HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam)
     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }
 

+#if wxUSE_MENUS

 int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
                                 WXLPARAM WXUNUSED_IN_WINCE(lParam))
 {
 int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
                                 WXLPARAM WXUNUSED_IN_WINCE(lParam))
 {


@@ -5276,6 +5279,7 @@ bool wxWindowMSW::HandleClipboardEvent( WXUINT nMsg )
 
     return GetEventHandler()->ProcessEvent(evt);
 }
 
     return GetEventHandler()->ProcessEvent(evt);
 }

+#endif // wxUSE_MENUS

 
 // ---------------------------------------------------------------------------
 // joystick
 
 // ---------------------------------------------------------------------------
 // joystick