X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/generic/splash.h?ds=inline diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index 498eee8eec..b23e3ea1d5 100644 --- a/include/wx/generic/splash.h +++ b/include/wx/generic/splash.h @@ -6,21 +6,14 @@ // Created: 28/6/2000 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "splash.h" -#endif - #ifndef _WX_SPLASH_H_ #define _WX_SPLASH_H_ -#ifndef WX_PRECOMP #include "wx/bitmap.h" #include "wx/timer.h" -#endif - #include "wx/frame.h" @@ -34,7 +27,7 @@ #define wxSPLASH_TIMEOUT 0x04 #define wxSPLASH_NO_TIMEOUT 0x00 -class WXDLLIMPEXP_ADV wxSplashScreenWindow; +class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow; /* * wxSplashScreen @@ -44,13 +37,13 @@ class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame { public: // for RTTI macros only - wxSplashScreen() {}; + wxSplashScreen() {} 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); - ~wxSplashScreen(); + virtual ~wxSplashScreen(); void OnCloseWindow(wxCloseEvent& event); void OnNotify(wxTimerEvent& event); @@ -67,7 +60,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxSplashScreen) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSplashScreen) + wxDECLARE_NO_COPY_CLASS(wxSplashScreen); }; /* @@ -91,7 +84,7 @@ protected: wxBitmap m_bitmap; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSplashScreenWindow) + wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow); };