Fixed GetIcon to keep up with return type change on all other platforms.

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

diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index 884318fbe736c86d74ea3b2bbd296d6d674e262d..42d406b79f782a8ece3781e40a2f2ffcacece9e4 100644 (file)
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -3,38 +3,35 @@
 // 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"
 
 #include "wx/wxprec.h"
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #if wxUSE_BUSYINFO
 
 #pragma hdrstop
 #endif
 
 #if wxUSE_BUSYINFO
 

-#include "wx/busyinfo.h"

 #include "wx/stattext.h"
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/stattext.h"
 #include "wx/panel.h"
 #include "wx/utils.h"

+#include "wx/busyinfo.h"

 
 
 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__)
                      wxDefaultPosition, wxDefaultSize,
 #if defined(__WXX11__)

-                     wxTHICK_FRAME | wxFRAME_TOOL_WINDOW)
+                     wxTHICK_FRAME

 #else
 #else

-                     wxSIMPLE_BORDER | wxFRAME_TOOL_WINDOW)
+                     wxSIMPLE_BORDER

 #endif
 #endif

+                     | wxFRAME_TOOL_WINDOW)

 {
     wxPanel *panel = new wxPanel( this );
 {
     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);


@@ -42,6 +39,54 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
     // make the frame of at least the standard size (400*80) but big enough
     // for the text we show
     wxSize sizeText = text->GetBestSize();
     // make the frame of at least the standard size (400*80) but big enough
     // for the text we show
     wxSize sizeText = text->GetBestSize();

+#ifdef __WXPM__
+    int                             nX = 0;
+    int                             nY = 0;
+    int                             nWidth = 0;
+    int                             nHeight = 0;
+    int                             nParentHeight = parent->GetClientSize().y;
+    int                             nParentWidth = parent->GetClientSize().x;
+    int                             nColor;
+
+    SetBackgroundColour(wxT("WHITE"));
+    nColor = (LONG)GetBackgroundColour().GetPixel();
+
+    ::WinSetPresParam( GetHwnd()
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&nColor
+                     );
+    panel->SetBackgroundColour(wxT("WHITE"));
+    nColor = (LONG)panel->GetBackgroundColour().GetPixel();
+
+    ::WinSetPresParam( GetHwndOf(panel)
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&nColor
+                     );
+    nWidth = wxMax(sizeText.x, 340) + 60;
+    nHeight = wxMax(sizeText.y, 40) + 40;
+    nX = (nParentWidth - nWidth) / 2;
+    nY = (nParentHeight / 2) - (nHeight / 2);
+    nY = nParentHeight - (nY + nHeight);
+    ::WinSetWindowPos( m_hFrame
+                      ,HWND_TOP
+                      ,nX
+                      ,nY
+                      ,nWidth
+                      ,nHeight
+                      ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
+                     );
+    text->SetBackgroundColour(wxT("WHITE"));
+    nColor = (LONG)text->GetBackgroundColour().GetPixel();
+
+    ::WinSetPresParam( GetHwndOf(text)
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&nColor
+                     );
+    text->Center(wxBOTH);
+#else

     SetClientSize(wxMax(sizeText.x, 340) + 60, wxMax(sizeText.y, 40) + 40);
 
     // need to size the panel correctly first so that text->Centre() works
     SetClientSize(wxMax(sizeText.x, 340) + 60, wxMax(sizeText.y, 40) + 40);
 
     // need to size the panel correctly first so that text->Centre() works


@@ -49,22 +94,21 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 
     text->Centre(wxBOTH);
     Centre(wxBOTH);
 
     text->Centre(wxBOTH);
     Centre(wxBOTH);

+#endif

 }
 
 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);
-    wxYield();
+    m_InfoFrame->Show(true);

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

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

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

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

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

-    wxYield();

 }
 
 #endif
 }
 
 #endif