projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't crash when XIM is used under IRIX
[wxWidgets.git]
/
src
/
generic
/
splash.cpp
diff --git
a/src/generic/splash.cpp
b/src/generic/splash.cpp
index f18edab377d3470623c4bfa6d6dee0ef826e63c3..e17b168167e0d6dfde786bfed121e1bc80c611cc 100644
(file)
--- a/
src/generic/splash.cpp
+++ b/
src/generic/splash.cpp
@@
-9,10
+9,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "splash.h"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
@@
-22,6
+18,10
@@
#if wxUSE_SPLASH
#if wxUSE_SPLASH
+#ifdef __WXGTK20__
+ #include <gtk/gtk.h>
+#endif
+
#ifndef WX_PRECOMP
#include "wx/dcmemory.h"
#include "wx/dcclient.h"
#ifndef WX_PRECOMP
#include "wx/dcmemory.h"
#include "wx/dcclient.h"
@@
-29,13
+29,14
@@
#include "wx/splash.h"
#include "wx/splash.h"
+
/*
* wxSplashScreen
*/
#define wxSPLASH_TIMER_ID 9999
/*
* wxSplashScreen
*/
#define wxSPLASH_TIMER_ID 9999
-IMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame)
;
+IMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame)
BEGIN_EVENT_TABLE(wxSplashScreen, wxFrame)
EVT_TIMER(wxSPLASH_TIMER_ID, wxSplashScreen::OnNotify)
BEGIN_EVENT_TABLE(wxSplashScreen, wxFrame)
EVT_TIMER(wxSPLASH_TIMER_ID, wxSplashScreen::OnNotify)
@@
-48,8
+49,16
@@
END_EVENT_TABLE()
*/
wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
*/
wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
- wxFrame(parent, id, wxEmptyString, wxPoint(0,
0), wxSize(100, 100), style)
+ wxFrame(parent, id, wxEmptyString, wxPoint(0,0), wxSize(100, 100), style)
{
{
+ // At least for GTK+ 2.0, this hint is not available.
+#if defined(__WXGTK20__)
+#if GTK_CHECK_VERSION(2,2,0)
+ gtk_window_set_type_hint(GTK_WINDOW(m_widget),
+ GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
+#endif
+#endif
+
m_window = NULL;
m_splashStyle = splashStyle;
m_milliseconds = milliseconds;
m_window = NULL;
m_splashStyle = splashStyle;
m_milliseconds = milliseconds;