no changes, just remove #if'd out code

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

diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index c073c5243632d1e8f8aaa1c82300dd944fdac9fd..b23e3ea1d5ccb69017c8154b7c7dec782788ef0e 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

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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,7 +27,7 @@
 #define wxSPLASH_TIMEOUT            0x04
 #define wxSPLASH_NO_TIMEOUT         0x00
 
 #define wxSPLASH_TIMEOUT            0x04
 #define wxSPLASH_NO_TIMEOUT         0x00
 

-class WXDLLIMPEXP_ADV wxSplashScreenWindow;
+class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow;

 
 /*
  * wxSplashScreen
 
 /*
  * wxSplashScreen


@@ -50,7 +43,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);

-    ~wxSplashScreen();
+    virtual ~wxSplashScreen();

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


@@ -67,7 +60,7 @@ protected:
 
     DECLARE_DYNAMIC_CLASS(wxSplashScreen)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxSplashScreen)
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxSplashScreen)
+    wxDECLARE_NO_COPY_CLASS(wxSplashScreen);

 };
 
 /*
 };
 
 /*


@@ -91,7 +84,7 @@ protected:
     wxBitmap    m_bitmap;
 
     DECLARE_EVENT_TABLE()
     wxBitmap    m_bitmap;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxSplashScreenWindow)
+    wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow);

 };
 
 
 };