Richtext interface fixes and additions for Phoenix

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

diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index c5820ef9241c568a7979c3ed21c3408ceaa432a4..1441be4420c36fc86d98184d861a63dcffcf1c89 100644 (file)
--- a/include/wx/generic/splash.h
+++ b/include/wx/generic/splash.h
@@ -1,27 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     Splash screen class
 // Author:      Julian Smart
 // Modified by:
 // Created:     28/6/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:
+// Licence:     wxWindows Licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma interface "splash.h"
-#endif
-

 #ifndef _WX_SPLASH_H_
 #define _WX_SPLASH_H_
 
 #ifndef _WX_SPLASH_H_
 #define _WX_SPLASH_H_
 

-#ifndef WX_PRECOMP

 #include "wx/bitmap.h"
 #include "wx/bitmap.h"

-#include "wx/timer.h"
-#endif
-
+#include "wx/eventfilter.h"

 #include "wx/frame.h"
 #include "wx/frame.h"

+#include "wx/timer.h"

 
 
 /*
 
 
 /*


@@ -34,19 +28,24 @@
 #define wxSPLASH_TIMEOUT            0x04
 #define wxSPLASH_NO_TIMEOUT         0x00
 
 #define wxSPLASH_TIMEOUT            0x04
 #define wxSPLASH_NO_TIMEOUT         0x00
 

-class WXDLLEXPORT wxSplashScreenWindow;
+class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow;

 
 /*
  * wxSplashScreen
  */
 
 
 /*
  * wxSplashScreen
  */
 

-class WXDLLEXPORT wxSplashScreen: public wxFrame
+class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame,
+                                      public wxEventFilter

 {
 public:
 {
 public:

-    // for RTTI macros obly
-    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();
+    // for RTTI macros only
+    wxSplashScreen() { Init(); }
+    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);
+    virtual ~wxSplashScreen();

 
     void OnCloseWindow(wxCloseEvent& event);
     void OnNotify(wxTimerEvent& event);
 
     void OnCloseWindow(wxCloseEvent& event);
     void OnNotify(wxTimerEvent& event);


@@ -55,29 +54,34 @@ public:
     wxSplashScreenWindow* GetSplashWindow() const { return m_window; }
     int GetTimeout() const { return m_milliseconds; }
 
     wxSplashScreenWindow* GetSplashWindow() const { return m_window; }
     int GetTimeout() const { return m_milliseconds; }
 

+    // Override wxEventFilter method to hide splash screen on any user input.
+    virtual int FilterEvent(wxEvent& event);
+

 protected:
 protected:

+    // Common part of all ctors.
+    void Init();
+

     wxSplashScreenWindow*   m_window;
     long                    m_splashStyle;
     int                     m_milliseconds;
     wxTimer                 m_timer;
 
     wxSplashScreenWindow*   m_window;
     long                    m_splashStyle;
     int                     m_milliseconds;
     wxTimer                 m_timer;
 

-DECLARE_DYNAMIC_CLASS(wxSplashScreen)
-DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxSplashScreen)
+    DECLARE_EVENT_TABLE()
+    wxDECLARE_NO_COPY_CLASS(wxSplashScreen);

 };
 
 /*
  * wxSplashScreenWindow
  */
 
 };
 
 /*
  * wxSplashScreenWindow
  */
 

-class WXDLLEXPORT wxSplashScreenWindow: public wxWindow
+class WXDLLIMPEXP_ADV wxSplashScreenWindow: public wxWindow

 {
 public:
     wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER);
 
     void OnPaint(wxPaintEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
 {
 public:
     wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER);
 
     void OnPaint(wxPaintEvent& event);
     void OnEraseBackground(wxEraseEvent& event);

-    void OnMouseEvent(wxMouseEvent& event);
-    void OnChar(wxKeyEvent& event);

 
     void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
     wxBitmap& GetBitmap() { return m_bitmap; }
 
     void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
     wxBitmap& GetBitmap() { return m_bitmap; }


@@ -85,7 +89,8 @@ public:
 protected:
     wxBitmap    m_bitmap;
 
 protected:
     wxBitmap    m_bitmap;
 

-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
+    wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow);

 };
 
 
 };