Dismiss wxSplashScreen on any user input, not necessarily on splash itself.
Use wxEventFilter to remove the splash screen as soon as any user input is detected anywhere in the application, not necessarily over the splash screen itself. This ensures that the splash screen disappears as soon as the user starts working with the application instead of sticking around and covering the main window. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,8 +13,9 @@
|
||||
#define _WX_SPLASH_H_
|
||||
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/timer.h"
|
||||
#include "wx/eventfilter.h"
|
||||
#include "wx/frame.h"
|
||||
#include "wx/timer.h"
|
||||
|
||||
|
||||
/*
|
||||
@@ -33,11 +34,12 @@ class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow;
|
||||
* wxSplashScreen
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame
|
||||
class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame,
|
||||
public wxEventFilter
|
||||
{
|
||||
public:
|
||||
// for RTTI macros only
|
||||
wxSplashScreen() {}
|
||||
wxSplashScreen() { Init(); }
|
||||
wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,
|
||||
wxWindow* parent, wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
@@ -52,7 +54,13 @@ public:
|
||||
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);
|
||||
|
||||
protected:
|
||||
// Common part of all ctors.
|
||||
void Init();
|
||||
|
||||
wxSplashScreenWindow* m_window;
|
||||
long m_splashStyle;
|
||||
int m_milliseconds;
|
||||
@@ -74,8 +82,6 @@ public:
|
||||
|
||||
void OnPaint(wxPaintEvent& event);
|
||||
void OnEraseBackground(wxEraseEvent& event);
|
||||
void OnMouseEvent(wxMouseEvent& event);
|
||||
void OnChar(wxKeyEvent& event);
|
||||
|
||||
void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
|
||||
wxBitmap& GetBitmap() { return m_bitmap; }
|
||||
|
Reference in New Issue
Block a user