Make storing non-trivial data in wxThreadSpecificInfo possible.

[wxWidgets.git] / interface / wx / splash.h

diff --git a/interface/wx/splash.h b/interface/wx/splash.h
index 698f910a39789a28dd25100e0a3b18cb3c4dcad7..2e09981951f0a48cfd6defe600746168396b17c2 100644 (file)
--- a/interface/wx/splash.h
+++ b/interface/wx/splash.h
@@ -2,28 +2,34 @@
 // Name:        splash.h
 // Purpose:     interface of wxSplashScreen
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#define wxSPLASH_CENTRE_ON_PARENT   0x01
+#define wxSPLASH_CENTRE_ON_SCREEN   0x02
+#define wxSPLASH_NO_CENTRE          0x00
+#define wxSPLASH_TIMEOUT            0x04
+#define wxSPLASH_NO_TIMEOUT         0x00
+
+
 /**
     @class wxSplashScreen
 
     wxSplashScreen shows a window with a thin border, displaying a bitmap
-    describing your
-    application. Show it in application initialisation, and then either explicitly
-    destroy
+    describing your application.
+
+    Show it in application initialisation, and then either explicitly destroy
     it or let it time-out.
 
     Example usage:
 
     @code
-    wxBitmap bitmap;
+      wxBitmap bitmap;
       if (bitmap.LoadFile("splash16.png", wxBITMAP_TYPE_PNG))
       {
           wxSplashScreen* splash = new wxSplashScreen(bitmap,
               wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
-              6000, @NULL, -1, wxDefaultPosition, wxDefaultSize,
+              6000, NULL, -1, wxDefaultPosition, wxDefaultSize,
               wxBORDER_SIMPLE|wxSTAY_ON_TOP);
       }
       wxYield();
@@ -37,14 +43,15 @@ class wxSplashScreen : public wxFrame
 public:
     /**
         Construct the splash screen passing a bitmap, a style, a timeout, a window id,
-        optional position
-        and size, and a window style.
+        optional position and size, and a window style.
+
         @a splashStyle is a bitlist of some of the following:
-         wxSPLASH_CENTRE_ON_PARENT
-         wxSPLASH_CENTRE_ON_SCREEN
-         wxSPLASH_NO_CENTRE
-         wxSPLASH_TIMEOUT
-         wxSPLASH_NO_TIMEOUT
+        - wxSPLASH_CENTRE_ON_PARENT
+        - wxSPLASH_CENTRE_ON_SCREEN
+        - wxSPLASH_NO_CENTRE
+        - wxSPLASH_TIMEOUT
+        - wxSPLASH_NO_TIMEOUT
+
         @a milliseconds is the timeout in milliseconds.
     */
     wxSplashScreen(const wxBitmap& bitmap, long splashStyle,
@@ -58,11 +65,10 @@ public:
     /**
         Destroys the splash screen.
     */
-    ~wxSplashScreen();
+    virtual ~wxSplashScreen();
 
     /**
-        Returns the splash style (see wxSplashScreen() for
-        details).
+        Returns the splash style (see wxSplashScreen() for details).
     */
     long GetSplashStyle() const;