mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 18:49: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.
120 lines
3.4 KiB
C++
120 lines
3.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/statusbr.h
|
|
// Purpose: wxStatusBarGeneric class
|
|
// Author: Julian Smart
|
|
// Modified by: VZ at 05.02.00 to derive from wxStatusBarBase
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GENERIC_STATUSBR_H_
|
|
#define _WX_GENERIC_STATUSBR_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_STATUSBAR
|
|
|
|
#include "wx/pen.h"
|
|
#include "wx/arrstr.h"
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxStatusBarGeneric
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxStatusBarGeneric : public wxStatusBarBase
|
|
{
|
|
public:
|
|
wxStatusBarGeneric() { Init(); }
|
|
wxStatusBarGeneric(wxWindow *parent,
|
|
wxWindowID winid = wxID_ANY,
|
|
long style = wxSTB_DEFAULT_STYLE,
|
|
const wxString& name = wxStatusBarNameStr)
|
|
{
|
|
Init();
|
|
|
|
Create(parent, winid, style, name);
|
|
}
|
|
|
|
virtual ~wxStatusBarGeneric();
|
|
|
|
bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
|
|
long style = wxSTB_DEFAULT_STYLE,
|
|
const wxString& name = wxStatusBarNameStr);
|
|
|
|
// implement base class methods
|
|
virtual void SetStatusWidths(int n, const int widths_field[]) wxOVERRIDE;
|
|
virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE;
|
|
virtual void SetMinHeight(int height) wxOVERRIDE;
|
|
|
|
virtual int GetBorderX() const wxOVERRIDE { return m_borderX; }
|
|
virtual int GetBorderY() const wxOVERRIDE { return m_borderY; }
|
|
|
|
|
|
// implementation only (not part of wxStatusBar public API):
|
|
|
|
int GetFieldFromPoint(const wxPoint& point) const;
|
|
|
|
protected:
|
|
virtual void DoUpdateStatusText(int number) wxOVERRIDE;
|
|
|
|
// event handlers
|
|
void OnPaint(wxPaintEvent& event);
|
|
void OnSize(wxSizeEvent& event);
|
|
|
|
void OnLeftDown(wxMouseEvent& event);
|
|
void OnRightDown(wxMouseEvent& event);
|
|
|
|
// Responds to colour changes
|
|
void OnSysColourChanged(wxSysColourChangedEvent& event);
|
|
|
|
protected:
|
|
|
|
virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight);
|
|
virtual void DrawField(wxDC& dc, int i, int textHeight);
|
|
|
|
void SetBorderX(int x);
|
|
void SetBorderY(int y);
|
|
|
|
virtual void InitColours();
|
|
|
|
// true if the status bar shows the size grip: for this it must have
|
|
// wxSTB_SIZEGRIP style and the window it is attached to must be resizable
|
|
// and not maximized
|
|
bool ShowsSizeGrip() const;
|
|
|
|
// returns the position and the size of the size grip
|
|
wxRect GetSizeGripRect() const;
|
|
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
// the last known size, fields widths must be updated whenever it's out of
|
|
// date
|
|
wxSize m_lastClientSize;
|
|
|
|
// the absolute widths of the status bar panes in pixels
|
|
wxArrayInt m_widthsAbs;
|
|
|
|
int m_borderX;
|
|
int m_borderY;
|
|
|
|
wxPen m_mediumShadowPen;
|
|
wxPen m_hilightPen;
|
|
|
|
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
|
|
|
private:
|
|
// Update m_lastClientSize and m_widthsAbs from the current size.
|
|
void DoUpdateFieldWidths();
|
|
|
|
wxDECLARE_EVENT_TABLE();
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric);
|
|
};
|
|
|
|
#endif // wxUSE_STATUSBAR
|
|
|
|
#endif
|
|
// _WX_GENERIC_STATUSBR_H_
|