MSVC compilation fixes: don't use std{out,err} as variable names; don't reuse loop...

[wxWidgets.git] / utils / screenshotgen / src / screenshot_app.cpp

diff --git a/utils/screenshotgen/src/screenshot_app.cpp b/utils/screenshotgen/src/screenshot_app.cpp
index e2b0c85380fb323ac5bf4720b94ed5a1721ca12f..329a1cbdeb48cbed1e43212ddfeb474449a2bda7 100644 (file)
--- a/utils/screenshotgen/src/screenshot_app.cpp
+++ b/utils/screenshotgen/src/screenshot_app.cpp
@@ -10,27 +10,27 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-    #pragma hdrstop
+#pragma hdrstop

 #endif
 
 #endif
 

-// for all others, include the necessary headers
+// for all others, include the necessary headers wxWidgets headers)

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+#include "wx/wx.h"

 #endif
 
 #endif
 

-#include <wx/richtext/richtextxml.h>
+#include "wx/richtext/richtextxml.h"

 
 #include "screenshot_app.h"
 #include "screenshot_main.h"
 
 
 // ----------------------------------------------------------------------------
 
 #include "screenshot_app.h"
 #include "screenshot_main.h"
 
 
 // ----------------------------------------------------------------------------

-// wxScreenshotApp
+// ScreenshotApp

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_APP(wxScreenshotApp);
+IMPLEMENT_APP(ScreenshotApp);

 
 

-bool wxScreenshotApp::OnInit()
+bool ScreenshotApp::OnInit()

 {
     // Init all Image handlers
     wxInitAllImageHandlers();
 {
     // Init all Image handlers
     wxInitAllImageHandlers();


@@ -38,7 +38,7 @@ bool wxScreenshotApp::OnInit()
     // Add richtext extra handlers (plain text is automatically added)
     wxRichTextBuffer::AddHandler(new wxRichTextXMLHandler);
 
     // Add richtext extra handlers (plain text is automatically added)
     wxRichTextBuffer::AddHandler(new wxRichTextXMLHandler);
 

-    wxScreenshotFrame* frame = new wxScreenshotFrame(0L);
+    ScreenshotFrame* frame = new ScreenshotFrame(0L);

     frame->Show();
 
     return true;
     frame->Show();
 
     return true;