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.
94 lines
2.7 KiB
C++
94 lines
2.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/numdlgg.h
|
|
// Purpose: wxNumberEntryDialog class
|
|
// Author: John Labenski
|
|
// Modified by:
|
|
// Created: 07.02.04 (extracted from textdlgg.cpp)
|
|
// Copyright: (c) wxWidgets team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef __NUMDLGH_G__
|
|
#define __NUMDLGH_G__
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_NUMBERDLG
|
|
|
|
#include "wx/dialog.h"
|
|
|
|
#if wxUSE_SPINCTRL
|
|
class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
|
|
#else
|
|
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
|
|
#endif // wxUSE_SPINCTRL
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxNumberEntryDialog: a dialog with spin control, [ok] and [cancel] buttons
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxNumberEntryDialog : public wxDialog
|
|
{
|
|
public:
|
|
wxNumberEntryDialog()
|
|
{
|
|
m_value = m_min = m_max = 0;
|
|
}
|
|
|
|
wxNumberEntryDialog(wxWindow *parent,
|
|
const wxString& message,
|
|
const wxString& prompt,
|
|
const wxString& caption,
|
|
long value, long min, long max,
|
|
const wxPoint& pos = wxDefaultPosition)
|
|
{
|
|
Create(parent, message, prompt, caption, value, min, max, pos);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
const wxString& message,
|
|
const wxString& prompt,
|
|
const wxString& caption,
|
|
long value, long min, long max,
|
|
const wxPoint& pos = wxDefaultPosition);
|
|
|
|
long GetValue() const { return m_value; }
|
|
|
|
// implementation only
|
|
void OnOK(wxCommandEvent& event);
|
|
void OnCancel(wxCommandEvent& event);
|
|
|
|
protected:
|
|
|
|
#if wxUSE_SPINCTRL
|
|
wxSpinCtrl *m_spinctrl;
|
|
#else
|
|
wxTextCtrl *m_spinctrl;
|
|
#endif // wxUSE_SPINCTRL
|
|
|
|
long m_value, m_min, m_max;
|
|
|
|
private:
|
|
wxDECLARE_EVENT_TABLE();
|
|
wxDECLARE_DYNAMIC_CLASS(wxNumberEntryDialog);
|
|
wxDECLARE_NO_COPY_CLASS(wxNumberEntryDialog);
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// function to get a number from user
|
|
// ----------------------------------------------------------------------------
|
|
|
|
WXDLLIMPEXP_CORE long
|
|
wxGetNumberFromUser(const wxString& message,
|
|
const wxString& prompt,
|
|
const wxString& caption,
|
|
long value = 0,
|
|
long min = 0,
|
|
long max = 100,
|
|
wxWindow *parent = NULL,
|
|
const wxPoint& pos = wxDefaultPosition);
|
|
|
|
#endif // wxUSE_NUMBERDLG
|
|
|
|
#endif // __NUMDLGH_G__
|