mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 18:49:11 +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.
78 lines
2.3 KiB
C++
78 lines
2.3 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/infobar.h
|
|
// Purpose: native implementation of wxInfoBar for GTK+ 2.18 and later
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2009-09-26
|
|
// Copyright: (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_INFOBAR_H_
|
|
#define _WX_GTK_INFOBAR_H_
|
|
|
|
#include "wx/generic/infobar.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxInfoBar for GTK+
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// notice that the native GTK+ implementation is only available since
|
|
// (relatively recent) 2.18 so we inherit from the generic one to be able to
|
|
// fall back to it if GTK+ version is determined to be too old during run-time
|
|
class WXDLLIMPEXP_CORE wxInfoBar : public wxInfoBarGeneric
|
|
{
|
|
public:
|
|
wxInfoBar() { Init(); }
|
|
|
|
wxInfoBar(wxWindow *parent, wxWindowID winid = wxID_ANY)
|
|
{
|
|
Init();
|
|
Create(parent, winid);
|
|
}
|
|
|
|
bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY);
|
|
|
|
virtual ~wxInfoBar();
|
|
|
|
// implement base class methods
|
|
// ----------------------------
|
|
|
|
virtual void ShowMessage(const wxString& msg,
|
|
int flags = wxICON_INFORMATION) wxOVERRIDE;
|
|
|
|
virtual void Dismiss() wxOVERRIDE;
|
|
|
|
virtual void AddButton(wxWindowID btnid,
|
|
const wxString& label = wxString()) wxOVERRIDE;
|
|
|
|
virtual void RemoveButton(wxWindowID btnid) wxOVERRIDE;
|
|
|
|
virtual size_t GetButtonCount() const wxOVERRIDE;
|
|
virtual wxWindowID GetButtonId(size_t idx) const wxOVERRIDE;
|
|
virtual bool HasButtonId(wxWindowID btnid) const wxOVERRIDE;
|
|
|
|
// implementation only
|
|
// -------------------
|
|
|
|
void GTKResponse(int btnid);
|
|
|
|
protected:
|
|
virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
|
|
|
|
private:
|
|
void Init() { m_impl = NULL; }
|
|
|
|
// add a button with the given id/label and return its widget
|
|
GtkWidget *GTKAddButton(wxWindowID btnid,
|
|
const wxString& label = wxString());
|
|
|
|
|
|
// only used when the native implementation is really being used
|
|
class wxInfoBarGTKImpl *m_impl;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxInfoBar);
|
|
};
|
|
|
|
#endif // _WX_GTK_INFOBAR_H_
|
|
|