Commit patch [ 1559950 ] fix mem leaks in wx{Dir|File}Dialog

[wxWidgets.git] / src / mac / carbon / frame.cpp

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 47505c64d7853687d1618d11a8633b3243deb09e..b630e653f4b7c94c8088c4cec87145f1b5f271b2 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -15,20 +15,18 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #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
 
 #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;
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;

-//extern wxList wxPendingDelete;

 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)


@@ -48,20 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 void wxFrame::Init()
 {
 
 void wxFrame::Init()
 {

-    m_frameMenuBar = NULL;
-    m_frameStatusBar = NULL;

     m_winLastFocused = 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,
 }
 
 bool wxFrame::Create(wxWindow *parent,