replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents

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

diff --git a/utils/screenshotgen/src/ctrlmaskout.cpp b/utils/screenshotgen/src/ctrlmaskout.cpp
index c4b51abae857693ee383dc8bfef7d3c5a6651fff..3db49ee92302e1dc1e2e879c0144bd3ff71a7540 100644 (file)
--- a/utils/screenshotgen/src/ctrlmaskout.cpp
+++ b/utils/screenshotgen/src/ctrlmaskout.cpp
@@ -10,23 +10,24 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-    #pragma hdrstop
+#pragma hdrstop
 #endif
 
-// for all others, include the necessary headers
+// for all others, include the necessary headers wxWidgets headers)
 #ifndef WX_PRECOMP
-    #include "wx/wx.h"
+#include "wx/wx.h"
 #endif
 
+#include "ctrlmaskout.h"
+
 #ifdef __WXMAC__ // See CreateMask()
-    #include <wx/minifram.h>
-    #include <cstdlib>
+#include <wx/minifram.h>
+#include <cstdlib>
 #endif
 
-#include <wx/filename.h>
-#include <wx/hashset.h>
-
-#include "ctrlmaskout.h"
+// use a set to make sure the same control won't be inserted twice
+#include "wx/hashset.h"
+WX_DECLARE_HASH_SET(wxWindow*, wxPointerHash, wxPointerEqual, CtrlSet);
 
 
 // It's copied from src/aui/framemanager.cpp and modified, a failed attempt to
@@ -75,11 +76,11 @@ public:
 //            return;
 //        }
 //
-//             Show(false);
+//         Show(false);
 //
-//             GetParent()->Update();
+//         GetParent()->Update();
 //
-//             Show(true);
+//         Show(true);
 //
 //
 //        m_lastWidth = event.GetSize().GetWidth();
@@ -280,9 +281,6 @@ void CtrlMaskOut::DetermineCtrlNameAndRect()
     wxString ctrlName;
     wxRect ctrlSize;
 
-    // use a set to make sure the same control won't be inserted twice
-    WX_DECLARE_HASH_SET(wxWindow*, wxPointerHash, wxPointerEqual, CtrlSet);
-
     CtrlSet ctrls;
 
     int i, j;