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.
100 lines
2.7 KiB
C++
100 lines
2.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/tglbtn.h
|
|
// Purpose: This dummy header includes the proper header file for the
|
|
// system we're compiling under.
|
|
// Author: John Norris, minor changes by Axel Schlueter
|
|
// Modified by:
|
|
// Created: 08.02.01
|
|
// Copyright: (c) 2000 Johnny C. Norris II
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_TOGGLEBUTTON_H_BASE_
|
|
#define _WX_TOGGLEBUTTON_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_TOGGLEBTN
|
|
|
|
#include "wx/event.h"
|
|
#include "wx/anybutton.h" // base class
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
|
|
|
|
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOGGLEBUTTON, wxCommandEvent );
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxToggleButtonBase
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxAnyButton
|
|
{
|
|
public:
|
|
wxToggleButtonBase() { }
|
|
|
|
// Get/set the value
|
|
virtual void SetValue(bool state) = 0;
|
|
virtual bool GetValue() const = 0;
|
|
|
|
// The current "normal" state for the toggle button depends upon its value.
|
|
virtual State GetNormalState() const wxOVERRIDE
|
|
{
|
|
return GetValue() ? State_Pressed : State_Normal;
|
|
}
|
|
|
|
void UpdateWindowUI(long flags) wxOVERRIDE
|
|
{
|
|
wxControl::UpdateWindowUI(flags);
|
|
|
|
if ( !IsShown() )
|
|
return;
|
|
|
|
wxWindow *tlw = wxGetTopLevelParent( this );
|
|
if (tlw && wxPendingDelete.Member( tlw ))
|
|
return;
|
|
|
|
wxUpdateUIEvent event( GetId() );
|
|
event.SetEventObject(this);
|
|
|
|
if (GetEventHandler()->ProcessEvent(event) )
|
|
{
|
|
if ( event.GetSetChecked() )
|
|
SetValue( event.GetChecked() );
|
|
}
|
|
}
|
|
|
|
protected:
|
|
wxDECLARE_NO_COPY_CLASS(wxToggleButtonBase);
|
|
};
|
|
|
|
|
|
#define EVT_TOGGLEBUTTON(id, fn) \
|
|
wx__DECLARE_EVT1(wxEVT_TOGGLEBUTTON, id, wxCommandEventHandler(fn))
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/tglbtn.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/tglbtn.h"
|
|
#define wxHAS_BITMAPTOGGLEBUTTON
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/tglbtn.h"
|
|
#define wxHAS_BITMAPTOGGLEBUTTON
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/tglbtn.h"
|
|
# elif defined(__WXMOTIF__)
|
|
#include "wx/motif/tglbtn.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/tglbtn.h"
|
|
#define wxHAS_BITMAPTOGGLEBUTTON
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/tglbtn.h"
|
|
#endif
|
|
|
|
// old wxEVT_COMMAND_* constants
|
|
#define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED wxEVT_TOGGLEBUTTON
|
|
|
|
#endif // wxUSE_TOGGLEBTN
|
|
|
|
#endif // _WX_TOGGLEBUTTON_H_BASE_
|
|
|