X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/generic/splash.h?ds=sidebyside

diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index a3ccfa3897..69d413c4e7 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(__APPLE__)
-#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,23 +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 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);
@@ -65,8 +58,8 @@ protected:
     int                     m_milliseconds;
     wxTimer                 m_timer;
 
-DECLARE_DYNAMIC_CLASS(wxSplashScreen)
-DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxSplashScreen)
+    DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxSplashScreen)
 };
 
@@ -74,7 +67,7 @@ DECLARE_EVENT_TABLE()
  * 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);
@@ -90,7 +83,8 @@ public:
 protected:
     wxBitmap    m_bitmap;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxSplashScreenWindow)
 };