Don't use a destroy event handler to disconnect the native control's delegate as...

[wxWidgets.git] / utils / screenshotgen / src / autocapture.h

diff --git a/utils/screenshotgen/src/autocapture.h b/utils/screenshotgen/src/autocapture.h
index 9984c21c97a43c611761f4216e3e4bfa7836db61..20f16415e594079b9e7f638a9bf7235b74a787d2 100644 (file)
--- a/utils/screenshotgen/src/autocapture.h
+++ b/utils/screenshotgen/src/autocapture.h
@@ -9,7 +9,9 @@
 #ifndef _AUTOCAPTURE_H_
 #define _AUTOCAPTURE_H_
 
+#include "wx/beforestd.h"
 #include <vector>
+#include "wx/afterstd.h"
 
 #include "wx/gdicmn.h"
 
@@ -240,7 +242,7 @@ public:
         Please read the document of enum AdjustFlags, and notice that this flag could be enabled/
         disabled by global flag GlobalAdjustFlags.
     */
-    void RegisterControl(wxWindow * ctrl, wxString name = _T(""), int flag = AJ_Normal)
+    void RegisterControl(wxWindow * ctrl, wxString name = wxT(""), int flag = AJ_Normal)
     {
         m_controlList.push_back(Control(ctrl, name, flag));
     }
@@ -254,7 +256,7 @@ public:
     */
     void RegisterControl(wxWindow * ctrl, int flag)
     {
-        RegisterControl(ctrl, _T(""), flag);
+        RegisterControl(ctrl, wxT(""), flag);
     }
 
     /**
@@ -265,7 +267,7 @@ public:
     */
     void RegisterPageTurn()
     {
-        m_controlList.push_back(Control(0, _T(""), AJ_TurnPage));
+        m_controlList.push_back(Control(0, wxT(""), AJ_TurnPage));
     }
 
     /**
@@ -279,13 +281,13 @@ public:
     /**
         Take a screenshot for the given region.
 
-               @param bitmap
-                       Bitmap to save the screenshot to.
+        @param bitmap
+            Bitmap to save the screenshot to.
         @param rect
-                       Given rectangular region.
+            Given rectangular region.
         @param delay
-                       Only useful for Mac, for fixing a delay bug. It seems that it
-                       didn't fix the bug, so it might be removed soon.
+            Only useful for Mac, for fixing a delay bug. It seems that it
+            didn't fix the bug, so it might be removed soon.
     */
     static bool Capture(wxBitmap* bitmap, wxRect rect, int delay = 0);