X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..c8e1af672f46e93ae2fe6d7f9d5b35a3d8d49c16:/include/wx/generic/splash.h diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index 2bc789fad8..c073c52436 100644 --- a/include/wx/generic/splash.h +++ b/include/wx/generic/splash.h @@ -9,7 +9,7 @@ // Licence: ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "splash.h" #endif @@ -34,17 +34,17 @@ #define wxSPLASH_TIMEOUT 0x04 #define wxSPLASH_NO_TIMEOUT 0x00 -class WXDLLEXPORT wxSplashScreenWindow; +class WXDLLIMPEXP_ADV wxSplashScreenWindow; /* * wxSplashScreen */ -class WXDLLEXPORT wxSplashScreen: public wxFrame +class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame { public: // for RTTI macros only - wxSplashScreen() {}; + wxSplashScreen() {} wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -65,15 +65,16 @@ protected: 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 */ -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); @@ -89,7 +90,8 @@ public: protected: wxBitmap m_bitmap; -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxSplashScreenWindow) };