mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 01:29: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.
98 lines
2.7 KiB
C++
98 lines
2.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/splash.h
|
|
// Purpose: Splash screen class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 28/6/2000
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_SPLASH_H_
|
|
#define _WX_SPLASH_H_
|
|
|
|
#include "wx/bitmap.h"
|
|
#include "wx/eventfilter.h"
|
|
#include "wx/frame.h"
|
|
#include "wx/timer.h"
|
|
|
|
|
|
/*
|
|
* A window for displaying a splash screen
|
|
*/
|
|
|
|
#define wxSPLASH_CENTRE_ON_PARENT 0x01
|
|
#define wxSPLASH_CENTRE_ON_SCREEN 0x02
|
|
#define wxSPLASH_NO_CENTRE 0x00
|
|
#define wxSPLASH_TIMEOUT 0x04
|
|
#define wxSPLASH_NO_TIMEOUT 0x00
|
|
|
|
class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow;
|
|
|
|
/*
|
|
* wxSplashScreen
|
|
*/
|
|
|
|
class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame,
|
|
public wxEventFilter
|
|
{
|
|
public:
|
|
// for RTTI macros only
|
|
wxSplashScreen() { Init(); }
|
|
wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,
|
|
wxWindow* parent, wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);
|
|
virtual ~wxSplashScreen();
|
|
|
|
void OnCloseWindow(wxCloseEvent& event);
|
|
void OnNotify(wxTimerEvent& event);
|
|
|
|
long GetSplashStyle() const { return m_splashStyle; }
|
|
wxSplashScreenWindow* GetSplashWindow() const { return m_window; }
|
|
int GetTimeout() const { return m_milliseconds; }
|
|
|
|
// Override wxEventFilter method to hide splash screen on any user input.
|
|
virtual int FilterEvent(wxEvent& event) wxOVERRIDE;
|
|
|
|
protected:
|
|
// Common part of all ctors.
|
|
void Init();
|
|
|
|
wxSplashScreenWindow* m_window;
|
|
long m_splashStyle;
|
|
int m_milliseconds;
|
|
wxTimer m_timer;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxSplashScreen);
|
|
wxDECLARE_EVENT_TABLE();
|
|
wxDECLARE_NO_COPY_CLASS(wxSplashScreen);
|
|
};
|
|
|
|
/*
|
|
* wxSplashScreenWindow
|
|
*/
|
|
|
|
class WXDLLIMPEXP_ADV wxSplashScreenWindow: public wxWindow
|
|
{
|
|
public:
|
|
wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER);
|
|
|
|
void OnPaint(wxPaintEvent& event);
|
|
void OnEraseBackground(wxEraseEvent& event);
|
|
|
|
void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
|
|
wxBitmap& GetBitmap() { return m_bitmap; }
|
|
|
|
protected:
|
|
wxBitmap m_bitmap;
|
|
|
|
wxDECLARE_EVENT_TABLE();
|
|
wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow);
|
|
};
|
|
|
|
|
|
#endif
|
|
// _WX_SPLASH_H_
|