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.
156 lines
5.0 KiB
C++
156 lines
5.0 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/generic/filepickerg.cpp
|
|
// Purpose: wxGenericFileDirButton class implementation
|
|
// Author: Francesco Montorsi
|
|
// Modified by:
|
|
// Created: 15/04/2006
|
|
// Copyright: (c) Francesco Montorsi
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ============================================================================
|
|
// declarations
|
|
// ============================================================================
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
|
|
|
|
#include "wx/filename.h"
|
|
#include "wx/filepicker.h"
|
|
|
|
#include "wx/scopedptr.h"
|
|
|
|
|
|
// ============================================================================
|
|
// implementation
|
|
// ============================================================================
|
|
|
|
wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton);
|
|
wxIMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton);
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGenericFileButton
|
|
// ----------------------------------------------------------------------------
|
|
|
|
bool wxGenericFileDirButton::Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& label,
|
|
const wxString& path,
|
|
const wxString& message,
|
|
const wxString& wildcard,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
long style,
|
|
const wxValidator& validator,
|
|
const wxString& name)
|
|
{
|
|
m_pickerStyle = style;
|
|
|
|
// If the special wxPB_SMALL flag is used, ignore the provided label and
|
|
// use the shortest possible label and the smallest possible button fitting
|
|
// it.
|
|
long styleButton = 0;
|
|
wxString labelButton;
|
|
if ( m_pickerStyle & wxPB_SMALL )
|
|
{
|
|
labelButton = _("...");
|
|
styleButton = wxBU_EXACTFIT;
|
|
}
|
|
else
|
|
{
|
|
labelButton = label;
|
|
}
|
|
|
|
// create this button
|
|
if ( !wxButton::Create(parent, id, labelButton,
|
|
pos, size, styleButton, validator, name) )
|
|
{
|
|
wxFAIL_MSG( wxT("wxGenericFileButton creation failed") );
|
|
return false;
|
|
}
|
|
|
|
// and handle user clicks on it
|
|
Connect(GetId(), wxEVT_BUTTON,
|
|
wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
|
|
NULL, this);
|
|
|
|
// create the dialog associated with this button
|
|
m_path = path;
|
|
m_message = message;
|
|
m_wildcard = wildcard;
|
|
|
|
return true;
|
|
}
|
|
|
|
void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
|
|
{
|
|
wxScopedPtr<wxDialog> p(CreateDialog());
|
|
if (p->ShowModal() == wxID_OK)
|
|
{
|
|
// save updated path in m_path
|
|
UpdatePathFromDialog(p.get());
|
|
|
|
// fire an event
|
|
wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path);
|
|
GetEventHandler()->ProcessEvent(event);
|
|
}
|
|
}
|
|
|
|
void wxGenericFileDirButton::SetInitialDirectory(const wxString& dir)
|
|
{
|
|
m_initialDir = dir;
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGenericFileButton
|
|
// ----------------------------------------------------------------------------
|
|
|
|
wxDialog *wxGenericFileButton::CreateDialog()
|
|
{
|
|
// Determine the initial directory for the dialog: it comes either from the
|
|
// default path, if it has it, or from the separately specified initial
|
|
// directory that can be set even if the path is e.g. empty.
|
|
wxFileName fn(m_path);
|
|
wxString initialDir = fn.GetPath();
|
|
if ( initialDir.empty() )
|
|
initialDir = m_initialDir;
|
|
|
|
return new wxFileDialog
|
|
(
|
|
GetDialogParent(),
|
|
m_message,
|
|
initialDir,
|
|
fn.GetFullName(),
|
|
m_wildcard,
|
|
GetDialogStyle()
|
|
);
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGenericDirButton
|
|
// ----------------------------------------------------------------------------
|
|
|
|
wxDialog *wxGenericDirButton::CreateDialog()
|
|
{
|
|
wxDirDialog* const dialog = new wxDirDialog
|
|
(
|
|
GetDialogParent(),
|
|
m_message,
|
|
m_path.empty() ? m_initialDir : m_path,
|
|
GetDialogStyle()
|
|
);
|
|
return dialog;
|
|
}
|
|
|
|
#endif // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
|