From 22e90769f8da73d398bd7da83f185263a292972f Mon Sep 17 00:00:00 2001 From: David Webster Date: Tue, 29 Feb 2000 23:18:42 +0000 Subject: [PATCH] no message git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/menuitem.h | 24 ++-- src/os2/gdiimage.cpp | 39 ++---- src/os2/menuitem.cpp | 260 ++++++++++++++++++++++++-------------- 3 files changed, 189 insertions(+), 134 deletions(-) diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h index f9ebaf8659..1d6b8879fe 100644 --- a/include/wx/os2/menuitem.h +++ b/include/wx/os2/menuitem.h @@ -43,34 +43,38 @@ class WXDLLEXPORT wxMenuItem: public wxMenuItemBase { public: // ctor & dtor - wxMenuItem(wxMenu *pParentMenu = NULL, int id = ID_SEPARATOR, - const wxString& strName = "", const wxString& wxHelp = "", - bool bCheckable = FALSE, wxMenu *pSubMenu = NULL); + wxMenuItem( wxMenu* pParentMenu = NULL + ,int nId = ID_SEPARATOR + ,const wxString& rStrName = "" + ,const wxString& rWxHelp = "" + ,bool bCheckable = FALSE + ,wxMenu* pSubMenu = NULL + ); virtual ~wxMenuItem(); // override base class virtuals - virtual void SetText(const wxString& strName); - virtual void SetCheckable(bool checkable); + virtual void SetText(const wxString& rStrName); + virtual void SetCheckable(bool bCheckable); virtual void Enable(bool bDoEnable = TRUE); virtual void Check(bool bDoCheck = TRUE); - virtual bool IsChecked() const; + virtual bool IsChecked(void) const; #if wxUSE_ACCEL - virtual wxAcceleratorEntry *GetAccel() const; + virtual wxAcceleratorEntry* GetAccel(void) const; #endif // wxUSE_ACCEL // unfortunately needed to resolve ambiguity between // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable() - bool IsCheckable() const { return wxMenuItemBase::IsCheckable(); } + bool IsCheckable(void) const { return wxMenuItemBase::IsCheckable(); } // the id for a popup menu is really its menu handle (as required by // ::AppendMenu() API), so this function will return either the id or the // menu handle depending on what we're - int GetRealId() const; + int GetRealId(void) const; private: DECLARE_DYNAMIC_CLASS(wxMenuItem) -}; +}; // end of CLASS wxMenuItem #endif //_MENUITEM_H diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp index d3b1965074..d4357d6331 100644 --- a/src/os2/gdiimage.cpp +++ b/src/os2/gdiimage.cpp @@ -518,42 +518,23 @@ bool wxICOResourceHandler::LoadIcon( , const wxString& rName , HPS hPs , long lFlags -, int nDesiredWidth -, int nDesiredHeight +, int WXUNUSED(nDesiredWidth) +, int WXUNUSED(nDesiredHeight) ) { - // TODO: load icon from a file - /* - HICON hicon; + HPOINTER hIcon; -#if defined(__WIN32__) && !defined(__SC__) - if ( desiredWidth != -1 && desiredHeight != -1 ) - { - hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON, - desiredWidth, desiredHeight, - LR_DEFAULTCOLOR); - } - else -#endif // Win32 - { - hicon = ::LoadIcon(wxGetInstance(), name); - } + hIcon = ::WinLoadFileIcon( (PSZ)rName.c_str() + ,TRUE // load for private use + ); - wxSize size = GetHiconSize(hicon); - icon->SetSize(size.x, size.y); + pIcon->SetSize(32, 32); // all OS/2 icons are 32 x 32 - // Override the found values with desired values - if ( desiredWidth > -1 && desiredHeight > -1 ) - { - icon->SetSize(desiredWidth, desiredHeight); - } - icon->SetHICON((WXHICON)hicon); + pIcon->SetHICON((WXHICON)hIcon); - return icon->Ok(); - */ - return(FALSE); -} + return pIcon->Ok(); +} // end of wxICOResourceHandler::LoadIcon // ---------------------------------------------------------------------------- // private functions diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 9b9143b352..da529a5633 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -75,26 +75,35 @@ // ctor & dtor // ----------- -wxMenuItem::wxMenuItem(wxMenu *pParentMenu, - int id, - const wxString& text, - const wxString& strHelp, - bool bCheckable, - wxMenu *pSubMenu) +wxMenuItem::wxMenuItem( + wxMenu* pParentMenu +, int nId +, const wxString& rText +, const wxString& rStrHelp +, bool bCheckable +, wxMenu* pSubMenu +) #if wxUSE_OWNER_DRAWN - : wxOwnerDrawn(text, bCheckable) +: wxOwnerDrawn( rText + ,bCheckable + ) #endif // owner drawn { - wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") ); + wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); #if wxUSE_OWNER_DRAWN - // set default menu colors + + // + // Set default menu colors + // #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c)) SetTextColour(SYS_COLOR(MENUTEXT)); SetBackgroundColour(SYS_COLOR(MENU)); - // we don't want normal items be owner-drawn + // + // We don't want normal items be owner-drawn + // ResetOwnerDrawn(); #undef SYS_COLOR @@ -104,42 +113,47 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, m_subMenu = pSubMenu; m_isEnabled = TRUE; m_isChecked = FALSE; - m_id = id; - m_text = text; + m_id = nId; + m_text = rText; m_isCheckable = bCheckable; - m_help = strHelp; -} + m_help = rStrHelp; +} // end of wxMenuItem::wxMenuItem wxMenuItem::~wxMenuItem() { -} +} // end of wxMenuItem::~wxMenuItem -// misc +// +// Misc // ---- -// return the id for calling Win32 API functions +// +// Return the id for calling Win32 API functions +// int wxMenuItem::GetRealId() const { return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId(); -} +} // end of wxMenuItem::GetRealId -// get item state +// +// Get item state // -------------- - bool wxMenuItem::IsChecked() const { -/* - int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND); - - // don't "and" with MF_ENABLED because its value is 0 - return (flag & MF_DISABLED) == 0; -*/ - return FALSE; -} - -wxString wxMenuItemBase::GetLabelFromText(const wxString& text) + USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_QUERYITEMATTR + ,MPFROM2SHORT(GetId(), TRUE) + ,MPFROMSHORT(MIA_CHECKED) + )); + + return (uFlag & MIA_CHECKED); +} // end of wxMenuItem::IsChecked + +wxString wxMenuItemBase::GetLabelFromText( + const wxString& rText +) { - return wxStripMenuCodes(text); + return wxStripMenuCodes(rText); } // accelerators @@ -157,114 +171,170 @@ wxAcceleratorEntry *wxMenuItem::GetAccel() const // change item state // ----------------- -void wxMenuItem::Enable(bool enable) +void wxMenuItem::Enable( + bool bEnable +) { - if ( m_isEnabled == enable ) - return; -/* - long rc = EnableMenuItem(GetHMenuOf(m_parentMenu), - GetRealId(), - MF_BYCOMMAND | - (enable ? MF_ENABLED : MF_GRAYED)); + bool bOk; - if ( rc == -1 ) { + if (m_isEnabled == bEnable) + return; + if (bEnable) + bOk = ::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_SETITEMATTR + ,MPFROM2SHORT(GetRealId(), TRUE) + ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED) + ); + else + bOk = ::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_SETITEMATTR + ,MPFROM2SHORT(GetRealId(), TRUE) + ,MPFROM2SHORT(MIA_DISABLED, FALSE) + ); + if (!bOk) + { wxLogLastError("EnableMenuItem"); } -*/ - wxMenuItemBase::Enable(enable); -} + wxMenuItemBase::Enable(bEnable); +} // end of wxMenuItem::Enable -void wxMenuItem::Check(bool check) +void wxMenuItem::Check( + bool bCheck +) { - wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") ); + bool bOk; - if ( m_isChecked == check ) + wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") ); + if (m_isChecked == bCheck) return; -/* - long rc = CheckMenuItem(GetHMenuOf(m_parentMenu), - GetRealId(), - MF_BYCOMMAND | - (check ? MF_CHECKED : MF_UNCHECKED)); - - if ( rc == -1 ) { - wxLogLastError("CheckMenuItem"); + if (bCheck) + bOk = ::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_SETITEMATTR + ,MPFROM2SHORT(GetRealId(), TRUE) + ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED) + ); + else + bOk = ::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_SETITEMATTR + ,MPFROM2SHORT(GetRealId(), TRUE) + ,MPFROM2SHORT(MIA_CHECKED, FALSE) + ); + if (!bOk) + { + wxLogLastError("EnableMenuItem"); } -*/ - wxMenuItemBase::Check(check); -} + wxMenuItemBase::Check(bCheck); +} // end of wxMenuItem::Check -void wxMenuItem::SetText(const wxString& text) +void wxMenuItem::SetText( + const wxString& rText +) { - // don't do anything if label didn't change - if ( m_text == text ) + // + // Don't do anything if label didn't change + // + if (m_text == rText) return; - wxMenuItemBase::SetText(text); - OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) ); -/* - HMENU hMenu = GetHMenuOf(m_parentMenu); - wxCHECK_RET( hMenu, wxT("menuitem without menu") ); + wxMenuItemBase::SetText(rText); + OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(rText)); + + HWND hMenu = GetHMenuOf(m_parentMenu); + + wxCHECK_RET(hMenu, wxT("menuitem without menu")); #if wxUSE_ACCEL m_parentMenu->UpdateAccel(this); #endif // wxUSE_ACCEL - UINT id = GetRealId(); - UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND); - if ( flagsOld == 0xFFFFFFFF ) + USHORT uId = GetRealId(); + MENUITEM vItem; + USHORT uFlagsOld; + + if (!::WinSendMsg( hMenu + ,MM_QUERYITEM + ,MPFROM2SHORT(uId, TRUE) + ,(MPARAM)&vItem + )) { wxLogLastError("GetMenuState"); } else { - if ( IsSubMenu() ) + uFlagsOld = vItem.afStyle; + if (IsSubMenu()) { - // high byte contains the number of items in a submenu for submenus - flagsOld &= 0xFF; - flagsOld |= MF_POPUP; + uFlagsOld |= MIS_SUBMENU; } - LPCTSTR data; + BYTE* pData; #if wxUSE_OWNER_DRAWN - if ( IsOwnerDrawn() ) + if (IsOwnerDrawn()) { - flagsOld |= MF_OWNERDRAW; - data = (LPCTSTR)this; + uFlagsOld |= MIS_OWNERDRAW; + pData = (BYTE*)this; } else #endif //owner drawn { - flagsOld |= MF_STRING; - data = (char*) text.c_str(); + uFlagsOld |= MIS_TEXT; + pData = (BYTE*)rText.c_str(); + } + + // + // Set the style + // + if (!::WinSendMsg( hMenu + ,MM_SETITEM + ,MPFROM2SHORT(uId, TRUE) + ,(MPARAM)&vItem + )) + { + wxLogLastError(wxT("ModifyMenu")); } - if ( ::ModifyMenu(hMenu, id, - MF_BYCOMMAND | flagsOld, - id, data) == (int)0xFFFFFFFF ) + // + // Set the text + // + if (::WinSendMsg( hMenu + ,MM_SETITEMTEXT + ,MPFROMSHORT(uId) + ,(MPARAM)pData + )) { wxLogLastError(wxT("ModifyMenu")); } } -*/ -} +} // end of wxMenuItem::SetText -void wxMenuItem::SetCheckable(bool checkable) +void wxMenuItem::SetCheckable( + bool bCheckable +) { - wxMenuItemBase::SetCheckable(checkable); - OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) ); -} + wxMenuItemBase::SetCheckable(bCheckable); + OWNER_DRAWN_ONLY(wxOwnerDrawn::SetCheckable(bCheckable)); +} // end of wxMenuItem::SetCheckable // ---------------------------------------------------------------------------- // wxMenuItemBase // ---------------------------------------------------------------------------- -wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, - int id, - const wxString& name, - const wxString& help, - bool isCheckable, - wxMenu *subMenu) +wxMenuItem* wxMenuItemBase::New( + wxMenu* pParentMenu +, int nId +, const wxString& rName +, const wxString& rHelp +, bool bIsCheckable +, wxMenu* pSubMenu +) { - return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu); -} + return new wxMenuItem( pParentMenu + ,nId + ,rName + ,rHelp + ,bIsCheckable + ,pSubMenu + ); +} // end of wxMenuItemBase::New + -- 2.45.2