X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..3ab296d9eb6d351eb1d2238f3e6ff2f5e6123861:/src/mac/carbon/frame.cpp?ds=sidebyside diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index 47505c64d7..b630e653f4 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -15,20 +15,18 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/dcclient.h" + #include "wx/menu.h" + #include "wx/dialog.h" + #include "wx/settings.h" + #include "wx/toolbar.h" + #include "wx/statusbr.h" + #include "wx/menuitem.h" #endif // WX_PRECOMP -#include "wx/statusbr.h" -#include "wx/toolbar.h" -#include "wx/menuitem.h" -#include "wx/menu.h" -#include "wx/dcclient.h" -#include "wx/dialog.h" -#include "wx/settings.h" - #include "wx/mac/uma.h" extern wxWindowList wxModelessWindows; -//extern wxList wxPendingDelete; BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_ACTIVATE(wxFrame::OnActivate) @@ -48,20 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) void wxFrame::Init() { - m_frameMenuBar = NULL; - m_frameStatusBar = NULL; m_winLastFocused = NULL; - -#if wxUSE_TOOLBAR - m_frameToolBar = NULL; -#endif - -#if wxUSE_TOOLTIPS - // NB: is this used anywhere? - m_hwndToolTip = NULL; -#endif - - m_iconized = false; } bool wxFrame::Create(wxWindow *parent,