Add code showing stereo support to the OpenGL cube sample.

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

diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index e11108364a670c37ae0a90fa82b1365392f9bb14..003853d86a634722c80cd7606580e60d01963dec 100644 (file)
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -3,7 +3,6 @@
 // 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

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,12 +16,14 @@
 
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
 
 // 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/stattext.h"
     #include "wx/panel.h"
     #include "wx/utils.h"
 #endif
 
 #include "wx/busyinfo.h"

+#include "wx/generic/stattextg.h"

 
 class WXDLLEXPORT wxInfoFrame : public wxFrame
 {
 
 class WXDLLEXPORT wxInfoFrame : public wxFrame
 {


@@ -30,7 +31,7 @@ public:
     wxInfoFrame(wxWindow *parent, const wxString& message);
 
 private:
     wxInfoFrame(wxWindow *parent, const wxString& message);
 
 private:

-    DECLARE_NO_COPY_CLASS(wxInfoFrame)
+    wxDECLARE_NO_COPY_CLASS(wxInfoFrame);

 };
 
 
 };
 
 


@@ -38,14 +39,18 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
            : wxFrame(parent, wxID_ANY, wxT("Busy"),
                      wxDefaultPosition, wxDefaultSize,
 #if defined(__WXX11__)
            : wxFrame(parent, wxID_ANY, wxT("Busy"),
                      wxDefaultPosition, wxDefaultSize,
 #if defined(__WXX11__)

-                     wxTHICK_FRAME
+                     wxRESIZE_BORDER

 #else
                      wxSIMPLE_BORDER
 #endif
 #else
                      wxSIMPLE_BORDER
 #endif

-                     | wxFRAME_TOOL_WINDOW)
+                     | wxFRAME_TOOL_WINDOW | wxSTAY_ON_TOP)

 {
     wxPanel *panel = new wxPanel( this );
 {
     wxPanel *panel = new wxPanel( this );

+#ifdef __WXGTK__
+    wxGenericStaticText *text = new wxGenericStaticText(panel, wxID_ANY, message);
+#else

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

+#endif

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


@@ -113,7 +118,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 
 wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
 {
 
 wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
 {

-    m_InfoFrame = new wxInfoFrame( parent, message);
+    m_InfoFrame = new wxInfoFrame(parent, message);

     m_InfoFrame->Show(true);
     m_InfoFrame->Refresh();
     m_InfoFrame->Update();
     m_InfoFrame->Show(true);
     m_InfoFrame->Refresh();
     m_InfoFrame->Update();