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.
67 lines
1.9 KiB
C++
67 lines
1.9 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/button.h
|
|
// Purpose: wxButtonBase class
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 15.08.00
|
|
// Copyright: (c) Vadim Zeitlin
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_BUTTON_H_BASE_
|
|
#define _WX_BUTTON_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_BUTTON
|
|
|
|
#include "wx/anybutton.h"
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxButton: a push button
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxButtonBase : public wxAnyButton
|
|
{
|
|
public:
|
|
wxButtonBase() { }
|
|
|
|
// show the authentication needed symbol on the button: this is currently
|
|
// only implemented on Windows Vista and newer (on which it shows the UAC
|
|
// shield symbol)
|
|
void SetAuthNeeded(bool show = true) { DoSetAuthNeeded(show); }
|
|
bool GetAuthNeeded() const { return DoGetAuthNeeded(); }
|
|
|
|
// make this button the default button in its top level window
|
|
//
|
|
// returns the old default item (possibly NULL)
|
|
virtual wxWindow *SetDefault();
|
|
|
|
// returns the default button size for this platform
|
|
static wxSize GetDefaultSize();
|
|
|
|
protected:
|
|
wxDECLARE_NO_COPY_CLASS(wxButtonBase);
|
|
};
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/button.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/button.h"
|
|
#elif defined(__WXMOTIF__)
|
|
#include "wx/motif/button.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/button.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/button.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/button.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/button.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_BUTTON
|
|
|
|
#endif // _WX_BUTTON_H_BASE_
|