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
This commit is contained in:
@@ -11,19 +11,10 @@
|
||||
|
||||
#include "guiframe.h"
|
||||
|
||||
// when defined to 1, wxAui for the main frame
|
||||
#define SCREENSHOTGEN_USE_AUI 0
|
||||
|
||||
|
||||
class CtrlMaskOut;
|
||||
|
||||
|
||||
class ScreenshotFrame
|
||||
#if SCREENSHOTGEN_USE_AUI
|
||||
: public AuiGUIFrame
|
||||
#else
|
||||
: public GUIFrame
|
||||
#endif
|
||||
class ScreenshotFrame : public GUIFrame
|
||||
{
|
||||
public:
|
||||
ScreenshotFrame(wxFrame *frame);
|
||||
@@ -41,13 +32,8 @@ protected: // event handlers
|
||||
virtual void OnEndCaptureRect( wxCommandEvent& event );
|
||||
virtual void OnCaptureAllControls( wxCommandEvent& event );
|
||||
|
||||
#if SCREENSHOTGEN_USE_AUI
|
||||
virtual void OnNotebookPageChanged( wxAuiNotebookEvent& event );
|
||||
virtual void OnNotebookPageChanging( wxAuiNotebookEvent& event );
|
||||
#else
|
||||
virtual void OnNotebookPageChanged( wxNotebookEvent& event );
|
||||
virtual void OnNotebookPageChanging( wxNotebookEvent& event );
|
||||
#endif
|
||||
|
||||
private:
|
||||
// Helper functions
|
||||
|
Reference in New Issue
Block a user