mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 09:39:11 +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.
103 lines
3.3 KiB
C++
103 lines
3.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/choice.h
|
|
// Purpose: wxChoice class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_CHOICE_H_
|
|
#define _WX_CHOICE_H_
|
|
|
|
#include "wx/control.h"
|
|
|
|
#include "wx/dynarray.h"
|
|
#include "wx/arrstr.h"
|
|
|
|
WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
|
|
|
|
// Choice item
|
|
class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
|
|
{
|
|
wxDECLARE_DYNAMIC_CLASS(wxChoice);
|
|
|
|
public:
|
|
wxChoice()
|
|
: m_strings(), m_datas()
|
|
{}
|
|
|
|
virtual ~wxChoice() ;
|
|
|
|
wxChoice(wxWindow *parent, wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
int n = 0, const wxString choices[] = NULL,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxChoiceNameStr)
|
|
{
|
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
|
}
|
|
wxChoice(wxWindow *parent, wxWindowID id,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
const wxArrayString& choices,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxChoiceNameStr)
|
|
{
|
|
Create(parent, id, pos, size, choices, style, validator, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent, wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
int n = 0, const wxString choices[] = NULL,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxChoiceNameStr);
|
|
bool Create(wxWindow *parent, wxWindowID id,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
const wxArrayString& choices,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxChoiceNameStr);
|
|
|
|
virtual unsigned int GetCount() const ;
|
|
virtual int GetSelection() const ;
|
|
virtual void SetSelection(int n);
|
|
|
|
virtual int FindString(const wxString& s, bool bCase = false) const;
|
|
virtual wxString GetString(unsigned int n) const ;
|
|
virtual void SetString(unsigned int pos, const wxString& s);
|
|
// osx specific event handling common for all osx-ports
|
|
|
|
virtual bool OSXHandleClicked( double timestampsec );
|
|
|
|
protected:
|
|
virtual void DoDeleteOneItem(unsigned int n);
|
|
virtual void DoClear();
|
|
|
|
virtual wxSize DoGetBestSize() const ;
|
|
virtual int DoInsertItems(const wxArrayStringsAdapter& items,
|
|
unsigned int pos,
|
|
void **clientData, wxClientDataType type);
|
|
|
|
virtual void DoSetItemClientData(unsigned int n, void* clientData);
|
|
virtual void* DoGetItemClientData(unsigned int n) const;
|
|
|
|
wxArrayString m_strings;
|
|
wxChoiceDataArray m_datas ;
|
|
wxMenu* m_popUpMenu ;
|
|
|
|
private:
|
|
// This should be called when the number of items in the control changes.
|
|
void DoAfterItemCountChange();
|
|
};
|
|
|
|
#endif
|
|
// _WX_CHOICE_H_
|