Remove wx/frame.h, wx/sizer.h, wx/access.h from headers
This commit is contained in:
parent
ef9f3255dd
commit
bcc2e0d13b
|
@ -13,7 +13,6 @@
|
|||
|
||||
#include "MemoryX.h"
|
||||
#include <vector>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/statbmp.h>
|
||||
#include <wx/bitmap.h>
|
||||
#include "widgets/wxPanelWrapper.h"
|
||||
|
|
|
@ -20,8 +20,9 @@
|
|||
|
||||
#include "MemoryX.h"
|
||||
#include <wx/log.h>
|
||||
#include <wx/frame.h>
|
||||
#include <wx/event.h> // to inherit wxEvtHandler
|
||||
|
||||
class wxFrame;
|
||||
class wxTextCtrl;
|
||||
|
||||
class AudacityLogger final : public wxEvtHandler, public wxLog {
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#endif
|
||||
|
||||
//#include "wx/log.h"
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/menuitem.h>
|
||||
#include <wx/checklst.h>
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#endif
|
||||
|
||||
//#include "wx/log.h"
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/menuitem.h>
|
||||
#include <wx/checklst.h>
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include <vector>
|
||||
#include <wx/brush.h>
|
||||
#include <wx/dcmemory.h>
|
||||
#include <wx/frame.h>
|
||||
#include <wx/panel.h>
|
||||
#include <wx/checkbox.h>
|
||||
#include <wx/dialog.h>
|
||||
|
@ -23,7 +22,6 @@
|
|||
#include <wx/pen.h>
|
||||
#include <wx/font.h>
|
||||
#include <wx/scrolbar.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/statusbr.h>
|
||||
#include <wx/utils.h>
|
||||
#include "SampleFormat.h"
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#define __AUDACITY_HISTORY_WINDOW__
|
||||
|
||||
#include <wx/button.h>
|
||||
#include <wx/frame.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/spinctrl.h>
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#ifndef __AUDACITY_LYRICS_WINDOW__
|
||||
#define __AUDACITY_LYRICS_WINDOW__
|
||||
|
||||
#include <wx/frame.h>
|
||||
#include <wx/frame.h> // to inherit
|
||||
|
||||
class AudacityProject;
|
||||
class LyricsPanel;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#ifndef __AUDACITY_MIXER_BOARD__
|
||||
#define __AUDACITY_MIXER_BOARD__
|
||||
|
||||
#include <wx/frame.h>
|
||||
#include <wx/frame.h> // to inherit
|
||||
#include <wx/bmpbuttn.h>
|
||||
#include <wx/hashmap.h>
|
||||
#include <wx/image.h>
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include <wx/log.h>
|
||||
#include <wx/dragimag.h>
|
||||
#include <wx/generic/dragimgg.h>
|
||||
#include <wx/frame.h>
|
||||
#include <wx/frame.h> // to inherit
|
||||
#include <wx/intl.h>
|
||||
#include <wx/dcclient.h>
|
||||
|
||||
|
@ -49,7 +49,6 @@ const int AudacityProjectTimerID = 5200;
|
|||
class wxArrayString;
|
||||
class wxWindow;
|
||||
class wxDialog;
|
||||
class wxBoxSizer;
|
||||
class wxScrollEvent;
|
||||
class wxScrollBar;
|
||||
class wxPanel;
|
||||
|
|
|
@ -32,6 +32,7 @@ It forwards the actual work of doing the commands to the ScreenshotCommand.
|
|||
#include <wx/image.h>
|
||||
#include <wx/intl.h>
|
||||
#include <wx/panel.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/statusbr.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/timer.h>
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include <vector>
|
||||
#include "MemoryX.h"
|
||||
#include <wx/grid.h>
|
||||
#include <wx/sizer.h>
|
||||
|
||||
#include "WrappedType.h"
|
||||
|
||||
|
@ -68,6 +67,7 @@ class wxRadioButton;
|
|||
class wxBitmap;
|
||||
class wxPanel;
|
||||
class wxSizer;
|
||||
class wxSizerItem;
|
||||
class wxStaticBox;
|
||||
class wxMenuBar;
|
||||
class wxMenu;
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include <wx/dialog.h>
|
||||
#include "widgets/wxPanelWrapper.h"
|
||||
|
||||
class wxBoxSizer;
|
||||
class wxStaticBitmap;
|
||||
class wxBitmap;
|
||||
class ShuttleGui;
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include <wx/setup.h> // for wxUSE_* macros
|
||||
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
#include <wx/access.h>
|
||||
#include "widgets/WindowAccessible.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "../widgets/wxPanelWrapper.h"
|
||||
|
||||
class wxButton;
|
||||
class wxSizer;
|
||||
class wxString;
|
||||
class wxTextCtrl;
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include "../MemoryX.h"
|
||||
#include "../UndoManager.h"
|
||||
|
||||
#include <wx/access.h>
|
||||
#include <wx/defs.h>
|
||||
#include <wx/bmpbuttn.h>
|
||||
#include <wx/button.h>
|
||||
|
|
|
@ -18,17 +18,16 @@
|
|||
|
||||
#if defined(EXPERIMENTAL_EFFECTS_RACK)
|
||||
|
||||
#include <wx/access.h>
|
||||
#include <wx/bmpbuttn.h>
|
||||
#include <wx/defs.h>
|
||||
#include <wx/frame.h>
|
||||
#include <wx/frame.h> // to inherit
|
||||
#include <wx/image.h>
|
||||
#include <wx/panel.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/timer.h>
|
||||
|
||||
#include "EffectManager.h"
|
||||
|
||||
class wxFlexGridSizer;
|
||||
class wxStaticText;
|
||||
|
||||
class EffectRack final : public wxFrame
|
||||
|
|
|
@ -80,6 +80,7 @@
|
|||
#include <wx/filefn.h>
|
||||
#include <wx/stdpaths.h>
|
||||
#include <wx/settings.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/checkbox.h>
|
||||
#include <wx/tooltip.h>
|
||||
#include <wx/utils.h>
|
||||
|
|
|
@ -23,13 +23,11 @@
|
|||
#include <wx/dialog.h>
|
||||
#include <wx/intl.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/bitmap.h>
|
||||
#include <wx/radiobut.h>
|
||||
#include <wx/checkbox.h>
|
||||
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
#include <wx/access.h>
|
||||
#include "../widgets/WindowAccessible.h"
|
||||
#endif
|
||||
|
||||
|
@ -53,7 +51,10 @@ const int kEqOptionCurve =1<<1;
|
|||
// The legacy version offers both Graphic and curve on the same UI.
|
||||
const int kEqLegacy = kEqOptionGraphic + kEqOptionCurve;
|
||||
|
||||
class wxBoxSizer;
|
||||
class wxChoice;
|
||||
class wxSizer;
|
||||
class wxSizerItem;
|
||||
class wxSlider;
|
||||
class wxStaticText;
|
||||
class Envelope;
|
||||
|
|
|
@ -54,7 +54,6 @@ extern int scorealign(
|
|||
#endif
|
||||
|
||||
class wxButton;
|
||||
class wxSizer;
|
||||
class wxString;
|
||||
class wxSlider;
|
||||
class wxStaticText;
|
||||
|
|
|
@ -53,7 +53,6 @@
|
|||
#include <wx/dcclient.h>
|
||||
#include <wx/file.h>
|
||||
#include <wx/filename.h>
|
||||
#include <wx/frame.h>
|
||||
#include <wx/imaglist.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/log.h>
|
||||
|
|
|
@ -39,6 +39,7 @@ effects from this one class.
|
|||
#include <wx/datetime.h>
|
||||
#include <wx/intl.h>
|
||||
#include <wx/log.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/slider.h>
|
||||
#include <wx/sstream.h>
|
||||
#include <wx/stattext.h>
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include <wx/datetime.h>
|
||||
#include <wx/dialog.h>
|
||||
#include <wx/intl.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/textbuf.h>
|
||||
#include <wx/tokenzr.h>
|
||||
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
#include <wx/event.h>
|
||||
#include <wx/image.h>
|
||||
#include <wx/intl.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/statusbr.h>
|
||||
#include <wx/timer.h>
|
||||
#endif
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
|
||||
#include <vector>
|
||||
#include <wx/defs.h>
|
||||
#include <wx/sizer.h>
|
||||
|
||||
#include "../Theme.h"
|
||||
#include "../widgets/wxPanelWrapper.h"
|
||||
|
||||
class wxBoxSizer;
|
||||
class wxDC;
|
||||
class wxEraseEvent;
|
||||
class wxMouseEvent;
|
||||
|
|
|
@ -41,6 +41,7 @@
|
|||
#include <wx/intl.h>
|
||||
#include <wx/region.h>
|
||||
#include <wx/settings.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/sysopt.h>
|
||||
#include <wx/timer.h>
|
||||
#include <wx/utils.h>
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include "../MemoryX.h"
|
||||
#include <wx/defs.h>
|
||||
#include <wx/eventfilter.h>
|
||||
#include <wx/frame.h>
|
||||
#include <wx/frame.h> // to inherit
|
||||
#include <wx/timer.h>
|
||||
|
||||
#include "ToolDock.h"
|
||||
|
|
|
@ -35,6 +35,7 @@ Paul Licameli split from TrackPanel.cpp
|
|||
#include "../../../../widgets/ErrorDialog.h"
|
||||
|
||||
#include <wx/combobox.h>
|
||||
#include <wx/sizer.h>
|
||||
|
||||
namespace
|
||||
{
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include <wx/setup.h> // for wxUSE_* macros
|
||||
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
#include <wx/access.h>
|
||||
#include "WindowAccessible.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include "widgets/wxPanelWrapper.h"
|
||||
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
#include <wx/access.h>
|
||||
#include "WindowAccessible.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#include "../Internat.h"
|
||||
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
#include <wx/access.h>
|
||||
#include "WindowAccessible.h"
|
||||
|
||||
class GridAx;
|
||||
|
|
|
@ -67,7 +67,6 @@ enum ViewByType
|
|||
};
|
||||
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
#include <wx/access.h>
|
||||
#include "WindowAccessible.h"
|
||||
|
||||
// Forward reference accessibility provideer
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
#include <wx/mimetype.h>
|
||||
#include <wx/filename.h>
|
||||
#include <wx/frame.h>
|
||||
#include <wx/uri.h>
|
||||
#include <wx/settings.h>
|
||||
#include <wx/log.h>
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#define __AUDACITY_LINKINGHTMLWINDOW__
|
||||
|
||||
#include <wx/html/htmlwin.h>
|
||||
#include <wx/frame.h>
|
||||
|
||||
#include "HtmlWindow.h"
|
||||
#include "wxPanelWrapper.h"
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include "../Internat.h"
|
||||
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
#include <wx/access.h>
|
||||
#include "WindowAccessible.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
|
||||
#include <wx/access.h>
|
||||
#include <wx/access.h> // to inherit
|
||||
|
||||
class WindowAccessible: public wxAccessible
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue