X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/generic/splash.h?ds=sidebyside diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index c17d68de85..77ea5dba03 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: @@ -12,11 +12,8 @@ #ifndef _WX_SPLASH_H_ #define _WX_SPLASH_H_ -#ifndef WX_PRECOMP #include "wx/bitmap.h" #include "wx/timer.h" -#endif - #include "wx/frame.h" @@ -30,7 +27,7 @@ #define wxSPLASH_TIMEOUT 0x04 #define wxSPLASH_NO_TIMEOUT 0x00 -class WXDLLIMPEXP_ADV wxSplashScreenWindow; +class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow; /* * wxSplashScreen @@ -46,7 +43,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP); - ~wxSplashScreen(); + virtual ~wxSplashScreen(); void OnCloseWindow(wxCloseEvent& event); void OnNotify(wxTimerEvent& event); @@ -63,7 +60,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxSplashScreen) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSplashScreen) + wxDECLARE_NO_COPY_CLASS(wxSplashScreen); }; /* @@ -87,7 +84,7 @@ protected: wxBitmap m_bitmap; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSplashScreenWindow) + wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow); };