Implement GetPageText for the OSX WebKit implementation.

[wxWidgets.git] / include / wx / generic / splash.h

diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index fc4112bc86f85ab9f3fce6eb3f4bfa9c65d01375..77ea5dba03cc3655880ce9e9e2b7f3d8d3de7a96 100644 (file)
--- a/include/wx/generic/splash.h
+++ b/include/wx/generic/splash.h
@@ -1,26 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        splash.h
+// Name:        wx/generic/splash.h
 // Purpose:     Splash screen class
 // Author:      Julian Smart
 // Modified by:
 // 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,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);
 };