mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 09:09:12 +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
3.2 KiB
C++
94 lines
3.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/choice.h
|
|
// Purpose: wxChoice class interface
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 26.07.99
|
|
// Copyright: (c) wxWidgets team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_CHOICE_H_BASE_
|
|
#define _WX_CHOICE_H_BASE_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_CHOICE
|
|
|
|
#include "wx/ctrlsub.h" // the base class
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// global data
|
|
// ----------------------------------------------------------------------------
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxChoiceNameStr[];
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxChoice allows to select one of a non-modifiable list of strings
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxChoiceBase : public wxControlWithItems
|
|
{
|
|
public:
|
|
wxChoiceBase() { }
|
|
virtual ~wxChoiceBase();
|
|
|
|
// all generic methods are in wxControlWithItems
|
|
|
|
// get the current selection: this can only be different from the normal
|
|
// selection if the popup items list is currently opened and the user
|
|
// selected some item in it but didn't close the list yet; otherwise (and
|
|
// currently always on platforms other than MSW) this is the same as
|
|
// GetSelection()
|
|
virtual int GetCurrentSelection() const { return GetSelection(); }
|
|
|
|
// set/get the number of columns in the control (as they're not supported on
|
|
// most platforms, they do nothing by default)
|
|
virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
|
|
virtual int GetColumns() const { return 1 ; }
|
|
|
|
// emulate selecting the item event.GetInt()
|
|
void Command(wxCommandEvent& event) wxOVERRIDE;
|
|
|
|
// override wxItemContainer::IsSorted
|
|
virtual bool IsSorted() const wxOVERRIDE { return HasFlag(wxCB_SORT); }
|
|
|
|
protected:
|
|
// The generic implementation doesn't determine the height correctly and
|
|
// doesn't account for the width of the arrow but does take into account
|
|
// the string widths, so the derived classes should override it and set the
|
|
// height and add the arrow width to the size returned by this version.
|
|
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
|
|
|
private:
|
|
wxDECLARE_NO_COPY_CLASS(wxChoiceBase);
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// include the platform-dependent class definition
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/choice.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/choice.h"
|
|
#elif defined(__WXMOTIF__)
|
|
#include "wx/motif/choice.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/choice.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/choice.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/choice.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/choice.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_CHOICE
|
|
|
|
#endif // _WX_CHOICE_H_BASE_
|