mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-14 10:09:13 +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.
118 lines
3.6 KiB
C++
118 lines
3.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/frame.h
|
|
// Purpose: wxFrame class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_FRAME_H_
|
|
#define _WX_FRAME_H_
|
|
|
|
#include "wx/toolbar.h"
|
|
#include "wx/accel.h"
|
|
#include "wx/icon.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
|
|
|
|
class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase
|
|
{
|
|
public:
|
|
// construction
|
|
wxFrame() { Init(); }
|
|
wxFrame(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxDEFAULT_FRAME_STYLE,
|
|
const wxString& name = wxFrameNameStr)
|
|
{
|
|
Init();
|
|
|
|
Create(parent, id, title, pos, size, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxDEFAULT_FRAME_STYLE,
|
|
const wxString& name = wxFrameNameStr);
|
|
|
|
// implementation only from now on
|
|
// -------------------------------
|
|
|
|
// get the origin of the client area (which may be different from (0, 0)
|
|
// if the frame has a toolbar) in client coordinates
|
|
virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
|
|
|
|
// override some more virtuals
|
|
virtual bool Show(bool show = true) wxOVERRIDE;
|
|
virtual bool Enable(bool enable = true) wxOVERRIDE;
|
|
|
|
// event handlers
|
|
void OnActivate(wxActivateEvent& event);
|
|
void OnSysColourChanged(wxSysColourChangedEvent& event);
|
|
|
|
// Toolbar
|
|
#if wxUSE_TOOLBAR
|
|
virtual wxToolBar* CreateToolBar(long style = -1,
|
|
wxWindowID id = -1,
|
|
const wxString& name = wxToolBarNameStr) wxOVERRIDE;
|
|
|
|
virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE;
|
|
#endif // wxUSE_TOOLBAR
|
|
|
|
// Status bar
|
|
#if wxUSE_STATUSBAR
|
|
virtual wxStatusBar* OnCreateStatusBar(int number = 1,
|
|
long style = wxSTB_DEFAULT_STYLE,
|
|
wxWindowID id = 0,
|
|
const wxString& name = wxStatusLineNameStr) wxOVERRIDE;
|
|
#endif // wxUSE_STATUSBAR
|
|
|
|
// called by wxWindow whenever it gets focus
|
|
void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
|
|
wxWindow *GetLastFocus() const { return m_winLastFocused; }
|
|
|
|
void PositionBars();
|
|
|
|
// internal response to size events
|
|
virtual void MacOnInternalSize() wxOVERRIDE { PositionBars(); }
|
|
|
|
protected:
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
#if wxUSE_TOOLBAR
|
|
virtual void PositionToolBar() wxOVERRIDE;
|
|
#endif
|
|
#if wxUSE_STATUSBAR
|
|
virtual void PositionStatusBar() wxOVERRIDE;
|
|
#endif
|
|
|
|
// override base class virtuals
|
|
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
|
|
virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
|
|
|
|
#if wxUSE_MENUS
|
|
virtual void DetachMenuBar() wxOVERRIDE;
|
|
virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE;
|
|
#endif
|
|
|
|
// the last focused child: we restore focus to it on activation
|
|
wxWindow *m_winLastFocused;
|
|
|
|
virtual bool MacIsChildOfClientArea( const wxWindow* child ) const wxOVERRIDE;
|
|
|
|
wxDECLARE_EVENT_TABLE();
|
|
wxDECLARE_DYNAMIC_CLASS(wxFrame);
|
|
};
|
|
|
|
#endif
|
|
// _WX_FRAME_H_
|