Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv30844/src/gui
Modified Files:
wxMDialogs.cpp
Log Message:
finally fixed the bug with never disappearing splash screen (bug 513) - even if the
fix is a dirty hack, it's still better than nothing
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.366
retrieving revision 1.367
diff -b -u -2 -r1.366 -r1.367
--- wxMDialogs.cpp 22 Apr 2002 16:10:51 -0000 1.366
+++ wxMDialogs.cpp 2 May 2002 20:54:45 -0000 1.367
@@ -981,8 +981,8 @@
// timer which calls our DoClose() when it expires
-class LogCloseTimer : public wxTimer
+class SplashCloseTimer : public wxTimer
{
public:
- LogCloseTimer(class wxAboutWindow *window)
+ SplashCloseTimer(class wxAboutWindow *window)
{
m_window = window;
@@ -1024,15 +1024,16 @@
StopTimer();
- wxWindow *parent = GetParent();
- if ( parent )
- parent->Close();
+ wxFrame *parent = wxDynamicCast(GetParent(), wxFrame);
+ CHECK_RET( parent, "should have the splash frame as parent!" );
+
+ ReallyCloseTopLevelWindow(parent);
}
private:
- LogCloseTimer *m_pTimer;
+ SplashCloseTimer *m_pTimer;
};
void
-LogCloseTimer::Notify()
+SplashCloseTimer::Notify()
{
m_window->DoClose();
@@ -1233,5 +1234,5 @@
// start a timer which will close us (if not disabled)
if ( bCloseOnTimeout ) {
- m_pTimer = new LogCloseTimer(this);
+ m_pTimer = new SplashCloseTimer(this);
}
else {
_______________________________________________________________
Have big pipes? SourceForge.net is looking for download mirrors. We supply
the hardware. You get the recognition. Email Us: [EMAIL PROTECTED]
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
