Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the default style flags on wxSplashScreen

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-05-27 19:23:10 +00:00
parent 40c4c5a3b5
commit 479101cac1
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/latex/wx/splash.tex
View File

@@ -17,7 +17,7 @@ Example usage:
} }
wxYield(); wxYield();
\end{verbatim} \end{verbatim}
\wxheading{Derived from} \wxheading{Derived from}
\helpref{wxFrame}{wxframe}\\ \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 Construct the splash screen passing a bitmap, a style, a timeout, a window id, optional position
and size, and a window style. and size, and a window style.

8
include/wx/generic/splash.h
View File

@@ -43,9 +43,13 @@ class WXDLLEXPORT wxSplashScreenWindow;
class WXDLLEXPORT wxSplashScreen: public wxFrame class WXDLLEXPORT wxSplashScreen: public wxFrame
{ {
public: 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(); ~wxSplashScreen();
void OnCloseWindow(wxCloseEvent& event); void OnCloseWindow(wxCloseEvent& event);

2
wxPython/src/frames.i
View File

@@ -283,7 +283,7 @@ public:
wxWindow* parent, wxWindowID id, wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, 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)"

2
wxPython/src/msw/frames.cpp
View File

@@ -2451,7 +2451,7 @@ static PyObject *_wrap_new_wxSplashScreen(PyObject *self, PyObject *args, PyObje
wxWindowID _arg4; wxWindowID _arg4;
wxPoint * _arg5 = (wxPoint *) &wxDefaultPosition; wxPoint * _arg5 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg6 = (wxSize *) &wxDefaultSize; 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 * _argo0 = 0;
PyObject * _argo3 = 0; PyObject * _argo3 = 0;
wxPoint temp; wxPoint temp;