mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-07-19 17:35:37 -05:00
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.
192 lines
5.4 KiB
C++
192 lines
5.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/generic/numdlgg.cpp
|
|
// Purpose: wxGetNumberFromUser implementation
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 23.07.99
|
|
// Copyright: (c) Vadim Zeitlin
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ============================================================================
|
|
// declarations
|
|
// ============================================================================
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_NUMBERDLG
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include <stdio.h>
|
|
|
|
#include "wx/utils.h"
|
|
#include "wx/dialog.h"
|
|
#include "wx/button.h"
|
|
#include "wx/stattext.h"
|
|
#include "wx/textctrl.h"
|
|
#include "wx/intl.h"
|
|
#include "wx/sizer.h"
|
|
#endif
|
|
|
|
#if wxUSE_STATLINE
|
|
#include "wx/statline.h"
|
|
#endif
|
|
|
|
#if wxUSE_SPINCTRL
|
|
#include "wx/spinctrl.h"
|
|
#endif
|
|
|
|
// this is where wxGetNumberFromUser() is declared
|
|
#include "wx/numdlg.h"
|
|
|
|
#if !wxUSE_SPINCTRL
|
|
// wxTextCtrl will do instead of wxSpinCtrl if we don't have it
|
|
#define wxSpinCtrl wxTextCtrl
|
|
#endif
|
|
|
|
// ============================================================================
|
|
// implementation
|
|
// ============================================================================
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxNumberEntryDialog
|
|
// ----------------------------------------------------------------------------
|
|
|
|
wxBEGIN_EVENT_TABLE(wxNumberEntryDialog, wxDialog)
|
|
EVT_BUTTON(wxID_OK, wxNumberEntryDialog::OnOK)
|
|
EVT_BUTTON(wxID_CANCEL, wxNumberEntryDialog::OnCancel)
|
|
wxEND_EVENT_TABLE()
|
|
|
|
wxIMPLEMENT_CLASS(wxNumberEntryDialog, wxDialog);
|
|
|
|
bool wxNumberEntryDialog::Create(wxWindow *parent,
|
|
const wxString& message,
|
|
const wxString& prompt,
|
|
const wxString& caption,
|
|
long value,
|
|
long min,
|
|
long max,
|
|
const wxPoint& pos)
|
|
{
|
|
if ( !wxDialog::Create(GetParentForModalDialog(parent, 0),
|
|
wxID_ANY, caption,
|
|
pos, wxDefaultSize) )
|
|
{
|
|
return false;
|
|
}
|
|
|
|
m_value = value;
|
|
m_max = max;
|
|
m_min = min;
|
|
|
|
wxBeginBusyCursor();
|
|
|
|
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
|
|
#if wxUSE_STATTEXT
|
|
// 1) text message
|
|
topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
|
|
#endif
|
|
|
|
// 2) prompt and text ctrl
|
|
wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );
|
|
|
|
#if wxUSE_STATTEXT
|
|
// prompt if any
|
|
if (!prompt.empty())
|
|
inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );
|
|
#endif
|
|
|
|
// spin ctrl
|
|
wxString valStr;
|
|
valStr.Printf(wxT("%ld"), m_value);
|
|
#if wxUSE_SPINCTRL
|
|
m_spinctrl = new wxSpinCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultCoord ), wxSP_ARROW_KEYS, (int)m_min, (int)m_max, (int)m_value);
|
|
#else
|
|
m_spinctrl = new wxTextCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultCoord ));
|
|
#endif
|
|
inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
|
|
// add both
|
|
topsizer->Add( inputsizer, 0, wxEXPAND | wxLEFT|wxRIGHT, 5 );
|
|
|
|
// 3) buttons if any
|
|
wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL);
|
|
if ( buttonSizer )
|
|
{
|
|
topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());
|
|
}
|
|
|
|
SetSizer( topsizer );
|
|
SetAutoLayout( true );
|
|
|
|
topsizer->SetSizeHints( this );
|
|
topsizer->Fit( this );
|
|
|
|
Centre( wxBOTH );
|
|
|
|
m_spinctrl->SetSelection(-1, -1);
|
|
m_spinctrl->SetFocus();
|
|
|
|
wxEndBusyCursor();
|
|
|
|
return true;
|
|
}
|
|
|
|
void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))
|
|
{
|
|
#if !wxUSE_SPINCTRL
|
|
wxString tmp = m_spinctrl->GetValue();
|
|
if ( wxSscanf(tmp, wxT("%ld"), &m_value) != 1 )
|
|
EndModal(wxID_CANCEL);
|
|
else
|
|
#else
|
|
m_value = m_spinctrl->GetValue();
|
|
#endif
|
|
if ( m_value < m_min || m_value > m_max )
|
|
{
|
|
// not a number or out of range
|
|
m_value = -1;
|
|
EndModal(wxID_CANCEL);
|
|
}
|
|
|
|
EndModal(wxID_OK);
|
|
}
|
|
|
|
void wxNumberEntryDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
|
|
{
|
|
EndModal(wxID_CANCEL);
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// global functions
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// wxGetTextFromUser is in utilscmn.cpp
|
|
|
|
long wxGetNumberFromUser(const wxString& msg,
|
|
const wxString& prompt,
|
|
const wxString& title,
|
|
long value,
|
|
long min,
|
|
long max,
|
|
wxWindow *parent,
|
|
const wxPoint& pos)
|
|
{
|
|
wxNumberEntryDialog dialog(parent, msg, prompt, title,
|
|
value, min, max, pos);
|
|
if (dialog.ShowModal() == wxID_OK)
|
|
return dialog.GetValue();
|
|
|
|
return -1;
|
|
}
|
|
|
|
#endif // wxUSE_NUMBERDLG
|