mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 10:39:13 +01:00
822326eea9
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.
62 lines
2.0 KiB
C++
62 lines
2.0 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/menuitem.h
|
|
// Purpose: wxMenuItem class
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTKMENUITEM_H_
|
|
#define _WX_GTKMENUITEM_H_
|
|
|
|
#include "wx/bitmap.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxMenuItem
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
|
|
{
|
|
public:
|
|
wxMenuItem(wxMenu *parentMenu = NULL,
|
|
int id = wxID_SEPARATOR,
|
|
const wxString& text = wxEmptyString,
|
|
const wxString& help = wxEmptyString,
|
|
wxItemKind kind = wxITEM_NORMAL,
|
|
wxMenu *subMenu = NULL);
|
|
virtual ~wxMenuItem();
|
|
|
|
// implement base class virtuals
|
|
virtual void SetItemLabel( const wxString& str ) wxOVERRIDE;
|
|
virtual void Enable( bool enable = true ) wxOVERRIDE;
|
|
virtual void Check( bool check = true ) wxOVERRIDE;
|
|
virtual bool IsChecked() const wxOVERRIDE;
|
|
virtual void SetBitmap(const wxBitmap& bitmap);
|
|
virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
|
|
|
|
// implementation
|
|
void SetMenuItem(GtkWidget *menuItem);
|
|
GtkWidget *GetMenuItem() const { return m_menuItem; }
|
|
void SetGtkLabel();
|
|
|
|
#if WXWIN_COMPATIBILITY_2_8
|
|
// compatibility only, don't use in new code
|
|
wxDEPRECATED_CONSTRUCTOR(
|
|
wxMenuItem(wxMenu *parentMenu,
|
|
int id,
|
|
const wxString& text,
|
|
const wxString& help,
|
|
bool isCheckable,
|
|
wxMenu *subMenu = NULL)
|
|
);
|
|
#endif
|
|
|
|
private:
|
|
wxBitmap m_bitmap; // Bitmap for menuitem, if any
|
|
GtkWidget *m_menuItem; // GtkMenuItem
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxMenuItem);
|
|
};
|
|
|
|
#endif // _WX_GTKMENUITEM_H_
|