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.
131 lines
4.7 KiB
C++
131 lines
4.7 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/choicebk.h
|
|
// Purpose: wxChoicebook: wxChoice and wxNotebook combination
|
|
// Author: Vadim Zeitlin
|
|
// Modified by: Wlodzimierz ABX Skiba from wx/listbook.h
|
|
// Created: 15.09.04
|
|
// Copyright: (c) Vadim Zeitlin, Wlodzimierz Skiba
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_CHOICEBOOK_H_
|
|
#define _WX_CHOICEBOOK_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_CHOICEBOOK
|
|
|
|
#include "wx/bookctrl.h"
|
|
#include "wx/choice.h"
|
|
#include "wx/containr.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxChoice;
|
|
|
|
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
|
|
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
|
|
|
|
// wxChoicebook flags
|
|
#define wxCHB_DEFAULT wxBK_DEFAULT
|
|
#define wxCHB_TOP wxBK_TOP
|
|
#define wxCHB_BOTTOM wxBK_BOTTOM
|
|
#define wxCHB_LEFT wxBK_LEFT
|
|
#define wxCHB_RIGHT wxBK_RIGHT
|
|
#define wxCHB_ALIGN_MASK wxBK_ALIGN_MASK
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxChoicebook
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxChoicebook : public wxNavigationEnabled<wxBookCtrlBase>
|
|
{
|
|
public:
|
|
wxChoicebook() { }
|
|
|
|
wxChoicebook(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxEmptyString)
|
|
{
|
|
(void)Create(parent, id, pos, size, style, name);
|
|
}
|
|
|
|
// quasi ctor
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxEmptyString);
|
|
|
|
|
|
virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE;
|
|
virtual wxString GetPageText(size_t n) const wxOVERRIDE;
|
|
virtual int GetPageImage(size_t n) const wxOVERRIDE;
|
|
virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE;
|
|
virtual bool InsertPage(size_t n,
|
|
wxWindow *page,
|
|
const wxString& text,
|
|
bool bSelect = false,
|
|
int imageId = NO_IMAGE) wxOVERRIDE;
|
|
virtual int SetSelection(size_t n) wxOVERRIDE
|
|
{ return DoSetSelection(n, SetSelection_SendEvent); }
|
|
virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); }
|
|
virtual void SetImageList(wxImageList *imageList) wxOVERRIDE;
|
|
|
|
virtual bool DeleteAllPages() wxOVERRIDE;
|
|
|
|
// returns the choice control
|
|
wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }
|
|
|
|
// Override this to return true because the part of parent window
|
|
// background between our controlling wxChoice and the page area should
|
|
// show through.
|
|
virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
|
|
|
|
protected:
|
|
virtual void DoSetWindowVariant(wxWindowVariant variant) wxOVERRIDE;
|
|
|
|
virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE;
|
|
|
|
void UpdateSelectedPage(size_t newsel) wxOVERRIDE
|
|
{
|
|
m_selection = static_cast<int>(newsel);
|
|
GetChoiceCtrl()->Select(m_selection);
|
|
}
|
|
|
|
wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE;
|
|
void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE;
|
|
|
|
// event handlers
|
|
void OnChoiceSelected(wxCommandEvent& event);
|
|
|
|
private:
|
|
wxDECLARE_EVENT_TABLE();
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook);
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// choicebook event class and related stuff
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// wxChoicebookEvent is obsolete and defined for compatibility only
|
|
#define wxChoicebookEvent wxBookCtrlEvent
|
|
typedef wxBookCtrlEventFunction wxChoicebookEventFunction;
|
|
#define wxChoicebookEventHandler(func) wxBookCtrlEventHandler(func)
|
|
|
|
#define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \
|
|
wx__DECLARE_EVT1(wxEVT_CHOICEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
|
|
|
|
#define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \
|
|
wx__DECLARE_EVT1(wxEVT_CHOICEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
|
|
|
|
// old wxEVT_COMMAND_* constants
|
|
#define wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED wxEVT_CHOICEBOOK_PAGE_CHANGED
|
|
#define wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING wxEVT_CHOICEBOOK_PAGE_CHANGING
|
|
|
|
#endif // wxUSE_CHOICEBOOK
|
|
|
|
#endif // _WX_CHOICEBOOK_H_
|