mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 12:21:41 +02: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.
72 lines
2.5 KiB
C++
72 lines
2.5 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/infobar.h
|
|
// Purpose: declaration of wxInfoBarBase defining common API of wxInfoBar
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2009-07-28
|
|
// Copyright: (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_INFOBAR_H_
|
|
#define _WX_INFOBAR_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_INFOBAR
|
|
|
|
#include "wx/control.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxInfoBar shows non-critical but important information to the user
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxInfoBarBase : public wxControl
|
|
{
|
|
public:
|
|
// real ctors are provided by the derived classes, just notice that unlike
|
|
// most of the other windows, info bar is created hidden and must be
|
|
// explicitly shown when it is needed (this is done because it is supposed
|
|
// to be shown only intermittently and hiding it after creating it from the
|
|
// user code would result in flicker)
|
|
wxInfoBarBase() { }
|
|
|
|
|
|
// show the info bar with the given message and optionally an icon
|
|
virtual void ShowMessage(const wxString& msg,
|
|
int flags = wxICON_INFORMATION) = 0;
|
|
|
|
// hide the info bar
|
|
virtual void Dismiss() = 0;
|
|
|
|
// add an extra button to the bar, near the message (replacing the default
|
|
// close button which is only shown if no extra buttons are used)
|
|
virtual void AddButton(wxWindowID btnid,
|
|
const wxString& label = wxString()) = 0;
|
|
|
|
// remove a button previously added by AddButton()
|
|
virtual void RemoveButton(wxWindowID btnid) = 0;
|
|
|
|
// get information about the currently shown buttons
|
|
virtual size_t GetButtonCount() const = 0;
|
|
virtual wxWindowID GetButtonId(size_t idx) const = 0;
|
|
virtual bool HasButtonId(wxWindowID btnid) const = 0;
|
|
|
|
private:
|
|
wxDECLARE_NO_COPY_CLASS(wxInfoBarBase);
|
|
};
|
|
|
|
// currently only GTK+ has a native implementation
|
|
#if defined(__WXGTK218__) && !defined(__WXUNIVERSAL__)
|
|
#include "wx/gtk/infobar.h"
|
|
#define wxHAS_NATIVE_INFOBAR
|
|
#endif // wxGTK2
|
|
|
|
// if the generic version is the only one we have, use it
|
|
#ifndef wxHAS_NATIVE_INFOBAR
|
|
#include "wx/generic/infobar.h"
|
|
#define wxInfoBar wxInfoBarGeneric
|
|
#endif
|
|
|
|
#endif // wxUSE_INFOBAR
|
|
|
|
#endif // _WX_INFOBAR_H_
|