mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-05-25 10:01:53 -04:00
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7. include/wx/defs.h -- __w64 warning disable patch by comex brought forward. include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code. src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux. src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue. src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text). Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
274 lines
7.6 KiB
C++
274 lines
7.6 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/osx/menuitem_osx.cpp
|
|
// Purpose: wxMenuItem implementation
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "wx/wxprec.h"
|
|
|
|
#if wxUSE_MENUS
|
|
|
|
#include "wx/menuitem.h"
|
|
#include "wx/stockitem.h"
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/app.h"
|
|
#include "wx/menu.h"
|
|
#endif // WX_PRECOMP
|
|
|
|
#include "wx/osx/private.h"
|
|
|
|
wxIMPLEMENT_ABSTRACT_CLASS(wxMenuItemImpl, wxObject);
|
|
|
|
wxMenuItemImpl::~wxMenuItemImpl()
|
|
{
|
|
}
|
|
|
|
wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
|
|
int id,
|
|
const wxString& t,
|
|
const wxString& strHelp,
|
|
wxItemKind kind,
|
|
wxMenu *pSubMenu)
|
|
:wxMenuItemBase(pParentMenu, id, t, strHelp, kind, pSubMenu)
|
|
{
|
|
wxASSERT_MSG( id != 0 || pSubMenu != NULL , wxT("A MenuItem ID of Zero does not work under Mac") ) ;
|
|
|
|
// In other languages there is no difference in naming the Exit/Quit menu item between MacOS and Windows guidelines
|
|
// therefore these item must not be translated
|
|
if (pParentMenu != NULL && !pParentMenu->GetNoEventsMode())
|
|
if ( wxStripMenuCodes(m_text).Upper() == wxT("EXIT") )
|
|
m_text = wxT("Quit\tCtrl+Q") ;
|
|
|
|
m_radioGroup.start = -1;
|
|
m_isRadioGroupStart = false;
|
|
|
|
wxString text = wxStripMenuCodes(m_text, (pParentMenu != NULL && pParentMenu->GetNoEventsMode()) ? wxStrip_Accel : wxStrip_All);
|
|
if (text.IsEmpty() && !IsSeparator())
|
|
{
|
|
wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
|
|
text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
|
|
}
|
|
|
|
wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
|
|
// use accessors for ID and Kind because they might have been changed in the base constructor
|
|
m_peer = wxMenuItemImpl::Create( this, pParentMenu, GetId(), text, entry, strHelp, GetKind(), pSubMenu );
|
|
delete entry;
|
|
}
|
|
|
|
wxMenuItem::~wxMenuItem()
|
|
{
|
|
delete m_peer;
|
|
}
|
|
|
|
// change item state
|
|
// -----------------
|
|
|
|
void wxMenuItem::SetBitmap(const wxBitmap& bitmap)
|
|
{
|
|
m_bitmap = bitmap;
|
|
UpdateItemBitmap();
|
|
}
|
|
|
|
void wxMenuItem::Enable(bool bDoEnable)
|
|
{
|
|
if (( m_isEnabled != bDoEnable
|
|
// avoid changing menuitem state when menu is disabled
|
|
// eg. BeginAppModalStateForWindow() will disable menus and ignore this change
|
|
// which in turn causes m_isEnabled to become out of sync with real menuitem state
|
|
)
|
|
// always update builtin menuitems
|
|
|| ( GetId() == wxApp::s_macPreferencesMenuItemId
|
|
|| GetId() == wxApp::s_macExitMenuItemId
|
|
|| GetId() == wxApp::s_macAboutMenuItemId
|
|
))
|
|
{
|
|
wxMenuItemBase::Enable( bDoEnable ) ;
|
|
UpdateItemStatus() ;
|
|
}
|
|
}
|
|
|
|
void wxMenuItem::UncheckRadio()
|
|
{
|
|
if ( m_isChecked )
|
|
{
|
|
wxMenuItemBase::Check( false ) ;
|
|
UpdateItemStatus() ;
|
|
}
|
|
}
|
|
|
|
void wxMenuItem::Check(bool bDoCheck)
|
|
{
|
|
wxCHECK_RET( IsCheckable() && !IsSeparator(), wxT("only checkable items may be checked") );
|
|
|
|
if ( m_isChecked != bDoCheck )
|
|
{
|
|
if ( GetKind() == wxITEM_RADIO )
|
|
{
|
|
if ( bDoCheck )
|
|
{
|
|
wxMenuItemBase::Check( bDoCheck ) ;
|
|
UpdateItemStatus() ;
|
|
|
|
// get the index of this item in the menu
|
|
const wxMenuItemList& items = m_parentMenu->GetMenuItems();
|
|
int pos = items.IndexOf(this);
|
|
wxCHECK_RET( pos != wxNOT_FOUND,
|
|
wxT("menuitem not found in the menu items list?") );
|
|
|
|
// get the radio group range
|
|
int start, end;
|
|
|
|
if ( m_isRadioGroupStart )
|
|
{
|
|
// we already have all information we need
|
|
start = pos;
|
|
end = m_radioGroup.end;
|
|
}
|
|
else // next radio group item
|
|
{
|
|
// get the radio group end from the start item
|
|
start = m_radioGroup.start;
|
|
end = items.Item(start)->GetData()->m_radioGroup.end;
|
|
}
|
|
|
|
// also uncheck all the other items in this radio group
|
|
wxMenuItemList::compatibility_iterator node = items.Item(start);
|
|
for ( int n = start; n <= end && node; n++ )
|
|
{
|
|
if ( n != pos )
|
|
((wxMenuItem*)node->GetData())->UncheckRadio();
|
|
|
|
node = node->GetNext();
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
wxMenuItemBase::Check( bDoCheck ) ;
|
|
UpdateItemStatus() ;
|
|
}
|
|
}
|
|
}
|
|
|
|
void wxMenuItem::SetItemLabel(const wxString& text)
|
|
{
|
|
// don't do anything if label didn't change
|
|
if ( m_text == text )
|
|
return;
|
|
|
|
wxMenuItemBase::SetItemLabel(text);
|
|
|
|
UpdateItemText() ;
|
|
}
|
|
|
|
|
|
void wxMenuItem::UpdateItemBitmap()
|
|
{
|
|
if ( !m_parentMenu )
|
|
return;
|
|
|
|
if ( m_bitmap.IsOk() )
|
|
{
|
|
GetPeer()->SetBitmap( m_bitmap );
|
|
}
|
|
}
|
|
|
|
void wxMenuItem::UpdateItemStatus()
|
|
{
|
|
if ( !m_parentMenu )
|
|
return ;
|
|
|
|
if ( IsSeparator() )
|
|
return ;
|
|
|
|
if ( IsCheckable() && IsChecked() )
|
|
GetPeer()->Check( true );
|
|
else
|
|
GetPeer()->Check( false );
|
|
|
|
GetPeer()->Enable( IsEnabled() );
|
|
}
|
|
|
|
void wxMenuItem::UpdateItemText()
|
|
{
|
|
if ( !m_parentMenu )
|
|
return ;
|
|
|
|
wxString text = wxStripMenuCodes(m_text, m_parentMenu != NULL && m_parentMenu->GetNoEventsMode() ? wxStrip_Accel : wxStrip_All);
|
|
if (text.IsEmpty() && !IsSeparator())
|
|
{
|
|
wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
|
|
text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
|
|
}
|
|
|
|
wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
|
|
GetPeer()->SetLabel( text, entry );
|
|
delete entry ;
|
|
}
|
|
|
|
// radio group stuff
|
|
// -----------------
|
|
|
|
void wxMenuItem::SetAsRadioGroupStart(bool start)
|
|
{
|
|
m_isRadioGroupStart = start;
|
|
}
|
|
|
|
void wxMenuItem::SetRadioGroupStart(int start)
|
|
{
|
|
wxASSERT_MSG( !m_isRadioGroupStart,
|
|
wxT("should only be called for the next radio items") );
|
|
|
|
m_radioGroup.start = start;
|
|
}
|
|
|
|
void wxMenuItem::SetRadioGroupEnd(int end)
|
|
{
|
|
wxASSERT_MSG( m_isRadioGroupStart,
|
|
wxT("should only be called for the first radio item") );
|
|
|
|
m_radioGroup.end = end;
|
|
}
|
|
|
|
bool wxMenuItem::IsRadioGroupStart() const
|
|
{
|
|
return m_isRadioGroupStart;
|
|
}
|
|
|
|
int wxMenuItem::GetRadioGroupStart() const
|
|
{
|
|
wxASSERT_MSG( !m_isRadioGroupStart,
|
|
wxS("shouldn't be called for the first radio item") );
|
|
|
|
return m_radioGroup.start;
|
|
}
|
|
|
|
int wxMenuItem::GetRadioGroupEnd() const
|
|
{
|
|
wxASSERT_MSG( m_isRadioGroupStart,
|
|
wxS("shouldn't be called for the first radio item") );
|
|
|
|
return m_radioGroup.end;
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxMenuItemBase
|
|
// ----------------------------------------------------------------------------
|
|
|
|
wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
|
|
int id,
|
|
const wxString& name,
|
|
const wxString& help,
|
|
wxItemKind kind,
|
|
wxMenu *subMenu)
|
|
{
|
|
return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);
|
|
}
|
|
|
|
#endif
|