projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
source id type is unsigned; minor cleanup
[wxWidgets.git]
/
src
/
generic
/
busyinfo.cpp
diff --git
a/src/generic/busyinfo.cpp
b/src/generic/busyinfo.cpp
index f2aa47c06151ff0be041a0a7ae4f8671cbec7d01..4d527e1555d6fbe26042fbe9d9f8d49fefdb97b1 100644
(file)
--- a/
src/generic/busyinfo.cpp
+++ b/
src/generic/busyinfo.cpp
@@
-1,40
+1,52
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: busyinfo.cpp
+// Name:
src/generic/
busyinfo.cpp
// 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
+// RCS-ID: $Id$
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "busyinfo.h"
-#endif
-
#include "wx/wxprec.h"
#include "wx/wxprec.h"
-#ifdef __BOR
D
LANDC__
+#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_BUSYINFO
#pragma hdrstop
#endif
#if wxUSE_BUSYINFO
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+ #include "wx/frame.h"
+ #include "wx/stattext.h"
+ #include "wx/panel.h"
+ #include "wx/utils.h"
+#endif
+
#include "wx/busyinfo.h"
#include "wx/busyinfo.h"
-#include "wx/stattext.h"
-#include "wx/panel.h"
-#include "wx/utils.h"
+
+class WXDLLEXPORT wxInfoFrame : public wxFrame
+{
+public:
+ wxInfoFrame(wxWindow *parent, const wxString& message);
+
+private:
+ DECLARE_NO_COPY_CLASS(wxInfoFrame)
+};
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__)
- wx
THICK_FRAME | wxFRAME_TOOL_WINDOW)
+ wx
RESIZE_BORDER
#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);
@@
-51,7
+63,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()
@@
-59,7
+71,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)
@@
-80,7
+92,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)
@@
-103,19
+115,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);
- 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
- // wxUSE_BUSYINFO
-
+#endif // wxUSE_BUSYINFO