applied patch fixing problems with X server crash when using wxGLCanvas with nVidia...

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

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

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

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


@@ -44,7 +44,7 @@ class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame
 {
 public:
     // for RTTI macros only
 {
 public:
     // for RTTI macros only

-    wxSplashScreen() {};
+    wxSplashScreen() {}

     wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,
                    wxWindow* parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,
     wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,
                    wxWindow* parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,