Avoid duplicated definition errors for wxLongToLongHashMap when both

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

diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index c5820ef9241c568a7979c3ed21c3408ceaa432a4..498eee8eec4202fa4386287e89ea72fb24158780 100644 (file)
--- a/include/wx/generic/splash.h
+++ b/include/wx/generic/splash.h
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "splash.h"
 #endif
 
 #pragma interface "splash.h"
 #endif
 


@@ -34,18 +34,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:

-    // 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);


@@ -61,15 +65,16 @@ protected:
     int                     m_milliseconds;
     wxTimer                 m_timer;
 
     int                     m_milliseconds;
     wxTimer                 m_timer;
 

-DECLARE_DYNAMIC_CLASS(wxSplashScreen)
-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);


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

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

 };
 
 
 };