Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/splash.h b/interface/wx/splash.h
index 1686cf77ee4943b159a826c90e6b124f5baf0bf8..26dedbf6f9606c29c3720c8f62bff7f49d9aa0a1 100644 (file)
--- a/interface/wx/splash.h
+++ b/interface/wx/splash.h
@@ -3,22 +3,22 @@
 // Purpose:     interface of wxSplashScreen
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxSplashScreen
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxSplashScreen
 
     wxSplashScreen shows a window with a thin border, displaying a bitmap
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @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
     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,
       if (bitmap.LoadFile("splash16.png", wxBITMAP_TYPE_PNG))
       {
           wxSplashScreen* splash = new wxSplashScreen(bitmap,


@@ -37,14 +37,15 @@ class wxSplashScreen : public wxFrame
 public:
     /**
         Construct the splash screen passing a bitmap, a style, a timeout, a window id,
 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:
         @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,
         @a milliseconds is the timeout in milliseconds.
     */
     wxSplashScreen(const wxBitmap& bitmap, long splashStyle,


@@ -61,8 +62,7 @@ public:
     virtual ~wxSplashScreen();
 
     /**
     virtual ~wxSplashScreen();
 
     /**

-        Returns the splash style (see wxSplashScreen() for
-        details).
+        Returns the splash style (see wxSplashScreen() for details).

     */
     long GetSplashStyle() const;
 
     */
     long GetSplashStyle() const;