Changed the default style flags on wxSplashScreen

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/splash.tex b/docs/latex/wx/splash.tex
index cd0193bd2fe4648e15dc1fabd9bde0e423dabf0f..c3aaff46c04163c870e336a1ff26b297d9b998bf 100644 (file)
--- a/docs/latex/wx/splash.tex
+++ b/docs/latex/wx/splash.tex
@@ -17,7 +17,7 @@ Example usage:
   }
   wxYield();
 \end{verbatim}
   }
   wxYield();
 \end{verbatim}

- 
+

 \wxheading{Derived from}
 
 \helpref{wxFrame}{wxframe}\\
 \wxheading{Derived from}
 
 \helpref{wxFrame}{wxframe}\\


@@ -33,7 +33,7 @@ Example usage:
 
 \membersection{wxSplashScreen::wxSplashScreen}\label{wxsplashscreenwxsplashscreen}
 
 
 \membersection{wxSplashScreen::wxSplashScreen}\label{wxsplashscreenwxsplashscreen}
 

-\func{}{wxSplashScreen}{\param{const wxBitmap\& }{bitmap}, \param{long }{splashStyle}, \param{int }{milliseconds}, \param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long }{style = wxSIMPLE\_BORDER}}
+\func{}{wxSplashScreen}{\param{const wxBitmap\& }{bitmap}, \param{long }{splashStyle}, \param{int }{milliseconds}, \param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long }{style = wxSIMPLE\_BORDER|wxFRAME\_NO\_TASKBAR|wxSTAY\_ON\_TOP}}

 
 Construct the splash screen passing a bitmap, a style, a timeout, a window id, optional position
 and size, and a window style.
 
 Construct the splash screen passing a bitmap, a style, a timeout, a window id, optional position
 and size, and a window style.

diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index c5820ef9241c568a7979c3ed21c3408ceaa432a4..dc5c195930cf9d89ff82c17b60566fbcef9dcdd5 100644 (file)
--- a/include/wx/generic/splash.h
+++ b/include/wx/generic/splash.h
@@ -43,9 +43,13 @@ class WXDLLEXPORT wxSplashScreenWindow;
 class WXDLLEXPORT wxSplashScreen: public wxFrame
 {
 public:
 class WXDLLEXPORT wxSplashScreen: public wxFrame
 {
 public:

-    // for RTTI macros obly
+    // 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_FLOAT_ON_PARENT);
+    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();
 
     void OnCloseWindow(wxCloseEvent& event);
     ~wxSplashScreen();
 
     void OnCloseWindow(wxCloseEvent& event);

diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i
index 465699722e3e87deecea6e82e82d403b2f6a3117..03cc0edfa27248fd193cc624d27e038a8595c87a 100644 (file)
--- a/wxPython/src/frames.i
+++ b/wxPython/src/frames.i
@@ -283,7 +283,7 @@ public:
                    wxWindow* parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    wxWindow* parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,

-                   long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxFRAME_FLOAT_ON_PARENT);
+                   long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);

 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 

diff --git a/wxPython/src/msw/frames.cpp b/wxPython/src/msw/frames.cpp
index 50a22c7fb98afebbca6cc4c29110275cc7ae7eaf..610a8a9d3452734612ea470f5f06b5d43035b46a 100644 (file)
--- a/wxPython/src/msw/frames.cpp
+++ b/wxPython/src/msw/frames.cpp
@@ -2451,7 +2451,7 @@ static PyObject *_wrap_new_wxSplashScreen(PyObject *self, PyObject *args, PyObje
     wxWindowID  _arg4;
     wxPoint * _arg5 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg6 = (wxSize *) &wxDefaultSize;
     wxWindowID  _arg4;
     wxPoint * _arg5 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg6 = (wxSize *) &wxDefaultSize;

-    long  _arg7 = (long ) wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxFRAME_FLOAT_ON_PARENT;
+    long  _arg7 = (long ) wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP;

     PyObject * _argo0 = 0;
     PyObject * _argo3 = 0;
     wxPoint  temp;
     PyObject * _argo0 = 0;
     PyObject * _argo3 = 0;
     wxPoint  temp;