mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 08:09:26 +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.
95 lines
3.1 KiB
C++
95 lines
3.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/valgen.h
|
|
// Purpose: wxGenericValidator class
|
|
// Author: Kevin Smith
|
|
// Created: Jan 22 1999
|
|
// Copyright: (c) 1999 Julian Smart (assigned from Kevin)
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_VALGENH__
|
|
#define _WX_VALGENH__
|
|
|
|
#include "wx/validate.h"
|
|
|
|
#if wxUSE_VALIDATORS
|
|
|
|
class WXDLLIMPEXP_FWD_BASE wxDateTime;
|
|
class WXDLLIMPEXP_FWD_BASE wxFileName;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGenericValidator performs data transfer between many standard controls and
|
|
// variables of the type corresponding to their values.
|
|
//
|
|
// It doesn't do any validation so its name is a slight misnomer.
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxGenericValidator: public wxValidator
|
|
{
|
|
public:
|
|
// Different constructors: each of them creates a validator which can only
|
|
// be used with some controls, the comments before each constructor
|
|
// indicate which ones:
|
|
// wxCheckBox, wxRadioButton, wx(Bitmap)ToggleButton
|
|
wxGenericValidator(bool* val);
|
|
// wxChoice, wxGauge, wxRadioBox, wxScrollBar, wxSlider, wxSpinButton
|
|
wxGenericValidator(int* val);
|
|
// wxComboBox, wxTextCtrl, wxButton, wxStaticText (read-only)
|
|
wxGenericValidator(wxString* val);
|
|
// wxListBox, wxCheckListBox
|
|
wxGenericValidator(wxArrayInt* val);
|
|
#if wxUSE_DATETIME
|
|
// wxDatePickerCtrl
|
|
wxGenericValidator(wxDateTime* val);
|
|
#endif // wxUSE_DATETIME
|
|
// wxTextCtrl
|
|
wxGenericValidator(wxFileName* val);
|
|
// wxTextCtrl
|
|
wxGenericValidator(float* val);
|
|
// wxTextCtrl
|
|
wxGenericValidator(double* val);
|
|
|
|
wxGenericValidator(const wxGenericValidator& copyFrom);
|
|
|
|
virtual ~wxGenericValidator(){}
|
|
|
|
// Make a clone of this validator (or return NULL) - currently necessary
|
|
// if you're passing a reference to a validator.
|
|
// Another possibility is to always pass a pointer to a new validator
|
|
// (so the calling code can use a copy constructor of the relevant class).
|
|
virtual wxObject *Clone() const wxOVERRIDE { return new wxGenericValidator(*this); }
|
|
bool Copy(const wxGenericValidator& val);
|
|
|
|
// Called when the value in the window must be validated: this is not used
|
|
// by this class
|
|
virtual bool Validate(wxWindow * WXUNUSED(parent)) wxOVERRIDE { return true; }
|
|
|
|
// Called to transfer data to the window
|
|
virtual bool TransferToWindow() wxOVERRIDE;
|
|
|
|
// Called to transfer data to the window
|
|
virtual bool TransferFromWindow() wxOVERRIDE;
|
|
|
|
protected:
|
|
void Initialize();
|
|
|
|
bool* m_pBool;
|
|
int* m_pInt;
|
|
wxString* m_pString;
|
|
wxArrayInt* m_pArrayInt;
|
|
#if wxUSE_DATETIME
|
|
wxDateTime* m_pDateTime;
|
|
#endif // wxUSE_DATETIME
|
|
wxFileName* m_pFileName;
|
|
float* m_pFloat;
|
|
double* m_pDouble;
|
|
|
|
private:
|
|
wxDECLARE_CLASS(wxGenericValidator);
|
|
wxDECLARE_NO_ASSIGN_CLASS(wxGenericValidator);
|
|
};
|
|
|
|
#endif // wxUSE_VALIDATORS
|
|
|
|
#endif // _WX_VALGENH__
|