lastest patch from Utensil Candel: remove some legacy code; clarify the logic in the construction of ScreenshotFrame; fix some wxFlexGridSizer issues; update README and TODO list

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/screenshotgen/src/screenshot_main.cpp

@@ -34,12 +34,7 @@
 // ScreenshotFrame
 // ----------------------------------------------------------------------------
 
-ScreenshotFrame::ScreenshotFrame(wxFrame *frame)
-#if SCREENSHOTGEN_USE_AUI
-: AuiGUIFrame(frame)
-#else
-: GUIFrame(frame)
-#endif
+ScreenshotFrame::ScreenshotFrame(wxFrame *frame) : GUIFrame(frame)
 {
 #if wxUSE_STATUSBAR
     statusBar->SetStatusText(_("Welcome to the Automatic Screenshot Generator!"), 0);
@@ -53,11 +48,6 @@ ScreenshotFrame::ScreenshotFrame(wxFrame *frame)
 
     // Do some further customization on some controls generated by wxFormBuilder
     InitFBControls();
-#if SCREENSHOTGEN_USE_AUI
-    // Somehow it will be very small after I move to Aui
-    SetSize(600, 600);
-    // Maximize(true);
-#endif
 }
 
 ScreenshotFrame::~ScreenshotFrame()
@@ -213,13 +203,7 @@ void ScreenshotFrame::OnEndCaptureRect(wxCommandEvent& WXUNUSED(event))
     thePage->Disconnect( wxEVT_MOTION, wxMouseEventHandler( CtrlMaskOut::OnMouseMoving ), NULL, m_maskout);
 }
 
-void ScreenshotFrame::OnNotebookPageChanging(
-#if SCREENSHOTGEN_USE_AUI
-wxAuiNotebookEvent& event
-#else
-wxNotebookEvent& event
-#endif
-)
+void ScreenshotFrame::OnNotebookPageChanging(wxNotebookEvent& event)
 {
     if (!capturingRect)
     {
@@ -236,13 +220,7 @@ wxNotebookEvent& event
     event.Skip();
 }
 
-void ScreenshotFrame::OnNotebookPageChanged(
-#if SCREENSHOTGEN_USE_AUI
-wxAuiNotebookEvent& event
-#else
-wxNotebookEvent& event
-#endif
-)
+void ScreenshotFrame::OnNotebookPageChanged(wxNotebookEvent& event)
 {
     if (!capturingRect)
     {