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.
75 lines
2.6 KiB
C++
75 lines
2.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/scrolbar.h
|
|
// Purpose: wxScrollBar class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_SCROLBAR_H_
|
|
#define _WX_SCROLBAR_H_
|
|
|
|
// Scrollbar item
|
|
class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase
|
|
{
|
|
public:
|
|
wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
|
|
virtual ~wxScrollBar();
|
|
|
|
wxScrollBar(wxWindow *parent, wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxSB_HORIZONTAL,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxScrollBarNameStr)
|
|
{
|
|
Create(parent, id, pos, size, style, validator, name);
|
|
}
|
|
bool Create(wxWindow *parent, wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxSB_HORIZONTAL,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxScrollBarNameStr);
|
|
|
|
int GetThumbPosition() const ;
|
|
int GetThumbSize() const { return m_pageSize; }
|
|
int GetPageSize() const { return m_viewSize; }
|
|
int GetRange() const { return m_objectSize; }
|
|
|
|
virtual void SetThumbPosition(int viewStart);
|
|
virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
|
|
bool refresh = true);
|
|
|
|
// needed for RTTI
|
|
void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; }
|
|
void SetPageSize( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , GetRange() , s , true ) ; }
|
|
void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; }
|
|
|
|
void Command(wxCommandEvent& event);
|
|
virtual bool MSWOnScroll(int orientation, WXWORD wParam,
|
|
WXWORD pos, WXHWND control);
|
|
|
|
// override wxControl version to not use solid background here
|
|
virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd);
|
|
|
|
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
|
|
|
// returns true if the platform should explicitly apply a theme border
|
|
virtual bool CanApplyThemeBorder() const { return false; }
|
|
|
|
protected:
|
|
virtual wxSize DoGetBestSize() const;
|
|
|
|
int m_pageSize;
|
|
int m_viewSize;
|
|
int m_objectSize;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxScrollBar);
|
|
};
|
|
|
|
#endif
|
|
// _WX_SCROLBAR_H_
|