fixed Printf() format spec warnings

[wxWidgets.git] / src / mgl / app.cpp

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index a542b5c24f9d17f1faa8c1485323f03255ee0387..82261a793878d065362ba8cb35836d4f43cf7eec 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -3,7 +3,7 @@
 // Author:      Vaclav Slavik
 //              based on GTK and MSW implementations
 // Id:          $Id$
 // Author:      Vaclav Slavik
 //              based on GTK and MSW implementations
 // Id:          $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

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


@@ -142,9 +142,13 @@ class wxRootWindow : public wxWindow
             m_wnd = NULL; 
         }
 
             m_wnd = NULL; 
         }
 

-        virtual bool AcceptsFocus() { return FALSE; }
+        virtual bool AcceptsFocus() const { return FALSE; }
+        
+        DECLARE_DYNAMIC_CLASS(wxRootWindow)

 };
 
 };
 

+IMPLEMENT_DYNAMIC_CLASS(wxRootWindow, wxWindow)
+

 static wxRootWindow *gs_rootWindow = NULL;
 
 //-----------------------------------------------------------------------------
 static wxRootWindow *gs_rootWindow = NULL;
 
 //-----------------------------------------------------------------------------


@@ -265,8 +269,9 @@ bool wxApp::OnInitGui()
 #ifdef __WXDEBUG__
     // MGL redirects stdout and stderr to physical console, so lets redirect
     // it to file. Do it only when WXDEBUG environment variable is set
 #ifdef __WXDEBUG__
     // MGL redirects stdout and stderr to physical console, so lets redirect
     // it to file. Do it only when WXDEBUG environment variable is set

-    if ( wxGetEnv(wxT("WXDEBUG"), NULL) )
-        freopen("output.err", "wt", stderr);
+    wxString redirect;
+    if ( wxGetEnv(wxT("WXSTDERR"), &redirect) )
+        freopen(redirect.mb_str(), "wt", stderr);

 #endif
 
     wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);
 #endif
 
     wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);


@@ -405,9 +410,10 @@ void wxApp::DeletePendingObjects()
 bool wxApp::Initialize()
 {
     if ( MGL_init(".", NULL) == 0 )
 bool wxApp::Initialize()
 {
     if ( MGL_init(".", NULL) == 0 )

+    {
+        wxLogError(_("Cannot initialize SciTech MGL!"));

         return FALSE;
         return FALSE;

-
-    wxBuffer = new wxChar[BUFSIZ + 512];
+    }

 
     wxClassInfo::InitializeClasses();
 
 
     wxClassInfo::InitializeClasses();
 


@@ -441,11 +447,6 @@ bool wxApp::Initialize()
     return TRUE;
 }
 
     return TRUE;
 }
 

-wxIcon wxApp::GetStdIcon(int which) const
-{
-    return wxTheme::Get()->GetRenderer()->GetStdIcon(which);
-}
-

 void wxApp::CleanUp()
 {
 #if wxUSE_LOG
 void wxApp::CleanUp()
 {
 #if wxUSE_LOG


@@ -492,8 +493,6 @@ void wxApp::CleanUp()
     delete wxTheFontsManager;
     wxTheFontsManager = (wxFontsManager*) NULL;
 
     delete wxTheFontsManager;
     wxTheFontsManager = (wxFontsManager*) NULL;
 

-    delete[] wxBuffer;
-

     // check for memory leaks
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     // check for memory leaks
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)