X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/generic/splash.h diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index fa7393e8bc..1441be4420 100644 --- a/include/wx/generic/splash.h +++ b/include/wx/generic/splash.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: splash.h +// Name: wx/generic/splash.h // Purpose: Splash screen class // Author: Julian Smart // Modified by: @@ -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" /* @@ -27,17 +28,18 @@ #define wxSPLASH_TIMEOUT 0x04 #define wxSPLASH_NO_TIMEOUT 0x00 -class WXDLLIMPEXP_ADV wxSplashScreenWindow; +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; @@ -60,7 +68,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxSplashScreen) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSplashScreen) + wxDECLARE_NO_COPY_CLASS(wxSplashScreen); }; /* @@ -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; } @@ -84,7 +90,7 @@ protected: wxBitmap m_bitmap; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSplashScreenWindow) + wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow); };