fixed problems with sometimes processing the events twice introduced in rev 1.170...

[wxWidgets.git] / src / generic / busyinfo.cpp

diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index ad0bd8af6b57c92b3efd799a30ed0b83eee61d3e..42d406b79f782a8ece3781e40a2f2ffcacece9e4 100644 (file)
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -3,13 +3,9 @@
 // Purpose:     Information window when app is busy
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     Information window when app is busy
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "busyinfo.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -25,7 +21,7 @@
 
 
 wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 
 
 wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)

-           : wxFrame(parent, -1, wxT("Busy"),
+           : wxFrame(parent, wxID_ANY, wxT("Busy"),

                      wxDefaultPosition, wxDefaultSize,
 #if defined(__WXX11__)
                      wxTHICK_FRAME
                      wxDefaultPosition, wxDefaultSize,
 #if defined(__WXX11__)
                      wxTHICK_FRAME


@@ -35,7 +31,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
                      | wxFRAME_TOOL_WINDOW)
 {
     wxPanel *panel = new wxPanel( this );
                      | wxFRAME_TOOL_WINDOW)
 {
     wxPanel *panel = new wxPanel( this );

-    wxStaticText *text = new wxStaticText(panel, -1, message);
+    wxStaticText *text = new wxStaticText(panel, wxID_ANY, message);

 
     panel->SetCursor(*wxHOURGLASS_CURSOR);
     text->SetCursor(*wxHOURGLASS_CURSOR);
 
     panel->SetCursor(*wxHOURGLASS_CURSOR);
     text->SetCursor(*wxHOURGLASS_CURSOR);


@@ -52,7 +48,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
     int                             nParentWidth = parent->GetClientSize().x;
     int                             nColor;
 
     int                             nParentWidth = parent->GetClientSize().x;
     int                             nColor;
 

-    SetBackgroundColour("WHITE");
+    SetBackgroundColour(wxT("WHITE"));

     nColor = (LONG)GetBackgroundColour().GetPixel();
 
     ::WinSetPresParam( GetHwnd()
     nColor = (LONG)GetBackgroundColour().GetPixel();
 
     ::WinSetPresParam( GetHwnd()


@@ -60,7 +56,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
                       ,sizeof(LONG)
                       ,(PVOID)&nColor
                      );
                       ,sizeof(LONG)
                       ,(PVOID)&nColor
                      );

-    panel->SetBackgroundColour("WHITE");
+    panel->SetBackgroundColour(wxT("WHITE"));

     nColor = (LONG)panel->GetBackgroundColour().GetPixel();
 
     ::WinSetPresParam( GetHwndOf(panel)
     nColor = (LONG)panel->GetBackgroundColour().GetPixel();
 
     ::WinSetPresParam( GetHwndOf(panel)


@@ -81,7 +77,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
                       ,nHeight
                       ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
                      );
                       ,nHeight
                       ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
                      );

-    text->SetBackgroundColour("WHITE");
+    text->SetBackgroundColour(wxT("WHITE"));

     nColor = (LONG)text->GetBackgroundColour().GetPixel();
 
     ::WinSetPresParam( GetHwndOf(text)
     nColor = (LONG)text->GetBackgroundColour().GetPixel();
 
     ::WinSetPresParam( GetHwndOf(text)


@@ -104,21 +100,15 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
 {
     m_InfoFrame = new wxInfoFrame( parent, message);
 wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
 {
     m_InfoFrame = new wxInfoFrame( parent, message);

-    m_InfoFrame->Show(TRUE);
-#ifdef __WXMAC__
-       m_InfoFrame->Update() ;
-#else
-    wxYield();
+    m_InfoFrame->Show(true);

     m_InfoFrame->Refresh();
     m_InfoFrame->Refresh();

-    wxYield();
-#endif
+    m_InfoFrame->Update();

 }
 
 wxBusyInfo::~wxBusyInfo()
 {
 }
 
 wxBusyInfo::~wxBusyInfo()
 {

-    m_InfoFrame->Show(FALSE);
+    m_InfoFrame->Show(false);

     m_InfoFrame->Close();
     m_InfoFrame->Close();

-    wxYield();

 }
 
 #endif
 }
 
 #endif