mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-19 12:31:17 +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.
111 lines
3.6 KiB
C++
111 lines
3.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/menu.h
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling, Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTKMENU_H_
|
|
#define _WX_GTKMENU_H_
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxMenuBar
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
|
|
{
|
|
public:
|
|
// ctors
|
|
wxMenuBar();
|
|
wxMenuBar(long style);
|
|
wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
|
|
~wxMenuBar();
|
|
|
|
// implement base class (pure) virtuals
|
|
virtual bool Append( wxMenu *menu, const wxString &title ) wxOVERRIDE;
|
|
virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
|
|
virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
|
|
virtual wxMenu *Remove(size_t pos) wxOVERRIDE;
|
|
|
|
virtual int FindMenuItem(const wxString& menuString,
|
|
const wxString& itemString) const wxOVERRIDE;
|
|
virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const wxOVERRIDE;
|
|
|
|
virtual void EnableTop( size_t pos, bool flag ) wxOVERRIDE;
|
|
virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE;
|
|
virtual void SetMenuLabel( size_t pos, const wxString& label ) wxOVERRIDE;
|
|
virtual wxString GetMenuLabel( size_t pos ) const wxOVERRIDE;
|
|
|
|
void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
|
|
wxLayoutDirection GetLayoutDirection() const wxOVERRIDE;
|
|
|
|
virtual void Attach(wxFrame *frame) wxOVERRIDE;
|
|
virtual void Detach() wxOVERRIDE;
|
|
|
|
private:
|
|
// common part of Append and Insert
|
|
void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1);
|
|
|
|
void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
|
|
|
|
// wxMenuBar is not a top level window but it still doesn't need a parent
|
|
// window
|
|
virtual bool GTKNeedsParent() const wxOVERRIDE { return false; }
|
|
|
|
GtkWidget* m_menubar;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxMenuBar);
|
|
};
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxMenu
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
|
|
{
|
|
public:
|
|
// ctors & dtor
|
|
wxMenu(const wxString& title, long style = 0)
|
|
: wxMenuBase(title, style) { Init(); }
|
|
|
|
wxMenu(long style = 0) : wxMenuBase(style) { Init(); }
|
|
|
|
virtual ~wxMenu();
|
|
|
|
void Attach(wxMenuBarBase *menubar) wxOVERRIDE;
|
|
|
|
void SetLayoutDirection(wxLayoutDirection dir);
|
|
wxLayoutDirection GetLayoutDirection() const;
|
|
|
|
// Returns the title, with mnemonics translated to wx format
|
|
wxString GetTitle() const;
|
|
|
|
// Sets the title, with mnemonics translated to gtk format
|
|
virtual void SetTitle(const wxString& title) wxOVERRIDE;
|
|
|
|
// implementation GTK only
|
|
GtkWidget *m_menu; // GtkMenu
|
|
GtkWidget *m_owner;
|
|
GtkAccelGroup *m_accel;
|
|
bool m_popupShown;
|
|
|
|
protected:
|
|
virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE;
|
|
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE;
|
|
virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE;
|
|
|
|
private:
|
|
// common code for all constructors:
|
|
void Init();
|
|
|
|
// common part of Append (if pos == -1) and Insert
|
|
void GtkAppend(wxMenuItem* item, int pos = -1);
|
|
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxMenu);
|
|
};
|
|
|
|
#endif
|
|
// _WX_GTKMENU_H_
|