listbox cleanup

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

diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index 961deb1ade2444065e6494fc96a2057897f24232..a8bf2ae8a10a0e6ed7f1df5ac48cb853154d8cf5 100644 (file)
--- a/include/wx/generic/splash.h
+++ b/include/wx/generic/splash.h
@@ -6,21 +6,14 @@
 // Created:     28/6/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // 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/timer.h"
 #include "wx/bitmap.h"
 #include "wx/timer.h"

-#endif
-

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


@@ -34,16 +27,22 @@
 #define wxSPLASH_TIMEOUT            0x04
 #define wxSPLASH_NO_TIMEOUT         0x00
 
 #define wxSPLASH_TIMEOUT            0x04
 #define wxSPLASH_NO_TIMEOUT         0x00
 

-class WXDLLEXPORT wxSplashScreenWindow;
+class WXDLLIMPEXP_ADV wxSplashScreenWindow;

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

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

 {
 public:
 {
 public:

-    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);
+    // for RTTI macros only
+    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_NO_TASKBAR|wxSTAY_ON_TOP);

     ~wxSplashScreen();
 
     void OnCloseWindow(wxCloseEvent& event);
     ~wxSplashScreen();
 
     void OnCloseWindow(wxCloseEvent& event);


@@ -59,14 +58,16 @@ protected:
     int                     m_milliseconds;
     wxTimer                 m_timer;
 
     int                     m_milliseconds;
     wxTimer                 m_timer;
 

-DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxSplashScreen)
+    DECLARE_EVENT_TABLE()
+    DECLARE_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);
 {
 public:
     wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER);


@@ -82,7 +83,8 @@ public:
 protected:
     wxBitmap    m_bitmap;
 
 protected:
     wxBitmap    m_bitmap;
 

-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxSplashScreenWindow)

 };
 
 
 };