Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-27 15:44:06 +00:00
parent fd749f4a70
commit 53a118d6fe
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/taskbar.cpp
View File

@@ -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) bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
{ {
wxASSERT_MSG( m_win != NULL, _T("taskbar icon not initialized") ); 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()
{ {

4
src/msw/window.cpp
View File

@@ -3151,6 +3151,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
break; break;
#endif #endif
#if wxUSE_MENUS
case WM_MENUCHAR: case WM_MENUCHAR:
// we're only interested in our own menus, not MF_SYSMENU // we're only interested in our own menus, not MF_SYSMENU
if ( HIWORD(wParam) == MF_POPUP ) 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__ #ifndef __WXWINCE__
case WM_POWERBROADCAST: 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), int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
WXLPARAM WXUNUSED_IN_WINCE(lParam)) 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