X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1d2cd38c4b7f6702af747ab81e1b85afa5fefdf..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/generic/splash.h?ds=sidebyside diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index c5820ef924..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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#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,19 +27,23 @@ #define wxSPLASH_TIMEOUT 0x04 #define wxSPLASH_NO_TIMEOUT 0x00 -class WXDLLEXPORT wxSplashScreenWindow; +class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow; /* * wxSplashScreen */ -class WXDLLEXPORT wxSplashScreen: public wxFrame +class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame { public: - // for RTTI macros obly - 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_FLOAT_ON_PARENT); - ~wxSplashScreen(); + // for RTTI macros only + 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); + virtual ~wxSplashScreen(); void OnCloseWindow(wxCloseEvent& event); void OnNotify(wxTimerEvent& event); @@ -61,15 +58,16 @@ protected: int m_milliseconds; wxTimer m_timer; -DECLARE_DYNAMIC_CLASS(wxSplashScreen) -DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxSplashScreen) + DECLARE_EVENT_TABLE() + wxDECLARE_NO_COPY_CLASS(wxSplashScreen); }; /* * wxSplashScreenWindow */ -class WXDLLEXPORT wxSplashScreenWindow: public wxWindow +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); @@ -85,7 +83,8 @@ public: protected: wxBitmap m_bitmap; -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() + wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow); };