X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9add93670bb4a38e4007b8422b34b29b6194eecb..85ac8ca017a0409e9762ed305ccc1d32a7c28fa7:/src/msw/menu.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 750b6d64f1..385c7fb320 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -73,7 +73,7 @@ extern wxMenu *wxCurrentPopupMenu; // ---------------------------------------------------------------------------- // the (popup) menu title has this special id -static const int idMenuTitle = -2; +static const int idMenuTitle = -3; // ---------------------------------------------------------------------------- // private functions @@ -137,7 +137,7 @@ template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVa wxBEGIN_PROPERTIES_TABLE(wxMenu) wxEVENT_PROPERTY( Select , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent) wxPROPERTY( Title, wxString , SetTitle, GetTitle, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) - wxREADONLY_PROPERTY_FLAGS( MenuStyle , wxMenuStyle , long , GetStyle , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style + wxREADONLY_PROPERTY_FLAGS( MenuStyle , wxMenuStyle , long , GetStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) wxEND_PROPERTIES_TABLE() @@ -163,7 +163,7 @@ IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow ,"wx/menu.h",wxMenuBarS IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfo, wxObject , "wx/menu.h" ) wxBEGIN_PROPERTIES_TABLE(wxMenuInfo) - wxREADONLY_PROPERTY( Menu , wxMenu* , GetMenu , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxREADONLY_PROPERTY( Menu , wxMenu* , GetMenu , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) wxREADONLY_PROPERTY( Title , wxString , GetTitle , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) wxEND_PROPERTIES_TABLE() @@ -321,7 +321,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item) if ( IsAttached() ) { - m_menuBar->RebuildAccelTable(); + GetMenuBar()->RebuildAccelTable(); } } //else: it is a separator, they can't have accels, nothing to do @@ -419,9 +419,9 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) #endif // __WIN32__ // if we're already attached to the menubar, we must update it - if ( IsAttached() && m_menuBar->IsAttached() ) + if ( IsAttached() && GetMenuBar()->IsAttached() ) { - m_menuBar->Refresh(); + GetMenuBar()->Refresh(); } return TRUE; @@ -532,10 +532,10 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) wxLogLastError(wxT("RemoveMenu")); } - if ( IsAttached() && m_menuBar->IsAttached() ) + if ( IsAttached() && GetMenuBar()->IsAttached() ) { // otherwise, the chane won't be visible - m_menuBar->Refresh(); + GetMenuBar()->Refresh(); } // and from internal data structures @@ -662,8 +662,8 @@ wxWindow *wxMenu::GetWindow() const { if ( m_invokingWindow != NULL ) return m_invokingWindow; - else if ( m_menuBar != NULL) - return m_menuBar->GetFrame(); + else if ( GetMenuBar() != NULL) + return GetMenuBar()->GetFrame(); return NULL; } @@ -676,13 +676,13 @@ void wxMenuBar::Init() { m_eventHandler = this; m_hMenu = 0; -#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) +#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) m_toolBar = NULL; #endif // Not using a combined wxToolBar/wxMenuBar? then use // a commandbar in WinCE .NET just to implement the // menubar. -#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI) +#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP)) m_commandBar = NULL; #endif } @@ -716,7 +716,7 @@ wxMenuBar::~wxMenuBar() { // In Windows CE (not .NET), the menubar is always associated // with a toolbar, which destroys the menu implicitly. -#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) if (GetToolBar()) GetToolBar()->SetMenuBar(NULL); #else @@ -724,7 +724,7 @@ wxMenuBar::~wxMenuBar() // which happens if we're attached to a frame if (m_hMenu && !IsAttached()) { -#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI) +#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP)) ::DestroyWindow((HWND) m_commandBar); m_commandBar = (WXHWND) NULL; #else @@ -743,12 +743,12 @@ void wxMenuBar::Refresh() { wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); -#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) if (GetToolBar()) { CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0); } -#elif defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI) +#elif defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP)) if (m_commandBar) DrawMenuBar((HWND) m_commandBar); #else @@ -762,7 +762,7 @@ WXHMENU wxMenuBar::Create() // since you have to use resources. // We'll have to find another way to add a menu // by changing/adding menu items to an existing menu. -#if defined(__WXWINCE__) && _WIN32_WCE < 400 +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) if ( m_hMenu != 0 ) return m_hMenu; @@ -832,7 +832,13 @@ int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos) wxASSERT(menu); wxASSERT(menu->GetHMenu()); wxASSERT(m_hMenu); + +#if defined(__WXWINCE__) + int totalMSWItems = GetMenuCount(); +#else int totalMSWItems = GetMenuItemCount((HMENU)m_hMenu); +#endif + int i; // For old C++ compatibility for(i=wxpos; iGetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0)) @@ -1164,10 +1170,14 @@ void wxMenuBar::Attach(wxFrame *frame) { wxMenuBarBase::Attach(frame); -#if defined(__WXWINCE__) && _WIN32_WCE >= 400 +#if defined(__WXWINCE__) if (!m_hMenu) this->Create(); -#if wxUSE_POCKETPC_UI +#if _WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP) + + // No idea why this was here, but it seems to be obsolete. + // Remove after testing with other WinCE combinations - April 2004 +#if 0 if (GetToolBar()) { HWND hCommandBar = (HWND) GetToolBar()->GetHWND(); @@ -1176,6 +1186,7 @@ void wxMenuBar::Attach(wxFrame *frame) wxLogLastError(wxT("CommandBar_InsertMenubarEx")); } } +#endif #else if (!m_commandBar) m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId()); @@ -1190,7 +1201,7 @@ void wxMenuBar::Attach(wxFrame *frame) } } #endif - // wxUSE_POCKETPC_UI + // PSPC/WFSP #endif // __WXWINCE__ && _WIN32_WCE >= 400